ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.212 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.272 by root, Tue Aug 19 17:38:29 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
34#include <SDL_endian.h> 39#include <SDL_endian.h>
35#include <SDL_image.h> 40#include <SDL_image.h>
36#include <SDL_mixer.h> 41#include <SDL_mixer.h>
37#include <SDL_opengl.h> 42#include <SDL_opengl.h>
38 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
39#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
41 51
42#include <glib/gmacros.h> 52#include <glib/gmacros.h>
43 53
44#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
45 66
46#ifndef _WIN32 67#ifndef _WIN32
47# include <sys/types.h> 68# include <sys/types.h>
48# include <sys/socket.h> 69# include <sys/socket.h>
49# include <netinet/in.h> 70# include <netinet/in.h>
50# include <netinet/tcp.h> 71# include <netinet/tcp.h>
51# include <inttypes.h> 72# include <inttypes.h>
52#endif 73#endif
53 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 85
56#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
57 87
58#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
60 90
61#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
62 92
63#if 0 93/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else
66# define PARACHUTE 0
67#endif
68 95
69static AV *texture_av; 96static AV *texture_av;
70 97
71static struct 98static struct
72{ 99{
109 av_push (texture_av, (SV *)(size_t)name); 136 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 137 glDeleteTextures (1, &name);
111} 138}
112 139
113#include "texcache.c" 140#include "texcache.c"
141#include "rendercache.c"
114 142
115#include "pango-font.c" 143#include "pango-font.c"
116#include "pango-fontmap.c" 144#include "pango-fontmap.c"
117#include "pango-render.c" 145#include "pango-render.c"
118 146
119typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
123 151
124typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
125 153
126static int 154static int
127shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
128{ 156{
129 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
143 171
144typedef struct cf_layout { 172typedef struct cf_layout {
145 PangoLayout *pl; 173 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
147 int base_height; 175 int base_height;
148 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
149} *CFPlus__Layout; 178} *DC__Layout;
150 179
151static CFPlus__Font default_font; 180static DC__Font default_font;
152static PangoContext *opengl_context; 181static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
154 183
155static void 184static void
156substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
161#endif 190#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 192}
164 193
165static void 194static void
166layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
167{ 196{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
170 */ 199 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
172 201
173 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 204
176 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
177} 206}
178 207
179static void 208static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 210{
182 PangoRectangle rect; 211 PangoRectangle rect;
183 212
184 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
196 225
197typedef uint16_t tileid; 226typedef uint16_t tileid;
198typedef uint16_t faceid; 227typedef uint16_t faceid;
199 228
200typedef struct { 229typedef struct {
201 int name; 230 GLuint name;
202 int w, h; 231 int w, h;
203 float s, t; 232 float s, t;
204 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
205 tileid smoothtile; 234 tileid smoothtile;
206 uint8_t smoothlevel; 235 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
226 255
227 int32_t rows; 256 int32_t rows;
228 maprow *row; 257 maprow *row;
229} *CFPlus__Map; 258} *DC__Map;
230 259
231static char * 260static char *
232prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
233{ 262{
234 char *p; 263 char *p;
272 self->texs *= 2; 301 self->texs *= 2;
273 } 302 }
274} 303}
275 304
276static maprow * 305static maprow *
277map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
278{ 307{
279 if (0 > y) 308 if (0 > y)
280 { 309 {
281 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
320 349
321 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
322} 351}
323 352
324static mapcell * 353static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
326{ 355{
327 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
328} 357}
329 358
330static void 359static void
331map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
332{ 361{
333 int r; 362 int r;
334 363
335 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
343 self->oy = 0; 372 self->oy = 0;
344 self->row = 0; 373 self->row = 0;
345 self->rows = 0; 374 self->rows = 0;
346} 375}
347 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
348static void 387static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 389{
351 int x, y; 390 int x, y;
352 maprow *row; 391 maprow *row;
353 mapcell *cell; 392 mapcell *cell;
354 393
366 if (x >= row->c1) 405 if (x >= row->c1)
367 break; 406 break;
368 407
369 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
370 409
371 cell->darkness = 0; 410 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 411 }
376 } 412 }
377} 413}
378 414
379typedef struct { 415typedef struct {
433 n |= n >> 16; 469 n |= n >> 16;
434 470
435 return n + 1; 471 return n + 1;
436} 472}
437 473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
438/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
441 488
442/******************************************************************************/ 489/******************************************************************************/
480 return 0; 527 return 0;
481 528
482 return 1; 529 return 1;
483} 530}
484 531
485MODULE = CFPlus PACKAGE = CFPlus 532static void
533deliantra_main ()
534{
535 call_argv ("::main", G_DISCARD | G_VOID, 0);
536 dSP;
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
486 571
487PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
488 573
489BOOT: 574BOOT:
490{ 575{
491 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 577 static const struct {
493 const char *name; 578 const char *name;
494 IV iv; 579 IV iv;
495 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
518 603
519 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
522 607
608 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 610 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 611 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 612 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 613 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 614 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 686 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 687 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 688 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 689 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 690 const_iv (KMOD_MODE),
691
692 const_iv (MIX_DEFAULT_FORMAT),
693
694 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO),
697 const_iv (SDL_INIT_CDROM),
698 const_iv (SDL_INIT_JOYSTICK),
699 const_iv (SDL_INIT_EVERYTHING),
700 const_iv (SDL_INIT_NOPARACHUTE),
701 const_iv (SDL_INIT_EVENTTHREAD),
702
703 const_iv (SDL_GL_RED_SIZE),
704 const_iv (SDL_GL_GREEN_SIZE),
705 const_iv (SDL_GL_BLUE_SIZE),
706 const_iv (SDL_GL_ALPHA_SIZE),
707 const_iv (SDL_GL_DOUBLEBUFFER),
708 const_iv (SDL_GL_BUFFER_SIZE),
709 const_iv (SDL_GL_DEPTH_SIZE),
710 const_iv (SDL_GL_STENCIL_SIZE),
711 const_iv (SDL_GL_ACCUM_RED_SIZE),
712 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
713 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
714 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
715 const_iv (SDL_GL_STEREO),
716 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
717 const_iv (SDL_GL_MULTISAMPLESAMPLES),
718 const_iv (SDL_GL_ACCELERATED_VISUAL),
719 const_iv (SDL_GL_SWAP_CONTROL),
720
721 const_iv (FOW_DARKNESS)
604# undef const_iv 722# undef const_iv
605 }; 723 };
606 724
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 744
627NV floor (NV x) 745NV floor (NV x)
628 746
629NV ceil (NV x) 747NV ceil (NV x)
630 748
749IV minpot (UV n)
750
751IV popcount (UV n)
752
631void 753void
632pango_init () 754pango_init ()
633 CODE: 755 CODE:
634{ 756{
635 opengl_fontmap = pango_opengl_font_map_new (); 757 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 758 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 759 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
760 /*pango_context_set_font_description (opengl_context, default_font);*/
761#if PANGO_VERSION_CHECK (1, 15, 2)
762 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
763 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
764#endif
638} 765}
639 766
640char *
641SDL_GetError () 767char *SDL_GetError ()
642 768
643int 769void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 770
646void 771int SDL_Init (U32 flags)
772
773int SDL_InitSubSystem (U32 flags)
774
775void SDL_QuitSubSystem (U32 flags)
776
647SDL_Quit () 777void SDL_Quit ()
778
779int SDL_GL_SetAttribute (int attr, int value)
780
781int SDL_GL_GetAttribute (int attr)
782 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL))
784 XSRETURN_UNDEF;
785 OUTPUT:
786 RETVAL
648 787
649void 788void
650SDL_ListModes (int rgb, int alpha) 789SDL_ListModes (int rgb, int alpha)
651 PPCODE: 790 PPCODE:
652{ 791{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 803 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 806
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 807 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 808 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 809
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 810 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 811
676 if (m && m != (SDL_Rect **)-1) 812 if (m && m != (SDL_Rect **)-1)
677 while (*m) 813 while (*m)
678 { 814 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 815 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 816 {
681 AV *av = newAV (); 817 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 818 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 819 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 820 av_push (av, newSViv (rgb));
708 844
709 if (RETVAL) 845 if (RETVAL)
710 { 846 {
711 av_clear (texture_av); 847 av_clear (texture_av);
712 848
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 850#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 851#include "glfunc.h"
716#undef GL_FUNC 852#undef GL_FUNC
717 } 853 }
718} 854}
725char * 861char *
726SDL_GetKeyName (int sym) 862SDL_GetKeyName (int sym)
727 863
728int 864int
729SDL_GetAppState () 865SDL_GetAppState ()
866
867int
868SDL_GetModState ()
730 869
731void 870void
732poll_events () 871poll_events ()
733 PPCODE: 872 PPCODE:
734{ 873{
744 { 883 {
745 case SDL_KEYDOWN: 884 case SDL_KEYDOWN:
746 case SDL_KEYUP: 885 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 891 break;
753 892
754 case SDL_ACTIVEEVENT: 893 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 912 x = ev.motion.x;
774 y = ev.motion.y; 913 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 915 }
777 916
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 918 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 919 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 920 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 921 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 922 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 923 }
785 break; 924 break;
786 925
787 case SDL_MOUSEBUTTONDOWN: 926 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 927 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 928 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 929
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 930 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 931 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 932 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 933 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 938 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 939 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 940 break;
802 } 941 }
803 942
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 944 }
806} 945}
807 946
808int 947int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 949 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 950 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 951 Mix_ChannelFinished (channel_finished);
813 952
814void 953void
954Mix_QuerySpec ()
955 PPCODE:
956{
957 int freq, channels;
958 Uint16 format;
959
960 if (Mix_QuerySpec (&freq, &format, &channels))
961 {
962 EXTEND (SP, 3);
963 PUSHs (sv_2mortal (newSViv (freq)));
964 PUSHs (sv_2mortal (newSViv (format)));
965 PUSHs (sv_2mortal (newSViv (channels)));
966 }
967}
968
969void
815Mix_CloseAudio () 970Mix_CloseAudio ()
816 971
817int 972int
818Mix_AllocateChannels (int numchans = -1) 973Mix_AllocateChannels (int numchans = -1)
974
975const char *
976Mix_GetError ()
819 977
820void 978void
821lowdelay (int fd, int val = 1) 979lowdelay (int fd, int val = 1)
822 CODE: 980 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 981 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1007 }
850 } 1008 }
851#endif 1009#endif
852} 1010}
853 1011
854void 1012int
855add_font (char *file) 1013add_font (char *file)
856 CODE: 1014 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT:
1017 RETVAL
858 1018
859void 1019void
860load_image_inline (SV *image_) 1020load_image_inline (SV *image_)
861 ALIAS: 1021 ALIAS:
862 load_image_file = 1 1022 load_image_file = 1
948void 1108void
949error (char *message) 1109error (char *message)
950 CODE: 1110 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1111 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1112#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1113 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1114#endif
955 1115
956void 1116void
957fatal (char *message) 1117fatal (char *message)
958 CODE: 1118 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1119 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1120#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1121 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1122#endif
963 _exit (1); 1123 _exit (1);
964 1124
965void 1125void
966_exit (int retval = 0) 1126_exit (int retval = 0)
978#if DEBUG 1138#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1139 VALGRIND_DO_LEAK_CHECK;
980#endif 1140#endif
981} 1141}
982 1142
983MODULE = CFPlus PACKAGE = CFPlus::Font 1143MODULE = Deliantra::Client PACKAGE = DC::Font
984 1144
985PROTOTYPES: DISABLE 1145PROTOTYPES: DISABLE
986 1146
987CFPlus::Font 1147DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1148new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1149 CODE:
990{ 1150{
991 int count; 1151 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1155}
996 OUTPUT: 1156 OUTPUT:
997 RETVAL 1157 RETVAL
998 1158
999void 1159void
1000DESTROY (CFPlus::Font self) 1160DESTROY (DC::Font self)
1001 CODE: 1161 CODE:
1002 pango_font_description_free (self); 1162 pango_font_description_free (self);
1003 1163
1004void 1164void
1005make_default (CFPlus::Font self) 1165make_default (DC::Font self)
1006 PROTOTYPE: $ 1166 PROTOTYPE: $
1007 CODE: 1167 CODE:
1008 default_font = self; 1168 default_font = self;
1009 1169
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1170MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1171
1012PROTOTYPES: DISABLE 1172PROTOTYPES: DISABLE
1013 1173
1014void 1174void
1015reset_glyph_cache () 1175glyph_cache_backup ()
1016 PROTOTYPE: 1176 PROTOTYPE:
1017 CODE: 1177 CODE:
1178 tc_backup ();
1179
1180void
1181glyph_cache_restore ()
1182 PROTOTYPE:
1183 CODE:
1018 tc_clear (); 1184 tc_restore ();
1019 1185
1020CFPlus::Layout 1186DC::Layout
1021new (SV *class) 1187new (SV *class)
1022 CODE: 1188 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1189 New (0, RETVAL, 1, struct cf_layout);
1024 1190
1025 RETVAL->pl = pango_layout_new (opengl_context); 1191 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1193 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1194 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1195 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1196 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1197 RETVAL->font = 0;
1198 RETVAL->rc = rc_alloc ();
1032 1199
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1200 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1201 layout_update_font (RETVAL);
1035 OUTPUT: 1202 OUTPUT:
1036 RETVAL 1203 RETVAL
1037 1204
1038void 1205void
1039DESTROY (CFPlus::Layout self) 1206DESTROY (DC::Layout self)
1040 CODE: 1207 CODE:
1041 g_object_unref (self->pl); 1208 g_object_unref (self->pl);
1209 rc_free (self->rc);
1042 Safefree (self); 1210 Safefree (self);
1043 1211
1044void 1212void
1045set_text (CFPlus::Layout self, SV *text_) 1213set_text (DC::Layout self, SV *text_)
1046 CODE: 1214 CODE:
1047{ 1215{
1048 STRLEN textlen; 1216 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1217 char *text = SvPVutf8 (text_, textlen);
1050 1218
1051 pango_layout_set_text (self->pl, text, textlen); 1219 pango_layout_set_text (self->pl, text, textlen);
1052} 1220}
1053 1221
1054void 1222void
1055set_markup (CFPlus::Layout self, SV *text_) 1223set_markup (DC::Layout self, SV *text_)
1056 CODE: 1224 CODE:
1057{ 1225{
1058 STRLEN textlen; 1226 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1227 char *text = SvPVutf8 (text_, textlen);
1060 1228
1061 pango_layout_set_markup (self->pl, text, textlen); 1229 pango_layout_set_markup (self->pl, text, textlen);
1062} 1230}
1063 1231
1064void 1232void
1065set_shapes (CFPlus::Layout self, ...) 1233set_shapes (DC::Layout self, ...)
1066 CODE: 1234 CODE:
1067{ 1235{
1068 PangoAttrList *attrs = 0; 1236 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1237 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1238 const char *pos = text;
1105 if (attrs) 1273 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1274 pango_layout_set_attributes (self->pl, attrs);
1107} 1275}
1108 1276
1109void 1277void
1110get_shapes (CFPlus::Layout self) 1278get_shapes (DC::Layout self)
1111 PPCODE: 1279 PPCODE:
1112{ 1280{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1281 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1282
1115 do 1283 do
1116 { 1284 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1285 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1286
1119 if (run && shape_attr_p (run)) 1287 if (run && shape_attr_p (run))
1120 { 1288 {
1121 PangoRectangle extents; 1289 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1290 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1298
1131 pango_layout_iter_free (iter); 1299 pango_layout_iter_free (iter);
1132} 1300}
1133 1301
1134int 1302int
1135has_wrapped (CFPlus::Layout self) 1303has_wrapped (DC::Layout self)
1136 CODE: 1304 CODE:
1137{ 1305{
1138 int lines = 1; 1306 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1307 const char *text = pango_layout_get_text (self->pl);
1140 1308
1145} 1313}
1146 OUTPUT: 1314 OUTPUT:
1147 RETVAL 1315 RETVAL
1148 1316
1149SV * 1317SV *
1150get_text (CFPlus::Layout self) 1318get_text (DC::Layout self)
1151 CODE: 1319 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1320 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1321 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1322 OUTPUT:
1155 RETVAL 1323 RETVAL
1156 1324
1157void 1325void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1326set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1327 CODE:
1160 self->r = r; 1328 self->r = r;
1161 self->g = g; 1329 self->g = g;
1162 self->b = b; 1330 self->b = b;
1163 self->a = a; 1331 self->a = a;
1164 1332
1165void 1333void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1334set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1335 CODE:
1168 if (self->font != font) 1336 if (self->font != font)
1169 { 1337 {
1170 self->font = font; 1338 self->font = font;
1171 layout_update_font (self); 1339 layout_update_font (self);
1172 } 1340 }
1173 1341
1174void 1342void
1175set_height (CFPlus::Layout self, int base_height) 1343set_height (DC::Layout self, int base_height)
1176 CODE: 1344 CODE:
1177 if (self->base_height != base_height) 1345 if (self->base_height != base_height)
1178 { 1346 {
1179 self->base_height = base_height; 1347 self->base_height = base_height;
1180 layout_update_font (self); 1348 layout_update_font (self);
1181 } 1349 }
1182 1350
1183void 1351void
1184set_width (CFPlus::Layout self, int max_width = -1) 1352set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1353 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1354 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1355
1188void 1356void
1189set_indent (CFPlus::Layout self, int indent) 1357set_indent (DC::Layout self, int indent)
1190 CODE: 1358 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1359 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1360
1193void 1361void
1194set_spacing (CFPlus::Layout self, int spacing) 1362set_spacing (DC::Layout self, int spacing)
1195 CODE: 1363 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1364 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1365
1198void 1366void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1367set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1368 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1369 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1370 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1371 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1372 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1373 : PANGO_ELLIPSIZE_NONE
1206 ); 1374 );
1207 1375
1208void 1376void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1377set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1378 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1379 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1380
1213void 1381void
1214size (CFPlus::Layout self) 1382size (DC::Layout self)
1215 PPCODE: 1383 PPCODE:
1216{ 1384{
1217 int w, h; 1385 int w, h;
1218 1386
1219 layout_get_pixel_size (self, &w, &h); 1387 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1390 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1391 PUSHs (sv_2mortal (newSViv (h)));
1224} 1392}
1225 1393
1226int 1394int
1227descent (CFPlus::Layout self) 1395descent (DC::Layout self)
1228 CODE: 1396 CODE:
1229{ 1397{
1230 PangoRectangle rect; 1398 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1399 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1400 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1401 RETVAL = PANGO_DESCENT (rect);
1234} 1402}
1235 OUTPUT: 1403 OUTPUT:
1236 RETVAL 1404 RETVAL
1237 1405
1238int 1406int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1407xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1408 CODE:
1241{ 1409{
1242 int index, trailing; 1410 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1411 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1412 RETVAL = index + trailing;
1245} 1413}
1246 OUTPUT: 1414 OUTPUT:
1247 RETVAL 1415 RETVAL
1248 1416
1249void 1417void
1250cursor_pos (CFPlus::Layout self, int index) 1418cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1419 PPCODE:
1252{ 1420{
1253 PangoRectangle strong_pos; 1421 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1422 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1423
1256 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1425 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1428}
1261 1429
1262void 1430void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1431index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1432 PPCODE:
1265{ 1433{
1266 int line, x; 1434 int line, x;
1267 1435
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1436 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1437#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1438 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1439 --line;
1440#endif
1271 EXTEND (SP, 2); 1441 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1442 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1443 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1444}
1275 1445
1276void 1446void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1447line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1448 PPCODE:
1279{ 1449{
1280 PangoLayoutLine *lp; 1450 PangoLayoutLine *lp;
1281 int index, trailing; 1451 int index, trailing;
1282 1452
1283 if (line < 0) 1453 if (line < 0)
1284 XSRETURN_EMPTY; 1454 XSRETURN_EMPTY;
1285 1455
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1456 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1457 XSRETURN_EMPTY; /* do better */
1288 1458
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1459 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1460
1291 EXTEND (SP, 2); 1461 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1467 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1468 }
1299} 1469}
1300 1470
1301void 1471void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1472render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1473 CODE:
1474 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1475 pango_opengl_render_layout_subpixel (
1305 self->pl, 1476 self->pl,
1477 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1478 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1479 self->r, self->g, self->b, self->a,
1308 flags 1480 flags
1309 ); 1481 );
1482 // we assume that context_change actually clears/frees stuff
1483 // and does not do any recomputation...
1484 pango_layout_context_changed (self->pl);
1310 1485
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1486void
1487draw (DC::Layout self)
1488 CODE:
1489{
1490 glEnable (GL_TEXTURE_2D);
1491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1492 glEnable (GL_BLEND);
1493 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1494 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1495 glEnable (GL_ALPHA_TEST);
1496 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1497
1498 rc_draw (self->rc);
1499
1500 glDisable (GL_ALPHA_TEST);
1501 glDisable (GL_BLEND);
1502 glDisable (GL_TEXTURE_2D);
1503}
1504
1505MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1506
1313PROTOTYPES: ENABLE 1507PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1508
1317void 1509void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1510pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1511 CODE:
1320{ 1512{
1347 HV *hv = (HV *)SvRV (self); 1539 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1540 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1541 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1542 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1543
1544 if (name <= 0)
1545 XSRETURN_EMPTY;
1546
1352 if (items < 5) 1547 if (items < 5)
1353 { 1548 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1549 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1550 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1551 }
1394 RETVAL = width > 0; 1589 RETVAL = width > 0;
1395} 1590}
1396 OUTPUT: 1591 OUTPUT:
1397 RETVAL 1592 RETVAL
1398 1593
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1594MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1595
1401PROTOTYPES: DISABLE 1596PROTOTYPES: DISABLE
1402 1597
1403CFPlus::Map 1598DC::Map
1404new (SV *class) 1599new (SV *class)
1405 CODE: 1600 CODE:
1406 New (0, RETVAL, 1, struct map); 1601 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1602 RETVAL->x = 0;
1408 RETVAL->y = 0; 1603 RETVAL->y = 0;
1416 RETVAL->row = 0; 1611 RETVAL->row = 0;
1417 OUTPUT: 1612 OUTPUT:
1418 RETVAL 1613 RETVAL
1419 1614
1420void 1615void
1421DESTROY (CFPlus::Map self) 1616DESTROY (DC::Map self)
1422 CODE: 1617 CODE:
1423{ 1618{
1424 map_clear (self); 1619 map_clear (self);
1425 Safefree (self->face2tile); 1620 Safefree (self->face2tile);
1426 Safefree (self->tex); 1621 Safefree (self->tex);
1427 Safefree (self); 1622 Safefree (self);
1428} 1623}
1429 1624
1430void 1625void
1431resize (CFPlus::Map self, int map_width, int map_height) 1626resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1627 CODE:
1433 self->w = map_width; 1628 self->w = map_width;
1434 self->h = map_height; 1629 self->h = map_height;
1435 1630
1436void 1631void
1437clear (CFPlus::Map self) 1632clear (DC::Map self)
1438 CODE: 1633 CODE:
1439 map_clear (self); 1634 map_clear (self);
1440 1635
1441void 1636void
1442set_tileid (CFPlus::Map self, int face, int tile) 1637set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1638 CODE:
1444{ 1639{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1640 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1641 need_texid (self, tile);
1447} 1642}
1448 1643
1449void 1644void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1645set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1646 CODE:
1452{ 1647{
1453 tileid texid; 1648 tileid texid;
1454 maptex *tex; 1649 maptex *tex;
1455 1650
1468 tex->smoothtile = self->face2tile [smooth]; 1663 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1664 tex->smoothlevel = level;
1470} 1665}
1471 1666
1472void 1667void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1668set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1669 CODE:
1475{ 1670{
1476 need_texid (self, texid); 1671 need_texid (self, texid);
1477 1672
1478 { 1673 {
1498 // from transparent color bleeding and ugly wrapping effects. 1693 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1695}
1501 1696
1502int 1697int
1503ox (CFPlus::Map self) 1698ox (DC::Map self)
1504 ALIAS: 1699 ALIAS:
1505 oy = 1 1700 oy = 1
1506 x = 2 1701 x = 2
1507 y = 3 1702 y = 3
1508 w = 4 1703 w = 4
1519 } 1714 }
1520 OUTPUT: 1715 OUTPUT:
1521 RETVAL 1716 RETVAL
1522 1717
1523void 1718void
1524scroll (CFPlus::Map self, int dx, int dy) 1719scroll (DC::Map self, int dx, int dy)
1525 CODE: 1720 CODE:
1526{ 1721{
1527 if (dx > 0) 1722 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1723 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1724 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1739 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1740 self->y += MAP_EXTEND_Y;
1546 } 1741 }
1547} 1742}
1548 1743
1549void 1744SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1745map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1746 CODE:
1552{ 1747{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1749 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1750 mapcell *cell;
1556 int x, y, flags; 1751 int x, y, z, flags;
1752 AV *missing = newAV ();
1753 RETVAL = newRV_noinc ((SV *)missing);
1557 1754
1558 while (data < data_end - 1) 1755 while (data < data_end - 1)
1559 { 1756 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1757 flags = (data [0] << 8) + data [1]; data += 2;
1561 1758
1581 uint8_t ext, cmd; 1778 uint8_t ext, cmd;
1582 1779
1583 do 1780 do
1584 { 1781 {
1585 ext = *data++; 1782 ext = *data++;
1586 cmd = ext & 0x3f; 1783 cmd = ext & 0x7f;
1587 1784
1588 if (cmd < 4) 1785 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1786 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1787 else if (cmd == 5) // health
1591 { 1788 {
1594 } 1791 }
1595 else if (cmd == 6) // monster width 1792 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1793 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1794 else if (cmd == 0x47)
1598 { 1795 {
1599 if (*data == 4) 1796 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 1800
1602 data += *data + 1; 1801 data += *data + 1;
1603 } 1802 }
1604 else if (cmd == 8) // cell flags 1803 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1804 cell->flags = *data++;
1612 } 1811 }
1613 else 1812 else
1614 cell->darkness = *data++ + 1; 1813 cell->darkness = *data++ + 1;
1615 } 1814 }
1616 1815
1816 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1817 if (flags & (4 >> z))
1618 { 1818 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1819 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1820 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1821 cell->tile [z] = self->face2tile [face];
1822
1823 if (cell->tile [z])
1824 {
1825 maptex *tex = self->tex + cell->tile [z];
1826 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z]));
1828
1829 if (tex->smoothtile)
1830 {
1831 maptex *smooth = self->tex + tex->smoothtile;
1832 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile));
1834 }
1835 }
1622 } 1836 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1837 }
1638 else 1838 else
1639 cell->darkness = 0; 1839 CELL_CLEAR (cell);
1640 } 1840 }
1641} 1841}
1842 OUTPUT:
1843 RETVAL
1642 1844
1643SV * 1845SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1846mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1847 CODE:
1646{ 1848{
1647 int x1, x; 1849 int x1, x;
1648 int y1, y; 1850 int y1, y;
1649 int z; 1851 int z;
1694} 1896}
1695 OUTPUT: 1897 OUTPUT:
1696 RETVAL 1898 RETVAL
1697 1899
1698void 1900void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1700 CODE: 1902 CODE:
1701{ 1903{
1904 int x, y, z;
1905
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1909 smooth_key skey;
1706 int x, y, z; 1910 int pl_x, pl_y;
1707 int last_name; 1911 maptex pl_tex;
1912 rc_t *rc = rc_alloc ();
1913 rc_key_t key;
1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1708 1917
1709 // thats current max. sorry. 1918 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1919 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1920 if (sh > 255) sh = 255;
1712 1921
1713 // clear key, in case of extra padding 1922 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1923 memset (&skey, 0, sizeof (skey));
1715 1924
1716 glColor4ub (255, 255, 255, 255); 1925 memset (&key, 0, sizeof (key));
1717 1926 key.r = 255;
1718 glEnable (GL_BLEND); 1927 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1928 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1929 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1930 key.mode = GL_QUADS;
1722 1931 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1932 key.texname = -1;
1724
1725 last_name = 0;
1726 1933
1727 mx += self->x; 1934 mx += self->x;
1728 my += self->y; 1935 my += self->y;
1729 1936
1730 // first pass: determine smooth_max 1937 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1953 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1954 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1955 self->tex [cell->tile [2]].smoothlevel));
1749 } 1956 }
1750 } 1957 }
1958
1959 glEnable (GL_BLEND);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1962
1752 for (z = 0; z <= 2; z++) 1963 for (z = 0; z <= 2; z++)
1753 { 1964 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1965 memset (smooth_level, 0, sizeof (smooth_level));
1755 1966
1768 { 1979 {
1769 maptex tex = self->tex [tile]; 1980 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1981 int px = (x + 1) * T - tex.w;
1771 int py = (y + 1) * T - tex.h; 1982 int py = (y + 1) * T - tex.h;
1772 1983
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1984 if (key.texname != tex.name)
1776 { 1985 {
1777 if (!tex.name) 1986 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1987 tex = self->tex [2]; /* missing, replace by noface */
1779 1988
1780 glEnd (); 1989 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1990 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1991 }
1784 1992
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789
1790 if (cell->flags && z == 2)
1791 { 1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
2000
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 2009 if (cell->flags & 1)
1793 { 2010 {
1794 maptex tex = self->tex [1]; 2011 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 2012 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 2013 int py = y * T - T * 6 / 32;
1797 2014
2015 if (tex.name)
1798 glEnd (); 2016 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 2027 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 2028 }
1807 } 2029 }
1808 2030
1809 // update smooth hash 2031 // update smooth hash
1810 if (tex.smoothtile) 2032 if (tex.smoothtile)
1846 } 2068 }
1847 } 2069 }
1848 } 2070 }
1849 } 2071 }
1850 2072
2073 rc_draw (rc);
2074 rc_clear (rc);
2075
1851 // go through all smoothlevels, lowest to highest, then draw. 2076 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2077 // this is basically counting sort
1853 { 2078 {
1854 int w, b; 2079 int w, b;
1855 2080
2081 glEnable (GL_TEXTURE_2D);
2082 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2083 for (w = 0; w < 256 / 32; ++w)
1857 { 2084 {
1858 uint32_t smask = smooth_level [w]; 2085 uint32_t smask = smooth_level [w];
1859 if (smask) 2086 if (smask)
1860 for (b = 0; b < 32; ++b) 2087 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2106 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2107 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2108 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2109 float dy = tex.t * .5f ; // 2 images/column
1883 2110
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2111 if (tex.name)
1887 { 2112 {
2113 // this time avoiding texture state changes
2114 // save gobs of state changes.
1888 if (!tex.name) 2115 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2116 {
1890
1891 glEnd (); 2117 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2119 glBegin (GL_QUADS);
1894 } 2120 }
1895 2121
1896 if (border) 2122 if (border)
1897 { 2123 {
1898 float ox = border * dx; 2124 float ox = border * dx;
1899 2125
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2130 }
1905 2131
1906 if (corner) 2132 if (corner)
1907 { 2133 {
1908 float ox = corner * dx; 2134 float ox = corner * dx;
1909 2135
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2136 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2140 }
1914 } 2141 }
1915 } 2142 }
1916 } 2143 }
1917 } 2144 }
1918 } 2145 }
2146
2147 glEnd ();
2148 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1;
1919 } 2150 }
1920 2151
1921 hv_clear (smooth); 2152 hv_clear (smooth);
1922 } 2153 }
1923 2154
1924 glEnd (); 2155 if (pl_tex.name)
2156 {
2157 maptex tex = pl_tex;
2158 int px = pl_x + sdx;
2159 int py = pl_y + sdy;
1925 2160
1926 glDisable (GL_TEXTURE_2D); 2161 key.texname = tex.name;
2162 arr = rc_array (rc, &key);
2163
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2166 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168
2169 rc_draw (rc);
2170 }
2171
1927 glDisable (GL_BLEND); 2172 glDisable (GL_BLEND);
2173 rc_free (rc);
1928 2174
1929 // top layer: overlays such as the health bar 2175 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2176 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2177 if (0 <= y + my && y + my < self->rows)
1932 { 2178 {
1957 } 2203 }
1958 } 2204 }
1959} 2205}
1960 2206
1961void 2207void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2209 CODE:
1964{ 2210{
1965 static float color[16][3] = { 2211 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2212 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2213 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2263 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2264 glDisable (GL_TEXTURE_2D);
2019} 2265}
2020 2266
2021void 2267void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2268fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2269 PPCODE:
2024{ 2270{
2025 int x, y; 2271 int x, y;
2026 int sw1 = sw + 2; 2272 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2273 int sh1 = sh + 2;
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
2036 2282
2037 mx += self->x - 1; 2283 mx += self->x - 1;
2038 my += self->y - 1; 2284 my += self->y - 1;
2039 2285
2040 memset (darkness1, 255, sw1 * sh1); 2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2041 2287
2042 for (y = 0; y < sh1; y++) 2288 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
2044 { 2290 {
2045 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2344 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2345 PUSHs (darkness3_sv);
2100} 2346}
2101 2347
2102SV * 2348SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2349get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2350 CODE:
2105{ 2351{
2106 int x, y, x1, y1; 2352 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2353 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2354 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2411 else
2166 *data++ = 0; 2412 *data++ = 0;
2167 } 2413 }
2168 } 2414 }
2169 2415
2416 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 {
2170 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
2172 RETVAL = data_sv; 2423 RETVAL = data_sv;
2173} 2424}
2174 OUTPUT: 2425 OUTPUT:
2175 RETVAL 2426 RETVAL
2176 2427
2177void 2428void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2430 PPCODE:
2180{ 2431{
2181 int x, y, z; 2432 int x, y, z;
2182 int w, h; 2433 int w, h;
2183 int x1, y1; 2434 int x1, y1;
2435 STRLEN len;
2436 uint8_t *data, *end;
2437
2438 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv);
2441 end = data + len + 8;
2442
2443 if (len < 5)
2444 XSRETURN_EMPTY;
2184 2445
2185 if (*data++ != 0) 2446 if (*data++ != 0)
2186 return; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
2187 2448
2188 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2450 h = *data++ << 8; h |= *data++;
2190 2451
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2452 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2464 {
2204 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
2205 2466
2206 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
2207 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
2208 uint8_t flags = *data++; 2474 flags = *data++;
2209 2475
2210 if (flags) 2476 if (flags)
2211 { 2477 {
2212 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2479 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2484
2219 if (cell->darkness == 0) 2485 if (cell->darkness == 0)
2220 { 2486 {
2221 cell->darkness = 0; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
2222 2489
2223 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
2224 { 2491 {
2225 tileid t = tile [z]; 2492 tileid t = tile [z];
2226 2493
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2495 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2497 need_texid (self, t);
2231 } 2498 }
2232 2499
2233 cell->tile [z] = t; 2500 cell->tile [z] = t;
2234 } 2501 }
2236 } 2503 }
2237 } 2504 }
2238 } 2505 }
2239} 2506}
2240 2507
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2508MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2509
2243CFPlus::RW 2510DC::RW
2244new (SV *class, SV *data_sv) 2511new (SV *class, SV *data_sv)
2245 CODE: 2512 CODE:
2246{ 2513{
2247 STRLEN datalen; 2514 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2515 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2517 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2518}
2252 OUTPUT: 2519 OUTPUT:
2253 RETVAL 2520 RETVAL
2254 2521
2255CFPlus::RW 2522DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2523new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2524 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2525 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2526 OUTPUT:
2260 RETVAL 2527 RETVAL
2261 2528
2529# fails on win32:
2530# dc.xs(2268) : error C2059: syntax error : '('
2262void 2531#void
2263close (CFPlus::RW self) 2532#close (DC::RW self)
2264 CODE: 2533# CODE:
2265 SDL_RWclose (self); 2534# (self->(close)) (self);
2266 2535
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2536MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2537
2269PROTOTYPES: DISABLE 2538PROTOTYPES: DISABLE
2270 2539
2540DC::Channel
2541find ()
2542 CODE:
2543{
2544 RETVAL = Mix_GroupAvailable (-1);
2545
2546 if (RETVAL < 0)
2547 {
2548 RETVAL = Mix_GroupOldest (-1);
2549
2550 if (RETVAL < 0)
2551 XSRETURN_UNDEF;
2552
2553 Mix_HaltChannel (RETVAL);
2554 }
2555
2556 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128);
2558}
2559 OUTPUT:
2560 RETVAL
2561
2562void
2563halt (DC::Channel self)
2564 CODE:
2565 Mix_HaltChannel (self);
2566
2567void
2568expire (DC::Channel self, int ticks = -1)
2569 CODE:
2570 Mix_ExpireChannel (self, ticks);
2571
2572void
2573fade_out (DC::Channel self, int ticks = -1)
2574 CODE:
2575 Mix_FadeOutChannel (self, ticks);
2576
2271int 2577int
2272volume (CFPlus::Channel self, int volume) 2578volume (DC::Channel self, int volume)
2273 CODE: 2579 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2580 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2275 OUTPUT: 2581 OUTPUT:
2276 RETVAL 2582 RETVAL
2277 2583
2278int 2584void
2279unregister_all_effects (CFPlus::Channel self) 2585unregister_all_effects (DC::Channel self)
2280 CODE: 2586 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2587 Mix_UnregisterAllEffects (self);
2282 OUTPUT:
2283 RETVAL
2284 2588
2285int 2589void
2286set_panning (CFPlus::Channel self, int left, int right) 2590set_panning (DC::Channel self, int left, int right)
2287 CODE: 2591 CODE:
2592 left = CLAMP (left , 0, 255);
2593 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2594 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2595
2292int 2596void
2293set_distance (CFPlus::Channel self, int distance) 2597set_distance (DC::Channel self, int distance)
2294 CODE: 2598 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2599 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2600
2299int 2601void
2300set_position (CFPlus::Channel self, int angle, int distance) 2602set_position (DC::Channel self, int angle, int distance)
2301 CODE: 2603 CODE:
2604
2605void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE:
2608{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2612}
2304 RETVAL
2305 2613
2306int 2614void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2615set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2616 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2617 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2618
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2620
2315PROTOTYPES: DISABLE 2621PROTOTYPES: DISABLE
2316 2622
2317CFPlus::MixChunk 2623DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2624new (SV *class, DC::RW rwops)
2319 CODE: 2625 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2626 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2627 OUTPUT:
2322 RETVAL 2628 RETVAL
2323 2629
2324void 2630void
2325DESTROY (CFPlus::MixChunk self) 2631DESTROY (DC::MixChunk self)
2326 CODE: 2632 CODE:
2327 Mix_FreeChunk (self); 2633 Mix_FreeChunk (self);
2328 2634
2329int 2635int
2330volume (CFPlus::MixChunk self, int volume = -1) 2636volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2637 CODE:
2638 if (items > 1)
2639 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2640 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2641 OUTPUT:
2334 RETVAL 2642 RETVAL
2335 2643
2336CFPlus::Channel 2644DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2645play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2646 CODE:
2647{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2648 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2649
2650 if (RETVAL < 0)
2651 XSRETURN_UNDEF;
2652
2653 if (channel < 0)
2654 {
2340 Mix_UnregisterAllEffects (RETVAL); 2655 Mix_UnregisterAllEffects (RETVAL);
2656 Mix_Volume (RETVAL, 128);
2657 }
2658}
2341 OUTPUT: 2659 OUTPUT:
2342 RETVAL 2660 RETVAL
2343 2661
2344MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2345 2663
2346int 2664int
2347volume (int volume = -1) 2665volume (int volume = -1)
2348 PROTOTYPE: ;$ 2666 PROTOTYPE: ;$
2349 CODE: 2667 CODE:
2668 if (items > 0)
2669 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 2670 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 2671 OUTPUT:
2352 RETVAL 2672 RETVAL
2353 2673
2354int 2674void
2355fade_out (int ms) 2675fade_out (int ms)
2356 CODE: 2676 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 2677 Mix_FadeOutMusic (ms);
2358 OUTPUT:
2359 RETVAL
2360 2678
2361void 2679void
2362halt () 2680halt ()
2363 CODE: 2681 CODE:
2364 Mix_HaltMusic (); 2682 Mix_HaltMusic ();
2365 2683
2366CFPlus::MixMusic 2684DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 2685new (SV *class, DC::RW rwops)
2368 CODE: 2686 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 2687 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 2688 OUTPUT:
2371 RETVAL 2689 RETVAL
2372 2690
2373void 2691void
2374DESTROY (CFPlus::MixMusic self) 2692DESTROY (DC::MixMusic self)
2375 CODE: 2693 CODE:
2376 Mix_FreeMusic (self); 2694 Mix_FreeMusic (self);
2377 2695
2378int 2696int
2379play (CFPlus::MixMusic self, int loops = -1) 2697play (DC::MixMusic self, int loops = -1)
2380 CODE: 2698 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 2699 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 2700 OUTPUT:
2383 RETVAL 2701 RETVAL
2384 2702
2385int 2703void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2704fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 2705 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2706 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 2707
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2708MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 2709
2394PROTOTYPES: ENABLE 2710PROTOTYPES: ENABLE
2395 2711
2396BOOT: 2712BOOT:
2397{ 2713{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2714 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 2715 static const struct {
2400 const char *name; 2716 const char *name;
2401 IV iv; 2717 IV iv;
2402 } *civ, const_iv[] = { 2718 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 2719# define const_iv(name) { # name, (IV)name }
2438 const_iv (GL_INTENSITY), 2754 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 2755 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 2756 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 2757 const_iv (GL_FLOAT),
2442 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2758 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2759 const_iv (GL_COMPRESSED_ALPHA_ARB),
2760 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2761 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2762 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2763 const_iv (GL_COMPRESSED_RGB_ARB),
2764 const_iv (GL_COMPRESSED_RGBA_ARB),
2443 const_iv (GL_COMPILE), 2765 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 2766 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 2767 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 2768 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 2769 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2808 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 2809 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 2810 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 2811 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 2812 const_iv (GL_GENERATE_MIPMAP_HINT),
2813 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 2814 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 2815 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 2816 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 2817 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 2818 const_iv (GL_V3F),
2503 2826
2504 texture_av = newAV (); 2827 texture_av = newAV ();
2505 AvREAL_off (texture_av); 2828 AvREAL_off (texture_av);
2506} 2829}
2507 2830
2831void
2832disable_GL_EXT_blend_func_separate ()
2833 CODE:
2834 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0;
2836
2508char * 2837char *
2509gl_vendor () 2838gl_vendor ()
2510 CODE: 2839 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 2840 RETVAL = (char *)glGetString (GL_VENDOR);
2512 OUTPUT: 2841 OUTPUT:
2633 2962
2634void glRect (float x1, float y1, float x2, float y2) 2963void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 2964 CODE:
2636 glRectf (x1, y1, x2, y2); 2965 glRectf (x1, y1, x2, y2);
2637 2966
2967void glRect_lineloop (float x1, float y1, float x2, float y2)
2968 CODE:
2969 glBegin (GL_LINE_LOOP);
2970 glVertex2f (x1, y1);
2971 glVertex2f (x2, y1);
2972 glVertex2f (x2, y2);
2973 glVertex2f (x1, y2);
2974 glEnd ();
2975
2638PROTOTYPES: ENABLE 2976PROTOTYPES: ENABLE
2639 2977
2640void glBegin (int mode) 2978void glBegin (int mode)
2641 2979
2642void glEnd () 2980void glEnd ()
2674void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3012void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2675 CODE: 3013 CODE:
2676 if (gl.SeparableFilter2D) 3014 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3015 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 3016
2679void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3017void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2680 3018
2681void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3019void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2682 3020
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 3021void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 3022
2710 3048
2711void glEndList () 3049void glEndList ()
2712 3050
2713void glCallList (int list) 3051void glCallList (int list)
2714 3052
2715MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2716 3054
2717PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2718 3056
2719void 3057void
2720find_widget (SV *self, NV x, NV y) 3058find_widget (SV *self, NV x, NV y)
2724 XPUSHs (self); 3062 XPUSHs (self);
2725} 3063}
2726 3064
2727BOOT: 3065BOOT:
2728{ 3066{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3067 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 3068
2731 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3069 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2732 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3070 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2733 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3071 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2734 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3072 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2735} 3073}
2736 3074
2737void 3075void
2738draw (SV *self) 3076draw (SV *self)
2739 CODE: 3077 CODE:
2743 NV x, y, w, h; 3081 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 3082 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 3083 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 3084 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 3085 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 3086 double draw_x, draw_y;
2750 3087
2751 if (!SvROK (self)) 3088 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3089 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 3090
2754 hv = (HV *)SvRV (self); 3091 hv = (HV *)SvRV (self);
2755 3092
2756 if (SvTYPE (hv) != SVt_PVHV) 3093 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3094 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 3095
2759 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3096 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2760 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3097 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2761 3098
2762 if (!h || !w) 3099 if (!h || !w)
2782 { 3119 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3120 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 3121
2785 if (svp && SvTRUE (*svp)) 3122 if (svp && SvTRUE (*svp))
2786 { 3123 {
2787 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3124 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2788 glEnable (GL_BLEND); 3125 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3126 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 3127 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 3128 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 3129 glVertex2f (w, 0);
2795 glEnd (); 3132 glEnd ();
2796 glDisable (GL_BLEND); 3133 glDisable (GL_BLEND);
2797 } 3134 }
2798 } 3135 }
2799#if 0 3136#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 3137 // draw borders, for debugging
2801 glPushMatrix; 3138 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 3139 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 3140 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 3141 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 3142 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 3143 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 3144 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 3145 glVertex2f (0 , h - 1);
2809 glEnd; 3146 glEnd ();
2810 glPopMatrix; 3147 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 3148#endif
2814 PUSHMARK (SP); 3149 PUSHMARK (SP);
2815 XPUSHs (self); 3150 XPUSHs (self);
2816 PUTBACK; 3151 PUTBACK;
2817 call_method ("_draw", G_VOID | G_DISCARD); 3152 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines