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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines