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.212 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 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)
680 {
681 AV *av = newAV (); 761 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 764 av_push (av, newSViv (rgb));
685 av_push (av, newSViv (alpha)); 765 av_push (av, newSViv (alpha));
686 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
687 }
688 767
689 ++m; 768 ++m;
690 } 769 }
691} 770}
692 771
708 787
709 if (RETVAL) 788 if (RETVAL)
710 { 789 {
711 av_clear (texture_av); 790 av_clear (texture_av);
712 791
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 793#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 794#include "glfunc.h"
716#undef GL_FUNC 795#undef GL_FUNC
717 } 796 }
718} 797}
725char * 804char *
726SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
727 806
728int 807int
729SDL_GetAppState () 808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
730 812
731void 813void
732poll_events () 814poll_events ()
733 PPCODE: 815 PPCODE:
734{ 816{
744 { 826 {
745 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
746 case SDL_KEYUP: 828 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 831 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 */ 832 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); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 834 break;
753 835
754 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 855 x = ev.motion.x;
774 y = ev.motion.y; 856 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 858 }
777 859
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 866 }
785 break; 867 break;
786 868
787 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 872
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 881 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 882 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 883 break;
802 } 884 }
803 885
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 886 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 887 }
806} 888}
807 889
808int 890int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 891Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 892 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 893 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 894 Mix_ChannelFinished (channel_finished);
813 895
814void 896void
897Mix_QuerySpec ()
898 PPCODE:
899{
900 int freq, channels;
901 Uint16 format;
902
903 if (Mix_QuerySpec (&freq, &format, &channels))
904 {
905 EXTEND (SP, 3);
906 PUSHs (sv_2mortal (newSViv (freq)));
907 PUSHs (sv_2mortal (newSViv (format)));
908 PUSHs (sv_2mortal (newSViv (channels)));
909 }
910}
911
912void
815Mix_CloseAudio () 913Mix_CloseAudio ()
816 914
817int 915int
818Mix_AllocateChannels (int numchans = -1) 916Mix_AllocateChannels (int numchans = -1)
917
918const char *
919Mix_GetError ()
819 920
820void 921void
821lowdelay (int fd, int val = 1) 922lowdelay (int fd, int val = 1)
822 CODE: 923 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 924 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 950 }
850 } 951 }
851#endif 952#endif
852} 953}
853 954
854void 955int
855add_font (char *file) 956add_font (char *file)
856 CODE: 957 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
858 961
859void 962void
860load_image_inline (SV *image_) 963load_image_inline (SV *image_)
861 ALIAS: 964 ALIAS:
862 load_image_file = 1 965 load_image_file = 1
948void 1051void
949error (char *message) 1052error (char *message)
950 CODE: 1053 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1054 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1055#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1056 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1057#endif
955 1058
956void 1059void
957fatal (char *message) 1060fatal (char *message)
958 CODE: 1061 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1062 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1063#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1065#endif
963 _exit (1); 1066 _exit (1);
964 1067
965void 1068void
966_exit (int retval = 0) 1069_exit (int retval = 0)
978#if DEBUG 1081#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1082 VALGRIND_DO_LEAK_CHECK;
980#endif 1083#endif
981} 1084}
982 1085
983MODULE = CFPlus PACKAGE = CFPlus::Font 1086MODULE = Deliantra::Client PACKAGE = DC::Font
984 1087
985PROTOTYPES: DISABLE 1088PROTOTYPES: DISABLE
986 1089
987CFPlus::Font 1090DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1091new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1092 CODE:
990{ 1093{
991 int count; 1094 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1098}
996 OUTPUT: 1099 OUTPUT:
997 RETVAL 1100 RETVAL
998 1101
999void 1102void
1000DESTROY (CFPlus::Font self) 1103DESTROY (DC::Font self)
1001 CODE: 1104 CODE:
1002 pango_font_description_free (self); 1105 pango_font_description_free (self);
1003 1106
1004void 1107void
1005make_default (CFPlus::Font self) 1108make_default (DC::Font self)
1006 PROTOTYPE: $ 1109 PROTOTYPE: $
1007 CODE: 1110 CODE:
1008 default_font = self; 1111 default_font = self;
1009 1112
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1113MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1114
1012PROTOTYPES: DISABLE 1115PROTOTYPES: DISABLE
1013 1116
1014void 1117void
1015reset_glyph_cache () 1118glyph_cache_backup ()
1016 PROTOTYPE: 1119 PROTOTYPE:
1017 CODE: 1120 CODE:
1121 tc_backup ();
1122
1123void
1124glyph_cache_restore ()
1125 PROTOTYPE:
1126 CODE:
1018 tc_clear (); 1127 tc_restore ();
1019 1128
1020CFPlus::Layout 1129DC::Layout
1021new (SV *class) 1130new (SV *class)
1022 CODE: 1131 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1132 New (0, RETVAL, 1, struct cf_layout);
1024 1133
1025 RETVAL->pl = pango_layout_new (opengl_context); 1134 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1136 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1137 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1138 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1139 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1140 RETVAL->font = 0;
1141 RETVAL->rc = rc_alloc ();
1032 1142
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1143 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1144 layout_update_font (RETVAL);
1035 OUTPUT: 1145 OUTPUT:
1036 RETVAL 1146 RETVAL
1037 1147
1038void 1148void
1039DESTROY (CFPlus::Layout self) 1149DESTROY (DC::Layout self)
1040 CODE: 1150 CODE:
1041 g_object_unref (self->pl); 1151 g_object_unref (self->pl);
1152 rc_free (self->rc);
1042 Safefree (self); 1153 Safefree (self);
1043 1154
1044void 1155void
1045set_text (CFPlus::Layout self, SV *text_) 1156set_text (DC::Layout self, SV *text_)
1046 CODE: 1157 CODE:
1047{ 1158{
1048 STRLEN textlen; 1159 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1160 char *text = SvPVutf8 (text_, textlen);
1050 1161
1051 pango_layout_set_text (self->pl, text, textlen); 1162 pango_layout_set_text (self->pl, text, textlen);
1052} 1163}
1053 1164
1054void 1165void
1055set_markup (CFPlus::Layout self, SV *text_) 1166set_markup (DC::Layout self, SV *text_)
1056 CODE: 1167 CODE:
1057{ 1168{
1058 STRLEN textlen; 1169 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1060 1171
1061 pango_layout_set_markup (self->pl, text, textlen); 1172 pango_layout_set_markup (self->pl, text, textlen);
1062} 1173}
1063 1174
1064void 1175void
1065set_shapes (CFPlus::Layout self, ...) 1176set_shapes (DC::Layout self, ...)
1066 CODE: 1177 CODE:
1067{ 1178{
1068 PangoAttrList *attrs = 0; 1179 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1180 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1181 const char *pos = text;
1105 if (attrs) 1216 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1217 pango_layout_set_attributes (self->pl, attrs);
1107} 1218}
1108 1219
1109void 1220void
1110get_shapes (CFPlus::Layout self) 1221get_shapes (DC::Layout self)
1111 PPCODE: 1222 PPCODE:
1112{ 1223{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1224 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1225
1115 do 1226 do
1116 { 1227 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1228 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1229
1119 if (run && shape_attr_p (run)) 1230 if (run && shape_attr_p (run))
1120 { 1231 {
1121 PangoRectangle extents; 1232 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1233 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1241
1131 pango_layout_iter_free (iter); 1242 pango_layout_iter_free (iter);
1132} 1243}
1133 1244
1134int 1245int
1135has_wrapped (CFPlus::Layout self) 1246has_wrapped (DC::Layout self)
1136 CODE: 1247 CODE:
1137{ 1248{
1138 int lines = 1; 1249 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1250 const char *text = pango_layout_get_text (self->pl);
1140 1251
1145} 1256}
1146 OUTPUT: 1257 OUTPUT:
1147 RETVAL 1258 RETVAL
1148 1259
1149SV * 1260SV *
1150get_text (CFPlus::Layout self) 1261get_text (DC::Layout self)
1151 CODE: 1262 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1263 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1264 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1265 OUTPUT:
1155 RETVAL 1266 RETVAL
1156 1267
1157void 1268void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1269set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1270 CODE:
1160 self->r = r; 1271 self->r = r;
1161 self->g = g; 1272 self->g = g;
1162 self->b = b; 1273 self->b = b;
1163 self->a = a; 1274 self->a = a;
1164 1275
1165void 1276void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1277set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1278 CODE:
1168 if (self->font != font) 1279 if (self->font != font)
1169 { 1280 {
1170 self->font = font; 1281 self->font = font;
1171 layout_update_font (self); 1282 layout_update_font (self);
1172 } 1283 }
1173 1284
1174void 1285void
1175set_height (CFPlus::Layout self, int base_height) 1286set_height (DC::Layout self, int base_height)
1176 CODE: 1287 CODE:
1177 if (self->base_height != base_height) 1288 if (self->base_height != base_height)
1178 { 1289 {
1179 self->base_height = base_height; 1290 self->base_height = base_height;
1180 layout_update_font (self); 1291 layout_update_font (self);
1181 } 1292 }
1182 1293
1183void 1294void
1184set_width (CFPlus::Layout self, int max_width = -1) 1295set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1296 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1297 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1298
1188void 1299void
1189set_indent (CFPlus::Layout self, int indent) 1300set_indent (DC::Layout self, int indent)
1190 CODE: 1301 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1302 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1303
1193void 1304void
1194set_spacing (CFPlus::Layout self, int spacing) 1305set_spacing (DC::Layout self, int spacing)
1195 CODE: 1306 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1307 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1308
1198void 1309void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1310set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1311 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1312 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1313 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1314 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1315 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1316 : PANGO_ELLIPSIZE_NONE
1206 ); 1317 );
1207 1318
1208void 1319void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1320set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1321 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1322 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1323
1213void 1324void
1214size (CFPlus::Layout self) 1325size (DC::Layout self)
1215 PPCODE: 1326 PPCODE:
1216{ 1327{
1217 int w, h; 1328 int w, h;
1218 1329
1219 layout_get_pixel_size (self, &w, &h); 1330 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1333 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1334 PUSHs (sv_2mortal (newSViv (h)));
1224} 1335}
1225 1336
1226int 1337int
1227descent (CFPlus::Layout self) 1338descent (DC::Layout self)
1228 CODE: 1339 CODE:
1229{ 1340{
1230 PangoRectangle rect; 1341 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1342 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1343 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1344 RETVAL = PANGO_DESCENT (rect);
1234} 1345}
1235 OUTPUT: 1346 OUTPUT:
1236 RETVAL 1347 RETVAL
1237 1348
1238int 1349int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1350xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1351 CODE:
1241{ 1352{
1242 int index, trailing; 1353 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1354 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1355 RETVAL = index + trailing;
1245} 1356}
1246 OUTPUT: 1357 OUTPUT:
1247 RETVAL 1358 RETVAL
1248 1359
1249void 1360void
1250cursor_pos (CFPlus::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1362 PPCODE:
1252{ 1363{
1253 PangoRectangle strong_pos; 1364 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1366
1256 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1371}
1261 1372
1262void 1373void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1374index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1375 PPCODE:
1265{ 1376{
1266 int line, x; 1377 int line, x;
1267 1378
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1379 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1380#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1382 --line;
1383#endif
1271 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1385 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1387}
1275 1388
1276void 1389void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1390line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1391 PPCODE:
1279{ 1392{
1280 PangoLayoutLine *lp; 1393 PangoLayoutLine *lp;
1281 int index, trailing; 1394 int index, trailing;
1282 1395
1283 if (line < 0) 1396 if (line < 0)
1284 XSRETURN_EMPTY; 1397 XSRETURN_EMPTY;
1285 1398
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1399 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1400 XSRETURN_EMPTY; /* do better */
1288 1401
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1402 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1403
1291 EXTEND (SP, 2); 1404 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1410 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1411 }
1299} 1412}
1300 1413
1301void 1414void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1415render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1416 CODE:
1417 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1418 pango_opengl_render_layout_subpixel (
1305 self->pl, 1419 self->pl,
1420 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1421 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1422 self->r, self->g, self->b, self->a,
1308 flags 1423 flags
1309 ); 1424 );
1425 // we assume that context_change actually clears/frees stuff
1426 // and does not do any recomputation...
1427 pango_layout_context_changed (self->pl);
1310 1428
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1429void
1430draw (DC::Layout self)
1431 CODE:
1432{
1433 glEnable (GL_TEXTURE_2D);
1434 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1435 glEnable (GL_BLEND);
1436 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1437 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1438 glEnable (GL_ALPHA_TEST);
1439 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1440
1441 rc_draw (self->rc);
1442
1443 glDisable (GL_ALPHA_TEST);
1444 glDisable (GL_BLEND);
1445 glDisable (GL_TEXTURE_2D);
1446}
1447
1448MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1449
1313PROTOTYPES: ENABLE 1450PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1451
1317void 1452void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1453pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1454 CODE:
1320{ 1455{
1347 HV *hv = (HV *)SvRV (self); 1482 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1483 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1484 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1485 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1486
1487 if (name <= 0)
1488 XSRETURN_EMPTY;
1489
1352 if (items < 5) 1490 if (items < 5)
1353 { 1491 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1492 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1493 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1494 }
1394 RETVAL = width > 0; 1532 RETVAL = width > 0;
1395} 1533}
1396 OUTPUT: 1534 OUTPUT:
1397 RETVAL 1535 RETVAL
1398 1536
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1537MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1538
1401PROTOTYPES: DISABLE 1539PROTOTYPES: DISABLE
1402 1540
1403CFPlus::Map 1541DC::Map
1404new (SV *class) 1542new (SV *class)
1405 CODE: 1543 CODE:
1406 New (0, RETVAL, 1, struct map); 1544 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1545 RETVAL->x = 0;
1408 RETVAL->y = 0; 1546 RETVAL->y = 0;
1416 RETVAL->row = 0; 1554 RETVAL->row = 0;
1417 OUTPUT: 1555 OUTPUT:
1418 RETVAL 1556 RETVAL
1419 1557
1420void 1558void
1421DESTROY (CFPlus::Map self) 1559DESTROY (DC::Map self)
1422 CODE: 1560 CODE:
1423{ 1561{
1424 map_clear (self); 1562 map_clear (self);
1425 Safefree (self->face2tile); 1563 Safefree (self->face2tile);
1426 Safefree (self->tex); 1564 Safefree (self->tex);
1427 Safefree (self); 1565 Safefree (self);
1428} 1566}
1429 1567
1430void 1568void
1431resize (CFPlus::Map self, int map_width, int map_height) 1569resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1570 CODE:
1433 self->w = map_width; 1571 self->w = map_width;
1434 self->h = map_height; 1572 self->h = map_height;
1435 1573
1436void 1574void
1437clear (CFPlus::Map self) 1575clear (DC::Map self)
1438 CODE: 1576 CODE:
1439 map_clear (self); 1577 map_clear (self);
1440 1578
1441void 1579void
1442set_tileid (CFPlus::Map self, int face, int tile) 1580set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1581 CODE:
1444{ 1582{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1583 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1584 need_texid (self, tile);
1447} 1585}
1448 1586
1449void 1587void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1588set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1589 CODE:
1452{ 1590{
1453 tileid texid; 1591 tileid texid;
1454 maptex *tex; 1592 maptex *tex;
1455 1593
1468 tex->smoothtile = self->face2tile [smooth]; 1606 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1607 tex->smoothlevel = level;
1470} 1608}
1471 1609
1472void 1610void
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) 1611set_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: 1612 CODE:
1475{ 1613{
1476 need_texid (self, texid); 1614 need_texid (self, texid);
1477 1615
1478 { 1616 {
1498 // from transparent color bleeding and ugly wrapping effects. 1636 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1638}
1501 1639
1502int 1640int
1503ox (CFPlus::Map self) 1641ox (DC::Map self)
1504 ALIAS: 1642 ALIAS:
1505 oy = 1 1643 oy = 1
1506 x = 2 1644 x = 2
1507 y = 3 1645 y = 3
1508 w = 4 1646 w = 4
1519 } 1657 }
1520 OUTPUT: 1658 OUTPUT:
1521 RETVAL 1659 RETVAL
1522 1660
1523void 1661void
1524scroll (CFPlus::Map self, int dx, int dy) 1662scroll (DC::Map self, int dx, int dy)
1525 CODE: 1663 CODE:
1526{ 1664{
1527 if (dx > 0) 1665 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1666 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1667 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1682 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1683 self->y += MAP_EXTEND_Y;
1546 } 1684 }
1547} 1685}
1548 1686
1549void 1687SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1688map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1689 CODE:
1552{ 1690{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1692 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1693 mapcell *cell;
1556 int x, y, flags; 1694 int x, y, z, flags;
1695 AV *missing = newAV ();
1696 RETVAL = newRV_noinc ((SV *)missing);
1557 1697
1558 while (data < data_end - 1) 1698 while (data < data_end - 1)
1559 { 1699 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1700 flags = (data [0] << 8) + data [1]; data += 2;
1561 1701
1581 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1582 1722
1583 do 1723 do
1584 { 1724 {
1585 ext = *data++; 1725 ext = *data++;
1586 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1587 1727
1588 if (cmd < 4) 1728 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1591 { 1731 {
1594 } 1734 }
1595 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1598 { 1738 {
1599 if (*data == 4) 1739 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 1740 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1741 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1742 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 1743
1602 data += *data + 1; 1744 data += *data + 1;
1603 } 1745 }
1604 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1747 cell->flags = *data++;
1612 } 1754 }
1613 else 1755 else
1614 cell->darkness = *data++ + 1; 1756 cell->darkness = *data++ + 1;
1615 } 1757 }
1616 1758
1759 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1760 if (flags & (4 >> z))
1618 { 1761 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1762 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1763 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1764 cell->tile [z] = self->face2tile [face];
1765
1766 if (cell->tile [z])
1767 {
1768 maptex *tex = self->tex + cell->tile [z];
1769 if (!tex->name)
1770 av_push (missing, newSViv (cell->tile [z]));
1771
1772 if (tex->smoothtile)
1773 {
1774 maptex *smooth = self->tex + tex->smoothtile;
1775 if (!smooth->name)
1776 av_push (missing, newSViv (tex->smoothtile));
1777 }
1778 }
1622 } 1779 }
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 } 1780 }
1638 else 1781 else
1639 cell->darkness = 0; 1782 cell->darkness = 0;
1640 } 1783 }
1641} 1784}
1785 OUTPUT:
1786 RETVAL
1642 1787
1643SV * 1788SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1789mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1790 CODE:
1646{ 1791{
1647 int x1, x; 1792 int x1, x;
1648 int y1, y; 1793 int y1, y;
1649 int z; 1794 int z;
1694} 1839}
1695 OUTPUT: 1840 OUTPUT:
1696 RETVAL 1841 RETVAL
1697 1842
1698void 1843void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1700 CODE: 1845 CODE:
1701{ 1846{
1847 int x, y, z;
1848
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1850 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) 1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1852 smooth_key skey;
1706 int x, y, z; 1853 int pl_x, pl_y;
1707 int last_name; 1854 maptex pl_tex;
1855 rc_t *rc = rc_alloc ();
1856 rc_key_t key;
1857 rc_array_t *arr;
1858
1859 pl_tex.name = 0;
1708 1860
1709 // thats current max. sorry. 1861 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1862 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1863 if (sh > 255) sh = 255;
1712 1864
1713 // clear key, in case of extra padding 1865 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1866 memset (&skey, 0, sizeof (skey));
1715 1867
1716 glColor4ub (255, 255, 255, 255); 1868 memset (&key, 0, sizeof (key));
1717 1869 key.r = 255;
1718 glEnable (GL_BLEND); 1870 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1871 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1872 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1873 key.mode = GL_QUADS;
1722 1874 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1875 key.texname = -1;
1724
1725 last_name = 0;
1726 1876
1727 mx += self->x; 1877 mx += self->x;
1728 my += self->y; 1878 my += self->y;
1729 1879
1730 // first pass: determine smooth_max 1880 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1896 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1897 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1898 self->tex [cell->tile [2]].smoothlevel));
1749 } 1899 }
1750 } 1900 }
1901
1902 glEnable (GL_BLEND);
1903 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1904 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1905
1752 for (z = 0; z <= 2; z++) 1906 for (z = 0; z <= 2; z++)
1753 { 1907 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1908 memset (smooth_level, 0, sizeof (smooth_level));
1755 1909
1768 { 1922 {
1769 maptex tex = self->tex [tile]; 1923 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1924 int px = (x + 1) * T - tex.w;
1771 int py = (y + 1) * T - tex.h; 1925 int py = (y + 1) * T - tex.h;
1772 1926
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1927 if (key.texname != tex.name)
1776 { 1928 {
1777 if (!tex.name) 1929 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1930 tex = self->tex [2]; /* missing, replace by noface */
1779 1931
1780 glEnd (); 1932 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1933 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1934 }
1784 1935
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1936 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 { 1937 {
1938 pl_x = px;
1939 pl_y = py;
1940 pl_tex = tex;
1941 continue;
1942 }
1943
1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1945 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1946 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1948
1949 if (expect_false (cell->flags) && expect_false (z == 2))
1950 {
1951 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1952 if (cell->flags & 1)
1793 { 1953 {
1794 maptex tex = self->tex [1]; 1954 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1955 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1956 int py = y * T - T * 6 / 32;
1797 1957
1958 if (tex.name)
1798 glEnd (); 1959 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1960 if (key.texname != tex.name)
1961 {
1962 key.texname = tex.name;
1963 arr = rc_array (rc, &key);
1964 }
1965
1966 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1967 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1968 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1969 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 1970 }
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 } 1971 }
1807 } 1972 }
1808 1973
1809 // update smooth hash 1974 // update smooth hash
1810 if (tex.smoothtile) 1975 if (tex.smoothtile)
1846 } 2011 }
1847 } 2012 }
1848 } 2013 }
1849 } 2014 }
1850 2015
2016 rc_draw (rc);
2017 rc_clear (rc);
2018
1851 // go through all smoothlevels, lowest to highest, then draw. 2019 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2020 // this is basically counting sort
1853 { 2021 {
1854 int w, b; 2022 int w, b;
1855 2023
2024 glEnable (GL_TEXTURE_2D);
2025 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2026 for (w = 0; w < 256 / 32; ++w)
1857 { 2027 {
1858 uint32_t smask = smooth_level [w]; 2028 uint32_t smask = smooth_level [w];
1859 if (smask) 2029 if (smask)
1860 for (b = 0; b < 32; ++b) 2030 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2049 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2050 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2051 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2052 float dy = tex.t * .5f ; // 2 images/column
1883 2053
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2054 if (tex.name)
1887 { 2055 {
2056 // this time avoiding texture state changes
2057 // save gobs of state changes.
1888 if (!tex.name) 2058 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2059 {
1890
1891 glEnd (); 2060 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2062 glBegin (GL_QUADS);
1894 } 2063 }
1895 2064
1896 if (border) 2065 if (border)
1897 { 2066 {
1898 float ox = border * dx; 2067 float ox = border * dx;
1899 2068
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2073 }
1905 2074
1906 if (corner) 2075 if (corner)
1907 { 2076 {
1908 float ox = corner * dx; 2077 float ox = corner * dx;
1909 2078
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2079 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2081 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2083 }
1914 } 2084 }
1915 } 2085 }
1916 } 2086 }
1917 } 2087 }
1918 } 2088 }
2089
2090 glEnd ();
2091 glDisable (GL_TEXTURE_2D);
2092 key.texname = -1;
1919 } 2093 }
1920 2094
1921 hv_clear (smooth); 2095 hv_clear (smooth);
1922 } 2096 }
1923 2097
1924 glEnd (); 2098 if (pl_tex.name)
2099 {
2100 maptex tex = pl_tex;
2101 int px = pl_x + pdx;
2102 int py = pl_y + pdy;
1925 2103
1926 glDisable (GL_TEXTURE_2D); 2104 key.texname = tex.name;
2105 arr = rc_array (rc, &key);
2106
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2108 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2109 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111
2112 rc_draw (rc);
2113 }
2114
1927 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
2116 rc_free (rc);
1928 2117
1929 // top layer: overlays such as the health bar 2118 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2119 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2120 if (0 <= y + my && y + my < self->rows)
1932 { 2121 {
1957 } 2146 }
1958 } 2147 }
1959} 2148}
1960 2149
1961void 2150void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2151draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2152 CODE:
1964{ 2153{
1965 static float color[16][3] = { 2154 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2155 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2156 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2206 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2207 glDisable (GL_TEXTURE_2D);
2019} 2208}
2020 2209
2021void 2210void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2211fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2212 PPCODE:
2024{ 2213{
2025 int x, y; 2214 int x, y;
2026 int sw1 = sw + 2; 2215 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2216 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2287 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2288 PUSHs (darkness3_sv);
2100} 2289}
2101 2290
2102SV * 2291SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2292get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2293 CODE:
2105{ 2294{
2106 int x, y, x1, y1; 2295 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2296 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2297 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2354 else
2166 *data++ = 0; 2355 *data++ = 0;
2167 } 2356 }
2168 } 2357 }
2169 2358
2359 /* if size is w*h + 5 then no data has been found */
2360 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2361 {
2170 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
2172 RETVAL = data_sv; 2366 RETVAL = data_sv;
2173} 2367}
2174 OUTPUT: 2368 OUTPUT:
2175 RETVAL 2369 RETVAL
2176 2370
2177void 2371void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2373 PPCODE:
2180{ 2374{
2181 int x, y, z; 2375 int x, y, z;
2182 int w, h; 2376 int w, h;
2183 int x1, y1; 2377 int x1, y1;
2378 STRLEN len;
2379 uint8_t *data, *end;
2380
2381 len = SvLEN (data_sv);
2382 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2383 data = SvPVbyte_nolen (data_sv);
2384 end = data + len + 8;
2385
2386 if (len < 5)
2387 XSRETURN_EMPTY;
2184 2388
2185 if (*data++ != 0) 2389 if (*data++ != 0)
2186 return; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
2187 2391
2188 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2393 h = *data++ << 8; h |= *data++;
2190 2394
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2395 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2407 {
2204 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
2205 2409
2206 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
2207 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
2208 uint8_t flags = *data++; 2417 flags = *data++;
2209 2418
2210 if (flags) 2419 if (flags)
2211 { 2420 {
2212 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2427
2219 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
2220 { 2429 {
2221 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
2222 2432
2223 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
2224 { 2434 {
2225 tileid t = tile [z]; 2435 tileid t = tile [z];
2226 2436
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2437 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2438 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2440 need_texid (self, t);
2231 } 2441 }
2232 2442
2233 cell->tile [z] = t; 2443 cell->tile [z] = t;
2234 } 2444 }
2236 } 2446 }
2237 } 2447 }
2238 } 2448 }
2239} 2449}
2240 2450
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2451MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2452
2243CFPlus::RW 2453DC::RW
2244new (SV *class, SV *data_sv) 2454new (SV *class, SV *data_sv)
2245 CODE: 2455 CODE:
2246{ 2456{
2247 STRLEN datalen; 2457 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2458 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2460 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2461}
2252 OUTPUT: 2462 OUTPUT:
2253 RETVAL 2463 RETVAL
2254 2464
2255CFPlus::RW 2465DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2466new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2467 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2468 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2469 OUTPUT:
2260 RETVAL 2470 RETVAL
2261 2471
2472# fails on win32:
2473# dc.xs(2268) : error C2059: syntax error : '('
2262void 2474#void
2263close (CFPlus::RW self) 2475#close (DC::RW self)
2264 CODE: 2476# CODE:
2265 SDL_RWclose (self); 2477# (self->(close)) (self);
2266 2478
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2479MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2480
2269PROTOTYPES: DISABLE 2481PROTOTYPES: DISABLE
2270 2482
2483DC::Channel
2484find ()
2485 CODE:
2486{
2487 RETVAL = Mix_GroupAvailable (-1);
2488
2489 if (RETVAL < 0)
2490 {
2491 RETVAL = Mix_GroupOldest (-1);
2492
2493 if (RETVAL < 0)
2494 XSRETURN_UNDEF;
2495
2496 Mix_HaltChannel (RETVAL);
2497 }
2498
2499 Mix_UnregisterAllEffects (RETVAL);
2500 Mix_Volume (RETVAL, 128);
2501}
2502 OUTPUT:
2503 RETVAL
2504
2505void
2506halt (DC::Channel self)
2507 CODE:
2508 Mix_HaltChannel (self);
2509
2510void
2511expire (DC::Channel self, int ticks = -1)
2512 CODE:
2513 Mix_ExpireChannel (self, ticks);
2514
2515void
2516fade_out (DC::Channel self, int ticks = -1)
2517 CODE:
2518 Mix_FadeOutChannel (self, ticks);
2519
2271int 2520int
2272volume (CFPlus::Channel self, int volume) 2521volume (DC::Channel self, int volume)
2273 CODE: 2522 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2523 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2275 OUTPUT: 2524 OUTPUT:
2276 RETVAL 2525 RETVAL
2277 2526
2278int 2527void
2279unregister_all_effects (CFPlus::Channel self) 2528unregister_all_effects (DC::Channel self)
2280 CODE: 2529 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2530 Mix_UnregisterAllEffects (self);
2282 OUTPUT:
2283 RETVAL
2284 2531
2285int 2532void
2286set_panning (CFPlus::Channel self, int left, int right) 2533set_panning (DC::Channel self, int left, int right)
2287 CODE: 2534 CODE:
2535 left = CLAMP (left , 0, 255);
2536 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2537 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2538
2292int 2539void
2293set_distance (CFPlus::Channel self, int distance) 2540set_distance (DC::Channel self, int distance)
2294 CODE: 2541 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2542 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2543
2299int 2544void
2300set_position (CFPlus::Channel self, int angle, int distance) 2545set_position (DC::Channel self, int angle, int distance)
2301 CODE: 2546 CODE:
2547
2548void
2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2550 CODE:
2551{
2552 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2553 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2555}
2304 RETVAL
2305 2556
2306int 2557void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2558set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2559 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2560 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2561
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2563
2315PROTOTYPES: DISABLE 2564PROTOTYPES: DISABLE
2316 2565
2317CFPlus::MixChunk 2566DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2567new (SV *class, DC::RW rwops)
2319 CODE: 2568 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2569 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2570 OUTPUT:
2322 RETVAL 2571 RETVAL
2323 2572
2324void 2573void
2325DESTROY (CFPlus::MixChunk self) 2574DESTROY (DC::MixChunk self)
2326 CODE: 2575 CODE:
2327 Mix_FreeChunk (self); 2576 Mix_FreeChunk (self);
2328 2577
2329int 2578int
2330volume (CFPlus::MixChunk self, int volume = -1) 2579volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2580 CODE:
2581 if (items > 1)
2582 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2583 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2584 OUTPUT:
2334 RETVAL 2585 RETVAL
2335 2586
2336CFPlus::Channel 2587DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2588play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2589 CODE:
2590{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2591 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2592
2593 if (RETVAL < 0)
2594 XSRETURN_UNDEF;
2595
2596 if (channel < 0)
2597 {
2340 Mix_UnregisterAllEffects (RETVAL); 2598 Mix_UnregisterAllEffects (RETVAL);
2599 Mix_Volume (RETVAL, 128);
2600 }
2601}
2341 OUTPUT: 2602 OUTPUT:
2342 RETVAL 2603 RETVAL
2343 2604
2344MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2345 2606
2346int 2607int
2347volume (int volume = -1) 2608volume (int volume = -1)
2348 PROTOTYPE: ;$ 2609 PROTOTYPE: ;$
2349 CODE: 2610 CODE:
2611 if (items > 0)
2612 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 2613 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 2614 OUTPUT:
2352 RETVAL 2615 RETVAL
2353 2616
2354int 2617void
2355fade_out (int ms) 2618fade_out (int ms)
2356 CODE: 2619 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 2620 Mix_FadeOutMusic (ms);
2358 OUTPUT:
2359 RETVAL
2360 2621
2361void 2622void
2362halt () 2623halt ()
2363 CODE: 2624 CODE:
2364 Mix_HaltMusic (); 2625 Mix_HaltMusic ();
2365 2626
2366CFPlus::MixMusic 2627DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 2628new (SV *class, DC::RW rwops)
2368 CODE: 2629 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 2630 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 2631 OUTPUT:
2371 RETVAL 2632 RETVAL
2372 2633
2373void 2634void
2374DESTROY (CFPlus::MixMusic self) 2635DESTROY (DC::MixMusic self)
2375 CODE: 2636 CODE:
2376 Mix_FreeMusic (self); 2637 Mix_FreeMusic (self);
2377 2638
2378int 2639int
2379play (CFPlus::MixMusic self, int loops = -1) 2640play (DC::MixMusic self, int loops = -1)
2380 CODE: 2641 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 2642 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 2643 OUTPUT:
2383 RETVAL 2644 RETVAL
2384 2645
2385int 2646void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2647fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 2648 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2649 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 2650
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2651MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 2652
2394PROTOTYPES: ENABLE 2653PROTOTYPES: ENABLE
2395 2654
2396BOOT: 2655BOOT:
2397{ 2656{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2657 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 2658 static const struct {
2400 const char *name; 2659 const char *name;
2401 IV iv; 2660 IV iv;
2402 } *civ, const_iv[] = { 2661 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 2662# define const_iv(name) { # name, (IV)name }
2438 const_iv (GL_INTENSITY), 2697 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 2698 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 2699 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 2700 const_iv (GL_FLOAT),
2442 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2701 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2702 const_iv (GL_COMPRESSED_ALPHA_ARB),
2703 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2704 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2705 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2706 const_iv (GL_COMPRESSED_RGB_ARB),
2707 const_iv (GL_COMPRESSED_RGBA_ARB),
2443 const_iv (GL_COMPILE), 2708 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 2709 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 2710 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 2711 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 2712 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2751 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 2752 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 2753 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 2754 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 2755 const_iv (GL_GENERATE_MIPMAP_HINT),
2756 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 2757 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 2758 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 2759 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 2760 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 2761 const_iv (GL_V3F),
2503 2769
2504 texture_av = newAV (); 2770 texture_av = newAV ();
2505 AvREAL_off (texture_av); 2771 AvREAL_off (texture_av);
2506} 2772}
2507 2773
2774void
2775disable_GL_EXT_blend_func_separate ()
2776 CODE:
2777 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0;
2779
2508char * 2780char *
2509gl_vendor () 2781gl_vendor ()
2510 CODE: 2782 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 2783 RETVAL = (char *)glGetString (GL_VENDOR);
2512 OUTPUT: 2784 OUTPUT:
2633 2905
2634void glRect (float x1, float y1, float x2, float y2) 2906void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 2907 CODE:
2636 glRectf (x1, y1, x2, y2); 2908 glRectf (x1, y1, x2, y2);
2637 2909
2910void glRect_lineloop (float x1, float y1, float x2, float y2)
2911 CODE:
2912 glBegin (GL_LINE_LOOP);
2913 glVertex2f (x1, y1);
2914 glVertex2f (x2, y1);
2915 glVertex2f (x2, y2);
2916 glVertex2f (x1, y2);
2917 glEnd ();
2918
2638PROTOTYPES: ENABLE 2919PROTOTYPES: ENABLE
2639 2920
2640void glBegin (int mode) 2921void glBegin (int mode)
2641 2922
2642void glEnd () 2923void glEnd ()
2674void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2955void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2675 CODE: 2956 CODE:
2676 if (gl.SeparableFilter2D) 2957 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 2959
2679void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2960void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2680 2961
2681void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2682 2963
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 2964void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 2965
2710 2991
2711void glEndList () 2992void glEndList ()
2712 2993
2713void glCallList (int list) 2994void glCallList (int list)
2714 2995
2715MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2716 2997
2717PROTOTYPES: DISABLE 2998PROTOTYPES: DISABLE
2718 2999
2719void 3000void
2720find_widget (SV *self, NV x, NV y) 3001find_widget (SV *self, NV x, NV y)
2724 XPUSHs (self); 3005 XPUSHs (self);
2725} 3006}
2726 3007
2727BOOT: 3008BOOT:
2728{ 3009{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3010 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 3011
2731 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3012 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2732 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3013 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2733 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3014 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2734 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3015 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2735} 3016}
2736 3017
2737void 3018void
2738draw (SV *self) 3019draw (SV *self)
2739 CODE: 3020 CODE:
2743 NV x, y, w, h; 3024 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 3025 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 3026 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 3027 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 3028 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 3029 double draw_x, draw_y;
2750 3030
2751 if (!SvROK (self)) 3031 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3032 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 3033
2754 hv = (HV *)SvRV (self); 3034 hv = (HV *)SvRV (self);
2755 3035
2756 if (SvTYPE (hv) != SVt_PVHV) 3036 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3037 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 3038
2759 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3039 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2760 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3040 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2761 3041
2762 if (!h || !w) 3042 if (!h || !w)
2782 { 3062 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3063 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 3064
2785 if (svp && SvTRUE (*svp)) 3065 if (svp && SvTRUE (*svp))
2786 { 3066 {
2787 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3067 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2788 glEnable (GL_BLEND); 3068 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3069 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 3070 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 3071 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 3072 glVertex2f (w, 0);
2795 glEnd (); 3075 glEnd ();
2796 glDisable (GL_BLEND); 3076 glDisable (GL_BLEND);
2797 } 3077 }
2798 } 3078 }
2799#if 0 3079#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 3080 // draw borders, for debugging
2801 glPushMatrix; 3081 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 3082 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 3083 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 3084 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 3085 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 3086 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 3087 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 3088 glVertex2f (0 , h - 1);
2809 glEnd; 3089 glEnd ();
2810 glPopMatrix; 3090 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 3091#endif
2814 PUSHMARK (SP); 3092 PUSHMARK (SP);
2815 XPUSHs (self); 3093 XPUSHs (self);
2816 PUTBACK; 3094 PUTBACK;
2817 call_method ("_draw", G_VOID | G_DISCARD); 3095 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines