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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines