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.273 by root, Wed Aug 20 13:30:02 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines