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.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.269 by root, Sun Jul 20 03:46:02 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>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
38#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
39 46
40#include <glib/gmacros.h> 47#include <glib/gmacros.h>
41 48
42#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
43 61
44#ifndef _WIN32 62#ifndef _WIN32
45# include <sys/types.h> 63# include <sys/types.h>
46# include <sys/socket.h> 64# include <sys/socket.h>
47# include <netinet/in.h> 65# include <netinet/in.h>
48# include <netinet/tcp.h> 66# include <netinet/tcp.h>
49# include <inttypes.h> 67# include <inttypes.h>
50#endif 68#endif
51 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
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 80
54#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
55 82
56#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
58 85
59#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
60 87
61#if 0 88/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else
64# define PARACHUTE 0
65#endif
66 90
67static AV *texture_av; 91static AV *texture_av;
68 92
69static struct 93static struct
70{ 94{
107 av_push (texture_av, (SV *)(size_t)name); 131 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 132 glDeleteTextures (1, &name);
109} 133}
110 134
111#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
112 137
113#include "pango-font.c" 138#include "pango-font.c"
114#include "pango-fontmap.c" 139#include "pango-fontmap.c"
115#include "pango-render.c" 140#include "pango-render.c"
116 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
119 146
120typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
121 148
122static int 149static int
123shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
124{ 151{
125 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
139 166
140typedef struct cf_layout { 167typedef struct cf_layout {
141 PangoLayout *pl; 168 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
143 int base_height; 170 int base_height;
144 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
145} *CFPlus__Layout; 173} *DC__Layout;
146 174
147static CFPlus__Font default_font; 175static DC__Font default_font;
148static PangoContext *opengl_context; 176static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
150 178
151static void 179static void
152substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
157#endif 185#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 187}
160 188
161static void 189static void
162layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
163{ 191{
164 /* 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
165 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
166 */ 194 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
168 196
169 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 199
172 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
173} 201}
174 202
175static void 203static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 205{
178 PangoRectangle rect; 206 PangoRectangle rect;
179 207
180 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
192 220
193typedef uint16_t tileid; 221typedef uint16_t tileid;
194typedef uint16_t faceid; 222typedef uint16_t faceid;
195 223
196typedef struct { 224typedef struct {
197 int name; 225 GLuint name;
198 int w, h; 226 int w, h;
199 float s, t; 227 float s, t;
200 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
201 tileid smoothtile; 229 tileid smoothtile;
202 uint8_t smoothlevel; 230 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
222 250
223 int32_t rows; 251 int32_t rows;
224 maprow *row; 252 maprow *row;
225} *CFPlus__Map; 253} *DC__Map;
226 254
227static char * 255static char *
228prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
229{ 257{
230 char *p; 258 char *p;
268 self->texs *= 2; 296 self->texs *= 2;
269 } 297 }
270} 298}
271 299
272static maprow * 300static maprow *
273map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
274{ 302{
275 if (0 > y) 303 if (0 > y)
276 { 304 {
277 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
316 344
317 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
318} 346}
319 347
320static mapcell * 348static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
322{ 350{
323 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
324} 352}
325 353
326static void 354static void
327map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
328{ 356{
329 int r; 357 int r;
330 358
331 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
339 self->oy = 0; 367 self->oy = 0;
340 self->row = 0; 368 self->row = 0;
341 self->rows = 0; 369 self->rows = 0;
342} 370}
343 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
344static void 382static void
345map_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)
346{ 384{
347 int x, y; 385 int x, y;
348 maprow *row; 386 maprow *row;
349 mapcell *cell; 387 mapcell *cell;
350 388
362 if (x >= row->c1) 400 if (x >= row->c1)
363 break; 401 break;
364 402
365 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
366 404
367 cell->darkness = 0; 405 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 406 }
372 } 407 }
373} 408}
374 409
375typedef struct { 410typedef struct {
429 n |= n >> 16; 464 n |= n >> 16;
430 465
431 return n + 1; 466 return n + 1;
432} 467}
433 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
434/* SDL should provide this, really. */ 480/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 481#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 482#define SDLK_MODIFIER_MAX 314
437 483
438/******************************************************************************/ 484/******************************************************************************/
476 return 0; 522 return 0;
477 523
478 return 1; 524 return 1;
479} 525}
480 526
481MODULE = CFPlus PACKAGE = CFPlus 527MODULE = Deliantra::Client PACKAGE = DC
482 528
483PROTOTYPES: ENABLE 529PROTOTYPES: ENABLE
484 530
485BOOT: 531BOOT:
486{ 532{
487 HV *stash = gv_stashpv ("CFPlus", 1); 533 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 534 static const struct {
489 const char *name; 535 const char *name;
490 IV iv; 536 IV iv;
491 } *civ, const_iv[] = { 537 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 538# define const_iv(name) { # name, (IV)name }
514 560
515 const_iv (SDL_APPINPUTFOCUS), 561 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 562 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 563 const_iv (SDL_APPACTIVE),
518 564
565 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 567 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 568 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 569 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 570 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 571 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 643 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 644 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
599 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)
600# undef const_iv 679# undef const_iv
601 }; 680 };
602 681
603 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; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 701
623NV floor (NV x) 702NV floor (NV x)
624 703
625NV ceil (NV x) 704NV ceil (NV x)
626 705
706IV minpot (UV n)
707
708IV popcount (UV n)
709
627void 710void
628pango_init () 711pango_init ()
629 CODE: 712 CODE:
630{ 713{
631 opengl_fontmap = pango_opengl_font_map_new (); 714 opengl_fontmap = pango_opengl_font_map_new ();
632 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);
633 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
634} 722}
635 723
636char *
637SDL_GetError () 724char *SDL_GetError ()
638 725
639int 726int SDL_Init (U32 flags)
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 727
642void 728int SDL_InitSubSystem (U32 flags)
729
730void SDL_QuitSubSystem (U32 flags)
731
643SDL_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
644 742
645void 743void
646SDL_ListModes (int rgb, int alpha) 744SDL_ListModes (int rgb, int alpha)
647 PPCODE: 745 PPCODE:
648{ 746{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 758 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 759 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 760 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 761
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 762 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 763 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 764
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 765 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 766
672 if (m && m != (SDL_Rect **)-1) 767 if (m && m != (SDL_Rect **)-1)
673 while (*m) 768 while (*m)
674 { 769 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 770 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 771 {
677 AV *av = newAV (); 772 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 773 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 774 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 775 av_push (av, newSViv (rgb));
704 799
705 if (RETVAL) 800 if (RETVAL)
706 { 801 {
707 av_clear (texture_av); 802 av_clear (texture_av);
708 803
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 804 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#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);
711#include "glfunc.h" 806#include "glfunc.h"
712#undef GL_FUNC 807#undef GL_FUNC
713 } 808 }
714} 809}
721char * 816char *
722SDL_GetKeyName (int sym) 817SDL_GetKeyName (int sym)
723 818
724int 819int
725SDL_GetAppState () 820SDL_GetAppState ()
821
822int
823SDL_GetModState ()
726 824
727void 825void
728poll_events () 826poll_events ()
729 PPCODE: 827 PPCODE:
730{ 828{
740 { 838 {
741 case SDL_KEYDOWN: 839 case SDL_KEYDOWN:
742 case SDL_KEYUP: 840 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 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);
746 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 */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 846 break;
749 847
750 case SDL_ACTIVEEVENT: 848 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 867 x = ev.motion.x;
770 y = ev.motion.y; 868 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 869 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 870 }
773 871
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 873 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 874 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 875 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 876 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 877 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 878 }
781 break; 879 break;
782 880
783 case SDL_MOUSEBUTTONDOWN: 881 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 882 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 883 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 884
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 885 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 887 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 888 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 893 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 894 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 895 break;
798 } 896 }
799 897
800 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))));
801 } 899 }
802} 900}
803 901
804int 902int
805Mix_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)
806 POSTCALL: 904 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 905 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 906 Mix_ChannelFinished (channel_finished);
809 907
810void 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
811Mix_CloseAudio () 925Mix_CloseAudio ()
812 926
813int 927int
814Mix_AllocateChannels (int numchans = -1) 928Mix_AllocateChannels (int numchans = -1)
929
930const char *
931Mix_GetError ()
815 932
816void 933void
817lowdelay (int fd, int val = 1) 934lowdelay (int fd, int val = 1)
818 CODE: 935 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 936 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 962 }
846 } 963 }
847#endif 964#endif
848} 965}
849 966
850void 967int
851add_font (char *file) 968add_font (char *file)
852 CODE: 969 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 970 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
971 OUTPUT:
972 RETVAL
854 973
855void 974void
856load_image_inline (SV *image_) 975load_image_inline (SV *image_)
857 ALIAS: 976 ALIAS:
858 load_image_file = 1 977 load_image_file = 1
861 STRLEN image_len; 980 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 981 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 982 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 983 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 984 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 985 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 986 : SDL_RWFromConstMem (image, image_len);
868 987
869 if (!rw) 988 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 989 croak ("load_image: %s", SDL_GetError ());
871 990
944void 1063void
945error (char *message) 1064error (char *message)
946 CODE: 1065 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1066 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1067#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1068 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1069#endif
951 1070
952void 1071void
953fatal (char *message) 1072fatal (char *message)
954 CODE: 1073 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1074 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1075#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1076 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1077#endif
959 _exit (1); 1078 _exit (1);
960 1079
961void 1080void
962_exit (int retval = 0) 1081_exit (int retval = 0)
974#if DEBUG 1093#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1094 VALGRIND_DO_LEAK_CHECK;
976#endif 1095#endif
977} 1096}
978 1097
979MODULE = CFPlus PACKAGE = CFPlus::Font 1098MODULE = Deliantra::Client PACKAGE = DC::Font
980 1099
981PROTOTYPES: DISABLE 1100PROTOTYPES: DISABLE
982 1101
983CFPlus::Font 1102DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1103new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1104 CODE:
986{ 1105{
987 int count; 1106 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1107 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1110}
992 OUTPUT: 1111 OUTPUT:
993 RETVAL 1112 RETVAL
994 1113
995void 1114void
996DESTROY (CFPlus::Font self) 1115DESTROY (DC::Font self)
997 CODE: 1116 CODE:
998 pango_font_description_free (self); 1117 pango_font_description_free (self);
999 1118
1000void 1119void
1001make_default (CFPlus::Font self) 1120make_default (DC::Font self)
1002 PROTOTYPE: $ 1121 PROTOTYPE: $
1003 CODE: 1122 CODE:
1004 default_font = self; 1123 default_font = self;
1005 1124
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1125MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1126
1008PROTOTYPES: DISABLE 1127PROTOTYPES: DISABLE
1009 1128
1010void 1129void
1011reset_glyph_cache () 1130glyph_cache_backup ()
1012 PROTOTYPE: 1131 PROTOTYPE:
1013 CODE: 1132 CODE:
1133 tc_backup ();
1134
1135void
1136glyph_cache_restore ()
1137 PROTOTYPE:
1138 CODE:
1014 tc_clear (); 1139 tc_restore ();
1015 1140
1016CFPlus::Layout 1141DC::Layout
1017new (SV *class) 1142new (SV *class)
1018 CODE: 1143 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1144 New (0, RETVAL, 1, struct cf_layout);
1020 1145
1021 RETVAL->pl = pango_layout_new (opengl_context); 1146 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1148 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1149 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1150 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1151 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1152 RETVAL->font = 0;
1153 RETVAL->rc = rc_alloc ();
1028 1154
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1155 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1156 layout_update_font (RETVAL);
1031 OUTPUT: 1157 OUTPUT:
1032 RETVAL 1158 RETVAL
1033 1159
1034void 1160void
1035DESTROY (CFPlus::Layout self) 1161DESTROY (DC::Layout self)
1036 CODE: 1162 CODE:
1037 g_object_unref (self->pl); 1163 g_object_unref (self->pl);
1164 rc_free (self->rc);
1038 Safefree (self); 1165 Safefree (self);
1039 1166
1040void 1167void
1041set_text (CFPlus::Layout self, SV *text_) 1168set_text (DC::Layout self, SV *text_)
1042 CODE: 1169 CODE:
1043{ 1170{
1044 STRLEN textlen; 1171 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1172 char *text = SvPVutf8 (text_, textlen);
1046 1173
1047 pango_layout_set_text (self->pl, text, textlen); 1174 pango_layout_set_text (self->pl, text, textlen);
1048} 1175}
1049 1176
1050void 1177void
1051set_markup (CFPlus::Layout self, SV *text_) 1178set_markup (DC::Layout self, SV *text_)
1052 CODE: 1179 CODE:
1053{ 1180{
1054 STRLEN textlen; 1181 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1182 char *text = SvPVutf8 (text_, textlen);
1056 1183
1057 pango_layout_set_markup (self->pl, text, textlen); 1184 pango_layout_set_markup (self->pl, text, textlen);
1058} 1185}
1059 1186
1060void 1187void
1061set_shapes (CFPlus::Layout self, ...) 1188set_shapes (DC::Layout self, ...)
1062 CODE: 1189 CODE:
1063{ 1190{
1064 PangoAttrList *attrs = 0; 1191 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1192 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1193 const char *pos = text;
1101 if (attrs) 1228 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1229 pango_layout_set_attributes (self->pl, attrs);
1103} 1230}
1104 1231
1105void 1232void
1106get_shapes (CFPlus::Layout self) 1233get_shapes (DC::Layout self)
1107 PPCODE: 1234 PPCODE:
1108{ 1235{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1236 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1237
1111 do 1238 do
1112 { 1239 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1240 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1241
1115 if (run && shape_attr_p (run)) 1242 if (run && shape_attr_p (run))
1116 { 1243 {
1117 PangoRectangle extents; 1244 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1245 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1253
1127 pango_layout_iter_free (iter); 1254 pango_layout_iter_free (iter);
1128} 1255}
1129 1256
1130int 1257int
1131has_wrapped (CFPlus::Layout self) 1258has_wrapped (DC::Layout self)
1132 CODE: 1259 CODE:
1133{ 1260{
1134 int lines = 1; 1261 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1262 const char *text = pango_layout_get_text (self->pl);
1136 1263
1141} 1268}
1142 OUTPUT: 1269 OUTPUT:
1143 RETVAL 1270 RETVAL
1144 1271
1145SV * 1272SV *
1146get_text (CFPlus::Layout self) 1273get_text (DC::Layout self)
1147 CODE: 1274 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1275 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1276 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1277 OUTPUT:
1151 RETVAL 1278 RETVAL
1152 1279
1153void 1280void
1154set_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.)
1155 CODE: 1282 CODE:
1156 self->r = r; 1283 self->r = r;
1157 self->g = g; 1284 self->g = g;
1158 self->b = b; 1285 self->b = b;
1159 self->a = a; 1286 self->a = a;
1160 1287
1161void 1288void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1289set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1290 CODE:
1164 if (self->font != font) 1291 if (self->font != font)
1165 { 1292 {
1166 self->font = font; 1293 self->font = font;
1167 layout_update_font (self); 1294 layout_update_font (self);
1168 } 1295 }
1169 1296
1170void 1297void
1171set_height (CFPlus::Layout self, int base_height) 1298set_height (DC::Layout self, int base_height)
1172 CODE: 1299 CODE:
1173 if (self->base_height != base_height) 1300 if (self->base_height != base_height)
1174 { 1301 {
1175 self->base_height = base_height; 1302 self->base_height = base_height;
1176 layout_update_font (self); 1303 layout_update_font (self);
1177 } 1304 }
1178 1305
1179void 1306void
1180set_width (CFPlus::Layout self, int max_width = -1) 1307set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1308 CODE:
1182 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);
1183 1310
1184void 1311void
1185set_indent (CFPlus::Layout self, int indent) 1312set_indent (DC::Layout self, int indent)
1186 CODE: 1313 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1314 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1315
1189void 1316void
1190set_spacing (CFPlus::Layout self, int spacing) 1317set_spacing (DC::Layout self, int spacing)
1191 CODE: 1318 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1319 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1320
1194void 1321void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1322set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1323 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1324 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1325 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1326 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1327 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1328 : PANGO_ELLIPSIZE_NONE
1202 ); 1329 );
1203 1330
1204void 1331void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1332set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1333 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1334 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1335
1209void 1336void
1210size (CFPlus::Layout self) 1337size (DC::Layout self)
1211 PPCODE: 1338 PPCODE:
1212{ 1339{
1213 int w, h; 1340 int w, h;
1214 1341
1215 layout_get_pixel_size (self, &w, &h); 1342 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1345 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1346 PUSHs (sv_2mortal (newSViv (h)));
1220} 1347}
1221 1348
1222int 1349int
1223descent (CFPlus::Layout self) 1350descent (DC::Layout self)
1224 CODE: 1351 CODE:
1225{ 1352{
1226 PangoRectangle rect; 1353 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1354 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1355 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1356 RETVAL = PANGO_DESCENT (rect);
1230} 1357}
1231 OUTPUT: 1358 OUTPUT:
1232 RETVAL 1359 RETVAL
1233 1360
1234int 1361int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1362xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1363 CODE:
1237{ 1364{
1238 int index, trailing; 1365 int index, trailing;
1239 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);
1240 RETVAL = index + trailing; 1367 RETVAL = index + trailing;
1241} 1368}
1242 OUTPUT: 1369 OUTPUT:
1243 RETVAL 1370 RETVAL
1244 1371
1245void 1372void
1246cursor_pos (CFPlus::Layout self, int index) 1373cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1374 PPCODE:
1248{ 1375{
1249 PangoRectangle strong_pos; 1376 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1377 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1378
1252 EXTEND (SP, 3); 1379 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1380 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1381 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1382 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1383}
1257 1384
1258void 1385void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1386index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1387 PPCODE:
1261{ 1388{
1262 int line, x; 1389 int line, x;
1263 1390
1264 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)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1393 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1394 --line;
1395#endif
1267 EXTEND (SP, 2); 1396 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1397 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1398 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1399}
1271 1400
1272void 1401void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1402line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1403 PPCODE:
1275{ 1404{
1276 PangoLayoutLine *lp; 1405 PangoLayoutLine *lp;
1277 int index, trailing; 1406 int index, trailing;
1278 1407
1279 if (line < 0) 1408 if (line < 0)
1280 XSRETURN_EMPTY; 1409 XSRETURN_EMPTY;
1281 1410
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1411 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1412 XSRETURN_EMPTY; /* do better */
1284 1413
1285 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);
1286 1415
1287 EXTEND (SP, 2); 1416 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1422 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1423 }
1295} 1424}
1296 1425
1297void 1426void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1427render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1428 CODE:
1429 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1430 pango_opengl_render_layout_subpixel (
1301 self->pl, 1431 self->pl,
1432 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1433 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1434 self->r, self->g, self->b, self->a,
1304 flags 1435 flags
1305 ); 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);
1306 1440
1307MODULE = 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
1308 1461
1309PROTOTYPES: ENABLE 1462PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1463
1313void 1464void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1465pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1466 CODE:
1316{ 1467{
1343 HV *hv = (HV *)SvRV (self); 1494 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1495 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1496 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1497 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1498
1499 if (name <= 0)
1500 XSRETURN_EMPTY;
1501
1348 if (items < 5) 1502 if (items < 5)
1349 { 1503 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1504 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1505 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1506 }
1390 RETVAL = width > 0; 1544 RETVAL = width > 0;
1391} 1545}
1392 OUTPUT: 1546 OUTPUT:
1393 RETVAL 1547 RETVAL
1394 1548
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1549MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1550
1397PROTOTYPES: DISABLE 1551PROTOTYPES: DISABLE
1398 1552
1399CFPlus::Map 1553DC::Map
1400new (SV *class) 1554new (SV *class)
1401 CODE: 1555 CODE:
1402 New (0, RETVAL, 1, struct map); 1556 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1557 RETVAL->x = 0;
1404 RETVAL->y = 0; 1558 RETVAL->y = 0;
1412 RETVAL->row = 0; 1566 RETVAL->row = 0;
1413 OUTPUT: 1567 OUTPUT:
1414 RETVAL 1568 RETVAL
1415 1569
1416void 1570void
1417DESTROY (CFPlus::Map self) 1571DESTROY (DC::Map self)
1418 CODE: 1572 CODE:
1419{ 1573{
1420 map_clear (self); 1574 map_clear (self);
1421 Safefree (self->face2tile); 1575 Safefree (self->face2tile);
1422 Safefree (self->tex); 1576 Safefree (self->tex);
1423 Safefree (self); 1577 Safefree (self);
1424} 1578}
1425 1579
1426void 1580void
1427resize (CFPlus::Map self, int map_width, int map_height) 1581resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1582 CODE:
1429 self->w = map_width; 1583 self->w = map_width;
1430 self->h = map_height; 1584 self->h = map_height;
1431 1585
1432void 1586void
1433clear (CFPlus::Map self) 1587clear (DC::Map self)
1434 CODE: 1588 CODE:
1435 map_clear (self); 1589 map_clear (self);
1436 1590
1437void 1591void
1438set_tileid (CFPlus::Map self, int face, int tile) 1592set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1593 CODE:
1440{ 1594{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1595 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1596 need_texid (self, tile);
1443} 1597}
1444 1598
1445void 1599void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1600set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1601 CODE:
1448{ 1602{
1449 tileid texid; 1603 tileid texid;
1450 maptex *tex; 1604 maptex *tex;
1451 1605
1464 tex->smoothtile = self->face2tile [smooth]; 1618 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1619 tex->smoothlevel = level;
1466} 1620}
1467 1621
1468void 1622void
1469set_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)
1470 CODE: 1624 CODE:
1471{ 1625{
1472 need_texid (self, texid); 1626 need_texid (self, texid);
1473 1627
1474 { 1628 {
1494 // from transparent color bleeding and ugly wrapping effects. 1648 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1650}
1497 1651
1498int 1652int
1499ox (CFPlus::Map self) 1653ox (DC::Map self)
1500 ALIAS: 1654 ALIAS:
1501 oy = 1 1655 oy = 1
1502 x = 2 1656 x = 2
1503 y = 3 1657 y = 3
1504 w = 4 1658 w = 4
1515 } 1669 }
1516 OUTPUT: 1670 OUTPUT:
1517 RETVAL 1671 RETVAL
1518 1672
1519void 1673void
1520scroll (CFPlus::Map self, int dx, int dy) 1674scroll (DC::Map self, int dx, int dy)
1521 CODE: 1675 CODE:
1522{ 1676{
1523 if (dx > 0) 1677 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1678 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1679 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1694 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1695 self->y += MAP_EXTEND_Y;
1542 } 1696 }
1543} 1697}
1544 1698
1545void 1699SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1700map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1701 CODE:
1548{ 1702{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1703 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1704 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1705 mapcell *cell;
1552 int x, y, flags; 1706 int x, y, z, flags;
1707 AV *missing = newAV ();
1708 RETVAL = newRV_noinc ((SV *)missing);
1553 1709
1554 while (data < data_end - 1) 1710 while (data < data_end - 1)
1555 { 1711 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1712 flags = (data [0] << 8) + data [1]; data += 2;
1557 1713
1577 uint8_t ext, cmd; 1733 uint8_t ext, cmd;
1578 1734
1579 do 1735 do
1580 { 1736 {
1581 ext = *data++; 1737 ext = *data++;
1582 cmd = ext & 0x3f; 1738 cmd = ext & 0x7f;
1583 1739
1584 if (cmd < 4) 1740 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1741 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1742 else if (cmd == 5) // health
1587 { 1743 {
1590 } 1746 }
1591 else if (cmd == 6) // monster width 1747 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1748 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1749 else if (cmd == 0x47)
1594 { 1750 {
1595 if (*data == 4) 1751 if (*data == 1) cell->player = data [1];
1596 ; // 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);
1597 1755
1598 data += *data + 1; 1756 data += *data + 1;
1599 } 1757 }
1600 else if (cmd == 8) // cell flags 1758 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1759 cell->flags = *data++;
1608 } 1766 }
1609 else 1767 else
1610 cell->darkness = *data++ + 1; 1768 cell->darkness = *data++ + 1;
1611 } 1769 }
1612 1770
1771 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1772 if (flags & (4 >> z))
1614 { 1773 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1774 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1775 need_facenum (self, face);
1617 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 }
1618 } 1791 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 1792 }
1634 else 1793 else
1635 cell->darkness = 0; 1794 CELL_CLEAR (cell);
1636 } 1795 }
1637} 1796}
1797 OUTPUT:
1798 RETVAL
1638 1799
1639SV * 1800SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1801mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1802 CODE:
1642{ 1803{
1643 int x1, x; 1804 int x1, x;
1644 int y1, y; 1805 int y1, y;
1645 int z; 1806 int z;
1690} 1851}
1691 OUTPUT: 1852 OUTPUT:
1692 RETVAL 1853 RETVAL
1693 1854
1694void 1855void
1695draw (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)
1696 CODE: 1857 CODE:
1697{ 1858{
1859 int x, y, z;
1860
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 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
1700 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)
1701 smooth_key skey; 1864 smooth_key skey;
1702 int x, y, z; 1865 int pl_x, pl_y;
1703 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;
1704 1872
1705 // thats current max. sorry. 1873 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1874 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1875 if (sh > 255) sh = 255;
1708 1876
1709 // clear key, in case of extra padding 1877 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1878 memset (&skey, 0, sizeof (skey));
1711 1879
1712 glColor4ub (255, 255, 255, 255); 1880 memset (&key, 0, sizeof (key));
1713 1881 key.r = 255;
1714 glEnable (GL_BLEND); 1882 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1883 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1884 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1885 key.mode = GL_QUADS;
1718 1886 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 1887 key.texname = -1;
1720
1721 last_name = 0;
1722 1888
1723 mx += self->x; 1889 mx += self->x;
1724 my += self->y; 1890 my += self->y;
1725 1891
1726 // first pass: determine smooth_max 1892 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 1908 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 1909 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 1910 self->tex [cell->tile [2]].smoothlevel));
1745 } 1911 }
1746 } 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);
1747 1917
1748 for (z = 0; z <= 2; z++) 1918 for (z = 0; z <= 2; z++)
1749 { 1919 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 1920 memset (smooth_level, 0, sizeof (smooth_level));
1751 1921
1764 { 1934 {
1765 maptex tex = self->tex [tile]; 1935 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 1936 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h; 1937 int py = (y + 1) * T - tex.h;
1768 1938
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 1939 if (key.texname != tex.name)
1772 { 1940 {
1773 if (!tex.name) 1941 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 1942 tex = self->tex [2]; /* missing, replace by noface */
1775 1943
1776 glEnd (); 1944 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1945 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 1946 }
1780 1947
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1948 if (expect_false (cell->player == player) && expect_false (z == 2))
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785
1786 if (cell->flags && z == 2)
1787 { 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
1788 if (cell->flags & 1) 1964 if (cell->flags & 1)
1789 { 1965 {
1790 maptex tex = self->tex [1]; 1966 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 1967 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 1968 int py = y * T - T * 6 / 32;
1793 1969
1970 if (tex.name)
1794 glEnd (); 1971 {
1795 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);
1796 glBegin (GL_QUADS); 1982 }
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 } 1983 }
1803 } 1984 }
1804 1985
1805 // update smooth hash 1986 // update smooth hash
1806 if (tex.smoothtile) 1987 if (tex.smoothtile)
1842 } 2023 }
1843 } 2024 }
1844 } 2025 }
1845 } 2026 }
1846 2027
2028 rc_draw (rc);
2029 rc_clear (rc);
2030
1847 // go through all smoothlevels, lowest to highest, then draw. 2031 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2032 // this is basically counting sort
1849 { 2033 {
1850 int w, b; 2034 int w, b;
1851 2035
2036 glEnable (GL_TEXTURE_2D);
2037 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2038 for (w = 0; w < 256 / 32; ++w)
1853 { 2039 {
1854 uint32_t smask = smooth_level [w]; 2040 uint32_t smask = smooth_level [w];
1855 if (smask) 2041 if (smask)
1856 for (b = 0; b < 32; ++b) 2042 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2061 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2062 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2063 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2064 float dy = tex.t * .5f ; // 2 images/column
1879 2065
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2066 if (tex.name)
1883 { 2067 {
2068 // this time avoiding texture state changes
2069 // save gobs of state changes.
1884 if (!tex.name) 2070 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2071 {
1886
1887 glEnd (); 2072 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2074 glBegin (GL_QUADS);
1890 } 2075 }
1891 2076
1892 if (border) 2077 if (border)
1893 { 2078 {
1894 float ox = border * dx; 2079 float ox = border * dx;
1895 2080
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2081 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2082 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2083 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2084 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2085 }
1901 2086
1902 if (corner) 2087 if (corner)
1903 { 2088 {
1904 float ox = corner * dx; 2089 float ox = corner * dx;
1905 2090
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2091 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2092 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2093 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2094 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2095 }
1910 } 2096 }
1911 } 2097 }
1912 } 2098 }
1913 } 2099 }
1914 } 2100 }
2101
2102 glEnd ();
2103 glDisable (GL_TEXTURE_2D);
2104 key.texname = -1;
1915 } 2105 }
1916 2106
1917 hv_clear (smooth); 2107 hv_clear (smooth);
1918 } 2108 }
1919 2109
1920 glEnd (); 2110 if (pl_tex.name)
2111 {
2112 maptex tex = pl_tex;
2113 int px = pl_x + sdx;
2114 int py = pl_y + sdy;
1921 2115
1922 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
1923 glDisable (GL_BLEND); 2127 glDisable (GL_BLEND);
2128 rc_free (rc);
1924 2129
1925 // top layer: overlays such as the health bar 2130 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2131 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2132 if (0 <= y + my && y + my < self->rows)
1928 { 2133 {
1953 } 2158 }
1954 } 2159 }
1955} 2160}
1956 2161
1957void 2162void
1958draw_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)
1959 CODE: 2164 CODE:
1960{ 2165{
1961 static float color[16][3] = { 2166 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2167 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2168 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2218 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2219 glDisable (GL_TEXTURE_2D);
2015} 2220}
2016 2221
2017void 2222void
2018fow_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)
2019 PPCODE: 2224 PPCODE:
2020{ 2225{
2021 int x, y; 2226 int x, y;
2022 int sw1 = sw + 2; 2227 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2228 int sh1 = sh + 2;
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2236 SvCUR_set (darkness3_sv, sw34 * sh3);
2032 2237
2033 mx += self->x - 1; 2238 mx += self->x - 1;
2034 my += self->y - 1; 2239 my += self->y - 1;
2035 2240
2036 memset (darkness1, 255, sw1 * sh1); 2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2037 2242
2038 for (y = 0; y < sh1; y++) 2243 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2244 if (0 <= y + my && y + my < self->rows)
2040 { 2245 {
2041 maprow *row = self->row + (y + my); 2246 maprow *row = self->row + (y + my);
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2299 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2300 PUSHs (darkness3_sv);
2096} 2301}
2097 2302
2098SV * 2303SV *
2099get_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)
2100 CODE: 2305 CODE:
2101{ 2306{
2102 int x, y, x1, y1; 2307 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2308 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2309 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2366 else
2162 *data++ = 0; 2367 *data++ = 0;
2163 } 2368 }
2164 } 2369 }
2165 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 {
2166 SvPOK_only (data_sv); 2374 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2375 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2376 }
2377
2168 RETVAL = data_sv; 2378 RETVAL = data_sv;
2169} 2379}
2170 OUTPUT: 2380 OUTPUT:
2171 RETVAL 2381 RETVAL
2172 2382
2173void 2383void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2384set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2385 PPCODE:
2176{ 2386{
2177 int x, y, z; 2387 int x, y, z;
2178 int w, h; 2388 int w, h;
2179 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;
2180 2400
2181 if (*data++ != 0) 2401 if (*data++ != 0)
2182 return; /* version mismatch */ 2402 XSRETURN_EMPTY; /* version mismatch */
2183 2403
2184 w = *data++ << 8; w |= *data++; 2404 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2405 h = *data++ << 8; h |= *data++;
2186 2406
2187 // 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
2199 { 2419 {
2200 maprow *row = map_get_row (self, y); 2420 maprow *row = map_get_row (self, y);
2201 2421
2202 for (x = x0; x < x1; x++) 2422 for (x = x0; x < x1; x++)
2203 { 2423 {
2424 uint8_t flags;
2425
2426 if (data + 7 >= end)
2427 XSRETURN_EMPTY;
2428
2204 uint8_t flags = *data++; 2429 flags = *data++;
2205 2430
2206 if (flags) 2431 if (flags)
2207 { 2432 {
2208 mapcell *cell = row_get_cell (row, x); 2433 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2434 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2437 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2438 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2439
2215 if (cell->darkness == 0) 2440 if (cell->darkness == 0)
2216 { 2441 {
2217 cell->darkness = 0; 2442 /*cell->darkness = 0;*/
2443 EXTEND (SP, 3);
2218 2444
2219 for (z = 0; z <= 2; z++) 2445 for (z = 0; z <= 2; z++)
2220 { 2446 {
2221 tileid t = tile [z]; 2447 tileid t = tile [z];
2222 2448
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2449 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2450 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2451 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2452 need_texid (self, t);
2227 } 2453 }
2228 2454
2229 cell->tile [z] = t; 2455 cell->tile [z] = t;
2230 } 2456 }
2232 } 2458 }
2233 } 2459 }
2234 } 2460 }
2235} 2461}
2236 2462
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2463MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2464
2239PROTOTYPES: DISABLE 2465DC::RW
2240
2241CFPlus::MixChunk
2242new (SV *class, SV *data_sv) 2466new (SV *class, SV *data_sv)
2243 CODE: 2467 CODE:
2244{ 2468{
2245 STRLEN datalen; 2469 STRLEN datalen;
2246 char *data = SvPVbyte (data_sv, datalen); 2470 char *data = SvPVbyte (data_sv, datalen);
2247 2471
2248 RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1); 2472 RETVAL = SDL_RWFromConstMem (data, datalen);
2249} 2473}
2250 OUTPUT: 2474 OUTPUT:
2251 RETVAL 2475 RETVAL
2252 2476
2253CFPlus::MixChunk 2477DC::RW
2254new_from_file (SV *class, char *path) 2478new_from_file (SV *class, const char *path, const char *mode = "rb")
2255 CODE: 2479 CODE:
2256 RETVAL = Mix_LoadWAV (path); 2480 RETVAL = SDL_RWFromFile (path, mode);
2257 OUTPUT: 2481 OUTPUT:
2258 RETVAL 2482 RETVAL
2259 2483
2484# fails on win32:
2485# dc.xs(2268) : error C2059: syntax error : '('
2260void 2486#void
2487#close (DC::RW self)
2488# CODE:
2489# (self->(close)) (self);
2490
2491MODULE = Deliantra::Client PACKAGE = DC::Channel
2492
2493PROTOTYPES: DISABLE
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
2532int
2533volume (DC::Channel self, int volume)
2534 CODE:
2535 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2536 OUTPUT:
2537 RETVAL
2538
2539void
2540unregister_all_effects (DC::Channel self)
2541 CODE:
2542 Mix_UnregisterAllEffects (self);
2543
2544void
2545set_panning (DC::Channel self, int left, int right)
2546 CODE:
2547 left = CLAMP (left , 0, 255);
2548 right = CLAMP (right, 0, 255);
2549 Mix_SetPanning (self, left, right);
2550
2551void
2552set_distance (DC::Channel self, int distance)
2553 CODE:
2554 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2555
2556void
2557set_position (DC::Channel self, int angle, int distance)
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);
2566 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2567}
2568
2569void
2570set_reverse_stereo (DC::Channel self, int flip)
2571 CODE:
2572 Mix_SetReverseStereo (self, flip);
2573
2574MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2575
2576PROTOTYPES: DISABLE
2577
2578DC::MixChunk
2579new (SV *class, DC::RW rwops)
2580 CODE:
2581 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2582 OUTPUT:
2583 RETVAL
2584
2585void
2261DESTROY (CFPlus::MixChunk self) 2586DESTROY (DC::MixChunk self)
2262 CODE: 2587 CODE:
2263 Mix_FreeChunk (self); 2588 Mix_FreeChunk (self);
2264 2589
2265int 2590int
2266volume (CFPlus::MixChunk self, int volume = -1) 2591volume (DC::MixChunk self, int volume = -1)
2267 CODE: 2592 CODE:
2593 if (items > 1)
2594 volume = CLAMP (volume, 0, 128);
2268 RETVAL = Mix_VolumeChunk (self, volume); 2595 RETVAL = Mix_VolumeChunk (self, volume);
2269 OUTPUT: 2596 OUTPUT:
2270 RETVAL 2597 RETVAL
2271 2598
2272int 2599DC::Channel
2273play (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)
2274 CODE: 2601 CODE:
2602{
2275 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 {
2610 Mix_UnregisterAllEffects (RETVAL);
2611 Mix_Volume (RETVAL, 128);
2612 }
2613}
2276 OUTPUT: 2614 OUTPUT:
2277 RETVAL 2615 RETVAL
2278 2616
2279MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2617MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2280 2618
2281int 2619int
2282volume (int volume = -1) 2620volume (int volume = -1)
2283 PROTOTYPE: ;$ 2621 PROTOTYPE: ;$
2284 CODE: 2622 CODE:
2623 if (items > 0)
2624 volume = CLAMP (volume, 0, 128);
2285 RETVAL = Mix_VolumeMusic (volume); 2625 RETVAL = Mix_VolumeMusic (volume);
2286 OUTPUT: 2626 OUTPUT:
2287 RETVAL 2627 RETVAL
2288 2628
2629void
2630fade_out (int ms)
2631 CODE:
2632 Mix_FadeOutMusic (ms);
2633
2634void
2635halt ()
2636 CODE:
2637 Mix_HaltMusic ();
2638
2639DC::MixMusic
2640new (SV *class, DC::RW rwops)
2641 CODE:
2642 RETVAL = Mix_LoadMUS_RW (rwops);
2643 OUTPUT:
2644 RETVAL
2645
2646void
2647DESTROY (DC::MixMusic self)
2648 CODE:
2649 Mix_FreeMusic (self);
2650
2289int 2651int
2290fade_out (int ms)
2291 CODE:
2292 RETVAL = Mix_FadeOutMusic (ms);
2293 OUTPUT:
2294 RETVAL
2295
2296CFPlus::MixMusic
2297new_from_file (SV *class, char *path)
2298 CODE:
2299 RETVAL = Mix_LoadMUS (path);
2300 OUTPUT:
2301 RETVAL
2302
2303void
2304DESTROY (CFPlus::MixMusic self)
2305 CODE:
2306 Mix_FreeMusic (self);
2307
2308int
2309play (CFPlus::MixMusic self, int loops = -1) 2652play (DC::MixMusic self, int loops = -1)
2310 CODE: 2653 CODE:
2311 RETVAL = Mix_PlayMusic (self, loops); 2654 RETVAL = Mix_PlayMusic (self, loops);
2312 OUTPUT: 2655 OUTPUT:
2313 RETVAL 2656 RETVAL
2314 2657
2315int 2658void
2316fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2659fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2317 CODE: 2660 CODE:
2318 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2661 Mix_FadeInMusicPos (self, loops, ms, position);
2319 OUTPUT:
2320 RETVAL
2321 2662
2322MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2663MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2323 2664
2324PROTOTYPES: ENABLE 2665PROTOTYPES: ENABLE
2325 2666
2326BOOT: 2667BOOT:
2327{ 2668{
2328 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2669 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2329 static const struct { 2670 static const struct {
2330 const char *name; 2671 const char *name;
2331 IV iv; 2672 IV iv;
2332 } *civ, const_iv[] = { 2673 } *civ, const_iv[] = {
2333# define const_iv(name) { # name, (IV)name } 2674# define const_iv(name) { # name, (IV)name }
2368 const_iv (GL_INTENSITY), 2709 const_iv (GL_INTENSITY),
2369 const_iv (GL_LUMINANCE), 2710 const_iv (GL_LUMINANCE),
2370 const_iv (GL_LUMINANCE_ALPHA), 2711 const_iv (GL_LUMINANCE_ALPHA),
2371 const_iv (GL_FLOAT), 2712 const_iv (GL_FLOAT),
2372 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),
2373 const_iv (GL_COMPILE), 2720 const_iv (GL_COMPILE),
2374 const_iv (GL_PROXY_TEXTURE_1D), 2721 const_iv (GL_PROXY_TEXTURE_1D),
2375 const_iv (GL_PROXY_TEXTURE_2D), 2722 const_iv (GL_PROXY_TEXTURE_2D),
2376 const_iv (GL_TEXTURE_1D), 2723 const_iv (GL_TEXTURE_1D),
2377 const_iv (GL_TEXTURE_2D), 2724 const_iv (GL_TEXTURE_2D),
2416 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2763 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2417 const_iv (GL_POINT_SMOOTH_HINT), 2764 const_iv (GL_POINT_SMOOTH_HINT),
2418 const_iv (GL_LINE_SMOOTH_HINT), 2765 const_iv (GL_LINE_SMOOTH_HINT),
2419 const_iv (GL_POLYGON_SMOOTH_HINT), 2766 const_iv (GL_POLYGON_SMOOTH_HINT),
2420 const_iv (GL_GENERATE_MIPMAP_HINT), 2767 const_iv (GL_GENERATE_MIPMAP_HINT),
2768 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2421 const_iv (GL_FASTEST), 2769 const_iv (GL_FASTEST),
2422 const_iv (GL_DONT_CARE), 2770 const_iv (GL_DONT_CARE),
2423 const_iv (GL_NICEST), 2771 const_iv (GL_NICEST),
2424 const_iv (GL_V2F), 2772 const_iv (GL_V2F),
2425 const_iv (GL_V3F), 2773 const_iv (GL_V3F),
2433 2781
2434 texture_av = newAV (); 2782 texture_av = newAV ();
2435 AvREAL_off (texture_av); 2783 AvREAL_off (texture_av);
2436} 2784}
2437 2785
2786void
2787disable_GL_EXT_blend_func_separate ()
2788 CODE:
2789 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0;
2791
2438char * 2792char *
2439gl_vendor () 2793gl_vendor ()
2440 CODE: 2794 CODE:
2441 RETVAL = (char *)glGetString (GL_VENDOR); 2795 RETVAL = (char *)glGetString (GL_VENDOR);
2442 OUTPUT: 2796 OUTPUT:
2563 2917
2564void glRect (float x1, float y1, float x2, float y2) 2918void glRect (float x1, float y1, float x2, float y2)
2565 CODE: 2919 CODE:
2566 glRectf (x1, y1, x2, y2); 2920 glRectf (x1, y1, x2, y2);
2567 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
2568PROTOTYPES: ENABLE 2931PROTOTYPES: ENABLE
2569 2932
2570void glBegin (int mode) 2933void glBegin (int mode)
2571 2934
2572void glEnd () 2935void glEnd ()
2604void 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)
2605 CODE: 2968 CODE:
2606 if (gl.SeparableFilter2D) 2969 if (gl.SeparableFilter2D)
2607 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2970 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2608 2971
2609void 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)
2610 2973
2611void 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)
2612 2975
2613void glDrawPixels (int width, int height, int format, int type, char *pixels) 2976void glDrawPixels (int width, int height, int format, int type, char *pixels)
2614 2977
2640 3003
2641void glEndList () 3004void glEndList ()
2642 3005
2643void glCallList (int list) 3006void glCallList (int list)
2644 3007
2645MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3008MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2646 3009
2647PROTOTYPES: DISABLE 3010PROTOTYPES: DISABLE
2648 3011
2649void 3012void
2650find_widget (SV *self, NV x, NV y) 3013find_widget (SV *self, NV x, NV y)
2654 XPUSHs (self); 3017 XPUSHs (self);
2655} 3018}
2656 3019
2657BOOT: 3020BOOT:
2658{ 3021{
2659 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3022 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2660 3023
2661 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);
2662 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);
2663 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);
2664 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);
2665} 3028}
2666 3029
2667void 3030void
2668draw (SV *self) 3031draw (SV *self)
2669 CODE: 3032 CODE:
2673 NV x, y, w, h; 3036 NV x, y, w, h;
2674 SV *draw_x_sv = GvSV (draw_x_gv); 3037 SV *draw_x_sv = GvSV (draw_x_gv);
2675 SV *draw_y_sv = GvSV (draw_y_gv); 3038 SV *draw_y_sv = GvSV (draw_y_gv);
2676 SV *draw_w_sv = GvSV (draw_w_gv); 3039 SV *draw_w_sv = GvSV (draw_w_gv);
2677 SV *draw_h_sv = GvSV (draw_h_gv); 3040 SV *draw_h_sv = GvSV (draw_h_gv);
2678 SV *hover;
2679 double draw_x, draw_y, draw_w, draw_h; 3041 double draw_x, draw_y;
2680 3042
2681 if (!SvROK (self)) 3043 if (!SvROK (self))
2682 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3044 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2683 3045
2684 hv = (HV *)SvRV (self); 3046 hv = (HV *)SvRV (self);
2685 3047
2686 if (SvTYPE (hv) != SVt_PVHV) 3048 if (SvTYPE (hv) != SVt_PVHV)
2687 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3049 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2688 3050
2689 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.;
2690 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.;
2691 3053
2692 if (!h || !w) 3054 if (!h || !w)
2712 { 3074 {
2713 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3075 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2714 3076
2715 if (svp && SvTRUE (*svp)) 3077 if (svp && SvTRUE (*svp))
2716 { 3078 {
2717 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);
2718 glEnable (GL_BLEND); 3080 glEnable (GL_BLEND);
2719 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3081 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2720 glBegin (GL_QUADS); 3082 glBegin (GL_QUADS);
2721 glVertex2f (0, 0); 3083 glVertex2f (0, 0);
2722 glVertex2f (w, 0); 3084 glVertex2f (w, 0);
2725 glEnd (); 3087 glEnd ();
2726 glDisable (GL_BLEND); 3088 glDisable (GL_BLEND);
2727 } 3089 }
2728 } 3090 }
2729#if 0 3091#if 0
2730 if ($ENV{CFPLUS_DEBUG} & 1) { 3092 // draw borders, for debugging
2731 glPushMatrix; 3093 glPushMatrix ();
2732 glColor 1, 1, 0, 1; 3094 glColor4f (1., 1., 0., 1.);
2733 glTranslate 0.375, 0.375; 3095 glTranslatef (.5, .5, 0.);
2734 glBegin GL_LINE_LOOP; 3096 glBegin (GL_LINE_LOOP);
2735 glVertex 0 , 0; 3097 glVertex2f (0 , 0);
2736 glVertex $self->{w} - 1, 0; 3098 glVertex2f (w - 1, 0);
2737 glVertex $self->{w} - 1, $self->{h} - 1; 3099 glVertex2f (w - 1, h - 1);
2738 glVertex 0 , $self->{h} - 1; 3100 glVertex2f (0 , h - 1);
2739 glEnd; 3101 glEnd ();
2740 glPopMatrix; 3102 glPopMatrix ();
2741 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2742 }
2743#endif 3103#endif
2744 PUSHMARK (SP); 3104 PUSHMARK (SP);
2745 XPUSHs (self); 3105 XPUSHs (self);
2746 PUTBACK; 3106 PUTBACK;
2747 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