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.220 by root, Thu Aug 9 11:02:08 2007 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
34#include <SDL_endian.h> 39#include <SDL_endian.h>
35#include <SDL_image.h> 40#include <SDL_image.h>
36#include <SDL_mixer.h> 41#include <SDL_mixer.h>
37#include <SDL_opengl.h> 42#include <SDL_opengl.h>
38 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
39#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
41 51
42#include <glib/gmacros.h> 52#include <glib/gmacros.h>
43 53
44#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
45 66
46#ifndef _WIN32 67#ifndef _WIN32
47# include <sys/types.h> 68# include <sys/types.h>
48# include <sys/socket.h> 69# include <sys/socket.h>
49# include <netinet/in.h> 70# include <netinet/in.h>
50# include <netinet/tcp.h> 71# include <netinet/tcp.h>
51# include <inttypes.h> 72# include <inttypes.h>
52#endif 73#endif
53 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 85
56#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
57 87
58#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
60 90
61#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
62 92
63#if 0 93/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else
66# define PARACHUTE 0
67#endif
68 95
69static AV *texture_av; 96static AV *texture_av;
70 97
71static struct 98static struct
72{ 99{
109 av_push (texture_av, (SV *)(size_t)name); 136 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 137 glDeleteTextures (1, &name);
111} 138}
112 139
113#include "texcache.c" 140#include "texcache.c"
141#include "rendercache.c"
114 142
115#include "pango-font.c" 143#include "pango-font.c"
116#include "pango-fontmap.c" 144#include "pango-fontmap.c"
117#include "pango-render.c" 145#include "pango-render.c"
118 146
119typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
123 151
124typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
125 153
126static int 154static int
127shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
128{ 156{
129 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
143 171
144typedef struct cf_layout { 172typedef struct cf_layout {
145 PangoLayout *pl; 173 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
147 int base_height; 175 int base_height;
148 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
149} *CFPlus__Layout; 178} *DC__Layout;
150 179
151static CFPlus__Font default_font; 180static DC__Font default_font;
152static PangoContext *opengl_context; 181static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
154 183
155static void 184static void
156substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
161#endif 190#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 192}
164 193
165static void 194static void
166layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
167{ 196{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
170 */ 199 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
172 201
173 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 204
176 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
177} 206}
178 207
179static void 208static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 210{
182 PangoRectangle rect; 211 PangoRectangle rect;
183 212
184 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
196 225
197typedef uint16_t tileid; 226typedef uint16_t tileid;
198typedef uint16_t faceid; 227typedef uint16_t faceid;
199 228
200typedef struct { 229typedef struct {
201 int name; 230 GLuint name;
202 int w, h; 231 int w, h;
203 float s, t; 232 float s, t;
204 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
205 tileid smoothtile; 234 tileid smoothtile;
206 uint8_t smoothlevel; 235 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
226 255
227 int32_t rows; 256 int32_t rows;
228 maprow *row; 257 maprow *row;
229} *CFPlus__Map; 258} *DC__Map;
230 259
231static char * 260static char *
232prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
233{ 262{
234 char *p; 263 char *p;
272 self->texs *= 2; 301 self->texs *= 2;
273 } 302 }
274} 303}
275 304
276static maprow * 305static maprow *
277map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
278{ 307{
279 if (0 > y) 308 if (0 > y)
280 { 309 {
281 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
320 349
321 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
322} 351}
323 352
324static mapcell * 353static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
326{ 355{
327 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
328} 357}
329 358
330static void 359static void
331map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
332{ 361{
333 int r; 362 int r;
334 363
335 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
343 self->oy = 0; 372 self->oy = 0;
344 self->row = 0; 373 self->row = 0;
345 self->rows = 0; 374 self->rows = 0;
346} 375}
347 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
348static void 387static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 389{
351 int x, y; 390 int x, y;
352 maprow *row; 391 maprow *row;
353 mapcell *cell; 392 mapcell *cell;
354 393
366 if (x >= row->c1) 405 if (x >= row->c1)
367 break; 406 break;
368 407
369 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
370 409
371 cell->darkness = 0; 410 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 411 }
376 } 412 }
377} 413}
378 414
379typedef struct { 415typedef struct {
433 n |= n >> 16; 469 n |= n >> 16;
434 470
435 return n + 1; 471 return n + 1;
436} 472}
437 473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
438/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
441 488
442/******************************************************************************/ 489/******************************************************************************/
480 return 0; 527 return 0;
481 528
482 return 1; 529 return 1;
483} 530}
484 531
485MODULE = CFPlus PACKAGE = CFPlus 532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
486 571
487PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
488 573
489BOOT: 574BOOT:
490{ 575{
491 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 577 static const struct {
493 const char *name; 578 const char *name;
494 IV iv; 579 IV iv;
495 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
518 603
519 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
522 607
608 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 610 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 611 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 612 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 613 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 614 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 686 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 687 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 688 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 689 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 690 const_iv (KMOD_MODE),
691
692 const_iv (MIX_DEFAULT_FORMAT),
693
694 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO),
697 const_iv (SDL_INIT_CDROM),
698 const_iv (SDL_INIT_JOYSTICK),
699 const_iv (SDL_INIT_EVERYTHING),
700 const_iv (SDL_INIT_NOPARACHUTE),
701 const_iv (SDL_INIT_EVENTTHREAD),
702
703 const_iv (SDL_GL_RED_SIZE),
704 const_iv (SDL_GL_GREEN_SIZE),
705 const_iv (SDL_GL_BLUE_SIZE),
706 const_iv (SDL_GL_ALPHA_SIZE),
707 const_iv (SDL_GL_DOUBLEBUFFER),
708 const_iv (SDL_GL_BUFFER_SIZE),
709 const_iv (SDL_GL_DEPTH_SIZE),
710 const_iv (SDL_GL_STENCIL_SIZE),
711 const_iv (SDL_GL_ACCUM_RED_SIZE),
712 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
713 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
714 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
715 const_iv (SDL_GL_STEREO),
716 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
717 const_iv (SDL_GL_MULTISAMPLESAMPLES),
718 const_iv (SDL_GL_ACCELERATED_VISUAL),
719 const_iv (SDL_GL_SWAP_CONTROL),
720
721 const_iv (FOW_DARKNESS)
604# undef const_iv 722# undef const_iv
605 }; 723 };
606 724
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 744
627NV floor (NV x) 745NV floor (NV x)
628 746
629NV ceil (NV x) 747NV ceil (NV x)
630 748
749IV minpot (UV n)
750
751IV popcount (UV n)
752
631void 753void
632pango_init () 754pango_init ()
633 CODE: 755 CODE:
634{ 756{
635 opengl_fontmap = pango_opengl_font_map_new (); 757 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 758 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 759 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
760 /*pango_context_set_font_description (opengl_context, default_font);*/
761#if PANGO_VERSION_CHECK (1, 15, 2)
762 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
763 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
764#endif
638} 765}
639 766
640char *
641SDL_GetError () 767char *SDL_GetError ()
642 768
643int 769void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 770
646void 771int SDL_Init (U32 flags)
772
773int SDL_InitSubSystem (U32 flags)
774
775void SDL_QuitSubSystem (U32 flags)
776
647SDL_Quit () 777void SDL_Quit ()
778
779int SDL_GL_SetAttribute (int attr, int value)
780
781int SDL_GL_GetAttribute (int attr)
782 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL))
784 XSRETURN_UNDEF;
785 OUTPUT:
786 RETVAL
648 787
649void 788void
650SDL_ListModes (int rgb, int alpha) 789SDL_ListModes (int rgb, int alpha)
651 PPCODE: 790 PPCODE:
652{ 791{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 803 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 806
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 807 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 808 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 809
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 810 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 811
676 if (m && m != (SDL_Rect **)-1) 812 if (m && m != (SDL_Rect **)-1)
677 while (*m) 813 while (*m)
678 { 814 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 815 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 816 {
681 AV *av = newAV (); 817 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 818 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 819 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 820 av_push (av, newSViv (rgb));
708 844
709 if (RETVAL) 845 if (RETVAL)
710 { 846 {
711 av_clear (texture_av); 847 av_clear (texture_av);
712 848
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 850#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 851#include "glfunc.h"
716#undef GL_FUNC 852#undef GL_FUNC
717 } 853 }
718} 854}
725char * 861char *
726SDL_GetKeyName (int sym) 862SDL_GetKeyName (int sym)
727 863
728int 864int
729SDL_GetAppState () 865SDL_GetAppState ()
866
867int
868SDL_GetModState ()
730 869
731void 870void
732poll_events () 871poll_events ()
733 PPCODE: 872 PPCODE:
734{ 873{
744 { 883 {
745 case SDL_KEYDOWN: 884 case SDL_KEYDOWN:
746 case SDL_KEYUP: 885 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 891 break;
753 892
754 case SDL_ACTIVEEVENT: 893 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 912 x = ev.motion.x;
774 y = ev.motion.y; 913 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 915 }
777 916
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 918 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 919 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 920 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 921 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 922 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 923 }
785 break; 924 break;
786 925
787 case SDL_MOUSEBUTTONDOWN: 926 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 927 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 928 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 929
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 930 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 931 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 932 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 933 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 938 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 939 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 940 break;
802 } 941 }
803 942
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 944 }
806} 945}
807 946
808int 947int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 949 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 950 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 951 Mix_ChannelFinished (channel_finished);
952
953void
954Mix_QuerySpec ()
955 PPCODE:
956{
957 int freq, channels;
958 Uint16 format;
959
960 if (Mix_QuerySpec (&freq, &format, &channels))
961 {
962 EXTEND (SP, 3);
963 PUSHs (sv_2mortal (newSViv (freq)));
964 PUSHs (sv_2mortal (newSViv (format)));
965 PUSHs (sv_2mortal (newSViv (channels)));
966 }
967}
813 968
814void 969void
815Mix_CloseAudio () 970Mix_CloseAudio ()
816 971
817int 972int
852 } 1007 }
853 } 1008 }
854#endif 1009#endif
855} 1010}
856 1011
857void 1012int
858add_font (char *file) 1013add_font (char *file)
859 CODE: 1014 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT:
1017 RETVAL
861 1018
862void 1019void
863load_image_inline (SV *image_) 1020load_image_inline (SV *image_)
864 ALIAS: 1021 ALIAS:
865 load_image_file = 1 1022 load_image_file = 1
951void 1108void
952error (char *message) 1109error (char *message)
953 CODE: 1110 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1111 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1112#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1113 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1114#endif
958 1115
959void 1116void
960fatal (char *message) 1117fatal (char *message)
961 CODE: 1118 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1119 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1120#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1121 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1122#endif
966 _exit (1); 1123 _exit (1);
967 1124
968void 1125void
969_exit (int retval = 0) 1126_exit (int retval = 0)
981#if DEBUG 1138#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1139 VALGRIND_DO_LEAK_CHECK;
983#endif 1140#endif
984} 1141}
985 1142
986MODULE = CFPlus PACKAGE = CFPlus::Font 1143MODULE = Deliantra::Client PACKAGE = DC::Font
987 1144
988PROTOTYPES: DISABLE 1145PROTOTYPES: DISABLE
989 1146
990CFPlus::Font 1147DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1148new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1149 CODE:
993{ 1150{
994 int count; 1151 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1155}
999 OUTPUT: 1156 OUTPUT:
1000 RETVAL 1157 RETVAL
1001 1158
1002void 1159void
1003DESTROY (CFPlus::Font self) 1160DESTROY (DC::Font self)
1004 CODE: 1161 CODE:
1005 pango_font_description_free (self); 1162 pango_font_description_free (self);
1006 1163
1007void 1164void
1008make_default (CFPlus::Font self) 1165make_default (DC::Font self)
1009 PROTOTYPE: $ 1166 PROTOTYPE: $
1010 CODE: 1167 CODE:
1011 default_font = self; 1168 default_font = self;
1012 1169
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1170MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1171
1015PROTOTYPES: DISABLE 1172PROTOTYPES: DISABLE
1016 1173
1017void 1174void
1018reset_glyph_cache () 1175glyph_cache_backup ()
1019 PROTOTYPE: 1176 PROTOTYPE:
1020 CODE: 1177 CODE:
1178 tc_backup ();
1179
1180void
1181glyph_cache_restore ()
1182 PROTOTYPE:
1183 CODE:
1021 tc_clear (); 1184 tc_restore ();
1022 1185
1023CFPlus::Layout 1186DC::Layout
1024new (SV *class) 1187new (SV *class)
1025 CODE: 1188 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1189 New (0, RETVAL, 1, struct cf_layout);
1027 1190
1028 RETVAL->pl = pango_layout_new (opengl_context); 1191 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1193 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1194 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1195 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1196 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1197 RETVAL->font = 0;
1198 RETVAL->rc = rc_alloc ();
1035 1199
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1200 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1201 layout_update_font (RETVAL);
1038 OUTPUT: 1202 OUTPUT:
1039 RETVAL 1203 RETVAL
1040 1204
1041void 1205void
1042DESTROY (CFPlus::Layout self) 1206DESTROY (DC::Layout self)
1043 CODE: 1207 CODE:
1044 g_object_unref (self->pl); 1208 g_object_unref (self->pl);
1209 rc_free (self->rc);
1045 Safefree (self); 1210 Safefree (self);
1046 1211
1047void 1212void
1048set_text (CFPlus::Layout self, SV *text_) 1213set_text (DC::Layout self, SV *text_)
1049 CODE: 1214 CODE:
1050{ 1215{
1051 STRLEN textlen; 1216 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1217 char *text = SvPVutf8 (text_, textlen);
1053 1218
1054 pango_layout_set_text (self->pl, text, textlen); 1219 pango_layout_set_text (self->pl, text, textlen);
1055} 1220}
1056 1221
1057void 1222void
1058set_markup (CFPlus::Layout self, SV *text_) 1223set_markup (DC::Layout self, SV *text_)
1059 CODE: 1224 CODE:
1060{ 1225{
1061 STRLEN textlen; 1226 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1227 char *text = SvPVutf8 (text_, textlen);
1063 1228
1064 pango_layout_set_markup (self->pl, text, textlen); 1229 pango_layout_set_markup (self->pl, text, textlen);
1065} 1230}
1066 1231
1067void 1232void
1068set_shapes (CFPlus::Layout self, ...) 1233set_shapes (DC::Layout self, ...)
1069 CODE: 1234 CODE:
1070{ 1235{
1071 PangoAttrList *attrs = 0; 1236 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1237 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1238 const char *pos = text;
1108 if (attrs) 1273 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1274 pango_layout_set_attributes (self->pl, attrs);
1110} 1275}
1111 1276
1112void 1277void
1113get_shapes (CFPlus::Layout self) 1278get_shapes (DC::Layout self)
1114 PPCODE: 1279 PPCODE:
1115{ 1280{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1281 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1282
1118 do 1283 do
1119 { 1284 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1285 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1286
1122 if (run && shape_attr_p (run)) 1287 if (run && shape_attr_p (run))
1123 { 1288 {
1124 PangoRectangle extents; 1289 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1290 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1298
1134 pango_layout_iter_free (iter); 1299 pango_layout_iter_free (iter);
1135} 1300}
1136 1301
1137int 1302int
1138has_wrapped (CFPlus::Layout self) 1303has_wrapped (DC::Layout self)
1139 CODE: 1304 CODE:
1140{ 1305{
1141 int lines = 1; 1306 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1307 const char *text = pango_layout_get_text (self->pl);
1143 1308
1148} 1313}
1149 OUTPUT: 1314 OUTPUT:
1150 RETVAL 1315 RETVAL
1151 1316
1152SV * 1317SV *
1153get_text (CFPlus::Layout self) 1318get_text (DC::Layout self)
1154 CODE: 1319 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1320 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1321 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1322 OUTPUT:
1158 RETVAL 1323 RETVAL
1159 1324
1160void 1325void
1161set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1326set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162 CODE: 1327 CODE:
1163 self->r = r; 1328 self->r = r;
1164 self->g = g; 1329 self->g = g;
1165 self->b = b; 1330 self->b = b;
1166 self->a = a; 1331 self->a = a;
1167 1332
1168void 1333void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1334set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1335 CODE:
1171 if (self->font != font) 1336 if (self->font != font)
1172 { 1337 {
1173 self->font = font; 1338 self->font = font;
1174 layout_update_font (self); 1339 layout_update_font (self);
1175 } 1340 }
1176 1341
1177void 1342void
1178set_height (CFPlus::Layout self, int base_height) 1343set_height (DC::Layout self, int base_height)
1179 CODE: 1344 CODE:
1180 if (self->base_height != base_height) 1345 if (self->base_height != base_height)
1181 { 1346 {
1182 self->base_height = base_height; 1347 self->base_height = base_height;
1183 layout_update_font (self); 1348 layout_update_font (self);
1184 } 1349 }
1185 1350
1186void 1351void
1187set_width (CFPlus::Layout self, int max_width = -1) 1352set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1353 CODE:
1189 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1354 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190 1355
1191void 1356void
1192set_indent (CFPlus::Layout self, int indent) 1357set_indent (DC::Layout self, int indent)
1193 CODE: 1358 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1359 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1360
1196void 1361void
1197set_spacing (CFPlus::Layout self, int spacing) 1362set_spacing (DC::Layout self, int spacing)
1198 CODE: 1363 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1364 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1365
1201void 1366void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1367set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1368 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1369 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1370 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1371 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1372 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1373 : PANGO_ELLIPSIZE_NONE
1209 ); 1374 );
1210 1375
1211void 1376void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1377set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1378 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1379 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1380
1216void 1381void
1217size (CFPlus::Layout self) 1382size (DC::Layout self)
1218 PPCODE: 1383 PPCODE:
1219{ 1384{
1220 int w, h; 1385 int w, h;
1221 1386
1222 layout_get_pixel_size (self, &w, &h); 1387 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1390 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1391 PUSHs (sv_2mortal (newSViv (h)));
1227} 1392}
1228 1393
1229int 1394int
1230descent (CFPlus::Layout self) 1395descent (DC::Layout self)
1231 CODE: 1396 CODE:
1232{ 1397{
1233 PangoRectangle rect; 1398 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1399 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1400 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1401 RETVAL = PANGO_DESCENT (rect);
1237} 1402}
1238 OUTPUT: 1403 OUTPUT:
1239 RETVAL 1404 RETVAL
1240 1405
1241int 1406int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1407xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1408 CODE:
1244{ 1409{
1245 int index, trailing; 1410 int index, trailing;
1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1411 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247 RETVAL = index + trailing; 1412 RETVAL = index + trailing;
1248} 1413}
1249 OUTPUT: 1414 OUTPUT:
1250 RETVAL 1415 RETVAL
1251 1416
1252void 1417void
1253cursor_pos (CFPlus::Layout self, int index) 1418cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1419 PPCODE:
1255{ 1420{
1256 PangoRectangle strong_pos; 1421 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1422 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1423
1259 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1425 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1428}
1264 1429
1265void 1430void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1431index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1432 PPCODE:
1268{ 1433{
1269 int line, x; 1434 int line, x;
1270 1435
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1436 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1437#if !PANGO_VERSION_CHECK (1, 17, 3)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1438 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1439 --line;
1440#endif
1274 EXTEND (SP, 2); 1441 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1442 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1443 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1444}
1278 1445
1279void 1446void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1447line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1448 PPCODE:
1282{ 1449{
1283 PangoLayoutLine *lp; 1450 PangoLayoutLine *lp;
1284 int index, trailing; 1451 int index, trailing;
1285 1452
1286 if (line < 0) 1453 if (line < 0)
1287 XSRETURN_EMPTY; 1454 XSRETURN_EMPTY;
1288 1455
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1456 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1457 XSRETURN_EMPTY; /* do better */
1291 1458
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1459 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293 1460
1294 EXTEND (SP, 2); 1461 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1467 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1468 }
1302} 1469}
1303 1470
1304void 1471void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1472render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1473 CODE:
1474 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1475 pango_opengl_render_layout_subpixel (
1308 self->pl, 1476 self->pl,
1477 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1478 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1479 self->r, self->g, self->b, self->a,
1311 flags 1480 flags
1312 ); 1481 );
1482 // we assume that context_change actually clears/frees stuff
1483 // and does not do any recomputation...
1484 pango_layout_context_changed (self->pl);
1313 1485
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1486void
1487draw (DC::Layout self)
1488 CODE:
1489{
1490 glEnable (GL_TEXTURE_2D);
1491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1492 glEnable (GL_BLEND);
1493 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1494 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1495 glEnable (GL_ALPHA_TEST);
1496 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1497
1498 rc_draw (self->rc);
1499
1500 glDisable (GL_ALPHA_TEST);
1501 glDisable (GL_BLEND);
1502 glDisable (GL_TEXTURE_2D);
1503}
1504
1505MODULE = Deliantra::Client PACKAGE = DC::Texture
1315 1506
1316PROTOTYPES: ENABLE 1507PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1508
1320void 1509void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1510pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1511 CODE:
1323{ 1512{
1400 RETVAL = width > 0; 1589 RETVAL = width > 0;
1401} 1590}
1402 OUTPUT: 1591 OUTPUT:
1403 RETVAL 1592 RETVAL
1404 1593
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1594MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1595
1407PROTOTYPES: DISABLE 1596PROTOTYPES: DISABLE
1408 1597
1409CFPlus::Map 1598DC::Map
1410new (SV *class) 1599new (SV *class)
1411 CODE: 1600 CODE:
1412 New (0, RETVAL, 1, struct map); 1601 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1602 RETVAL->x = 0;
1414 RETVAL->y = 0; 1603 RETVAL->y = 0;
1422 RETVAL->row = 0; 1611 RETVAL->row = 0;
1423 OUTPUT: 1612 OUTPUT:
1424 RETVAL 1613 RETVAL
1425 1614
1426void 1615void
1427DESTROY (CFPlus::Map self) 1616DESTROY (DC::Map self)
1428 CODE: 1617 CODE:
1429{ 1618{
1430 map_clear (self); 1619 map_clear (self);
1431 Safefree (self->face2tile); 1620 Safefree (self->face2tile);
1432 Safefree (self->tex); 1621 Safefree (self->tex);
1433 Safefree (self); 1622 Safefree (self);
1434} 1623}
1435 1624
1436void 1625void
1437resize (CFPlus::Map self, int map_width, int map_height) 1626resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1627 CODE:
1439 self->w = map_width; 1628 self->w = map_width;
1440 self->h = map_height; 1629 self->h = map_height;
1441 1630
1442void 1631void
1443clear (CFPlus::Map self) 1632clear (DC::Map self)
1444 CODE: 1633 CODE:
1445 map_clear (self); 1634 map_clear (self);
1446 1635
1447void 1636void
1448set_tileid (CFPlus::Map self, int face, int tile) 1637set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1638 CODE:
1450{ 1639{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1640 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1641 need_texid (self, tile);
1453} 1642}
1454 1643
1455void 1644void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1645set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1646 CODE:
1458{ 1647{
1459 tileid texid; 1648 tileid texid;
1460 maptex *tex; 1649 maptex *tex;
1461 1650
1474 tex->smoothtile = self->face2tile [smooth]; 1663 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1664 tex->smoothlevel = level;
1476} 1665}
1477 1666
1478void 1667void
1479set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1668set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1480 CODE: 1669 CODE:
1481{ 1670{
1482 need_texid (self, texid); 1671 need_texid (self, texid);
1483 1672
1484 { 1673 {
1504 // from transparent color bleeding and ugly wrapping effects. 1693 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1695}
1507 1696
1508int 1697int
1509ox (CFPlus::Map self) 1698ox (DC::Map self)
1510 ALIAS: 1699 ALIAS:
1511 oy = 1 1700 oy = 1
1512 x = 2 1701 x = 2
1513 y = 3 1702 y = 3
1514 w = 4 1703 w = 4
1525 } 1714 }
1526 OUTPUT: 1715 OUTPUT:
1527 RETVAL 1716 RETVAL
1528 1717
1529void 1718void
1530scroll (CFPlus::Map self, int dx, int dy) 1719scroll (DC::Map self, int dx, int dy)
1531 CODE: 1720 CODE:
1532{ 1721{
1533 if (dx > 0) 1722 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1723 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1724 else if (dx < 0)
1550 self->rows += MAP_EXTEND_Y; 1739 self->rows += MAP_EXTEND_Y;
1551 self->y += MAP_EXTEND_Y; 1740 self->y += MAP_EXTEND_Y;
1552 } 1741 }
1553} 1742}
1554 1743
1555void 1744SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1745map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1746 CODE:
1558{ 1747{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1749 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1750 mapcell *cell;
1562 int x, y, flags; 1751 int x, y, z, flags;
1752 AV *missing = newAV ();
1753 RETVAL = newRV_noinc ((SV *)missing);
1563 1754
1564 while (data < data_end - 1) 1755 while (data < data_end - 1)
1565 { 1756 {
1566 flags = (data [0] << 8) + data [1]; data += 2; 1757 flags = (data [0] << 8) + data [1]; data += 2;
1567 1758
1587 uint8_t ext, cmd; 1778 uint8_t ext, cmd;
1588 1779
1589 do 1780 do
1590 { 1781 {
1591 ext = *data++; 1782 ext = *data++;
1592 cmd = ext & 0x3f; 1783 cmd = ext & 0x7f;
1593 1784
1594 if (cmd < 4) 1785 if (cmd < 4)
1595 cell->darkness = 255 - ext * 64 + 1; 1786 cell->darkness = 255 - ext * 64 + 1;
1596 else if (cmd == 5) // health 1787 else if (cmd == 5) // health
1597 { 1788 {
1600 } 1791 }
1601 else if (cmd == 6) // monster width 1792 else if (cmd == 6) // monster width
1602 cell->stat_width = *data++ + 1; 1793 cell->stat_width = *data++ + 1;
1603 else if (cmd == 0x47) 1794 else if (cmd == 0x47)
1604 { 1795 {
1605 if (*data == 4) 1796 if (*data == 1) cell->player = data [1];
1606 ; // decode player count 1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1607 1800
1608 data += *data + 1; 1801 data += *data + 1;
1609 } 1802 }
1610 else if (cmd == 8) // cell flags 1803 else if (cmd == 8) // cell flags
1611 cell->flags = *data++; 1804 cell->flags = *data++;
1618 } 1811 }
1619 else 1812 else
1620 cell->darkness = *data++ + 1; 1813 cell->darkness = *data++ + 1;
1621 } 1814 }
1622 1815
1816 for (z = 0; z <= 2; ++z)
1623 if (flags & 4) 1817 if (flags & (4 >> z))
1624 { 1818 {
1625 faceid face = (data [0] << 8) + data [1]; data += 2; 1819 faceid face = (data [0] << 8) + data [1]; data += 2;
1626 need_facenum (self, face); 1820 need_facenum (self, face);
1627 cell->tile [0] = self->face2tile [face]; 1821 cell->tile [z] = self->face2tile [face];
1822
1823 if (cell->tile [z])
1824 {
1825 maptex *tex = self->tex + cell->tile [z];
1826 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z]));
1828
1829 if (tex->smoothtile)
1830 {
1831 maptex *smooth = self->tex + tex->smoothtile;
1832 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile));
1834 }
1835 }
1628 } 1836 }
1629
1630 if (flags & 2)
1631 {
1632 faceid face = (data [0] << 8) + data [1]; data += 2;
1633 need_facenum (self, face);
1634 cell->tile [1] = self->face2tile [face];
1635 }
1636
1637 if (flags & 1)
1638 {
1639 faceid face = (data [0] << 8) + data [1]; data += 2;
1640 need_facenum (self, face);
1641 cell->tile [2] = self->face2tile [face];
1642 }
1643 } 1837 }
1644 else 1838 else
1645 cell->darkness = 0; 1839 CELL_CLEAR (cell);
1646 } 1840 }
1647} 1841}
1842 OUTPUT:
1843 RETVAL
1648 1844
1649SV * 1845SV *
1650mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1846mapmap (DC::Map self, int x0, int y0, int w, int h)
1651 CODE: 1847 CODE:
1652{ 1848{
1653 int x1, x; 1849 int x1, x;
1654 int y1, y; 1850 int y1, y;
1655 int z; 1851 int z;
1699 RETVAL = map_sv; 1895 RETVAL = map_sv;
1700} 1896}
1701 OUTPUT: 1897 OUTPUT:
1702 RETVAL 1898 RETVAL
1703 1899
1704SV * 1900void
1705draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1706 CODE: 1902 CODE:
1707{ 1903{
1904 int x, y, z;
1905
1708 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1709 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1710 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1711 smooth_key skey; 1909 smooth_key skey;
1712 int x, y, z; 1910 int pl_x, pl_y;
1713 int last_name; 1911 maptex pl_tex;
1714 AV *missing = newAV (); 1912 rc_t *rc = rc_alloc ();
1715 RETVAL = newRV_noinc ((SV *)missing); 1913 rc_key_t key;
1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1716 1917
1717 // thats current max. sorry. 1918 // thats current max. sorry.
1718 if (sw > 255) sw = 255; 1919 if (sw > 255) sw = 255;
1719 if (sh > 255) sh = 255; 1920 if (sh > 255) sh = 255;
1720 1921
1721 // clear key, in case of extra padding 1922 // clear key, in case of extra padding
1722 memset (&skey, 0, sizeof (skey)); 1923 memset (&skey, 0, sizeof (skey));
1723 1924
1724 glColor4ub (255, 255, 255, 255); 1925 memset (&key, 0, sizeof (key));
1725 1926 key.r = 255;
1726 glEnable (GL_BLEND); 1927 key.g = 255;
1727 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1928 key.b = 255;
1728 glEnable (GL_TEXTURE_2D); 1929 key.a = 255;
1729 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1930 key.mode = GL_QUADS;
1730 1931 key.format = GL_T2F_V3F;
1731 glBegin (GL_QUADS);
1732
1733 last_name = -1; 1932 key.texname = -1;
1734 1933
1735 mx += self->x; 1934 mx += self->x;
1736 my += self->y; 1935 my += self->y;
1737 1936
1738 // first pass: determine smooth_max 1937 // first pass: determine smooth_max
1754 MAX (self->tex [cell->tile [0]].smoothlevel, 1953 MAX (self->tex [cell->tile [0]].smoothlevel,
1755 MAX (self->tex [cell->tile [1]].smoothlevel, 1954 MAX (self->tex [cell->tile [1]].smoothlevel,
1756 self->tex [cell->tile [2]].smoothlevel)); 1955 self->tex [cell->tile [2]].smoothlevel));
1757 } 1956 }
1758 } 1957 }
1958
1959 glEnable (GL_BLEND);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759 1962
1760 for (z = 0; z <= 2; z++) 1963 for (z = 0; z <= 2; z++)
1761 { 1964 {
1762 memset (smooth_level, 0, sizeof (smooth_level)); 1965 memset (smooth_level, 0, sizeof (smooth_level));
1763 1966
1773 tileid tile = cell->tile [z]; 1976 tileid tile = cell->tile [z];
1774 1977
1775 if (tile) 1978 if (tile)
1776 { 1979 {
1777 maptex tex = self->tex [tile]; 1980 maptex tex = self->tex [tile];
1778 int px, py; 1981 int px = (x + 1) * T - tex.w;
1982 int py = (y + 1) * T - tex.h;
1779 1983
1780 // suppressing texture state switches here
1781 // is only moderately effective, but worth the extra effort
1782 if (last_name != tex.name) 1984 if (key.texname != tex.name)
1783 { 1985 {
1784 if (!tex.name) 1986 if (!tex.name)
1785 {
1786 av_push (missing, newSViv (tile));
1787 tex = self->tex [2]; /* missing, replace by noface */ 1987 tex = self->tex [2]; /* missing, replace by noface */
1788 }
1789 1988
1790 glEnd (); 1989 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1990 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 1991 }
1794 1992
1795 px = (x + 1) * T - tex.w; 1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1796 py = (y + 1) * T - tex.h;
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 { 1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
2000
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
1805 if (cell->flags & 1) 2009 if (cell->flags & 1)
1806 { 2010 {
1807 maptex tex = self->tex [1]; 2011 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32; 2012 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32; 2013 int py = y * T - T * 6 / 32;
1810 2014
2015 if (tex.name)
1811 glEnd (); 2016 {
1812 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1813 glBegin (GL_QUADS); 2027 }
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 } 2028 }
1820 } 2029 }
1821 2030
1822 // update smooth hash 2031 // update smooth hash
1823 if (tex.smoothtile) 2032 if (tex.smoothtile)
1859 } 2068 }
1860 } 2069 }
1861 } 2070 }
1862 } 2071 }
1863 2072
2073 rc_draw (rc);
2074 rc_clear (rc);
2075
1864 // go through all smoothlevels, lowest to highest, then draw. 2076 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 2077 // this is basically counting sort
1866 { 2078 {
1867 int w, b; 2079 int w, b;
1868 2080
2081 glEnable (GL_TEXTURE_2D);
2082 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2083 for (w = 0; w < 256 / 32; ++w)
1870 { 2084 {
1871 uint32_t smask = smooth_level [w]; 2085 uint32_t smask = smooth_level [w];
1872 if (smask) 2086 if (smask)
1873 for (b = 0; b < 32; ++b) 2087 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2106 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2107 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2108 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2109 float dy = tex.t * .5f ; // 2 images/column
1896 2110
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2111 if (tex.name)
1900 { 2112 {
2113 // this time avoiding texture state changes
2114 // save gobs of state changes.
1901 if (!tex.name) 2115 if (key.texname != tex.name)
1902 { 2116 {
1903 av_push (missing, newSViv (skey->tile)); 2117 glEnd ();
1904 continue; // smoothing not yet available 2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS);
1905 } 2120 }
1906 2121
1907 glEnd ();
1908 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1909 glBegin (GL_QUADS);
1910 }
1911
1912 if (border) 2122 if (border)
1913 { 2123 {
1914 float ox = border * dx; 2124 float ox = border * dx;
1915 2125
1916 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1917 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1918 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1919 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1920 } 2130 }
1921 2131
1922 if (corner) 2132 if (corner)
1923 { 2133 {
1924 float ox = corner * dx; 2134 float ox = corner * dx;
1925 2135
1926 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2136 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1927 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1928 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1929 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2140 }
1930 } 2141 }
1931 } 2142 }
1932 } 2143 }
1933 } 2144 }
1934 } 2145 }
2146
2147 glEnd ();
2148 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1;
1935 } 2150 }
1936 2151
1937 hv_clear (smooth); 2152 hv_clear (smooth);
1938 } 2153 }
1939 2154
1940 glEnd (); 2155 if (pl_tex.name)
2156 {
2157 maptex tex = pl_tex;
2158 int px = pl_x + sdx;
2159 int py = pl_y + sdy;
1941 2160
1942 glDisable (GL_TEXTURE_2D); 2161 key.texname = tex.name;
2162 arr = rc_array (rc, &key);
2163
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2166 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168
2169 rc_draw (rc);
2170 }
2171
1943 glDisable (GL_BLEND); 2172 glDisable (GL_BLEND);
2173 rc_free (rc);
1944 2174
1945 // top layer: overlays such as the health bar 2175 // top layer: overlays such as the health bar
1946 for (y = 0; y < sh; y++) 2176 for (y = 0; y < sh; y++)
1947 if (0 <= y + my && y + my < self->rows) 2177 if (0 <= y + my && y + my < self->rows)
1948 { 2178 {
1971 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 2201 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1972 } 2202 }
1973 } 2203 }
1974 } 2204 }
1975} 2205}
1976 OUTPUT:
1977 RETVAL
1978 2206
1979void 2207void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981 CODE: 2209 CODE:
1982{ 2210{
1983 static float color[16][3] = { 2211 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2212 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2213 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2263 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2264 glDisable (GL_TEXTURE_2D);
2037} 2265}
2038 2266
2039void 2267void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2268fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2269 PPCODE:
2042{ 2270{
2043 int x, y; 2271 int x, y;
2044 int sw1 = sw + 2; 2272 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2273 int sh1 = sh + 2;
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
2054 2282
2055 mx += self->x - 1; 2283 mx += self->x - 1;
2056 my += self->y - 1; 2284 my += self->y - 1;
2057 2285
2058 memset (darkness1, 255, sw1 * sh1); 2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2059 2287
2060 for (y = 0; y < sh1; y++) 2288 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
2062 { 2290 {
2063 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2344 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2345 PUSHs (darkness3_sv);
2118} 2346}
2119 2347
2120SV * 2348SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2349get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2350 CODE:
2123{ 2351{
2124 int x, y, x1, y1; 2352 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2353 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2354 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2411 else
2184 *data++ = 0; 2412 *data++ = 0;
2185 } 2413 }
2186 } 2414 }
2187 2415
2416 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 {
2188 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
2190 RETVAL = data_sv; 2423 RETVAL = data_sv;
2191} 2424}
2192 OUTPUT: 2425 OUTPUT:
2193 RETVAL 2426 RETVAL
2194 2427
2195void 2428void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2430 PPCODE:
2198{ 2431{
2199 int x, y, z; 2432 int x, y, z;
2200 int w, h; 2433 int w, h;
2201 int x1, y1; 2434 int x1, y1;
2435 STRLEN len;
2436 uint8_t *data, *end;
2437
2438 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv);
2441 end = data + len + 8;
2442
2443 if (len < 5)
2444 XSRETURN_EMPTY;
2202 2445
2203 if (*data++ != 0) 2446 if (*data++ != 0)
2204 return; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
2205 2448
2206 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2450 h = *data++ << 8; h |= *data++;
2208 2451
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2452 // we need to do this 'cause we don't keep an absolute coord system for rows
2221 { 2464 {
2222 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
2223 2466
2224 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
2225 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
2226 uint8_t flags = *data++; 2474 flags = *data++;
2227 2475
2228 if (flags) 2476 if (flags)
2229 { 2477 {
2230 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2479 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2484
2237 if (cell->darkness == 0) 2485 if (cell->darkness == 0)
2238 { 2486 {
2239 cell->darkness = 0; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
2240 2489
2241 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
2242 { 2491 {
2243 tileid t = tile [z]; 2492 tileid t = tile [z];
2244 2493
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2495 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2497 need_texid (self, t);
2249 } 2498 }
2250 2499
2251 cell->tile [z] = t; 2500 cell->tile [z] = t;
2252 } 2501 }
2254 } 2503 }
2255 } 2504 }
2256 } 2505 }
2257} 2506}
2258 2507
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2508MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2509
2261CFPlus::RW 2510DC::RW
2262new (SV *class, SV *data_sv) 2511new (SV *class, SV *data_sv)
2263 CODE: 2512 CODE:
2264{ 2513{
2265 STRLEN datalen; 2514 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2515 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2517 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2518}
2270 OUTPUT: 2519 OUTPUT:
2271 RETVAL 2520 RETVAL
2272 2521
2273CFPlus::RW 2522DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2523new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2524 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2525 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2526 OUTPUT:
2278 RETVAL 2527 RETVAL
2279 2528
2280# fails on win32: 2529# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2530# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2531#void
2283#close (CFPlus::RW self) 2532#close (DC::RW self)
2284# CODE: 2533# CODE:
2285# (self->(close)) (self); 2534# (self->(close)) (self);
2286 2535
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2536MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2537
2289PROTOTYPES: DISABLE 2538PROTOTYPES: DISABLE
2290 2539
2291CFPlus::Channel 2540DC::Channel
2292find () 2541find ()
2293 CODE: 2542 CODE:
2294{ 2543{
2295 RETVAL = Mix_GroupAvailable (-1); 2544 RETVAL = Mix_GroupAvailable (-1);
2296 2545
2309} 2558}
2310 OUTPUT: 2559 OUTPUT:
2311 RETVAL 2560 RETVAL
2312 2561
2313void 2562void
2314halt (CFPlus::Channel self) 2563halt (DC::Channel self)
2315 CODE: 2564 CODE:
2316 Mix_HaltChannel (self); 2565 Mix_HaltChannel (self);
2317 2566
2318void 2567void
2319expire (CFPlus::Channel self, int ticks = -1) 2568expire (DC::Channel self, int ticks = -1)
2320 CODE: 2569 CODE:
2321 Mix_ExpireChannel (self, ticks); 2570 Mix_ExpireChannel (self, ticks);
2322 2571
2323void 2572void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2573fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2574 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2575 Mix_FadeOutChannel (self, ticks);
2327 2576
2328int 2577int
2329volume (CFPlus::Channel self, int volume) 2578volume (DC::Channel self, int volume)
2330 CODE: 2579 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2580 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2581 OUTPUT:
2333 RETVAL 2582 RETVAL
2334 2583
2335void 2584void
2336unregister_all_effects (CFPlus::Channel self) 2585unregister_all_effects (DC::Channel self)
2337 CODE: 2586 CODE:
2338 Mix_UnregisterAllEffects (self); 2587 Mix_UnregisterAllEffects (self);
2339 2588
2340void 2589void
2341set_panning (CFPlus::Channel self, int left, int right) 2590set_panning (DC::Channel self, int left, int right)
2342 CODE: 2591 CODE:
2343 left = CLAMP (left , 0, 255); 2592 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2593 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2594 Mix_SetPanning (self, left, right);
2346 2595
2347void 2596void
2348set_distance (CFPlus::Channel self, int distance) 2597set_distance (DC::Channel self, int distance)
2349 CODE: 2598 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2599 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2600
2352void 2601void
2353set_position (CFPlus::Channel self, int angle, int distance) 2602set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2603 CODE:
2355 2604
2356void 2605void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2607 CODE:
2359{ 2608{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2612}
2364 2613
2365void 2614void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2615set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2616 CODE:
2368 Mix_SetReverseStereo (self, flip); 2617 Mix_SetReverseStereo (self, flip);
2369 2618
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2620
2372PROTOTYPES: DISABLE 2621PROTOTYPES: DISABLE
2373 2622
2374CFPlus::MixChunk 2623DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2624new (SV *class, DC::RW rwops)
2376 CODE: 2625 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2626 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2627 OUTPUT:
2379 RETVAL 2628 RETVAL
2380 2629
2381void 2630void
2382DESTROY (CFPlus::MixChunk self) 2631DESTROY (DC::MixChunk self)
2383 CODE: 2632 CODE:
2384 Mix_FreeChunk (self); 2633 Mix_FreeChunk (self);
2385 2634
2386int 2635int
2387volume (CFPlus::MixChunk self, int volume = -1) 2636volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2637 CODE:
2389 if (items > 1) 2638 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2639 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2640 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2641 OUTPUT:
2393 RETVAL 2642 RETVAL
2394 2643
2395CFPlus::Channel 2644DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2645play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2646 CODE:
2398{ 2647{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2648 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2649
2401 if (RETVAL < 0) 2650 if (RETVAL < 0)
2408 } 2657 }
2409} 2658}
2410 OUTPUT: 2659 OUTPUT:
2411 RETVAL 2660 RETVAL
2412 2661
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414 2663
2415int 2664int
2416volume (int volume = -1) 2665volume (int volume = -1)
2417 PROTOTYPE: ;$ 2666 PROTOTYPE: ;$
2418 CODE: 2667 CODE:
2430void 2679void
2431halt () 2680halt ()
2432 CODE: 2681 CODE:
2433 Mix_HaltMusic (); 2682 Mix_HaltMusic ();
2434 2683
2435CFPlus::MixMusic 2684DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2685new (SV *class, DC::RW rwops)
2437 CODE: 2686 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2687 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2688 OUTPUT:
2440 RETVAL 2689 RETVAL
2441 2690
2442void 2691void
2443DESTROY (CFPlus::MixMusic self) 2692DESTROY (DC::MixMusic self)
2444 CODE: 2693 CODE:
2445 Mix_FreeMusic (self); 2694 Mix_FreeMusic (self);
2446 2695
2447int 2696int
2448play (CFPlus::MixMusic self, int loops = -1) 2697play (DC::MixMusic self, int loops = -1)
2449 CODE: 2698 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2699 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2700 OUTPUT:
2452 RETVAL 2701 RETVAL
2453 2702
2454void 2703void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2704fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2705 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2706 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2707
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2708MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2709
2461PROTOTYPES: ENABLE 2710PROTOTYPES: ENABLE
2462 2711
2463BOOT: 2712BOOT:
2464{ 2713{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2714 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2715 static const struct {
2467 const char *name; 2716 const char *name;
2468 IV iv; 2717 IV iv;
2469 } *civ, const_iv[] = { 2718 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2719# define const_iv(name) { # name, (IV)name }
2505 const_iv (GL_INTENSITY), 2754 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2755 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2756 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2757 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2758 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2759 const_iv (GL_COMPRESSED_ALPHA_ARB),
2760 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2761 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2762 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2763 const_iv (GL_COMPRESSED_RGB_ARB),
2764 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 2765 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2766 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2767 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2768 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2769 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2808 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2809 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2810 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2811 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2812 const_iv (GL_GENERATE_MIPMAP_HINT),
2813 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2814 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2815 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2816 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2817 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2818 const_iv (GL_V3F),
2570 2826
2571 texture_av = newAV (); 2827 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2828 AvREAL_off (texture_av);
2573} 2829}
2574 2830
2831void
2832disable_GL_EXT_blend_func_separate ()
2833 CODE:
2834 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0;
2836
2575char * 2837char *
2576gl_vendor () 2838gl_vendor ()
2577 CODE: 2839 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2840 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2841 OUTPUT:
2700 2962
2701void glRect (float x1, float y1, float x2, float y2) 2963void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 2964 CODE:
2703 glRectf (x1, y1, x2, y2); 2965 glRectf (x1, y1, x2, y2);
2704 2966
2967void glRect_lineloop (float x1, float y1, float x2, float y2)
2968 CODE:
2969 glBegin (GL_LINE_LOOP);
2970 glVertex2f (x1, y1);
2971 glVertex2f (x2, y1);
2972 glVertex2f (x2, y2);
2973 glVertex2f (x1, y2);
2974 glEnd ();
2975
2705PROTOTYPES: ENABLE 2976PROTOTYPES: ENABLE
2706 2977
2707void glBegin (int mode) 2978void glBegin (int mode)
2708 2979
2709void glEnd () 2980void glEnd ()
2741void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3012void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742 CODE: 3013 CODE:
2743 if (gl.SeparableFilter2D) 3014 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3015 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 3016
2746void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3017void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747 3018
2748void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3019void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749 3020
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 3021void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 3022
2777 3048
2778void glEndList () 3049void glEndList ()
2779 3050
2780void glCallList (int list) 3051void glCallList (int list)
2781 3052
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 3054
2784PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2785 3056
2786void 3057void
2787find_widget (SV *self, NV x, NV y) 3058find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 3062 XPUSHs (self);
2792} 3063}
2793 3064
2794BOOT: 3065BOOT:
2795{ 3066{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3067 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3068
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3069 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3070 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3071 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3072 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802} 3073}
2803 3074
2804void 3075void
2805draw (SV *self) 3076draw (SV *self)
2806 CODE: 3077 CODE:
2810 NV x, y, w, h; 3081 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3082 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3083 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3084 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3085 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3086 double draw_x, draw_y;
2817 3087
2818 if (!SvROK (self)) 3088 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3089 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3090
2821 hv = (HV *)SvRV (self); 3091 hv = (HV *)SvRV (self);
2822 3092
2823 if (SvTYPE (hv) != SVt_PVHV) 3093 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3094 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3095
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3096 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3097 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 3098
2829 if (!h || !w) 3099 if (!h || !w)
2849 { 3119 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3120 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3121
2852 if (svp && SvTRUE (*svp)) 3122 if (svp && SvTRUE (*svp))
2853 { 3123 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3124 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 3125 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3126 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3127 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3128 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3129 glVertex2f (w, 0);
2862 glEnd (); 3132 glEnd ();
2863 glDisable (GL_BLEND); 3133 glDisable (GL_BLEND);
2864 } 3134 }
2865 } 3135 }
2866#if 0 3136#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3137 // draw borders, for debugging
2868 glPushMatrix; 3138 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3139 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3140 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3141 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3142 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3143 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3144 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3145 glVertex2f (0 , h - 1);
2876 glEnd; 3146 glEnd ();
2877 glPopMatrix; 3147 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3148#endif
2881 PUSHMARK (SP); 3149 PUSHMARK (SP);
2882 XPUSHs (self); 3150 XPUSHs (self);
2883 PUTBACK; 3151 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 3152 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines