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.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 2010 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 CFPlus__Channel; 175typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 176typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 177typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 178typedef Mix_Music *DC__MixMusic;
129 179
130typedef PangoFontDescription *CFPlus__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 CFPlus__Font font; 204 DC__Font font;
155 rc_t *rc; 205 rc_t *rc;
156} *CFPlus__Layout; 206} *DC__Layout;
157 207
158static CFPlus__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 (CFPlus__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 (CFPlus__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} *CFPlus__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 (CFPlus__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 (CFPlus__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 (CFPlus__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 (CFPlus__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
503MODULE = CFPlus PACKAGE = CFPlus 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 ("::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 share dlibrary 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
619MODULE = Deliantra::Client PACKAGE = DC
504 620
505PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
506 622
507BOOT: 623BOOT:
508{ 624{
509 HV *stash = gv_stashpv ("CFPlus", 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; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
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
751char * 971char *
752SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
753 973
754int 974int
755SDL_GetAppState () 975SDL_GetAppState ()
976
977int
978SDL_GetModState ()
756 979
757void 980void
758poll_events () 981poll_events ()
759 PPCODE: 982 PPCODE:
760{ 983{
770 { 993 {
771 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
772 case SDL_KEYUP: 995 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 998 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 */ 999 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); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1001 break;
779 1002
780 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 1022 x = ev.motion.x;
800 y = ev.motion.y; 1023 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1025 }
803 1026
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1033 }
811 break; 1034 break;
812 1035
813 case SDL_MOUSEBUTTONDOWN: 1036 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1037 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1038 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1039
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1040 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1042 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1043 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1048 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1049 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1050 break;
828 } 1051 }
829 1052
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1054 }
832} 1055}
1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
833 1069
834int 1070int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1072 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
894 } 1130 }
895 } 1131 }
896#endif 1132#endif
897} 1133}
898 1134
899void 1135int
900add_font (char *file) 1136add_font (char *file)
901 CODE: 1137 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1139 OUTPUT:
1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
903 1144
904void 1145void
905load_image_inline (SV *image_) 1146load_image_inline (SV *image_)
906 ALIAS: 1147 ALIAS:
907 load_image_file = 1 1148 load_image_file = 1
1023#if DEBUG 1264#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1265 VALGRIND_DO_LEAK_CHECK;
1025#endif 1266#endif
1026} 1267}
1027 1268
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1269int
1270SvREFCNT (SV *sv)
1271 CODE:
1272 RETVAL = SvREFCNT (sv);
1273 OUTPUT:
1274 RETVAL
1275
1276MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1277
1030PROTOTYPES: DISABLE 1278PROTOTYPES: DISABLE
1031 1279
1032CFPlus::Font 1280DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1281new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1282 CODE:
1035{ 1283{
1036 int count; 1284 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1285 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1288}
1041 OUTPUT: 1289 OUTPUT:
1042 RETVAL 1290 RETVAL
1043 1291
1044void 1292void
1045DESTROY (CFPlus::Font self) 1293DESTROY (DC::Font self)
1046 CODE: 1294 CODE:
1047 pango_font_description_free (self); 1295 pango_font_description_free (self);
1048 1296
1049void 1297void
1050make_default (CFPlus::Font self) 1298make_default (DC::Font self)
1051 PROTOTYPE: $ 1299 PROTOTYPE: $
1052 CODE: 1300 CODE:
1053 default_font = self; 1301 default_font = self;
1054 1302
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1303MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1304
1057PROTOTYPES: DISABLE 1305PROTOTYPES: DISABLE
1058 1306
1059void 1307void
1060glyph_cache_backup () 1308glyph_cache_backup ()
1066glyph_cache_restore () 1314glyph_cache_restore ()
1067 PROTOTYPE: 1315 PROTOTYPE:
1068 CODE: 1316 CODE:
1069 tc_restore (); 1317 tc_restore ();
1070 1318
1071CFPlus::Layout 1319DC::Layout
1072new (SV *class) 1320new (SV *class)
1073 CODE: 1321 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1322 New (0, RETVAL, 1, struct cf_layout);
1075 1323
1076 RETVAL->pl = pango_layout_new (opengl_context); 1324 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1334 layout_update_font (RETVAL);
1087 OUTPUT: 1335 OUTPUT:
1088 RETVAL 1336 RETVAL
1089 1337
1090void 1338void
1091DESTROY (CFPlus::Layout self) 1339DESTROY (DC::Layout self)
1092 CODE: 1340 CODE:
1093 g_object_unref (self->pl); 1341 g_object_unref (self->pl);
1094 rc_free (self->rc); 1342 rc_free (self->rc);
1095 Safefree (self); 1343 Safefree (self);
1096 1344
1097void 1345void
1098set_text (CFPlus::Layout self, SV *text_) 1346set_text (DC::Layout self, SV *text_)
1099 CODE: 1347 CODE:
1100{ 1348{
1101 STRLEN textlen; 1349 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1350 char *text = SvPVutf8 (text_, textlen);
1103 1351
1104 pango_layout_set_text (self->pl, text, textlen); 1352 pango_layout_set_text (self->pl, text, textlen);
1105} 1353}
1106 1354
1107void 1355void
1108set_markup (CFPlus::Layout self, SV *text_) 1356set_markup (DC::Layout self, SV *text_)
1109 CODE: 1357 CODE:
1110{ 1358{
1111 STRLEN textlen; 1359 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1360 char *text = SvPVutf8 (text_, textlen);
1113 1361
1114 pango_layout_set_markup (self->pl, text, textlen); 1362 pango_layout_set_markup (self->pl, text, textlen);
1115} 1363}
1116 1364
1117void 1365void
1118set_shapes (CFPlus::Layout self, ...) 1366set_shapes (DC::Layout self, ...)
1119 CODE: 1367 CODE:
1120{ 1368{
1121 PangoAttrList *attrs = 0; 1369 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1370 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1371 const char *pos = text;
1158 if (attrs) 1406 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1407 pango_layout_set_attributes (self->pl, attrs);
1160} 1408}
1161 1409
1162void 1410void
1163get_shapes (CFPlus::Layout self) 1411get_shapes (DC::Layout self)
1164 PPCODE: 1412 PPCODE:
1165{ 1413{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1414 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1415
1168 do 1416 do
1169 { 1417 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1418 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1419
1172 if (run && shape_attr_p (run)) 1420 if (run && shape_attr_p (run))
1173 { 1421 {
1174 PangoRectangle extents; 1422 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1423 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1431
1184 pango_layout_iter_free (iter); 1432 pango_layout_iter_free (iter);
1185} 1433}
1186 1434
1187int 1435int
1188has_wrapped (CFPlus::Layout self) 1436has_wrapped (DC::Layout self)
1189 CODE: 1437 CODE:
1190{ 1438{
1191 int lines = 1; 1439 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1440 const char *text = pango_layout_get_text (self->pl);
1193 1441
1198} 1446}
1199 OUTPUT: 1447 OUTPUT:
1200 RETVAL 1448 RETVAL
1201 1449
1202SV * 1450SV *
1203get_text (CFPlus::Layout self) 1451get_text (DC::Layout self)
1204 CODE: 1452 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1453 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1454 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1455 OUTPUT:
1208 RETVAL 1456 RETVAL
1209 1457
1210void 1458void
1211set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1459set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1460 CODE:
1213 self->r = r; 1461 self->r = r;
1214 self->g = g; 1462 self->g = g;
1215 self->b = b; 1463 self->b = b;
1216 self->a = a; 1464 self->a = a;
1217 1465
1218void 1466void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1467set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1468 CODE:
1221 if (self->font != font) 1469 if (self->font != font)
1222 { 1470 {
1223 self->font = font; 1471 self->font = font;
1224 layout_update_font (self); 1472 layout_update_font (self);
1225 } 1473 }
1226 1474
1227void 1475void
1228set_height (CFPlus::Layout self, int base_height) 1476set_height (DC::Layout self, int base_height)
1229 CODE: 1477 CODE:
1230 if (self->base_height != base_height) 1478 if (self->base_height != base_height)
1231 { 1479 {
1232 self->base_height = base_height; 1480 self->base_height = base_height;
1233 layout_update_font (self); 1481 layout_update_font (self);
1234 } 1482 }
1235 1483
1236void 1484void
1237set_width (CFPlus::Layout self, int max_width = -1) 1485set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1486 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1487 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1488
1241void 1489void
1242set_indent (CFPlus::Layout self, int indent) 1490set_indent (DC::Layout self, int indent)
1243 CODE: 1491 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1492 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1493
1246void 1494void
1247set_spacing (CFPlus::Layout self, int spacing) 1495set_spacing (DC::Layout self, int spacing)
1248 CODE: 1496 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1497 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1498
1251void 1499void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1500set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1501 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1502 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1503 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1504 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1505 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1506 : PANGO_ELLIPSIZE_NONE
1259 ); 1507 );
1260 1508
1261void 1509void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1510set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1511 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1512 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1513
1266void 1514void
1267size (CFPlus::Layout self) 1515size (DC::Layout self)
1268 PPCODE: 1516 PPCODE:
1269{ 1517{
1270 int w, h; 1518 int w, h;
1271 1519
1272 layout_get_pixel_size (self, &w, &h); 1520 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1523 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1524 PUSHs (sv_2mortal (newSViv (h)));
1277} 1525}
1278 1526
1279int 1527int
1280descent (CFPlus::Layout self) 1528descent (DC::Layout self)
1281 CODE: 1529 CODE:
1282{ 1530{
1283 PangoRectangle rect; 1531 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1532 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1533 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1534 RETVAL = PANGO_DESCENT (rect);
1287} 1535}
1288 OUTPUT: 1536 OUTPUT:
1289 RETVAL 1537 RETVAL
1290 1538
1291int 1539int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1540xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1541 CODE:
1294{ 1542{
1295 int index, trailing; 1543 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1544 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1545 RETVAL = index + trailing;
1298} 1546}
1299 OUTPUT: 1547 OUTPUT:
1300 RETVAL 1548 RETVAL
1301 1549
1302void 1550void
1303cursor_pos (CFPlus::Layout self, int index) 1551cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1552 PPCODE:
1305{ 1553{
1306 PangoRectangle strong_pos; 1554 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1555 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1556
1309 EXTEND (SP, 3); 1557 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1558 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1559 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1560 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1561}
1314 1562
1315void 1563void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1564index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1565 PPCODE:
1318{ 1566{
1319 int line, x; 1567 int line, x;
1320 1568
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1569 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1570#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1571 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1572 --line;
1573#endif
1324 EXTEND (SP, 2); 1574 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1575 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1576 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1577}
1328 1578
1329void 1579void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1580line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1581 PPCODE:
1332{ 1582{
1333 PangoLayoutLine *lp; 1583 PangoLayoutLine *lp;
1334 int index, trailing; 1584 int index, trailing;
1335 1585
1336 if (line < 0) 1586 if (line < 0)
1337 XSRETURN_EMPTY; 1587 XSRETURN_EMPTY;
1338 1588
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1589 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1590 XSRETURN_EMPTY; /* do better */
1341 1591
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1592 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1593
1344 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1600 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1601 }
1352} 1602}
1353 1603
1354void 1604void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1605render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1606 CODE:
1357 rc_clear (self->rc); 1607 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1608 pango_opengl_render_layout_subpixel (
1359 self->pl, 1609 self->pl,
1360 self->rc, 1610 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1615 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1616 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1617 pango_layout_context_changed (self->pl);
1368 1618
1369void 1619void
1370draw (CFPlus::Layout self) 1620draw (DC::Layout self)
1371 CODE: 1621 CODE:
1372{ 1622{
1373 glEnable (GL_TEXTURE_2D); 1623 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1624 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1625 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1633 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1634 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1635 glDisable (GL_TEXTURE_2D);
1386} 1636}
1387 1637
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1638MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1639
1390PROTOTYPES: ENABLE 1640PROTOTYPES: ENABLE
1391 1641
1392void 1642void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1643pad (SV *data_, int ow, int oh, int nw, int nh)
1461 glDisable (GL_ALPHA_TEST); 1711 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1712 glDisable (GL_BLEND);
1463 } 1713 }
1464} 1714}
1465 1715
1716void
1717draw_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)
1718 PROTOTYPE: @
1719 CODE:
1720{
1721 glEnable (GL_BLEND);
1722 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1723 glEnable (GL_TEXTURE_2D);
1724 glBindTexture (GL_TEXTURE_2D, name1);
1725
1726 glColor3f (intensity, intensity, intensity);
1727 glPushMatrix ();
1728 glScalef (1./3, 1./3, 1.);
1729
1730 if (blend > 0.f)
1731 {
1732 float dx3 = dx * -3.f / w;
1733 float dy3 = dy * -3.f / h;
1734 GLfloat env_color[4] = { 0., 0., 0., blend };
1735
1736 /* interpolate the two shadow textures */
1737 /* stage 0 == rgb(glcolor) + alpha(t0) */
1738 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1739
1740 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1741 gl.ActiveTexture (GL_TEXTURE1);
1742 glEnable (GL_TEXTURE_2D);
1743 glBindTexture (GL_TEXTURE_2D, name2);
1744 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1745
1746 /* rgb == rgb(glcolor) */
1747 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1748 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1749 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1750
1751 /* alpha = interpolate t0, t1 by env_alpha */
1752 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1753
1754 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1755 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1756 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1757
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1763
1764 glBegin (GL_QUADS);
1765 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1766 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1767 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1769 glEnd ();
1770
1771 glDisable (GL_TEXTURE_2D);
1772 gl.ActiveTexture (GL_TEXTURE0);
1773 }
1774 else
1775 {
1776 /* simple blending of one texture, also opengl <1.3 path */
1777 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1778
1779 glBegin (GL_QUADS);
1780 glTexCoord2f (0, 0); glVertex2f (0, 0);
1781 glTexCoord2f (0, t); glVertex2f (0, h);
1782 glTexCoord2f (s, t); glVertex2f (w, h);
1783 glTexCoord2f (s, 0); glVertex2f (w, 0);
1784 glEnd ();
1785 }
1786
1787 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1788 {
1789 int x, y;
1790 int dx3 = dx * 3;
1791 int dy3 = dy * 3;
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1794 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1795 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1796 glTranslatef (-1., -1., 0);
1797 glBegin (GL_QUADS);
1798
1799 for (y = 1; y < h; y += 3)
1800 {
1801 int y1 = y - dy3;
1802 int y1valid = y1 >= 0 && y1 < h;
1803
1804 for (x = 1; x < w; x += 3)
1805 {
1806 int x1 = x - dx3;
1807 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1808 uint8_t h2;
1809
1810 if (y1valid && x1 >= 0 && x1 < w)
1811 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1812 else
1813 h2 = 1; /* out of range == invisible */
1814
1815 if (h1 || h2)
1816 {
1817 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1818 glColor4f (1., 1., 1., alpha);
1819
1820 glTexCoord2f (0, 0.); glVertex2i (x , y );
1821 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1822 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1823 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1824 }
1825 }
1826 }
1827 }
1828
1829 glEnd ();
1830
1831 glPopMatrix ();
1832
1833 glDisable (GL_TEXTURE_2D);
1834 glDisable (GL_BLEND);
1835}
1836
1466IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1837IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467 CODE: 1838 CODE:
1468{ 1839{
1469 GLint width; 1840 GLint width;
1470 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1841 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1472 RETVAL = width > 0; 1843 RETVAL = width > 0;
1473} 1844}
1474 OUTPUT: 1845 OUTPUT:
1475 RETVAL 1846 RETVAL
1476 1847
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1848MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1849
1479PROTOTYPES: DISABLE 1850PROTOTYPES: DISABLE
1480 1851
1481CFPlus::Map 1852DC::Map
1482new (SV *class) 1853new (SV *class)
1483 CODE: 1854 CODE:
1484 New (0, RETVAL, 1, struct map); 1855 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1856 RETVAL->x = 0;
1486 RETVAL->y = 0; 1857 RETVAL->y = 0;
1494 RETVAL->row = 0; 1865 RETVAL->row = 0;
1495 OUTPUT: 1866 OUTPUT:
1496 RETVAL 1867 RETVAL
1497 1868
1498void 1869void
1499DESTROY (CFPlus::Map self) 1870DESTROY (DC::Map self)
1500 CODE: 1871 CODE:
1501{ 1872{
1502 map_clear (self); 1873 map_clear (self);
1503 Safefree (self->face2tile); 1874 Safefree (self->face2tile);
1504 Safefree (self->tex); 1875 Safefree (self->tex);
1505 Safefree (self); 1876 Safefree (self);
1506} 1877}
1507 1878
1508void 1879void
1509resize (CFPlus::Map self, int map_width, int map_height) 1880resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1881 CODE:
1511 self->w = map_width; 1882 self->w = map_width;
1512 self->h = map_height; 1883 self->h = map_height;
1513 1884
1514void 1885void
1515clear (CFPlus::Map self) 1886clear (DC::Map self)
1516 CODE: 1887 CODE:
1517 map_clear (self); 1888 map_clear (self);
1518 1889
1519void 1890void
1520set_tileid (CFPlus::Map self, int face, int tile) 1891set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1892 CODE:
1522{ 1893{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1894 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1895 need_texid (self, tile);
1525} 1896}
1526 1897
1527void 1898void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1899set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1900 CODE:
1530{ 1901{
1531 tileid texid; 1902 tileid texid;
1532 maptex *tex; 1903 maptex *tex;
1533 1904
1546 tex->smoothtile = self->face2tile [smooth]; 1917 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1918 tex->smoothlevel = level;
1548} 1919}
1549 1920
1550void 1921void
1551set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1922set_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: 1923 CODE:
1553{ 1924{
1554 need_texid (self, texid); 1925 need_texid (self, texid);
1555 1926
1556 { 1927 {
1575 // use uglier nearest interpolation because linear suffers 1946 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1947 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1948 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1949}
1579 1950
1951void
1952expire_textures (DC::Map self, int texid, int count)
1953 PPCODE:
1954 for (; texid < self->texs && count; ++texid, --count)
1955 {
1956 maptex *tex = self->tex + texid;
1957
1958 if (tex->name)
1959 {
1960 if (tex->unused)
1961 {
1962 tex->name = 0;
1963 tex->unused = 0;
1964 XPUSHs (sv_2mortal (newSViv (texid)));
1965 }
1966 else
1967 tex->unused = 1;
1968 }
1969 }
1970
1580int 1971int
1581ox (CFPlus::Map self) 1972ox (DC::Map self)
1582 ALIAS: 1973 ALIAS:
1583 oy = 1 1974 oy = 1
1584 x = 2 1975 x = 2
1585 y = 3 1976 y = 3
1586 w = 4 1977 w = 4
1597 } 1988 }
1598 OUTPUT: 1989 OUTPUT:
1599 RETVAL 1990 RETVAL
1600 1991
1601void 1992void
1602scroll (CFPlus::Map self, int dx, int dy) 1993scroll (DC::Map self, int dx, int dy)
1603 CODE: 1994 CODE:
1604{ 1995{
1605 if (dx > 0) 1996 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1997 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1998 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 2014 self->y += MAP_EXTEND_Y;
1624 } 2015 }
1625} 2016}
1626 2017
1627SV * 2018SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 2019map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 2020 CODE:
1630{ 2021{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2022 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 2023 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 2024 mapcell *cell;
1661 uint8_t ext, cmd; 2052 uint8_t ext, cmd;
1662 2053
1663 do 2054 do
1664 { 2055 {
1665 ext = *data++; 2056 ext = *data++;
1666 cmd = ext & 0x3f; 2057 cmd = ext & 0x7f;
1667 2058
1668 if (cmd < 4) 2059 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 2060 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1670 else if (cmd == 5) // health 2061 else if (cmd == 5) // health
1671 { 2062 {
1672 cell->stat_width = 1; 2063 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2064 cell->stat_hp = *data++;
1674 } 2065 }
1675 else if (cmd == 6) // monster width 2066 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 2067 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 2068 else if (cmd == 0x47)
1678 { 2069 {
1679 if (*data == 4) 2070 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 2071 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2072 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2073 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 2074
1682 data += *data + 1; 2075 data += *data + 1;
1683 } 2076 }
1684 else if (cmd == 8) // cell flags 2077 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 2078 cell->flags = *data++;
1702 cell->tile [z] = self->face2tile [face]; 2095 cell->tile [z] = self->face2tile [face];
1703 2096
1704 if (cell->tile [z]) 2097 if (cell->tile [z])
1705 { 2098 {
1706 maptex *tex = self->tex + cell->tile [z]; 2099 maptex *tex = self->tex + cell->tile [z];
2100 tex->unused = 0;
1707 if (!tex->name) 2101 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2102 av_push (missing, newSViv (cell->tile [z]));
1709 2103
1710 if (tex->smoothtile) 2104 if (tex->smoothtile)
1711 { 2105 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2106 maptex *smooth = self->tex + tex->smoothtile;
2107 smooth->unused = 0;
1713 if (!smooth->name) 2108 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2109 av_push (missing, newSViv (tex->smoothtile));
1715 } 2110 }
1716 } 2111 }
1717 } 2112 }
1718 } 2113 }
1719 else 2114 else
1720 cell->darkness = 0; 2115 CELL_CLEAR (cell);
1721 } 2116 }
1722} 2117}
1723 OUTPUT: 2118 OUTPUT:
1724 RETVAL 2119 RETVAL
1725 2120
1726SV * 2121SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2122mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2123 CODE:
1729{ 2124{
1730 int x1, x; 2125 int x1, x;
1731 int y1, y; 2126 int y1, y;
1732 int z; 2127 int z;
1745 ? self->row + y 2140 ? self->row + y
1746 : 0; 2141 : 0;
1747 2142
1748 for (x = x0; x < x1; x++) 2143 for (x = x0; x < x1; x++)
1749 { 2144 {
1750 int r = 32, g = 32, b = 32, a = 192; 2145 unsigned int r = 32, g = 32, b = 32, a = 192;
1751 2146
1752 if (row && row->c0 <= x && x < row->c1) 2147 if (row && row->c0 <= x && x < row->c1)
1753 { 2148 {
1754 mapcell *cell = row->col + (x - row->c0); 2149 mapcell *cell = row->col + (x - row->c0);
1755 2150
1757 { 2152 {
1758 maptex tex = self->tex [cell->tile [z]]; 2153 maptex tex = self->tex [cell->tile [z]];
1759 int a0 = 255 - tex.a; 2154 int a0 = 255 - tex.a;
1760 int a1 = tex.a; 2155 int a1 = tex.a;
1761 2156
1762 r = (r * a0 + tex.r * a1) / 255; 2157 r = div255 (r * a0 + tex.r * a1);
1763 g = (g * a0 + tex.g * a1) / 255; 2158 g = div255 (g * a0 + tex.g * a1);
1764 b = (b * a0 + tex.b * a1) / 255; 2159 b = div255 (b * a0 + tex.b * a1);
1765 a = (a * a0 + tex.a * a1) / 255; 2160 a = div255 (a * a0 + tex.a * a1);
1766 } 2161 }
1767 } 2162 }
1768 2163
1769 *map++ = (r ) 2164 *map++ = (r )
1770 | (g << 8) 2165 | (g << 8)
1777} 2172}
1778 OUTPUT: 2173 OUTPUT:
1779 RETVAL 2174 RETVAL
1780 2175
1781void 2176void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2177draw (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: 2178 CODE:
1784{ 2179{
1785 int x, y, z; 2180 int x, y, z;
1786 2181
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2183 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) 2184 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 2185 smooth_key skey;
1791 2186 int pl_x, pl_y;
2187 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2188 rc_t *rc = rc_alloc ();
2189 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2190 rc_key_t key;
1794 rc_array_t *arr; 2191 rc_array_t *arr;
1795 2192
2193 pl_tex.name = 0;
2194
1796 // thats current max. sorry. 2195 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2196 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2197 if (sh > 255) sh = 255;
1799 2198
1800 // clear key, in case of extra padding 2199 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2200 memset (&skey, 0, sizeof (skey));
1805 key.g = 255; 2204 key.g = 255;
1806 key.b = 255; 2205 key.b = 255;
1807 key.a = 255; 2206 key.a = 255;
1808 key.mode = GL_QUADS; 2207 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2208 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2209
1812 mx += self->x; 2210 mx += self->x;
1813 my += self->y; 2211 my += self->y;
1814 2212
1815 // first pass: determine smooth_max 2213 // first pass: determine smooth_max
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2238
1841 for (z = 0; z <= 2; z++) 2239 for (z = 0; z <= 2; z++)
1842 { 2240 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2241 memset (smooth_level, 0, sizeof (smooth_level));
2242 key.texname = -1;
1844 2243
1845 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1847 { 2246 {
1848 maprow *row = self->row + (y + my); 2247 maprow *row = self->row + (y + my);
1858 maptex tex = self->tex [tile]; 2257 maptex tex = self->tex [tile];
1859 int px, py; 2258 int px, py;
1860 2259
1861 if (key.texname != tex.name) 2260 if (key.texname != tex.name)
1862 { 2261 {
2262 self->tex [tile].unused = 0;
2263
1863 if (!tex.name) 2264 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2265 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2266
1866 key.texname = tex.name; 2267 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2268 arr = rc_array (rc, &key);
1868 } 2269 }
1869 2270
1870 px = (x + 1) * T - tex.w; 2271 px = (x + 1) * Th - tex.w;
1871 py = (y + 1) * T - tex.h; 2272 py = (y + 1) * Tw - tex.h;
2273
2274 if (expect_false (cell->player == player) && expect_false (z == 2))
2275 {
2276 pl_x = px;
2277 pl_y = py;
2278 pl_tex = tex;
2279 continue;
2280 }
1872 2281
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2282 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2283 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); 2284 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); 2285 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 2286
1903 // update smooth hash 2287 // update smooth hash
1904 if (tex.smoothtile) 2288 if (tex.smoothtile)
1905 { 2289 {
1906 skey.tile = tex.smoothtile; 2290 skey.tile = tex.smoothtile;
1935 // corners 2319 // corners
1936 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2320 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); 2321 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); 2322 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); 2323 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2324 }
2325 }
2326
2327 if (expect_false (z == 2) && expect_false (cell->flags))
2328 {
2329 // overlays such as the speech bubble, probably more to come
2330 if (cell->flags & 1)
2331 {
2332 rc_key_t key_ov = key;
2333 maptex tex = self->tex [TEXID_SPEECH];
2334 rc_array_t *arr;
2335 int px = x * Tw + Tw * 2 / 32;
2336 int py = y * Th - Th * 6 / 32;
2337
2338 key_ov.texname = tex.name;
2339 arr = rc_array (rc_ov, &key_ov);
2340
2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2342 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2343 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1940 } 2345 }
1941 } 2346 }
1942 } 2347 }
1943 } 2348 }
1944 2349
1971 if (!(bits & 0x1000) 2376 if (!(bits & 0x1000)
1972 && skey->level == level 2377 && skey->level == level
1973 && level > smooth_max [skey->x][skey->y]) 2378 && level > smooth_max [skey->x][skey->y])
1974 { 2379 {
1975 maptex tex = self->tex [skey->tile]; 2380 maptex tex = self->tex [skey->tile];
1976 int px = (((int)skey->x) - 1) * T; 2381 int px = (((int)skey->x) - 1) * Tw;
1977 int py = (((int)skey->y) - 1) * T; 2382 int py = (((int)skey->y) - 1) * Th;
1978 int border = bits & 15; 2383 int border = bits & 15;
1979 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1980 float dx = tex.s * .0625f; // 16 images/row 2385 float dx = tex.s * .0625f; // 16 images/row
1981 float dy = tex.t * .5f ; // 2 images/column 2386 float dy = tex.t * .5f ; // 2 images/column
1982 2387
1984 { 2389 {
1985 // this time avoiding texture state changes 2390 // this time avoiding texture state changes
1986 // save gobs of state changes. 2391 // save gobs of state changes.
1987 if (key.texname != tex.name) 2392 if (key.texname != tex.name)
1988 { 2393 {
2394 self->tex [skey->tile].unused = 0;
2395
1989 glEnd (); 2396 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2397 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2398 glBegin (GL_QUADS);
1992 } 2399 }
1993 2400
1994 if (border) 2401 if (border)
1995 { 2402 {
1996 float ox = border * dx; 2403 float ox = border * dx;
1997 2404
1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2002 } 2409 }
2003 2410
2004 if (corner) 2411 if (corner)
2005 { 2412 {
2006 float ox = corner * dx; 2413 float ox = corner * dx;
2007 2414
2008 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2012 } 2419 }
2013 } 2420 }
2014 } 2421 }
2015 } 2422 }
2016 } 2423 }
2022 } 2429 }
2023 2430
2024 hv_clear (smooth); 2431 hv_clear (smooth);
2025 } 2432 }
2026 2433
2434 if (pl_tex.name)
2435 {
2436 maptex tex = pl_tex;
2437 int px = pl_x + sdx;
2438 int py = pl_y + sdy;
2439
2440 key.texname = tex.name;
2441 arr = rc_array (rc, &key);
2442
2443 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2444 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2445 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2446 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2447
2448 rc_draw (rc);
2449 }
2450
2451 rc_draw (rc_ov);
2452 rc_clear (rc_ov);
2453
2027 glDisable (GL_BLEND); 2454 glDisable (GL_BLEND);
2028 rc_free (rc); 2455 rc_free (rc);
2456 rc_free (rc_ov);
2029 2457
2030 // top layer: overlays such as the health bar 2458 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2459 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2460 if (0 <= y + my && y + my < self->rows)
2033 { 2461 {
2036 for (x = 0; x < sw; x++) 2464 for (x = 0; x < sw; x++)
2037 if (row->c0 <= x + mx && x + mx < row->c1) 2465 if (row->c0 <= x + mx && x + mx < row->c1)
2038 { 2466 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2467 mapcell *cell = row->col + (x + mx - row->c0);
2040 2468
2041 int px = x * T; 2469 int px = x * Tw;
2042 int py = y * T; 2470 int py = y * Th;
2471
2472 if (expect_false (cell->player == player))
2473 {
2474 px += sdx;
2475 py += sdy;
2476 }
2043 2477
2044 if (cell->stat_hp) 2478 if (cell->stat_hp)
2045 { 2479 {
2046 int width = cell->stat_width * T; 2480 int width = cell->stat_width * Tw;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2481 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2048 2482
2049 glColor3ub (0, 0, 0); 2483 glColor3ub (0, 0, 0);
2050 glRectf (px + 1, py - thick - 2, 2484 glRectf (px + 1, py - thick - 2,
2051 px + width - 1, py); 2485 px + width - 1, py);
2052 2486
2058 } 2492 }
2059 } 2493 }
2060} 2494}
2061 2495
2062void 2496void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2497draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2064 CODE: 2498 CODE:
2065{ 2499{
2066 static float color[16][3] = { 2500 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2501 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2502 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2503 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2504 { 1.00f, 0.00f, 0.00f },
2071 2505
2072 { 1.00F, 0.54F, 0.00F }, 2506 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2507 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2508 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2509 { 0.18f, 0.54f, 0.34f },
2076 2510
2077 { 0.56F, 0.73F, 0.56F }, 2511 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2512 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2513 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2514 { 0.99f, 0.77f, 0.26f },
2081 2515
2082 { 0.74F, 0.65F, 0.41F }, 2516 { 0.74f, 0.65f, 0.41f },
2083 2517
2084 { 0.00F, 1.00F, 1.00F }, 2518 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2519 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2520 { 1.00f, 1.00f, 0.00f },
2087 }; 2521 };
2088 2522
2089 int x, y; 2523 int x, y;
2090 2524
2091 glEnable (GL_TEXTURE_2D); 2525 glEnable (GL_TEXTURE_2D);
2526 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2527 * but the nvidia driver (185.18.14) mishandles alpha textures
2528 * and takes the colour from god knows where instead of using
2529 * Cp. MODULATE results in the same colour, but slightly different
2530 * alpha, but atcually gives us the correct colour with nvidia.
2531 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2533 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2535 glBegin (GL_QUADS);
2096 2536
2097 for (y = 0; y < h; y++) 2537 for (y = 0; y < h; y++)
2101 2541
2102 if (m) 2542 if (m)
2103 { 2543 {
2104 float *c = color [m & 15]; 2544 float *c = color [m & 15];
2105 2545
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2546 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2547 float tx2 = tx1 + 0.5f;
2108 2548
2109 glColor4f (c[0], c[1], c[2], 0.75); 2549 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2554 }
2118 glDisable (GL_BLEND); 2558 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2559 glDisable (GL_TEXTURE_2D);
2120} 2560}
2121 2561
2122void 2562void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2563fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2564 PPCODE:
2125{ 2565{
2126 int x, y; 2566 int x, y;
2127 int sw1 = sw + 2; 2567 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2568 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2569 int sh3 = sh * 3;
2130 int sw34 = (sw * 3 + 3) & ~3; 2570 int sw3 = sw * 3;
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2571 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2572 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2573 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2574
2135 SvPOK_only (darkness3_sv); 2575 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2576 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2577
2138 mx += self->x - 1; 2578 mx += self->x - 1;
2139 my += self->y - 1; 2579 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2580
2143 for (y = 0; y < sh1; y++) 2581 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2582 if (0 <= y + my && y + my < self->rows)
2145 { 2583 {
2146 maprow *row = self->row + (y + my); 2584 maprow *row = self->row + (y + my);
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2587 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2588 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2589 mapcell *cell = row->col + (x + mx - row->c0);
2152 2590
2153 darkness1 [y * sw1 + x] = cell->darkness 2591 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2592 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2593 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2594 }
2157 } 2595 }
2158 2596
2159 for (y = 0; y < sh; ++y) 2597 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2598 for (x = 0; x < sw; ++x)
2179 2617
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2618 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2619 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2620 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2621
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2622 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2623 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2624 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2625 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2626 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); 2627 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2628 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2629 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2630 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2631 }
2194 2632
2195 free (darkness1); 2633 free (darkness1);
2196 2634
2197 EXTEND (SP, 3); 2635 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2636 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2637 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2638 PUSHs (darkness3_sv);
2201} 2639}
2202 2640
2203SV * 2641SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2642get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2643 CODE:
2206{ 2644{
2207 int x, y, x1, y1; 2645 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2646 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2647 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2704 else
2267 *data++ = 0; 2705 *data++ = 0;
2268 } 2706 }
2269 } 2707 }
2270 2708
2709 /* if size is w*h + 5 then no data has been found */
2710 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2711 {
2271 SvPOK_only (data_sv); 2712 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2713 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2714 }
2715
2273 RETVAL = data_sv; 2716 RETVAL = data_sv;
2274} 2717}
2275 OUTPUT: 2718 OUTPUT:
2276 RETVAL 2719 RETVAL
2277 2720
2278void 2721void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2722set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2723 PPCODE:
2281{ 2724{
2282 int x, y, z; 2725 int x, y, z;
2283 int w, h; 2726 int w, h;
2284 int x1, y1; 2727 int x1, y1;
2728 STRLEN len;
2729 uint8_t *data, *end;
2730
2731 len = SvLEN (data_sv);
2732 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2733 data = SvPVbyte_nolen (data_sv);
2734 end = data + len + 8;
2735
2736 if (len < 5)
2737 XSRETURN_EMPTY;
2285 2738
2286 if (*data++ != 0) 2739 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2740 XSRETURN_EMPTY; /* version mismatch */
2288 2741
2289 w = *data++ << 8; w |= *data++; 2742 w = *data++ << 8; w |= *data++;
2304 { 2757 {
2305 maprow *row = map_get_row (self, y); 2758 maprow *row = map_get_row (self, y);
2306 2759
2307 for (x = x0; x < x1; x++) 2760 for (x = x0; x < x1; x++)
2308 { 2761 {
2762 uint8_t flags;
2763
2764 if (data + 7 >= end)
2765 XSRETURN_EMPTY;
2766
2309 uint8_t flags = *data++; 2767 flags = *data++;
2310 2768
2311 if (flags) 2769 if (flags)
2312 { 2770 {
2313 mapcell *cell = row_get_cell (row, x); 2771 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2772 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2775 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2776 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2777
2320 if (cell->darkness == 0) 2778 if (cell->darkness == 0)
2321 { 2779 {
2322 cell->darkness = 0; 2780 /*cell->darkness = 0;*/
2781 EXTEND (SP, 3);
2323 2782
2324 for (z = 0; z <= 2; z++) 2783 for (z = 0; z <= 2; z++)
2325 { 2784 {
2326 tileid t = tile [z]; 2785 tileid t = tile [z];
2327 2786
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2787 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2788 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2789 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2790 need_texid (self, t);
2332 } 2791 }
2333 2792
2334 cell->tile [z] = t; 2793 cell->tile [z] = t;
2335 } 2794 }
2337 } 2796 }
2338 } 2797 }
2339 } 2798 }
2340} 2799}
2341 2800
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2801MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2802
2344CFPlus::RW 2803DC::RW
2345new (SV *class, SV *data_sv) 2804new (SV *class, SV *data_sv)
2346 CODE: 2805 CODE:
2347{ 2806{
2348 STRLEN datalen; 2807 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2808 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2810 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2811}
2353 OUTPUT: 2812 OUTPUT:
2354 RETVAL 2813 RETVAL
2355 2814
2356CFPlus::RW 2815DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2816new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2817 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2818 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2819 OUTPUT:
2361 RETVAL 2820 RETVAL
2362 2821
2363# fails on win32: 2822# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2823# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2824#void
2366#close (CFPlus::RW self) 2825#close (DC::RW self)
2367# CODE: 2826# CODE:
2368# (self->(close)) (self); 2827# (self->(close)) (self);
2369 2828
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2829MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2830
2372PROTOTYPES: DISABLE 2831PROTOTYPES: DISABLE
2373 2832
2374CFPlus::Channel 2833DC::Channel
2375find () 2834find ()
2376 CODE: 2835 CODE:
2377{ 2836{
2378 RETVAL = Mix_GroupAvailable (-1); 2837 RETVAL = Mix_GroupAvailable (-1);
2379 2838
2380 if (RETVAL < 0) 2839 if (RETVAL < 0)
2381 { 2840 {
2382 RETVAL = Mix_GroupOldest (-1); 2841 RETVAL = Mix_GroupOldest (-1);
2383 2842
2384 if (RETVAL < 0) 2843 if (RETVAL < 0)
2844 {
2845 // happens sometimes, maybe it just stopped playing(?)
2846 RETVAL = Mix_GroupAvailable (-1);
2847
2848 if (RETVAL < 0)
2385 XSRETURN_UNDEF; 2849 XSRETURN_UNDEF;
2386 2850 }
2851 else
2387 Mix_HaltChannel (RETVAL); 2852 Mix_HaltChannel (RETVAL);
2388 } 2853 }
2389 2854
2390 Mix_UnregisterAllEffects (RETVAL); 2855 Mix_UnregisterAllEffects (RETVAL);
2391 Mix_Volume (RETVAL, 128); 2856 Mix_Volume (RETVAL, 128);
2392} 2857}
2393 OUTPUT: 2858 OUTPUT:
2394 RETVAL 2859 RETVAL
2395 2860
2396void 2861void
2397halt (CFPlus::Channel self) 2862halt (DC::Channel self)
2398 CODE: 2863 CODE:
2399 Mix_HaltChannel (self); 2864 Mix_HaltChannel (self);
2400 2865
2401void 2866void
2402expire (CFPlus::Channel self, int ticks = -1) 2867expire (DC::Channel self, int ticks = -1)
2403 CODE: 2868 CODE:
2404 Mix_ExpireChannel (self, ticks); 2869 Mix_ExpireChannel (self, ticks);
2405 2870
2406void 2871void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2872fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2873 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2874 Mix_FadeOutChannel (self, ticks);
2410 2875
2411int 2876int
2412volume (CFPlus::Channel self, int volume) 2877volume (DC::Channel self, int volume)
2413 CODE: 2878 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2879 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2880 OUTPUT:
2416 RETVAL 2881 RETVAL
2417 2882
2418void 2883void
2419unregister_all_effects (CFPlus::Channel self) 2884unregister_all_effects (DC::Channel self)
2420 CODE: 2885 CODE:
2421 Mix_UnregisterAllEffects (self); 2886 Mix_UnregisterAllEffects (self);
2422 2887
2423void 2888void
2424set_panning (CFPlus::Channel self, int left, int right) 2889set_panning (DC::Channel self, int left, int right)
2425 CODE: 2890 CODE:
2426 left = CLAMP (left , 0, 255); 2891 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2892 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2893 Mix_SetPanning (self, left, right);
2429 2894
2430void 2895void
2431set_distance (CFPlus::Channel self, int distance) 2896set_distance (DC::Channel self, int distance)
2432 CODE: 2897 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2898 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2899
2435void 2900void
2436set_position (CFPlus::Channel self, int angle, int distance) 2901set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2902 CODE:
2438 2903
2439void 2904void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2905set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2906 CODE:
2442{ 2907{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2908 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); 2909 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2910 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2911}
2447 2912
2448void 2913void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2914set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2915 CODE:
2451 Mix_SetReverseStereo (self, flip); 2916 Mix_SetReverseStereo (self, flip);
2452 2917
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2918MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2919
2455PROTOTYPES: DISABLE 2920PROTOTYPES: DISABLE
2456 2921
2922void
2923decoders ()
2924 PPCODE:
2925#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2926 int i, num = Mix_GetNumChunkDecoders ();
2927 EXTEND (SP, num);
2928 for (i = 0; i < num; ++i)
2929 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2930#else
2931 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2932#endif
2933
2457CFPlus::MixChunk 2934DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2935new (SV *class, DC::RW rwops)
2459 CODE: 2936 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2937 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2938 OUTPUT:
2462 RETVAL 2939 RETVAL
2463 2940
2464void 2941void
2465DESTROY (CFPlus::MixChunk self) 2942DESTROY (DC::MixChunk self)
2466 CODE: 2943 CODE:
2467 Mix_FreeChunk (self); 2944 Mix_FreeChunk (self);
2468 2945
2469int 2946int
2470volume (CFPlus::MixChunk self, int volume = -1) 2947volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2948 CODE:
2472 if (items > 1) 2949 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2950 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2951 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2952 OUTPUT:
2476 RETVAL 2953 RETVAL
2477 2954
2478CFPlus::Channel 2955DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2956play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2957 CODE:
2481{ 2958{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2959 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2960
2484 if (RETVAL < 0) 2961 if (RETVAL < 0)
2491 } 2968 }
2492} 2969}
2493 OUTPUT: 2970 OUTPUT:
2494 RETVAL 2971 RETVAL
2495 2972
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2973MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2974
2975void
2976decoders ()
2977 PPCODE:
2978#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2979 int i, num = Mix_GetNumMusicDecoders ();
2980 EXTEND (SP, num);
2981 for (i = 0; i < num; ++i)
2982 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2983#else
2984 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2985#endif
2497 2986
2498int 2987int
2499volume (int volume = -1) 2988volume (int volume = -1)
2500 PROTOTYPE: ;$ 2989 PROTOTYPE: ;$
2501 CODE: 2990 CODE:
2513void 3002void
2514halt () 3003halt ()
2515 CODE: 3004 CODE:
2516 Mix_HaltMusic (); 3005 Mix_HaltMusic ();
2517 3006
3007int
3008playing ()
3009 CODE:
3010 RETVAL = Mix_PlayingMusic ();
3011 OUTPUT:
3012 RETVAL
3013
2518CFPlus::MixMusic 3014DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 3015new (SV *class, DC::RW rwops)
2520 CODE: 3016 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 3017 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 3018 OUTPUT:
2523 RETVAL 3019 RETVAL
2524 3020
2525void 3021void
2526DESTROY (CFPlus::MixMusic self) 3022DESTROY (DC::MixMusic self)
2527 CODE: 3023 CODE:
2528 Mix_FreeMusic (self); 3024 Mix_FreeMusic (self);
2529 3025
2530int 3026int
2531play (CFPlus::MixMusic self, int loops = -1) 3027play (DC::MixMusic self, int loops = -1)
2532 CODE: 3028 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 3029 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 3030 OUTPUT:
2535 RETVAL 3031 RETVAL
2536 3032
2537void 3033void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3034fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 3035 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 3036 Mix_FadeInMusicPos (self, loops, ms, position);
2541 3037
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3038MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 3039
2544PROTOTYPES: ENABLE 3040PROTOTYPES: ENABLE
2545 3041
2546BOOT: 3042BOOT:
2547{ 3043{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3044 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 3045 static const struct {
2550 const char *name; 3046 const char *name;
2551 IV iv; 3047 IV iv;
2552 } *civ, const_iv[] = { 3048 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 3049# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 3050 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 3051 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 3052 const_iv (GL_EXTENSIONS),
3053 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 3054 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 3055 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 3056 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 3057 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 3058 const_iv (GL_BLEND),
2573 const_iv (GL_ZERO), 3070 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 3071 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 3072 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3073 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 3074 const_iv (GL_ONE_MINUS_DST_ALPHA),
3075 const_iv (GL_SRC_COLOR),
3076 const_iv (GL_DST_COLOR),
3077 const_iv (GL_ONE_MINUS_SRC_COLOR),
3078 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 3079 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 3080 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 3081 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 3082 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3083 const_iv (GL_RGBA8),
2650 const_iv (GL_NICEST), 3151 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3152 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3153 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3154 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 3155 const_iv (GL_T2F_N3F_V3F),
3156 const_iv (GL_FUNC_ADD),
3157 const_iv (GL_FUNC_SUBTRACT),
3158 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 3159# undef const_iv
2656 }; 3160 };
2657 3161
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3162 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3163 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2666disable_GL_EXT_blend_func_separate () 3170disable_GL_EXT_blend_func_separate ()
2667 CODE: 3171 CODE:
2668 gl.BlendFuncSeparate = 0; 3172 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3173 gl.BlendFuncSeparateEXT = 0;
2670 3174
3175void
3176apple_nvidia_bug (int enable)
3177
2671char * 3178char *
2672gl_vendor () 3179gl_vendor ()
2673 CODE: 3180 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3181 RETVAL = (char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3182 OUTPUT:
2705 3212
2706int glGetError () 3213int glGetError ()
2707 3214
2708void glFinish () 3215void glFinish ()
2709 3216
3217void glFlush ()
3218
2710void glClear (int mask) 3219void glClear (int mask)
2711 3220
2712void glClearColor (float r, float g, float b, float a = 1.0) 3221void glClearColor (float r, float g, float b, float a = 1.0)
2713 PROTOTYPE: @ 3222 PROTOTYPE: @
2714 3223
2723void glBlendFunc (int sfactor, int dfactor) 3232void glBlendFunc (int sfactor, int dfactor)
2724 3233
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3234void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3235 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3236 gl_BlendFuncSeparate (sa, da, saa, daa);
3237
3238# void glBlendEquation (int se)
2728 3239
2729void glDepthMask (int flag) 3240void glDepthMask (int flag)
2730 3241
2731void glLogicOp (int opcode) 3242void glLogicOp (int opcode)
2732 3243
2767void glRotate (float angle, float x, float y, float z) 3278void glRotate (float angle, float x, float y, float z)
2768 CODE: 3279 CODE:
2769 glRotatef (angle, x, y, z); 3280 glRotatef (angle, x, y, z);
2770 3281
2771void glColor (float r, float g, float b, float a = 1.0) 3282void glColor (float r, float g, float b, float a = 1.0)
3283 PROTOTYPE: @
2772 ALIAS: 3284 ALIAS:
2773 glColor_premultiply = 1 3285 glColor_premultiply = 1
2774 CODE: 3286 CODE:
2775 if (ix) 3287 if (ix)
2776 { 3288 {
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3358void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3359 CODE:
2848 if (gl.SeparableFilter2D) 3360 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3361 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3362
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3363void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3364
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3365void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3366
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3367void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3368
2882 3394
2883void glEndList () 3395void glEndList ()
2884 3396
2885void glCallList (int list) 3397void glCallList (int list)
2886 3398
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3399void c_init ()
3400 CODE:
3401 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3402 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3403
3404MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3405
2889PROTOTYPES: DISABLE 3406PROTOTYPES: DISABLE
2890 3407
2891void 3408void
2892find_widget (SV *self, NV x, NV y) 3409find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3413 XPUSHs (self);
2897} 3414}
2898 3415
2899BOOT: 3416BOOT:
2900{ 3417{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3418 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3419
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3420 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3421 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3422 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3423 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3424}
2908 3425
2909void 3426void
2910draw (SV *self) 3427draw (SV *self)
2911 CODE: 3428 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3435 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3436 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3437 double draw_x, draw_y;
2921 3438
2922 if (!SvROK (self)) 3439 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3440 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3441
2925 hv = (HV *)SvRV (self); 3442 hv = (HV *)SvRV (self);
2926 3443
2927 if (SvTYPE (hv) != SVt_PVHV) 3444 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3445 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3446
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3447 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.; 3448 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3449
2933 if (!h || !w) 3450 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines