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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines