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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.265 by root, Fri Jul 18 22:56:11 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>
40#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
41 46
42#include <glib/gmacros.h> 47#include <glib/gmacros.h>
43 48
44#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
45 61
46#ifndef _WIN32 62#ifndef _WIN32
47# include <sys/types.h> 63# include <sys/types.h>
48# include <sys/socket.h> 64# include <sys/socket.h>
49# include <netinet/in.h> 65# include <netinet/in.h>
50# include <netinet/tcp.h> 66# include <netinet/tcp.h>
51# include <inttypes.h> 67# include <inttypes.h>
52#endif 68#endif
53 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 80
56#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
57 82
58#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
60 85
61#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
62 87
63#if 0 88/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else
66# define PARACHUTE 0
67#endif
68 90
69static AV *texture_av; 91static AV *texture_av;
70 92
71static struct 93static struct
72{ 94{
109 av_push (texture_av, (SV *)(size_t)name); 131 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 132 glDeleteTextures (1, &name);
111} 133}
112 134
113#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
114 137
115#include "pango-font.c" 138#include "pango-font.c"
116#include "pango-fontmap.c" 139#include "pango-fontmap.c"
117#include "pango-render.c" 140#include "pango-render.c"
118 141
119typedef IV CFPlus__Channel; 142typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 143typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
123 146
124typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
125 148
126static int 149static int
127shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
128{ 151{
129 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
143 166
144typedef struct cf_layout { 167typedef struct cf_layout {
145 PangoLayout *pl; 168 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
147 int base_height; 170 int base_height;
148 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
149} *CFPlus__Layout; 173} *DC__Layout;
150 174
151static CFPlus__Font default_font; 175static DC__Font default_font;
152static PangoContext *opengl_context; 176static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
154 178
155static void 179static void
156substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
161#endif 185#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 187}
164 188
165static void 189static void
166layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
167{ 191{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
170 */ 194 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
172 196
173 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 199
176 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
177} 201}
178 202
179static void 203static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 205{
182 PangoRectangle rect; 206 PangoRectangle rect;
183 207
184 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
196 220
197typedef uint16_t tileid; 221typedef uint16_t tileid;
198typedef uint16_t faceid; 222typedef uint16_t faceid;
199 223
200typedef struct { 224typedef struct {
201 int name; 225 GLuint name;
202 int w, h; 226 int w, h;
203 float s, t; 227 float s, t;
204 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
205 tileid smoothtile; 229 tileid smoothtile;
206 uint8_t smoothlevel; 230 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
226 250
227 int32_t rows; 251 int32_t rows;
228 maprow *row; 252 maprow *row;
229} *CFPlus__Map; 253} *DC__Map;
230 254
231static char * 255static char *
232prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
233{ 257{
234 char *p; 258 char *p;
272 self->texs *= 2; 296 self->texs *= 2;
273 } 297 }
274} 298}
275 299
276static maprow * 300static maprow *
277map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
278{ 302{
279 if (0 > y) 303 if (0 > y)
280 { 304 {
281 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
320 344
321 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
322} 346}
323 347
324static mapcell * 348static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
326{ 350{
327 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
328} 352}
329 353
330static void 354static void
331map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
332{ 356{
333 int r; 357 int r;
334 358
335 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
344 self->row = 0; 368 self->row = 0;
345 self->rows = 0; 369 self->rows = 0;
346} 370}
347 371
348static void 372static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 373map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 374{
351 int x, y; 375 int x, y;
352 maprow *row; 376 maprow *row;
353 mapcell *cell; 377 mapcell *cell;
354 378
433 n |= n >> 16; 457 n |= n >> 16;
434 458
435 return n + 1; 459 return n + 1;
436} 460}
437 461
462static unsigned int
463popcount (unsigned int n)
464{
465 n -= (n >> 1) & 0x55555555U;
466 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
467 n = ((n >> 4) + n) & 0x0f0f0f0fU;
468 n *= 0x01010101U;
469
470 return n >> 24;
471}
472
438/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
441 476
442/******************************************************************************/ 477/******************************************************************************/
480 return 0; 515 return 0;
481 516
482 return 1; 517 return 1;
483} 518}
484 519
485MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
486 521
487PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
488 523
489BOOT: 524BOOT:
490{ 525{
491 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 527 static const struct {
493 const char *name; 528 const char *name;
494 IV iv; 529 IV iv;
495 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
518 553
519 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
522 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
641
642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
604# undef const_iv 670# undef const_iv
605 }; 671 };
606 672
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 692
627NV floor (NV x) 693NV floor (NV x)
628 694
629NV ceil (NV x) 695NV ceil (NV x)
630 696
697IV minpot (UV n)
698
699IV popcount (UV n)
700
631void 701void
632pango_init () 702pango_init ()
633 CODE: 703 CODE:
634{ 704{
635 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 706 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); 707 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
708 /*pango_context_set_font_description (opengl_context, default_font);*/
709#if PANGO_VERSION_CHECK (1, 15, 2)
710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif
638} 713}
639 714
640char *
641SDL_GetError () 715char *SDL_GetError ()
642 716
643int 717int SDL_Init (U32 flags)
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 718
646void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
647SDL_Quit () 723void SDL_Quit ()
724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
648 733
649void 734void
650SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
651 PPCODE: 736 PPCODE:
652{ 737{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 752
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 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); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 755
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 757
676 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
677 while (*m) 759 while (*m)
678 { 760 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 761 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 762 {
681 AV *av = newAV (); 763 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 764 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 765 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 766 av_push (av, newSViv (rgb));
708 790
709 if (RETVAL) 791 if (RETVAL)
710 { 792 {
711 av_clear (texture_av); 793 av_clear (texture_av);
712 794
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 796#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 797#include "glfunc.h"
716#undef GL_FUNC 798#undef GL_FUNC
717 } 799 }
718} 800}
725char * 807char *
726SDL_GetKeyName (int sym) 808SDL_GetKeyName (int sym)
727 809
728int 810int
729SDL_GetAppState () 811SDL_GetAppState ()
812
813int
814SDL_GetModState ()
730 815
731void 816void
732poll_events () 817poll_events ()
733 PPCODE: 818 PPCODE:
734{ 819{
744 { 829 {
745 case SDL_KEYDOWN: 830 case SDL_KEYDOWN:
746 case SDL_KEYUP: 831 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 834 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 */ 835 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); 836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 837 break;
753 838
754 case SDL_ACTIVEEVENT: 839 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 858 x = ev.motion.x;
774 y = ev.motion.y; 859 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 861 }
777 862
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 864 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 865 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 866 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 867 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 868 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 869 }
785 break; 870 break;
786 871
787 case SDL_MOUSEBUTTONDOWN: 872 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 873 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 874 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 875
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 876 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 877 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 878 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 879 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 884 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 885 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 886 break;
802 } 887 }
803 888
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 889 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 890 }
806} 891}
807 892
808int 893int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 894Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 895 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 896 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 897 Mix_ChannelFinished (channel_finished);
813 898
814void 899void
900Mix_QuerySpec ()
901 PPCODE:
902{
903 int freq, channels;
904 Uint16 format;
905
906 if (Mix_QuerySpec (&freq, &format, &channels))
907 {
908 EXTEND (SP, 3);
909 PUSHs (sv_2mortal (newSViv (freq)));
910 PUSHs (sv_2mortal (newSViv (format)));
911 PUSHs (sv_2mortal (newSViv (channels)));
912 }
913}
914
915void
815Mix_CloseAudio () 916Mix_CloseAudio ()
816 917
817int 918int
818Mix_AllocateChannels (int numchans = -1) 919Mix_AllocateChannels (int numchans = -1)
920
921const char *
922Mix_GetError ()
819 923
820void 924void
821lowdelay (int fd, int val = 1) 925lowdelay (int fd, int val = 1)
822 CODE: 926 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 927 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 953 }
850 } 954 }
851#endif 955#endif
852} 956}
853 957
854void 958int
855add_font (char *file) 959add_font (char *file)
856 CODE: 960 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT:
963 RETVAL
858 964
859void 965void
860load_image_inline (SV *image_) 966load_image_inline (SV *image_)
861 ALIAS: 967 ALIAS:
862 load_image_file = 1 968 load_image_file = 1
948void 1054void
949error (char *message) 1055error (char *message)
950 CODE: 1056 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1057 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1058#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1059 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1060#endif
955 1061
956void 1062void
957fatal (char *message) 1063fatal (char *message)
958 CODE: 1064 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1065 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1066#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1067 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1068#endif
963 _exit (1); 1069 _exit (1);
964 1070
965void 1071void
966_exit (int retval = 0) 1072_exit (int retval = 0)
978#if DEBUG 1084#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1085 VALGRIND_DO_LEAK_CHECK;
980#endif 1086#endif
981} 1087}
982 1088
983MODULE = CFPlus PACKAGE = CFPlus::Font 1089MODULE = Deliantra::Client PACKAGE = DC::Font
984 1090
985PROTOTYPES: DISABLE 1091PROTOTYPES: DISABLE
986 1092
987CFPlus::Font 1093DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1094new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1095 CODE:
990{ 1096{
991 int count; 1097 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1101}
996 OUTPUT: 1102 OUTPUT:
997 RETVAL 1103 RETVAL
998 1104
999void 1105void
1000DESTROY (CFPlus::Font self) 1106DESTROY (DC::Font self)
1001 CODE: 1107 CODE:
1002 pango_font_description_free (self); 1108 pango_font_description_free (self);
1003 1109
1004void 1110void
1005make_default (CFPlus::Font self) 1111make_default (DC::Font self)
1006 PROTOTYPE: $ 1112 PROTOTYPE: $
1007 CODE: 1113 CODE:
1008 default_font = self; 1114 default_font = self;
1009 1115
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1116MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1117
1012PROTOTYPES: DISABLE 1118PROTOTYPES: DISABLE
1013 1119
1014void 1120void
1015reset_glyph_cache () 1121glyph_cache_backup ()
1016 PROTOTYPE: 1122 PROTOTYPE:
1017 CODE: 1123 CODE:
1124 tc_backup ();
1125
1126void
1127glyph_cache_restore ()
1128 PROTOTYPE:
1129 CODE:
1018 tc_clear (); 1130 tc_restore ();
1019 1131
1020CFPlus::Layout 1132DC::Layout
1021new (SV *class) 1133new (SV *class)
1022 CODE: 1134 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1135 New (0, RETVAL, 1, struct cf_layout);
1024 1136
1025 RETVAL->pl = pango_layout_new (opengl_context); 1137 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1139 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1140 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1141 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1142 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1143 RETVAL->font = 0;
1144 RETVAL->rc = rc_alloc ();
1032 1145
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1146 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1147 layout_update_font (RETVAL);
1035 OUTPUT: 1148 OUTPUT:
1036 RETVAL 1149 RETVAL
1037 1150
1038void 1151void
1039DESTROY (CFPlus::Layout self) 1152DESTROY (DC::Layout self)
1040 CODE: 1153 CODE:
1041 g_object_unref (self->pl); 1154 g_object_unref (self->pl);
1155 rc_free (self->rc);
1042 Safefree (self); 1156 Safefree (self);
1043 1157
1044void 1158void
1045set_text (CFPlus::Layout self, SV *text_) 1159set_text (DC::Layout self, SV *text_)
1046 CODE: 1160 CODE:
1047{ 1161{
1048 STRLEN textlen; 1162 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1163 char *text = SvPVutf8 (text_, textlen);
1050 1164
1051 pango_layout_set_text (self->pl, text, textlen); 1165 pango_layout_set_text (self->pl, text, textlen);
1052} 1166}
1053 1167
1054void 1168void
1055set_markup (CFPlus::Layout self, SV *text_) 1169set_markup (DC::Layout self, SV *text_)
1056 CODE: 1170 CODE:
1057{ 1171{
1058 STRLEN textlen; 1172 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1173 char *text = SvPVutf8 (text_, textlen);
1060 1174
1061 pango_layout_set_markup (self->pl, text, textlen); 1175 pango_layout_set_markup (self->pl, text, textlen);
1062} 1176}
1063 1177
1064void 1178void
1065set_shapes (CFPlus::Layout self, ...) 1179set_shapes (DC::Layout self, ...)
1066 CODE: 1180 CODE:
1067{ 1181{
1068 PangoAttrList *attrs = 0; 1182 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1183 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1184 const char *pos = text;
1105 if (attrs) 1219 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1220 pango_layout_set_attributes (self->pl, attrs);
1107} 1221}
1108 1222
1109void 1223void
1110get_shapes (CFPlus::Layout self) 1224get_shapes (DC::Layout self)
1111 PPCODE: 1225 PPCODE:
1112{ 1226{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1227 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1228
1115 do 1229 do
1116 { 1230 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1231 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1232
1119 if (run && shape_attr_p (run)) 1233 if (run && shape_attr_p (run))
1120 { 1234 {
1121 PangoRectangle extents; 1235 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1236 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1244
1131 pango_layout_iter_free (iter); 1245 pango_layout_iter_free (iter);
1132} 1246}
1133 1247
1134int 1248int
1135has_wrapped (CFPlus::Layout self) 1249has_wrapped (DC::Layout self)
1136 CODE: 1250 CODE:
1137{ 1251{
1138 int lines = 1; 1252 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1253 const char *text = pango_layout_get_text (self->pl);
1140 1254
1145} 1259}
1146 OUTPUT: 1260 OUTPUT:
1147 RETVAL 1261 RETVAL
1148 1262
1149SV * 1263SV *
1150get_text (CFPlus::Layout self) 1264get_text (DC::Layout self)
1151 CODE: 1265 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1266 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1267 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1268 OUTPUT:
1155 RETVAL 1269 RETVAL
1156 1270
1157void 1271void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1272set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1273 CODE:
1160 self->r = r; 1274 self->r = r;
1161 self->g = g; 1275 self->g = g;
1162 self->b = b; 1276 self->b = b;
1163 self->a = a; 1277 self->a = a;
1164 1278
1165void 1279void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1280set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1281 CODE:
1168 if (self->font != font) 1282 if (self->font != font)
1169 { 1283 {
1170 self->font = font; 1284 self->font = font;
1171 layout_update_font (self); 1285 layout_update_font (self);
1172 } 1286 }
1173 1287
1174void 1288void
1175set_height (CFPlus::Layout self, int base_height) 1289set_height (DC::Layout self, int base_height)
1176 CODE: 1290 CODE:
1177 if (self->base_height != base_height) 1291 if (self->base_height != base_height)
1178 { 1292 {
1179 self->base_height = base_height; 1293 self->base_height = base_height;
1180 layout_update_font (self); 1294 layout_update_font (self);
1181 } 1295 }
1182 1296
1183void 1297void
1184set_width (CFPlus::Layout self, int max_width = -1) 1298set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1299 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1300 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1301
1188void 1302void
1189set_indent (CFPlus::Layout self, int indent) 1303set_indent (DC::Layout self, int indent)
1190 CODE: 1304 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1305 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1306
1193void 1307void
1194set_spacing (CFPlus::Layout self, int spacing) 1308set_spacing (DC::Layout self, int spacing)
1195 CODE: 1309 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1310 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1311
1198void 1312void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1313set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1314 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1315 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1316 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1317 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1318 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1319 : PANGO_ELLIPSIZE_NONE
1206 ); 1320 );
1207 1321
1208void 1322void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1323set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1324 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1325 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1326
1213void 1327void
1214size (CFPlus::Layout self) 1328size (DC::Layout self)
1215 PPCODE: 1329 PPCODE:
1216{ 1330{
1217 int w, h; 1331 int w, h;
1218 1332
1219 layout_get_pixel_size (self, &w, &h); 1333 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1336 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1337 PUSHs (sv_2mortal (newSViv (h)));
1224} 1338}
1225 1339
1226int 1340int
1227descent (CFPlus::Layout self) 1341descent (DC::Layout self)
1228 CODE: 1342 CODE:
1229{ 1343{
1230 PangoRectangle rect; 1344 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1345 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1346 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1347 RETVAL = PANGO_DESCENT (rect);
1234} 1348}
1235 OUTPUT: 1349 OUTPUT:
1236 RETVAL 1350 RETVAL
1237 1351
1238int 1352int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1353xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1354 CODE:
1241{ 1355{
1242 int index, trailing; 1356 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1357 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1358 RETVAL = index + trailing;
1245} 1359}
1246 OUTPUT: 1360 OUTPUT:
1247 RETVAL 1361 RETVAL
1248 1362
1249void 1363void
1250cursor_pos (CFPlus::Layout self, int index) 1364cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1365 PPCODE:
1252{ 1366{
1253 PangoRectangle strong_pos; 1367 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1368 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1369
1256 EXTEND (SP, 3); 1370 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1371 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1372 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1373 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1374}
1261 1375
1262void 1376void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1377index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1378 PPCODE:
1265{ 1379{
1266 int line, x; 1380 int line, x;
1267 1381
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1382 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1383#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1384 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1385 --line;
1386#endif
1271 EXTEND (SP, 2); 1387 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1388 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1389 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1390}
1275 1391
1276void 1392void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1393line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1394 PPCODE:
1279{ 1395{
1280 PangoLayoutLine *lp; 1396 PangoLayoutLine *lp;
1281 int index, trailing; 1397 int index, trailing;
1282 1398
1283 if (line < 0) 1399 if (line < 0)
1284 XSRETURN_EMPTY; 1400 XSRETURN_EMPTY;
1285 1401
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1402 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1403 XSRETURN_EMPTY; /* do better */
1288 1404
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1405 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1406
1291 EXTEND (SP, 2); 1407 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1413 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1414 }
1299} 1415}
1300 1416
1301void 1417void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1418render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1419 CODE:
1420 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1421 pango_opengl_render_layout_subpixel (
1305 self->pl, 1422 self->pl,
1423 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1424 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1425 self->r, self->g, self->b, self->a,
1308 flags 1426 flags
1309 ); 1427 );
1428 // we assume that context_change actually clears/frees stuff
1429 // and does not do any recomputation...
1430 pango_layout_context_changed (self->pl);
1310 1431
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1432void
1433draw (DC::Layout self)
1434 CODE:
1435{
1436 glEnable (GL_TEXTURE_2D);
1437 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1438 glEnable (GL_BLEND);
1439 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1440 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1441 glEnable (GL_ALPHA_TEST);
1442 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1443
1444 rc_draw (self->rc);
1445
1446 glDisable (GL_ALPHA_TEST);
1447 glDisable (GL_BLEND);
1448 glDisable (GL_TEXTURE_2D);
1449}
1450
1451MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1452
1313PROTOTYPES: ENABLE 1453PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1454
1317void 1455void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1456pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1457 CODE:
1320{ 1458{
1347 HV *hv = (HV *)SvRV (self); 1485 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1486 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1487 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1488 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1489
1490 if (name <= 0)
1491 XSRETURN_EMPTY;
1492
1352 if (items < 5) 1493 if (items < 5)
1353 { 1494 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1495 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1496 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1497 }
1394 RETVAL = width > 0; 1535 RETVAL = width > 0;
1395} 1536}
1396 OUTPUT: 1537 OUTPUT:
1397 RETVAL 1538 RETVAL
1398 1539
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1540MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1541
1401PROTOTYPES: DISABLE 1542PROTOTYPES: DISABLE
1402 1543
1403CFPlus::Map 1544DC::Map
1404new (SV *class) 1545new (SV *class)
1405 CODE: 1546 CODE:
1406 New (0, RETVAL, 1, struct map); 1547 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1548 RETVAL->x = 0;
1408 RETVAL->y = 0; 1549 RETVAL->y = 0;
1416 RETVAL->row = 0; 1557 RETVAL->row = 0;
1417 OUTPUT: 1558 OUTPUT:
1418 RETVAL 1559 RETVAL
1419 1560
1420void 1561void
1421DESTROY (CFPlus::Map self) 1562DESTROY (DC::Map self)
1422 CODE: 1563 CODE:
1423{ 1564{
1424 map_clear (self); 1565 map_clear (self);
1425 Safefree (self->face2tile); 1566 Safefree (self->face2tile);
1426 Safefree (self->tex); 1567 Safefree (self->tex);
1427 Safefree (self); 1568 Safefree (self);
1428} 1569}
1429 1570
1430void 1571void
1431resize (CFPlus::Map self, int map_width, int map_height) 1572resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1573 CODE:
1433 self->w = map_width; 1574 self->w = map_width;
1434 self->h = map_height; 1575 self->h = map_height;
1435 1576
1436void 1577void
1437clear (CFPlus::Map self) 1578clear (DC::Map self)
1438 CODE: 1579 CODE:
1439 map_clear (self); 1580 map_clear (self);
1440 1581
1441void 1582void
1442set_tileid (CFPlus::Map self, int face, int tile) 1583set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1584 CODE:
1444{ 1585{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1586 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1587 need_texid (self, tile);
1447} 1588}
1448 1589
1449void 1590void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1591set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1592 CODE:
1452{ 1593{
1453 tileid texid; 1594 tileid texid;
1454 maptex *tex; 1595 maptex *tex;
1455 1596
1468 tex->smoothtile = self->face2tile [smooth]; 1609 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1610 tex->smoothlevel = level;
1470} 1611}
1471 1612
1472void 1613void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1614set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1615 CODE:
1475{ 1616{
1476 need_texid (self, texid); 1617 need_texid (self, texid);
1477 1618
1478 { 1619 {
1498 // from transparent color bleeding and ugly wrapping effects. 1639 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1641}
1501 1642
1502int 1643int
1503ox (CFPlus::Map self) 1644ox (DC::Map self)
1504 ALIAS: 1645 ALIAS:
1505 oy = 1 1646 oy = 1
1506 x = 2 1647 x = 2
1507 y = 3 1648 y = 3
1508 w = 4 1649 w = 4
1519 } 1660 }
1520 OUTPUT: 1661 OUTPUT:
1521 RETVAL 1662 RETVAL
1522 1663
1523void 1664void
1524scroll (CFPlus::Map self, int dx, int dy) 1665scroll (DC::Map self, int dx, int dy)
1525 CODE: 1666 CODE:
1526{ 1667{
1527 if (dx > 0) 1668 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1669 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1670 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1685 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1686 self->y += MAP_EXTEND_Y;
1546 } 1687 }
1547} 1688}
1548 1689
1549void 1690SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1691map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1692 CODE:
1552{ 1693{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1695 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1696 mapcell *cell;
1556 int x, y, flags; 1697 int x, y, z, flags;
1698 AV *missing = newAV ();
1699 RETVAL = newRV_noinc ((SV *)missing);
1557 1700
1558 while (data < data_end - 1) 1701 while (data < data_end - 1)
1559 { 1702 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1703 flags = (data [0] << 8) + data [1]; data += 2;
1561 1704
1581 uint8_t ext, cmd; 1724 uint8_t ext, cmd;
1582 1725
1583 do 1726 do
1584 { 1727 {
1585 ext = *data++; 1728 ext = *data++;
1586 cmd = ext & 0x3f; 1729 cmd = ext & 0x7f;
1587 1730
1588 if (cmd < 4) 1731 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1732 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1733 else if (cmd == 5) // health
1591 { 1734 {
1594 } 1737 }
1595 else if (cmd == 6) // monster width 1738 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1739 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1740 else if (cmd == 0x47)
1598 { 1741 {
1599 if (*data == 4) 1742 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 1746
1602 data += *data + 1; 1747 data += *data + 1;
1603 } 1748 }
1604 else if (cmd == 8) // cell flags 1749 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1750 cell->flags = *data++;
1612 } 1757 }
1613 else 1758 else
1614 cell->darkness = *data++ + 1; 1759 cell->darkness = *data++ + 1;
1615 } 1760 }
1616 1761
1762 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1763 if (flags & (4 >> z))
1618 { 1764 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1765 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1766 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1767 cell->tile [z] = self->face2tile [face];
1768
1769 if (cell->tile [z])
1770 {
1771 maptex *tex = self->tex + cell->tile [z];
1772 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z]));
1774
1775 if (tex->smoothtile)
1776 {
1777 maptex *smooth = self->tex + tex->smoothtile;
1778 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile));
1780 }
1781 }
1622 } 1782 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1783 }
1638 else 1784 else
1639 cell->darkness = 0; 1785 cell->darkness = 0;
1640 } 1786 }
1641} 1787}
1788 OUTPUT:
1789 RETVAL
1642 1790
1643SV * 1791SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1792mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1793 CODE:
1646{ 1794{
1647 int x1, x; 1795 int x1, x;
1648 int y1, y; 1796 int y1, y;
1649 int z; 1797 int z;
1694} 1842}
1695 OUTPUT: 1843 OUTPUT:
1696 RETVAL 1844 RETVAL
1697 1845
1698void 1846void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1700 CODE: 1848 CODE:
1701{ 1849{
1850 int x, y, z;
1851
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1853 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1854 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1855 smooth_key skey;
1706 int x, y, z; 1856 int pl_x, pl_y;
1707 int last_name; 1857 maptex pl_tex;
1858 rc_t *rc = rc_alloc ();
1859 rc_key_t key;
1860 rc_array_t *arr;
1861
1862 pl_tex.name = 0;
1708 1863
1709 // thats current max. sorry. 1864 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1865 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1866 if (sh > 255) sh = 255;
1712 1867
1713 // clear key, in case of extra padding 1868 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1869 memset (&skey, 0, sizeof (skey));
1715 1870
1716 glColor4ub (255, 255, 255, 255); 1871 memset (&key, 0, sizeof (key));
1717 1872 key.r = 255;
1718 glEnable (GL_BLEND); 1873 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1874 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1875 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1876 key.mode = GL_QUADS;
1722 1877 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1878 key.texname = -1;
1724
1725 last_name = 0;
1726 1879
1727 mx += self->x; 1880 mx += self->x;
1728 my += self->y; 1881 my += self->y;
1729 1882
1730 // first pass: determine smooth_max 1883 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1899 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1900 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1901 self->tex [cell->tile [2]].smoothlevel));
1749 } 1902 }
1750 } 1903 }
1904
1905 glEnable (GL_BLEND);
1906 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1908
1752 for (z = 0; z <= 2; z++) 1909 for (z = 0; z <= 2; z++)
1753 { 1910 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1911 memset (smooth_level, 0, sizeof (smooth_level));
1755 1912
1768 { 1925 {
1769 maptex tex = self->tex [tile]; 1926 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1927 int px = (x + 1) * T - tex.w;
1771 int py = (y + 1) * T - tex.h; 1928 int py = (y + 1) * T - tex.h;
1772 1929
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1930 if (key.texname != tex.name)
1776 { 1931 {
1777 if (!tex.name) 1932 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1933 tex = self->tex [2]; /* missing, replace by noface */
1779 1934
1780 glEnd (); 1935 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1936 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1937 }
1784 1938
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1939 if (expect_false (cell->player == player) && expect_false (z == 2))
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789
1790 if (cell->flags && z == 2)
1791 { 1940 {
1941 pl_x = px;
1942 pl_y = py;
1943 pl_tex = tex;
1944 continue;
1945 }
1946
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1949 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1950 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1951
1952 if (expect_false (cell->flags) && expect_false (z == 2))
1953 {
1954 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1955 if (cell->flags & 1)
1793 { 1956 {
1794 maptex tex = self->tex [1]; 1957 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1958 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1959 int py = y * T - T * 6 / 32;
1797 1960
1961 if (tex.name)
1798 glEnd (); 1962 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1963 if (key.texname != tex.name)
1964 {
1965 key.texname = tex.name;
1966 arr = rc_array (rc, &key);
1967 }
1968
1969 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1970 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1971 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1972 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 1973 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 1974 }
1807 } 1975 }
1808 1976
1809 // update smooth hash 1977 // update smooth hash
1810 if (tex.smoothtile) 1978 if (tex.smoothtile)
1846 } 2014 }
1847 } 2015 }
1848 } 2016 }
1849 } 2017 }
1850 2018
2019 rc_draw (rc);
2020 rc_clear (rc);
2021
1851 // go through all smoothlevels, lowest to highest, then draw. 2022 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2023 // this is basically counting sort
1853 { 2024 {
1854 int w, b; 2025 int w, b;
1855 2026
2027 glEnable (GL_TEXTURE_2D);
2028 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2029 for (w = 0; w < 256 / 32; ++w)
1857 { 2030 {
1858 uint32_t smask = smooth_level [w]; 2031 uint32_t smask = smooth_level [w];
1859 if (smask) 2032 if (smask)
1860 for (b = 0; b < 32; ++b) 2033 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2052 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2053 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2054 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2055 float dy = tex.t * .5f ; // 2 images/column
1883 2056
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2057 if (tex.name)
1887 { 2058 {
2059 // this time avoiding texture state changes
2060 // save gobs of state changes.
1888 if (!tex.name) 2061 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2062 {
1890
1891 glEnd (); 2063 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2065 glBegin (GL_QUADS);
1894 } 2066 }
1895 2067
1896 if (border) 2068 if (border)
1897 { 2069 {
1898 float ox = border * dx; 2070 float ox = border * dx;
1899 2071
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2072 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2073 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2074 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2075 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2076 }
1905 2077
1906 if (corner) 2078 if (corner)
1907 { 2079 {
1908 float ox = corner * dx; 2080 float ox = corner * dx;
1909 2081
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2082 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2083 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2084 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2085 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2086 }
1914 } 2087 }
1915 } 2088 }
1916 } 2089 }
1917 } 2090 }
1918 } 2091 }
2092
2093 glEnd ();
2094 glDisable (GL_TEXTURE_2D);
2095 key.texname = -1;
1919 } 2096 }
1920 2097
1921 hv_clear (smooth); 2098 hv_clear (smooth);
1922 } 2099 }
1923 2100
1924 glEnd (); 2101 if (pl_tex.name)
2102 {
2103 maptex tex = pl_tex;
2104 int px = pl_x + pdx;
2105 int py = pl_y + pdy;
1925 2106
1926 glDisable (GL_TEXTURE_2D); 2107 key.texname = tex.name;
2108 arr = rc_array (rc, &key);
2109
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2111 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2112 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2114
2115 rc_draw (rc);
2116 }
2117
1927 glDisable (GL_BLEND); 2118 glDisable (GL_BLEND);
2119 rc_free (rc);
1928 2120
1929 // top layer: overlays such as the health bar 2121 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2122 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2123 if (0 <= y + my && y + my < self->rows)
1932 { 2124 {
1957 } 2149 }
1958 } 2150 }
1959} 2151}
1960 2152
1961void 2153void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2154draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2155 CODE:
1964{ 2156{
1965 static float color[16][3] = { 2157 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2158 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2159 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2209 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2210 glDisable (GL_TEXTURE_2D);
2019} 2211}
2020 2212
2021void 2213void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2214fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2215 PPCODE:
2024{ 2216{
2025 int x, y; 2217 int x, y;
2026 int sw1 = sw + 2; 2218 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2219 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2290 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2291 PUSHs (darkness3_sv);
2100} 2292}
2101 2293
2102SV * 2294SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2295get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2296 CODE:
2105{ 2297{
2106 int x, y, x1, y1; 2298 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2299 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2300 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2357 else
2166 *data++ = 0; 2358 *data++ = 0;
2167 } 2359 }
2168 } 2360 }
2169 2361
2362 /* if size is w*h + 5 then no data has been found */
2363 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2364 {
2170 SvPOK_only (data_sv); 2365 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2366 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2367 }
2368
2172 RETVAL = data_sv; 2369 RETVAL = data_sv;
2173} 2370}
2174 OUTPUT: 2371 OUTPUT:
2175 RETVAL 2372 RETVAL
2176 2373
2177void 2374void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2375set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2376 PPCODE:
2180{ 2377{
2181 int x, y, z; 2378 int x, y, z;
2182 int w, h; 2379 int w, h;
2183 int x1, y1; 2380 int x1, y1;
2381 STRLEN len;
2382 uint8_t *data, *end;
2383
2384 len = SvLEN (data_sv);
2385 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2386 data = SvPVbyte_nolen (data_sv);
2387 end = data + len + 8;
2388
2389 if (len < 5)
2390 XSRETURN_EMPTY;
2184 2391
2185 if (*data++ != 0) 2392 if (*data++ != 0)
2186 return; /* version mismatch */ 2393 XSRETURN_EMPTY; /* version mismatch */
2187 2394
2188 w = *data++ << 8; w |= *data++; 2395 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2396 h = *data++ << 8; h |= *data++;
2190 2397
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2398 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2410 {
2204 maprow *row = map_get_row (self, y); 2411 maprow *row = map_get_row (self, y);
2205 2412
2206 for (x = x0; x < x1; x++) 2413 for (x = x0; x < x1; x++)
2207 { 2414 {
2415 uint8_t flags;
2416
2417 if (data + 7 >= end)
2418 XSRETURN_EMPTY;
2419
2208 uint8_t flags = *data++; 2420 flags = *data++;
2209 2421
2210 if (flags) 2422 if (flags)
2211 { 2423 {
2212 mapcell *cell = row_get_cell (row, x); 2424 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2425 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2428 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2429 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2430
2219 if (cell->darkness == 0) 2431 if (cell->darkness == 0)
2220 { 2432 {
2221 cell->darkness = 0; 2433 /*cell->darkness = 0;*/
2434 EXTEND (SP, 3);
2222 2435
2223 for (z = 0; z <= 2; z++) 2436 for (z = 0; z <= 2; z++)
2224 { 2437 {
2225 tileid t = tile [z]; 2438 tileid t = tile [z];
2226 2439
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2440 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2441 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2442 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2443 need_texid (self, t);
2231 } 2444 }
2232 2445
2233 cell->tile [z] = t; 2446 cell->tile [z] = t;
2234 } 2447 }
2236 } 2449 }
2237 } 2450 }
2238 } 2451 }
2239} 2452}
2240 2453
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2454MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2455
2243CFPlus::RW 2456DC::RW
2244new (SV *class, SV *data_sv) 2457new (SV *class, SV *data_sv)
2245 CODE: 2458 CODE:
2246{ 2459{
2247 STRLEN datalen; 2460 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2461 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2463 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2464}
2252 OUTPUT: 2465 OUTPUT:
2253 RETVAL 2466 RETVAL
2254 2467
2255CFPlus::RW 2468DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2469new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2470 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2471 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2472 OUTPUT:
2260 RETVAL 2473 RETVAL
2261 2474
2475# fails on win32:
2476# dc.xs(2268) : error C2059: syntax error : '('
2262void 2477#void
2263close (CFPlus::RW self) 2478#close (DC::RW self)
2264 CODE: 2479# CODE:
2265 SDL_RWclose (self); 2480# (self->(close)) (self);
2266 2481
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2482MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2483
2269PROTOTYPES: DISABLE 2484PROTOTYPES: DISABLE
2270 2485
2486DC::Channel
2487find ()
2488 CODE:
2489{
2490 RETVAL = Mix_GroupAvailable (-1);
2491
2492 if (RETVAL < 0)
2493 {
2494 RETVAL = Mix_GroupOldest (-1);
2495
2496 if (RETVAL < 0)
2497 XSRETURN_UNDEF;
2498
2499 Mix_HaltChannel (RETVAL);
2500 }
2501
2502 Mix_UnregisterAllEffects (RETVAL);
2503 Mix_Volume (RETVAL, 128);
2504}
2505 OUTPUT:
2506 RETVAL
2507
2271void 2508void
2272halt (CFPlus::Channel self) 2509halt (DC::Channel self)
2273 CODE: 2510 CODE:
2274 Mix_HaltChannel (self); 2511 Mix_HaltChannel (self);
2275 2512
2276void 2513void
2277expire (CFPlus::Channel self, int ticks = -1) 2514expire (DC::Channel self, int ticks = -1)
2278 CODE: 2515 CODE:
2279 Mix_ExpireChannel (self, ticks); 2516 Mix_ExpireChannel (self, ticks);
2280 2517
2281void 2518void
2282fade_out (CFPlus::Channel self, int ticks = -1) 2519fade_out (DC::Channel self, int ticks = -1)
2283 CODE: 2520 CODE:
2284 Mix_FadeOutChannel (self, ticks); 2521 Mix_FadeOutChannel (self, ticks);
2285 2522
2286int 2523int
2287volume (CFPlus::Channel self, int volume) 2524volume (DC::Channel self, int volume)
2288 CODE: 2525 CODE:
2289 RETVAL = Mix_Volume (self, volume); 2526 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2290 OUTPUT: 2527 OUTPUT:
2291 RETVAL 2528 RETVAL
2292 2529
2293void 2530void
2294unregister_all_effects (CFPlus::Channel self) 2531unregister_all_effects (DC::Channel self)
2295 CODE: 2532 CODE:
2296 Mix_UnregisterAllEffects (self); 2533 Mix_UnregisterAllEffects (self);
2297 2534
2298void 2535void
2299set_panning (CFPlus::Channel self, int left, int right) 2536set_panning (DC::Channel self, int left, int right)
2300 CODE: 2537 CODE:
2538 left = CLAMP (left , 0, 255);
2539 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2540 Mix_SetPanning (self, left, right);
2302 2541
2303void 2542void
2304set_distance (CFPlus::Channel self, int distance) 2543set_distance (DC::Channel self, int distance)
2305 CODE: 2544 CODE:
2306 Mix_SetDistance (self, distance); 2545 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2546
2308void 2547void
2309set_position (CFPlus::Channel self, int angle, int distance) 2548set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2549 CODE:
2550
2551void
2552set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2553 CODE:
2554{
2555 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2556 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2557 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2558}
2312 2559
2313void 2560void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2561set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2562 CODE:
2316 Mix_SetReverseStereo (self, flip); 2563 Mix_SetReverseStereo (self, flip);
2317 2564
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2565MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2566
2320PROTOTYPES: DISABLE 2567PROTOTYPES: DISABLE
2321 2568
2322CFPlus::MixChunk 2569DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2570new (SV *class, DC::RW rwops)
2324 CODE: 2571 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2572 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2573 OUTPUT:
2327 RETVAL 2574 RETVAL
2328 2575
2329void 2576void
2330DESTROY (CFPlus::MixChunk self) 2577DESTROY (DC::MixChunk self)
2331 CODE: 2578 CODE:
2332 Mix_FreeChunk (self); 2579 Mix_FreeChunk (self);
2333 2580
2334int 2581int
2335volume (CFPlus::MixChunk self, int volume = -1) 2582volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2583 CODE:
2584 if (items > 1)
2585 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2586 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2587 OUTPUT:
2339 RETVAL 2588 RETVAL
2340 2589
2341CFPlus::Channel 2590DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2591play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2592 CODE:
2593{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2594 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2595
2596 if (RETVAL < 0)
2597 XSRETURN_UNDEF;
2598
2599 if (channel < 0)
2600 {
2345 Mix_UnregisterAllEffects (RETVAL); 2601 Mix_UnregisterAllEffects (RETVAL);
2602 Mix_Volume (RETVAL, 128);
2603 }
2604}
2346 OUTPUT: 2605 OUTPUT:
2347 RETVAL 2606 RETVAL
2348 2607
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2608MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2609
2351int 2610int
2352volume (int volume = -1) 2611volume (int volume = -1)
2353 PROTOTYPE: ;$ 2612 PROTOTYPE: ;$
2354 CODE: 2613 CODE:
2614 if (items > 0)
2615 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2616 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2617 OUTPUT:
2357 RETVAL 2618 RETVAL
2358 2619
2359void 2620void
2364void 2625void
2365halt () 2626halt ()
2366 CODE: 2627 CODE:
2367 Mix_HaltMusic (); 2628 Mix_HaltMusic ();
2368 2629
2369CFPlus::MixMusic 2630DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2631new (SV *class, DC::RW rwops)
2371 CODE: 2632 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2633 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2634 OUTPUT:
2374 RETVAL 2635 RETVAL
2375 2636
2376void 2637void
2377DESTROY (CFPlus::MixMusic self) 2638DESTROY (DC::MixMusic self)
2378 CODE: 2639 CODE:
2379 Mix_FreeMusic (self); 2640 Mix_FreeMusic (self);
2380 2641
2381int 2642int
2382play (CFPlus::MixMusic self, int loops = -1) 2643play (DC::MixMusic self, int loops = -1)
2383 CODE: 2644 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2645 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2646 OUTPUT:
2386 RETVAL 2647 RETVAL
2387 2648
2388void 2649void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2650fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2651 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2652 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2653
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2654MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2655
2395PROTOTYPES: ENABLE 2656PROTOTYPES: ENABLE
2396 2657
2397BOOT: 2658BOOT:
2398{ 2659{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2660 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2661 static const struct {
2401 const char *name; 2662 const char *name;
2402 IV iv; 2663 IV iv;
2403 } *civ, const_iv[] = { 2664 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2665# define const_iv(name) { # name, (IV)name }
2439 const_iv (GL_INTENSITY), 2700 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2701 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2702 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2703 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2704 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2705 const_iv (GL_COMPRESSED_ALPHA_ARB),
2706 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2707 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2708 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2709 const_iv (GL_COMPRESSED_RGB_ARB),
2710 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 2711 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2712 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2713 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2714 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2715 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2754 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2755 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2756 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2757 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2758 const_iv (GL_GENERATE_MIPMAP_HINT),
2759 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2760 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2761 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2762 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2763 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2764 const_iv (GL_V3F),
2504 2772
2505 texture_av = newAV (); 2773 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2774 AvREAL_off (texture_av);
2507} 2775}
2508 2776
2777void
2778disable_GL_EXT_blend_func_separate ()
2779 CODE:
2780 gl.BlendFuncSeparate = 0;
2781 gl.BlendFuncSeparateEXT = 0;
2782
2509char * 2783char *
2510gl_vendor () 2784gl_vendor ()
2511 CODE: 2785 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2786 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2787 OUTPUT:
2634 2908
2635void glRect (float x1, float y1, float x2, float y2) 2909void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 2910 CODE:
2637 glRectf (x1, y1, x2, y2); 2911 glRectf (x1, y1, x2, y2);
2638 2912
2913void glRect_lineloop (float x1, float y1, float x2, float y2)
2914 CODE:
2915 glBegin (GL_LINE_LOOP);
2916 glVertex2f (x1, y1);
2917 glVertex2f (x2, y1);
2918 glVertex2f (x2, y2);
2919 glVertex2f (x1, y2);
2920 glEnd ();
2921
2639PROTOTYPES: ENABLE 2922PROTOTYPES: ENABLE
2640 2923
2641void glBegin (int mode) 2924void glBegin (int mode)
2642 2925
2643void glEnd () 2926void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2958void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 2959 CODE:
2677 if (gl.SeparableFilter2D) 2960 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2961 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 2962
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2963void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 2964
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2965void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 2966
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 2967void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 2968
2711 2994
2712void glEndList () 2995void glEndList ()
2713 2996
2714void glCallList (int list) 2997void glCallList (int list)
2715 2998
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2999MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 3000
2718PROTOTYPES: DISABLE 3001PROTOTYPES: DISABLE
2719 3002
2720void 3003void
2721find_widget (SV *self, NV x, NV y) 3004find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 3008 XPUSHs (self);
2726} 3009}
2727 3010
2728BOOT: 3011BOOT:
2729{ 3012{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3013 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 3014
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3015 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2733 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3016 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2734 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3017 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2735 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3018 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 3019}
2737 3020
2738void 3021void
2739draw (SV *self) 3022draw (SV *self)
2740 CODE: 3023 CODE:
2744 NV x, y, w, h; 3027 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 3028 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 3029 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 3030 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 3031 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 3032 double draw_x, draw_y;
2751 3033
2752 if (!SvROK (self)) 3034 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3035 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 3036
2755 hv = (HV *)SvRV (self); 3037 hv = (HV *)SvRV (self);
2756 3038
2757 if (SvTYPE (hv) != SVt_PVHV) 3039 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3040 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 3041
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3042 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3043 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 3044
2763 if (!h || !w) 3045 if (!h || !w)
2783 { 3065 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3066 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 3067
2786 if (svp && SvTRUE (*svp)) 3068 if (svp && SvTRUE (*svp))
2787 { 3069 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3070 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 3071 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3072 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 3073 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 3074 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 3075 glVertex2f (w, 0);
2796 glEnd (); 3078 glEnd ();
2797 glDisable (GL_BLEND); 3079 glDisable (GL_BLEND);
2798 } 3080 }
2799 } 3081 }
2800#if 0 3082#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 3083 // draw borders, for debugging
2802 glPushMatrix; 3084 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 3085 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 3086 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 3087 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 3088 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 3089 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 3090 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 3091 glVertex2f (0 , h - 1);
2810 glEnd; 3092 glEnd ();
2811 glPopMatrix; 3093 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 3094#endif
2815 PUSHMARK (SP); 3095 PUSHMARK (SP);
2816 XPUSHs (self); 3096 XPUSHs (self);
2817 PUTBACK; 3097 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3098 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines