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.238 by root, Sat Nov 3 12:08:43 2007 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines