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.219 by root, Mon Aug 6 05:06:32 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 = 1024) 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);
953
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}
813 969
814void 970void
815Mix_CloseAudio () 971Mix_CloseAudio ()
816 972
817int 973int
852 } 1008 }
853 } 1009 }
854#endif 1010#endif
855} 1011}
856 1012
857void 1013int
858add_font (char *file) 1014add_font (char *file)
859 CODE: 1015 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1016 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1017 OUTPUT:
1018 RETVAL
861 1019
862void 1020void
863load_image_inline (SV *image_) 1021load_image_inline (SV *image_)
864 ALIAS: 1022 ALIAS:
865 load_image_file = 1 1023 load_image_file = 1
951void 1109void
952error (char *message) 1110error (char *message)
953 CODE: 1111 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1112 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1113#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1114 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1115#endif
958 1116
959void 1117void
960fatal (char *message) 1118fatal (char *message)
961 CODE: 1119 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1120 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1121#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1122 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1123#endif
966 _exit (1); 1124 _exit (1);
967 1125
968void 1126void
969_exit (int retval = 0) 1127_exit (int retval = 0)
981#if DEBUG 1139#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1140 VALGRIND_DO_LEAK_CHECK;
983#endif 1141#endif
984} 1142}
985 1143
986MODULE = CFPlus PACKAGE = CFPlus::Font 1144MODULE = Deliantra::Client PACKAGE = DC::Font
987 1145
988PROTOTYPES: DISABLE 1146PROTOTYPES: DISABLE
989 1147
990CFPlus::Font 1148DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1149new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1150 CODE:
993{ 1151{
994 int count; 1152 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1153 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1156}
999 OUTPUT: 1157 OUTPUT:
1000 RETVAL 1158 RETVAL
1001 1159
1002void 1160void
1003DESTROY (CFPlus::Font self) 1161DESTROY (DC::Font self)
1004 CODE: 1162 CODE:
1005 pango_font_description_free (self); 1163 pango_font_description_free (self);
1006 1164
1007void 1165void
1008make_default (CFPlus::Font self) 1166make_default (DC::Font self)
1009 PROTOTYPE: $ 1167 PROTOTYPE: $
1010 CODE: 1168 CODE:
1011 default_font = self; 1169 default_font = self;
1012 1170
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1171MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1172
1015PROTOTYPES: DISABLE 1173PROTOTYPES: DISABLE
1016 1174
1017void 1175void
1018reset_glyph_cache () 1176glyph_cache_backup ()
1019 PROTOTYPE: 1177 PROTOTYPE:
1020 CODE: 1178 CODE:
1179 tc_backup ();
1180
1181void
1182glyph_cache_restore ()
1183 PROTOTYPE:
1184 CODE:
1021 tc_clear (); 1185 tc_restore ();
1022 1186
1023CFPlus::Layout 1187DC::Layout
1024new (SV *class) 1188new (SV *class)
1025 CODE: 1189 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1190 New (0, RETVAL, 1, struct cf_layout);
1027 1191
1028 RETVAL->pl = pango_layout_new (opengl_context); 1192 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1194 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1195 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1196 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1197 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1198 RETVAL->font = 0;
1199 RETVAL->rc = rc_alloc ();
1035 1200
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1201 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1202 layout_update_font (RETVAL);
1038 OUTPUT: 1203 OUTPUT:
1039 RETVAL 1204 RETVAL
1040 1205
1041void 1206void
1042DESTROY (CFPlus::Layout self) 1207DESTROY (DC::Layout self)
1043 CODE: 1208 CODE:
1044 g_object_unref (self->pl); 1209 g_object_unref (self->pl);
1210 rc_free (self->rc);
1045 Safefree (self); 1211 Safefree (self);
1046 1212
1047void 1213void
1048set_text (CFPlus::Layout self, SV *text_) 1214set_text (DC::Layout self, SV *text_)
1049 CODE: 1215 CODE:
1050{ 1216{
1051 STRLEN textlen; 1217 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1218 char *text = SvPVutf8 (text_, textlen);
1053 1219
1054 pango_layout_set_text (self->pl, text, textlen); 1220 pango_layout_set_text (self->pl, text, textlen);
1055} 1221}
1056 1222
1057void 1223void
1058set_markup (CFPlus::Layout self, SV *text_) 1224set_markup (DC::Layout self, SV *text_)
1059 CODE: 1225 CODE:
1060{ 1226{
1061 STRLEN textlen; 1227 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1228 char *text = SvPVutf8 (text_, textlen);
1063 1229
1064 pango_layout_set_markup (self->pl, text, textlen); 1230 pango_layout_set_markup (self->pl, text, textlen);
1065} 1231}
1066 1232
1067void 1233void
1068set_shapes (CFPlus::Layout self, ...) 1234set_shapes (DC::Layout self, ...)
1069 CODE: 1235 CODE:
1070{ 1236{
1071 PangoAttrList *attrs = 0; 1237 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1238 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1239 const char *pos = text;
1108 if (attrs) 1274 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1275 pango_layout_set_attributes (self->pl, attrs);
1110} 1276}
1111 1277
1112void 1278void
1113get_shapes (CFPlus::Layout self) 1279get_shapes (DC::Layout self)
1114 PPCODE: 1280 PPCODE:
1115{ 1281{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1282 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1283
1118 do 1284 do
1119 { 1285 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1286 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1287
1122 if (run && shape_attr_p (run)) 1288 if (run && shape_attr_p (run))
1123 { 1289 {
1124 PangoRectangle extents; 1290 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1291 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1299
1134 pango_layout_iter_free (iter); 1300 pango_layout_iter_free (iter);
1135} 1301}
1136 1302
1137int 1303int
1138has_wrapped (CFPlus::Layout self) 1304has_wrapped (DC::Layout self)
1139 CODE: 1305 CODE:
1140{ 1306{
1141 int lines = 1; 1307 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1308 const char *text = pango_layout_get_text (self->pl);
1143 1309
1148} 1314}
1149 OUTPUT: 1315 OUTPUT:
1150 RETVAL 1316 RETVAL
1151 1317
1152SV * 1318SV *
1153get_text (CFPlus::Layout self) 1319get_text (DC::Layout self)
1154 CODE: 1320 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1321 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1322 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1323 OUTPUT:
1158 RETVAL 1324 RETVAL
1159 1325
1160void 1326void
1161set_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.)
1162 CODE: 1328 CODE:
1163 self->r = r; 1329 self->r = r;
1164 self->g = g; 1330 self->g = g;
1165 self->b = b; 1331 self->b = b;
1166 self->a = a; 1332 self->a = a;
1167 1333
1168void 1334void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1335set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1336 CODE:
1171 if (self->font != font) 1337 if (self->font != font)
1172 { 1338 {
1173 self->font = font; 1339 self->font = font;
1174 layout_update_font (self); 1340 layout_update_font (self);
1175 } 1341 }
1176 1342
1177void 1343void
1178set_height (CFPlus::Layout self, int base_height) 1344set_height (DC::Layout self, int base_height)
1179 CODE: 1345 CODE:
1180 if (self->base_height != base_height) 1346 if (self->base_height != base_height)
1181 { 1347 {
1182 self->base_height = base_height; 1348 self->base_height = base_height;
1183 layout_update_font (self); 1349 layout_update_font (self);
1184 } 1350 }
1185 1351
1186void 1352void
1187set_width (CFPlus::Layout self, int max_width = -1) 1353set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1354 CODE:
1189 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);
1190 1356
1191void 1357void
1192set_indent (CFPlus::Layout self, int indent) 1358set_indent (DC::Layout self, int indent)
1193 CODE: 1359 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1360 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1361
1196void 1362void
1197set_spacing (CFPlus::Layout self, int spacing) 1363set_spacing (DC::Layout self, int spacing)
1198 CODE: 1364 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1365 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1366
1201void 1367void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1368set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1369 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1370 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1371 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1372 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1373 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1374 : PANGO_ELLIPSIZE_NONE
1209 ); 1375 );
1210 1376
1211void 1377void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1378set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1379 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1380 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1381
1216void 1382void
1217size (CFPlus::Layout self) 1383size (DC::Layout self)
1218 PPCODE: 1384 PPCODE:
1219{ 1385{
1220 int w, h; 1386 int w, h;
1221 1387
1222 layout_get_pixel_size (self, &w, &h); 1388 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1391 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1392 PUSHs (sv_2mortal (newSViv (h)));
1227} 1393}
1228 1394
1229int 1395int
1230descent (CFPlus::Layout self) 1396descent (DC::Layout self)
1231 CODE: 1397 CODE:
1232{ 1398{
1233 PangoRectangle rect; 1399 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1400 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1401 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1402 RETVAL = PANGO_DESCENT (rect);
1237} 1403}
1238 OUTPUT: 1404 OUTPUT:
1239 RETVAL 1405 RETVAL
1240 1406
1241int 1407int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1408xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1409 CODE:
1244{ 1410{
1245 int index, trailing; 1411 int index, trailing;
1246 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);
1247 RETVAL = index + trailing; 1413 RETVAL = index + trailing;
1248} 1414}
1249 OUTPUT: 1415 OUTPUT:
1250 RETVAL 1416 RETVAL
1251 1417
1252void 1418void
1253cursor_pos (CFPlus::Layout self, int index) 1419cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1420 PPCODE:
1255{ 1421{
1256 PangoRectangle strong_pos; 1422 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1423 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1424
1259 EXTEND (SP, 3); 1425 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1428 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1429}
1264 1430
1265void 1431void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1432index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1433 PPCODE:
1268{ 1434{
1269 int line, x; 1435 int line, x;
1270 1436
1271 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)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1439 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1440 --line;
1441#endif
1274 EXTEND (SP, 2); 1442 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1443 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1444 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1445}
1278 1446
1279void 1447void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1448line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1449 PPCODE:
1282{ 1450{
1283 PangoLayoutLine *lp; 1451 PangoLayoutLine *lp;
1284 int index, trailing; 1452 int index, trailing;
1285 1453
1286 if (line < 0) 1454 if (line < 0)
1287 XSRETURN_EMPTY; 1455 XSRETURN_EMPTY;
1288 1456
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1457 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1458 XSRETURN_EMPTY; /* do better */
1291 1459
1292 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);
1293 1461
1294 EXTEND (SP, 2); 1462 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1468 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1469 }
1302} 1470}
1303 1471
1304void 1472void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1473render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1474 CODE:
1475 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1476 pango_opengl_render_layout_subpixel (
1308 self->pl, 1477 self->pl,
1478 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1479 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1480 self->r, self->g, self->b, self->a,
1311 flags 1481 flags
1312 ); 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);
1313 1486
1314MODULE = 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
1315 1507
1316PROTOTYPES: ENABLE 1508PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1509
1320void 1510void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1511pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1512 CODE:
1323{ 1513{
1400 RETVAL = width > 0; 1590 RETVAL = width > 0;
1401} 1591}
1402 OUTPUT: 1592 OUTPUT:
1403 RETVAL 1593 RETVAL
1404 1594
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1595MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1596
1407PROTOTYPES: DISABLE 1597PROTOTYPES: DISABLE
1408 1598
1409CFPlus::Map 1599DC::Map
1410new (SV *class) 1600new (SV *class)
1411 CODE: 1601 CODE:
1412 New (0, RETVAL, 1, struct map); 1602 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1603 RETVAL->x = 0;
1414 RETVAL->y = 0; 1604 RETVAL->y = 0;
1422 RETVAL->row = 0; 1612 RETVAL->row = 0;
1423 OUTPUT: 1613 OUTPUT:
1424 RETVAL 1614 RETVAL
1425 1615
1426void 1616void
1427DESTROY (CFPlus::Map self) 1617DESTROY (DC::Map self)
1428 CODE: 1618 CODE:
1429{ 1619{
1430 map_clear (self); 1620 map_clear (self);
1431 Safefree (self->face2tile); 1621 Safefree (self->face2tile);
1432 Safefree (self->tex); 1622 Safefree (self->tex);
1433 Safefree (self); 1623 Safefree (self);
1434} 1624}
1435 1625
1436void 1626void
1437resize (CFPlus::Map self, int map_width, int map_height) 1627resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1628 CODE:
1439 self->w = map_width; 1629 self->w = map_width;
1440 self->h = map_height; 1630 self->h = map_height;
1441 1631
1442void 1632void
1443clear (CFPlus::Map self) 1633clear (DC::Map self)
1444 CODE: 1634 CODE:
1445 map_clear (self); 1635 map_clear (self);
1446 1636
1447void 1637void
1448set_tileid (CFPlus::Map self, int face, int tile) 1638set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1639 CODE:
1450{ 1640{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1641 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1642 need_texid (self, tile);
1453} 1643}
1454 1644
1455void 1645void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1646set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1647 CODE:
1458{ 1648{
1459 tileid texid; 1649 tileid texid;
1460 maptex *tex; 1650 maptex *tex;
1461 1651
1474 tex->smoothtile = self->face2tile [smooth]; 1664 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1665 tex->smoothlevel = level;
1476} 1666}
1477 1667
1478void 1668void
1479set_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)
1480 CODE: 1670 CODE:
1481{ 1671{
1482 need_texid (self, texid); 1672 need_texid (self, texid);
1483 1673
1484 { 1674 {
1504 // from transparent color bleeding and ugly wrapping effects. 1694 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1696}
1507 1697
1508int 1698int
1509ox (CFPlus::Map self) 1699ox (DC::Map self)
1510 ALIAS: 1700 ALIAS:
1511 oy = 1 1701 oy = 1
1512 x = 2 1702 x = 2
1513 y = 3 1703 y = 3
1514 w = 4 1704 w = 4
1525 } 1715 }
1526 OUTPUT: 1716 OUTPUT:
1527 RETVAL 1717 RETVAL
1528 1718
1529void 1719void
1530scroll (CFPlus::Map self, int dx, int dy) 1720scroll (DC::Map self, int dx, int dy)
1531 CODE: 1721 CODE:
1532{ 1722{
1533 if (dx > 0) 1723 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1724 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1725 else if (dx < 0)
1550 self->rows += MAP_EXTEND_Y; 1740 self->rows += MAP_EXTEND_Y;
1551 self->y += MAP_EXTEND_Y; 1741 self->y += MAP_EXTEND_Y;
1552 } 1742 }
1553} 1743}
1554 1744
1555void 1745SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1746map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1747 CODE:
1558{ 1748{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1749 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1750 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1751 mapcell *cell;
1562 int x, y, flags; 1752 int x, y, z, flags;
1753 AV *missing = newAV ();
1754 RETVAL = newRV_noinc ((SV *)missing);
1563 1755
1564 while (data < data_end - 1) 1756 while (data < data_end - 1)
1565 { 1757 {
1566 flags = (data [0] << 8) + data [1]; data += 2; 1758 flags = (data [0] << 8) + data [1]; data += 2;
1567 1759
1587 uint8_t ext, cmd; 1779 uint8_t ext, cmd;
1588 1780
1589 do 1781 do
1590 { 1782 {
1591 ext = *data++; 1783 ext = *data++;
1592 cmd = ext & 0x3f; 1784 cmd = ext & 0x7f;
1593 1785
1594 if (cmd < 4) 1786 if (cmd < 4)
1595 cell->darkness = 255 - ext * 64 + 1; 1787 cell->darkness = 255 - ext * 64 + 1;
1596 else if (cmd == 5) // health 1788 else if (cmd == 5) // health
1597 { 1789 {
1600 } 1792 }
1601 else if (cmd == 6) // monster width 1793 else if (cmd == 6) // monster width
1602 cell->stat_width = *data++ + 1; 1794 cell->stat_width = *data++ + 1;
1603 else if (cmd == 0x47) 1795 else if (cmd == 0x47)
1604 { 1796 {
1605 if (*data == 4) 1797 if (*data == 1) cell->player = data [1];
1606 ; // 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);
1607 1801
1608 data += *data + 1; 1802 data += *data + 1;
1609 } 1803 }
1610 else if (cmd == 8) // cell flags 1804 else if (cmd == 8) // cell flags
1611 cell->flags = *data++; 1805 cell->flags = *data++;
1618 } 1812 }
1619 else 1813 else
1620 cell->darkness = *data++ + 1; 1814 cell->darkness = *data++ + 1;
1621 } 1815 }
1622 1816
1817 for (z = 0; z <= 2; ++z)
1623 if (flags & 4) 1818 if (flags & (4 >> z))
1624 { 1819 {
1625 faceid face = (data [0] << 8) + data [1]; data += 2; 1820 faceid face = (data [0] << 8) + data [1]; data += 2;
1626 need_facenum (self, face); 1821 need_facenum (self, face);
1627 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 }
1628 } 1837 }
1629
1630 if (flags & 2)
1631 {
1632 faceid face = (data [0] << 8) + data [1]; data += 2;
1633 need_facenum (self, face);
1634 cell->tile [1] = self->face2tile [face];
1635 }
1636
1637 if (flags & 1)
1638 {
1639 faceid face = (data [0] << 8) + data [1]; data += 2;
1640 need_facenum (self, face);
1641 cell->tile [2] = self->face2tile [face];
1642 }
1643 } 1838 }
1644 else 1839 else
1645 cell->darkness = 0; 1840 CELL_CLEAR (cell);
1646 } 1841 }
1647} 1842}
1843 OUTPUT:
1844 RETVAL
1648 1845
1649SV * 1846SV *
1650mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1847mapmap (DC::Map self, int x0, int y0, int w, int h)
1651 CODE: 1848 CODE:
1652{ 1849{
1653 int x1, x; 1850 int x1, x;
1654 int y1, y; 1851 int y1, y;
1655 int z; 1852 int z;
1699 RETVAL = map_sv; 1896 RETVAL = map_sv;
1700} 1897}
1701 OUTPUT: 1898 OUTPUT:
1702 RETVAL 1899 RETVAL
1703 1900
1704SV * 1901void
1705draw (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)
1706 CODE: 1903 CODE:
1707{ 1904{
1905 int x, y, z;
1906
1708 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1907 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1709 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
1710 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)
1711 smooth_key skey; 1910 smooth_key skey;
1712 int x, y, z; 1911 int pl_x, pl_y;
1713 int last_name; 1912 maptex pl_tex;
1714 AV *missing = newAV (); 1913 rc_t *rc = rc_alloc ();
1715 RETVAL = newRV_noinc ((SV *)missing); 1914 rc_key_t key;
1915 rc_array_t *arr;
1916
1917 pl_tex.name = 0;
1716 1918
1717 // thats current max. sorry. 1919 // thats current max. sorry.
1718 if (sw > 255) sw = 255; 1920 if (sw > 255) sw = 255;
1719 if (sh > 255) sh = 255; 1921 if (sh > 255) sh = 255;
1720 1922
1721 // clear key, in case of extra padding 1923 // clear key, in case of extra padding
1722 memset (&skey, 0, sizeof (skey)); 1924 memset (&skey, 0, sizeof (skey));
1723 1925
1724 glColor4ub (255, 255, 255, 255); 1926 memset (&key, 0, sizeof (key));
1725 1927 key.r = 255;
1726 glEnable (GL_BLEND); 1928 key.g = 255;
1727 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1929 key.b = 255;
1728 glEnable (GL_TEXTURE_2D); 1930 key.a = 255;
1729 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1931 key.mode = GL_QUADS;
1730 1932 key.format = GL_T2F_V3F;
1731 glBegin (GL_QUADS);
1732
1733 last_name = -1; 1933 key.texname = -1;
1734 1934
1735 mx += self->x; 1935 mx += self->x;
1736 my += self->y; 1936 my += self->y;
1737 1937
1738 // first pass: determine smooth_max 1938 // first pass: determine smooth_max
1754 MAX (self->tex [cell->tile [0]].smoothlevel, 1954 MAX (self->tex [cell->tile [0]].smoothlevel,
1755 MAX (self->tex [cell->tile [1]].smoothlevel, 1955 MAX (self->tex [cell->tile [1]].smoothlevel,
1756 self->tex [cell->tile [2]].smoothlevel)); 1956 self->tex [cell->tile [2]].smoothlevel));
1757 } 1957 }
1758 } 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);
1759 1963
1760 for (z = 0; z <= 2; z++) 1964 for (z = 0; z <= 2; z++)
1761 { 1965 {
1762 memset (smooth_level, 0, sizeof (smooth_level)); 1966 memset (smooth_level, 0, sizeof (smooth_level));
1763 1967
1773 tileid tile = cell->tile [z]; 1977 tileid tile = cell->tile [z];
1774 1978
1775 if (tile) 1979 if (tile)
1776 { 1980 {
1777 maptex tex = self->tex [tile]; 1981 maptex tex = self->tex [tile];
1778 int px, py; 1982 int px = (x + 1) * T - tex.w;
1983 int py = (y + 1) * T - tex.h;
1779 1984
1780 // suppressing texture state switches here
1781 // is only moderately effective, but worth the extra effort
1782 if (last_name != tex.name) 1985 if (key.texname != tex.name)
1783 { 1986 {
1784 if (!tex.name) 1987 if (!tex.name)
1785 {
1786 av_push (missing, newSViv (tile));
1787 tex = self->tex [2]; /* missing, replace by noface */ 1988 tex = self->tex [2]; /* missing, replace by noface */
1788 }
1789 1989
1790 glEnd (); 1990 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1991 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 1992 }
1794 1993
1795 px = (x + 1) * T - tex.w; 1994 if (expect_false (cell->player == player) && expect_false (z == 2))
1796 py = (y + 1) * T - tex.h;
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 { 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
1805 if (cell->flags & 1) 2010 if (cell->flags & 1)
1806 { 2011 {
1807 maptex tex = self->tex [1]; 2012 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32; 2013 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32; 2014 int py = y * T - T * 6 / 32;
1810 2015
2016 if (tex.name)
1811 glEnd (); 2017 {
1812 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);
1813 glBegin (GL_QUADS); 2028 }
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 } 2029 }
1820 } 2030 }
1821 2031
1822 // update smooth hash 2032 // update smooth hash
1823 if (tex.smoothtile) 2033 if (tex.smoothtile)
1859 } 2069 }
1860 } 2070 }
1861 } 2071 }
1862 } 2072 }
1863 2073
2074 rc_draw (rc);
2075 rc_clear (rc);
2076
1864 // go through all smoothlevels, lowest to highest, then draw. 2077 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 2078 // this is basically counting sort
1866 { 2079 {
1867 int w, b; 2080 int w, b;
1868 2081
2082 glEnable (GL_TEXTURE_2D);
2083 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2084 for (w = 0; w < 256 / 32; ++w)
1870 { 2085 {
1871 uint32_t smask = smooth_level [w]; 2086 uint32_t smask = smooth_level [w];
1872 if (smask) 2087 if (smask)
1873 for (b = 0; b < 32; ++b) 2088 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2107 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2108 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2109 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2110 float dy = tex.t * .5f ; // 2 images/column
1896 2111
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2112 if (tex.name)
1900 { 2113 {
2114 // this time avoiding texture state changes
2115 // save gobs of state changes.
1901 if (!tex.name) 2116 if (key.texname != tex.name)
1902 { 2117 {
1903 av_push (missing, newSViv (skey->tile)); 2118 glEnd ();
1904 continue; // smoothing not yet available 2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2120 glBegin (GL_QUADS);
1905 } 2121 }
1906 2122
1907 glEnd ();
1908 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1909 glBegin (GL_QUADS);
1910 }
1911
1912 if (border) 2123 if (border)
1913 { 2124 {
1914 float ox = border * dx; 2125 float ox = border * dx;
1915 2126
1916 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2127 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1917 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2128 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1918 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2129 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1919 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2130 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1920 } 2131 }
1921 2132
1922 if (corner) 2133 if (corner)
1923 { 2134 {
1924 float ox = corner * dx; 2135 float ox = corner * dx;
1925 2136
1926 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2137 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1927 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2138 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1928 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2139 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1929 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2140 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2141 }
1930 } 2142 }
1931 } 2143 }
1932 } 2144 }
1933 } 2145 }
1934 } 2146 }
2147
2148 glEnd ();
2149 glDisable (GL_TEXTURE_2D);
2150 key.texname = -1;
1935 } 2151 }
1936 2152
1937 hv_clear (smooth); 2153 hv_clear (smooth);
1938 } 2154 }
1939 2155
1940 glEnd (); 2156 if (pl_tex.name)
2157 {
2158 maptex tex = pl_tex;
2159 int px = pl_x + sdx;
2160 int py = pl_y + sdy;
1941 2161
1942 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
1943 glDisable (GL_BLEND); 2173 glDisable (GL_BLEND);
2174 rc_free (rc);
1944 2175
1945 // top layer: overlays such as the health bar 2176 // top layer: overlays such as the health bar
1946 for (y = 0; y < sh; y++) 2177 for (y = 0; y < sh; y++)
1947 if (0 <= y + my && y + my < self->rows) 2178 if (0 <= y + my && y + my < self->rows)
1948 { 2179 {
1971 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 2202 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1972 } 2203 }
1973 } 2204 }
1974 } 2205 }
1975} 2206}
1976 OUTPUT:
1977 RETVAL
1978 2207
1979void 2208void
1980draw_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)
1981 CODE: 2210 CODE:
1982{ 2211{
1983 static float color[16][3] = { 2212 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2213 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2214 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2264 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2265 glDisable (GL_TEXTURE_2D);
2037} 2266}
2038 2267
2039void 2268void
2040fow_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)
2041 PPCODE: 2270 PPCODE:
2042{ 2271{
2043 int x, y; 2272 int x, y;
2044 int sw1 = sw + 2; 2273 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2274 int sh1 = sh + 2;
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2282 SvCUR_set (darkness3_sv, sw34 * sh3);
2054 2283
2055 mx += self->x - 1; 2284 mx += self->x - 1;
2056 my += self->y - 1; 2285 my += self->y - 1;
2057 2286
2058 memset (darkness1, 255, sw1 * sh1); 2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2059 2288
2060 for (y = 0; y < sh1; y++) 2289 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2290 if (0 <= y + my && y + my < self->rows)
2062 { 2291 {
2063 maprow *row = self->row + (y + my); 2292 maprow *row = self->row + (y + my);
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2345 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2346 PUSHs (darkness3_sv);
2118} 2347}
2119 2348
2120SV * 2349SV *
2121get_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)
2122 CODE: 2351 CODE:
2123{ 2352{
2124 int x, y, x1, y1; 2353 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2354 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2355 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2412 else
2184 *data++ = 0; 2413 *data++ = 0;
2185 } 2414 }
2186 } 2415 }
2187 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 {
2188 SvPOK_only (data_sv); 2420 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2421 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2422 }
2423
2190 RETVAL = data_sv; 2424 RETVAL = data_sv;
2191} 2425}
2192 OUTPUT: 2426 OUTPUT:
2193 RETVAL 2427 RETVAL
2194 2428
2195void 2429void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2430set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2431 PPCODE:
2198{ 2432{
2199 int x, y, z; 2433 int x, y, z;
2200 int w, h; 2434 int w, h;
2201 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;
2202 2446
2203 if (*data++ != 0) 2447 if (*data++ != 0)
2204 return; /* version mismatch */ 2448 XSRETURN_EMPTY; /* version mismatch */
2205 2449
2206 w = *data++ << 8; w |= *data++; 2450 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2451 h = *data++ << 8; h |= *data++;
2208 2452
2209 // 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
2221 { 2465 {
2222 maprow *row = map_get_row (self, y); 2466 maprow *row = map_get_row (self, y);
2223 2467
2224 for (x = x0; x < x1; x++) 2468 for (x = x0; x < x1; x++)
2225 { 2469 {
2470 uint8_t flags;
2471
2472 if (data + 7 >= end)
2473 XSRETURN_EMPTY;
2474
2226 uint8_t flags = *data++; 2475 flags = *data++;
2227 2476
2228 if (flags) 2477 if (flags)
2229 { 2478 {
2230 mapcell *cell = row_get_cell (row, x); 2479 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2480 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2483 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2484 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2485
2237 if (cell->darkness == 0) 2486 if (cell->darkness == 0)
2238 { 2487 {
2239 cell->darkness = 0; 2488 /*cell->darkness = 0;*/
2489 EXTEND (SP, 3);
2240 2490
2241 for (z = 0; z <= 2; z++) 2491 for (z = 0; z <= 2; z++)
2242 { 2492 {
2243 tileid t = tile [z]; 2493 tileid t = tile [z];
2244 2494
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2495 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2496 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2497 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2498 need_texid (self, t);
2249 } 2499 }
2250 2500
2251 cell->tile [z] = t; 2501 cell->tile [z] = t;
2252 } 2502 }
2254 } 2504 }
2255 } 2505 }
2256 } 2506 }
2257} 2507}
2258 2508
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2509MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2510
2261CFPlus::RW 2511DC::RW
2262new (SV *class, SV *data_sv) 2512new (SV *class, SV *data_sv)
2263 CODE: 2513 CODE:
2264{ 2514{
2265 STRLEN datalen; 2515 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2516 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2518 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2519}
2270 OUTPUT: 2520 OUTPUT:
2271 RETVAL 2521 RETVAL
2272 2522
2273CFPlus::RW 2523DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2524new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2525 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2526 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2527 OUTPUT:
2278 RETVAL 2528 RETVAL
2279 2529
2280# fails on win32: 2530# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2531# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2532#void
2283#close (CFPlus::RW self) 2533#close (DC::RW self)
2284# CODE: 2534# CODE:
2285# (self->(close)) (self); 2535# (self->(close)) (self);
2286 2536
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2537MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2538
2289PROTOTYPES: DISABLE 2539PROTOTYPES: DISABLE
2290 2540
2291CFPlus::Channel 2541DC::Channel
2292find () 2542find ()
2293 CODE: 2543 CODE:
2294{ 2544{
2295 RETVAL = Mix_GroupAvailable (-1); 2545 RETVAL = Mix_GroupAvailable (-1);
2296 2546
2309} 2559}
2310 OUTPUT: 2560 OUTPUT:
2311 RETVAL 2561 RETVAL
2312 2562
2313void 2563void
2314halt (CFPlus::Channel self) 2564halt (DC::Channel self)
2315 CODE: 2565 CODE:
2316 Mix_HaltChannel (self); 2566 Mix_HaltChannel (self);
2317 2567
2318void 2568void
2319expire (CFPlus::Channel self, int ticks = -1) 2569expire (DC::Channel self, int ticks = -1)
2320 CODE: 2570 CODE:
2321 Mix_ExpireChannel (self, ticks); 2571 Mix_ExpireChannel (self, ticks);
2322 2572
2323void 2573void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2574fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2575 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2576 Mix_FadeOutChannel (self, ticks);
2327 2577
2328int 2578int
2329volume (CFPlus::Channel self, int volume) 2579volume (DC::Channel self, int volume)
2330 CODE: 2580 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2581 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2582 OUTPUT:
2333 RETVAL 2583 RETVAL
2334 2584
2335void 2585void
2336unregister_all_effects (CFPlus::Channel self) 2586unregister_all_effects (DC::Channel self)
2337 CODE: 2587 CODE:
2338 Mix_UnregisterAllEffects (self); 2588 Mix_UnregisterAllEffects (self);
2339 2589
2340void 2590void
2341set_panning (CFPlus::Channel self, int left, int right) 2591set_panning (DC::Channel self, int left, int right)
2342 CODE: 2592 CODE:
2343 left = CLAMP (left , 0, 255); 2593 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2594 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2595 Mix_SetPanning (self, left, right);
2346 2596
2347void 2597void
2348set_distance (CFPlus::Channel self, int distance) 2598set_distance (DC::Channel self, int distance)
2349 CODE: 2599 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2600 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2601
2352void 2602void
2353set_position (CFPlus::Channel self, int angle, int distance) 2603set_position (DC::Channel self, int angle, int distance)
2354 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);
2355 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2612 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2613}
2356 2614
2357void 2615void
2358set_reverse_stereo (CFPlus::Channel self, int flip) 2616set_reverse_stereo (DC::Channel self, int flip)
2359 CODE: 2617 CODE:
2360 Mix_SetReverseStereo (self, flip); 2618 Mix_SetReverseStereo (self, flip);
2361 2619
2362MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2620MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2363 2621
2364PROTOTYPES: DISABLE 2622PROTOTYPES: DISABLE
2365 2623
2366CFPlus::MixChunk 2624DC::MixChunk
2367new (SV *class, CFPlus::RW rwops) 2625new (SV *class, DC::RW rwops)
2368 CODE: 2626 CODE:
2369 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2627 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2370 OUTPUT: 2628 OUTPUT:
2371 RETVAL 2629 RETVAL
2372 2630
2373void 2631void
2374DESTROY (CFPlus::MixChunk self) 2632DESTROY (DC::MixChunk self)
2375 CODE: 2633 CODE:
2376 Mix_FreeChunk (self); 2634 Mix_FreeChunk (self);
2377 2635
2378int 2636int
2379volume (CFPlus::MixChunk self, int volume = -1) 2637volume (DC::MixChunk self, int volume = -1)
2380 CODE: 2638 CODE:
2381 if (items > 1) 2639 if (items > 1)
2382 volume = CLAMP (volume, 0, 128); 2640 volume = CLAMP (volume, 0, 128);
2383 RETVAL = Mix_VolumeChunk (self, volume); 2641 RETVAL = Mix_VolumeChunk (self, volume);
2384 OUTPUT: 2642 OUTPUT:
2385 RETVAL 2643 RETVAL
2386 2644
2387CFPlus::Channel 2645DC::Channel
2388play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2646play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2389 CODE: 2647 CODE:
2390{ 2648{
2391 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2649 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2392 2650
2393 if (RETVAL < 0) 2651 if (RETVAL < 0)
2400 } 2658 }
2401} 2659}
2402 OUTPUT: 2660 OUTPUT:
2403 RETVAL 2661 RETVAL
2404 2662
2405MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2663MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2406 2664
2407int 2665int
2408volume (int volume = -1) 2666volume (int volume = -1)
2409 PROTOTYPE: ;$ 2667 PROTOTYPE: ;$
2410 CODE: 2668 CODE:
2422void 2680void
2423halt () 2681halt ()
2424 CODE: 2682 CODE:
2425 Mix_HaltMusic (); 2683 Mix_HaltMusic ();
2426 2684
2427CFPlus::MixMusic 2685DC::MixMusic
2428new (SV *class, CFPlus::RW rwops) 2686new (SV *class, DC::RW rwops)
2429 CODE: 2687 CODE:
2430 RETVAL = Mix_LoadMUS_RW (rwops); 2688 RETVAL = Mix_LoadMUS_RW (rwops);
2431 OUTPUT: 2689 OUTPUT:
2432 RETVAL 2690 RETVAL
2433 2691
2434void 2692void
2435DESTROY (CFPlus::MixMusic self) 2693DESTROY (DC::MixMusic self)
2436 CODE: 2694 CODE:
2437 Mix_FreeMusic (self); 2695 Mix_FreeMusic (self);
2438 2696
2439int 2697int
2440play (CFPlus::MixMusic self, int loops = -1) 2698play (DC::MixMusic self, int loops = -1)
2441 CODE: 2699 CODE:
2442 RETVAL = Mix_PlayMusic (self, loops); 2700 RETVAL = Mix_PlayMusic (self, loops);
2443 OUTPUT: 2701 OUTPUT:
2444 RETVAL 2702 RETVAL
2445 2703
2446void 2704void
2447fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2705fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2448 CODE: 2706 CODE:
2449 Mix_FadeInMusicPos (self, loops, ms, position); 2707 Mix_FadeInMusicPos (self, loops, ms, position);
2450 2708
2451MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2709MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2452 2710
2453PROTOTYPES: ENABLE 2711PROTOTYPES: ENABLE
2454 2712
2455BOOT: 2713BOOT:
2456{ 2714{
2457 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2715 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2458 static const struct { 2716 static const struct {
2459 const char *name; 2717 const char *name;
2460 IV iv; 2718 IV iv;
2461 } *civ, const_iv[] = { 2719 } *civ, const_iv[] = {
2462# define const_iv(name) { # name, (IV)name } 2720# define const_iv(name) { # name, (IV)name }
2497 const_iv (GL_INTENSITY), 2755 const_iv (GL_INTENSITY),
2498 const_iv (GL_LUMINANCE), 2756 const_iv (GL_LUMINANCE),
2499 const_iv (GL_LUMINANCE_ALPHA), 2757 const_iv (GL_LUMINANCE_ALPHA),
2500 const_iv (GL_FLOAT), 2758 const_iv (GL_FLOAT),
2501 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),
2502 const_iv (GL_COMPILE), 2766 const_iv (GL_COMPILE),
2503 const_iv (GL_PROXY_TEXTURE_1D), 2767 const_iv (GL_PROXY_TEXTURE_1D),
2504 const_iv (GL_PROXY_TEXTURE_2D), 2768 const_iv (GL_PROXY_TEXTURE_2D),
2505 const_iv (GL_TEXTURE_1D), 2769 const_iv (GL_TEXTURE_1D),
2506 const_iv (GL_TEXTURE_2D), 2770 const_iv (GL_TEXTURE_2D),
2545 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2809 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2546 const_iv (GL_POINT_SMOOTH_HINT), 2810 const_iv (GL_POINT_SMOOTH_HINT),
2547 const_iv (GL_LINE_SMOOTH_HINT), 2811 const_iv (GL_LINE_SMOOTH_HINT),
2548 const_iv (GL_POLYGON_SMOOTH_HINT), 2812 const_iv (GL_POLYGON_SMOOTH_HINT),
2549 const_iv (GL_GENERATE_MIPMAP_HINT), 2813 const_iv (GL_GENERATE_MIPMAP_HINT),
2814 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2550 const_iv (GL_FASTEST), 2815 const_iv (GL_FASTEST),
2551 const_iv (GL_DONT_CARE), 2816 const_iv (GL_DONT_CARE),
2552 const_iv (GL_NICEST), 2817 const_iv (GL_NICEST),
2553 const_iv (GL_V2F), 2818 const_iv (GL_V2F),
2554 const_iv (GL_V3F), 2819 const_iv (GL_V3F),
2562 2827
2563 texture_av = newAV (); 2828 texture_av = newAV ();
2564 AvREAL_off (texture_av); 2829 AvREAL_off (texture_av);
2565} 2830}
2566 2831
2832void
2833disable_GL_EXT_blend_func_separate ()
2834 CODE:
2835 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0;
2837
2567char * 2838char *
2568gl_vendor () 2839gl_vendor ()
2569 CODE: 2840 CODE:
2570 RETVAL = (char *)glGetString (GL_VENDOR); 2841 RETVAL = (char *)glGetString (GL_VENDOR);
2571 OUTPUT: 2842 OUTPUT:
2692 2963
2693void glRect (float x1, float y1, float x2, float y2) 2964void glRect (float x1, float y1, float x2, float y2)
2694 CODE: 2965 CODE:
2695 glRectf (x1, y1, x2, y2); 2966 glRectf (x1, y1, x2, y2);
2696 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
2697PROTOTYPES: ENABLE 2977PROTOTYPES: ENABLE
2698 2978
2699void glBegin (int mode) 2979void glBegin (int mode)
2700 2980
2701void glEnd () 2981void glEnd ()
2733void 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)
2734 CODE: 3014 CODE:
2735 if (gl.SeparableFilter2D) 3015 if (gl.SeparableFilter2D)
2736 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3016 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2737 3017
2738void 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)
2739 3019
2740void 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)
2741 3021
2742void glDrawPixels (int width, int height, int format, int type, char *pixels) 3022void glDrawPixels (int width, int height, int format, int type, char *pixels)
2743 3023
2769 3049
2770void glEndList () 3050void glEndList ()
2771 3051
2772void glCallList (int list) 3052void glCallList (int list)
2773 3053
2774MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3054MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2775 3055
2776PROTOTYPES: DISABLE 3056PROTOTYPES: DISABLE
2777 3057
2778void 3058void
2779find_widget (SV *self, NV x, NV y) 3059find_widget (SV *self, NV x, NV y)
2783 XPUSHs (self); 3063 XPUSHs (self);
2784} 3064}
2785 3065
2786BOOT: 3066BOOT:
2787{ 3067{
2788 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3068 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2789 3069
2790 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);
2791 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);
2792 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);
2793 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);
2794} 3074}
2795 3075
2796void 3076void
2797draw (SV *self) 3077draw (SV *self)
2798 CODE: 3078 CODE:
2802 NV x, y, w, h; 3082 NV x, y, w, h;
2803 SV *draw_x_sv = GvSV (draw_x_gv); 3083 SV *draw_x_sv = GvSV (draw_x_gv);
2804 SV *draw_y_sv = GvSV (draw_y_gv); 3084 SV *draw_y_sv = GvSV (draw_y_gv);
2805 SV *draw_w_sv = GvSV (draw_w_gv); 3085 SV *draw_w_sv = GvSV (draw_w_gv);
2806 SV *draw_h_sv = GvSV (draw_h_gv); 3086 SV *draw_h_sv = GvSV (draw_h_gv);
2807 SV *hover;
2808 double draw_x, draw_y, draw_w, draw_h; 3087 double draw_x, draw_y;
2809 3088
2810 if (!SvROK (self)) 3089 if (!SvROK (self))
2811 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3090 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2812 3091
2813 hv = (HV *)SvRV (self); 3092 hv = (HV *)SvRV (self);
2814 3093
2815 if (SvTYPE (hv) != SVt_PVHV) 3094 if (SvTYPE (hv) != SVt_PVHV)
2816 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3095 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2817 3096
2818 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.;
2819 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.;
2820 3099
2821 if (!h || !w) 3100 if (!h || !w)
2841 { 3120 {
2842 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3121 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2843 3122
2844 if (svp && SvTRUE (*svp)) 3123 if (svp && SvTRUE (*svp))
2845 { 3124 {
2846 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);
2847 glEnable (GL_BLEND); 3126 glEnable (GL_BLEND);
2848 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3127 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2849 glBegin (GL_QUADS); 3128 glBegin (GL_QUADS);
2850 glVertex2f (0, 0); 3129 glVertex2f (0, 0);
2851 glVertex2f (w, 0); 3130 glVertex2f (w, 0);
2854 glEnd (); 3133 glEnd ();
2855 glDisable (GL_BLEND); 3134 glDisable (GL_BLEND);
2856 } 3135 }
2857 } 3136 }
2858#if 0 3137#if 0
2859 if ($ENV{CFPLUS_DEBUG} & 1) { 3138 // draw borders, for debugging
2860 glPushMatrix; 3139 glPushMatrix ();
2861 glColor 1, 1, 0, 1; 3140 glColor4f (1., 1., 0., 1.);
2862 glTranslate 0.375, 0.375; 3141 glTranslatef (.5, .5, 0.);
2863 glBegin GL_LINE_LOOP; 3142 glBegin (GL_LINE_LOOP);
2864 glVertex 0 , 0; 3143 glVertex2f (0 , 0);
2865 glVertex $self->{w} - 1, 0; 3144 glVertex2f (w - 1, 0);
2866 glVertex $self->{w} - 1, $self->{h} - 1; 3145 glVertex2f (w - 1, h - 1);
2867 glVertex 0 , $self->{h} - 1; 3146 glVertex2f (0 , h - 1);
2868 glEnd; 3147 glEnd ();
2869 glPopMatrix; 3148 glPopMatrix ();
2870 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2871 }
2872#endif 3149#endif
2873 PUSHMARK (SP); 3150 PUSHMARK (SP);
2874 XPUSHs (self); 3151 XPUSHs (self);
2875 PUTBACK; 3152 PUTBACK;
2876 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