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.236 by root, Mon Oct 8 16:10:14 2007 UTC vs.
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines