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.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.315 by root, Wed Jan 18 23:34:44 2012 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 (SV *real_main)
583{
584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
588}
589
590#ifdef __MACOSX__
591 static SV *real_main;
592
593 /* to due surprising braindamage on the side of SDL design, we
594 * do some mind-boggling hack here: SDL requires a custom main()
595 * on OS X, so... we provide one and call the original main(), which,
596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
597 * and which calls our main (== SDL_main) back.
598 */
599 extern C_LINKAGE int
600 main (int argc, char *argv[])
601 {
602 deliantra_main (real_main);
603 }
604
605 #undef main
606
607 extern C_LINKAGE int main (int argc, char *argv[]);
608
609 static void
610 SDL_main_hack (SV *real_main_)
611 {
612 real_main = real_main_;
613
614 char *argv[] = { "deliantra client", 0 };
615 (main) (1, argv);
616 }
617#else
618 static void
619 SDL_main_hack (SV *real_main)
620 {
621 deliantra_main (real_main);
622 }
623#endif
624
625MODULE = Deliantra::Client PACKAGE = DC
504 626
505PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
506 628
507BOOT: 629BOOT:
508{ 630{
509 HV *stash = gv_stashpv ("CFPlus", 1); 631 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 632 static const struct {
511 const char *name; 633 const char *name;
512 IV iv; 634 IV iv;
513 } *civ, const_iv[] = { 635 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 636# define const_iv(name) { # name, (IV)name }
535 const_iv (SDL_USEREVENT), 657 const_iv (SDL_USEREVENT),
536 658
537 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
540 712
541 const_iv (SDLK_FIRST), 713 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 714 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
624 796
797 const_iv (KMOD_LRAM),
798
625 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
800
801 const_iv (SDL_INIT_TIMER),
802 const_iv (SDL_INIT_AUDIO),
803 const_iv (SDL_INIT_VIDEO),
804 const_iv (SDL_INIT_CDROM),
805 const_iv (SDL_INIT_JOYSTICK),
806 const_iv (SDL_INIT_EVERYTHING),
807 const_iv (SDL_INIT_NOPARACHUTE),
808 const_iv (SDL_INIT_EVENTTHREAD),
809
810 const_iv (SDL_GL_RED_SIZE),
811 const_iv (SDL_GL_GREEN_SIZE),
812 const_iv (SDL_GL_BLUE_SIZE),
813 const_iv (SDL_GL_ALPHA_SIZE),
814 const_iv (SDL_GL_DOUBLEBUFFER),
815 const_iv (SDL_GL_BUFFER_SIZE),
816 const_iv (SDL_GL_DEPTH_SIZE),
817 const_iv (SDL_GL_STENCIL_SIZE),
818 const_iv (SDL_GL_ACCUM_RED_SIZE),
819 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
820 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
821 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
822 const_iv (SDL_GL_STEREO),
823 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
824 const_iv (SDL_GL_MULTISAMPLESAMPLES),
825 const_iv (SDL_GL_ACCELERATED_VISUAL),
826 const_iv (SDL_GL_SWAP_CONTROL),
827
828 const_iv (FOW_DARKNESS)
626# undef const_iv 829# undef const_iv
627 }; 830 };
628 831
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 834
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 837}
635 838
652 855
653IV minpot (UV n) 856IV minpot (UV n)
654 857
655IV popcount (UV n) 858IV popcount (UV n)
656 859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
865
657void 866void
658pango_init () 867pango_init ()
659 CODE: 868 CODE:
660{ 869{
661 opengl_fontmap = pango_opengl_font_map_new (); 870 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 871 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); 872 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
873 /*pango_context_set_font_description (opengl_context, default_font);*/
874#if PANGO_VERSION_CHECK (1, 15, 2)
875 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
876 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
877#endif
664} 878}
665 879
666char *
667SDL_GetError () 880char *SDL_GetError ()
668 881
669int 882void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
671 884
672void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
673SDL_Quit () 891void SDL_Quit ()
892
893int SDL_GL_SetAttribute (int attr, int value)
894
895int SDL_GL_GetAttribute (int attr)
896 CODE:
897 if (SDL_GL_GetAttribute (attr, &RETVAL))
898 XSRETURN_UNDEF;
899 OUTPUT:
900 RETVAL
674 901
675void 902void
676SDL_ListModes (int rgb, int alpha) 903SDL_ListModes (int rgb, int alpha)
677 PPCODE: 904 PPCODE:
678{ 905{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 917 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 920
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 921 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); 922 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 923
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 924 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 925
702 if (m && m != (SDL_Rect **)-1) 926 if (m && m != (SDL_Rect **)-1)
703 while (*m) 927 while (*m)
704 { 928 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 929 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 930 {
707 AV *av = newAV (); 931 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 932 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 933 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 934 av_push (av, newSViv (rgb));
733 ); 957 );
734 958
735 if (RETVAL) 959 if (RETVAL)
736 { 960 {
737 av_clear (texture_av); 961 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 963#include "glfunc.h"
742#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 967 }
744} 968}
745 OUTPUT: 969 OUTPUT:
746 RETVAL 970 RETVAL
747 971
748void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
749SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
750 977
751char * 978char *
752SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
753 980
754int 981int
755SDL_GetAppState () 982SDL_GetAppState ()
756 983
984int
985SDL_GetModState ()
986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
757void 991void
992SDL_PumpEvents ()
993
994void
758poll_events () 995peep_events ()
759 PPCODE: 996 PPCODE:
760{ 997{
761 SDL_Event ev; 998 SDL_Event ev;
762 999
763 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
770 { 1007 {
771 case SDL_KEYDOWN: 1008 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1009 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1011 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1012 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 */ 1013 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); 1014 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1015 break;
779 1016
780 case SDL_ACTIVEEVENT: 1017 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1018 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 1036 x = ev.motion.x;
800 y = ev.motion.y; 1037 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1038 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1039 }
803 1040
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1041 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1042 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1043 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1044 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1045 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1046 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1047 }
811 break; 1048 break;
812 1049
813 case SDL_MOUSEBUTTONDOWN: 1050 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1051 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1052 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1053
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1054 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1055 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1056 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1057 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1062 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1063 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1064 break;
828 } 1065 }
829 1066
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1067 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1068 }
832} 1069}
1070
1071char *
1072SDL_AudioDriverName ()
1073 CODE:
1074{
1075 char buf [256];
1076 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1077 XSRETURN_UNDEF;
1078
1079 RETVAL = buf;
1080}
1081 OUTPUT:
1082 RETVAL
833 1083
834int 1084int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1085Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1086 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
894 } 1144 }
895 } 1145 }
896#endif 1146#endif
897} 1147}
898 1148
899void 1149int
900add_font (char *file) 1150add_font (char *file)
901 CODE: 1151 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1153 OUTPUT:
1154 RETVAL
1155
1156void
1157IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1158
1159# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1160void
1161Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
903 1162
904void 1163void
905load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
906 ALIAS: 1165 ALIAS:
907 load_image_file = 1 1166 load_image_file = 1
993void 1252void
994error (char *message) 1253error (char *message)
995 CODE: 1254 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1255 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1256#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1257 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1258#endif
1000 1259
1001void 1260void
1002fatal (char *message) 1261fatal (char *message)
1003 CODE: 1262 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1263 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1264#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1265 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1266#endif
1008 _exit (1); 1267 _exit (1);
1009 1268
1010void 1269void
1011_exit (int retval = 0) 1270_exit (int retval = 0)
1023#if DEBUG 1282#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1283 VALGRIND_DO_LEAK_CHECK;
1025#endif 1284#endif
1026} 1285}
1027 1286
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1287int
1288SvREFCNT (SV *sv)
1289 CODE:
1290 RETVAL = SvREFCNT (sv);
1291 OUTPUT:
1292 RETVAL
1293
1294MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1295
1030PROTOTYPES: DISABLE 1296PROTOTYPES: DISABLE
1031 1297
1032CFPlus::Font 1298DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1299new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1300 CODE:
1035{ 1301{
1036 int count; 1302 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1303 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1306}
1041 OUTPUT: 1307 OUTPUT:
1042 RETVAL 1308 RETVAL
1043 1309
1044void 1310void
1045DESTROY (CFPlus::Font self) 1311DESTROY (DC::Font self)
1046 CODE: 1312 CODE:
1047 pango_font_description_free (self); 1313 pango_font_description_free (self);
1048 1314
1049void 1315void
1050make_default (CFPlus::Font self) 1316make_default (DC::Font self)
1051 PROTOTYPE: $ 1317 PROTOTYPE: $
1052 CODE: 1318 CODE:
1053 default_font = self; 1319 default_font = self;
1054 1320
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1321MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1322
1057PROTOTYPES: DISABLE 1323PROTOTYPES: DISABLE
1058 1324
1059void 1325void
1060glyph_cache_backup () 1326glyph_cache_backup ()
1066glyph_cache_restore () 1332glyph_cache_restore ()
1067 PROTOTYPE: 1333 PROTOTYPE:
1068 CODE: 1334 CODE:
1069 tc_restore (); 1335 tc_restore ();
1070 1336
1071CFPlus::Layout 1337DC::Layout
1072new (SV *class) 1338new (SV *class)
1073 CODE: 1339 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1340 New (0, RETVAL, 1, struct cf_layout);
1075 1341
1076 RETVAL->pl = pango_layout_new (opengl_context); 1342 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1352 layout_update_font (RETVAL);
1087 OUTPUT: 1353 OUTPUT:
1088 RETVAL 1354 RETVAL
1089 1355
1090void 1356void
1091DESTROY (CFPlus::Layout self) 1357DESTROY (DC::Layout self)
1092 CODE: 1358 CODE:
1093 g_object_unref (self->pl); 1359 g_object_unref (self->pl);
1094 rc_free (self->rc); 1360 rc_free (self->rc);
1095 Safefree (self); 1361 Safefree (self);
1096 1362
1097void 1363void
1098set_text (CFPlus::Layout self, SV *text_) 1364set_text (DC::Layout self, SV *text_)
1099 CODE: 1365 CODE:
1100{ 1366{
1101 STRLEN textlen; 1367 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1368 char *text = SvPVutf8 (text_, textlen);
1103 1369
1104 pango_layout_set_text (self->pl, text, textlen); 1370 pango_layout_set_text (self->pl, text, textlen);
1105} 1371}
1106 1372
1107void 1373void
1108set_markup (CFPlus::Layout self, SV *text_) 1374set_markup (DC::Layout self, SV *text_)
1109 CODE: 1375 CODE:
1110{ 1376{
1111 STRLEN textlen; 1377 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1378 char *text = SvPVutf8 (text_, textlen);
1113 1379
1114 pango_layout_set_markup (self->pl, text, textlen); 1380 pango_layout_set_markup (self->pl, text, textlen);
1115} 1381}
1116 1382
1117void 1383void
1118set_shapes (CFPlus::Layout self, ...) 1384set_shapes (DC::Layout self, ...)
1119 CODE: 1385 CODE:
1120{ 1386{
1121 PangoAttrList *attrs = 0; 1387 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1389 const char *pos = text;
1158 if (attrs) 1424 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1425 pango_layout_set_attributes (self->pl, attrs);
1160} 1426}
1161 1427
1162void 1428void
1163get_shapes (CFPlus::Layout self) 1429get_shapes (DC::Layout self)
1164 PPCODE: 1430 PPCODE:
1165{ 1431{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1432 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1433
1168 do 1434 do
1169 { 1435 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1436 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1437
1172 if (run && shape_attr_p (run)) 1438 if (run && shape_attr_p (run))
1173 { 1439 {
1174 PangoRectangle extents; 1440 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1441 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1449
1184 pango_layout_iter_free (iter); 1450 pango_layout_iter_free (iter);
1185} 1451}
1186 1452
1187int 1453int
1188has_wrapped (CFPlus::Layout self) 1454has_wrapped (DC::Layout self)
1189 CODE: 1455 CODE:
1190{ 1456{
1191 int lines = 1; 1457 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1458 const char *text = pango_layout_get_text (self->pl);
1193 1459
1198} 1464}
1199 OUTPUT: 1465 OUTPUT:
1200 RETVAL 1466 RETVAL
1201 1467
1202SV * 1468SV *
1203get_text (CFPlus::Layout self) 1469get_text (DC::Layout self)
1204 CODE: 1470 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1471 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1472 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1473 OUTPUT:
1208 RETVAL 1474 RETVAL
1209 1475
1210void 1476void
1211set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1477set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1478 CODE:
1213 self->r = r; 1479 self->r = r;
1214 self->g = g; 1480 self->g = g;
1215 self->b = b; 1481 self->b = b;
1216 self->a = a; 1482 self->a = a;
1217 1483
1218void 1484void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1485set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1486 CODE:
1221 if (self->font != font) 1487 if (self->font != font)
1222 { 1488 {
1223 self->font = font; 1489 self->font = font;
1224 layout_update_font (self); 1490 layout_update_font (self);
1225 } 1491 }
1226 1492
1227void 1493void
1228set_height (CFPlus::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1229 CODE: 1495 CODE:
1230 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1231 { 1497 {
1232 self->base_height = base_height; 1498 self->base_height = base_height;
1233 layout_update_font (self); 1499 layout_update_font (self);
1234 } 1500 }
1235 1501
1236void 1502void
1237set_width (CFPlus::Layout self, int max_width = -1) 1503set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1504 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1505 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1506
1241void 1507void
1242set_indent (CFPlus::Layout self, int indent) 1508set_indent (DC::Layout self, int indent)
1243 CODE: 1509 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1510 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1511
1246void 1512void
1247set_spacing (CFPlus::Layout self, int spacing) 1513set_spacing (DC::Layout self, int spacing)
1248 CODE: 1514 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1515 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1516
1251void 1517void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1518set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1519 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1520 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1521 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1522 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1523 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1524 : PANGO_ELLIPSIZE_NONE
1259 ); 1525 );
1260 1526
1261void 1527void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1528set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1529 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1530 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1531
1266void 1532void
1267size (CFPlus::Layout self) 1533size (DC::Layout self)
1268 PPCODE: 1534 PPCODE:
1269{ 1535{
1270 int w, h; 1536 int w, h;
1271 1537
1272 layout_get_pixel_size (self, &w, &h); 1538 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1541 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1542 PUSHs (sv_2mortal (newSViv (h)));
1277} 1543}
1278 1544
1279int 1545int
1280descent (CFPlus::Layout self) 1546descent (DC::Layout self)
1281 CODE: 1547 CODE:
1282{ 1548{
1283 PangoRectangle rect; 1549 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1550 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1551 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1552 RETVAL = PANGO_DESCENT (rect);
1287} 1553}
1288 OUTPUT: 1554 OUTPUT:
1289 RETVAL 1555 RETVAL
1290 1556
1291int 1557int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1558xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1559 CODE:
1294{ 1560{
1295 int index, trailing; 1561 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1562 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1563 RETVAL = index + trailing;
1298} 1564}
1299 OUTPUT: 1565 OUTPUT:
1300 RETVAL 1566 RETVAL
1301 1567
1302void 1568void
1303cursor_pos (CFPlus::Layout self, int index) 1569cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1570 PPCODE:
1305{ 1571{
1306 PangoRectangle strong_pos; 1572 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1573 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1574
1309 EXTEND (SP, 3); 1575 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1576 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1577 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1578 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1579}
1314 1580
1315void 1581void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1582index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1583 PPCODE:
1318{ 1584{
1319 int line, x; 1585 int line, x;
1320 1586
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1587 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1588#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1589 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1590 --line;
1591#endif
1324 EXTEND (SP, 2); 1592 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1593 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1595}
1328 1596
1329void 1597void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1598line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1599 PPCODE:
1332{ 1600{
1333 PangoLayoutLine *lp; 1601 PangoLayoutLine *lp;
1334 int index, trailing; 1602 int index, trailing;
1335 1603
1336 if (line < 0) 1604 if (line < 0)
1337 XSRETURN_EMPTY; 1605 XSRETURN_EMPTY;
1338 1606
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1607 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1608 XSRETURN_EMPTY; /* do better */
1341 1609
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1610 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1611
1344 EXTEND (SP, 2); 1612 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1618 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1619 }
1352} 1620}
1353 1621
1354void 1622void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1623render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1624 CODE:
1357 rc_clear (self->rc); 1625 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1626 pango_opengl_render_layout_subpixel (
1359 self->pl, 1627 self->pl,
1360 self->rc, 1628 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1633 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1634 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1635 pango_layout_context_changed (self->pl);
1368 1636
1369void 1637void
1370draw (CFPlus::Layout self) 1638draw (DC::Layout self)
1371 CODE: 1639 CODE:
1372{ 1640{
1373 glEnable (GL_TEXTURE_2D); 1641 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1642 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1643 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1651 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1652 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1653 glDisable (GL_TEXTURE_2D);
1386} 1654}
1387 1655
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1656MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1657
1390PROTOTYPES: ENABLE 1658PROTOTYPES: ENABLE
1391 1659
1392void 1660void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1661pad (SV *data_, int ow, int oh, int nw, int nh)
1461 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1463 } 1731 }
1464} 1732}
1465 1733
1734void
1735draw_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)
1736 PROTOTYPE: @
1737 CODE:
1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1741 glEnable (GL_TEXTURE_2D);
1742 glBindTexture (GL_TEXTURE_2D, name1);
1743
1744 glColor3f (intensity, intensity, intensity);
1745 glPushMatrix ();
1746 glScalef (1./3, 1./3, 1.);
1747
1748 if (blend > 0.f)
1749 {
1750 float dx3 = dx * -3.f / w;
1751 float dy3 = dy * -3.f / h;
1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1753
1754 /* interpolate the two shadow textures */
1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1757
1758 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1759 gl.ActiveTexture (GL_TEXTURE1);
1760 glEnable (GL_TEXTURE_2D);
1761 glBindTexture (GL_TEXTURE_2D, name2);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1763
1764 /* rgb == rgb(glcolor) */
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1768
1769 /* alpha = interpolate t0, t1 by env_alpha */
1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1774 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1775
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1781
1782 glBegin (GL_QUADS);
1783 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1784 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1787 glEnd ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 gl.ActiveTexture (GL_TEXTURE0);
1791 }
1792 else
1793 {
1794 /* simple blending of one texture, also opengl <1.3 path */
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1796
1797 glBegin (GL_QUADS);
1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1799 glTexCoord2f (0, t); glVertex2f (0, h);
1800 glTexCoord2f (s, t); glVertex2f (w, h);
1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1802 glEnd ();
1803 }
1804
1805 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1806 {
1807 int x, y;
1808 int dx3 = dx * 3;
1809 int dy3 = dy * 3;
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1812 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1813 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1814 glTranslatef (-1., -1., 0);
1815 glBegin (GL_QUADS);
1816
1817 for (y = 1; y < h; y += 3)
1818 {
1819 int y1 = y - dy3;
1820 int y1valid = y1 >= 0 && y1 < h;
1821
1822 for (x = 1; x < w; x += 3)
1823 {
1824 int x1 = x - dx3;
1825 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1826 uint8_t h2;
1827
1828 if (y1valid && x1 >= 0 && x1 < w)
1829 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1830 else
1831 h2 = 1; /* out of range == invisible */
1832
1833 if (h1 || h2)
1834 {
1835 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1836 glColor4f (1., 1., 1., alpha);
1837
1838 glTexCoord2f (0, 0.); glVertex2i (x , y );
1839 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1840 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1841 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1842 }
1843 }
1844 }
1845 }
1846
1847 glEnd ();
1848
1849 glPopMatrix ();
1850
1851 glDisable (GL_TEXTURE_2D);
1852 glDisable (GL_BLEND);
1853}
1854
1466IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1855IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467 CODE: 1856 CODE:
1468{ 1857{
1469 GLint width; 1858 GLint width;
1470 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1859 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1472 RETVAL = width > 0; 1861 RETVAL = width > 0;
1473} 1862}
1474 OUTPUT: 1863 OUTPUT:
1475 RETVAL 1864 RETVAL
1476 1865
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1866MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1867
1479PROTOTYPES: DISABLE 1868PROTOTYPES: DISABLE
1480 1869
1481CFPlus::Map 1870DC::Map
1482new (SV *class) 1871new (SV *class)
1483 CODE: 1872 CODE:
1484 New (0, RETVAL, 1, struct map); 1873 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1874 RETVAL->x = 0;
1486 RETVAL->y = 0; 1875 RETVAL->y = 0;
1494 RETVAL->row = 0; 1883 RETVAL->row = 0;
1495 OUTPUT: 1884 OUTPUT:
1496 RETVAL 1885 RETVAL
1497 1886
1498void 1887void
1499DESTROY (CFPlus::Map self) 1888DESTROY (DC::Map self)
1500 CODE: 1889 CODE:
1501{ 1890{
1502 map_clear (self); 1891 map_clear (self);
1503 Safefree (self->face2tile); 1892 Safefree (self->face2tile);
1504 Safefree (self->tex); 1893 Safefree (self->tex);
1505 Safefree (self); 1894 Safefree (self);
1506} 1895}
1507 1896
1508void 1897void
1509resize (CFPlus::Map self, int map_width, int map_height) 1898resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1899 CODE:
1511 self->w = map_width; 1900 self->w = map_width;
1512 self->h = map_height; 1901 self->h = map_height;
1513 1902
1514void 1903void
1515clear (CFPlus::Map self) 1904clear (DC::Map self)
1516 CODE: 1905 CODE:
1517 map_clear (self); 1906 map_clear (self);
1518 1907
1519void 1908void
1520set_tileid (CFPlus::Map self, int face, int tile) 1909set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1910 CODE:
1522{ 1911{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1912 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1913 need_texid (self, tile);
1525} 1914}
1526 1915
1527void 1916void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1917set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1918 CODE:
1530{ 1919{
1531 tileid texid; 1920 tileid texid;
1532 maptex *tex; 1921 maptex *tex;
1533 1922
1546 tex->smoothtile = self->face2tile [smooth]; 1935 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1936 tex->smoothlevel = level;
1548} 1937}
1549 1938
1550void 1939void
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) 1940set_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: 1941 CODE:
1553{ 1942{
1554 need_texid (self, texid); 1943 need_texid (self, texid);
1555 1944
1556 { 1945 {
1575 // use uglier nearest interpolation because linear suffers 1964 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1965 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1966 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1967}
1579 1968
1969void
1970expire_textures (DC::Map self, int texid, int count)
1971 PPCODE:
1972 for (; texid < self->texs && count; ++texid, --count)
1973 {
1974 maptex *tex = self->tex + texid;
1975
1976 if (tex->name)
1977 {
1978 if (tex->unused)
1979 {
1980 tex->name = 0;
1981 tex->unused = 0;
1982 XPUSHs (sv_2mortal (newSViv (texid)));
1983 }
1984 else
1985 tex->unused = 1;
1986 }
1987 }
1988
1580int 1989int
1581ox (CFPlus::Map self) 1990ox (DC::Map self)
1582 ALIAS: 1991 ALIAS:
1583 oy = 1 1992 oy = 1
1584 x = 2 1993 x = 2
1585 y = 3 1994 y = 3
1586 w = 4 1995 w = 4
1597 } 2006 }
1598 OUTPUT: 2007 OUTPUT:
1599 RETVAL 2008 RETVAL
1600 2009
1601void 2010void
1602scroll (CFPlus::Map self, int dx, int dy) 2011scroll (DC::Map self, int dx, int dy)
1603 CODE: 2012 CODE:
1604{ 2013{
1605 if (dx > 0) 2014 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 2015 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 2016 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1624 } 2033 }
1625} 2034}
1626 2035
1627SV * 2036SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 2038 CODE:
1630{ 2039{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 2042 mapcell *cell;
1661 uint8_t ext, cmd; 2070 uint8_t ext, cmd;
1662 2071
1663 do 2072 do
1664 { 2073 {
1665 ext = *data++; 2074 ext = *data++;
1666 cmd = ext & 0x3f; 2075 cmd = ext & 0x7f;
1667 2076
1668 if (cmd < 4) 2077 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1670 else if (cmd == 5) // health 2079 else if (cmd == 5) // health
1671 { 2080 {
1672 cell->stat_width = 1; 2081 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1674 } 2083 }
1675 else if (cmd == 6) // monster width 2084 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 2085 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 2086 else if (cmd == 0x47)
1678 { 2087 {
1679 if (*data == 4) 2088 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 2089 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2090 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2091 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 2092
1682 data += *data + 1; 2093 data += *data + 1;
1683 } 2094 }
1684 else if (cmd == 8) // cell flags 2095 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 2096 cell->flags = *data++;
1702 cell->tile [z] = self->face2tile [face]; 2113 cell->tile [z] = self->face2tile [face];
1703 2114
1704 if (cell->tile [z]) 2115 if (cell->tile [z])
1705 { 2116 {
1706 maptex *tex = self->tex + cell->tile [z]; 2117 maptex *tex = self->tex + cell->tile [z];
2118 tex->unused = 0;
1707 if (!tex->name) 2119 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2120 av_push (missing, newSViv (cell->tile [z]));
1709 2121
1710 if (tex->smoothtile) 2122 if (tex->smoothtile)
1711 { 2123 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2124 maptex *smooth = self->tex + tex->smoothtile;
2125 smooth->unused = 0;
1713 if (!smooth->name) 2126 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2127 av_push (missing, newSViv (tex->smoothtile));
1715 } 2128 }
1716 } 2129 }
1717 } 2130 }
1718 } 2131 }
1719 else 2132 else
1720 cell->darkness = 0; 2133 CELL_CLEAR (cell);
1721 } 2134 }
1722} 2135}
1723 OUTPUT: 2136 OUTPUT:
1724 RETVAL 2137 RETVAL
1725 2138
1726SV * 2139SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2140mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2141 CODE:
1729{ 2142{
1730 int x1, x; 2143 int x1, x;
1731 int y1, y; 2144 int y1, y;
1732 int z; 2145 int z;
1745 ? self->row + y 2158 ? self->row + y
1746 : 0; 2159 : 0;
1747 2160
1748 for (x = x0; x < x1; x++) 2161 for (x = x0; x < x1; x++)
1749 { 2162 {
1750 int r = 32, g = 32, b = 32, a = 192; 2163 unsigned int r = 32, g = 32, b = 32, a = 192;
1751 2164
1752 if (row && row->c0 <= x && x < row->c1) 2165 if (row && row->c0 <= x && x < row->c1)
1753 { 2166 {
1754 mapcell *cell = row->col + (x - row->c0); 2167 mapcell *cell = row->col + (x - row->c0);
1755 2168
1757 { 2170 {
1758 maptex tex = self->tex [cell->tile [z]]; 2171 maptex tex = self->tex [cell->tile [z]];
1759 int a0 = 255 - tex.a; 2172 int a0 = 255 - tex.a;
1760 int a1 = tex.a; 2173 int a1 = tex.a;
1761 2174
1762 r = (r * a0 + tex.r * a1) / 255; 2175 r = div255 (r * a0 + tex.r * a1);
1763 g = (g * a0 + tex.g * a1) / 255; 2176 g = div255 (g * a0 + tex.g * a1);
1764 b = (b * a0 + tex.b * a1) / 255; 2177 b = div255 (b * a0 + tex.b * a1);
1765 a = (a * a0 + tex.a * a1) / 255; 2178 a = div255 (a * a0 + tex.a * a1);
1766 } 2179 }
1767 } 2180 }
1768 2181
1769 *map++ = (r ) 2182 *map++ = (r )
1770 | (g << 8) 2183 | (g << 8)
1777} 2190}
1778 OUTPUT: 2191 OUTPUT:
1779 RETVAL 2192 RETVAL
1780 2193
1781void 2194void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2195draw (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: 2196 CODE:
1784{ 2197{
1785 int x, y, z; 2198 int x, y, z;
1786 2199
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2200 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2201 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) 2202 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 2203 smooth_key skey;
1791 2204 int pl_x, pl_y;
2205 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2206 rc_t *rc = rc_alloc ();
2207 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2208 rc_key_t key;
1794 rc_array_t *arr; 2209 rc_array_t *arr;
1795 2210
2211 pl_tex.name = 0;
2212
1796 // thats current max. sorry. 2213 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2214 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2215 if (sh > 255) sh = 255;
1799 2216
1800 // clear key, in case of extra padding 2217 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2218 memset (&skey, 0, sizeof (skey));
1805 key.g = 255; 2222 key.g = 255;
1806 key.b = 255; 2223 key.b = 255;
1807 key.a = 255; 2224 key.a = 255;
1808 key.mode = GL_QUADS; 2225 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2226 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2227
1812 mx += self->x; 2228 mx += self->x;
1813 my += self->y; 2229 my += self->y;
1814 2230
1815 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2256
1841 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
1842 { 2258 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2259 memset (smooth_level, 0, sizeof (smooth_level));
2260 key.texname = -1;
1844 2261
1845 for (y = 0; y < sh; y++) 2262 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2263 if (0 <= y + my && y + my < self->rows)
1847 { 2264 {
1848 maprow *row = self->row + (y + my); 2265 maprow *row = self->row + (y + my);
1858 maptex tex = self->tex [tile]; 2275 maptex tex = self->tex [tile];
1859 int px, py; 2276 int px, py;
1860 2277
1861 if (key.texname != tex.name) 2278 if (key.texname != tex.name)
1862 { 2279 {
2280 self->tex [tile].unused = 0;
2281
1863 if (!tex.name) 2282 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2283 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2284
1866 key.texname = tex.name; 2285 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2286 arr = rc_array (rc, &key);
1868 } 2287 }
1869 2288
1870 px = (x + 1) * T - tex.w; 2289 px = (x + 1) * Th - tex.w;
1871 py = (y + 1) * T - tex.h; 2290 py = (y + 1) * Tw - tex.h;
2291
2292 if (expect_false (cell->player == player) && expect_false (z == 2))
2293 {
2294 pl_x = px;
2295 pl_y = py;
2296 pl_tex = tex;
2297 continue;
2298 }
1872 2299
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2301 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); 2302 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); 2303 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 2304
1903 // update smooth hash 2305 // update smooth hash
1904 if (tex.smoothtile) 2306 if (tex.smoothtile)
1905 { 2307 {
1906 skey.tile = tex.smoothtile; 2308 skey.tile = tex.smoothtile;
1935 // corners 2337 // corners
1936 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2338 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); 2339 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); 2340 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); 2341 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2342 }
2343 }
2344
2345 if (expect_false (z == 2) && expect_false (cell->flags))
2346 {
2347 // overlays such as the speech bubble, probably more to come
2348 if (cell->flags & 1)
2349 {
2350 rc_key_t key_ov = key;
2351 maptex tex = self->tex [TEXID_SPEECH];
2352 rc_array_t *arr;
2353 int px = x * Tw + Tw * 2 / 32;
2354 int py = y * Th - Th * 6 / 32;
2355
2356 key_ov.texname = tex.name;
2357 arr = rc_array (rc_ov, &key_ov);
2358
2359 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2360 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2361 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2362 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1940 } 2363 }
1941 } 2364 }
1942 } 2365 }
1943 } 2366 }
1944 2367
1971 if (!(bits & 0x1000) 2394 if (!(bits & 0x1000)
1972 && skey->level == level 2395 && skey->level == level
1973 && level > smooth_max [skey->x][skey->y]) 2396 && level > smooth_max [skey->x][skey->y])
1974 { 2397 {
1975 maptex tex = self->tex [skey->tile]; 2398 maptex tex = self->tex [skey->tile];
1976 int px = (((int)skey->x) - 1) * T; 2399 int px = (((int)skey->x) - 1) * Tw;
1977 int py = (((int)skey->y) - 1) * T; 2400 int py = (((int)skey->y) - 1) * Th;
1978 int border = bits & 15; 2401 int border = bits & 15;
1979 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2402 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1980 float dx = tex.s * .0625f; // 16 images/row 2403 float dx = tex.s * .0625f; // 16 images/row
1981 float dy = tex.t * .5f ; // 2 images/column 2404 float dy = tex.t * .5f ; // 2 images/column
1982 2405
1984 { 2407 {
1985 // this time avoiding texture state changes 2408 // this time avoiding texture state changes
1986 // save gobs of state changes. 2409 // save gobs of state changes.
1987 if (key.texname != tex.name) 2410 if (key.texname != tex.name)
1988 { 2411 {
2412 self->tex [skey->tile].unused = 0;
2413
1989 glEnd (); 2414 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2415 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2416 glBegin (GL_QUADS);
1992 } 2417 }
1993 2418
1994 if (border) 2419 if (border)
1995 { 2420 {
1996 float ox = border * dx; 2421 float ox = border * dx;
1997 2422
1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2423 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2424 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2425 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2426 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2002 } 2427 }
2003 2428
2004 if (corner) 2429 if (corner)
2005 { 2430 {
2006 float ox = corner * dx; 2431 float ox = corner * dx;
2007 2432
2008 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2012 } 2437 }
2013 } 2438 }
2014 } 2439 }
2015 } 2440 }
2016 } 2441 }
2022 } 2447 }
2023 2448
2024 hv_clear (smooth); 2449 hv_clear (smooth);
2025 } 2450 }
2026 2451
2452 if (pl_tex.name)
2453 {
2454 maptex tex = pl_tex;
2455 int px = pl_x + sdx;
2456 int py = pl_y + sdy;
2457
2458 key.texname = tex.name;
2459 arr = rc_array (rc, &key);
2460
2461 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2462 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2463 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2464 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2465
2466 rc_draw (rc);
2467 }
2468
2469 rc_draw (rc_ov);
2470 rc_clear (rc_ov);
2471
2027 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2028 rc_free (rc); 2473 rc_free (rc);
2474 rc_free (rc_ov);
2029 2475
2030 // top layer: overlays such as the health bar 2476 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2477 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2478 if (0 <= y + my && y + my < self->rows)
2033 { 2479 {
2036 for (x = 0; x < sw; x++) 2482 for (x = 0; x < sw; x++)
2037 if (row->c0 <= x + mx && x + mx < row->c1) 2483 if (row->c0 <= x + mx && x + mx < row->c1)
2038 { 2484 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2485 mapcell *cell = row->col + (x + mx - row->c0);
2040 2486
2041 int px = x * T; 2487 int px = x * Tw;
2042 int py = y * T; 2488 int py = y * Th;
2489
2490 if (expect_false (cell->player == player))
2491 {
2492 px += sdx;
2493 py += sdy;
2494 }
2043 2495
2044 if (cell->stat_hp) 2496 if (cell->stat_hp)
2045 { 2497 {
2046 int width = cell->stat_width * T; 2498 int width = cell->stat_width * Tw;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2499 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2048 2500
2049 glColor3ub (0, 0, 0); 2501 glColor3ub (0, 0, 0);
2050 glRectf (px + 1, py - thick - 2, 2502 glRectf (px + 1, py - thick - 2,
2051 px + width - 1, py); 2503 px + width - 1, py);
2052 2504
2058 } 2510 }
2059 } 2511 }
2060} 2512}
2061 2513
2062void 2514void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2515draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2064 CODE: 2516 CODE:
2065{ 2517{
2066 static float color[16][3] = { 2518 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2519 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2520 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2521 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2522 { 1.00f, 0.00f, 0.00f },
2071 2523
2072 { 1.00F, 0.54F, 0.00F }, 2524 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2525 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2526 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2527 { 0.18f, 0.54f, 0.34f },
2076 2528
2077 { 0.56F, 0.73F, 0.56F }, 2529 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2530 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2531 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2532 { 0.99f, 0.77f, 0.26f },
2081 2533
2082 { 0.74F, 0.65F, 0.41F }, 2534 { 0.74f, 0.65f, 0.41f },
2083 2535
2084 { 0.00F, 1.00F, 1.00F }, 2536 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2537 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2538 { 1.00f, 1.00f, 0.00f },
2087 }; 2539 };
2088 2540
2089 int x, y; 2541 int x, y;
2090 2542
2091 glEnable (GL_TEXTURE_2D); 2543 glEnable (GL_TEXTURE_2D);
2544 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2545 * but the nvidia driver (185.18.14) mishandles alpha textures
2546 * and takes the colour from god knows where instead of using
2547 * Cp. MODULATE results in the same colour, but slightly different
2548 * alpha, but atcually gives us the correct colour with nvidia.
2549 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2550 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2551 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2552 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2553 glBegin (GL_QUADS);
2096 2554
2097 for (y = 0; y < h; y++) 2555 for (y = 0; y < h; y++)
2101 2559
2102 if (m) 2560 if (m)
2103 { 2561 {
2104 float *c = color [m & 15]; 2562 float *c = color [m & 15];
2105 2563
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2564 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2565 float tx2 = tx1 + 0.5f;
2108 2566
2109 glColor4f (c[0], c[1], c[2], 0.75); 2567 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2568 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2569 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2570 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2571 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2572 }
2118 glDisable (GL_BLEND); 2576 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2577 glDisable (GL_TEXTURE_2D);
2120} 2578}
2121 2579
2122void 2580void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2581fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2582 PPCODE:
2125{ 2583{
2126 int x, y; 2584 int x, y;
2127 int sw1 = sw + 2; 2585 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2586 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2587 int sh3 = sh * 3;
2130 int sw34 = (sw * 3 + 3) & ~3; 2588 int sw3 = sw * 3;
2589 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2590 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2591 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2592 memset (darkness1, 0, sw1*sh1);
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2593
2135 SvPOK_only (darkness3_sv); 2594 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2595 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2596
2138 mx += self->x - 1; 2597 mx += self->x - 1;
2139 my += self->y - 1; 2598 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2599
2143 for (y = 0; y < sh1; y++) 2600 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2601 if (0 <= y + my && y + my < self->rows)
2145 { 2602 {
2146 maprow *row = self->row + (y + my); 2603 maprow *row = self->row + (y + my);
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2606 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2607 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2608 mapcell *cell = row->col + (x + mx - row->c0);
2152 2609
2153 darkness1 [y * sw1 + x] = cell->darkness 2610 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2611 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2612 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2613 }
2157 } 2614 }
2158 2615
2159 for (y = 0; y < sh; ++y) 2616 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2617 for (x = 0; x < sw; ++x)
2179 2636
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2637 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2638 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2639 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2640
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2645 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); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2650 }
2194 2651
2195 free (darkness1); 2652 free (darkness1);
2196 2653
2197 EXTEND (SP, 3); 2654 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2655 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2656 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2657 PUSHs (darkness3_sv);
2201} 2658}
2202 2659
2203SV * 2660SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2661get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2662 CODE:
2206{ 2663{
2207 int x, y, x1, y1; 2664 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2665 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2666 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2723 else
2267 *data++ = 0; 2724 *data++ = 0;
2268 } 2725 }
2269 } 2726 }
2270 2727
2728 /* if size is w*h + 5 then no data has been found */
2729 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2730 {
2271 SvPOK_only (data_sv); 2731 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2732 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2733 }
2734
2273 RETVAL = data_sv; 2735 RETVAL = data_sv;
2274} 2736}
2275 OUTPUT: 2737 OUTPUT:
2276 RETVAL 2738 RETVAL
2277 2739
2278void 2740void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2741set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2742 PPCODE:
2281{ 2743{
2282 int x, y, z; 2744 int x, y, z;
2283 int w, h; 2745 int w, h;
2284 int x1, y1; 2746 int x1, y1;
2747 STRLEN len;
2748 uint8_t *data, *end;
2749
2750 len = SvLEN (data_sv);
2751 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2752 data = SvPVbyte_nolen (data_sv);
2753 end = data + len + 8;
2754
2755 if (len < 5)
2756 XSRETURN_EMPTY;
2285 2757
2286 if (*data++ != 0) 2758 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2759 XSRETURN_EMPTY; /* version mismatch */
2288 2760
2289 w = *data++ << 8; w |= *data++; 2761 w = *data++ << 8; w |= *data++;
2304 { 2776 {
2305 maprow *row = map_get_row (self, y); 2777 maprow *row = map_get_row (self, y);
2306 2778
2307 for (x = x0; x < x1; x++) 2779 for (x = x0; x < x1; x++)
2308 { 2780 {
2781 uint8_t flags;
2782
2783 if (data + 7 >= end)
2784 XSRETURN_EMPTY;
2785
2309 uint8_t flags = *data++; 2786 flags = *data++;
2310 2787
2311 if (flags) 2788 if (flags)
2312 { 2789 {
2313 mapcell *cell = row_get_cell (row, x); 2790 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2791 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2794 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2795 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2796
2320 if (cell->darkness == 0) 2797 if (cell->darkness == 0)
2321 { 2798 {
2322 cell->darkness = 0; 2799 /*cell->darkness = 0;*/
2800 EXTEND (SP, 3);
2323 2801
2324 for (z = 0; z <= 2; z++) 2802 for (z = 0; z <= 2; z++)
2325 { 2803 {
2326 tileid t = tile [z]; 2804 tileid t = tile [z];
2327 2805
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2806 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2807 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2808 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2809 need_texid (self, t);
2332 } 2810 }
2333 2811
2334 cell->tile [z] = t; 2812 cell->tile [z] = t;
2335 } 2813 }
2337 } 2815 }
2338 } 2816 }
2339 } 2817 }
2340} 2818}
2341 2819
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2820MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2821
2344CFPlus::RW 2822DC::RW
2345new (SV *class, SV *data_sv) 2823new (SV *class, SV *data_sv)
2346 CODE: 2824 CODE:
2347{ 2825{
2348 STRLEN datalen; 2826 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2827 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2829 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2830}
2353 OUTPUT: 2831 OUTPUT:
2354 RETVAL 2832 RETVAL
2355 2833
2356CFPlus::RW 2834DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2835new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2836 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2837 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2838 OUTPUT:
2361 RETVAL 2839 RETVAL
2362 2840
2363# fails on win32: 2841# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2842# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2843#void
2366#close (CFPlus::RW self) 2844#close (DC::RW self)
2367# CODE: 2845# CODE:
2368# (self->(close)) (self); 2846# (self->(close)) (self);
2369 2847
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2848MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2849
2372PROTOTYPES: DISABLE 2850PROTOTYPES: DISABLE
2373 2851
2374CFPlus::Channel 2852DC::Channel
2375find () 2853find ()
2376 CODE: 2854 CODE:
2377{ 2855{
2378 RETVAL = Mix_GroupAvailable (-1); 2856 RETVAL = Mix_GroupAvailable (-1);
2379 2857
2380 if (RETVAL < 0) 2858 if (RETVAL < 0)
2381 { 2859 {
2382 RETVAL = Mix_GroupOldest (-1); 2860 RETVAL = Mix_GroupOldest (-1);
2383 2861
2384 if (RETVAL < 0) 2862 if (RETVAL < 0)
2863 {
2864 // happens sometimes, maybe it just stopped playing(?)
2865 RETVAL = Mix_GroupAvailable (-1);
2866
2867 if (RETVAL < 0)
2385 XSRETURN_UNDEF; 2868 XSRETURN_UNDEF;
2386 2869 }
2870 else
2387 Mix_HaltChannel (RETVAL); 2871 Mix_HaltChannel (RETVAL);
2388 } 2872 }
2389 2873
2390 Mix_UnregisterAllEffects (RETVAL); 2874 Mix_UnregisterAllEffects (RETVAL);
2391 Mix_Volume (RETVAL, 128); 2875 Mix_Volume (RETVAL, 128);
2392} 2876}
2393 OUTPUT: 2877 OUTPUT:
2394 RETVAL 2878 RETVAL
2395 2879
2396void 2880void
2397halt (CFPlus::Channel self) 2881halt (DC::Channel self)
2398 CODE: 2882 CODE:
2399 Mix_HaltChannel (self); 2883 Mix_HaltChannel (self);
2400 2884
2401void 2885void
2402expire (CFPlus::Channel self, int ticks = -1) 2886expire (DC::Channel self, int ticks = -1)
2403 CODE: 2887 CODE:
2404 Mix_ExpireChannel (self, ticks); 2888 Mix_ExpireChannel (self, ticks);
2405 2889
2406void 2890void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2891fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2892 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2893 Mix_FadeOutChannel (self, ticks);
2410 2894
2411int 2895int
2412volume (CFPlus::Channel self, int volume) 2896volume (DC::Channel self, int volume)
2413 CODE: 2897 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2898 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2899 OUTPUT:
2416 RETVAL 2900 RETVAL
2417 2901
2418void 2902void
2419unregister_all_effects (CFPlus::Channel self) 2903unregister_all_effects (DC::Channel self)
2420 CODE: 2904 CODE:
2421 Mix_UnregisterAllEffects (self); 2905 Mix_UnregisterAllEffects (self);
2422 2906
2423void 2907void
2424set_panning (CFPlus::Channel self, int left, int right) 2908set_panning (DC::Channel self, int left, int right)
2425 CODE: 2909 CODE:
2426 left = CLAMP (left , 0, 255); 2910 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2911 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2912 Mix_SetPanning (self, left, right);
2429 2913
2430void 2914void
2431set_distance (CFPlus::Channel self, int distance) 2915set_distance (DC::Channel self, int distance)
2432 CODE: 2916 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2917 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2918
2435void 2919void
2436set_position (CFPlus::Channel self, int angle, int distance) 2920set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2921 CODE:
2438 2922
2439void 2923void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2924set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2925 CODE:
2442{ 2926{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2927 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); 2928 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2929 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2930}
2447 2931
2448void 2932void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2933set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2934 CODE:
2451 Mix_SetReverseStereo (self, flip); 2935 Mix_SetReverseStereo (self, flip);
2452 2936
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2937MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2938
2455PROTOTYPES: DISABLE 2939PROTOTYPES: DISABLE
2456 2940
2941void
2942decoders ()
2943 PPCODE:
2944#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2945 int i, num = Mix_GetNumChunkDecoders ();
2946 EXTEND (SP, num);
2947 for (i = 0; i < num; ++i)
2948 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2949#else
2950 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2951#endif
2952
2457CFPlus::MixChunk 2953DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2954new (SV *class, DC::RW rwops)
2459 CODE: 2955 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2956 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2957 OUTPUT:
2462 RETVAL 2958 RETVAL
2463 2959
2464void 2960void
2465DESTROY (CFPlus::MixChunk self) 2961DESTROY (DC::MixChunk self)
2466 CODE: 2962 CODE:
2467 Mix_FreeChunk (self); 2963 Mix_FreeChunk (self);
2468 2964
2469int 2965int
2470volume (CFPlus::MixChunk self, int volume = -1) 2966volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2967 CODE:
2472 if (items > 1) 2968 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2969 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2970 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2971 OUTPUT:
2476 RETVAL 2972 RETVAL
2477 2973
2478CFPlus::Channel 2974DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2975play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2976 CODE:
2481{ 2977{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2978 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2979
2484 if (RETVAL < 0) 2980 if (RETVAL < 0)
2491 } 2987 }
2492} 2988}
2493 OUTPUT: 2989 OUTPUT:
2494 RETVAL 2990 RETVAL
2495 2991
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2992MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2993
2994void
2995decoders ()
2996 PPCODE:
2997#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2998 int i, num = Mix_GetNumMusicDecoders ();
2999 EXTEND (SP, num);
3000 for (i = 0; i < num; ++i)
3001 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3002#else
3003 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3004#endif
2497 3005
2498int 3006int
2499volume (int volume = -1) 3007volume (int volume = -1)
2500 PROTOTYPE: ;$ 3008 PROTOTYPE: ;$
2501 CODE: 3009 CODE:
2513void 3021void
2514halt () 3022halt ()
2515 CODE: 3023 CODE:
2516 Mix_HaltMusic (); 3024 Mix_HaltMusic ();
2517 3025
3026int
3027playing ()
3028 CODE:
3029 RETVAL = Mix_PlayingMusic ();
3030 OUTPUT:
3031 RETVAL
3032
2518CFPlus::MixMusic 3033DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 3034new (SV *class, DC::RW rwops)
2520 CODE: 3035 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 3036 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 3037 OUTPUT:
2523 RETVAL 3038 RETVAL
2524 3039
2525void 3040void
2526DESTROY (CFPlus::MixMusic self) 3041DESTROY (DC::MixMusic self)
2527 CODE: 3042 CODE:
2528 Mix_FreeMusic (self); 3043 Mix_FreeMusic (self);
2529 3044
2530int 3045int
2531play (CFPlus::MixMusic self, int loops = -1) 3046play (DC::MixMusic self, int loops = -1)
2532 CODE: 3047 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 3048 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 3049 OUTPUT:
2535 RETVAL 3050 RETVAL
2536 3051
2537void 3052void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3053fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 3054 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 3055 Mix_FadeInMusicPos (self, loops, ms, position);
2541 3056
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3057MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 3058
2544PROTOTYPES: ENABLE 3059PROTOTYPES: ENABLE
2545 3060
2546BOOT: 3061BOOT:
2547{ 3062{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3063 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 3064 static const struct {
2550 const char *name; 3065 const char *name;
2551 IV iv; 3066 IV iv;
2552 } *civ, const_iv[] = { 3067 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 3068# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 3069 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 3070 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 3071 const_iv (GL_EXTENSIONS),
3072 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 3073 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 3074 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 3075 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 3076 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 3077 const_iv (GL_BLEND),
2573 const_iv (GL_ZERO), 3089 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 3090 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 3091 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3092 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 3093 const_iv (GL_ONE_MINUS_DST_ALPHA),
3094 const_iv (GL_SRC_COLOR),
3095 const_iv (GL_DST_COLOR),
3096 const_iv (GL_ONE_MINUS_SRC_COLOR),
3097 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 3098 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 3099 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 3100 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 3101 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3102 const_iv (GL_RGBA8),
2650 const_iv (GL_NICEST), 3170 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3171 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3172 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3173 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 3174 const_iv (GL_T2F_N3F_V3F),
3175 const_iv (GL_FUNC_ADD),
3176 const_iv (GL_FUNC_SUBTRACT),
3177 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 3178# undef const_iv
2656 }; 3179 };
2657 3180
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3181 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3182 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2660 3183
2661 texture_av = newAV (); 3184 texture_av = newAV ();
2662 AvREAL_off (texture_av); 3185 AvREAL_off (texture_av);
2663} 3186}
2664 3187
2665void 3188void
2666disable_GL_EXT_blend_func_separate () 3189disable_GL_EXT_blend_func_separate ()
2667 CODE: 3190 CODE:
2668 gl.BlendFuncSeparate = 0; 3191 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3192 gl.BlendFuncSeparateEXT = 0;
3193
3194void
3195apple_nvidia_bug (int enable)
2670 3196
2671char * 3197char *
2672gl_vendor () 3198gl_vendor ()
2673 CODE: 3199 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3200 RETVAL = (char *)glGetString (GL_VENDOR);
2705 3231
2706int glGetError () 3232int glGetError ()
2707 3233
2708void glFinish () 3234void glFinish ()
2709 3235
3236void glFlush ()
3237
2710void glClear (int mask) 3238void glClear (int mask)
2711 3239
2712void glClearColor (float r, float g, float b, float a = 1.0) 3240void glClearColor (float r, float g, float b, float a = 1.0)
2713 PROTOTYPE: @ 3241 PROTOTYPE: @
2714 3242
2723void glBlendFunc (int sfactor, int dfactor) 3251void glBlendFunc (int sfactor, int dfactor)
2724 3252
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3253void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3254 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3255 gl_BlendFuncSeparate (sa, da, saa, daa);
3256
3257# void glBlendEquation (int se)
2728 3258
2729void glDepthMask (int flag) 3259void glDepthMask (int flag)
2730 3260
2731void glLogicOp (int opcode) 3261void glLogicOp (int opcode)
2732 3262
2767void glRotate (float angle, float x, float y, float z) 3297void glRotate (float angle, float x, float y, float z)
2768 CODE: 3298 CODE:
2769 glRotatef (angle, x, y, z); 3299 glRotatef (angle, x, y, z);
2770 3300
2771void glColor (float r, float g, float b, float a = 1.0) 3301void glColor (float r, float g, float b, float a = 1.0)
3302 PROTOTYPE: @
2772 ALIAS: 3303 ALIAS:
2773 glColor_premultiply = 1 3304 glColor_premultiply = 1
2774 CODE: 3305 CODE:
2775 if (ix) 3306 if (ix)
2776 { 3307 {
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3377void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3378 CODE:
2848 if (gl.SeparableFilter2D) 3379 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3380 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3381
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3382void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3383
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3384void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3385
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3386void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3387
2882 3413
2883void glEndList () 3414void glEndList ()
2884 3415
2885void glCallList (int list) 3416void glCallList (int list)
2886 3417
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3418void c_init ()
3419 CODE:
3420 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3421 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3422
3423MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3424
2889PROTOTYPES: DISABLE 3425PROTOTYPES: DISABLE
2890 3426
2891void 3427void
2892find_widget (SV *self, NV x, NV y) 3428find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3432 XPUSHs (self);
2897} 3433}
2898 3434
2899BOOT: 3435BOOT:
2900{ 3436{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3437 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3438
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3439 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); 3440 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); 3441 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); 3442 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3443}
2908 3444
2909void 3445void
2910draw (SV *self) 3446draw (SV *self)
2911 CODE: 3447 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3454 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3455 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3456 double draw_x, draw_y;
2921 3457
2922 if (!SvROK (self)) 3458 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3459 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3460
2925 hv = (HV *)SvRV (self); 3461 hv = (HV *)SvRV (self);
2926 3462
2927 if (SvTYPE (hv) != SVt_PVHV) 3463 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3464 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3465
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3466 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.; 3467 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3468
2933 if (!h || !w) 3469 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines