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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines