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.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 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 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 ("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
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),
619 const_iv (KMOD_LMETA), 785 const_iv (KMOD_LMETA),
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),
790
791 const_iv (KMOD_LRAM),
792
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)
624# undef const_iv 823# undef const_iv
625 }; 824 };
626 825
627 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--)
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
629 828
630 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
631 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
632} 831}
633 832
650 849
651IV minpot (UV n) 850IV minpot (UV n)
652 851
653IV popcount (UV n) 852IV popcount (UV n)
654 853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
859
655void 860void
656pango_init () 861pango_init ()
657 CODE: 862 CODE:
658{ 863{
659 opengl_fontmap = pango_opengl_font_map_new (); 864 opengl_fontmap = pango_opengl_font_map_new ();
660 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);
661 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
662} 872}
663 873
664char *
665SDL_GetError () 874char *SDL_GetError ()
666 875
667int 876void SDL_braino ()
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
669 877
670void 878int SDL_Init (U32 flags)
879
880int SDL_InitSubSystem (U32 flags)
881
882void SDL_QuitSubSystem (U32 flags)
883
671SDL_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
672 894
673void 895void
674SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
675 PPCODE: 897 PPCODE:
676{ 898{
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 913
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693#if SDL_VERSION_ATLEAST(1,2,10)
694 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 916
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 918
700 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
701 while (*m) 920 while (*m)
702 { 921 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 922 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 923 {
705 AV *av = newAV (); 924 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
732 951
733 if (RETVAL) 952 if (RETVAL)
734 { 953 {
735 av_clear (texture_av); 954 av_clear (texture_av);
736 955
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#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);
739#include "glfunc.h" 958#include "glfunc.h"
740#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
741 } 963 }
742} 964}
743 OUTPUT: 965 OUTPUT:
744 RETVAL 966 RETVAL
745 967
750SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
751 973
752int 974int
753SDL_GetAppState () 975SDL_GetAppState ()
754 976
977int
978SDL_GetModState ()
979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
755void 984void
985SDL_PumpEvents ()
986
987void
756poll_events () 988peep_events ()
757 PPCODE: 989 PPCODE:
758{ 990{
759 SDL_Event ev; 991 SDL_Event ev;
760 992
761 SDL_PumpEvents (); 993 SDL_PumpEvents ();
768 { 1000 {
769 case SDL_KEYDOWN: 1001 case SDL_KEYDOWN:
770 case SDL_KEYUP: 1002 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1003 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1004 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 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);
774 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 */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1007 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 1008 break;
777 1009
778 case SDL_ACTIVEEVENT: 1010 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1011 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 1029 x = ev.motion.x;
798 y = ev.motion.y; 1030 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1031 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 1032 }
801 1033
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1034 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 1035 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 1036 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 1037 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1038 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1039 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 1040 }
809 break; 1041 break;
810 1042
811 case SDL_MOUSEBUTTONDOWN: 1043 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 1044 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1045 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 1046
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1047 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1048 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1049 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1050 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1055 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1056 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 1057 break;
826 } 1058 }
827 1059
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1060 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 1061 }
830} 1062}
831 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
1076
832int 1077int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1078Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 1079 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 1080 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 1081 Mix_ChannelFinished (channel_finished);
1082
1083void
1084Mix_QuerySpec ()
1085 PPCODE:
1086{
1087 int freq, channels;
1088 Uint16 format;
1089
1090 if (Mix_QuerySpec (&freq, &format, &channels))
1091 {
1092 EXTEND (SP, 3);
1093 PUSHs (sv_2mortal (newSViv (freq)));
1094 PUSHs (sv_2mortal (newSViv (format)));
1095 PUSHs (sv_2mortal (newSViv (channels)));
1096 }
1097}
837 1098
838void 1099void
839Mix_CloseAudio () 1100Mix_CloseAudio ()
840 1101
841int 1102int
876 } 1137 }
877 } 1138 }
878#endif 1139#endif
879} 1140}
880 1141
881void 1142int
882add_font (char *file) 1143add_font (char *file)
883 CODE: 1144 CODE:
884 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
1152void
1153Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
885 1154
886void 1155void
887load_image_inline (SV *image_) 1156load_image_inline (SV *image_)
888 ALIAS: 1157 ALIAS:
889 load_image_file = 1 1158 load_image_file = 1
975void 1244void
976error (char *message) 1245error (char *message)
977 CODE: 1246 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1247 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1248#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1249 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1250#endif
982 1251
983void 1252void
984fatal (char *message) 1253fatal (char *message)
985 CODE: 1254 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1255 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1256#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1257 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1258#endif
990 _exit (1); 1259 _exit (1);
991 1260
992void 1261void
993_exit (int retval = 0) 1262_exit (int retval = 0)
1005#if DEBUG 1274#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1275 VALGRIND_DO_LEAK_CHECK;
1007#endif 1276#endif
1008} 1277}
1009 1278
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1279int
1280SvREFCNT (SV *sv)
1281 CODE:
1282 RETVAL = SvREFCNT (sv);
1283 OUTPUT:
1284 RETVAL
1285
1286MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1287
1012PROTOTYPES: DISABLE 1288PROTOTYPES: DISABLE
1013 1289
1014CFPlus::Font 1290DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1291new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1292 CODE:
1017{ 1293{
1018 int count; 1294 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1295 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1022} 1298}
1023 OUTPUT: 1299 OUTPUT:
1024 RETVAL 1300 RETVAL
1025 1301
1026void 1302void
1027DESTROY (CFPlus::Font self) 1303DESTROY (DC::Font self)
1028 CODE: 1304 CODE:
1029 pango_font_description_free (self); 1305 pango_font_description_free (self);
1030 1306
1031void 1307void
1032make_default (CFPlus::Font self) 1308make_default (DC::Font self)
1033 PROTOTYPE: $ 1309 PROTOTYPE: $
1034 CODE: 1310 CODE:
1035 default_font = self; 1311 default_font = self;
1036 1312
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1313MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1314
1039PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1040 1316
1041void 1317void
1042reset_glyph_cache () 1318glyph_cache_backup ()
1043 PROTOTYPE: 1319 PROTOTYPE:
1044 CODE: 1320 CODE:
1321 tc_backup ();
1322
1323void
1324glyph_cache_restore ()
1325 PROTOTYPE:
1326 CODE:
1045 tc_clear (); 1327 tc_restore ();
1046 1328
1047CFPlus::Layout 1329DC::Layout
1048new (SV *class) 1330new (SV *class)
1049 CODE: 1331 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1332 New (0, RETVAL, 1, struct cf_layout);
1051 1333
1052 RETVAL->pl = pango_layout_new (opengl_context); 1334 RETVAL->pl = pango_layout_new (opengl_context);
1062 layout_update_font (RETVAL); 1344 layout_update_font (RETVAL);
1063 OUTPUT: 1345 OUTPUT:
1064 RETVAL 1346 RETVAL
1065 1347
1066void 1348void
1067DESTROY (CFPlus::Layout self) 1349DESTROY (DC::Layout self)
1068 CODE: 1350 CODE:
1069 g_object_unref (self->pl); 1351 g_object_unref (self->pl);
1070 rc_free (self->rc); 1352 rc_free (self->rc);
1071 Safefree (self); 1353 Safefree (self);
1072 1354
1073void 1355void
1074set_text (CFPlus::Layout self, SV *text_) 1356set_text (DC::Layout self, SV *text_)
1075 CODE: 1357 CODE:
1076{ 1358{
1077 STRLEN textlen; 1359 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1360 char *text = SvPVutf8 (text_, textlen);
1079 1361
1080 pango_layout_set_text (self->pl, text, textlen); 1362 pango_layout_set_text (self->pl, text, textlen);
1081} 1363}
1082 1364
1083void 1365void
1084set_markup (CFPlus::Layout self, SV *text_) 1366set_markup (DC::Layout self, SV *text_)
1085 CODE: 1367 CODE:
1086{ 1368{
1087 STRLEN textlen; 1369 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1370 char *text = SvPVutf8 (text_, textlen);
1089 1371
1090 pango_layout_set_markup (self->pl, text, textlen); 1372 pango_layout_set_markup (self->pl, text, textlen);
1091} 1373}
1092 1374
1093void 1375void
1094set_shapes (CFPlus::Layout self, ...) 1376set_shapes (DC::Layout self, ...)
1095 CODE: 1377 CODE:
1096{ 1378{
1097 PangoAttrList *attrs = 0; 1379 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1380 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1381 const char *pos = text;
1134 if (attrs) 1416 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1417 pango_layout_set_attributes (self->pl, attrs);
1136} 1418}
1137 1419
1138void 1420void
1139get_shapes (CFPlus::Layout self) 1421get_shapes (DC::Layout self)
1140 PPCODE: 1422 PPCODE:
1141{ 1423{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1424 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1425
1144 do 1426 do
1145 { 1427 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1428 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1429
1148 if (run && shape_attr_p (run)) 1430 if (run && shape_attr_p (run))
1149 { 1431 {
1150 PangoRectangle extents; 1432 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1433 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1441
1160 pango_layout_iter_free (iter); 1442 pango_layout_iter_free (iter);
1161} 1443}
1162 1444
1163int 1445int
1164has_wrapped (CFPlus::Layout self) 1446has_wrapped (DC::Layout self)
1165 CODE: 1447 CODE:
1166{ 1448{
1167 int lines = 1; 1449 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1450 const char *text = pango_layout_get_text (self->pl);
1169 1451
1174} 1456}
1175 OUTPUT: 1457 OUTPUT:
1176 RETVAL 1458 RETVAL
1177 1459
1178SV * 1460SV *
1179get_text (CFPlus::Layout self) 1461get_text (DC::Layout self)
1180 CODE: 1462 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1463 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1464 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1465 OUTPUT:
1184 RETVAL 1466 RETVAL
1185 1467
1186void 1468void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1469set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1470 CODE:
1189 self->r = r; 1471 self->r = r;
1190 self->g = g; 1472 self->g = g;
1191 self->b = b; 1473 self->b = b;
1192 self->a = a; 1474 self->a = a;
1193 1475
1194void 1476void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1477set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1478 CODE:
1197 if (self->font != font) 1479 if (self->font != font)
1198 { 1480 {
1199 self->font = font; 1481 self->font = font;
1200 layout_update_font (self); 1482 layout_update_font (self);
1201 } 1483 }
1202 1484
1203void 1485void
1204set_height (CFPlus::Layout self, int base_height) 1486set_height (DC::Layout self, int base_height)
1205 CODE: 1487 CODE:
1206 if (self->base_height != base_height) 1488 if (self->base_height != base_height)
1207 { 1489 {
1208 self->base_height = base_height; 1490 self->base_height = base_height;
1209 layout_update_font (self); 1491 layout_update_font (self);
1210 } 1492 }
1211 1493
1212void 1494void
1213set_width (CFPlus::Layout self, int max_width = -1) 1495set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1496 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1497 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1498
1217void 1499void
1218set_indent (CFPlus::Layout self, int indent) 1500set_indent (DC::Layout self, int indent)
1219 CODE: 1501 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1502 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1503
1222void 1504void
1223set_spacing (CFPlus::Layout self, int spacing) 1505set_spacing (DC::Layout self, int spacing)
1224 CODE: 1506 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1507 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1508
1227void 1509void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1510set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1511 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1512 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1513 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1514 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1515 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1516 : PANGO_ELLIPSIZE_NONE
1235 ); 1517 );
1236 1518
1237void 1519void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1520set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1521 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1522 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1523
1242void 1524void
1243size (CFPlus::Layout self) 1525size (DC::Layout self)
1244 PPCODE: 1526 PPCODE:
1245{ 1527{
1246 int w, h; 1528 int w, h;
1247 1529
1248 layout_get_pixel_size (self, &w, &h); 1530 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1533 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1534 PUSHs (sv_2mortal (newSViv (h)));
1253} 1535}
1254 1536
1255int 1537int
1256descent (CFPlus::Layout self) 1538descent (DC::Layout self)
1257 CODE: 1539 CODE:
1258{ 1540{
1259 PangoRectangle rect; 1541 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1542 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1543 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1544 RETVAL = PANGO_DESCENT (rect);
1263} 1545}
1264 OUTPUT: 1546 OUTPUT:
1265 RETVAL 1547 RETVAL
1266 1548
1267int 1549int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1550xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1551 CODE:
1270{ 1552{
1271 int index, trailing; 1553 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1554 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1555 RETVAL = index + trailing;
1274} 1556}
1275 OUTPUT: 1557 OUTPUT:
1276 RETVAL 1558 RETVAL
1277 1559
1278void 1560void
1279cursor_pos (CFPlus::Layout self, int index) 1561cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1562 PPCODE:
1281{ 1563{
1282 PangoRectangle strong_pos; 1564 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1565 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1566
1285 EXTEND (SP, 3); 1567 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1568 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1569 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1570 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1571}
1290 1572
1291void 1573void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1574index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1575 PPCODE:
1294{ 1576{
1295 int line, x; 1577 int line, x;
1296 1578
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1579 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1580#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1581 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1582 --line;
1583#endif
1300 EXTEND (SP, 2); 1584 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1585 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1586 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1587}
1304 1588
1305void 1589void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1590line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1591 PPCODE:
1308{ 1592{
1309 PangoLayoutLine *lp; 1593 PangoLayoutLine *lp;
1310 int index, trailing; 1594 int index, trailing;
1311 1595
1312 if (line < 0) 1596 if (line < 0)
1313 XSRETURN_EMPTY; 1597 XSRETURN_EMPTY;
1314 1598
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1599 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1600 XSRETURN_EMPTY; /* do better */
1317 1601
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1602 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1603
1320 EXTEND (SP, 2); 1604 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1610 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1611 }
1328} 1612}
1329 1613
1330void 1614void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1615render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1616 CODE:
1333 rc_clear (self->rc); 1617 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1618 pango_opengl_render_layout_subpixel (
1335 self->pl, 1619 self->pl,
1336 self->rc, 1620 self->rc,
1341 // we assume that context_change actually clears/frees stuff 1625 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1626 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1627 pango_layout_context_changed (self->pl);
1344 1628
1345void 1629void
1346draw (CFPlus::Layout self) 1630draw (DC::Layout self)
1347 CODE: 1631 CODE:
1348{ 1632{
1349 glEnable (GL_TEXTURE_2D); 1633 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1634 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1635 glEnable (GL_BLEND);
1359 glDisable (GL_ALPHA_TEST); 1643 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1644 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1645 glDisable (GL_TEXTURE_2D);
1362} 1646}
1363 1647
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1648MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1649
1366PROTOTYPES: ENABLE 1650PROTOTYPES: ENABLE
1367 1651
1368void 1652void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1653pad (SV *data_, int ow, int oh, int nw, int nh)
1437 glDisable (GL_ALPHA_TEST); 1721 glDisable (GL_ALPHA_TEST);
1438 glDisable (GL_BLEND); 1722 glDisable (GL_BLEND);
1439 } 1723 }
1440} 1724}
1441 1725
1726void
1727draw_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)
1728 PROTOTYPE: @
1729 CODE:
1730{
1731 glEnable (GL_BLEND);
1732 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1733 glEnable (GL_TEXTURE_2D);
1734 glBindTexture (GL_TEXTURE_2D, name1);
1735
1736 glColor3f (intensity, intensity, intensity);
1737 glPushMatrix ();
1738 glScalef (1./3, 1./3, 1.);
1739
1740 if (blend > 0.f)
1741 {
1742 float dx3 = dx * -3.f / w;
1743 float dy3 = dy * -3.f / h;
1744 GLfloat env_color[4] = { 0., 0., 0., blend };
1745
1746 /* interpolate the two shadow textures */
1747 /* stage 0 == rgb(glcolor) + alpha(t0) */
1748 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1749
1750 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1751 gl.ActiveTexture (GL_TEXTURE1);
1752 glEnable (GL_TEXTURE_2D);
1753 glBindTexture (GL_TEXTURE_2D, name2);
1754 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1755
1756 /* rgb == rgb(glcolor) */
1757 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1760
1761 /* alpha = interpolate t0, t1 by env_alpha */
1762 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1763
1764 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1767
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1770
1771 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1772 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1773
1774 glBegin (GL_QUADS);
1775 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1776 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1777 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1778 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1779 glEnd ();
1780
1781 glDisable (GL_TEXTURE_2D);
1782 gl.ActiveTexture (GL_TEXTURE0);
1783 }
1784 else
1785 {
1786 /* simple blending of one texture, also opengl <1.3 path */
1787 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1788
1789 glBegin (GL_QUADS);
1790 glTexCoord2f (0, 0); glVertex2f (0, 0);
1791 glTexCoord2f (0, t); glVertex2f (0, h);
1792 glTexCoord2f (s, t); glVertex2f (w, h);
1793 glTexCoord2f (s, 0); glVertex2f (w, 0);
1794 glEnd ();
1795 }
1796
1797 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1798 {
1799 int x, y;
1800 int dx3 = dx * 3;
1801 int dy3 = dy * 3;
1802
1803 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1804 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1805 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1806 glTranslatef (-1., -1., 0);
1807 glBegin (GL_QUADS);
1808
1809 for (y = 1; y < h; y += 3)
1810 {
1811 int y1 = y - dy3;
1812 int y1valid = y1 >= 0 && y1 < h;
1813
1814 for (x = 1; x < w; x += 3)
1815 {
1816 int x1 = x - dx3;
1817 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1818 uint8_t h2;
1819
1820 if (y1valid && x1 >= 0 && x1 < w)
1821 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1822 else
1823 h2 = 1; /* out of range == invisible */
1824
1825 if (h1 || h2)
1826 {
1827 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1828 glColor4f (1., 1., 1., alpha);
1829
1830 glTexCoord2f (0, 0.); glVertex2i (x , y );
1831 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1832 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1833 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1834 }
1835 }
1836 }
1837 }
1838
1839 glEnd ();
1840
1841 glPopMatrix ();
1842
1843 glDisable (GL_TEXTURE_2D);
1844 glDisable (GL_BLEND);
1845}
1846
1442IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1847IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1443 CODE: 1848 CODE:
1444{ 1849{
1445 GLint width; 1850 GLint width;
1446 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1851 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1448 RETVAL = width > 0; 1853 RETVAL = width > 0;
1449} 1854}
1450 OUTPUT: 1855 OUTPUT:
1451 RETVAL 1856 RETVAL
1452 1857
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1858MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1859
1455PROTOTYPES: DISABLE 1860PROTOTYPES: DISABLE
1456 1861
1457CFPlus::Map 1862DC::Map
1458new (SV *class) 1863new (SV *class)
1459 CODE: 1864 CODE:
1460 New (0, RETVAL, 1, struct map); 1865 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1866 RETVAL->x = 0;
1462 RETVAL->y = 0; 1867 RETVAL->y = 0;
1470 RETVAL->row = 0; 1875 RETVAL->row = 0;
1471 OUTPUT: 1876 OUTPUT:
1472 RETVAL 1877 RETVAL
1473 1878
1474void 1879void
1475DESTROY (CFPlus::Map self) 1880DESTROY (DC::Map self)
1476 CODE: 1881 CODE:
1477{ 1882{
1478 map_clear (self); 1883 map_clear (self);
1479 Safefree (self->face2tile); 1884 Safefree (self->face2tile);
1480 Safefree (self->tex); 1885 Safefree (self->tex);
1481 Safefree (self); 1886 Safefree (self);
1482} 1887}
1483 1888
1484void 1889void
1485resize (CFPlus::Map self, int map_width, int map_height) 1890resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1891 CODE:
1487 self->w = map_width; 1892 self->w = map_width;
1488 self->h = map_height; 1893 self->h = map_height;
1489 1894
1490void 1895void
1491clear (CFPlus::Map self) 1896clear (DC::Map self)
1492 CODE: 1897 CODE:
1493 map_clear (self); 1898 map_clear (self);
1494 1899
1495void 1900void
1496set_tileid (CFPlus::Map self, int face, int tile) 1901set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1902 CODE:
1498{ 1903{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1904 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1905 need_texid (self, tile);
1501} 1906}
1502 1907
1503void 1908void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1909set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1910 CODE:
1506{ 1911{
1507 tileid texid; 1912 tileid texid;
1508 maptex *tex; 1913 maptex *tex;
1509 1914
1522 tex->smoothtile = self->face2tile [smooth]; 1927 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1928 tex->smoothlevel = level;
1524} 1929}
1525 1930
1526void 1931void
1527set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1932set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528 CODE: 1933 CODE:
1529{ 1934{
1530 need_texid (self, texid); 1935 need_texid (self, texid);
1531 1936
1532 { 1937 {
1551 // use uglier nearest interpolation because linear suffers 1956 // use uglier nearest interpolation because linear suffers
1552 // from transparent color bleeding and ugly wrapping effects. 1957 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1958 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1959}
1555 1960
1961void
1962expire_textures (DC::Map self, int texid, int count)
1963 PPCODE:
1964 for (; texid < self->texs && count; ++texid, --count)
1965 {
1966 maptex *tex = self->tex + texid;
1967
1968 if (tex->name)
1969 {
1970 if (tex->unused)
1971 {
1972 tex->name = 0;
1973 tex->unused = 0;
1974 XPUSHs (sv_2mortal (newSViv (texid)));
1975 }
1976 else
1977 tex->unused = 1;
1978 }
1979 }
1980
1556int 1981int
1557ox (CFPlus::Map self) 1982ox (DC::Map self)
1558 ALIAS: 1983 ALIAS:
1559 oy = 1 1984 oy = 1
1560 x = 2 1985 x = 2
1561 y = 3 1986 y = 3
1562 w = 4 1987 w = 4
1573 } 1998 }
1574 OUTPUT: 1999 OUTPUT:
1575 RETVAL 2000 RETVAL
1576 2001
1577void 2002void
1578scroll (CFPlus::Map self, int dx, int dy) 2003scroll (DC::Map self, int dx, int dy)
1579 CODE: 2004 CODE:
1580{ 2005{
1581 if (dx > 0) 2006 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 2007 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 2008 else if (dx < 0)
1599 self->y += MAP_EXTEND_Y; 2024 self->y += MAP_EXTEND_Y;
1600 } 2025 }
1601} 2026}
1602 2027
1603SV * 2028SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 2029map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 2030 CODE:
1606{ 2031{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2032 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 2033 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 2034 mapcell *cell;
1637 uint8_t ext, cmd; 2062 uint8_t ext, cmd;
1638 2063
1639 do 2064 do
1640 { 2065 {
1641 ext = *data++; 2066 ext = *data++;
1642 cmd = ext & 0x3f; 2067 cmd = ext & 0x7f;
1643 2068
1644 if (cmd < 4) 2069 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1; 2070 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1646 else if (cmd == 5) // health 2071 else if (cmd == 5) // health
1647 { 2072 {
1648 cell->stat_width = 1; 2073 cell->stat_width = 1;
1649 cell->stat_hp = *data++; 2074 cell->stat_hp = *data++;
1650 } 2075 }
1651 else if (cmd == 6) // monster width 2076 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1; 2077 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47) 2078 else if (cmd == 0x47)
1654 { 2079 {
1655 if (*data == 4) 2080 if (*data == 1) cell->player = data [1];
1656 ; // decode player count 2081 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2082 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2083 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1657 2084
1658 data += *data + 1; 2085 data += *data + 1;
1659 } 2086 }
1660 else if (cmd == 8) // cell flags 2087 else if (cmd == 8) // cell flags
1661 cell->flags = *data++; 2088 cell->flags = *data++;
1678 cell->tile [z] = self->face2tile [face]; 2105 cell->tile [z] = self->face2tile [face];
1679 2106
1680 if (cell->tile [z]) 2107 if (cell->tile [z])
1681 { 2108 {
1682 maptex *tex = self->tex + cell->tile [z]; 2109 maptex *tex = self->tex + cell->tile [z];
2110 tex->unused = 0;
1683 if (!tex->name) 2111 if (!tex->name)
1684 av_push (missing, newSViv (cell->tile [z])); 2112 av_push (missing, newSViv (cell->tile [z]));
1685 2113
1686 if (tex->smoothtile) 2114 if (tex->smoothtile)
1687 { 2115 {
1688 maptex *smooth = self->tex + tex->smoothtile; 2116 maptex *smooth = self->tex + tex->smoothtile;
2117 smooth->unused = 0;
1689 if (!smooth->name) 2118 if (!smooth->name)
1690 av_push (missing, newSViv (tex->smoothtile)); 2119 av_push (missing, newSViv (tex->smoothtile));
1691 } 2120 }
1692 } 2121 }
1693 } 2122 }
1694 } 2123 }
1695 else 2124 else
1696 cell->darkness = 0; 2125 CELL_CLEAR (cell);
1697 } 2126 }
1698} 2127}
1699 OUTPUT: 2128 OUTPUT:
1700 RETVAL 2129 RETVAL
1701 2130
1702SV * 2131SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2132mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 2133 CODE:
1705{ 2134{
1706 int x1, x; 2135 int x1, x;
1707 int y1, y; 2136 int y1, y;
1708 int z; 2137 int z;
1721 ? self->row + y 2150 ? self->row + y
1722 : 0; 2151 : 0;
1723 2152
1724 for (x = x0; x < x1; x++) 2153 for (x = x0; x < x1; x++)
1725 { 2154 {
1726 int r = 32, g = 32, b = 32, a = 192; 2155 unsigned int r = 32, g = 32, b = 32, a = 192;
1727 2156
1728 if (row && row->c0 <= x && x < row->c1) 2157 if (row && row->c0 <= x && x < row->c1)
1729 { 2158 {
1730 mapcell *cell = row->col + (x - row->c0); 2159 mapcell *cell = row->col + (x - row->c0);
1731 2160
1733 { 2162 {
1734 maptex tex = self->tex [cell->tile [z]]; 2163 maptex tex = self->tex [cell->tile [z]];
1735 int a0 = 255 - tex.a; 2164 int a0 = 255 - tex.a;
1736 int a1 = tex.a; 2165 int a1 = tex.a;
1737 2166
1738 r = (r * a0 + tex.r * a1) / 255; 2167 r = div255 (r * a0 + tex.r * a1);
1739 g = (g * a0 + tex.g * a1) / 255; 2168 g = div255 (g * a0 + tex.g * a1);
1740 b = (b * a0 + tex.b * a1) / 255; 2169 b = div255 (b * a0 + tex.b * a1);
1741 a = (a * a0 + tex.a * a1) / 255; 2170 a = div255 (a * a0 + tex.a * a1);
1742 } 2171 }
1743 } 2172 }
1744 2173
1745 *map++ = (r ) 2174 *map++ = (r )
1746 | (g << 8) 2175 | (g << 8)
1753} 2182}
1754 OUTPUT: 2183 OUTPUT:
1755 RETVAL 2184 RETVAL
1756 2185
1757void 2186void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2187draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1759 CODE: 2188 CODE:
1760{ 2189{
1761 int x, y, z; 2190 int x, y, z;
1762 2191
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2192 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2193 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1765 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2194 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766 smooth_key skey; 2195 smooth_key skey;
1767 2196 int pl_x, pl_y;
2197 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 2198 rc_t *rc = rc_alloc ();
2199 rc_t *rc_ov = rc_alloc ();
1769 rc_key_t key; 2200 rc_key_t key;
1770 rc_array_t *arr; 2201 rc_array_t *arr;
1771 2202
2203 pl_tex.name = 0;
2204
1772 // thats current max. sorry. 2205 // that's current max. sorry.
1773 if (sw > 255) sw = 255; 2206 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 2207 if (sh > 255) sh = 255;
1775 2208
1776 // clear key, in case of extra padding 2209 // clear key, in case of extra padding
1777 memset (&skey, 0, sizeof (skey)); 2210 memset (&skey, 0, sizeof (skey));
1781 key.g = 255; 2214 key.g = 255;
1782 key.b = 255; 2215 key.b = 255;
1783 key.a = 255; 2216 key.a = 255;
1784 key.mode = GL_QUADS; 2217 key.mode = GL_QUADS;
1785 key.format = GL_T2F_V3F; 2218 key.format = GL_T2F_V3F;
1786 key.texname = -1;
1787 2219
1788 mx += self->x; 2220 mx += self->x;
1789 my += self->y; 2221 my += self->y;
1790 2222
1791 // first pass: determine smooth_max 2223 // first pass: determine smooth_max
1815 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2247 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1816 2248
1817 for (z = 0; z <= 2; z++) 2249 for (z = 0; z <= 2; z++)
1818 { 2250 {
1819 memset (smooth_level, 0, sizeof (smooth_level)); 2251 memset (smooth_level, 0, sizeof (smooth_level));
2252 key.texname = -1;
1820 2253
1821 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
1822 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
1823 { 2256 {
1824 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
1834 maptex tex = self->tex [tile]; 2267 maptex tex = self->tex [tile];
1835 int px, py; 2268 int px, py;
1836 2269
1837 if (key.texname != tex.name) 2270 if (key.texname != tex.name)
1838 { 2271 {
2272 self->tex [tile].unused = 0;
2273
1839 if (!tex.name) 2274 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 2275 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1841 2276
1842 key.texname = tex.name; 2277 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 2278 arr = rc_array (rc, &key);
1844 } 2279 }
1845 2280
1846 px = (x + 1) * T - tex.w; 2281 px = (x + 1) * Th - tex.w;
1847 py = (y + 1) * T - tex.h; 2282 py = (y + 1) * Tw - tex.h;
2283
2284 if (expect_false (cell->player == player) && expect_false (z == 2))
2285 {
2286 pl_x = px;
2287 pl_y = py;
2288 pl_tex = tex;
2289 continue;
2290 }
1848 2291
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2292 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2293 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1851 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2294 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1852 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2295 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853
1854 if (cell->flags && z == 2)
1855 {
1856 // overlays such as the speech bubble, probably more to come
1857 if (cell->flags & 1)
1858 {
1859 maptex tex = self->tex [1];
1860 int px = x * T + T * 2 / 32;
1861 int py = y * T - T * 6 / 32;
1862
1863 if (tex.name)
1864 {
1865 if (key.texname != tex.name)
1866 {
1867 key.texname = tex.name;
1868 arr = rc_array (rc, &key);
1869 }
1870
1871 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1872 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1873 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1874 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1875 }
1876 }
1877 }
1878 2296
1879 // update smooth hash 2297 // update smooth hash
1880 if (tex.smoothtile) 2298 if (tex.smoothtile)
1881 { 2299 {
1882 skey.tile = tex.smoothtile; 2300 skey.tile = tex.smoothtile;
1911 // corners 2329 // corners
1912 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2330 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1913 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2331 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1914 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2332 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1915 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2333 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2334 }
2335 }
2336
2337 if (expect_false (z == 2) && expect_false (cell->flags))
2338 {
2339 // overlays such as the speech bubble, probably more to come
2340 if (cell->flags & 1)
2341 {
2342 rc_key_t key_ov = key;
2343 maptex tex = self->tex [TEXID_SPEECH];
2344 rc_array_t *arr;
2345 int px = x * Tw + Tw * 2 / 32;
2346 int py = y * Th - Th * 6 / 32;
2347
2348 key_ov.texname = tex.name;
2349 arr = rc_array (rc_ov, &key_ov);
2350
2351 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2352 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2353 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2354 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1916 } 2355 }
1917 } 2356 }
1918 } 2357 }
1919 } 2358 }
1920 2359
1947 if (!(bits & 0x1000) 2386 if (!(bits & 0x1000)
1948 && skey->level == level 2387 && skey->level == level
1949 && level > smooth_max [skey->x][skey->y]) 2388 && level > smooth_max [skey->x][skey->y])
1950 { 2389 {
1951 maptex tex = self->tex [skey->tile]; 2390 maptex tex = self->tex [skey->tile];
1952 int px = (((int)skey->x) - 1) * T; 2391 int px = (((int)skey->x) - 1) * Tw;
1953 int py = (((int)skey->y) - 1) * T; 2392 int py = (((int)skey->y) - 1) * Th;
1954 int border = bits & 15; 2393 int border = bits & 15;
1955 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1956 float dx = tex.s * .0625f; // 16 images/row 2395 float dx = tex.s * .0625f; // 16 images/row
1957 float dy = tex.t * .5f ; // 2 images/column 2396 float dy = tex.t * .5f ; // 2 images/column
1958 2397
1960 { 2399 {
1961 // this time avoiding texture state changes 2400 // this time avoiding texture state changes
1962 // save gobs of state changes. 2401 // save gobs of state changes.
1963 if (key.texname != tex.name) 2402 if (key.texname != tex.name)
1964 { 2403 {
2404 self->tex [skey->tile].unused = 0;
2405
1965 glEnd (); 2406 glEnd ();
1966 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1967 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
1968 } 2409 }
1969 2410
1970 if (border) 2411 if (border)
1971 { 2412 {
1972 float ox = border * dx; 2413 float ox = border * dx;
1973 2414
1974 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1975 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1976 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1977 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1978 } 2419 }
1979 2420
1980 if (corner) 2421 if (corner)
1981 { 2422 {
1982 float ox = corner * dx; 2423 float ox = corner * dx;
1983 2424
1984 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1985 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1986 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1987 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1988 } 2429 }
1989 } 2430 }
1990 } 2431 }
1991 } 2432 }
1992 } 2433 }
1998 } 2439 }
1999 2440
2000 hv_clear (smooth); 2441 hv_clear (smooth);
2001 } 2442 }
2002 2443
2444 if (pl_tex.name)
2445 {
2446 maptex tex = pl_tex;
2447 int px = pl_x + sdx;
2448 int py = pl_y + sdy;
2449
2450 key.texname = tex.name;
2451 arr = rc_array (rc, &key);
2452
2453 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2454 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2455 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2456 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2457
2458 rc_draw (rc);
2459 }
2460
2461 rc_draw (rc_ov);
2462 rc_clear (rc_ov);
2463
2003 glDisable (GL_BLEND); 2464 glDisable (GL_BLEND);
2004 rc_free (rc); 2465 rc_free (rc);
2466 rc_free (rc_ov);
2005 2467
2006 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2008 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2009 { 2471 {
2012 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2013 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2014 { 2476 {
2015 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2016 2478
2017 int px = x * T; 2479 int px = x * Tw;
2018 int py = y * T; 2480 int py = y * Th;
2481
2482 if (expect_false (cell->player == player))
2483 {
2484 px += sdx;
2485 py += sdy;
2486 }
2019 2487
2020 if (cell->stat_hp) 2488 if (cell->stat_hp)
2021 { 2489 {
2022 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2023 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2024 2492
2025 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2026 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2027 px + width - 1, py); 2495 px + width - 1, py);
2028 2496
2034 } 2502 }
2035 } 2503 }
2036} 2504}
2037 2505
2038void 2506void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2040 CODE: 2508 CODE:
2041{ 2509{
2042 static float color[16][3] = { 2510 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2044 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2045 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2046 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2047 2515
2048 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2049 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2050 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2051 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2052 2520
2053 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2054 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2055 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2056 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2057 2525
2058 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2059 2527
2060 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2061 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2062 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2063 }; 2531 };
2064 2532
2065 int x, y; 2533 int x, y;
2066 2534
2067 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2068 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2069 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2070 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2071 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2072 2546
2073 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2077 2551
2078 if (m) 2552 if (m)
2079 { 2553 {
2080 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2081 2555
2082 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2083 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2084 2558
2085 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2086 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2087 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2088 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2089 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2090 } 2564 }
2094 glDisable (GL_BLEND); 2568 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2569 glDisable (GL_TEXTURE_2D);
2096} 2570}
2097 2571
2098void 2572void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2574 PPCODE:
2101{ 2575{
2102 int x, y; 2576 int x, y;
2103 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2105 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2106 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2107 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2108 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2109 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2110 2585
2111 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2113 2588
2114 mx += self->x - 1; 2589 mx += self->x - 1;
2115 my += self->y - 1; 2590 my += self->y - 1;
2116
2117 memset (darkness1, 255, sw1 * sh1);
2118 2591
2119 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2121 { 2594 {
2122 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2599 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2128 2601
2129 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2130 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2131 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2132 } 2605 }
2133 } 2606 }
2134 2607
2135 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2136 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2155 2628
2156 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2157 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2158 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2159 2632
2160 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2161 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2162 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2163 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2164 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2165 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2166 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2167 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2168 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2169 } 2642 }
2170 2643
2171 free (darkness1); 2644 free (darkness1);
2172 2645
2173 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2174 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2177} 2650}
2178 2651
2179SV * 2652SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2653get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2654 CODE:
2182{ 2655{
2183 int x, y, x1, y1; 2656 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2657 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2658 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2242 else 2715 else
2243 *data++ = 0; 2716 *data++ = 0;
2244 } 2717 }
2245 } 2718 }
2246 2719
2720 /* if size is w*h + 5 then no data has been found */
2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2722 {
2247 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2725 }
2726
2249 RETVAL = data_sv; 2727 RETVAL = data_sv;
2250} 2728}
2251 OUTPUT: 2729 OUTPUT:
2252 RETVAL 2730 RETVAL
2253 2731
2254void 2732void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2733set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2734 PPCODE:
2257{ 2735{
2258 int x, y, z; 2736 int x, y, z;
2259 int w, h; 2737 int w, h;
2260 int x1, y1; 2738 int x1, y1;
2739 STRLEN len;
2740 uint8_t *data, *end;
2741
2742 len = SvLEN (data_sv);
2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2744 data = SvPVbyte_nolen (data_sv);
2745 end = data + len + 8;
2746
2747 if (len < 5)
2748 XSRETURN_EMPTY;
2261 2749
2262 if (*data++ != 0) 2750 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2751 XSRETURN_EMPTY; /* version mismatch */
2264 2752
2265 w = *data++ << 8; w |= *data++; 2753 w = *data++ << 8; w |= *data++;
2280 { 2768 {
2281 maprow *row = map_get_row (self, y); 2769 maprow *row = map_get_row (self, y);
2282 2770
2283 for (x = x0; x < x1; x++) 2771 for (x = x0; x < x1; x++)
2284 { 2772 {
2773 uint8_t flags;
2774
2775 if (data + 7 >= end)
2776 XSRETURN_EMPTY;
2777
2285 uint8_t flags = *data++; 2778 flags = *data++;
2286 2779
2287 if (flags) 2780 if (flags)
2288 { 2781 {
2289 mapcell *cell = row_get_cell (row, x); 2782 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2783 tileid tile[3] = { 0, 0, 0 };
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2786 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2787 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2788
2296 if (cell->darkness == 0) 2789 if (cell->darkness == 0)
2297 { 2790 {
2298 cell->darkness = 0; 2791 /*cell->darkness = 0;*/
2792 EXTEND (SP, 3);
2299 2793
2300 for (z = 0; z <= 2; z++) 2794 for (z = 0; z <= 2; z++)
2301 { 2795 {
2302 tileid t = tile [z]; 2796 tileid t = tile [z];
2303 2797
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2798 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2799 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2800 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2801 need_texid (self, t);
2308 } 2802 }
2309 2803
2310 cell->tile [z] = t; 2804 cell->tile [z] = t;
2311 } 2805 }
2313 } 2807 }
2314 } 2808 }
2315 } 2809 }
2316} 2810}
2317 2811
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2813
2320CFPlus::RW 2814DC::RW
2321new (SV *class, SV *data_sv) 2815new (SV *class, SV *data_sv)
2322 CODE: 2816 CODE:
2323{ 2817{
2324 STRLEN datalen; 2818 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2821 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2822}
2329 OUTPUT: 2823 OUTPUT:
2330 RETVAL 2824 RETVAL
2331 2825
2332CFPlus::RW 2826DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2828 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2830 OUTPUT:
2337 RETVAL 2831 RETVAL
2338 2832
2339# fails on win32: 2833# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2834# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2835#void
2342#close (CFPlus::RW self) 2836#close (DC::RW self)
2343# CODE: 2837# CODE:
2344# (self->(close)) (self); 2838# (self->(close)) (self);
2345 2839
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2840MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2841
2348PROTOTYPES: DISABLE 2842PROTOTYPES: DISABLE
2349 2843
2350CFPlus::Channel 2844DC::Channel
2351find () 2845find ()
2352 CODE: 2846 CODE:
2353{ 2847{
2354 RETVAL = Mix_GroupAvailable (-1); 2848 RETVAL = Mix_GroupAvailable (-1);
2355 2849
2356 if (RETVAL < 0) 2850 if (RETVAL < 0)
2357 { 2851 {
2358 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2359 2853
2360 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2361 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2362 2861 }
2862 else
2363 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2364 } 2864 }
2365 2865
2366 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2367 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2368} 2868}
2369 OUTPUT: 2869 OUTPUT:
2370 RETVAL 2870 RETVAL
2371 2871
2372void 2872void
2373halt (CFPlus::Channel self) 2873halt (DC::Channel self)
2374 CODE: 2874 CODE:
2375 Mix_HaltChannel (self); 2875 Mix_HaltChannel (self);
2376 2876
2377void 2877void
2378expire (CFPlus::Channel self, int ticks = -1) 2878expire (DC::Channel self, int ticks = -1)
2379 CODE: 2879 CODE:
2380 Mix_ExpireChannel (self, ticks); 2880 Mix_ExpireChannel (self, ticks);
2381 2881
2382void 2882void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2883fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2884 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2885 Mix_FadeOutChannel (self, ticks);
2386 2886
2387int 2887int
2388volume (CFPlus::Channel self, int volume) 2888volume (DC::Channel self, int volume)
2389 CODE: 2889 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2890 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2891 OUTPUT:
2392 RETVAL 2892 RETVAL
2393 2893
2394void 2894void
2395unregister_all_effects (CFPlus::Channel self) 2895unregister_all_effects (DC::Channel self)
2396 CODE: 2896 CODE:
2397 Mix_UnregisterAllEffects (self); 2897 Mix_UnregisterAllEffects (self);
2398 2898
2399void 2899void
2400set_panning (CFPlus::Channel self, int left, int right) 2900set_panning (DC::Channel self, int left, int right)
2401 CODE: 2901 CODE:
2402 left = CLAMP (left , 0, 255); 2902 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2903 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2904 Mix_SetPanning (self, left, right);
2405 2905
2406void 2906void
2407set_distance (CFPlus::Channel self, int distance) 2907set_distance (DC::Channel self, int distance)
2408 CODE: 2908 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2909 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2910
2411void 2911void
2412set_position (CFPlus::Channel self, int angle, int distance) 2912set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2913 CODE:
2414 2914
2415void 2915void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2917 CODE:
2418{ 2918{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2922}
2423 2923
2424void 2924void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2926 CODE:
2427 Mix_SetReverseStereo (self, flip); 2927 Mix_SetReverseStereo (self, flip);
2428 2928
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2930
2431PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2432 2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2944
2433CFPlus::MixChunk 2945DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2946new (SV *class, DC::RW rwops)
2435 CODE: 2947 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2949 OUTPUT:
2438 RETVAL 2950 RETVAL
2439 2951
2440void 2952void
2441DESTROY (CFPlus::MixChunk self) 2953DESTROY (DC::MixChunk self)
2442 CODE: 2954 CODE:
2443 Mix_FreeChunk (self); 2955 Mix_FreeChunk (self);
2444 2956
2445int 2957int
2446volume (CFPlus::MixChunk self, int volume = -1) 2958volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2959 CODE:
2448 if (items > 1) 2960 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2961 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2962 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2963 OUTPUT:
2452 RETVAL 2964 RETVAL
2453 2965
2454CFPlus::Channel 2966DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2967play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2968 CODE:
2457{ 2969{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2970 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2971
2460 if (RETVAL < 0) 2972 if (RETVAL < 0)
2467 } 2979 }
2468} 2980}
2469 OUTPUT: 2981 OUTPUT:
2470 RETVAL 2982 RETVAL
2471 2983
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2473 2997
2474int 2998int
2475volume (int volume = -1) 2999volume (int volume = -1)
2476 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2477 CODE: 3001 CODE:
2489void 3013void
2490halt () 3014halt ()
2491 CODE: 3015 CODE:
2492 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2493 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2494CFPlus::MixMusic 3025DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 3026new (SV *class, DC::RW rwops)
2496 CODE: 3027 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 3029 OUTPUT:
2499 RETVAL 3030 RETVAL
2500 3031
2501void 3032void
2502DESTROY (CFPlus::MixMusic self) 3033DESTROY (DC::MixMusic self)
2503 CODE: 3034 CODE:
2504 Mix_FreeMusic (self); 3035 Mix_FreeMusic (self);
2505 3036
2506int 3037int
2507play (CFPlus::MixMusic self, int loops = -1) 3038play (DC::MixMusic self, int loops = -1)
2508 CODE: 3039 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 3040 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 3041 OUTPUT:
2511 RETVAL 3042 RETVAL
2512 3043
2513void 3044void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3045fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 3046 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 3047 Mix_FadeInMusicPos (self, loops, ms, position);
2517 3048
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3049MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 3050
2520PROTOTYPES: ENABLE 3051PROTOTYPES: ENABLE
2521 3052
2522BOOT: 3053BOOT:
2523{ 3054{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3055 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 3056 static const struct {
2526 const char *name; 3057 const char *name;
2527 IV iv; 3058 IV iv;
2528 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2530 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2531 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2532 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2533 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2534 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2535 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2536 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2537 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2549 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2550 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2551 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2552 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2553 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2554 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2555 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2556 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2557 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2558 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2626 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2627 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2628 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2629 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2630 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2631# undef const_iv 3170# undef const_iv
2632 }; 3171 };
2633 3172
2634 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2635 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2636 3175
2637 texture_av = newAV (); 3176 texture_av = newAV ();
2638 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2639} 3178}
2640 3179
2641void 3180void
2642disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2643 CODE: 3182 CODE:
2644 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2645 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
3185
3186void
3187apple_nvidia_bug (int enable)
2646 3188
2647char * 3189char *
2648gl_vendor () 3190gl_vendor ()
2649 CODE: 3191 CODE:
2650 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (char *)glGetString (GL_VENDOR);
2681 3223
2682int glGetError () 3224int glGetError ()
2683 3225
2684void glFinish () 3226void glFinish ()
2685 3227
3228void glFlush ()
3229
2686void glClear (int mask) 3230void glClear (int mask)
2687 3231
2688void glClearColor (float r, float g, float b, float a = 1.0) 3232void glClearColor (float r, float g, float b, float a = 1.0)
2689 PROTOTYPE: @ 3233 PROTOTYPE: @
2690 3234
2699void glBlendFunc (int sfactor, int dfactor) 3243void glBlendFunc (int sfactor, int dfactor)
2700 3244
2701void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3245void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2702 CODE: 3246 CODE:
2703 gl_BlendFuncSeparate (sa, da, saa, daa); 3247 gl_BlendFuncSeparate (sa, da, saa, daa);
3248
3249# void glBlendEquation (int se)
2704 3250
2705void glDepthMask (int flag) 3251void glDepthMask (int flag)
2706 3252
2707void glLogicOp (int opcode) 3253void glLogicOp (int opcode)
2708 3254
2743void glRotate (float angle, float x, float y, float z) 3289void glRotate (float angle, float x, float y, float z)
2744 CODE: 3290 CODE:
2745 glRotatef (angle, x, y, z); 3291 glRotatef (angle, x, y, z);
2746 3292
2747void glColor (float r, float g, float b, float a = 1.0) 3293void glColor (float r, float g, float b, float a = 1.0)
3294 PROTOTYPE: @
2748 ALIAS: 3295 ALIAS:
2749 glColor_premultiply = 1 3296 glColor_premultiply = 1
2750 CODE: 3297 CODE:
2751 if (ix) 3298 if (ix)
2752 { 3299 {
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3369void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 3370 CODE:
2824 if (gl.SeparableFilter2D) 3371 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3372 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 3373
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3374void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 3375
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3376void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 3377
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 3378void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 3379
2858 3405
2859void glEndList () 3406void glEndList ()
2860 3407
2861void glCallList (int list) 3408void glCallList (int list)
2862 3409
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3410void c_init ()
3411 CODE:
3412 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3413 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3414
3415MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3416
2865PROTOTYPES: DISABLE 3417PROTOTYPES: DISABLE
2866 3418
2867void 3419void
2868find_widget (SV *self, NV x, NV y) 3420find_widget (SV *self, NV x, NV y)
2872 XPUSHs (self); 3424 XPUSHs (self);
2873} 3425}
2874 3426
2875BOOT: 3427BOOT:
2876{ 3428{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3429 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3430
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3431 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3432 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3433 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3434 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3435}
2884 3436
2885void 3437void
2886draw (SV *self) 3438draw (SV *self)
2887 CODE: 3439 CODE:
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3446 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3447 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3448 double draw_x, draw_y;
2897 3449
2898 if (!SvROK (self)) 3450 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3451 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3452
2901 hv = (HV *)SvRV (self); 3453 hv = (HV *)SvRV (self);
2902 3454
2903 if (SvTYPE (hv) != SVt_PVHV) 3455 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3456 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3457
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3458 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3459 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3460
2909 if (!h || !w) 3461 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines