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.210 by root, Tue Jul 24 18:24:03 2007 UTC vs.
Revision 1.270 by root, Sun Jul 20 15:05:13 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
706NV ceilabs (NV x)
707 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x);
709 OUTPUT:
710 RETVAL
711
712IV minpot (UV n)
713
714IV popcount (UV n)
715
627void 716void
628pango_init () 717pango_init ()
629 CODE: 718 CODE:
630{ 719{
631 opengl_fontmap = pango_opengl_font_map_new (); 720 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 721 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); 722 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
723 /*pango_context_set_font_description (opengl_context, default_font);*/
724#if PANGO_VERSION_CHECK (1, 15, 2)
725 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
726 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
727#endif
634} 728}
635 729
636char *
637SDL_GetError () 730char *SDL_GetError ()
638 731
639int 732int SDL_Init (U32 flags)
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 733
642void 734int SDL_InitSubSystem (U32 flags)
735
736void SDL_QuitSubSystem (U32 flags)
737
643SDL_Quit () 738void SDL_Quit ()
739
740int SDL_GL_SetAttribute (int attr, int value)
741
742int SDL_GL_GetAttribute (int attr)
743 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL))
745 XSRETURN_UNDEF;
746 OUTPUT:
747 RETVAL
644 748
645void 749void
646SDL_ListModes (int rgb, int alpha) 750SDL_ListModes (int rgb, int alpha)
647 PPCODE: 751 PPCODE:
648{ 752{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 764 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 765 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 766 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 767
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 768 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); 769 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 770
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 771 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 772
672 if (m && m != (SDL_Rect **)-1) 773 if (m && m != (SDL_Rect **)-1)
673 while (*m) 774 while (*m)
674 { 775 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 776 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 777 {
677 AV *av = newAV (); 778 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 779 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 780 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 781 av_push (av, newSViv (rgb));
704 805
705 if (RETVAL) 806 if (RETVAL)
706 { 807 {
707 av_clear (texture_av); 808 av_clear (texture_av);
708 809
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 810 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 811#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 812#include "glfunc.h"
712#undef GL_FUNC 813#undef GL_FUNC
713 } 814 }
714} 815}
721char * 822char *
722SDL_GetKeyName (int sym) 823SDL_GetKeyName (int sym)
723 824
724int 825int
725SDL_GetAppState () 826SDL_GetAppState ()
827
828int
829SDL_GetModState ()
726 830
727void 831void
728poll_events () 832poll_events ()
729 PPCODE: 833 PPCODE:
730{ 834{
740 { 844 {
741 case SDL_KEYDOWN: 845 case SDL_KEYDOWN:
742 case SDL_KEYUP: 846 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 849 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 */ 850 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); 851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 852 break;
749 853
750 case SDL_ACTIVEEVENT: 854 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 873 x = ev.motion.x;
770 y = ev.motion.y; 874 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 876 }
773 877
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 879 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 880 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 881 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 882 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 883 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 884 }
781 break; 885 break;
782 886
783 case SDL_MOUSEBUTTONDOWN: 887 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 888 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 889 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 890
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 891 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 892 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 893 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 894 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 899 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 900 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 901 break;
798 } 902 }
799 903
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 904 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 905 }
802} 906}
803 907
804int 908int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 909Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 910 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 911 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 912 Mix_ChannelFinished (channel_finished);
809 913
810void 914void
915Mix_QuerySpec ()
916 PPCODE:
917{
918 int freq, channels;
919 Uint16 format;
920
921 if (Mix_QuerySpec (&freq, &format, &channels))
922 {
923 EXTEND (SP, 3);
924 PUSHs (sv_2mortal (newSViv (freq)));
925 PUSHs (sv_2mortal (newSViv (format)));
926 PUSHs (sv_2mortal (newSViv (channels)));
927 }
928}
929
930void
811Mix_CloseAudio () 931Mix_CloseAudio ()
812 932
813int 933int
814Mix_AllocateChannels (int numchans = -1) 934Mix_AllocateChannels (int numchans = -1)
935
936const char *
937Mix_GetError ()
815 938
816void 939void
817lowdelay (int fd, int val = 1) 940lowdelay (int fd, int val = 1)
818 CODE: 941 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 942 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 968 }
846 } 969 }
847#endif 970#endif
848} 971}
849 972
850void 973int
851add_font (char *file) 974add_font (char *file)
852 CODE: 975 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT:
978 RETVAL
854 979
855void 980void
856load_image_inline (SV *image_) 981load_image_inline (SV *image_)
857 ALIAS: 982 ALIAS:
858 load_image_file = 1 983 load_image_file = 1
861 STRLEN image_len; 986 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 987 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 988 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 989 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 990 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 991 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 992 : SDL_RWFromConstMem (image, image_len);
868 993
869 if (!rw) 994 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 995 croak ("load_image: %s", SDL_GetError ());
871 996
944void 1069void
945error (char *message) 1070error (char *message)
946 CODE: 1071 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1072 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1073#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1074 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1075#endif
951 1076
952void 1077void
953fatal (char *message) 1078fatal (char *message)
954 CODE: 1079 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1080 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1081#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1082 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1083#endif
959 _exit (1); 1084 _exit (1);
960 1085
961void 1086void
962_exit (int retval = 0) 1087_exit (int retval = 0)
974#if DEBUG 1099#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1100 VALGRIND_DO_LEAK_CHECK;
976#endif 1101#endif
977} 1102}
978 1103
979MODULE = CFPlus PACKAGE = CFPlus::Font 1104MODULE = Deliantra::Client PACKAGE = DC::Font
980 1105
981PROTOTYPES: DISABLE 1106PROTOTYPES: DISABLE
982 1107
983CFPlus::Font 1108DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1109new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1110 CODE:
986{ 1111{
987 int count; 1112 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1113 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1116}
992 OUTPUT: 1117 OUTPUT:
993 RETVAL 1118 RETVAL
994 1119
995void 1120void
996DESTROY (CFPlus::Font self) 1121DESTROY (DC::Font self)
997 CODE: 1122 CODE:
998 pango_font_description_free (self); 1123 pango_font_description_free (self);
999 1124
1000void 1125void
1001make_default (CFPlus::Font self) 1126make_default (DC::Font self)
1002 PROTOTYPE: $ 1127 PROTOTYPE: $
1003 CODE: 1128 CODE:
1004 default_font = self; 1129 default_font = self;
1005 1130
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1131MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1132
1008PROTOTYPES: DISABLE 1133PROTOTYPES: DISABLE
1009 1134
1010void 1135void
1011reset_glyph_cache () 1136glyph_cache_backup ()
1012 PROTOTYPE: 1137 PROTOTYPE:
1013 CODE: 1138 CODE:
1139 tc_backup ();
1140
1141void
1142glyph_cache_restore ()
1143 PROTOTYPE:
1144 CODE:
1014 tc_clear (); 1145 tc_restore ();
1015 1146
1016CFPlus::Layout 1147DC::Layout
1017new (SV *class) 1148new (SV *class)
1018 CODE: 1149 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1150 New (0, RETVAL, 1, struct cf_layout);
1020 1151
1021 RETVAL->pl = pango_layout_new (opengl_context); 1152 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1154 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1155 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1156 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1157 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1158 RETVAL->font = 0;
1159 RETVAL->rc = rc_alloc ();
1028 1160
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1161 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1162 layout_update_font (RETVAL);
1031 OUTPUT: 1163 OUTPUT:
1032 RETVAL 1164 RETVAL
1033 1165
1034void 1166void
1035DESTROY (CFPlus::Layout self) 1167DESTROY (DC::Layout self)
1036 CODE: 1168 CODE:
1037 g_object_unref (self->pl); 1169 g_object_unref (self->pl);
1170 rc_free (self->rc);
1038 Safefree (self); 1171 Safefree (self);
1039 1172
1040void 1173void
1041set_text (CFPlus::Layout self, SV *text_) 1174set_text (DC::Layout self, SV *text_)
1042 CODE: 1175 CODE:
1043{ 1176{
1044 STRLEN textlen; 1177 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
1046 1179
1047 pango_layout_set_text (self->pl, text, textlen); 1180 pango_layout_set_text (self->pl, text, textlen);
1048} 1181}
1049 1182
1050void 1183void
1051set_markup (CFPlus::Layout self, SV *text_) 1184set_markup (DC::Layout self, SV *text_)
1052 CODE: 1185 CODE:
1053{ 1186{
1054 STRLEN textlen; 1187 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1188 char *text = SvPVutf8 (text_, textlen);
1056 1189
1057 pango_layout_set_markup (self->pl, text, textlen); 1190 pango_layout_set_markup (self->pl, text, textlen);
1058} 1191}
1059 1192
1060void 1193void
1061set_shapes (CFPlus::Layout self, ...) 1194set_shapes (DC::Layout self, ...)
1062 CODE: 1195 CODE:
1063{ 1196{
1064 PangoAttrList *attrs = 0; 1197 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1198 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1199 const char *pos = text;
1101 if (attrs) 1234 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1235 pango_layout_set_attributes (self->pl, attrs);
1103} 1236}
1104 1237
1105void 1238void
1106get_shapes (CFPlus::Layout self) 1239get_shapes (DC::Layout self)
1107 PPCODE: 1240 PPCODE:
1108{ 1241{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1242 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1243
1111 do 1244 do
1112 { 1245 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1246 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1247
1115 if (run && shape_attr_p (run)) 1248 if (run && shape_attr_p (run))
1116 { 1249 {
1117 PangoRectangle extents; 1250 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1251 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1259
1127 pango_layout_iter_free (iter); 1260 pango_layout_iter_free (iter);
1128} 1261}
1129 1262
1130int 1263int
1131has_wrapped (CFPlus::Layout self) 1264has_wrapped (DC::Layout self)
1132 CODE: 1265 CODE:
1133{ 1266{
1134 int lines = 1; 1267 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1268 const char *text = pango_layout_get_text (self->pl);
1136 1269
1141} 1274}
1142 OUTPUT: 1275 OUTPUT:
1143 RETVAL 1276 RETVAL
1144 1277
1145SV * 1278SV *
1146get_text (CFPlus::Layout self) 1279get_text (DC::Layout self)
1147 CODE: 1280 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1281 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1282 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1283 OUTPUT:
1151 RETVAL 1284 RETVAL
1152 1285
1153void 1286void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1287set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1288 CODE:
1156 self->r = r; 1289 self->r = r;
1157 self->g = g; 1290 self->g = g;
1158 self->b = b; 1291 self->b = b;
1159 self->a = a; 1292 self->a = a;
1160 1293
1161void 1294void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1295set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1296 CODE:
1164 if (self->font != font) 1297 if (self->font != font)
1165 { 1298 {
1166 self->font = font; 1299 self->font = font;
1167 layout_update_font (self); 1300 layout_update_font (self);
1168 } 1301 }
1169 1302
1170void 1303void
1171set_height (CFPlus::Layout self, int base_height) 1304set_height (DC::Layout self, int base_height)
1172 CODE: 1305 CODE:
1173 if (self->base_height != base_height) 1306 if (self->base_height != base_height)
1174 { 1307 {
1175 self->base_height = base_height; 1308 self->base_height = base_height;
1176 layout_update_font (self); 1309 layout_update_font (self);
1177 } 1310 }
1178 1311
1179void 1312void
1180set_width (CFPlus::Layout self, int max_width = -1) 1313set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1314 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1315 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1316
1184void 1317void
1185set_indent (CFPlus::Layout self, int indent) 1318set_indent (DC::Layout self, int indent)
1186 CODE: 1319 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1320 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1321
1189void 1322void
1190set_spacing (CFPlus::Layout self, int spacing) 1323set_spacing (DC::Layout self, int spacing)
1191 CODE: 1324 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1325 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1326
1194void 1327void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1328set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1329 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1330 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1331 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1332 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1333 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1334 : PANGO_ELLIPSIZE_NONE
1202 ); 1335 );
1203 1336
1204void 1337void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1338set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1339 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1340 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1341
1209void 1342void
1210size (CFPlus::Layout self) 1343size (DC::Layout self)
1211 PPCODE: 1344 PPCODE:
1212{ 1345{
1213 int w, h; 1346 int w, h;
1214 1347
1215 layout_get_pixel_size (self, &w, &h); 1348 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1351 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1352 PUSHs (sv_2mortal (newSViv (h)));
1220} 1353}
1221 1354
1222int 1355int
1223descent (CFPlus::Layout self) 1356descent (DC::Layout self)
1224 CODE: 1357 CODE:
1225{ 1358{
1226 PangoRectangle rect; 1359 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1360 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1361 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1362 RETVAL = PANGO_DESCENT (rect);
1230} 1363}
1231 OUTPUT: 1364 OUTPUT:
1232 RETVAL 1365 RETVAL
1233 1366
1234int 1367int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1368xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1369 CODE:
1237{ 1370{
1238 int index, trailing; 1371 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1372 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1373 RETVAL = index + trailing;
1241} 1374}
1242 OUTPUT: 1375 OUTPUT:
1243 RETVAL 1376 RETVAL
1244 1377
1245void 1378void
1246cursor_pos (CFPlus::Layout self, int index) 1379cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1380 PPCODE:
1248{ 1381{
1249 PangoRectangle strong_pos; 1382 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1383 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1384
1252 EXTEND (SP, 3); 1385 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1387 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1388 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1389}
1257 1390
1258void 1391void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1392index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1393 PPCODE:
1261{ 1394{
1262 int line, x; 1395 int line, x;
1263 1396
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1397 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1398#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1399 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1400 --line;
1401#endif
1267 EXTEND (SP, 2); 1402 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1403 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1404 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1405}
1271 1406
1272void 1407void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1408line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1409 PPCODE:
1275{ 1410{
1276 PangoLayoutLine *lp; 1411 PangoLayoutLine *lp;
1277 int index, trailing; 1412 int index, trailing;
1278 1413
1279 if (line < 0) 1414 if (line < 0)
1280 XSRETURN_EMPTY; 1415 XSRETURN_EMPTY;
1281 1416
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1417 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1418 XSRETURN_EMPTY; /* do better */
1284 1419
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1420 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1421
1287 EXTEND (SP, 2); 1422 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1428 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1429 }
1295} 1430}
1296 1431
1297void 1432void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1433render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1434 CODE:
1435 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1436 pango_opengl_render_layout_subpixel (
1301 self->pl, 1437 self->pl,
1438 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1439 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1440 self->r, self->g, self->b, self->a,
1304 flags 1441 flags
1305 ); 1442 );
1443 // we assume that context_change actually clears/frees stuff
1444 // and does not do any recomputation...
1445 pango_layout_context_changed (self->pl);
1306 1446
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1447void
1448draw (DC::Layout self)
1449 CODE:
1450{
1451 glEnable (GL_TEXTURE_2D);
1452 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1453 glEnable (GL_BLEND);
1454 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1455 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1456 glEnable (GL_ALPHA_TEST);
1457 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1458
1459 rc_draw (self->rc);
1460
1461 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND);
1463 glDisable (GL_TEXTURE_2D);
1464}
1465
1466MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1467
1309PROTOTYPES: ENABLE 1468PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1469
1313void 1470void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1471pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1472 CODE:
1316{ 1473{
1343 HV *hv = (HV *)SvRV (self); 1500 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1501 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1502 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1503 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1504
1505 if (name <= 0)
1506 XSRETURN_EMPTY;
1507
1348 if (items < 5) 1508 if (items < 5)
1349 { 1509 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1510 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1511 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1512 }
1390 RETVAL = width > 0; 1550 RETVAL = width > 0;
1391} 1551}
1392 OUTPUT: 1552 OUTPUT:
1393 RETVAL 1553 RETVAL
1394 1554
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1555MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1556
1397PROTOTYPES: DISABLE 1557PROTOTYPES: DISABLE
1398 1558
1399CFPlus::Map 1559DC::Map
1400new (SV *class) 1560new (SV *class)
1401 CODE: 1561 CODE:
1402 New (0, RETVAL, 1, struct map); 1562 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1563 RETVAL->x = 0;
1404 RETVAL->y = 0; 1564 RETVAL->y = 0;
1412 RETVAL->row = 0; 1572 RETVAL->row = 0;
1413 OUTPUT: 1573 OUTPUT:
1414 RETVAL 1574 RETVAL
1415 1575
1416void 1576void
1417DESTROY (CFPlus::Map self) 1577DESTROY (DC::Map self)
1418 CODE: 1578 CODE:
1419{ 1579{
1420 map_clear (self); 1580 map_clear (self);
1421 Safefree (self->face2tile); 1581 Safefree (self->face2tile);
1422 Safefree (self->tex); 1582 Safefree (self->tex);
1423 Safefree (self); 1583 Safefree (self);
1424} 1584}
1425 1585
1426void 1586void
1427resize (CFPlus::Map self, int map_width, int map_height) 1587resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1588 CODE:
1429 self->w = map_width; 1589 self->w = map_width;
1430 self->h = map_height; 1590 self->h = map_height;
1431 1591
1432void 1592void
1433clear (CFPlus::Map self) 1593clear (DC::Map self)
1434 CODE: 1594 CODE:
1435 map_clear (self); 1595 map_clear (self);
1436 1596
1437void 1597void
1438set_tileid (CFPlus::Map self, int face, int tile) 1598set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1599 CODE:
1440{ 1600{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1601 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1602 need_texid (self, tile);
1443} 1603}
1444 1604
1445void 1605void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1606set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1607 CODE:
1448{ 1608{
1449 tileid texid; 1609 tileid texid;
1450 maptex *tex; 1610 maptex *tex;
1451 1611
1464 tex->smoothtile = self->face2tile [smooth]; 1624 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1625 tex->smoothlevel = level;
1466} 1626}
1467 1627
1468void 1628void
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) 1629set_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: 1630 CODE:
1471{ 1631{
1472 need_texid (self, texid); 1632 need_texid (self, texid);
1473 1633
1474 { 1634 {
1494 // from transparent color bleeding and ugly wrapping effects. 1654 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1656}
1497 1657
1498int 1658int
1499ox (CFPlus::Map self) 1659ox (DC::Map self)
1500 ALIAS: 1660 ALIAS:
1501 oy = 1 1661 oy = 1
1502 x = 2 1662 x = 2
1503 y = 3 1663 y = 3
1504 w = 4 1664 w = 4
1515 } 1675 }
1516 OUTPUT: 1676 OUTPUT:
1517 RETVAL 1677 RETVAL
1518 1678
1519void 1679void
1520scroll (CFPlus::Map self, int dx, int dy) 1680scroll (DC::Map self, int dx, int dy)
1521 CODE: 1681 CODE:
1522{ 1682{
1523 if (dx > 0) 1683 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1684 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1685 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1700 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1701 self->y += MAP_EXTEND_Y;
1542 } 1702 }
1543} 1703}
1544 1704
1545void 1705SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1706map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1707 CODE:
1548{ 1708{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1709 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1710 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1711 mapcell *cell;
1552 int x, y, flags; 1712 int x, y, z, flags;
1713 AV *missing = newAV ();
1714 RETVAL = newRV_noinc ((SV *)missing);
1553 1715
1554 while (data < data_end - 1) 1716 while (data < data_end - 1)
1555 { 1717 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1718 flags = (data [0] << 8) + data [1]; data += 2;
1557 1719
1577 uint8_t ext, cmd; 1739 uint8_t ext, cmd;
1578 1740
1579 do 1741 do
1580 { 1742 {
1581 ext = *data++; 1743 ext = *data++;
1582 cmd = ext & 0x3f; 1744 cmd = ext & 0x7f;
1583 1745
1584 if (cmd < 4) 1746 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1747 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1748 else if (cmd == 5) // health
1587 { 1749 {
1590 } 1752 }
1591 else if (cmd == 6) // monster width 1753 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1754 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1755 else if (cmd == 0x47)
1594 { 1756 {
1595 if (*data == 4) 1757 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1761
1598 data += *data + 1; 1762 data += *data + 1;
1599 } 1763 }
1600 else if (cmd == 8) // cell flags 1764 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1765 cell->flags = *data++;
1608 } 1772 }
1609 else 1773 else
1610 cell->darkness = *data++ + 1; 1774 cell->darkness = *data++ + 1;
1611 } 1775 }
1612 1776
1777 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1778 if (flags & (4 >> z))
1614 { 1779 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1780 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1781 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1782 cell->tile [z] = self->face2tile [face];
1783
1784 if (cell->tile [z])
1785 {
1786 maptex *tex = self->tex + cell->tile [z];
1787 if (!tex->name)
1788 av_push (missing, newSViv (cell->tile [z]));
1789
1790 if (tex->smoothtile)
1791 {
1792 maptex *smooth = self->tex + tex->smoothtile;
1793 if (!smooth->name)
1794 av_push (missing, newSViv (tex->smoothtile));
1795 }
1796 }
1618 } 1797 }
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 } 1798 }
1634 else 1799 else
1635 cell->darkness = 0; 1800 CELL_CLEAR (cell);
1636 } 1801 }
1637} 1802}
1803 OUTPUT:
1804 RETVAL
1638 1805
1639SV * 1806SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1807mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1808 CODE:
1642{ 1809{
1643 int x1, x; 1810 int x1, x;
1644 int y1, y; 1811 int y1, y;
1645 int z; 1812 int z;
1690} 1857}
1691 OUTPUT: 1858 OUTPUT:
1692 RETVAL 1859 RETVAL
1693 1860
1694void 1861void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1862draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 1863 CODE:
1697{ 1864{
1865 int x, y, z;
1866
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1868 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) 1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 1870 smooth_key skey;
1702 int x, y, z; 1871 int pl_x, pl_y;
1703 int last_name; 1872 maptex pl_tex;
1873 rc_t *rc = rc_alloc ();
1874 rc_key_t key;
1875 rc_array_t *arr;
1876
1877 pl_tex.name = 0;
1704 1878
1705 // thats current max. sorry. 1879 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1880 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1881 if (sh > 255) sh = 255;
1708 1882
1709 // clear key, in case of extra padding 1883 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1884 memset (&skey, 0, sizeof (skey));
1711 1885
1712 glColor4ub (255, 255, 255, 255); 1886 memset (&key, 0, sizeof (key));
1713 1887 key.r = 255;
1714 glEnable (GL_BLEND); 1888 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1889 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1890 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1891 key.mode = GL_QUADS;
1718 1892 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 1893 key.texname = -1;
1720
1721 last_name = 0;
1722 1894
1723 mx += self->x; 1895 mx += self->x;
1724 my += self->y; 1896 my += self->y;
1725 1897
1726 // first pass: determine smooth_max 1898 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 1914 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 1915 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 1916 self->tex [cell->tile [2]].smoothlevel));
1745 } 1917 }
1746 } 1918 }
1919
1920 glEnable (GL_BLEND);
1921 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1922 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1747 1923
1748 for (z = 0; z <= 2; z++) 1924 for (z = 0; z <= 2; z++)
1749 { 1925 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 1926 memset (smooth_level, 0, sizeof (smooth_level));
1751 1927
1764 { 1940 {
1765 maptex tex = self->tex [tile]; 1941 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 1942 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h; 1943 int py = (y + 1) * T - tex.h;
1768 1944
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 1945 if (key.texname != tex.name)
1772 { 1946 {
1773 if (!tex.name) 1947 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 1948 tex = self->tex [2]; /* missing, replace by noface */
1775 1949
1776 glEnd (); 1950 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1951 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 1952 }
1780 1953
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1954 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 { 1955 {
1956 pl_x = px;
1957 pl_y = py;
1958 pl_tex = tex;
1959 continue;
1960 }
1961
1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1963 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1964 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1966
1967 if (expect_false (cell->flags) && expect_false (z == 2))
1968 {
1969 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 1970 if (cell->flags & 1)
1789 { 1971 {
1790 maptex tex = self->tex [1]; 1972 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 1973 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 1974 int py = y * T - T * 6 / 32;
1793 1975
1976 if (tex.name)
1794 glEnd (); 1977 {
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1978 if (key.texname != tex.name)
1979 {
1980 key.texname = tex.name;
1981 arr = rc_array (rc, &key);
1982 }
1983
1984 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796 glBegin (GL_QUADS); 1988 }
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 } 1989 }
1803 } 1990 }
1804 1991
1805 // update smooth hash 1992 // update smooth hash
1806 if (tex.smoothtile) 1993 if (tex.smoothtile)
1842 } 2029 }
1843 } 2030 }
1844 } 2031 }
1845 } 2032 }
1846 2033
2034 rc_draw (rc);
2035 rc_clear (rc);
2036
1847 // go through all smoothlevels, lowest to highest, then draw. 2037 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2038 // this is basically counting sort
1849 { 2039 {
1850 int w, b; 2040 int w, b;
1851 2041
2042 glEnable (GL_TEXTURE_2D);
2043 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2044 for (w = 0; w < 256 / 32; ++w)
1853 { 2045 {
1854 uint32_t smask = smooth_level [w]; 2046 uint32_t smask = smooth_level [w];
1855 if (smask) 2047 if (smask)
1856 for (b = 0; b < 32; ++b) 2048 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2067 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2068 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2069 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2070 float dy = tex.t * .5f ; // 2 images/column
1879 2071
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2072 if (tex.name)
1883 { 2073 {
2074 // this time avoiding texture state changes
2075 // save gobs of state changes.
1884 if (!tex.name) 2076 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2077 {
1886
1887 glEnd (); 2078 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2079 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2080 glBegin (GL_QUADS);
1890 } 2081 }
1891 2082
1892 if (border) 2083 if (border)
1893 { 2084 {
1894 float ox = border * dx; 2085 float ox = border * dx;
1895 2086
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2087 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2088 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2089 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2090 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2091 }
1901 2092
1902 if (corner) 2093 if (corner)
1903 { 2094 {
1904 float ox = corner * dx; 2095 float ox = corner * dx;
1905 2096
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2097 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2098 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2099 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2100 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2101 }
1910 } 2102 }
1911 } 2103 }
1912 } 2104 }
1913 } 2105 }
1914 } 2106 }
2107
2108 glEnd ();
2109 glDisable (GL_TEXTURE_2D);
2110 key.texname = -1;
1915 } 2111 }
1916 2112
1917 hv_clear (smooth); 2113 hv_clear (smooth);
1918 } 2114 }
1919 2115
1920 glEnd (); 2116 if (pl_tex.name)
2117 {
2118 maptex tex = pl_tex;
2119 int px = pl_x + sdx;
2120 int py = pl_y + sdy;
1921 2121
1922 glDisable (GL_TEXTURE_2D); 2122 key.texname = tex.name;
2123 arr = rc_array (rc, &key);
2124
2125 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2126 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2127 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129
2130 rc_draw (rc);
2131 }
2132
1923 glDisable (GL_BLEND); 2133 glDisable (GL_BLEND);
2134 rc_free (rc);
1924 2135
1925 // top layer: overlays such as the health bar 2136 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2137 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2138 if (0 <= y + my && y + my < self->rows)
1928 { 2139 {
1953 } 2164 }
1954 } 2165 }
1955} 2166}
1956 2167
1957void 2168void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2169draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2170 CODE:
1960{ 2171{
1961 static float color[16][3] = { 2172 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2173 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2174 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2224 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2225 glDisable (GL_TEXTURE_2D);
2015} 2226}
2016 2227
2017void 2228void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2229fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2230 PPCODE:
2020{ 2231{
2021 int x, y; 2232 int x, y;
2022 int sw1 = sw + 2; 2233 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2234 int sh1 = sh + 2;
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2242 SvCUR_set (darkness3_sv, sw34 * sh3);
2032 2243
2033 mx += self->x - 1; 2244 mx += self->x - 1;
2034 my += self->y - 1; 2245 my += self->y - 1;
2035 2246
2036 memset (darkness1, 255, sw1 * sh1); 2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2037 2248
2038 for (y = 0; y < sh1; y++) 2249 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2040 { 2251 {
2041 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2305 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2306 PUSHs (darkness3_sv);
2096} 2307}
2097 2308
2098SV * 2309SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2310get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2311 CODE:
2101{ 2312{
2102 int x, y, x1, y1; 2313 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2314 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2315 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2372 else
2162 *data++ = 0; 2373 *data++ = 0;
2163 } 2374 }
2164 } 2375 }
2165 2376
2377 /* if size is w*h + 5 then no data has been found */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 {
2166 SvPOK_only (data_sv); 2380 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 }
2383
2168 RETVAL = data_sv; 2384 RETVAL = data_sv;
2169} 2385}
2170 OUTPUT: 2386 OUTPUT:
2171 RETVAL 2387 RETVAL
2172 2388
2173void 2389void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2390set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2391 PPCODE:
2176{ 2392{
2177 int x, y, z; 2393 int x, y, z;
2178 int w, h; 2394 int w, h;
2179 int x1, y1; 2395 int x1, y1;
2396 STRLEN len;
2397 uint8_t *data, *end;
2398
2399 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv);
2402 end = data + len + 8;
2403
2404 if (len < 5)
2405 XSRETURN_EMPTY;
2180 2406
2181 if (*data++ != 0) 2407 if (*data++ != 0)
2182 return; /* version mismatch */ 2408 XSRETURN_EMPTY; /* version mismatch */
2183 2409
2184 w = *data++ << 8; w |= *data++; 2410 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2411 h = *data++ << 8; h |= *data++;
2186 2412
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2413 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2425 {
2200 maprow *row = map_get_row (self, y); 2426 maprow *row = map_get_row (self, y);
2201 2427
2202 for (x = x0; x < x1; x++) 2428 for (x = x0; x < x1; x++)
2203 { 2429 {
2430 uint8_t flags;
2431
2432 if (data + 7 >= end)
2433 XSRETURN_EMPTY;
2434
2204 uint8_t flags = *data++; 2435 flags = *data++;
2205 2436
2206 if (flags) 2437 if (flags)
2207 { 2438 {
2208 mapcell *cell = row_get_cell (row, x); 2439 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2440 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2443 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2444 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2445
2215 if (cell->darkness == 0) 2446 if (cell->darkness == 0)
2216 { 2447 {
2217 cell->darkness = 0; 2448 /*cell->darkness = 0;*/
2449 EXTEND (SP, 3);
2218 2450
2219 for (z = 0; z <= 2; z++) 2451 for (z = 0; z <= 2; z++)
2220 { 2452 {
2221 tileid t = tile [z]; 2453 tileid t = tile [z];
2222 2454
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2455 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2456 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2457 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2458 need_texid (self, t);
2227 } 2459 }
2228 2460
2229 cell->tile [z] = t; 2461 cell->tile [z] = t;
2230 } 2462 }
2232 } 2464 }
2233 } 2465 }
2234 } 2466 }
2235} 2467}
2236 2468
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2469MODULE = Deliantra::Client PACKAGE = DC::RW
2470
2471DC::RW
2472new (SV *class, SV *data_sv)
2473 CODE:
2474{
2475 STRLEN datalen;
2476 char *data = SvPVbyte (data_sv, datalen);
2477
2478 RETVAL = SDL_RWFromConstMem (data, datalen);
2479}
2480 OUTPUT:
2481 RETVAL
2482
2483DC::RW
2484new_from_file (SV *class, const char *path, const char *mode = "rb")
2485 CODE:
2486 RETVAL = SDL_RWFromFile (path, mode);
2487 OUTPUT:
2488 RETVAL
2489
2490# fails on win32:
2491# dc.xs(2268) : error C2059: syntax error : '('
2492#void
2493#close (DC::RW self)
2494# CODE:
2495# (self->(close)) (self);
2496
2497MODULE = Deliantra::Client PACKAGE = DC::Channel
2238 2498
2239PROTOTYPES: DISABLE 2499PROTOTYPES: DISABLE
2240 2500
2241CFPlus::MixChunk 2501DC::Channel
2242new_from_file (SV *class, char *path) 2502find ()
2243 CODE: 2503 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2504{
2505 RETVAL = Mix_GroupAvailable (-1);
2506
2507 if (RETVAL < 0)
2508 {
2509 RETVAL = Mix_GroupOldest (-1);
2510
2511 if (RETVAL < 0)
2512 XSRETURN_UNDEF;
2513
2514 Mix_HaltChannel (RETVAL);
2515 }
2516
2517 Mix_UnregisterAllEffects (RETVAL);
2518 Mix_Volume (RETVAL, 128);
2519}
2245 OUTPUT: 2520 OUTPUT:
2246 RETVAL 2521 RETVAL
2247 2522
2248void 2523void
2524halt (DC::Channel self)
2525 CODE:
2526 Mix_HaltChannel (self);
2527
2528void
2529expire (DC::Channel self, int ticks = -1)
2530 CODE:
2531 Mix_ExpireChannel (self, ticks);
2532
2533void
2534fade_out (DC::Channel self, int ticks = -1)
2535 CODE:
2536 Mix_FadeOutChannel (self, ticks);
2537
2538int
2539volume (DC::Channel self, int volume)
2540 CODE:
2541 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2542 OUTPUT:
2543 RETVAL
2544
2545void
2546unregister_all_effects (DC::Channel self)
2547 CODE:
2548 Mix_UnregisterAllEffects (self);
2549
2550void
2551set_panning (DC::Channel self, int left, int right)
2552 CODE:
2553 left = CLAMP (left , 0, 255);
2554 right = CLAMP (right, 0, 255);
2555 Mix_SetPanning (self, left, right);
2556
2557void
2558set_distance (DC::Channel self, int distance)
2559 CODE:
2560 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2561
2562void
2563set_position (DC::Channel self, int angle, int distance)
2564 CODE:
2565
2566void
2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2568 CODE:
2569{
2570 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2571 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2573}
2574
2575void
2576set_reverse_stereo (DC::Channel self, int flip)
2577 CODE:
2578 Mix_SetReverseStereo (self, flip);
2579
2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2581
2582PROTOTYPES: DISABLE
2583
2584DC::MixChunk
2585new (SV *class, DC::RW rwops)
2586 CODE:
2587 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2588 OUTPUT:
2589 RETVAL
2590
2591void
2249DESTROY (CFPlus::MixChunk self) 2592DESTROY (DC::MixChunk self)
2250 CODE: 2593 CODE:
2251 Mix_FreeChunk (self); 2594 Mix_FreeChunk (self);
2252 2595
2253int 2596int
2254volume (CFPlus::MixChunk self, int volume = -1) 2597volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2598 CODE:
2599 if (items > 1)
2600 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2601 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2602 OUTPUT:
2258 RETVAL 2603 RETVAL
2259 2604
2260int 2605DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2606play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2607 CODE:
2608{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2609 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2610
2611 if (RETVAL < 0)
2612 XSRETURN_UNDEF;
2613
2614 if (channel < 0)
2615 {
2616 Mix_UnregisterAllEffects (RETVAL);
2617 Mix_Volume (RETVAL, 128);
2618 }
2619}
2264 OUTPUT: 2620 OUTPUT:
2265 RETVAL 2621 RETVAL
2266 2622
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2624
2269int 2625int
2270volume (int volume = -1) 2626volume (int volume = -1)
2271 PROTOTYPE: ;$ 2627 PROTOTYPE: ;$
2272 CODE: 2628 CODE:
2629 if (items > 0)
2630 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2631 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2632 OUTPUT:
2275 RETVAL 2633 RETVAL
2276 2634
2635void
2636fade_out (int ms)
2637 CODE:
2638 Mix_FadeOutMusic (ms);
2639
2640void
2641halt ()
2642 CODE:
2643 Mix_HaltMusic ();
2644
2645DC::MixMusic
2646new (SV *class, DC::RW rwops)
2647 CODE:
2648 RETVAL = Mix_LoadMUS_RW (rwops);
2649 OUTPUT:
2650 RETVAL
2651
2652void
2653DESTROY (DC::MixMusic self)
2654 CODE:
2655 Mix_FreeMusic (self);
2656
2277int 2657int
2278fade_out (int ms)
2279 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms);
2281 OUTPUT:
2282 RETVAL
2283
2284CFPlus::MixMusic
2285new_from_file (SV *class, char *path)
2286 CODE:
2287 RETVAL = Mix_LoadMUS (path);
2288 OUTPUT:
2289 RETVAL
2290
2291void
2292DESTROY (CFPlus::MixMusic self)
2293 CODE:
2294 Mix_FreeMusic (self);
2295
2296int
2297play (CFPlus::MixMusic self, int loops = -1) 2658play (DC::MixMusic self, int loops = -1)
2298 CODE: 2659 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2660 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2661 OUTPUT:
2301 RETVAL 2662 RETVAL
2302 2663
2303int 2664void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2665fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2666 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2667 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2668
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2669MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2670
2312PROTOTYPES: ENABLE 2671PROTOTYPES: ENABLE
2313 2672
2314BOOT: 2673BOOT:
2315{ 2674{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2675 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2676 static const struct {
2318 const char *name; 2677 const char *name;
2319 IV iv; 2678 IV iv;
2320 } *civ, const_iv[] = { 2679 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2680# define const_iv(name) { # name, (IV)name }
2356 const_iv (GL_INTENSITY), 2715 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2716 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2717 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2718 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2719 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2720 const_iv (GL_COMPRESSED_ALPHA_ARB),
2721 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2722 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2723 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2724 const_iv (GL_COMPRESSED_RGB_ARB),
2725 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 2726 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 2727 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 2728 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 2729 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 2730 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2769 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 2770 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 2771 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 2772 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 2773 const_iv (GL_GENERATE_MIPMAP_HINT),
2774 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 2775 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 2776 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 2777 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 2778 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 2779 const_iv (GL_V3F),
2421 2787
2422 texture_av = newAV (); 2788 texture_av = newAV ();
2423 AvREAL_off (texture_av); 2789 AvREAL_off (texture_av);
2424} 2790}
2425 2791
2792void
2793disable_GL_EXT_blend_func_separate ()
2794 CODE:
2795 gl.BlendFuncSeparate = 0;
2796 gl.BlendFuncSeparateEXT = 0;
2797
2426char * 2798char *
2427gl_vendor () 2799gl_vendor ()
2428 CODE: 2800 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 2801 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 2802 OUTPUT:
2551 2923
2552void glRect (float x1, float y1, float x2, float y2) 2924void glRect (float x1, float y1, float x2, float y2)
2553 CODE: 2925 CODE:
2554 glRectf (x1, y1, x2, y2); 2926 glRectf (x1, y1, x2, y2);
2555 2927
2928void glRect_lineloop (float x1, float y1, float x2, float y2)
2929 CODE:
2930 glBegin (GL_LINE_LOOP);
2931 glVertex2f (x1, y1);
2932 glVertex2f (x2, y1);
2933 glVertex2f (x2, y2);
2934 glVertex2f (x1, y2);
2935 glEnd ();
2936
2556PROTOTYPES: ENABLE 2937PROTOTYPES: ENABLE
2557 2938
2558void glBegin (int mode) 2939void glBegin (int mode)
2559 2940
2560void glEnd () 2941void glEnd ()
2592void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2973void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2593 CODE: 2974 CODE:
2594 if (gl.SeparableFilter2D) 2975 if (gl.SeparableFilter2D)
2595 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2976 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2596 2977
2597void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2978void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2598 2979
2599void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2980void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2600 2981
2601void glDrawPixels (int width, int height, int format, int type, char *pixels) 2982void glDrawPixels (int width, int height, int format, int type, char *pixels)
2602 2983
2628 3009
2629void glEndList () 3010void glEndList ()
2630 3011
2631void glCallList (int list) 3012void glCallList (int list)
2632 3013
2633MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2634 3015
2635PROTOTYPES: DISABLE 3016PROTOTYPES: DISABLE
2636 3017
2637void 3018void
2638find_widget (SV *self, NV x, NV y) 3019find_widget (SV *self, NV x, NV y)
2642 XPUSHs (self); 3023 XPUSHs (self);
2643} 3024}
2644 3025
2645BOOT: 3026BOOT:
2646{ 3027{
2647 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3028 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2648 3029
2649 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3030 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2650 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3031 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2651 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3032 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2652 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3033 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2653} 3034}
2654 3035
2655void 3036void
2656draw (SV *self) 3037draw (SV *self)
2657 CODE: 3038 CODE:
2661 NV x, y, w, h; 3042 NV x, y, w, h;
2662 SV *draw_x_sv = GvSV (draw_x_gv); 3043 SV *draw_x_sv = GvSV (draw_x_gv);
2663 SV *draw_y_sv = GvSV (draw_y_gv); 3044 SV *draw_y_sv = GvSV (draw_y_gv);
2664 SV *draw_w_sv = GvSV (draw_w_gv); 3045 SV *draw_w_sv = GvSV (draw_w_gv);
2665 SV *draw_h_sv = GvSV (draw_h_gv); 3046 SV *draw_h_sv = GvSV (draw_h_gv);
2666 SV *hover;
2667 double draw_x, draw_y, draw_w, draw_h; 3047 double draw_x, draw_y;
2668 3048
2669 if (!SvROK (self)) 3049 if (!SvROK (self))
2670 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3050 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2671 3051
2672 hv = (HV *)SvRV (self); 3052 hv = (HV *)SvRV (self);
2673 3053
2674 if (SvTYPE (hv) != SVt_PVHV) 3054 if (SvTYPE (hv) != SVt_PVHV)
2675 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3055 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2676 3056
2677 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3057 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2678 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3058 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2679 3059
2680 if (!h || !w) 3060 if (!h || !w)
2700 { 3080 {
2701 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3081 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2702 3082
2703 if (svp && SvTRUE (*svp)) 3083 if (svp && SvTRUE (*svp))
2704 { 3084 {
2705 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3085 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2706 glEnable (GL_BLEND); 3086 glEnable (GL_BLEND);
2707 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3087 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2708 glBegin (GL_QUADS); 3088 glBegin (GL_QUADS);
2709 glVertex2f (0, 0); 3089 glVertex2f (0, 0);
2710 glVertex2f (w, 0); 3090 glVertex2f (w, 0);
2713 glEnd (); 3093 glEnd ();
2714 glDisable (GL_BLEND); 3094 glDisable (GL_BLEND);
2715 } 3095 }
2716 } 3096 }
2717#if 0 3097#if 0
2718 if ($ENV{CFPLUS_DEBUG} & 1) { 3098 // draw borders, for debugging
2719 glPushMatrix; 3099 glPushMatrix ();
2720 glColor 1, 1, 0, 1; 3100 glColor4f (1., 1., 0., 1.);
2721 glTranslate 0.375, 0.375; 3101 glTranslatef (.5, .5, 0.);
2722 glBegin GL_LINE_LOOP; 3102 glBegin (GL_LINE_LOOP);
2723 glVertex 0 , 0; 3103 glVertex2f (0 , 0);
2724 glVertex $self->{w} - 1, 0; 3104 glVertex2f (w - 1, 0);
2725 glVertex $self->{w} - 1, $self->{h} - 1; 3105 glVertex2f (w - 1, h - 1);
2726 glVertex 0 , $self->{h} - 1; 3106 glVertex2f (0 , h - 1);
2727 glEnd; 3107 glEnd ();
2728 glPopMatrix; 3108 glPopMatrix ();
2729 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2730 }
2731#endif 3109#endif
2732 PUSHMARK (SP); 3110 PUSHMARK (SP);
2733 XPUSHs (self); 3111 XPUSHs (self);
2734 PUTBACK; 3112 PUTBACK;
2735 call_method ("_draw", G_VOID | G_DISCARD); 3113 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines