ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
52#endif
53
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#include <pango/pango.h> 59#include <pango/pango.h>
50 60
51#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
78 88
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
82 95
83#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
85 98
86#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
87 100
88/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
103
104#define KMOD_LRAM 0x10000 // our extension
105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
90 127
91static AV *texture_av; 128static AV *texture_av;
92 129
93static struct 130static struct
94{ 131{
151{ 188{
152 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
153 190
154 while (attrs) 191 while (attrs)
155 { 192 {
156 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 194
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 196 return 1;
160 197
161 attrs = attrs->next; 198 attrs = attrs->next;
162 } 199 }
163 200
164 return 0; 201 return 0;
165} 202}
166 203
167typedef struct cf_layout { 204struct cf_layout {
168 PangoLayout *pl; 205 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
170 int base_height; 207 int base_height;
171 DC__Font font; 208 DC__Font font;
172 rc_t *rc; 209 rc_t *rc;
173} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
174 213
175static DC__Font default_font; 214static DC__Font default_font;
176static PangoContext *opengl_context; 215static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
178 217
179static void 218static void
180substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
181{ 220{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 224#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 226}
188 227
189static void 228static void
219} 258}
220 259
221typedef uint16_t tileid; 260typedef uint16_t tileid;
222typedef uint16_t faceid; 261typedef uint16_t faceid;
223 262
224typedef struct { 263struct maptex
264{
225 GLuint name; 265 GLuint name;
226 int w, h; 266 int w, h;
227 float s, t; 267 float s, t;
228 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
229 tileid smoothtile; 269 tileid smoothtile;
230 uint8_t smoothlevel; 270 uint8_t smoothlevel;
231} maptex; 271 uint8_t unused; /* set to zero on use */
272};
232 273
233typedef struct { 274struct mapcell
275{
234 uint32_t player; 276 uint32_t player;
235 tileid tile[3]; 277 tileid tile[3];
236 uint16_t darkness; 278 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 280};
239 281
240typedef struct { 282struct maprow
283{
241 int32_t c0, c1; 284 int32_t c0, c1;
242 mapcell *col; 285 mapcell *col;
243} maprow; 286};
244 287
245typedef struct map { 288struct mapgrid {
246 int x, y, w, h; 289 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
250 293
251 int32_t rows; 294 int32_t rows;
252 maprow *row; 295 maprow *row;
253} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
254 299
255static char * 300static char *
256prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
257{ 302{
258 char *p; 303 char *p;
276 321
277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 322#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
278#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
279 324
280static void 325static void
281need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
282{ 327{
283 while (self->faces <= face) 328 while (self->faces <= face)
284 { 329 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 331 self->faces *= 2;
287 } 332 }
288} 333}
289 334
290static void 335static void
291need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
292{ 337{
293 while (self->texs <= texid) 338 while (self->texs <= texid)
294 { 339 {
295 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
296 self->texs *= 2; 341 self->texs *= 2;
297 } 342 }
298} 343}
299 344
300static maprow * 345static maprow *
301map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
302{ 347{
303 if (0 > y) 348 if (0 > y)
304 { 349 {
305 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
344 389
345 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
346} 391}
347 392
348static mapcell * 393static mapcell *
349map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
350{ 395{
351 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
352} 397}
353 398
354static void 399static void
355map_clear (DC__Map self) 400map_clear (mapgrid *self)
356{ 401{
357 int r; 402 int r;
358 403
359 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
367 self->oy = 0; 412 self->oy = 0;
368 self->row = 0; 413 self->row = 0;
369 self->rows = 0; 414 self->rows = 0;
370} 415}
371 416
417#define CELL_CLEAR(cell) \
418 do { \
419 if ((cell)->player) \
420 (cell)->tile [2] = 0; \
421 (cell)->darkness = 0; \
422 (cell)->stat_hp = 0; \
423 (cell)->flags = 0; \
424 (cell)->player = 0; \
425 } while (0)
426
372static void 427static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
374{ 429{
375 int x, y; 430 int x, y;
376 maprow *row; 431 maprow *row;
377 mapcell *cell; 432 mapcell *cell;
378 433
390 if (x >= row->c1) 445 if (x >= row->c1)
391 break; 446 break;
392 447
393 cell = row->col + x - row->c0; 448 cell = row->col + x - row->c0;
394 449
395 cell->darkness = 0; 450 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 451 }
400 } 452 }
401} 453}
402 454
403typedef struct { 455struct smooth_key
456{
404 tileid tile; 457 tileid tile;
405 uint8_t x, y, level; 458 uint8_t x, y, level;
406} smooth_key; 459
460 bool operator == (const smooth_key &o) const
461 {
462 return tile == o.tile && x == o.x && y == o.y && level == o.level;
463 }
464};
465
466typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
467
468namespace std {
469 template <>
470 struct hash<smooth_key>
471 {
472 size_t operator () (const smooth_key &v) const
473 {
474 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
475 }
476 };
477}
407 478
408static void 479static void
409smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
410{ 481{
411 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
412 483
413 if (SvIOK (*sv)) 484 if (it == h.end ())
414 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
415 else 486 else
416 sv_setiv (*sv, bits); 487 it->second |= bits;
417} 488}
418 489
419static void 490static void
420music_finished (void) 491music_finished (void)
421{ 492{
438 ev.code = 1; 509 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 511 ev.data2 = 0;
441 512
442 SDL_PushEvent ((SDL_Event *)&ev); 513 SDL_PushEvent ((SDL_Event *)&ev);
514}
515
516// approximately divide by 255
517static unsigned int
518div255 (unsigned int n)
519{
520 return (n + (n >> 8)) >> 8;
443} 521}
444 522
445static unsigned int 523static unsigned int
446minpot (unsigned int n) 524minpot (unsigned int n)
447{ 525{
514 if (!svp || !SvTRUE (*svp)) 592 if (!svp || !SvTRUE (*svp))
515 return 0; 593 return 0;
516 594
517 return 1; 595 return 1;
518} 596}
597
598/******************************************************************************/
599
600/* process keyboard modifiers */
601static int
602mod_munge (int mod)
603{
604 mod &= MOD_MASK;
605
606 if (mod & (KMOD_META | KMOD_ALT))
607 mod |= KMOD_LRAM;
608
609 return mod;
610}
611
612static void
613deliantra_main (SV *real_main)
614{
615 dSP;
616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
619}
620
621#ifdef __MACOSX__
622 static SV *real_main;
623
624 /* to due surprising braindamage on the side of SDL design, we
625 * do some mind-boggling hack here: SDL requires a custom main()
626 * on OS X, so... we provide one and call the original main(), which,
627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
628 * and which calls our main (== SDL_main) back.
629 */
630 extern C_LINKAGE int
631 main (int argc, char *argv[])
632 {
633 deliantra_main (real_main);
634 }
635
636 #undef main
637
638 extern C_LINKAGE int main (int argc, char *argv[]);
639
640 static void
641 SDL_main_hack (SV *real_main_)
642 {
643 real_main = real_main_;
644
645 char *argv[] = { "deliantra client", 0 };
646 (main) (1, argv);
647 }
648#else
649 static void
650 SDL_main_hack (SV *real_main)
651 {
652 deliantra_main (real_main);
653 }
654#endif
519 655
520MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
521 657
522PROTOTYPES: ENABLE 658PROTOTYPES: ENABLE
523 659
552 const_iv (SDL_USEREVENT), 688 const_iv (SDL_USEREVENT),
553 689
554 const_iv (SDL_APPINPUTFOCUS), 690 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 691 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 692 const_iv (SDL_APPACTIVE),
693
694
695 const_iv (SDLK_UNKNOWN),
696 const_iv (SDLK_FIRST),
697 const_iv (SDLK_BACKSPACE),
698 const_iv (SDLK_TAB),
699 const_iv (SDLK_CLEAR),
700 const_iv (SDLK_RETURN),
701 const_iv (SDLK_PAUSE),
702 const_iv (SDLK_ESCAPE),
703 const_iv (SDLK_SPACE),
704 const_iv (SDLK_EXCLAIM),
705 const_iv (SDLK_QUOTEDBL),
706 const_iv (SDLK_HASH),
707 const_iv (SDLK_DOLLAR),
708 const_iv (SDLK_AMPERSAND),
709 const_iv (SDLK_QUOTE),
710 const_iv (SDLK_LEFTPAREN),
711 const_iv (SDLK_RIGHTPAREN),
712 const_iv (SDLK_ASTERISK),
713 const_iv (SDLK_PLUS),
714 const_iv (SDLK_COMMA),
715 const_iv (SDLK_MINUS),
716 const_iv (SDLK_PERIOD),
717 const_iv (SDLK_SLASH),
718 const_iv (SDLK_0),
719 const_iv (SDLK_1),
720 const_iv (SDLK_2),
721 const_iv (SDLK_3),
722 const_iv (SDLK_4),
723 const_iv (SDLK_5),
724 const_iv (SDLK_6),
725 const_iv (SDLK_7),
726 const_iv (SDLK_8),
727 const_iv (SDLK_9),
728 const_iv (SDLK_COLON),
729 const_iv (SDLK_SEMICOLON),
730 const_iv (SDLK_LESS),
731 const_iv (SDLK_EQUALS),
732 const_iv (SDLK_GREATER),
733 const_iv (SDLK_QUESTION),
734 const_iv (SDLK_AT),
735
736 const_iv (SDLK_LEFTBRACKET),
737 const_iv (SDLK_BACKSLASH),
738 const_iv (SDLK_RIGHTBRACKET),
739 const_iv (SDLK_CARET),
740 const_iv (SDLK_UNDERSCORE),
741 const_iv (SDLK_BACKQUOTE),
742 const_iv (SDLK_DELETE),
557 743
558 const_iv (SDLK_FIRST), 744 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 745 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 746 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 747 const_iv (SDLK_KP1),
637 const_iv (KMOD_RMETA), 823 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 824 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 825 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 826 const_iv (KMOD_MODE),
641 827
828 const_iv (KMOD_LRAM),
829
642 const_iv (MIX_DEFAULT_FORMAT), 830 const_iv (MIX_DEFAULT_FORMAT),
643 831
644 const_iv (SDL_INIT_TIMER), 832 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 833 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 834 const_iv (SDL_INIT_VIDEO),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 852 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 853 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 854 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 855 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 856 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 857 const_iv (SDL_GL_SWAP_CONTROL),
858
859 const_iv (FOW_DARKNESS)
670# undef const_iv 860# undef const_iv
671 }; 861 };
672 862
673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 863 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675 865
676 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678} 868}
679 869
695NV ceil (NV x) 885NV ceil (NV x)
696 886
697IV minpot (UV n) 887IV minpot (UV n)
698 888
699IV popcount (UV n) 889IV popcount (UV n)
890
891NV distance (NV dx, NV dy)
892 CODE:
893 RETVAL = pow (dx * dx + dy * dy, 0.5);
894 OUTPUT:
895 RETVAL
700 896
701void 897void
702pango_init () 898pango_init ()
703 CODE: 899 CODE:
704{ 900{
712#endif 908#endif
713} 909}
714 910
715char *SDL_GetError () 911char *SDL_GetError ()
716 912
913void SDL_main_hack (SV *real_main)
914 PROTOTYPE: &
915
717int SDL_Init (U32 flags) 916int SDL_Init (U32 flags)
718 917
719int SDL_InitSubSystem (U32 flags) 918int SDL_InitSubSystem (U32 flags)
720 919
721void SDL_QuitSubSystem (U32 flags) 920void SDL_QuitSubSystem (U32 flags)
722 921
723void SDL_Quit () 922void SDL_Quit ()
724 923
725int SDL_GL_SetAttribute (int attr, int value) 924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
726 926
727int SDL_GL_GetAttribute (int attr) 927int SDL_GL_GetAttribute (int attr)
728 CODE: 928 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL)) 929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
730 XSRETURN_UNDEF; 930 XSRETURN_UNDEF;
731 OUTPUT: 931 OUTPUT:
732 RETVAL 932 RETVAL
733 933
734void 934void
756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 956 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
757 957
758 if (m && m != (SDL_Rect **)-1) 958 if (m && m != (SDL_Rect **)-1)
759 while (*m) 959 while (*m)
760 { 960 {
961 if ((*m)->w >= 400 && (*m)->h >= 300)
962 {
761 AV *av = newAV (); 963 AV *av = newAV ();
762 av_push (av, newSViv ((*m)->w)); 964 av_push (av, newSViv ((*m)->w));
763 av_push (av, newSViv ((*m)->h)); 965 av_push (av, newSViv ((*m)->h));
764 av_push (av, newSViv (rgb)); 966 av_push (av, newSViv (rgb));
765 av_push (av, newSViv (alpha)); 967 av_push (av, newSViv (alpha));
766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 968 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
969 }
767 970
768 ++m; 971 ++m;
769 } 972 }
770} 973}
771 974
786 ); 989 );
787 990
788 if (RETVAL) 991 if (RETVAL)
789 { 992 {
790 av_clear (texture_av); 993 av_clear (texture_av);
791
792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
793#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 994#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
794#include "glfunc.h" 995#include "glfunc.h"
795#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
796 } 999 }
797} 1000}
798 OUTPUT: 1001 OUTPUT:
799 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
800 1006
801void 1007void
802SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
803 1009
804char * 1010char *
805SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
806 1013
807int 1014int
808SDL_GetAppState () 1015SDL_GetAppState ()
809 1016
810int 1017int
811SDL_GetModState () 1018SDL_GetModState ()
812 1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
813void 1024void
1025SDL_PumpEvents ()
1026
1027void
814poll_events () 1028peep_events ()
815 PPCODE: 1029 PPCODE:
816{ 1030{
817 SDL_Event ev; 1031 SDL_Event ev;
818 1032
819 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
826 { 1040 {
827 case SDL_KEYDOWN: 1041 case SDL_KEYDOWN:
828 case SDL_KEYUP: 1042 case SDL_KEYUP:
829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1043 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1044 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
831 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1045 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
832 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1046 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1047 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
834 break; 1048 break;
835 1049
836 case SDL_ACTIVEEVENT: 1050 case SDL_ACTIVEEVENT:
837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1051 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
855 x = ev.motion.x; 1069 x = ev.motion.x;
856 y = ev.motion.y; 1070 y = ev.motion.y;
857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1071 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
858 } 1072 }
859 1073
860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1074 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
861 hv_store (hv, "state", 5, newSViv (state), 0); 1075 hv_store (hv, "state", 5, newSViv (state), 0);
862 hv_store (hv, "x", 1, newSViv (x), 0); 1076 hv_store (hv, "x", 1, newSViv (x), 0);
863 hv_store (hv, "y", 1, newSViv (y), 0); 1077 hv_store (hv, "y", 1, newSViv (y), 0);
864 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1078 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
865 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1079 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
885 1099
886 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1100 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
887 } 1101 }
888} 1102}
889 1103
1104char *
1105SDL_AudioDriverName ()
1106 CODE:
1107{
1108 char buf [256];
1109 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1110 XSRETURN_UNDEF;
1111
1112 RETVAL = buf;
1113}
1114 OUTPUT:
1115 RETVAL
1116
890int 1117int
891Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
892 POSTCALL: 1119 POSTCALL:
893 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
894 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
895 1122
896void 1123void
897Mix_QuerySpec () 1124Mix_QuerySpec ()
956add_font (char *file) 1183add_font (char *file)
957 CODE: 1184 CODE:
958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT: 1186 OUTPUT:
960 RETVAL 1187 RETVAL
1188
1189void
1190IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1191
1192# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1193void
1194Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
961 1195
962void 1196void
963load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
964 ALIAS: 1198 ALIAS:
965 load_image_file = 1 1199 load_image_file = 1
1011 1245
1012 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
1013 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
1014 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
1015 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
1016 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1017 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1251 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1018 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1019 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1020 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
1021 1255
1081#if DEBUG 1315#if DEBUG
1082 VALGRIND_DO_LEAK_CHECK; 1316 VALGRIND_DO_LEAK_CHECK;
1083#endif 1317#endif
1084} 1318}
1085 1319
1320int
1321SvREFCNT (SV *sv)
1322 CODE:
1323 RETVAL = SvREFCNT (sv);
1324 OUTPUT:
1325 RETVAL
1326
1086MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1087 1328
1088PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1089 1330
1090DC::Font 1331DC::Font
1091new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1092 CODE: 1333 CODE:
1093{ 1334{
1094 int count; 1335 int count;
1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1096 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1125 PROTOTYPE: 1366 PROTOTYPE:
1126 CODE: 1367 CODE:
1127 tc_restore (); 1368 tc_restore ();
1128 1369
1129DC::Layout 1370DC::Layout
1130new (SV *class) 1371new (SV *klass)
1131 CODE: 1372 CODE:
1132 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1133 1374
1134 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1135 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1284 1525
1285void 1526void
1286set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1287 CODE: 1528 CODE:
1288 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1289 { 1530 {
1290 self->base_height = base_height; 1531 self->base_height = base_height;
1291 layout_update_font (self); 1532 layout_update_font (self);
1292 } 1533 }
1293 1534
1294void 1535void
1521 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1522 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1523 } 1764 }
1524} 1765}
1525 1766
1767void
1768draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1769 PROTOTYPE: @
1770 CODE:
1771{
1772 glEnable (GL_BLEND);
1773 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1774 glEnable (GL_TEXTURE_2D);
1775 glBindTexture (GL_TEXTURE_2D, name1);
1776
1777 glColor3f (intensity, intensity, intensity);
1778 glPushMatrix ();
1779 glScalef (1./3, 1./3, 1.);
1780
1781 if (blend > 0.f)
1782 {
1783 float dx3 = dx * -3.f / w;
1784 float dy3 = dy * -3.f / h;
1785 GLfloat env_color[4] = { 0., 0., 0., blend };
1786
1787 /* interpolate the two shadow textures */
1788 /* stage 0 == rgb(glcolor) + alpha(t0) */
1789 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1790
1791 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1792 gl.ActiveTexture (GL_TEXTURE1);
1793 glEnable (GL_TEXTURE_2D);
1794 glBindTexture (GL_TEXTURE_2D, name2);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1796
1797 /* rgb == rgb(glcolor) */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1801
1802 /* alpha = interpolate t0, t1 by env_alpha */
1803 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1808
1809 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1810 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1811
1812 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1813 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1814
1815 glBegin (GL_QUADS);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 gl.ActiveTexture (GL_TEXTURE0);
1824 }
1825 else
1826 {
1827 /* simple blending of one texture, also opengl <1.3 path */
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1829
1830 glBegin (GL_QUADS);
1831 glTexCoord2f (0, 0); glVertex2f (0, 0);
1832 glTexCoord2f (0, t); glVertex2f (0, h);
1833 glTexCoord2f (s, t); glVertex2f (w, h);
1834 glTexCoord2f (s, 0); glVertex2f (w, 0);
1835 glEnd ();
1836 }
1837
1838 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1839 {
1840 int x, y;
1841 int dx3 = dx * 3;
1842 int dy3 = dy * 3;
1843
1844 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1845 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1846 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1847 glTranslatef (-1., -1., 0);
1848 glBegin (GL_QUADS);
1849
1850 for (y = 1; y < h; y += 3)
1851 {
1852 int y1 = y - dy3;
1853 int y1valid = y1 >= 0 && y1 < h;
1854
1855 for (x = 1; x < w; x += 3)
1856 {
1857 int x1 = x - dx3;
1858 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 uint8_t h2;
1860
1861 if (y1valid && x1 >= 0 && x1 < w)
1862 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1863 else
1864 h2 = 1; /* out of range == invisible */
1865
1866 if (h1 || h2)
1867 {
1868 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1869 glColor4f (1., 1., 1., alpha);
1870
1871 glTexCoord2f (0, 0.); glVertex2i (x , y );
1872 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1873 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1874 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1875 }
1876 }
1877 }
1878 }
1879
1880 glEnd ();
1881
1882 glPopMatrix ();
1883
1884 glDisable (GL_TEXTURE_2D);
1885 glDisable (GL_BLEND);
1886}
1887
1526IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1888IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1527 CODE: 1889 CODE:
1528{ 1890{
1529 GLint width; 1891 GLint width;
1530 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1892 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1537MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1538 1900
1539PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1540 1902
1541DC::Map 1903DC::Map
1542new (SV *class) 1904new (SV *klass)
1543 CODE: 1905 CODE:
1544 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1545 RETVAL->x = 0; 1907 RETVAL->x = 0;
1546 RETVAL->y = 0; 1908 RETVAL->y = 0;
1547 RETVAL->w = 0; 1909 RETVAL->w = 0;
1548 RETVAL->h = 0; 1910 RETVAL->h = 0;
1549 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1586 1948
1587void 1949void
1588set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1589 CODE: 1951 CODE:
1590{ 1952{
1591 tileid texid; 1953 tileid texid;
1592 maptex *tex; 1954 maptex *tex;
1593 1955
1594 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1595 return; 1957 return;
1596 1958
1597 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1598 return; 1960 return;
1599 1961
1600 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1601 1963
1602 if (!texid) 1964 if (!texid)
1603 return; 1965 return;
1604 1966
1605 tex = self->tex + texid; 1967 tex = self->tex + texid;
1634 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1996 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1635 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1636 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1638} 2000}
2001
2002void
2003expire_textures (DC::Map self, int texid, int count)
2004 PPCODE:
2005 for (; texid < self->texs && count; ++texid, --count)
2006 {
2007 maptex *tex = self->tex + texid;
2008
2009 if (tex->name)
2010 {
2011 if (tex->unused)
2012 {
2013 tex->name = 0;
2014 tex->unused = 0;
2015 XPUSHs (sv_2mortal (newSViv (texid)));
2016 }
2017 else
2018 tex->unused = 1;
2019 }
2020 }
1639 2021
1640int 2022int
1641ox (DC::Map self) 2023ox (DC::Map self)
1642 ALIAS: 2024 ALIAS:
1643 oy = 1 2025 oy = 1
1683 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1684 } 2066 }
1685} 2067}
1686 2068
1687SV * 2069SV *
1688map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1689 CODE: 2071 CODE:
1690{ 2072{
1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1692 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1693 mapcell *cell; 2075 mapcell *cell;
1714 2096
1715 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1716 2098
1717 if (flags & 8) 2099 if (flags & 8)
1718 { 2100 {
2101 uint8_t ext, cmd;
2102
1719 if (extmap) 2103 do
1720 { 2104 {
1721 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1722 2107
1723 do 2108 if (cmd < 4)
2109 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2110 else if (cmd == 5) // health
1724 { 2111 {
1725 ext = *data++;
1726 cmd = ext & 0x7f;
1727
1728 if (cmd < 4)
1729 cell->darkness = 255 - ext * 64 + 1;
1730 else if (cmd == 5) // health
1731 {
1732 cell->stat_width = 1; 2112 cell->stat_width = 1;
1733 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1734 }
1735 else if (cmd == 6) // monster width
1736 cell->stat_width = *data++ + 1;
1737 else if (cmd == 0x47)
1738 {
1739 if (*data == 1) cell->player = data [1];
1740 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1741 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1742 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1743
1744 data += *data + 1;
1745 }
1746 else if (cmd == 8) // cell flags
1747 cell->flags = *data++;
1748 else if (ext & 0x40) // unknown, multibyte => skip
1749 data += *data + 1;
1750 else
1751 data++;
1752 } 2114 }
1753 while (ext & 0x80); 2115 else if (cmd == 6) // monster width
2116 cell->stat_width = *data++ + 1;
2117 else if (cmd == 0x47)
2118 {
2119 if (*data == 1) cell->player = data [1];
2120 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2121 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2122 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2123
2124 data += *data + 1;
2125 }
2126 else if (cmd == 8) // cell flags
2127 cell->flags = *data++;
2128 else if (ext & 0x40) // unknown, multibyte => skip
2129 data += *data + 1;
2130 else
2131 data++;
1754 } 2132 }
1755 else 2133 while (ext & 0x80);
1756 cell->darkness = *data++ + 1;
1757 } 2134 }
1758 2135
1759 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
1760 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
1761 { 2138 {
1764 cell->tile [z] = self->face2tile [face]; 2141 cell->tile [z] = self->face2tile [face];
1765 2142
1766 if (cell->tile [z]) 2143 if (cell->tile [z])
1767 { 2144 {
1768 maptex *tex = self->tex + cell->tile [z]; 2145 maptex *tex = self->tex + cell->tile [z];
2146 tex->unused = 0;
1769 if (!tex->name) 2147 if (!tex->name)
1770 av_push (missing, newSViv (cell->tile [z])); 2148 av_push (missing, newSViv (cell->tile [z]));
1771 2149
1772 if (tex->smoothtile) 2150 if (tex->smoothtile)
1773 { 2151 {
1774 maptex *smooth = self->tex + tex->smoothtile; 2152 maptex *smooth = self->tex + tex->smoothtile;
2153 smooth->unused = 0;
1775 if (!smooth->name) 2154 if (!smooth->name)
1776 av_push (missing, newSViv (tex->smoothtile)); 2155 av_push (missing, newSViv (tex->smoothtile));
1777 } 2156 }
1778 } 2157 }
1779 } 2158 }
1780 } 2159 }
1781 else 2160 else
1782 cell->darkness = 0; 2161 CELL_CLEAR (cell);
1783 } 2162 }
1784} 2163}
1785 OUTPUT: 2164 OUTPUT:
1786 RETVAL 2165 RETVAL
1787 2166
1807 ? self->row + y 2186 ? self->row + y
1808 : 0; 2187 : 0;
1809 2188
1810 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1811 { 2190 {
1812 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1813 2192
1814 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1815 { 2194 {
1816 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1817 2196
1819 { 2198 {
1820 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1821 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1822 int a1 = tex.a; 2201 int a1 = tex.a;
1823 2202
1824 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1825 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1826 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1827 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1828 } 2207 }
1829 } 2208 }
1830 2209
1831 *map++ = (r ) 2210 *map++ = (r )
1832 | (g << 8) 2211 | (g << 8)
1833 | (b << 16) 2212 | (b << 16)
1834 | (a << 24); 2213 | (a << 24);
1835 } 2214 }
1836 } 2215 }
1837 2216
1838 RETVAL = map_sv; 2217 RETVAL = map_sv;
1839} 2218}
1840 OUTPUT: 2219 OUTPUT:
1841 RETVAL 2220 RETVAL
1842 2221
1843void 2222void
1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1845 CODE: 2224 CODE:
1846{ 2225{
1847 int x, y, z; 2226 int x, y, z;
1848 2227
1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1850 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1852 smooth_key skey; 2230 smooth_key skey;
1853 int pl_x, pl_y; 2231 int pl_x, pl_y;
1854 maptex pl_tex; 2232 maptex pl_tex;
1855 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2234 rc_t *rc_ov = rc_alloc ();
1856 rc_key_t key; 2235 rc_key_t key;
1857 rc_array_t *arr; 2236 rc_array_t *arr;
1858 2237
1859 pl_tex.name = 0; 2238 pl_tex.name = 0;
1860 2239
1861 // thats current max. sorry. 2240 // that's current max. sorry.
1862 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1863 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1864 2243
1865 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1866 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
1870 key.g = 255; 2249 key.g = 255;
1871 key.b = 255; 2250 key.b = 255;
1872 key.a = 255; 2251 key.a = 255;
1873 key.mode = GL_QUADS; 2252 key.mode = GL_QUADS;
1874 key.format = GL_T2F_V3F; 2253 key.format = GL_T2F_V3F;
1875 key.texname = -1;
1876 2254
1877 mx += self->x; 2255 mx += self->x;
1878 my += self->y; 2256 my += self->y;
1879 2257
1880 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
1903 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1904 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1905 2283
1906 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1907 { 2285 {
2286 smooth_hash smooth;
1908 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1909 2289
1910 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1911 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1912 { 2292 {
1913 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
1919 tileid tile = cell->tile [z]; 2299 tileid tile = cell->tile [z];
1920 2300
1921 if (tile) 2301 if (tile)
1922 { 2302 {
1923 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1924 int px = (x + 1) * T - tex.w; 2304 int px, py;
1925 int py = (y + 1) * T - tex.h;
1926 2305
1927 if (key.texname != tex.name) 2306 if (key.texname != tex.name)
1928 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1929 if (!tex.name) 2310 if (!tex.name)
1930 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1931 2312
1932 key.texname = tex.name; 2313 key.texname = tex.name;
1933 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
1934 } 2315 }
2316
2317 px = (x + 1) * Th - tex.w;
2318 py = (y + 1) * Tw - tex.h;
1935 2319
1936 if (expect_false (cell->player == player) && expect_false (z == 2)) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
1937 { 2321 {
1938 pl_x = px; 2322 pl_x = px;
1939 pl_y = py; 2323 pl_y = py;
1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1945 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2329 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1946 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2330 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2331 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1948 2332
1949 if (expect_false (cell->flags) && expect_false (z == 2))
1950 {
1951 // overlays such as the speech bubble, probably more to come
1952 if (cell->flags & 1)
1953 {
1954 maptex tex = self->tex [1];
1955 int px = x * T + T * 2 / 32;
1956 int py = y * T - T * 6 / 32;
1957
1958 if (tex.name)
1959 {
1960 if (key.texname != tex.name)
1961 {
1962 key.texname = tex.name;
1963 arr = rc_array (rc, &key);
1964 }
1965
1966 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1967 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1968 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1969 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1970 }
1971 }
1972 }
1973
1974 // update smooth hash 2333 // update smooth hash
1975 if (tex.smoothtile) 2334 if (tex.smoothtile)
1976 { 2335 {
1977 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
1978 skey.level = tex.smoothlevel; 2337 skey.level = tex.smoothlevel;
1993 2352
1994 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1995 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
1996 2355
1997 // full tile 2356 // full tile
1998 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2357 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1999 2358
2000 // borders 2359 // borders
2001 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2002 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2003 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2362 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2004 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2363 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2005 2364
2006 // corners 2365 // corners
2007 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2366 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2008 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2367 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2009 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2368 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2010 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2369 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2370 }
2371 }
2372
2373 if (expect_false (z == 2) && expect_false (cell->flags))
2374 {
2375 // overlays such as the speech bubble, probably more to come
2376 if (cell->flags & 1)
2377 {
2378 rc_key_t key_ov = key;
2379 maptex tex = self->tex [TEXID_SPEECH];
2380 rc_array_t *arr;
2381 int px = x * Tw + Tw * 2 / 32;
2382 int py = y * Th - Th * 6 / 32;
2383
2384 key_ov.texname = tex.name;
2385 arr = rc_array (rc_ov, &key_ov);
2386
2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2011 } 2391 }
2012 } 2392 }
2013 } 2393 }
2014 } 2394 }
2015 2395
2031 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
2032 { 2412 {
2033 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
2034 HE *he; 2414 HE *he;
2035 2415
2036 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2037 while ((he = hv_iternext (smooth)))
2038 { 2417 {
2039 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
2040 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
2041 2420
2042 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
2043 && skey->level == level 2422 && skey.level == level
2044 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
2045 { 2424 {
2046 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
2047 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
2048 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
2049 int border = bits & 15; 2428 int border = bits & 15;
2050 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2051 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
2052 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
2053 2432
2055 { 2434 {
2056 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2057 // save gobs of state changes. 2436 // save gobs of state changes.
2058 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2059 { 2438 {
2439 self->tex [skey.tile].unused = 0;
2440
2060 glEnd (); 2441 glEnd ();
2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2062 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2063 } 2444 }
2064 2445
2065 if (border) 2446 if (border)
2066 { 2447 {
2067 float ox = border * dx; 2448 float ox = border * dx;
2068 2449
2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2073 } 2454 }
2074 2455
2075 if (corner) 2456 if (corner)
2076 { 2457 {
2077 float ox = corner * dx; 2458 float ox = corner * dx;
2078 2459
2079 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2081 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2083 } 2464 }
2084 } 2465 }
2085 } 2466 }
2086 } 2467 }
2087 } 2468 }
2089 2470
2090 glEnd (); 2471 glEnd ();
2091 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2092 key.texname = -1; 2473 key.texname = -1;
2093 } 2474 }
2094
2095 hv_clear (smooth);
2096 } 2475 }
2097 2476
2098 if (pl_tex.name) 2477 if (pl_tex.name)
2099 { 2478 {
2100 maptex tex = pl_tex; 2479 maptex tex = pl_tex;
2101 int px = pl_x + pdx; 2480 int px = pl_x + sdx;
2102 int py = pl_y + pdy; 2481 int py = pl_y + sdy;
2103 2482
2104 key.texname = tex.name; 2483 key.texname = tex.name;
2105 arr = rc_array (rc, &key); 2484 arr = rc_array (rc, &key);
2106 2485
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2486 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2489 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111 2490
2112 rc_draw (rc); 2491 rc_draw (rc);
2113 } 2492 }
2114 2493
2494 rc_draw (rc_ov);
2495 rc_clear (rc_ov);
2496
2115 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
2116 rc_free (rc); 2498 rc_free (rc);
2499 rc_free (rc_ov);
2117 2500
2118 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
2119 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
2120 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
2121 { 2504 {
2124 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2509 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2128 2511
2129 int px = x * T; 2512 int px = x * Tw;
2130 int py = y * T; 2513 int py = y * Th;
2514
2515 if (expect_false (cell->player == player))
2516 {
2517 px += sdx;
2518 py += sdy;
2519 }
2131 2520
2132 if (cell->stat_hp) 2521 if (cell->stat_hp)
2133 { 2522 {
2134 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2135 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2136 2525
2137 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2138 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2139 px + width - 1, py); 2528 px + width - 1, py);
2140 2529
2146 } 2535 }
2147 } 2536 }
2148} 2537}
2149 2538
2150void 2539void
2151draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2540draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2152 CODE: 2541 CODE:
2153{ 2542{
2154 static float color[16][3] = { 2543 static float color[16][3] = {
2155 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
2156 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
2157 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
2158 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
2159 2548
2160 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
2161 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
2162 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
2163 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
2164 2553
2165 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
2166 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
2167 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
2168 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
2169 2558
2170 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
2171 2560
2172 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
2173 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
2174 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
2175 }; 2564 };
2176 2565
2177 int x, y; 2566 int x, y;
2178 2567
2179 glEnable (GL_TEXTURE_2D); 2568 glEnable (GL_TEXTURE_2D);
2569 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2570 * but the nvidia driver (185.18.14) mishandles alpha textures
2571 * and takes the colour from god knows where instead of using
2572 * Cp. MODULATE results in the same colour, but slightly different
2573 * alpha, but atcually gives us the correct colour with nvidia.
2574 */
2180 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2181 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2182 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2183 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
2184 2579
2185 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
2189 2584
2190 if (m) 2585 if (m)
2191 { 2586 {
2192 float *c = color [m & 15]; 2587 float *c = color [m & 15];
2193 2588
2194 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
2195 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
2196 2591
2197 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
2198 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2199 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2200 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2201 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2202 } 2597 }
2210void 2605void
2211fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2606fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2212 PPCODE: 2607 PPCODE:
2213{ 2608{
2214 int x, y; 2609 int x, y;
2215 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2216 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2217 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2218 int sw34 = (sw * 3 + 3) & ~3; 2613 int sw3 = sw * 3;
2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2219 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2220 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2221 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2222 2618
2223 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2224 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2225 2621
2226 mx += self->x - 1; 2622 mx += self->x - 1;
2227 my += self->y - 1; 2623 my += self->y - 1;
2228
2229 memset (darkness1, 255, sw1 * sh1);
2230 2624
2231 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2232 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2233 { 2627 {
2234 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
2237 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
2238 { 2632 {
2239 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
2240 2634
2241 darkness1 [y * sw1 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
2242 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2243 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2244 } 2638 }
2245 } 2639 }
2246 2640
2247 for (y = 0; y < sh; ++y) 2641 for (y = 0; y < sh; ++y)
2248 for (x = 0; x < sw; ++x) 2642 for (x = 0; x < sw; ++x)
2267 2661
2268 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2269 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2270 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2271 2665
2272 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2273 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2274 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2275 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2276 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2670 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2277 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2278 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2279 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2280 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2281 } 2675 }
2282 2676
2283 free (darkness1); 2677 free (darkness1);
2284 2678
2285 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2286 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2287 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2288 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2289} 2683}
2290 2684
2291SV * 2685SV *
2354 else 2748 else
2355 *data++ = 0; 2749 *data++ = 0;
2356 } 2750 }
2357 } 2751 }
2358 2752
2359 /* if size is w*h + 5 then no data has been found */ 2753 /* if size is w*h + 5 then no data has been found */
2360 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2361 { 2755 {
2362 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 } 2758 }
2365 2759
2366 RETVAL = data_sv; 2760 RETVAL = data_sv;
2367} 2761}
2368 OUTPUT: 2762 OUTPUT:
2369 RETVAL 2763 RETVAL
2370 2764
2371void 2765void
2378 STRLEN len; 2772 STRLEN len;
2379 uint8_t *data, *end; 2773 uint8_t *data, *end;
2380 2774
2381 len = SvLEN (data_sv); 2775 len = SvLEN (data_sv);
2382 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2383 data = SvPVbyte_nolen (data_sv); 2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2384 end = data + len + 8; 2778 end = data + len + 8;
2385 2779
2386 if (len < 5) 2780 if (len < 5)
2387 XSRETURN_EMPTY; 2781 XSRETURN_EMPTY;
2388 2782
2449} 2843}
2450 2844
2451MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2452 2846
2453DC::RW 2847DC::RW
2454new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2455 CODE: 2849 CODE:
2456{ 2850{
2457 STRLEN datalen; 2851 STRLEN datalen;
2458 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2459 2853
2461} 2855}
2462 OUTPUT: 2856 OUTPUT:
2463 RETVAL 2857 RETVAL
2464 2858
2465DC::RW 2859DC::RW
2466new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2467 CODE: 2861 CODE:
2468 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2469 OUTPUT: 2863 OUTPUT:
2470 RETVAL 2864 RETVAL
2471 2865
2489 if (RETVAL < 0) 2883 if (RETVAL < 0)
2490 { 2884 {
2491 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2492 2886
2493 if (RETVAL < 0) 2887 if (RETVAL < 0)
2888 {
2889 // happens sometimes, maybe it just stopped playing(?)
2890 RETVAL = Mix_GroupAvailable (-1);
2891
2892 if (RETVAL < 0)
2494 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2495 2894 }
2895 else
2496 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2497 } 2897 }
2498 2898
2499 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2500 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2501} 2901}
2548void 2948void
2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2550 CODE: 2950 CODE:
2551{ 2951{
2552 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2952 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2553 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2953 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2555} 2955}
2556 2956
2557void 2957void
2558set_reverse_stereo (DC::Channel self, int flip) 2958set_reverse_stereo (DC::Channel self, int flip)
2561 2961
2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2563 2963
2564PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2565 2965
2966void
2967decoders ()
2968 PPCODE:
2969#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2970 int i, num = Mix_GetNumChunkDecoders ();
2971 EXTEND (SP, num);
2972 for (i = 0; i < num; ++i)
2973 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2974#else
2975 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2976#endif
2977
2566DC::MixChunk 2978DC::MixChunk
2567new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2568 CODE: 2980 CODE:
2569 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2570 OUTPUT: 2982 OUTPUT:
2571 RETVAL 2983 RETVAL
2572 2984
2602 OUTPUT: 3014 OUTPUT:
2603 RETVAL 3015 RETVAL
2604 3016
2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2606 3018
3019void
3020decoders ()
3021 PPCODE:
3022#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3023 int i, num = Mix_GetNumMusicDecoders ();
3024 EXTEND (SP, num);
3025 for (i = 0; i < num; ++i)
3026 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3027#else
3028 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3029#endif
3030
2607int 3031int
2608volume (int volume = -1) 3032volume (int volume = -1)
2609 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2610 CODE: 3034 CODE:
2611 if (items > 0) 3035 if (items > 0)
2622void 3046void
2623halt () 3047halt ()
2624 CODE: 3048 CODE:
2625 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2626 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2627DC::MixMusic 3058DC::MixMusic
2628new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
2629 CODE: 3060 CODE:
2630 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2631 OUTPUT: 3062 OUTPUT:
2632 RETVAL 3063 RETVAL
2633 3064
2661 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2662# define const_iv(name) { # name, (IV)name } 3093# define const_iv(name) { # name, (IV)name }
2663 const_iv (GL_VENDOR), 3094 const_iv (GL_VENDOR),
2664 const_iv (GL_VERSION), 3095 const_iv (GL_VERSION),
2665 const_iv (GL_EXTENSIONS), 3096 const_iv (GL_EXTENSIONS),
3097 const_iv (GL_MAX_TEXTURE_UNITS),
2666 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2667 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2668 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2669 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2670 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
2682 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2683 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2684 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2685 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2686 const_iv (GL_ONE_MINUS_DST_ALPHA), 3118 const_iv (GL_ONE_MINUS_DST_ALPHA),
3119 const_iv (GL_SRC_COLOR),
3120 const_iv (GL_DST_COLOR),
3121 const_iv (GL_ONE_MINUS_SRC_COLOR),
3122 const_iv (GL_ONE_MINUS_DST_COLOR),
2687 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2688 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2689 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2690 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2691 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
2759 const_iv (GL_NICEST), 3195 const_iv (GL_NICEST),
2760 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2761 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2762 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2763 const_iv (GL_T2F_N3F_V3F), 3199 const_iv (GL_T2F_N3F_V3F),
3200 const_iv (GL_FUNC_ADD),
3201 const_iv (GL_FUNC_SUBTRACT),
3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2764# undef const_iv 3203# undef const_iv
2765 }; 3204 };
2766 3205
2767 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3206 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2768 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2769 3208
2770 texture_av = newAV (); 3209 texture_av = newAV ();
2771 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
2772} 3211}
2773 3212
2775disable_GL_EXT_blend_func_separate () 3214disable_GL_EXT_blend_func_separate ()
2776 CODE: 3215 CODE:
2777 gl.BlendFuncSeparate = 0; 3216 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
2779 3218
2780char * 3219void
3220apple_nvidia_bug (int enable)
3221
3222const char *
2781gl_vendor () 3223gl_vendor ()
2782 CODE: 3224 CODE:
2783 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2784 OUTPUT: 3226 OUTPUT:
2785 RETVAL 3227 RETVAL
2786 3228
2787char * 3229const char *
2788gl_version () 3230gl_version ()
2789 CODE: 3231 CODE:
2790 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2791 OUTPUT: 3233 OUTPUT:
2792 RETVAL 3234 RETVAL
2793 3235
2794char * 3236const char *
2795gl_extensions () 3237gl_extensions ()
2796 CODE: 3238 CODE:
2797 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2798 OUTPUT: 3240 OUTPUT:
2799 RETVAL 3241 RETVAL
2800 3242
2801const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
2802 3248
2803GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
2804 CODE: 3250 CODE:
2805 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
2806 OUTPUT: 3252 OUTPUT:
2814 3260
2815int glGetError () 3261int glGetError ()
2816 3262
2817void glFinish () 3263void glFinish ()
2818 3264
3265void glFlush ()
3266
2819void glClear (int mask) 3267void glClear (int mask)
2820 3268
2821void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2822 PROTOTYPE: @ 3270 PROTOTYPE: @
2823 3271
2832void glBlendFunc (int sfactor, int dfactor) 3280void glBlendFunc (int sfactor, int dfactor)
2833 3281
2834void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2835 CODE: 3283 CODE:
2836 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
3285
3286# void glBlendEquation (int se)
2837 3287
2838void glDepthMask (int flag) 3288void glDepthMask (int flag)
2839 3289
2840void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2841 3291
2876void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2877 CODE: 3327 CODE:
2878 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2879 3329
2880void glColor (float r, float g, float b, float a = 1.0) 3330void glColor (float r, float g, float b, float a = 1.0)
3331 PROTOTYPE: @
2881 ALIAS: 3332 ALIAS:
2882 glColor_premultiply = 1 3333 glColor_premultiply = 1
2883 CODE: 3334 CODE:
2884 if (ix) 3335 if (ix)
2885 { 3336 {
2991 3442
2992void glEndList () 3443void glEndList ()
2993 3444
2994void glCallList (int list) 3445void glCallList (int list)
2995 3446
3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2997 3453
2998PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
2999 3455
3000void 3456void
3001find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
3002 PPCODE: 3458 PPCODE:
3003{ 3459{
3004 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
3005 XPUSHs (self); 3461 XPUSHs (self);
3006} 3462}
3007 3463
3008BOOT: 3464BOOT:
3009{ 3465{
3017 3473
3018void 3474void
3019draw (SV *self) 3475draw (SV *self)
3020 CODE: 3476 CODE:
3021{ 3477{
3022 HV *hv; 3478 HV *hv;
3023 SV **svp; 3479 SV **svp;
3024 NV x, y, w, h; 3480 NV x, y, w, h;
3025 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
3026 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
3027 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
3028 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines