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.241 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
73 123
74static AV *texture_av; 124static AV *texture_av;
75 125
76static struct 126static struct
77{ 127{
120 170
121#include "pango-font.c" 171#include "pango-font.c"
122#include "pango-fontmap.c" 172#include "pango-fontmap.c"
123#include "pango-render.c" 173#include "pango-render.c"
124 174
125typedef IV dc__Channel; 175typedef IV DC__Channel;
126typedef SDL_RWops *dc__RW; 176typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *dc__MixChunk; 177typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *dc__MixMusic; 178typedef Mix_Music *DC__MixMusic;
129 179
130typedef PangoFontDescription *dc__Font; 180typedef PangoFontDescription *DC__Font;
131 181
132static int 182static int
133shape_attr_p (PangoLayoutRun *run) 183shape_attr_p (PangoLayoutRun *run)
134{ 184{
135 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
149 199
150typedef struct cf_layout { 200typedef struct cf_layout {
151 PangoLayout *pl; 201 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 202 float r, g, b, a; // default color for rgba mode
153 int base_height; 203 int base_height;
154 dc__Font font; 204 DC__Font font;
155 rc_t *rc; 205 rc_t *rc;
156} *dc__Layout; 206} *DC__Layout;
157 207
158static dc__Font default_font; 208static DC__Font default_font;
159static PangoContext *opengl_context; 209static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
161 211
162static void 212static void
163substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
168#endif 218#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 220}
171 221
172static void 222static void
173layout_update_font (dc__Layout self) 223layout_update_font (DC__Layout self)
174{ 224{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 225 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
177 */ 227 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
179 229
180 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 232
183 pango_layout_set_font_description (self->pl, font); 233 pango_layout_set_font_description (self->pl, font);
184} 234}
185 235
186static void 236static void
187layout_get_pixel_size (dc__Layout self, int *w, int *h) 237layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 238{
189 PangoRectangle rect; 239 PangoRectangle rect;
190 240
191 // get_pixel_* wrongly rounds down 241 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 242 pango_layout_get_extents (self->pl, 0, &rect);
209 int w, h; 259 int w, h;
210 float s, t; 260 float s, t;
211 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
212 tileid smoothtile; 262 tileid smoothtile;
213 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
214} maptex; 265} maptex;
215 266
216typedef struct { 267typedef struct {
217 uint32_t player; 268 uint32_t player;
218 tileid tile[3]; 269 tileid tile[3];
231 int faces; tileid *face2tile; // [faceid] 282 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 283 int texs; maptex *tex; // [tileid]
233 284
234 int32_t rows; 285 int32_t rows;
235 maprow *row; 286 maprow *row;
236} *dc__Map; 287} *DC__Map;
237 288
238static char * 289static char *
239prepend (char *ptr, int sze, int inc) 290prepend (char *ptr, int sze, int inc)
240{ 291{
241 char *p; 292 char *p;
279 self->texs *= 2; 330 self->texs *= 2;
280 } 331 }
281} 332}
282 333
283static maprow * 334static maprow *
284map_get_row (dc__Map self, int y) 335map_get_row (DC__Map self, int y)
285{ 336{
286 if (0 > y) 337 if (0 > y)
287 { 338 {
288 int extend = - y + MAP_EXTEND_Y; 339 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 340 Prepend (maprow, self->row, self->rows, extend);
327 378
328 return row->col + (x - row->c0); 379 return row->col + (x - row->c0);
329} 380}
330 381
331static mapcell * 382static mapcell *
332map_get_cell (dc__Map self, int x, int y) 383map_get_cell (DC__Map self, int x, int y)
333{ 384{
334 return row_get_cell (map_get_row (self, y), x); 385 return row_get_cell (map_get_row (self, y), x);
335} 386}
336 387
337static void 388static void
338map_clear (dc__Map self) 389map_clear (DC__Map self)
339{ 390{
340 int r; 391 int r;
341 392
342 for (r = 0; r < self->rows; r++) 393 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 394 Safefree (self->row[r].col);
350 self->oy = 0; 401 self->oy = 0;
351 self->row = 0; 402 self->row = 0;
352 self->rows = 0; 403 self->rows = 0;
353} 404}
354 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
355static void 416static void
356map_blank (dc__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 418{
358 int x, y; 419 int x, y;
359 maprow *row; 420 maprow *row;
360 mapcell *cell; 421 mapcell *cell;
361 422
373 if (x >= row->c1) 434 if (x >= row->c1)
374 break; 435 break;
375 436
376 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
377 438
378 cell->darkness = 0; 439 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 440 }
383 } 441 }
384} 442}
385 443
386typedef struct { 444typedef struct {
421 ev.code = 1; 479 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 481 ev.data2 = 0;
424 482
425 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
426} 490}
427 491
428static unsigned int 492static unsigned int
429minpot (unsigned int n) 493minpot (unsigned int n)
430{ 494{
498 return 0; 562 return 0;
499 563
500 return 1; 564 return 1;
501} 565}
502 566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main ()
583{
584 char *argv[] = { 0 };
585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
586}
587
588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which,
592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back.
594 */
595 extern C_LINKAGE int
596 main (int argc, char *argv[])
597 {
598 deliantra_main ();
599 }
600
601 #undef main
602
603 extern C_LINKAGE int main (int argc, char *argv[]);
604
605 static void
606 SDL_braino (void)
607 {
608 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv);
610 }
611#else
612 static void
613 SDL_braino (void)
614 {
615 deliantra_main ();
616 }
617#endif
618
503MODULE = Deliantra::Client PACKAGE = dc 619MODULE = Deliantra::Client PACKAGE = DC
504 620
505PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
506 622
507BOOT: 623BOOT:
508{ 624{
509 HV *stash = gv_stashpv ("dc", 1); 625 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 626 static const struct {
511 const char *name; 627 const char *name;
512 IV iv; 628 IV iv;
513 } *civ, const_iv[] = { 629 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 630# define const_iv(name) { # name, (IV)name }
535 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
536 652
537 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 655 const_iv (SDL_APPACTIVE),
656
657
658 const_iv (SDLK_UNKNOWN),
659 const_iv (SDLK_FIRST),
660 const_iv (SDLK_BACKSPACE),
661 const_iv (SDLK_TAB),
662 const_iv (SDLK_CLEAR),
663 const_iv (SDLK_RETURN),
664 const_iv (SDLK_PAUSE),
665 const_iv (SDLK_ESCAPE),
666 const_iv (SDLK_SPACE),
667 const_iv (SDLK_EXCLAIM),
668 const_iv (SDLK_QUOTEDBL),
669 const_iv (SDLK_HASH),
670 const_iv (SDLK_DOLLAR),
671 const_iv (SDLK_AMPERSAND),
672 const_iv (SDLK_QUOTE),
673 const_iv (SDLK_LEFTPAREN),
674 const_iv (SDLK_RIGHTPAREN),
675 const_iv (SDLK_ASTERISK),
676 const_iv (SDLK_PLUS),
677 const_iv (SDLK_COMMA),
678 const_iv (SDLK_MINUS),
679 const_iv (SDLK_PERIOD),
680 const_iv (SDLK_SLASH),
681 const_iv (SDLK_0),
682 const_iv (SDLK_1),
683 const_iv (SDLK_2),
684 const_iv (SDLK_3),
685 const_iv (SDLK_4),
686 const_iv (SDLK_5),
687 const_iv (SDLK_6),
688 const_iv (SDLK_7),
689 const_iv (SDLK_8),
690 const_iv (SDLK_9),
691 const_iv (SDLK_COLON),
692 const_iv (SDLK_SEMICOLON),
693 const_iv (SDLK_LESS),
694 const_iv (SDLK_EQUALS),
695 const_iv (SDLK_GREATER),
696 const_iv (SDLK_QUESTION),
697 const_iv (SDLK_AT),
698
699 const_iv (SDLK_LEFTBRACKET),
700 const_iv (SDLK_BACKSLASH),
701 const_iv (SDLK_RIGHTBRACKET),
702 const_iv (SDLK_CARET),
703 const_iv (SDLK_UNDERSCORE),
704 const_iv (SDLK_BACKQUOTE),
705 const_iv (SDLK_DELETE),
540 706
541 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
624 790
791 const_iv (KMOD_LRAM),
792
625 const_iv (MIX_DEFAULT_FORMAT), 793 const_iv (MIX_DEFAULT_FORMAT),
794
795 const_iv (SDL_INIT_TIMER),
796 const_iv (SDL_INIT_AUDIO),
797 const_iv (SDL_INIT_VIDEO),
798 const_iv (SDL_INIT_CDROM),
799 const_iv (SDL_INIT_JOYSTICK),
800 const_iv (SDL_INIT_EVERYTHING),
801 const_iv (SDL_INIT_NOPARACHUTE),
802 const_iv (SDL_INIT_EVENTTHREAD),
803
804 const_iv (SDL_GL_RED_SIZE),
805 const_iv (SDL_GL_GREEN_SIZE),
806 const_iv (SDL_GL_BLUE_SIZE),
807 const_iv (SDL_GL_ALPHA_SIZE),
808 const_iv (SDL_GL_DOUBLEBUFFER),
809 const_iv (SDL_GL_BUFFER_SIZE),
810 const_iv (SDL_GL_DEPTH_SIZE),
811 const_iv (SDL_GL_STENCIL_SIZE),
812 const_iv (SDL_GL_ACCUM_RED_SIZE),
813 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
814 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
815 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
816 const_iv (SDL_GL_STEREO),
817 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
818 const_iv (SDL_GL_MULTISAMPLESAMPLES),
819 const_iv (SDL_GL_ACCELERATED_VISUAL),
820 const_iv (SDL_GL_SWAP_CONTROL),
821
822 const_iv (FOW_DARKNESS)
626# undef const_iv 823# undef const_iv
627 }; 824 };
628 825
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 828
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 831}
635 832
652 849
653IV minpot (UV n) 850IV minpot (UV n)
654 851
655IV popcount (UV n) 852IV popcount (UV n)
656 853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
859
657void 860void
658pango_init () 861pango_init ()
659 CODE: 862 CODE:
660{ 863{
661 opengl_fontmap = pango_opengl_font_map_new (); 864 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 865 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 866 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
867 /*pango_context_set_font_description (opengl_context, default_font);*/
868#if PANGO_VERSION_CHECK (1, 15, 2)
869 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
871#endif
664} 872}
665 873
666char *
667SDL_GetError () 874char *SDL_GetError ()
668 875
669int 876void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 877
672void 878int SDL_Init (U32 flags)
879
880int SDL_InitSubSystem (U32 flags)
881
882void SDL_QuitSubSystem (U32 flags)
883
673SDL_Quit () 884void SDL_Quit ()
885
886int SDL_GL_SetAttribute (int attr, int value)
887
888int SDL_GL_GetAttribute (int attr)
889 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL))
891 XSRETURN_UNDEF;
892 OUTPUT:
893 RETVAL
674 894
675void 895void
676SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
677 PPCODE: 897 PPCODE:
678{ 898{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 913
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 916
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 918
702 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
703 while (*m) 920 while (*m)
704 { 921 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 922 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 923 {
707 AV *av = newAV (); 924 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
738 955
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 958#include "glfunc.h"
742#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 963 }
744} 964}
745 OUTPUT: 965 OUTPUT:
746 RETVAL 966 RETVAL
747 967
752SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
753 973
754int 974int
755SDL_GetAppState () 975SDL_GetAppState ()
756 976
977int
978SDL_GetModState ()
979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
757void 984void
985SDL_PumpEvents ()
986
987void
758poll_events () 988peep_events ()
759 PPCODE: 989 PPCODE:
760{ 990{
761 SDL_Event ev; 991 SDL_Event ev;
762 992
763 SDL_PumpEvents (); 993 SDL_PumpEvents ();
770 { 1000 {
771 case SDL_KEYDOWN: 1001 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1002 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1003 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1004 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1005 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1006 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1007 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1008 break;
779 1009
780 case SDL_ACTIVEEVENT: 1010 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1011 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 1029 x = ev.motion.x;
800 y = ev.motion.y; 1030 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1031 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1032 }
803 1033
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1034 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1035 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1036 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1037 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1038 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1039 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1040 }
811 break; 1041 break;
812 1042
813 case SDL_MOUSEBUTTONDOWN: 1043 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1044 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1045 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1046
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1047 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1048 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1049 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1050 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1055 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1056 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1057 break;
828 } 1058 }
829 1059
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("dc::UI::Event", 1)))); 1060 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1061 }
832} 1062}
1063
1064char *
1065SDL_AudioDriverName ()
1066 CODE:
1067{
1068 char buf [256];
1069 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1070 XSRETURN_UNDEF;
1071
1072 RETVAL = buf;
1073}
1074 OUTPUT:
1075 RETVAL
833 1076
834int 1077int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1078Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1079 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1080 Mix_HookMusicFinished (music_finished);
894 } 1137 }
895 } 1138 }
896#endif 1139#endif
897} 1140}
898 1141
899void 1142int
900add_font (char *file) 1143add_font (char *file)
901 CODE: 1144 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1145 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1146 OUTPUT:
1147 RETVAL
1148
1149void
1150IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1151
1152# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1153void
1154Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
903 1155
904void 1156void
905load_image_inline (SV *image_) 1157load_image_inline (SV *image_)
906 ALIAS: 1158 ALIAS:
907 load_image_file = 1 1159 load_image_file = 1
1023#if DEBUG 1275#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1276 VALGRIND_DO_LEAK_CHECK;
1025#endif 1277#endif
1026} 1278}
1027 1279
1280int
1281SvREFCNT (SV *sv)
1282 CODE:
1283 RETVAL = SvREFCNT (sv);
1284 OUTPUT:
1285 RETVAL
1286
1028MODULE = Deliantra::Client PACKAGE = dc::Font 1287MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1288
1030PROTOTYPES: DISABLE 1289PROTOTYPES: DISABLE
1031 1290
1032dc::Font 1291DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1292new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1293 CODE:
1035{ 1294{
1036 int count; 1295 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1296 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1299}
1041 OUTPUT: 1300 OUTPUT:
1042 RETVAL 1301 RETVAL
1043 1302
1044void 1303void
1045DESTROY (dc::Font self) 1304DESTROY (DC::Font self)
1046 CODE: 1305 CODE:
1047 pango_font_description_free (self); 1306 pango_font_description_free (self);
1048 1307
1049void 1308void
1050make_default (dc::Font self) 1309make_default (DC::Font self)
1051 PROTOTYPE: $ 1310 PROTOTYPE: $
1052 CODE: 1311 CODE:
1053 default_font = self; 1312 default_font = self;
1054 1313
1055MODULE = Deliantra::Client PACKAGE = dc::Layout 1314MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1315
1057PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1058 1317
1059void 1318void
1060glyph_cache_backup () 1319glyph_cache_backup ()
1066glyph_cache_restore () 1325glyph_cache_restore ()
1067 PROTOTYPE: 1326 PROTOTYPE:
1068 CODE: 1327 CODE:
1069 tc_restore (); 1328 tc_restore ();
1070 1329
1071dc::Layout 1330DC::Layout
1072new (SV *class) 1331new (SV *class)
1073 CODE: 1332 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1333 New (0, RETVAL, 1, struct cf_layout);
1075 1334
1076 RETVAL->pl = pango_layout_new (opengl_context); 1335 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1345 layout_update_font (RETVAL);
1087 OUTPUT: 1346 OUTPUT:
1088 RETVAL 1347 RETVAL
1089 1348
1090void 1349void
1091DESTROY (dc::Layout self) 1350DESTROY (DC::Layout self)
1092 CODE: 1351 CODE:
1093 g_object_unref (self->pl); 1352 g_object_unref (self->pl);
1094 rc_free (self->rc); 1353 rc_free (self->rc);
1095 Safefree (self); 1354 Safefree (self);
1096 1355
1097void 1356void
1098set_text (dc::Layout self, SV *text_) 1357set_text (DC::Layout self, SV *text_)
1099 CODE: 1358 CODE:
1100{ 1359{
1101 STRLEN textlen; 1360 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1361 char *text = SvPVutf8 (text_, textlen);
1103 1362
1104 pango_layout_set_text (self->pl, text, textlen); 1363 pango_layout_set_text (self->pl, text, textlen);
1105} 1364}
1106 1365
1107void 1366void
1108set_markup (dc::Layout self, SV *text_) 1367set_markup (DC::Layout self, SV *text_)
1109 CODE: 1368 CODE:
1110{ 1369{
1111 STRLEN textlen; 1370 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1371 char *text = SvPVutf8 (text_, textlen);
1113 1372
1114 pango_layout_set_markup (self->pl, text, textlen); 1373 pango_layout_set_markup (self->pl, text, textlen);
1115} 1374}
1116 1375
1117void 1376void
1118set_shapes (dc::Layout self, ...) 1377set_shapes (DC::Layout self, ...)
1119 CODE: 1378 CODE:
1120{ 1379{
1121 PangoAttrList *attrs = 0; 1380 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1381 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1382 const char *pos = text;
1158 if (attrs) 1417 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1418 pango_layout_set_attributes (self->pl, attrs);
1160} 1419}
1161 1420
1162void 1421void
1163get_shapes (dc::Layout self) 1422get_shapes (DC::Layout self)
1164 PPCODE: 1423 PPCODE:
1165{ 1424{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1425 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1426
1168 do 1427 do
1169 { 1428 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1429 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1430
1172 if (run && shape_attr_p (run)) 1431 if (run && shape_attr_p (run))
1173 { 1432 {
1174 PangoRectangle extents; 1433 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1434 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1442
1184 pango_layout_iter_free (iter); 1443 pango_layout_iter_free (iter);
1185} 1444}
1186 1445
1187int 1446int
1188has_wrapped (dc::Layout self) 1447has_wrapped (DC::Layout self)
1189 CODE: 1448 CODE:
1190{ 1449{
1191 int lines = 1; 1450 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1451 const char *text = pango_layout_get_text (self->pl);
1193 1452
1198} 1457}
1199 OUTPUT: 1458 OUTPUT:
1200 RETVAL 1459 RETVAL
1201 1460
1202SV * 1461SV *
1203get_text (dc::Layout self) 1462get_text (DC::Layout self)
1204 CODE: 1463 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1464 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1465 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1466 OUTPUT:
1208 RETVAL 1467 RETVAL
1209 1468
1210void 1469void
1211set_foreground (dc::Layout self, float r, float g, float b, float a = 1.) 1470set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1471 CODE:
1213 self->r = r; 1472 self->r = r;
1214 self->g = g; 1473 self->g = g;
1215 self->b = b; 1474 self->b = b;
1216 self->a = a; 1475 self->a = a;
1217 1476
1218void 1477void
1219set_font (dc::Layout self, dc::Font font = 0) 1478set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1479 CODE:
1221 if (self->font != font) 1480 if (self->font != font)
1222 { 1481 {
1223 self->font = font; 1482 self->font = font;
1224 layout_update_font (self); 1483 layout_update_font (self);
1225 } 1484 }
1226 1485
1227void 1486void
1228set_height (dc::Layout self, int base_height) 1487set_height (DC::Layout self, int base_height)
1229 CODE: 1488 CODE:
1230 if (self->base_height != base_height) 1489 if (self->base_height != base_height)
1231 { 1490 {
1232 self->base_height = base_height; 1491 self->base_height = base_height;
1233 layout_update_font (self); 1492 layout_update_font (self);
1234 } 1493 }
1235 1494
1236void 1495void
1237set_width (dc::Layout self, int max_width = -1) 1496set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1497 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1498 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1499
1241void 1500void
1242set_indent (dc::Layout self, int indent) 1501set_indent (DC::Layout self, int indent)
1243 CODE: 1502 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1503 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1504
1246void 1505void
1247set_spacing (dc::Layout self, int spacing) 1506set_spacing (DC::Layout self, int spacing)
1248 CODE: 1507 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1508 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1509
1251void 1510void
1252set_ellipsise (dc::Layout self, int ellipsise) 1511set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1512 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1513 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1514 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1515 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1516 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1517 : PANGO_ELLIPSIZE_NONE
1259 ); 1518 );
1260 1519
1261void 1520void
1262set_single_paragraph_mode (dc::Layout self, int spm) 1521set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1522 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1523 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1524
1266void 1525void
1267size (dc::Layout self) 1526size (DC::Layout self)
1268 PPCODE: 1527 PPCODE:
1269{ 1528{
1270 int w, h; 1529 int w, h;
1271 1530
1272 layout_get_pixel_size (self, &w, &h); 1531 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1534 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1535 PUSHs (sv_2mortal (newSViv (h)));
1277} 1536}
1278 1537
1279int 1538int
1280descent (dc::Layout self) 1539descent (DC::Layout self)
1281 CODE: 1540 CODE:
1282{ 1541{
1283 PangoRectangle rect; 1542 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1543 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1544 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1545 RETVAL = PANGO_DESCENT (rect);
1287} 1546}
1288 OUTPUT: 1547 OUTPUT:
1289 RETVAL 1548 RETVAL
1290 1549
1291int 1550int
1292xy_to_index (dc::Layout self, int x, int y) 1551xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1552 CODE:
1294{ 1553{
1295 int index, trailing; 1554 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1555 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1556 RETVAL = index + trailing;
1298} 1557}
1299 OUTPUT: 1558 OUTPUT:
1300 RETVAL 1559 RETVAL
1301 1560
1302void 1561void
1303cursor_pos (dc::Layout self, int index) 1562cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1563 PPCODE:
1305{ 1564{
1306 PangoRectangle strong_pos; 1565 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1566 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1567
1309 EXTEND (SP, 3); 1568 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1569 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1570 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1571 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1572}
1314 1573
1315void 1574void
1316index_to_line_x (dc::Layout self, int index, int trailing = 0) 1575index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1576 PPCODE:
1318{ 1577{
1319 int line, x; 1578 int line, x;
1320 1579
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1580 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1581#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1582 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1583 --line;
1584#endif
1324 EXTEND (SP, 2); 1585 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1586 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1587 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1588}
1328 1589
1329void 1590void
1330line_x_to_index (dc::Layout self, int line, int x) 1591line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1592 PPCODE:
1332{ 1593{
1333 PangoLayoutLine *lp; 1594 PangoLayoutLine *lp;
1334 int index, trailing; 1595 int index, trailing;
1335 1596
1336 if (line < 0) 1597 if (line < 0)
1337 XSRETURN_EMPTY; 1598 XSRETURN_EMPTY;
1338 1599
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1600 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1601 XSRETURN_EMPTY; /* do better */
1341 1602
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1603 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1604
1344 EXTEND (SP, 2); 1605 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1611 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1612 }
1352} 1613}
1353 1614
1354void 1615void
1355render (dc::Layout self, float x, float y, int flags = 0) 1616render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1617 CODE:
1357 rc_clear (self->rc); 1618 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1619 pango_opengl_render_layout_subpixel (
1359 self->pl, 1620 self->pl,
1360 self->rc, 1621 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1626 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1627 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1628 pango_layout_context_changed (self->pl);
1368 1629
1369void 1630void
1370draw (dc::Layout self) 1631draw (DC::Layout self)
1371 CODE: 1632 CODE:
1372{ 1633{
1373 glEnable (GL_TEXTURE_2D); 1634 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1635 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1636 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1644 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1645 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1646 glDisable (GL_TEXTURE_2D);
1386} 1647}
1387 1648
1388MODULE = Deliantra::Client PACKAGE = dc::Texture 1649MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1650
1390PROTOTYPES: ENABLE 1651PROTOTYPES: ENABLE
1391 1652
1392void 1653void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1654pad (SV *data_, int ow, int oh, int nw, int nh)
1461 glDisable (GL_ALPHA_TEST); 1722 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1723 glDisable (GL_BLEND);
1463 } 1724 }
1464} 1725}
1465 1726
1727void
1728draw_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)
1729 PROTOTYPE: @
1730 CODE:
1731{
1732 glEnable (GL_BLEND);
1733 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1734 glEnable (GL_TEXTURE_2D);
1735 glBindTexture (GL_TEXTURE_2D, name1);
1736
1737 glColor3f (intensity, intensity, intensity);
1738 glPushMatrix ();
1739 glScalef (1./3, 1./3, 1.);
1740
1741 if (blend > 0.f)
1742 {
1743 float dx3 = dx * -3.f / w;
1744 float dy3 = dy * -3.f / h;
1745 GLfloat env_color[4] = { 0., 0., 0., blend };
1746
1747 /* interpolate the two shadow textures */
1748 /* stage 0 == rgb(glcolor) + alpha(t0) */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1752 gl.ActiveTexture (GL_TEXTURE1);
1753 glEnable (GL_TEXTURE_2D);
1754 glBindTexture (GL_TEXTURE_2D, name2);
1755 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1756
1757 /* rgb == rgb(glcolor) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1760 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1761
1762 /* alpha = interpolate t0, t1 by env_alpha */
1763 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1768
1769 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1770 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1774
1775 glBegin (GL_QUADS);
1776 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1777 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1778 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1779 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1780 glEnd ();
1781
1782 glDisable (GL_TEXTURE_2D);
1783 gl.ActiveTexture (GL_TEXTURE0);
1784 }
1785 else
1786 {
1787 /* simple blending of one texture, also opengl <1.3 path */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 glBegin (GL_QUADS);
1791 glTexCoord2f (0, 0); glVertex2f (0, 0);
1792 glTexCoord2f (0, t); glVertex2f (0, h);
1793 glTexCoord2f (s, t); glVertex2f (w, h);
1794 glTexCoord2f (s, 0); glVertex2f (w, 0);
1795 glEnd ();
1796 }
1797
1798 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1799 {
1800 int x, y;
1801 int dx3 = dx * 3;
1802 int dy3 = dy * 3;
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1805 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1806 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1807 glTranslatef (-1., -1., 0);
1808 glBegin (GL_QUADS);
1809
1810 for (y = 1; y < h; y += 3)
1811 {
1812 int y1 = y - dy3;
1813 int y1valid = y1 >= 0 && y1 < h;
1814
1815 for (x = 1; x < w; x += 3)
1816 {
1817 int x1 = x - dx3;
1818 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1819 uint8_t h2;
1820
1821 if (y1valid && x1 >= 0 && x1 < w)
1822 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1823 else
1824 h2 = 1; /* out of range == invisible */
1825
1826 if (h1 || h2)
1827 {
1828 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1829 glColor4f (1., 1., 1., alpha);
1830
1831 glTexCoord2f (0, 0.); glVertex2i (x , y );
1832 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1833 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1834 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1835 }
1836 }
1837 }
1838 }
1839
1840 glEnd ();
1841
1842 glPopMatrix ();
1843
1844 glDisable (GL_TEXTURE_2D);
1845 glDisable (GL_BLEND);
1846}
1847
1466IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1848IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467 CODE: 1849 CODE:
1468{ 1850{
1469 GLint width; 1851 GLint width;
1470 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1852 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1472 RETVAL = width > 0; 1854 RETVAL = width > 0;
1473} 1855}
1474 OUTPUT: 1856 OUTPUT:
1475 RETVAL 1857 RETVAL
1476 1858
1477MODULE = Deliantra::Client PACKAGE = dc::Map 1859MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1860
1479PROTOTYPES: DISABLE 1861PROTOTYPES: DISABLE
1480 1862
1481dc::Map 1863DC::Map
1482new (SV *class) 1864new (SV *class)
1483 CODE: 1865 CODE:
1484 New (0, RETVAL, 1, struct map); 1866 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1867 RETVAL->x = 0;
1486 RETVAL->y = 0; 1868 RETVAL->y = 0;
1494 RETVAL->row = 0; 1876 RETVAL->row = 0;
1495 OUTPUT: 1877 OUTPUT:
1496 RETVAL 1878 RETVAL
1497 1879
1498void 1880void
1499DESTROY (dc::Map self) 1881DESTROY (DC::Map self)
1500 CODE: 1882 CODE:
1501{ 1883{
1502 map_clear (self); 1884 map_clear (self);
1503 Safefree (self->face2tile); 1885 Safefree (self->face2tile);
1504 Safefree (self->tex); 1886 Safefree (self->tex);
1505 Safefree (self); 1887 Safefree (self);
1506} 1888}
1507 1889
1508void 1890void
1509resize (dc::Map self, int map_width, int map_height) 1891resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1892 CODE:
1511 self->w = map_width; 1893 self->w = map_width;
1512 self->h = map_height; 1894 self->h = map_height;
1513 1895
1514void 1896void
1515clear (dc::Map self) 1897clear (DC::Map self)
1516 CODE: 1898 CODE:
1517 map_clear (self); 1899 map_clear (self);
1518 1900
1519void 1901void
1520set_tileid (dc::Map self, int face, int tile) 1902set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1903 CODE:
1522{ 1904{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1905 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1906 need_texid (self, tile);
1525} 1907}
1526 1908
1527void 1909void
1528set_smooth (dc::Map self, int face, int smooth, int level) 1910set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1911 CODE:
1530{ 1912{
1531 tileid texid; 1913 tileid texid;
1532 maptex *tex; 1914 maptex *tex;
1533 1915
1546 tex->smoothtile = self->face2tile [smooth]; 1928 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1929 tex->smoothlevel = level;
1548} 1930}
1549 1931
1550void 1932void
1551set_texture (dc::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1933set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1552 CODE: 1934 CODE:
1553{ 1935{
1554 need_texid (self, texid); 1936 need_texid (self, texid);
1555 1937
1556 { 1938 {
1575 // use uglier nearest interpolation because linear suffers 1957 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1958 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1959 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1960}
1579 1961
1962void
1963expire_textures (DC::Map self, int texid, int count)
1964 PPCODE:
1965 for (; texid < self->texs && count; ++texid, --count)
1966 {
1967 maptex *tex = self->tex + texid;
1968
1969 if (tex->name)
1970 {
1971 if (tex->unused)
1972 {
1973 tex->name = 0;
1974 tex->unused = 0;
1975 XPUSHs (sv_2mortal (newSViv (texid)));
1976 }
1977 else
1978 tex->unused = 1;
1979 }
1980 }
1981
1580int 1982int
1581ox (dc::Map self) 1983ox (DC::Map self)
1582 ALIAS: 1984 ALIAS:
1583 oy = 1 1985 oy = 1
1584 x = 2 1986 x = 2
1585 y = 3 1987 y = 3
1586 w = 4 1988 w = 4
1597 } 1999 }
1598 OUTPUT: 2000 OUTPUT:
1599 RETVAL 2001 RETVAL
1600 2002
1601void 2003void
1602scroll (dc::Map self, int dx, int dy) 2004scroll (DC::Map self, int dx, int dy)
1603 CODE: 2005 CODE:
1604{ 2006{
1605 if (dx > 0) 2007 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 2008 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 2009 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 2025 self->y += MAP_EXTEND_Y;
1624 } 2026 }
1625} 2027}
1626 2028
1627SV * 2029SV *
1628map1a_update (dc::Map self, SV *data_, int extmap) 2030map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 2031 CODE:
1630{ 2032{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2033 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 2034 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 2035 mapcell *cell;
1661 uint8_t ext, cmd; 2063 uint8_t ext, cmd;
1662 2064
1663 do 2065 do
1664 { 2066 {
1665 ext = *data++; 2067 ext = *data++;
1666 cmd = ext & 0x3f; 2068 cmd = ext & 0x7f;
1667 2069
1668 if (cmd < 4) 2070 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 2071 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1670 else if (cmd == 5) // health 2072 else if (cmd == 5) // health
1671 { 2073 {
1672 cell->stat_width = 1; 2074 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2075 cell->stat_hp = *data++;
1674 } 2076 }
1675 else if (cmd == 6) // monster width 2077 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 2078 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 2079 else if (cmd == 0x47)
1678 { 2080 {
1679 if (*data == 4) 2081 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 2082 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2083 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2084 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 2085
1682 data += *data + 1; 2086 data += *data + 1;
1683 } 2087 }
1684 else if (cmd == 8) // cell flags 2088 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 2089 cell->flags = *data++;
1702 cell->tile [z] = self->face2tile [face]; 2106 cell->tile [z] = self->face2tile [face];
1703 2107
1704 if (cell->tile [z]) 2108 if (cell->tile [z])
1705 { 2109 {
1706 maptex *tex = self->tex + cell->tile [z]; 2110 maptex *tex = self->tex + cell->tile [z];
2111 tex->unused = 0;
1707 if (!tex->name) 2112 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2113 av_push (missing, newSViv (cell->tile [z]));
1709 2114
1710 if (tex->smoothtile) 2115 if (tex->smoothtile)
1711 { 2116 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2117 maptex *smooth = self->tex + tex->smoothtile;
2118 smooth->unused = 0;
1713 if (!smooth->name) 2119 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2120 av_push (missing, newSViv (tex->smoothtile));
1715 } 2121 }
1716 } 2122 }
1717 } 2123 }
1718 } 2124 }
1719 else 2125 else
1720 cell->darkness = 0; 2126 CELL_CLEAR (cell);
1721 } 2127 }
1722} 2128}
1723 OUTPUT: 2129 OUTPUT:
1724 RETVAL 2130 RETVAL
1725 2131
1726SV * 2132SV *
1727mapmap (dc::Map self, int x0, int y0, int w, int h) 2133mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2134 CODE:
1729{ 2135{
1730 int x1, x; 2136 int x1, x;
1731 int y1, y; 2137 int y1, y;
1732 int z; 2138 int z;
1745 ? self->row + y 2151 ? self->row + y
1746 : 0; 2152 : 0;
1747 2153
1748 for (x = x0; x < x1; x++) 2154 for (x = x0; x < x1; x++)
1749 { 2155 {
1750 int r = 32, g = 32, b = 32, a = 192; 2156 unsigned int r = 32, g = 32, b = 32, a = 192;
1751 2157
1752 if (row && row->c0 <= x && x < row->c1) 2158 if (row && row->c0 <= x && x < row->c1)
1753 { 2159 {
1754 mapcell *cell = row->col + (x - row->c0); 2160 mapcell *cell = row->col + (x - row->c0);
1755 2161
1757 { 2163 {
1758 maptex tex = self->tex [cell->tile [z]]; 2164 maptex tex = self->tex [cell->tile [z]];
1759 int a0 = 255 - tex.a; 2165 int a0 = 255 - tex.a;
1760 int a1 = tex.a; 2166 int a1 = tex.a;
1761 2167
1762 r = (r * a0 + tex.r * a1) / 255; 2168 r = div255 (r * a0 + tex.r * a1);
1763 g = (g * a0 + tex.g * a1) / 255; 2169 g = div255 (g * a0 + tex.g * a1);
1764 b = (b * a0 + tex.b * a1) / 255; 2170 b = div255 (b * a0 + tex.b * a1);
1765 a = (a * a0 + tex.a * a1) / 255; 2171 a = div255 (a * a0 + tex.a * a1);
1766 } 2172 }
1767 } 2173 }
1768 2174
1769 *map++ = (r ) 2175 *map++ = (r )
1770 | (g << 8) 2176 | (g << 8)
1777} 2183}
1778 OUTPUT: 2184 OUTPUT:
1779 RETVAL 2185 RETVAL
1780 2186
1781void 2187void
1782draw (dc::Map self, int mx, int my, int sw, int sh, int T) 2188draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 2189 CODE:
1784{ 2190{
1785 int x, y, z; 2191 int x, y, z;
1786 2192
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2193 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2194 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2195 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 2196 smooth_key skey;
1791 2197 int pl_x, pl_y;
2198 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2199 rc_t *rc = rc_alloc ();
2200 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2201 rc_key_t key;
1794 rc_array_t *arr; 2202 rc_array_t *arr;
1795 2203
2204 pl_tex.name = 0;
2205
1796 // thats current max. sorry. 2206 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2207 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2208 if (sh > 255) sh = 255;
1799 2209
1800 // clear key, in case of extra padding 2210 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2211 memset (&skey, 0, sizeof (skey));
1805 key.g = 255; 2215 key.g = 255;
1806 key.b = 255; 2216 key.b = 255;
1807 key.a = 255; 2217 key.a = 255;
1808 key.mode = GL_QUADS; 2218 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2219 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2220
1812 mx += self->x; 2221 mx += self->x;
1813 my += self->y; 2222 my += self->y;
1814 2223
1815 // first pass: determine smooth_max 2224 // first pass: determine smooth_max
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2248 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2249
1841 for (z = 0; z <= 2; z++) 2250 for (z = 0; z <= 2; z++)
1842 { 2251 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2252 memset (smooth_level, 0, sizeof (smooth_level));
2253 key.texname = -1;
1844 2254
1845 for (y = 0; y < sh; y++) 2255 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2256 if (0 <= y + my && y + my < self->rows)
1847 { 2257 {
1848 maprow *row = self->row + (y + my); 2258 maprow *row = self->row + (y + my);
1858 maptex tex = self->tex [tile]; 2268 maptex tex = self->tex [tile];
1859 int px, py; 2269 int px, py;
1860 2270
1861 if (key.texname != tex.name) 2271 if (key.texname != tex.name)
1862 { 2272 {
2273 self->tex [tile].unused = 0;
2274
1863 if (!tex.name) 2275 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2276 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2277
1866 key.texname = tex.name; 2278 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2279 arr = rc_array (rc, &key);
1868 } 2280 }
1869 2281
1870 px = (x + 1) * T - tex.w; 2282 px = (x + 1) * Th - tex.w;
1871 py = (y + 1) * T - tex.h; 2283 py = (y + 1) * Tw - tex.h;
2284
2285 if (expect_false (cell->player == player) && expect_false (z == 2))
2286 {
2287 pl_x = px;
2288 pl_y = py;
2289 pl_tex = tex;
2290 continue;
2291 }
1872 2292
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2293 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2294 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2295 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2296 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2297
1903 // update smooth hash 2298 // update smooth hash
1904 if (tex.smoothtile) 2299 if (tex.smoothtile)
1905 { 2300 {
1906 skey.tile = tex.smoothtile; 2301 skey.tile = tex.smoothtile;
1935 // corners 2330 // corners
1936 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2331 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1937 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2332 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1938 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2333 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1939 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2334 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2335 }
2336 }
2337
2338 if (expect_false (z == 2) && expect_false (cell->flags))
2339 {
2340 // overlays such as the speech bubble, probably more to come
2341 if (cell->flags & 1)
2342 {
2343 rc_key_t key_ov = key;
2344 maptex tex = self->tex [TEXID_SPEECH];
2345 rc_array_t *arr;
2346 int px = x * Tw + Tw * 2 / 32;
2347 int py = y * Th - Th * 6 / 32;
2348
2349 key_ov.texname = tex.name;
2350 arr = rc_array (rc_ov, &key_ov);
2351
2352 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2353 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2354 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2355 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1940 } 2356 }
1941 } 2357 }
1942 } 2358 }
1943 } 2359 }
1944 2360
1971 if (!(bits & 0x1000) 2387 if (!(bits & 0x1000)
1972 && skey->level == level 2388 && skey->level == level
1973 && level > smooth_max [skey->x][skey->y]) 2389 && level > smooth_max [skey->x][skey->y])
1974 { 2390 {
1975 maptex tex = self->tex [skey->tile]; 2391 maptex tex = self->tex [skey->tile];
1976 int px = (((int)skey->x) - 1) * T; 2392 int px = (((int)skey->x) - 1) * Tw;
1977 int py = (((int)skey->y) - 1) * T; 2393 int py = (((int)skey->y) - 1) * Th;
1978 int border = bits & 15; 2394 int border = bits & 15;
1979 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2395 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1980 float dx = tex.s * .0625f; // 16 images/row 2396 float dx = tex.s * .0625f; // 16 images/row
1981 float dy = tex.t * .5f ; // 2 images/column 2397 float dy = tex.t * .5f ; // 2 images/column
1982 2398
1984 { 2400 {
1985 // this time avoiding texture state changes 2401 // this time avoiding texture state changes
1986 // save gobs of state changes. 2402 // save gobs of state changes.
1987 if (key.texname != tex.name) 2403 if (key.texname != tex.name)
1988 { 2404 {
2405 self->tex [skey->tile].unused = 0;
2406
1989 glEnd (); 2407 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2408 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
1992 } 2410 }
1993 2411
1994 if (border) 2412 if (border)
1995 { 2413 {
1996 float ox = border * dx; 2414 float ox = border * dx;
1997 2415
1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2416 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2417 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2419 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2002 } 2420 }
2003 2421
2004 if (corner) 2422 if (corner)
2005 { 2423 {
2006 float ox = corner * dx; 2424 float ox = corner * dx;
2007 2425
2008 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2426 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2427 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2428 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2012 } 2430 }
2013 } 2431 }
2014 } 2432 }
2015 } 2433 }
2016 } 2434 }
2022 } 2440 }
2023 2441
2024 hv_clear (smooth); 2442 hv_clear (smooth);
2025 } 2443 }
2026 2444
2445 if (pl_tex.name)
2446 {
2447 maptex tex = pl_tex;
2448 int px = pl_x + sdx;
2449 int py = pl_y + sdy;
2450
2451 key.texname = tex.name;
2452 arr = rc_array (rc, &key);
2453
2454 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2455 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2456 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2457 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2458
2459 rc_draw (rc);
2460 }
2461
2462 rc_draw (rc_ov);
2463 rc_clear (rc_ov);
2464
2027 glDisable (GL_BLEND); 2465 glDisable (GL_BLEND);
2028 rc_free (rc); 2466 rc_free (rc);
2467 rc_free (rc_ov);
2029 2468
2030 // top layer: overlays such as the health bar 2469 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2470 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2471 if (0 <= y + my && y + my < self->rows)
2033 { 2472 {
2036 for (x = 0; x < sw; x++) 2475 for (x = 0; x < sw; x++)
2037 if (row->c0 <= x + mx && x + mx < row->c1) 2476 if (row->c0 <= x + mx && x + mx < row->c1)
2038 { 2477 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2478 mapcell *cell = row->col + (x + mx - row->c0);
2040 2479
2041 int px = x * T; 2480 int px = x * Tw;
2042 int py = y * T; 2481 int py = y * Th;
2482
2483 if (expect_false (cell->player == player))
2484 {
2485 px += sdx;
2486 py += sdy;
2487 }
2043 2488
2044 if (cell->stat_hp) 2489 if (cell->stat_hp)
2045 { 2490 {
2046 int width = cell->stat_width * T; 2491 int width = cell->stat_width * Tw;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2492 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2048 2493
2049 glColor3ub (0, 0, 0); 2494 glColor3ub (0, 0, 0);
2050 glRectf (px + 1, py - thick - 2, 2495 glRectf (px + 1, py - thick - 2,
2051 px + width - 1, py); 2496 px + width - 1, py);
2052 2497
2058 } 2503 }
2059 } 2504 }
2060} 2505}
2061 2506
2062void 2507void
2063draw_magicmap (dc::Map self, int dx, int dy, int w, int h, unsigned char *data) 2508draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2064 CODE: 2509 CODE:
2065{ 2510{
2066 static float color[16][3] = { 2511 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2512 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2513 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2514 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2515 { 1.00f, 0.00f, 0.00f },
2071 2516
2072 { 1.00F, 0.54F, 0.00F }, 2517 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2518 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2519 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2520 { 0.18f, 0.54f, 0.34f },
2076 2521
2077 { 0.56F, 0.73F, 0.56F }, 2522 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2523 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2524 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2525 { 0.99f, 0.77f, 0.26f },
2081 2526
2082 { 0.74F, 0.65F, 0.41F }, 2527 { 0.74f, 0.65f, 0.41f },
2083 2528
2084 { 0.00F, 1.00F, 1.00F }, 2529 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2530 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2531 { 1.00f, 1.00f, 0.00f },
2087 }; 2532 };
2088 2533
2089 int x, y; 2534 int x, y;
2090 2535
2091 glEnable (GL_TEXTURE_2D); 2536 glEnable (GL_TEXTURE_2D);
2537 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2538 * but the nvidia driver (185.18.14) mishandles alpha textures
2539 * and takes the colour from god knows where instead of using
2540 * Cp. MODULATE results in the same colour, but slightly different
2541 * alpha, but atcually gives us the correct colour with nvidia.
2542 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2543 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2544 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2545 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2546 glBegin (GL_QUADS);
2096 2547
2097 for (y = 0; y < h; y++) 2548 for (y = 0; y < h; y++)
2101 2552
2102 if (m) 2553 if (m)
2103 { 2554 {
2104 float *c = color [m & 15]; 2555 float *c = color [m & 15];
2105 2556
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2557 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2558 float tx2 = tx1 + 0.5f;
2108 2559
2109 glColor4f (c[0], c[1], c[2], 0.75); 2560 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2561 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2562 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2563 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2564 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2565 }
2118 glDisable (GL_BLEND); 2569 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2570 glDisable (GL_TEXTURE_2D);
2120} 2571}
2121 2572
2122void 2573void
2123fow_texture (dc::Map self, int mx, int my, int sw, int sh) 2574fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2575 PPCODE:
2125{ 2576{
2126 int x, y; 2577 int x, y;
2127 int sw1 = sw + 2; 2578 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2579 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2580 int sh3 = sh * 3;
2130 int sw34 = (sw * 3 + 3) & ~3; 2581 int sw3 = sw * 3;
2582 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2583 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2584 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2585 memset (darkness1, 0, sw1*sh1);
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2586
2135 SvPOK_only (darkness3_sv); 2587 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2588 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2589
2138 mx += self->x - 1; 2590 mx += self->x - 1;
2139 my += self->y - 1; 2591 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2592
2143 for (y = 0; y < sh1; y++) 2593 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2594 if (0 <= y + my && y + my < self->rows)
2145 { 2595 {
2146 maprow *row = self->row + (y + my); 2596 maprow *row = self->row + (y + my);
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2599 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2600 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2601 mapcell *cell = row->col + (x + mx - row->c0);
2152 2602
2153 darkness1 [y * sw1 + x] = cell->darkness 2603 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2604 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2605 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2606 }
2157 } 2607 }
2158 2608
2159 for (y = 0; y < sh; ++y) 2609 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2610 for (x = 0; x < sw; ++x)
2179 2629
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2630 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2631 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2632 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2633
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2643 }
2194 2644
2195 free (darkness1); 2645 free (darkness1);
2196 2646
2197 EXTEND (SP, 3); 2647 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2648 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2649 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2650 PUSHs (darkness3_sv);
2201} 2651}
2202 2652
2203SV * 2653SV *
2204get_rect (dc::Map self, int x0, int y0, int w, int h) 2654get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2655 CODE:
2206{ 2656{
2207 int x, y, x1, y1; 2657 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2658 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2659 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2716 else
2267 *data++ = 0; 2717 *data++ = 0;
2268 } 2718 }
2269 } 2719 }
2270 2720
2721 /* if size is w*h + 5 then no data has been found */
2722 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2723 {
2271 SvPOK_only (data_sv); 2724 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2725 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2726 }
2727
2273 RETVAL = data_sv; 2728 RETVAL = data_sv;
2274} 2729}
2275 OUTPUT: 2730 OUTPUT:
2276 RETVAL 2731 RETVAL
2277 2732
2278void 2733void
2279set_rect (dc::Map self, int x0, int y0, uint8_t *data) 2734set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2735 PPCODE:
2281{ 2736{
2282 int x, y, z; 2737 int x, y, z;
2283 int w, h; 2738 int w, h;
2284 int x1, y1; 2739 int x1, y1;
2740 STRLEN len;
2741 uint8_t *data, *end;
2742
2743 len = SvLEN (data_sv);
2744 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2745 data = SvPVbyte_nolen (data_sv);
2746 end = data + len + 8;
2747
2748 if (len < 5)
2749 XSRETURN_EMPTY;
2285 2750
2286 if (*data++ != 0) 2751 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2752 XSRETURN_EMPTY; /* version mismatch */
2288 2753
2289 w = *data++ << 8; w |= *data++; 2754 w = *data++ << 8; w |= *data++;
2304 { 2769 {
2305 maprow *row = map_get_row (self, y); 2770 maprow *row = map_get_row (self, y);
2306 2771
2307 for (x = x0; x < x1; x++) 2772 for (x = x0; x < x1; x++)
2308 { 2773 {
2774 uint8_t flags;
2775
2776 if (data + 7 >= end)
2777 XSRETURN_EMPTY;
2778
2309 uint8_t flags = *data++; 2779 flags = *data++;
2310 2780
2311 if (flags) 2781 if (flags)
2312 { 2782 {
2313 mapcell *cell = row_get_cell (row, x); 2783 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2784 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2787 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2788 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2789
2320 if (cell->darkness == 0) 2790 if (cell->darkness == 0)
2321 { 2791 {
2322 cell->darkness = 0; 2792 /*cell->darkness = 0;*/
2793 EXTEND (SP, 3);
2323 2794
2324 for (z = 0; z <= 2; z++) 2795 for (z = 0; z <= 2; z++)
2325 { 2796 {
2326 tileid t = tile [z]; 2797 tileid t = tile [z];
2327 2798
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2799 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2800 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2801 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2802 need_texid (self, t);
2332 } 2803 }
2333 2804
2334 cell->tile [z] = t; 2805 cell->tile [z] = t;
2335 } 2806 }
2337 } 2808 }
2338 } 2809 }
2339 } 2810 }
2340} 2811}
2341 2812
2342MODULE = Deliantra::Client PACKAGE = dc::RW 2813MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2814
2344dc::RW 2815DC::RW
2345new (SV *class, SV *data_sv) 2816new (SV *class, SV *data_sv)
2346 CODE: 2817 CODE:
2347{ 2818{
2348 STRLEN datalen; 2819 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2820 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2822 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2823}
2353 OUTPUT: 2824 OUTPUT:
2354 RETVAL 2825 RETVAL
2355 2826
2356dc::RW 2827DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2828new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2829 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2830 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2831 OUTPUT:
2361 RETVAL 2832 RETVAL
2362 2833
2363# fails on win32: 2834# fails on win32:
2364# dc.xs(2268) : error C2059: syntax error : '(' 2835# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2836#void
2366#close (dc::RW self) 2837#close (DC::RW self)
2367# CODE: 2838# CODE:
2368# (self->(close)) (self); 2839# (self->(close)) (self);
2369 2840
2370MODULE = Deliantra::Client PACKAGE = dc::Channel 2841MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2842
2372PROTOTYPES: DISABLE 2843PROTOTYPES: DISABLE
2373 2844
2374dc::Channel 2845DC::Channel
2375find () 2846find ()
2376 CODE: 2847 CODE:
2377{ 2848{
2378 RETVAL = Mix_GroupAvailable (-1); 2849 RETVAL = Mix_GroupAvailable (-1);
2379 2850
2380 if (RETVAL < 0) 2851 if (RETVAL < 0)
2381 { 2852 {
2382 RETVAL = Mix_GroupOldest (-1); 2853 RETVAL = Mix_GroupOldest (-1);
2383 2854
2384 if (RETVAL < 0) 2855 if (RETVAL < 0)
2856 {
2857 // happens sometimes, maybe it just stopped playing(?)
2858 RETVAL = Mix_GroupAvailable (-1);
2859
2860 if (RETVAL < 0)
2385 XSRETURN_UNDEF; 2861 XSRETURN_UNDEF;
2386 2862 }
2863 else
2387 Mix_HaltChannel (RETVAL); 2864 Mix_HaltChannel (RETVAL);
2388 } 2865 }
2389 2866
2390 Mix_UnregisterAllEffects (RETVAL); 2867 Mix_UnregisterAllEffects (RETVAL);
2391 Mix_Volume (RETVAL, 128); 2868 Mix_Volume (RETVAL, 128);
2392} 2869}
2393 OUTPUT: 2870 OUTPUT:
2394 RETVAL 2871 RETVAL
2395 2872
2396void 2873void
2397halt (dc::Channel self) 2874halt (DC::Channel self)
2398 CODE: 2875 CODE:
2399 Mix_HaltChannel (self); 2876 Mix_HaltChannel (self);
2400 2877
2401void 2878void
2402expire (dc::Channel self, int ticks = -1) 2879expire (DC::Channel self, int ticks = -1)
2403 CODE: 2880 CODE:
2404 Mix_ExpireChannel (self, ticks); 2881 Mix_ExpireChannel (self, ticks);
2405 2882
2406void 2883void
2407fade_out (dc::Channel self, int ticks = -1) 2884fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2885 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2886 Mix_FadeOutChannel (self, ticks);
2410 2887
2411int 2888int
2412volume (dc::Channel self, int volume) 2889volume (DC::Channel self, int volume)
2413 CODE: 2890 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2891 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2892 OUTPUT:
2416 RETVAL 2893 RETVAL
2417 2894
2418void 2895void
2419unregister_all_effects (dc::Channel self) 2896unregister_all_effects (DC::Channel self)
2420 CODE: 2897 CODE:
2421 Mix_UnregisterAllEffects (self); 2898 Mix_UnregisterAllEffects (self);
2422 2899
2423void 2900void
2424set_panning (dc::Channel self, int left, int right) 2901set_panning (DC::Channel self, int left, int right)
2425 CODE: 2902 CODE:
2426 left = CLAMP (left , 0, 255); 2903 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2904 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2905 Mix_SetPanning (self, left, right);
2429 2906
2430void 2907void
2431set_distance (dc::Channel self, int distance) 2908set_distance (DC::Channel self, int distance)
2432 CODE: 2909 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2910 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2911
2435void 2912void
2436set_position (dc::Channel self, int angle, int distance) 2913set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2914 CODE:
2438 2915
2439void 2916void
2440set_position_r (dc::Channel self, int dx, int dy, int maxdistance) 2917set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2918 CODE:
2442{ 2919{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2920 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2921 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2922 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2923}
2447 2924
2448void 2925void
2449set_reverse_stereo (dc::Channel self, int flip) 2926set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2927 CODE:
2451 Mix_SetReverseStereo (self, flip); 2928 Mix_SetReverseStereo (self, flip);
2452 2929
2453MODULE = Deliantra::Client PACKAGE = dc::MixChunk 2930MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2931
2455PROTOTYPES: DISABLE 2932PROTOTYPES: DISABLE
2456 2933
2934void
2935decoders ()
2936 PPCODE:
2937#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2938 int i, num = Mix_GetNumChunkDecoders ();
2939 EXTEND (SP, num);
2940 for (i = 0; i < num; ++i)
2941 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2942#else
2943 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2944#endif
2945
2457dc::MixChunk 2946DC::MixChunk
2458new (SV *class, dc::RW rwops) 2947new (SV *class, DC::RW rwops)
2459 CODE: 2948 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2949 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2950 OUTPUT:
2462 RETVAL 2951 RETVAL
2463 2952
2464void 2953void
2465DESTROY (dc::MixChunk self) 2954DESTROY (DC::MixChunk self)
2466 CODE: 2955 CODE:
2467 Mix_FreeChunk (self); 2956 Mix_FreeChunk (self);
2468 2957
2469int 2958int
2470volume (dc::MixChunk self, int volume = -1) 2959volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2960 CODE:
2472 if (items > 1) 2961 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2962 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2963 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2964 OUTPUT:
2476 RETVAL 2965 RETVAL
2477 2966
2478dc::Channel 2967DC::Channel
2479play (dc::MixChunk self, dc::Channel channel = -1, int loops = 0, int ticks = -1) 2968play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2969 CODE:
2481{ 2970{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2971 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2972
2484 if (RETVAL < 0) 2973 if (RETVAL < 0)
2491 } 2980 }
2492} 2981}
2493 OUTPUT: 2982 OUTPUT:
2494 RETVAL 2983 RETVAL
2495 2984
2496MODULE = Deliantra::Client PACKAGE = dc::MixMusic 2985MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2986
2987void
2988decoders ()
2989 PPCODE:
2990#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2991 int i, num = Mix_GetNumMusicDecoders ();
2992 EXTEND (SP, num);
2993 for (i = 0; i < num; ++i)
2994 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2995#else
2996 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2997#endif
2497 2998
2498int 2999int
2499volume (int volume = -1) 3000volume (int volume = -1)
2500 PROTOTYPE: ;$ 3001 PROTOTYPE: ;$
2501 CODE: 3002 CODE:
2513void 3014void
2514halt () 3015halt ()
2515 CODE: 3016 CODE:
2516 Mix_HaltMusic (); 3017 Mix_HaltMusic ();
2517 3018
3019int
3020playing ()
3021 CODE:
3022 RETVAL = Mix_PlayingMusic ();
3023 OUTPUT:
3024 RETVAL
3025
2518dc::MixMusic 3026DC::MixMusic
2519new (SV *class, dc::RW rwops) 3027new (SV *class, DC::RW rwops)
2520 CODE: 3028 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 3029 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 3030 OUTPUT:
2523 RETVAL 3031 RETVAL
2524 3032
2525void 3033void
2526DESTROY (dc::MixMusic self) 3034DESTROY (DC::MixMusic self)
2527 CODE: 3035 CODE:
2528 Mix_FreeMusic (self); 3036 Mix_FreeMusic (self);
2529 3037
2530int 3038int
2531play (dc::MixMusic self, int loops = -1) 3039play (DC::MixMusic self, int loops = -1)
2532 CODE: 3040 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 3041 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 3042 OUTPUT:
2535 RETVAL 3043 RETVAL
2536 3044
2537void 3045void
2538fade_in_pos (dc::MixMusic self, int loops, int ms, double position) 3046fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 3047 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 3048 Mix_FadeInMusicPos (self, loops, ms, position);
2541 3049
2542MODULE = Deliantra::Client PACKAGE = dc::OpenGL 3050MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 3051
2544PROTOTYPES: ENABLE 3052PROTOTYPES: ENABLE
2545 3053
2546BOOT: 3054BOOT:
2547{ 3055{
2548 HV *stash = gv_stashpv ("dc::OpenGL", 1); 3056 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 3057 static const struct {
2550 const char *name; 3058 const char *name;
2551 IV iv; 3059 IV iv;
2552 } *civ, const_iv[] = { 3060 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 3061# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 3062 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 3063 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 3064 const_iv (GL_EXTENSIONS),
3065 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 3066 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 3067 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 3068 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 3069 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 3070 const_iv (GL_BLEND),
2573 const_iv (GL_ZERO), 3082 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 3083 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 3084 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3085 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 3086 const_iv (GL_ONE_MINUS_DST_ALPHA),
3087 const_iv (GL_SRC_COLOR),
3088 const_iv (GL_DST_COLOR),
3089 const_iv (GL_ONE_MINUS_SRC_COLOR),
3090 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 3091 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 3092 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 3093 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 3094 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3095 const_iv (GL_RGBA8),
2650 const_iv (GL_NICEST), 3163 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3164 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3165 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3166 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 3167 const_iv (GL_T2F_N3F_V3F),
3168 const_iv (GL_FUNC_ADD),
3169 const_iv (GL_FUNC_SUBTRACT),
3170 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 3171# undef const_iv
2656 }; 3172 };
2657 3173
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3174 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3175 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2660 3176
2661 texture_av = newAV (); 3177 texture_av = newAV ();
2662 AvREAL_off (texture_av); 3178 AvREAL_off (texture_av);
2663} 3179}
2664 3180
2665void 3181void
2666disable_GL_EXT_blend_func_separate () 3182disable_GL_EXT_blend_func_separate ()
2667 CODE: 3183 CODE:
2668 gl.BlendFuncSeparate = 0; 3184 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3185 gl.BlendFuncSeparateEXT = 0;
3186
3187void
3188apple_nvidia_bug (int enable)
2670 3189
2671char * 3190char *
2672gl_vendor () 3191gl_vendor ()
2673 CODE: 3192 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3193 RETVAL = (char *)glGetString (GL_VENDOR);
2705 3224
2706int glGetError () 3225int glGetError ()
2707 3226
2708void glFinish () 3227void glFinish ()
2709 3228
3229void glFlush ()
3230
2710void glClear (int mask) 3231void glClear (int mask)
2711 3232
2712void glClearColor (float r, float g, float b, float a = 1.0) 3233void glClearColor (float r, float g, float b, float a = 1.0)
2713 PROTOTYPE: @ 3234 PROTOTYPE: @
2714 3235
2723void glBlendFunc (int sfactor, int dfactor) 3244void glBlendFunc (int sfactor, int dfactor)
2724 3245
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3246void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3247 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3248 gl_BlendFuncSeparate (sa, da, saa, daa);
3249
3250# void glBlendEquation (int se)
2728 3251
2729void glDepthMask (int flag) 3252void glDepthMask (int flag)
2730 3253
2731void glLogicOp (int opcode) 3254void glLogicOp (int opcode)
2732 3255
2767void glRotate (float angle, float x, float y, float z) 3290void glRotate (float angle, float x, float y, float z)
2768 CODE: 3291 CODE:
2769 glRotatef (angle, x, y, z); 3292 glRotatef (angle, x, y, z);
2770 3293
2771void glColor (float r, float g, float b, float a = 1.0) 3294void glColor (float r, float g, float b, float a = 1.0)
3295 PROTOTYPE: @
2772 ALIAS: 3296 ALIAS:
2773 glColor_premultiply = 1 3297 glColor_premultiply = 1
2774 CODE: 3298 CODE:
2775 if (ix) 3299 if (ix)
2776 { 3300 {
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3370void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3371 CODE:
2848 if (gl.SeparableFilter2D) 3372 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3373 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3374
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3375void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3376
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3377void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3378
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3379void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3380
2882 3406
2883void glEndList () 3407void glEndList ()
2884 3408
2885void glCallList (int list) 3409void glCallList (int list)
2886 3410
3411void c_init ()
3412 CODE:
3413 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3414 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3415
2887MODULE = Deliantra::Client PACKAGE = dc::UI::Base 3416MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3417
2889PROTOTYPES: DISABLE 3418PROTOTYPES: DISABLE
2890 3419
2891void 3420void
2892find_widget (SV *self, NV x, NV y) 3421find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3425 XPUSHs (self);
2897} 3426}
2898 3427
2899BOOT: 3428BOOT:
2900{ 3429{
2901 hover_gv = gv_fetchpv ("dc::UI::HOVER", 1, SVt_NV); 3430 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3431
2903 draw_x_gv = gv_fetchpv ("dc::UI::Base::draw_x", 1, SVt_NV); 3432 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("dc::UI::Base::draw_y", 1, SVt_NV); 3433 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("dc::UI::Base::draw_w", 1, SVt_NV); 3434 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("dc::UI::Base::draw_h", 1, SVt_NV); 3435 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3436}
2908 3437
2909void 3438void
2910draw (SV *self) 3439draw (SV *self)
2911 CODE: 3440 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3447 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3448 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3449 double draw_x, draw_y;
2921 3450
2922 if (!SvROK (self)) 3451 if (!SvROK (self))
2923 croak ("dc::Base::draw: %s not a reference", SvPV_nolen (self)); 3452 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3453
2925 hv = (HV *)SvRV (self); 3454 hv = (HV *)SvRV (self);
2926 3455
2927 if (SvTYPE (hv) != SVt_PVHV) 3456 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("dc::Base::draw: %s not a hashref", SvPV_nolen (self)); 3457 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3458
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3459 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3460 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3461
2933 if (!h || !w) 3462 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines