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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines