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.295 by root, Mon Dec 21 03:30:22 2009 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 atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
34#include <SDL_endian.h> 38#include <SDL_endian.h>
35#include <SDL_image.h> 39#include <SDL_image.h>
36#include <SDL_mixer.h> 40#include <SDL_mixer.h>
37#include <SDL_opengl.h> 41#include <SDL_opengl.h>
38 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
47
39#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
41 50
42#include <glib/gmacros.h> 51#include <glib/gmacros.h>
43 52
44#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
45 65
46#ifndef _WIN32 66#ifndef _WIN32
47# include <sys/types.h> 67# include <sys/types.h>
48# include <sys/socket.h> 68# include <sys/socket.h>
49# include <netinet/in.h> 69# include <netinet/in.h>
50# include <netinet/tcp.h> 70# include <netinet/tcp.h>
51# include <inttypes.h> 71# include <inttypes.h>
52#endif 72#endif
53 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 84
56#define FOW_DARKNESS 32 85#define FOW_DARKNESS 64
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
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 95
66# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
67#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
68 101
69static AV *texture_av; 102static AV *texture_av;
70 103
71static struct 104static struct
72{ 105{
109 av_push (texture_av, (SV *)(size_t)name); 142 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 143 glDeleteTextures (1, &name);
111} 144}
112 145
113#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
114 148
115#include "pango-font.c" 149#include "pango-font.c"
116#include "pango-fontmap.c" 150#include "pango-fontmap.c"
117#include "pango-render.c" 151#include "pango-render.c"
118 152
119typedef IV CFPlus__Channel; 153typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 154typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
123 157
124typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
125 159
126static int 160static int
127shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
128{ 162{
129 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
143 177
144typedef struct cf_layout { 178typedef struct cf_layout {
145 PangoLayout *pl; 179 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
147 int base_height; 181 int base_height;
148 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
149} *CFPlus__Layout; 184} *DC__Layout;
150 185
151static CFPlus__Font default_font; 186static DC__Font default_font;
152static PangoContext *opengl_context; 187static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
154 189
155static void 190static void
156substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
161#endif 196#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 198}
164 199
165static void 200static void
166layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
167{ 202{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
170 */ 205 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
172 207
173 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 210
176 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
177} 212}
178 213
179static void 214static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 216{
182 PangoRectangle rect; 217 PangoRectangle rect;
183 218
184 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
196 231
197typedef uint16_t tileid; 232typedef uint16_t tileid;
198typedef uint16_t faceid; 233typedef uint16_t faceid;
199 234
200typedef struct { 235typedef struct {
201 int name; 236 GLuint name;
202 int w, h; 237 int w, h;
203 float s, t; 238 float s, t;
204 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
205 tileid smoothtile; 240 tileid smoothtile;
206 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
207} maptex; 243} maptex;
208 244
209typedef struct { 245typedef struct {
210 uint32_t player; 246 uint32_t player;
211 tileid tile[3]; 247 tileid tile[3];
224 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
226 262
227 int32_t rows; 263 int32_t rows;
228 maprow *row; 264 maprow *row;
229} *CFPlus__Map; 265} *DC__Map;
230 266
231static char * 267static char *
232prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
233{ 269{
234 char *p; 270 char *p;
272 self->texs *= 2; 308 self->texs *= 2;
273 } 309 }
274} 310}
275 311
276static maprow * 312static maprow *
277map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
278{ 314{
279 if (0 > y) 315 if (0 > y)
280 { 316 {
281 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
320 356
321 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
322} 358}
323 359
324static mapcell * 360static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
326{ 362{
327 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
328} 364}
329 365
330static void 366static void
331map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
332{ 368{
333 int r; 369 int r;
334 370
335 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
343 self->oy = 0; 379 self->oy = 0;
344 self->row = 0; 380 self->row = 0;
345 self->rows = 0; 381 self->rows = 0;
346} 382}
347 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
348static void 394static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 396{
351 int x, y; 397 int x, y;
352 maprow *row; 398 maprow *row;
353 mapcell *cell; 399 mapcell *cell;
354 400
366 if (x >= row->c1) 412 if (x >= row->c1)
367 break; 413 break;
368 414
369 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
370 416
371 cell->darkness = 0; 417 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 418 }
376 } 419 }
377} 420}
378 421
379typedef struct { 422typedef struct {
433 n |= n >> 16; 476 n |= n >> 16;
434 477
435 return n + 1; 478 return n + 1;
436} 479}
437 480
481static unsigned int
482popcount (unsigned int n)
483{
484 n -= (n >> 1) & 0x55555555U;
485 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486 n = ((n >> 4) + n) & 0x0f0f0f0fU;
487 n *= 0x01010101U;
488
489 return n >> 24;
490}
491
438/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
441 495
442/******************************************************************************/ 496/******************************************************************************/
480 return 0; 534 return 0;
481 535
482 return 1; 536 return 1;
483} 537}
484 538
485MODULE = CFPlus PACKAGE = CFPlus 539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
590
591MODULE = Deliantra::Client PACKAGE = DC
486 592
487PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
488 594
489BOOT: 595BOOT:
490{ 596{
491 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 598 static const struct {
493 const char *name; 599 const char *name;
494 IV iv; 600 IV iv;
495 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
518 624
519 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
522 628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
678
679 const_iv (SDLK_FIRST),
680 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
762
763 const_iv (KMOD_LRAM),
764
765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
604# undef const_iv 795# undef const_iv
605 }; 796 };
606 797
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 817
627NV floor (NV x) 818NV floor (NV x)
628 819
629NV ceil (NV x) 820NV ceil (NV x)
630 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
826NV distance (NV dx, NV dy)
827 CODE:
828 RETVAL = pow (dx * dx + dy * dy, 0.5);
829 OUTPUT:
830 RETVAL
831
631void 832void
632pango_init () 833pango_init ()
633 CODE: 834 CODE:
634{ 835{
635 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 837 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); 838 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
839 /*pango_context_set_font_description (opengl_context, default_font);*/
840#if PANGO_VERSION_CHECK (1, 15, 2)
841 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
842 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
843#endif
638} 844}
639 845
640char *
641SDL_GetError () 846char *SDL_GetError ()
642 847
643int 848void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 849
646void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
647SDL_Quit () 856void SDL_Quit ()
857
858int SDL_GL_SetAttribute (int attr, int value)
859
860int SDL_GL_GetAttribute (int attr)
861 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL))
863 XSRETURN_UNDEF;
864 OUTPUT:
865 RETVAL
648 866
649void 867void
650SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
651 PPCODE: 869 PPCODE:
652{ 870{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 885
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 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); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 888
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 890
676 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
677 while (*m) 892 while (*m)
678 { 893 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 895 {
681 AV *av = newAV (); 896 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
708 923
709 if (RETVAL) 924 if (RETVAL)
710 { 925 {
711 av_clear (texture_av); 926 av_clear (texture_av);
712 927
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 930#include "glfunc.h"
716#undef GL_FUNC 931#undef GL_FUNC
717 } 932 }
718} 933}
725char * 940char *
726SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
727 942
728int 943int
729SDL_GetAppState () 944SDL_GetAppState ()
945
946int
947SDL_GetModState ()
730 948
731void 949void
732poll_events () 950poll_events ()
733 PPCODE: 951 PPCODE:
734{ 952{
744 { 962 {
745 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
746 case SDL_KEYUP: 964 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 967 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 968 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 970 break;
753 971
754 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 991 x = ev.motion.x;
774 y = ev.motion.y; 992 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 994 }
777 995
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 1002 }
785 break; 1003 break;
786 1004
787 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 1008
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1017 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1018 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1019 break;
802 } 1020 }
803 1021
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 1023 }
806} 1024}
807 1025
808int 1026int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 1028 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1029 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1030 Mix_ChannelFinished (channel_finished);
813 1031
814void 1032void
1033Mix_QuerySpec ()
1034 PPCODE:
1035{
1036 int freq, channels;
1037 Uint16 format;
1038
1039 if (Mix_QuerySpec (&freq, &format, &channels))
1040 {
1041 EXTEND (SP, 3);
1042 PUSHs (sv_2mortal (newSViv (freq)));
1043 PUSHs (sv_2mortal (newSViv (format)));
1044 PUSHs (sv_2mortal (newSViv (channels)));
1045 }
1046}
1047
1048void
815Mix_CloseAudio () 1049Mix_CloseAudio ()
816 1050
817int 1051int
818Mix_AllocateChannels (int numchans = -1) 1052Mix_AllocateChannels (int numchans = -1)
1053
1054const char *
1055Mix_GetError ()
819 1056
820void 1057void
821lowdelay (int fd, int val = 1) 1058lowdelay (int fd, int val = 1)
822 CODE: 1059 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1060 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1086 }
850 } 1087 }
851#endif 1088#endif
852} 1089}
853 1090
854void 1091int
855add_font (char *file) 1092add_font (char *file)
856 CODE: 1093 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
858 1097
859void 1098void
860load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
861 ALIAS: 1100 ALIAS:
862 load_image_file = 1 1101 load_image_file = 1
948void 1187void
949error (char *message) 1188error (char *message)
950 CODE: 1189 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1190 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1191#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1192 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1193#endif
955 1194
956void 1195void
957fatal (char *message) 1196fatal (char *message)
958 CODE: 1197 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1198 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1199#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1200 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1201#endif
963 _exit (1); 1202 _exit (1);
964 1203
965void 1204void
966_exit (int retval = 0) 1205_exit (int retval = 0)
978#if DEBUG 1217#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
980#endif 1219#endif
981} 1220}
982 1221
983MODULE = CFPlus PACKAGE = CFPlus::Font 1222int
1223SvREFCNT (SV *sv)
1224 CODE:
1225 RETVAL = SvREFCNT (sv);
1226 OUTPUT:
1227 RETVAL
1228
1229MODULE = Deliantra::Client PACKAGE = DC::Font
984 1230
985PROTOTYPES: DISABLE 1231PROTOTYPES: DISABLE
986 1232
987CFPlus::Font 1233DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1234new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1235 CODE:
990{ 1236{
991 int count; 1237 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1241}
996 OUTPUT: 1242 OUTPUT:
997 RETVAL 1243 RETVAL
998 1244
999void 1245void
1000DESTROY (CFPlus::Font self) 1246DESTROY (DC::Font self)
1001 CODE: 1247 CODE:
1002 pango_font_description_free (self); 1248 pango_font_description_free (self);
1003 1249
1004void 1250void
1005make_default (CFPlus::Font self) 1251make_default (DC::Font self)
1006 PROTOTYPE: $ 1252 PROTOTYPE: $
1007 CODE: 1253 CODE:
1008 default_font = self; 1254 default_font = self;
1009 1255
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1256MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1257
1012PROTOTYPES: DISABLE 1258PROTOTYPES: DISABLE
1013 1259
1014void 1260void
1015reset_glyph_cache () 1261glyph_cache_backup ()
1016 PROTOTYPE: 1262 PROTOTYPE:
1017 CODE: 1263 CODE:
1264 tc_backup ();
1265
1266void
1267glyph_cache_restore ()
1268 PROTOTYPE:
1269 CODE:
1018 tc_clear (); 1270 tc_restore ();
1019 1271
1020CFPlus::Layout 1272DC::Layout
1021new (SV *class) 1273new (SV *class)
1022 CODE: 1274 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1275 New (0, RETVAL, 1, struct cf_layout);
1024 1276
1025 RETVAL->pl = pango_layout_new (opengl_context); 1277 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1279 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1280 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1281 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1282 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1283 RETVAL->font = 0;
1284 RETVAL->rc = rc_alloc ();
1032 1285
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1286 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1287 layout_update_font (RETVAL);
1035 OUTPUT: 1288 OUTPUT:
1036 RETVAL 1289 RETVAL
1037 1290
1038void 1291void
1039DESTROY (CFPlus::Layout self) 1292DESTROY (DC::Layout self)
1040 CODE: 1293 CODE:
1041 g_object_unref (self->pl); 1294 g_object_unref (self->pl);
1295 rc_free (self->rc);
1042 Safefree (self); 1296 Safefree (self);
1043 1297
1044void 1298void
1045set_text (CFPlus::Layout self, SV *text_) 1299set_text (DC::Layout self, SV *text_)
1046 CODE: 1300 CODE:
1047{ 1301{
1048 STRLEN textlen; 1302 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1050 1304
1051 pango_layout_set_text (self->pl, text, textlen); 1305 pango_layout_set_text (self->pl, text, textlen);
1052} 1306}
1053 1307
1054void 1308void
1055set_markup (CFPlus::Layout self, SV *text_) 1309set_markup (DC::Layout self, SV *text_)
1056 CODE: 1310 CODE:
1057{ 1311{
1058 STRLEN textlen; 1312 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1313 char *text = SvPVutf8 (text_, textlen);
1060 1314
1061 pango_layout_set_markup (self->pl, text, textlen); 1315 pango_layout_set_markup (self->pl, text, textlen);
1062} 1316}
1063 1317
1064void 1318void
1065set_shapes (CFPlus::Layout self, ...) 1319set_shapes (DC::Layout self, ...)
1066 CODE: 1320 CODE:
1067{ 1321{
1068 PangoAttrList *attrs = 0; 1322 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1323 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1324 const char *pos = text;
1105 if (attrs) 1359 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1360 pango_layout_set_attributes (self->pl, attrs);
1107} 1361}
1108 1362
1109void 1363void
1110get_shapes (CFPlus::Layout self) 1364get_shapes (DC::Layout self)
1111 PPCODE: 1365 PPCODE:
1112{ 1366{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1368
1115 do 1369 do
1116 { 1370 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1372
1119 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1120 { 1374 {
1121 PangoRectangle extents; 1375 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1384
1131 pango_layout_iter_free (iter); 1385 pango_layout_iter_free (iter);
1132} 1386}
1133 1387
1134int 1388int
1135has_wrapped (CFPlus::Layout self) 1389has_wrapped (DC::Layout self)
1136 CODE: 1390 CODE:
1137{ 1391{
1138 int lines = 1; 1392 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1393 const char *text = pango_layout_get_text (self->pl);
1140 1394
1145} 1399}
1146 OUTPUT: 1400 OUTPUT:
1147 RETVAL 1401 RETVAL
1148 1402
1149SV * 1403SV *
1150get_text (CFPlus::Layout self) 1404get_text (DC::Layout self)
1151 CODE: 1405 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1406 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1407 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1408 OUTPUT:
1155 RETVAL 1409 RETVAL
1156 1410
1157void 1411void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1412set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1413 CODE:
1160 self->r = r; 1414 self->r = r;
1161 self->g = g; 1415 self->g = g;
1162 self->b = b; 1416 self->b = b;
1163 self->a = a; 1417 self->a = a;
1164 1418
1165void 1419void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1420set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1421 CODE:
1168 if (self->font != font) 1422 if (self->font != font)
1169 { 1423 {
1170 self->font = font; 1424 self->font = font;
1171 layout_update_font (self); 1425 layout_update_font (self);
1172 } 1426 }
1173 1427
1174void 1428void
1175set_height (CFPlus::Layout self, int base_height) 1429set_height (DC::Layout self, int base_height)
1176 CODE: 1430 CODE:
1177 if (self->base_height != base_height) 1431 if (self->base_height != base_height)
1178 { 1432 {
1179 self->base_height = base_height; 1433 self->base_height = base_height;
1180 layout_update_font (self); 1434 layout_update_font (self);
1181 } 1435 }
1182 1436
1183void 1437void
1184set_width (CFPlus::Layout self, int max_width = -1) 1438set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1439 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1440 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1441
1188void 1442void
1189set_indent (CFPlus::Layout self, int indent) 1443set_indent (DC::Layout self, int indent)
1190 CODE: 1444 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1445 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1446
1193void 1447void
1194set_spacing (CFPlus::Layout self, int spacing) 1448set_spacing (DC::Layout self, int spacing)
1195 CODE: 1449 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1450 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1451
1198void 1452void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1453set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1454 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1455 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1456 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1457 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1458 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1459 : PANGO_ELLIPSIZE_NONE
1206 ); 1460 );
1207 1461
1208void 1462void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1463set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1464 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1465 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1466
1213void 1467void
1214size (CFPlus::Layout self) 1468size (DC::Layout self)
1215 PPCODE: 1469 PPCODE:
1216{ 1470{
1217 int w, h; 1471 int w, h;
1218 1472
1219 layout_get_pixel_size (self, &w, &h); 1473 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1476 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1477 PUSHs (sv_2mortal (newSViv (h)));
1224} 1478}
1225 1479
1226int 1480int
1227descent (CFPlus::Layout self) 1481descent (DC::Layout self)
1228 CODE: 1482 CODE:
1229{ 1483{
1230 PangoRectangle rect; 1484 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1234} 1488}
1235 OUTPUT: 1489 OUTPUT:
1236 RETVAL 1490 RETVAL
1237 1491
1238int 1492int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1493xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1494 CODE:
1241{ 1495{
1242 int index, trailing; 1496 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1497 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1498 RETVAL = index + trailing;
1245} 1499}
1246 OUTPUT: 1500 OUTPUT:
1247 RETVAL 1501 RETVAL
1248 1502
1249void 1503void
1250cursor_pos (CFPlus::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1505 PPCODE:
1252{ 1506{
1253 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1509
1256 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1514}
1261 1515
1262void 1516void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1518 PPCODE:
1265{ 1519{
1266 int line, x; 1520 int line, x;
1267 1521
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1522 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1523#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1524 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1525 --line;
1526#endif
1271 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1528 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1529 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1530}
1275 1531
1276void 1532void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1533line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1534 PPCODE:
1279{ 1535{
1280 PangoLayoutLine *lp; 1536 PangoLayoutLine *lp;
1281 int index, trailing; 1537 int index, trailing;
1282 1538
1283 if (line < 0) 1539 if (line < 0)
1284 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1285 1541
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1288 1544
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1545 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1546
1291 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1553 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1554 }
1299} 1555}
1300 1556
1301void 1557void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1558render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1559 CODE:
1560 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1561 pango_opengl_render_layout_subpixel (
1305 self->pl, 1562 self->pl,
1563 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1564 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1565 self->r, self->g, self->b, self->a,
1308 flags 1566 flags
1309 ); 1567 );
1568 // we assume that context_change actually clears/frees stuff
1569 // and does not do any recomputation...
1570 pango_layout_context_changed (self->pl);
1310 1571
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1572void
1573draw (DC::Layout self)
1574 CODE:
1575{
1576 glEnable (GL_TEXTURE_2D);
1577 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1578 glEnable (GL_BLEND);
1579 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1580 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1581 glEnable (GL_ALPHA_TEST);
1582 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1583
1584 rc_draw (self->rc);
1585
1586 glDisable (GL_ALPHA_TEST);
1587 glDisable (GL_BLEND);
1588 glDisable (GL_TEXTURE_2D);
1589}
1590
1591MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1592
1313PROTOTYPES: ENABLE 1593PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1594
1317void 1595void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1596pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1597 CODE:
1320{ 1598{
1347 HV *hv = (HV *)SvRV (self); 1625 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1626 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1627 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1628 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1629
1630 if (name <= 0)
1631 XSRETURN_EMPTY;
1632
1352 if (items < 5) 1633 if (items < 5)
1353 { 1634 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1635 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1636 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1637 }
1383 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1385 } 1666 }
1386} 1667}
1387 1668
1669void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1671 PROTOTYPE: @
1672 CODE:
1673{
1674 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.);
1682
1683 if (blend > 0.f)
1684 {
1685 float S2, T2; /* 0. 0. for texture 2 */
1686 float w = w1 > w2 ? w1 : w2;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1734 glEnd ();
1735
1736 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0);
1738 }
1739 else
1740 {
1741 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743
1744 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1749 glEnd ();
1750 }
1751
1752 glPopMatrix ();
1753
1754 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND);
1756}
1757
1388IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1758IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1389 CODE: 1759 CODE:
1390{ 1760{
1391 GLint width; 1761 GLint width;
1392 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1762 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1394 RETVAL = width > 0; 1764 RETVAL = width > 0;
1395} 1765}
1396 OUTPUT: 1766 OUTPUT:
1397 RETVAL 1767 RETVAL
1398 1768
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1769MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1770
1401PROTOTYPES: DISABLE 1771PROTOTYPES: DISABLE
1402 1772
1403CFPlus::Map 1773DC::Map
1404new (SV *class) 1774new (SV *class)
1405 CODE: 1775 CODE:
1406 New (0, RETVAL, 1, struct map); 1776 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1777 RETVAL->x = 0;
1408 RETVAL->y = 0; 1778 RETVAL->y = 0;
1416 RETVAL->row = 0; 1786 RETVAL->row = 0;
1417 OUTPUT: 1787 OUTPUT:
1418 RETVAL 1788 RETVAL
1419 1789
1420void 1790void
1421DESTROY (CFPlus::Map self) 1791DESTROY (DC::Map self)
1422 CODE: 1792 CODE:
1423{ 1793{
1424 map_clear (self); 1794 map_clear (self);
1425 Safefree (self->face2tile); 1795 Safefree (self->face2tile);
1426 Safefree (self->tex); 1796 Safefree (self->tex);
1427 Safefree (self); 1797 Safefree (self);
1428} 1798}
1429 1799
1430void 1800void
1431resize (CFPlus::Map self, int map_width, int map_height) 1801resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1802 CODE:
1433 self->w = map_width; 1803 self->w = map_width;
1434 self->h = map_height; 1804 self->h = map_height;
1435 1805
1436void 1806void
1437clear (CFPlus::Map self) 1807clear (DC::Map self)
1438 CODE: 1808 CODE:
1439 map_clear (self); 1809 map_clear (self);
1440 1810
1441void 1811void
1442set_tileid (CFPlus::Map self, int face, int tile) 1812set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1813 CODE:
1444{ 1814{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1815 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1816 need_texid (self, tile);
1447} 1817}
1448 1818
1449void 1819void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1820set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1821 CODE:
1452{ 1822{
1453 tileid texid; 1823 tileid texid;
1454 maptex *tex; 1824 maptex *tex;
1455 1825
1468 tex->smoothtile = self->face2tile [smooth]; 1838 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1839 tex->smoothlevel = level;
1470} 1840}
1471 1841
1472void 1842void
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) 1843set_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: 1844 CODE:
1475{ 1845{
1476 need_texid (self, texid); 1846 need_texid (self, texid);
1477 1847
1478 { 1848 {
1497 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1498 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1870}
1501 1871
1872void
1873expire_textures (DC::Map self, int texid, int count)
1874 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count)
1876 {
1877 maptex *tex = self->tex + texid;
1878
1879 if (tex->name)
1880 {
1881 if (tex->unused)
1882 {
1883 tex->name = 0;
1884 tex->unused = 0;
1885 XPUSHs (sv_2mortal (newSViv (texid)));
1886 }
1887 else
1888 tex->unused = 1;
1889 }
1890 }
1891
1502int 1892int
1503ox (CFPlus::Map self) 1893ox (DC::Map self)
1504 ALIAS: 1894 ALIAS:
1505 oy = 1 1895 oy = 1
1506 x = 2 1896 x = 2
1507 y = 3 1897 y = 3
1508 w = 4 1898 w = 4
1519 } 1909 }
1520 OUTPUT: 1910 OUTPUT:
1521 RETVAL 1911 RETVAL
1522 1912
1523void 1913void
1524scroll (CFPlus::Map self, int dx, int dy) 1914scroll (DC::Map self, int dx, int dy)
1525 CODE: 1915 CODE:
1526{ 1916{
1527 if (dx > 0) 1917 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1918 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1919 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1934 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1935 self->y += MAP_EXTEND_Y;
1546 } 1936 }
1547} 1937}
1548 1938
1549void 1939SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1940map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1941 CODE:
1552{ 1942{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1944 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1945 mapcell *cell;
1556 int x, y, flags; 1946 int x, y, z, flags;
1947 AV *missing = newAV ();
1948 RETVAL = newRV_noinc ((SV *)missing);
1557 1949
1558 while (data < data_end - 1) 1950 while (data < data_end - 1)
1559 { 1951 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1952 flags = (data [0] << 8) + data [1]; data += 2;
1561 1953
1581 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1582 1974
1583 do 1975 do
1584 { 1976 {
1585 ext = *data++; 1977 ext = *data++;
1586 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1587 1979
1588 if (cmd < 4) 1980 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1591 { 1983 {
1594 } 1986 }
1595 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1598 { 1990 {
1599 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 1995
1602 data += *data + 1; 1996 data += *data + 1;
1603 } 1997 }
1604 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1999 cell->flags = *data++;
1612 } 2006 }
1613 else 2007 else
1614 cell->darkness = *data++ + 1; 2008 cell->darkness = *data++ + 1;
1615 } 2009 }
1616 2010
2011 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 2012 if (flags & (4 >> z))
1618 { 2013 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 2014 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 2015 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 2016 cell->tile [z] = self->face2tile [face];
2017
2018 if (cell->tile [z])
2019 {
2020 maptex *tex = self->tex + cell->tile [z];
2021 tex->unused = 0;
2022 if (!tex->name)
2023 av_push (missing, newSViv (cell->tile [z]));
2024
2025 if (tex->smoothtile)
2026 {
2027 maptex *smooth = self->tex + tex->smoothtile;
2028 smooth->unused = 0;
2029 if (!smooth->name)
2030 av_push (missing, newSViv (tex->smoothtile));
2031 }
2032 }
1622 } 2033 }
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 } 2034 }
1638 else 2035 else
1639 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1640 } 2037 }
1641} 2038}
2039 OUTPUT:
2040 RETVAL
1642 2041
1643SV * 2042SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2043mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 2044 CODE:
1646{ 2045{
1647 int x1, x; 2046 int x1, x;
1648 int y1, y; 2047 int y1, y;
1649 int z; 2048 int z;
1694} 2093}
1695 OUTPUT: 2094 OUTPUT:
1696 RETVAL 2095 RETVAL
1697 2096
1698void 2097void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1700 CODE: 2099 CODE:
1701{ 2100{
2101 int x, y, z;
2102
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2104 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) 2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 2106 smooth_key skey;
1706 int x, y, z; 2107 int pl_x, pl_y;
1707 int last_name; 2108 maptex pl_tex;
2109 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden;
1708 2113
2114 pl_tex.name = 0;
2115
1709 // thats current max. sorry. 2116 // that's current max. sorry.
1710 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1712 2119
1713 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
1715 2122
1716 glColor4ub (255, 255, 255, 255); 2123 memset (&key, 0, sizeof (key));
1717 2124 key.r = 255;
1718 glEnable (GL_BLEND); 2125 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2126 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 2127 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2128 key.mode = GL_QUADS;
1722 2129 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS);
1724
1725 last_name = 0;
1726 2130
1727 mx += self->x; 2131 mx += self->x;
1728 my += self->y; 2132 my += self->y;
1729 2133
1730 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2151 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2152 self->tex [cell->tile [2]].smoothlevel));
1749 } 2153 }
1750 } 2154 }
1751 2155
2156 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
1752 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1753 { 2164 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1755 2167
1756 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1757 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1758 { 2170 {
1759 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
1765 tileid tile = cell->tile [z]; 2177 tileid tile = cell->tile [z];
1766 2178
1767 if (tile) 2179 if (tile)
1768 { 2180 {
1769 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2182 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 2183
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2184 if (key.texname != tex.name)
1776 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1777 if (!tex.name) 2188 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1779 2190
1780 glEnd (); 2191 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2192 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2193 }
1784 2194
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2195 px = (x + 1) * T - tex.w;
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2196 py = (y + 1) * T - 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 2197
1790 if (cell->flags && z == 2) 2198 if (expect_false (cell->player == player) && expect_false (z == 2))
1791 { 2199 {
1792 if (cell->flags & 1) 2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
1793 { 2203 continue;
1794 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32;
1797
1798 glEnd ();
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1800 glBegin (GL_QUADS);
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 }
1807 } 2204 }
2205
2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2207 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2208 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2209 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1808 2210
1809 // update smooth hash 2211 // update smooth hash
1810 if (tex.smoothtile) 2212 if (tex.smoothtile)
1811 { 2213 {
1812 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
1843 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1844 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1845 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1846 } 2248 }
1847 } 2249 }
2250
2251 if (expect_false (z == 2))
2252 {
2253 /* draw question marks on top of hidden spaces */
2254 if (!cell->darkness)
2255 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32;
2275 int py = y * T - T * 6 / 32;
2276
2277 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov);
2279
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2284 }
2285 }
2286 }
1848 } 2287 }
1849 } 2288 }
2289
2290 rc_draw (rc);
2291 rc_clear (rc);
1850 2292
1851 // go through all smoothlevels, lowest to highest, then draw. 2293 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2294 // this is basically counting sort
1853 { 2295 {
1854 int w, b; 2296 int w, b;
1855 2297
2298 glEnable (GL_TEXTURE_2D);
2299 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2300 for (w = 0; w < 256 / 32; ++w)
1857 { 2301 {
1858 uint32_t smask = smooth_level [w]; 2302 uint32_t smask = smooth_level [w];
1859 if (smask) 2303 if (smask)
1860 for (b = 0; b < 32; ++b) 2304 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2323 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2324 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2325 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2326 float dy = tex.t * .5f ; // 2 images/column
1883 2327
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2328 if (tex.name)
1887 { 2329 {
2330 // this time avoiding texture state changes
2331 // save gobs of state changes.
1888 if (!tex.name) 2332 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2333 {
2334 self->tex [skey->tile].unused = 0;
1890 2335
1891 glEnd (); 2336 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
1894 } 2339 }
1895 2340
1896 if (border) 2341 if (border)
1897 { 2342 {
1898 float ox = border * dx; 2343 float ox = border * dx;
1899 2344
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2349 }
1905 2350
1906 if (corner) 2351 if (corner)
1907 { 2352 {
1908 float ox = corner * dx; 2353 float ox = corner * dx;
1909 2354
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2355 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2359 }
1914 } 2360 }
1915 } 2361 }
1916 } 2362 }
1917 } 2363 }
1918 } 2364 }
2365
2366 glEnd ();
2367 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1;
1919 } 2369 }
1920 2370
1921 hv_clear (smooth); 2371 hv_clear (smooth);
1922 } 2372 }
1923 2373
1924 glEnd (); 2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
1925 2379
1926 glDisable (GL_TEXTURE_2D); 2380 key.texname = tex.name;
2381 arr = rc_array (rc, &key);
2382
2383 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2384 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2385 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2386 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2387
2388 rc_draw (rc);
2389 }
2390
2391 rc_draw (rc_ov);
2392 rc_clear (rc_ov);
2393
1927 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
2395 rc_free (rc);
2396 rc_free (rc_ov);
1928 2397
1929 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
1932 { 2401 {
1937 { 2406 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
1939 2408
1940 int px = x * T; 2409 int px = x * T;
1941 int py = y * T; 2410 int py = y * T;
2411
2412 if (expect_false (cell->player == player))
2413 {
2414 px += sdx;
2415 py += sdy;
2416 }
1942 2417
1943 if (cell->stat_hp) 2418 if (cell->stat_hp)
1944 { 2419 {
1945 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1957 } 2432 }
1958 } 2433 }
1959} 2434}
1960 2435
1961void 2436void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2437draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1963 CODE: 2438 CODE:
1964{ 2439{
1965 static float color[16][3] = { 2440 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
1967 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
1968 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
1969 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
1970 2445
1971 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
1972 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
1973 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
1974 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
1975 2450
1976 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
1977 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
1978 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
1979 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
1980 2455
1981 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
1982 2457
1983 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
1984 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
1985 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
1986 }; 2461 };
1987 2462
1988 int x, y; 2463 int x, y;
1989 2464
1990 glEnable (GL_TEXTURE_2D); 2465 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia.
2471 */
1991 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1992 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
1993 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1994 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
1995 2476
1996 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
2000 2481
2001 if (m) 2482 if (m)
2002 { 2483 {
2003 float *c = color [m & 15]; 2484 float *c = color [m & 15];
2004 2485
2005 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
2006 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
2007 2488
2008 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
2009 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2010 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2011 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2012 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2013 } 2494 }
2017 glDisable (GL_BLEND); 2498 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2499 glDisable (GL_TEXTURE_2D);
2019} 2500}
2020 2501
2021void 2502void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2503fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2504 PPCODE:
2024{ 2505{
2025 int x, y; 2506 int x, y;
2026 int sw1 = sw + 2; 2507 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2508 int sh1 = sh + 2;
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
2036 2517
2037 mx += self->x - 1; 2518 mx += self->x - 1;
2038 my += self->y - 1; 2519 my += self->y - 1;
2039 2520
2040 memset (darkness1, 255, sw1 * sh1); 2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2041 2522
2042 for (y = 0; y < sh1; y++) 2523 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
2044 { 2525 {
2045 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
2048 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2049 { 2530 {
2050 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2051 2532
2052 darkness1 [y * sw1 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2053 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2054 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2055 } 2536 }
2056 } 2537 }
2057 2538
2058 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2059 for (x = 0; x < sw; ++x) 2540 for (x = 0; x < sw; ++x)
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2579 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2580 PUSHs (darkness3_sv);
2100} 2581}
2101 2582
2102SV * 2583SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2584get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2585 CODE:
2105{ 2586{
2106 int x, y, x1, y1; 2587 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2588 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2589 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2646 else
2166 *data++ = 0; 2647 *data++ = 0;
2167 } 2648 }
2168 } 2649 }
2169 2650
2651 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 {
2170 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2172 RETVAL = data_sv; 2658 RETVAL = data_sv;
2173} 2659}
2174 OUTPUT: 2660 OUTPUT:
2175 RETVAL 2661 RETVAL
2176 2662
2177void 2663void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2665 PPCODE:
2180{ 2666{
2181 int x, y, z; 2667 int x, y, z;
2182 int w, h; 2668 int w, h;
2183 int x1, y1; 2669 int x1, y1;
2670 STRLEN len;
2671 uint8_t *data, *end;
2672
2673 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv);
2676 end = data + len + 8;
2677
2678 if (len < 5)
2679 XSRETURN_EMPTY;
2184 2680
2185 if (*data++ != 0) 2681 if (*data++ != 0)
2186 return; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2187 2683
2188 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2685 h = *data++ << 8; h |= *data++;
2190 2686
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2687 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2699 {
2204 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2205 2701
2206 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2207 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2208 uint8_t flags = *data++; 2709 flags = *data++;
2209 2710
2210 if (flags) 2711 if (flags)
2211 { 2712 {
2212 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2719
2219 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2220 { 2721 {
2221 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2222 2724
2223 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2224 { 2726 {
2225 tileid t = tile [z]; 2727 tileid t = tile [z];
2226 2728
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2730 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2732 need_texid (self, t);
2231 } 2733 }
2232 2734
2233 cell->tile [z] = t; 2735 cell->tile [z] = t;
2234 } 2736 }
2236 } 2738 }
2237 } 2739 }
2238 } 2740 }
2239} 2741}
2240 2742
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2743MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2744
2243CFPlus::RW 2745DC::RW
2244new (SV *class, SV *data_sv) 2746new (SV *class, SV *data_sv)
2245 CODE: 2747 CODE:
2246{ 2748{
2247 STRLEN datalen; 2749 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2750 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2752 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2753}
2252 OUTPUT: 2754 OUTPUT:
2253 RETVAL 2755 RETVAL
2254 2756
2255CFPlus::RW 2757DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2758new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2759 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2760 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2761 OUTPUT:
2260 RETVAL 2762 RETVAL
2261 2763
2764# fails on win32:
2765# dc.xs(2268) : error C2059: syntax error : '('
2262void 2766#void
2263close (CFPlus::RW self) 2767#close (DC::RW self)
2264 CODE: 2768# CODE:
2265 SDL_RWclose (self); 2769# (self->(close)) (self);
2266 2770
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2771MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2772
2269PROTOTYPES: DISABLE 2773PROTOTYPES: DISABLE
2270 2774
2271int 2775DC::Channel
2272volume (CFPlus::Channel self, int volume) 2776find ()
2273 CODE: 2777 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2778{
2779 RETVAL = Mix_GroupAvailable (-1);
2780
2781 if (RETVAL < 0)
2782 {
2783 RETVAL = Mix_GroupOldest (-1);
2784
2785 if (RETVAL < 0)
2786 XSRETURN_UNDEF;
2787
2788 Mix_HaltChannel (RETVAL);
2789 }
2790
2791 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128);
2793}
2275 OUTPUT: 2794 OUTPUT:
2276 RETVAL 2795 RETVAL
2277 2796
2797void
2798halt (DC::Channel self)
2799 CODE:
2800 Mix_HaltChannel (self);
2801
2802void
2803expire (DC::Channel self, int ticks = -1)
2804 CODE:
2805 Mix_ExpireChannel (self, ticks);
2806
2807void
2808fade_out (DC::Channel self, int ticks = -1)
2809 CODE:
2810 Mix_FadeOutChannel (self, ticks);
2811
2278int 2812int
2279unregister_all_effects (CFPlus::Channel self) 2813volume (DC::Channel self, int volume)
2280 CODE: 2814 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2815 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2282 OUTPUT: 2816 OUTPUT:
2283 RETVAL 2817 RETVAL
2284 2818
2285int 2819void
2820unregister_all_effects (DC::Channel self)
2821 CODE:
2822 Mix_UnregisterAllEffects (self);
2823
2824void
2286set_panning (CFPlus::Channel self, int left, int right) 2825set_panning (DC::Channel self, int left, int right)
2287 CODE: 2826 CODE:
2827 left = CLAMP (left , 0, 255);
2828 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2829 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2830
2292int 2831void
2293set_distance (CFPlus::Channel self, int distance) 2832set_distance (DC::Channel self, int distance)
2294 CODE: 2833 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2834 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2835
2299int 2836void
2300set_position (CFPlus::Channel self, int angle, int distance) 2837set_position (DC::Channel self, int angle, int distance)
2301 CODE: 2838 CODE:
2839
2840void
2841set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2842 CODE:
2843{
2844 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2845 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2846 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2847}
2304 RETVAL
2305 2848
2306int 2849void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2850set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2851 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2852 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2853
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2855
2315PROTOTYPES: DISABLE 2856PROTOTYPES: DISABLE
2316 2857
2317CFPlus::MixChunk 2858DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2859new (SV *class, DC::RW rwops)
2319 CODE: 2860 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2861 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2862 OUTPUT:
2322 RETVAL 2863 RETVAL
2323 2864
2324void 2865void
2325DESTROY (CFPlus::MixChunk self) 2866DESTROY (DC::MixChunk self)
2326 CODE: 2867 CODE:
2327 Mix_FreeChunk (self); 2868 Mix_FreeChunk (self);
2328 2869
2329int 2870int
2330volume (CFPlus::MixChunk self, int volume = -1) 2871volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2872 CODE:
2873 if (items > 1)
2874 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2875 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2876 OUTPUT:
2334 RETVAL 2877 RETVAL
2335 2878
2336CFPlus::Channel 2879DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2880play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2881 CODE:
2882{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2884
2885 if (RETVAL < 0)
2886 XSRETURN_UNDEF;
2887
2888 if (channel < 0)
2889 {
2340 Mix_UnregisterAllEffects (RETVAL); 2890 Mix_UnregisterAllEffects (RETVAL);
2891 Mix_Volume (RETVAL, 128);
2892 }
2893}
2341 OUTPUT: 2894 OUTPUT:
2342 RETVAL 2895 RETVAL
2343 2896
2344MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2345 2898
2346int 2899int
2347volume (int volume = -1) 2900volume (int volume = -1)
2348 PROTOTYPE: ;$ 2901 PROTOTYPE: ;$
2349 CODE: 2902 CODE:
2903 if (items > 0)
2904 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 2905 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 2906 OUTPUT:
2352 RETVAL 2907 RETVAL
2353 2908
2354int 2909void
2355fade_out (int ms) 2910fade_out (int ms)
2356 CODE: 2911 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 2912 Mix_FadeOutMusic (ms);
2358 OUTPUT:
2359 RETVAL
2360 2913
2361void 2914void
2362halt () 2915halt ()
2363 CODE: 2916 CODE:
2364 Mix_HaltMusic (); 2917 Mix_HaltMusic ();
2365 2918
2366CFPlus::MixMusic 2919DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 2920new (SV *class, DC::RW rwops)
2368 CODE: 2921 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 2922 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 2923 OUTPUT:
2371 RETVAL 2924 RETVAL
2372 2925
2373void 2926void
2374DESTROY (CFPlus::MixMusic self) 2927DESTROY (DC::MixMusic self)
2375 CODE: 2928 CODE:
2376 Mix_FreeMusic (self); 2929 Mix_FreeMusic (self);
2377 2930
2378int 2931int
2379play (CFPlus::MixMusic self, int loops = -1) 2932play (DC::MixMusic self, int loops = -1)
2380 CODE: 2933 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 2934 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 2935 OUTPUT:
2383 RETVAL 2936 RETVAL
2384 2937
2385int 2938void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2939fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 2940 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2941 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 2942
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2943MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 2944
2394PROTOTYPES: ENABLE 2945PROTOTYPES: ENABLE
2395 2946
2396BOOT: 2947BOOT:
2397{ 2948{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2949 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 2950 static const struct {
2400 const char *name; 2951 const char *name;
2401 IV iv; 2952 IV iv;
2402 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2404 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2405 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2406 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2407 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2408 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2409 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2410 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2411 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
2423 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2424 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2425 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2426 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2427 const_iv (GL_ONE_MINUS_DST_ALPHA), 2979 const_iv (GL_ONE_MINUS_DST_ALPHA),
2980 const_iv (GL_SRC_COLOR),
2981 const_iv (GL_DST_COLOR),
2982 const_iv (GL_ONE_MINUS_SRC_COLOR),
2983 const_iv (GL_ONE_MINUS_DST_COLOR),
2428 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2429 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2430 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2431 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2432 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
2438 const_iv (GL_INTENSITY), 2994 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 2995 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 2996 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 2997 const_iv (GL_FLOAT),
2442 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2998 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2999 const_iv (GL_COMPRESSED_ALPHA_ARB),
3000 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3001 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3002 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3003 const_iv (GL_COMPRESSED_RGB_ARB),
3004 const_iv (GL_COMPRESSED_RGBA_ARB),
2443 const_iv (GL_COMPILE), 3005 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 3006 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 3007 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 3008 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 3009 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3048 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 3049 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 3050 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 3051 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 3052 const_iv (GL_GENERATE_MIPMAP_HINT),
3053 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 3054 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 3055 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 3056 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2496 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2497 const_iv (GL_T2F_N3F_V3F), 3060 const_iv (GL_T2F_N3F_V3F),
3061 const_iv (GL_FUNC_ADD),
3062 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2498# undef const_iv 3064# undef const_iv
2499 }; 3065 };
2500 3066
2501 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2502 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2503 3069
2504 texture_av = newAV (); 3070 texture_av = newAV ();
2505 AvREAL_off (texture_av); 3071 AvREAL_off (texture_av);
2506} 3072}
2507 3073
3074void
3075disable_GL_EXT_blend_func_separate ()
3076 CODE:
3077 gl.BlendFuncSeparate = 0;
3078 gl.BlendFuncSeparateEXT = 0;
3079
3080void
3081apple_nvidia_bug (int enable)
3082
2508char * 3083char *
2509gl_vendor () 3084gl_vendor ()
2510 CODE: 3085 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2512 OUTPUT: 3087 OUTPUT:
2561 3136
2562void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2563 CODE: 3138 CODE:
2564 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2565 3140
3141# void glBlendEquation (int se)
3142
2566void glDepthMask (int flag) 3143void glDepthMask (int flag)
2567 3144
2568void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2569 3146
2570void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
2604void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2605 CODE: 3182 CODE:
2606 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2607 3184
2608void glColor (float r, float g, float b, float a = 1.0) 3185void glColor (float r, float g, float b, float a = 1.0)
3186 PROTOTYPE: @
2609 ALIAS: 3187 ALIAS:
2610 glColor_premultiply = 1 3188 glColor_premultiply = 1
2611 CODE: 3189 CODE:
2612 if (ix) 3190 if (ix)
2613 { 3191 {
2633 3211
2634void glRect (float x1, float y1, float x2, float y2) 3212void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 3213 CODE:
2636 glRectf (x1, y1, x2, y2); 3214 glRectf (x1, y1, x2, y2);
2637 3215
3216void glRect_lineloop (float x1, float y1, float x2, float y2)
3217 CODE:
3218 glBegin (GL_LINE_LOOP);
3219 glVertex2f (x1, y1);
3220 glVertex2f (x2, y1);
3221 glVertex2f (x2, y2);
3222 glVertex2f (x1, y2);
3223 glEnd ();
3224
2638PROTOTYPES: ENABLE 3225PROTOTYPES: ENABLE
2639 3226
2640void glBegin (int mode) 3227void glBegin (int mode)
2641 3228
2642void glEnd () 3229void glEnd ()
2674void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3261void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2675 CODE: 3262 CODE:
2676 if (gl.SeparableFilter2D) 3263 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3264 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 3265
2679void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3266void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2680 3267
2681void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3268void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2682 3269
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 3270void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 3271
2710 3297
2711void glEndList () 3298void glEndList ()
2712 3299
2713void glCallList (int list) 3300void glCallList (int list)
2714 3301
2715MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2716 3303
2717PROTOTYPES: DISABLE 3304PROTOTYPES: DISABLE
2718 3305
2719void 3306void
2720find_widget (SV *self, NV x, NV y) 3307find_widget (SV *self, NV x, NV y)
2724 XPUSHs (self); 3311 XPUSHs (self);
2725} 3312}
2726 3313
2727BOOT: 3314BOOT:
2728{ 3315{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3316 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 3317
2731 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3318 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); 3319 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); 3320 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); 3321 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2735} 3322}
2736 3323
2737void 3324void
2738draw (SV *self) 3325draw (SV *self)
2739 CODE: 3326 CODE:
2743 NV x, y, w, h; 3330 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 3331 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 3332 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 3333 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 3334 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 3335 double draw_x, draw_y;
2750 3336
2751 if (!SvROK (self)) 3337 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 3339
2754 hv = (HV *)SvRV (self); 3340 hv = (HV *)SvRV (self);
2755 3341
2756 if (SvTYPE (hv) != SVt_PVHV) 3342 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3343 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 3344
2759 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3345 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.; 3346 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2761 3347
2762 if (!h || !w) 3348 if (!h || !w)
2782 { 3368 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3369 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 3370
2785 if (svp && SvTRUE (*svp)) 3371 if (svp && SvTRUE (*svp))
2786 { 3372 {
2787 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3373 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2788 glEnable (GL_BLEND); 3374 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3375 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 3376 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 3377 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 3378 glVertex2f (w, 0);
2795 glEnd (); 3381 glEnd ();
2796 glDisable (GL_BLEND); 3382 glDisable (GL_BLEND);
2797 } 3383 }
2798 } 3384 }
2799#if 0 3385#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 3386 // draw borders, for debugging
2801 glPushMatrix; 3387 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 3388 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 3389 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 3390 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 3391 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 3392 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 3393 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 3394 glVertex2f (0 , h - 1);
2809 glEnd; 3395 glEnd ();
2810 glPopMatrix; 3396 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 3397#endif
2814 PUSHMARK (SP); 3398 PUSHMARK (SP);
2815 XPUSHs (self); 3399 XPUSHs (self);
2816 PUTBACK; 3400 PUTBACK;
2817 call_method ("_draw", G_VOID | G_DISCARD); 3401 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines