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.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
34#include <SDL_endian.h> 38#include <SDL_endian.h>
35#include <SDL_image.h> 39#include <SDL_image.h>
36#include <SDL_mixer.h> 40#include <SDL_mixer.h>
37#include <SDL_opengl.h> 41#include <SDL_opengl.h>
38 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
47
39#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
41 50
42#include <glib/gmacros.h> 51#include <glib/gmacros.h>
43 52
44#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
45 65
46#ifndef _WIN32 66#ifndef _WIN32
47# include <sys/types.h> 67# include <sys/types.h>
48# include <sys/socket.h> 68# include <sys/socket.h>
49# include <netinet/in.h> 69# include <netinet/in.h>
50# include <netinet/tcp.h> 70# include <netinet/tcp.h>
51# include <inttypes.h> 71# include <inttypes.h>
52#endif 72#endif
53 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 84
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 */
56#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
57 89
58#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
60 92
61#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
62 94
63#if 0 95/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else 97
66# define PARACHUTE 0 98#define KMOD_LRAM 0x10000 // our extension
67#endif 99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
68 102
69static AV *texture_av; 103static AV *texture_av;
70 104
71static struct 105static struct
72{ 106{
109 av_push (texture_av, (SV *)(size_t)name); 143 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 144 glDeleteTextures (1, &name);
111} 145}
112 146
113#include "texcache.c" 147#include "texcache.c"
148#include "rendercache.c"
114 149
115#include "pango-font.c" 150#include "pango-font.c"
116#include "pango-fontmap.c" 151#include "pango-fontmap.c"
117#include "pango-render.c" 152#include "pango-render.c"
118 153
119typedef IV CFPlus__Channel; 154typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 155typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 156typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 157typedef Mix_Music *DC__MixMusic;
123 158
124typedef PangoFontDescription *CFPlus__Font; 159typedef PangoFontDescription *DC__Font;
125 160
126static int 161static int
127shape_attr_p (PangoLayoutRun *run) 162shape_attr_p (PangoLayoutRun *run)
128{ 163{
129 GSList *attrs = run->item->analysis.extra_attrs; 164 GSList *attrs = run->item->analysis.extra_attrs;
143 178
144typedef struct cf_layout { 179typedef struct cf_layout {
145 PangoLayout *pl; 180 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 181 float r, g, b, a; // default color for rgba mode
147 int base_height; 182 int base_height;
148 CFPlus__Font font; 183 DC__Font font;
184 rc_t *rc;
149} *CFPlus__Layout; 185} *DC__Layout;
150 186
151static CFPlus__Font default_font; 187static DC__Font default_font;
152static PangoContext *opengl_context; 188static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 189static PangoFontMap *opengl_fontmap;
154 190
155static void 191static void
156substitute_func (FcPattern *pattern, gpointer data) 192substitute_func (FcPattern *pattern, gpointer data)
161#endif 197#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 198 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 199}
164 200
165static void 201static void
166layout_update_font (CFPlus__Layout self) 202layout_update_font (DC__Layout self)
167{ 203{
168 /* 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
169 * reasonably well with bitstream vera 205 * reasonably well with dejavu/bistream fonts
170 */ 206 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 207 PangoFontDescription *font = self->font ? self->font : default_font;
172 208
173 pango_font_description_set_absolute_size (font, 209 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 210 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 211
176 pango_layout_set_font_description (self->pl, font); 212 pango_layout_set_font_description (self->pl, font);
177} 213}
178 214
179static void 215static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 216layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 217{
182 PangoRectangle rect; 218 PangoRectangle rect;
183 219
184 // get_pixel_* wrongly rounds down 220 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 221 pango_layout_get_extents (self->pl, 0, &rect);
196 232
197typedef uint16_t tileid; 233typedef uint16_t tileid;
198typedef uint16_t faceid; 234typedef uint16_t faceid;
199 235
200typedef struct { 236typedef struct {
201 int name; 237 GLuint name;
202 int w, h; 238 int w, h;
203 float s, t; 239 float s, t;
204 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
205 tileid smoothtile; 241 tileid smoothtile;
206 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
207} maptex; 244} maptex;
208 245
209typedef struct { 246typedef struct {
210 uint32_t player; 247 uint32_t player;
211 tileid tile[3]; 248 tileid tile[3];
224 int faces; tileid *face2tile; // [faceid] 261 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 262 int texs; maptex *tex; // [tileid]
226 263
227 int32_t rows; 264 int32_t rows;
228 maprow *row; 265 maprow *row;
229} *CFPlus__Map; 266} *DC__Map;
230 267
231static char * 268static char *
232prepend (char *ptr, int sze, int inc) 269prepend (char *ptr, int sze, int inc)
233{ 270{
234 char *p; 271 char *p;
272 self->texs *= 2; 309 self->texs *= 2;
273 } 310 }
274} 311}
275 312
276static maprow * 313static maprow *
277map_get_row (CFPlus__Map self, int y) 314map_get_row (DC__Map self, int y)
278{ 315{
279 if (0 > y) 316 if (0 > y)
280 { 317 {
281 int extend = - y + MAP_EXTEND_Y; 318 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 319 Prepend (maprow, self->row, self->rows, extend);
320 357
321 return row->col + (x - row->c0); 358 return row->col + (x - row->c0);
322} 359}
323 360
324static mapcell * 361static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 362map_get_cell (DC__Map self, int x, int y)
326{ 363{
327 return row_get_cell (map_get_row (self, y), x); 364 return row_get_cell (map_get_row (self, y), x);
328} 365}
329 366
330static void 367static void
331map_clear (CFPlus__Map self) 368map_clear (DC__Map self)
332{ 369{
333 int r; 370 int r;
334 371
335 for (r = 0; r < self->rows; r++) 372 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 373 Safefree (self->row[r].col);
343 self->oy = 0; 380 self->oy = 0;
344 self->row = 0; 381 self->row = 0;
345 self->rows = 0; 382 self->rows = 0;
346} 383}
347 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
348static void 395static void
349map_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)
350{ 397{
351 int x, y; 398 int x, y;
352 maprow *row; 399 maprow *row;
353 mapcell *cell; 400 mapcell *cell;
354 401
366 if (x >= row->c1) 413 if (x >= row->c1)
367 break; 414 break;
368 415
369 cell = row->col + x - row->c0; 416 cell = row->col + x - row->c0;
370 417
371 cell->darkness = 0; 418 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 419 }
376 } 420 }
377} 421}
378 422
379typedef struct { 423typedef struct {
433 n |= n >> 16; 477 n |= n >> 16;
434 478
435 return n + 1; 479 return n + 1;
436} 480}
437 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
438/* SDL should provide this, really. */ 493/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 494#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 495#define SDLK_MODIFIER_MAX 314
441 496
442/******************************************************************************/ 497/******************************************************************************/
480 return 0; 535 return 0;
481 536
482 return 1; 537 return 1;
483} 538}
484 539
485MODULE = 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
486 593
487PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
488 595
489BOOT: 596BOOT:
490{ 597{
491 HV *stash = gv_stashpv ("CFPlus", 1); 598 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 599 static const struct {
493 const char *name; 600 const char *name;
494 IV iv; 601 IV iv;
495 } *civ, const_iv[] = { 602 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 603# define const_iv(name) { # name, (IV)name }
518 625
519 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 628 const_iv (SDL_APPACTIVE),
522 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),
523 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 684 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 685 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 686 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 758 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
603 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)
604# undef const_iv 796# undef const_iv
605 }; 797 };
606 798
607 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; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 818
627NV floor (NV x) 819NV floor (NV x)
628 820
629NV ceil (NV x) 821NV ceil (NV x)
630 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
631void 833void
632pango_init () 834pango_init ()
633 CODE: 835 CODE:
634{ 836{
635 opengl_fontmap = pango_opengl_font_map_new (); 837 opengl_fontmap = pango_opengl_font_map_new ();
636 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);
637 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
638} 845}
639 846
640char *
641SDL_GetError () 847char *SDL_GetError ()
642 848
643int 849void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 850
646void 851int SDL_Init (U32 flags)
852
853int SDL_InitSubSystem (U32 flags)
854
855void SDL_QuitSubSystem (U32 flags)
856
647SDL_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
648 867
649void 868void
650SDL_ListModes (int rgb, int alpha) 869SDL_ListModes (int rgb, int alpha)
651 PPCODE: 870 PPCODE:
652{ 871{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 886
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 887 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 888 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 889
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 890 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 891
676 if (m && m != (SDL_Rect **)-1) 892 if (m && m != (SDL_Rect **)-1)
677 while (*m) 893 while (*m)
678 { 894 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 895 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 896 {
681 AV *av = newAV (); 897 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 898 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 899 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 900 av_push (av, newSViv (rgb));
708 924
709 if (RETVAL) 925 if (RETVAL)
710 { 926 {
711 av_clear (texture_av); 927 av_clear (texture_av);
712 928
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 929 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#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);
715#include "glfunc.h" 931#include "glfunc.h"
716#undef GL_FUNC 932#undef GL_FUNC
717 } 933 }
718} 934}
725char * 941char *
726SDL_GetKeyName (int sym) 942SDL_GetKeyName (int sym)
727 943
728int 944int
729SDL_GetAppState () 945SDL_GetAppState ()
946
947int
948SDL_GetModState ()
730 949
731void 950void
732poll_events () 951poll_events ()
733 PPCODE: 952 PPCODE:
734{ 953{
744 { 963 {
745 case SDL_KEYDOWN: 964 case SDL_KEYDOWN:
746 case SDL_KEYUP: 965 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 966 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 967 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 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);
750 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 */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 970 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 971 break;
753 972
754 case SDL_ACTIVEEVENT: 973 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 974 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 992 x = ev.motion.x;
774 y = ev.motion.y; 993 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 994 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 995 }
777 996
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 998 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 999 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 1000 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1001 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1002 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 1003 }
785 break; 1004 break;
786 1005
787 case SDL_MOUSEBUTTONDOWN: 1006 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 1007 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1008 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 1009
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1010 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1011 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1012 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1013 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1018 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1019 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1020 break;
802 } 1021 }
803 1022
804 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))));
805 } 1024 }
806} 1025}
807 1026
808int 1027int
809Mix_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)
810 POSTCALL: 1029 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1030 Mix_HookMusicFinished (music_finished);
812 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}
813 1048
814void 1049void
815Mix_CloseAudio () 1050Mix_CloseAudio ()
816 1051
817int 1052int
852 } 1087 }
853 } 1088 }
854#endif 1089#endif
855} 1090}
856 1091
857void 1092int
858add_font (char *file) 1093add_font (char *file)
859 CODE: 1094 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1095 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096 OUTPUT:
1097 RETVAL
861 1098
862void 1099void
863load_image_inline (SV *image_) 1100load_image_inline (SV *image_)
864 ALIAS: 1101 ALIAS:
865 load_image_file = 1 1102 load_image_file = 1
951void 1188void
952error (char *message) 1189error (char *message)
953 CODE: 1190 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1191 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1192#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1193 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1194#endif
958 1195
959void 1196void
960fatal (char *message) 1197fatal (char *message)
961 CODE: 1198 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1199 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1200#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1201 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1202#endif
966 _exit (1); 1203 _exit (1);
967 1204
968void 1205void
969_exit (int retval = 0) 1206_exit (int retval = 0)
981#if DEBUG 1218#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1219 VALGRIND_DO_LEAK_CHECK;
983#endif 1220#endif
984} 1221}
985 1222
986MODULE = 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
987 1231
988PROTOTYPES: DISABLE 1232PROTOTYPES: DISABLE
989 1233
990CFPlus::Font 1234DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1235new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1236 CODE:
993{ 1237{
994 int count; 1238 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1239 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1242}
999 OUTPUT: 1243 OUTPUT:
1000 RETVAL 1244 RETVAL
1001 1245
1002void 1246void
1003DESTROY (CFPlus::Font self) 1247DESTROY (DC::Font self)
1004 CODE: 1248 CODE:
1005 pango_font_description_free (self); 1249 pango_font_description_free (self);
1006 1250
1007void 1251void
1008make_default (CFPlus::Font self) 1252make_default (DC::Font self)
1009 PROTOTYPE: $ 1253 PROTOTYPE: $
1010 CODE: 1254 CODE:
1011 default_font = self; 1255 default_font = self;
1012 1256
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1257MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1258
1015PROTOTYPES: DISABLE 1259PROTOTYPES: DISABLE
1016 1260
1017void 1261void
1018reset_glyph_cache () 1262glyph_cache_backup ()
1019 PROTOTYPE: 1263 PROTOTYPE:
1020 CODE: 1264 CODE:
1265 tc_backup ();
1266
1267void
1268glyph_cache_restore ()
1269 PROTOTYPE:
1270 CODE:
1021 tc_clear (); 1271 tc_restore ();
1022 1272
1023CFPlus::Layout 1273DC::Layout
1024new (SV *class) 1274new (SV *class)
1025 CODE: 1275 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1276 New (0, RETVAL, 1, struct cf_layout);
1027 1277
1028 RETVAL->pl = pango_layout_new (opengl_context); 1278 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1280 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1281 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1282 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1283 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1284 RETVAL->font = 0;
1285 RETVAL->rc = rc_alloc ();
1035 1286
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1287 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1288 layout_update_font (RETVAL);
1038 OUTPUT: 1289 OUTPUT:
1039 RETVAL 1290 RETVAL
1040 1291
1041void 1292void
1042DESTROY (CFPlus::Layout self) 1293DESTROY (DC::Layout self)
1043 CODE: 1294 CODE:
1044 g_object_unref (self->pl); 1295 g_object_unref (self->pl);
1296 rc_free (self->rc);
1045 Safefree (self); 1297 Safefree (self);
1046 1298
1047void 1299void
1048set_text (CFPlus::Layout self, SV *text_) 1300set_text (DC::Layout self, SV *text_)
1049 CODE: 1301 CODE:
1050{ 1302{
1051 STRLEN textlen; 1303 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1304 char *text = SvPVutf8 (text_, textlen);
1053 1305
1054 pango_layout_set_text (self->pl, text, textlen); 1306 pango_layout_set_text (self->pl, text, textlen);
1055} 1307}
1056 1308
1057void 1309void
1058set_markup (CFPlus::Layout self, SV *text_) 1310set_markup (DC::Layout self, SV *text_)
1059 CODE: 1311 CODE:
1060{ 1312{
1061 STRLEN textlen; 1313 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1314 char *text = SvPVutf8 (text_, textlen);
1063 1315
1064 pango_layout_set_markup (self->pl, text, textlen); 1316 pango_layout_set_markup (self->pl, text, textlen);
1065} 1317}
1066 1318
1067void 1319void
1068set_shapes (CFPlus::Layout self, ...) 1320set_shapes (DC::Layout self, ...)
1069 CODE: 1321 CODE:
1070{ 1322{
1071 PangoAttrList *attrs = 0; 1323 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1324 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1325 const char *pos = text;
1108 if (attrs) 1360 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1361 pango_layout_set_attributes (self->pl, attrs);
1110} 1362}
1111 1363
1112void 1364void
1113get_shapes (CFPlus::Layout self) 1365get_shapes (DC::Layout self)
1114 PPCODE: 1366 PPCODE:
1115{ 1367{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1368 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1369
1118 do 1370 do
1119 { 1371 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1372 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1373
1122 if (run && shape_attr_p (run)) 1374 if (run && shape_attr_p (run))
1123 { 1375 {
1124 PangoRectangle extents; 1376 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1377 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1385
1134 pango_layout_iter_free (iter); 1386 pango_layout_iter_free (iter);
1135} 1387}
1136 1388
1137int 1389int
1138has_wrapped (CFPlus::Layout self) 1390has_wrapped (DC::Layout self)
1139 CODE: 1391 CODE:
1140{ 1392{
1141 int lines = 1; 1393 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1394 const char *text = pango_layout_get_text (self->pl);
1143 1395
1148} 1400}
1149 OUTPUT: 1401 OUTPUT:
1150 RETVAL 1402 RETVAL
1151 1403
1152SV * 1404SV *
1153get_text (CFPlus::Layout self) 1405get_text (DC::Layout self)
1154 CODE: 1406 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1407 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1408 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1409 OUTPUT:
1158 RETVAL 1410 RETVAL
1159 1411
1160void 1412void
1161set_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.)
1162 CODE: 1414 CODE:
1163 self->r = r; 1415 self->r = r;
1164 self->g = g; 1416 self->g = g;
1165 self->b = b; 1417 self->b = b;
1166 self->a = a; 1418 self->a = a;
1167 1419
1168void 1420void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1421set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1422 CODE:
1171 if (self->font != font) 1423 if (self->font != font)
1172 { 1424 {
1173 self->font = font; 1425 self->font = font;
1174 layout_update_font (self); 1426 layout_update_font (self);
1175 } 1427 }
1176 1428
1177void 1429void
1178set_height (CFPlus::Layout self, int base_height) 1430set_height (DC::Layout self, int base_height)
1179 CODE: 1431 CODE:
1180 if (self->base_height != base_height) 1432 if (self->base_height != base_height)
1181 { 1433 {
1182 self->base_height = base_height; 1434 self->base_height = base_height;
1183 layout_update_font (self); 1435 layout_update_font (self);
1184 } 1436 }
1185 1437
1186void 1438void
1187set_width (CFPlus::Layout self, int max_width = -1) 1439set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1440 CODE:
1189 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);
1190 1442
1191void 1443void
1192set_indent (CFPlus::Layout self, int indent) 1444set_indent (DC::Layout self, int indent)
1193 CODE: 1445 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1446 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1447
1196void 1448void
1197set_spacing (CFPlus::Layout self, int spacing) 1449set_spacing (DC::Layout self, int spacing)
1198 CODE: 1450 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1451 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1452
1201void 1453void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1454set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1455 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1456 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1457 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1458 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1459 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1460 : PANGO_ELLIPSIZE_NONE
1209 ); 1461 );
1210 1462
1211void 1463void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1464set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1465 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1466 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1467
1216void 1468void
1217size (CFPlus::Layout self) 1469size (DC::Layout self)
1218 PPCODE: 1470 PPCODE:
1219{ 1471{
1220 int w, h; 1472 int w, h;
1221 1473
1222 layout_get_pixel_size (self, &w, &h); 1474 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1477 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1478 PUSHs (sv_2mortal (newSViv (h)));
1227} 1479}
1228 1480
1229int 1481int
1230descent (CFPlus::Layout self) 1482descent (DC::Layout self)
1231 CODE: 1483 CODE:
1232{ 1484{
1233 PangoRectangle rect; 1485 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1486 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1487 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1488 RETVAL = PANGO_DESCENT (rect);
1237} 1489}
1238 OUTPUT: 1490 OUTPUT:
1239 RETVAL 1491 RETVAL
1240 1492
1241int 1493int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1494xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1495 CODE:
1244{ 1496{
1245 int index, trailing; 1497 int index, trailing;
1246 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);
1247 RETVAL = index + trailing; 1499 RETVAL = index + trailing;
1248} 1500}
1249 OUTPUT: 1501 OUTPUT:
1250 RETVAL 1502 RETVAL
1251 1503
1252void 1504void
1253cursor_pos (CFPlus::Layout self, int index) 1505cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1506 PPCODE:
1255{ 1507{
1256 PangoRectangle strong_pos; 1508 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1509 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1510
1259 EXTEND (SP, 3); 1511 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1515}
1264 1516
1265void 1517void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1518index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1519 PPCODE:
1268{ 1520{
1269 int line, x; 1521 int line, x;
1270 1522
1271 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)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1525 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1526 --line;
1527#endif
1274 EXTEND (SP, 2); 1528 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1529 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1531}
1278 1532
1279void 1533void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1534line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1535 PPCODE:
1282{ 1536{
1283 PangoLayoutLine *lp; 1537 PangoLayoutLine *lp;
1284 int index, trailing; 1538 int index, trailing;
1285 1539
1286 if (line < 0) 1540 if (line < 0)
1287 XSRETURN_EMPTY; 1541 XSRETURN_EMPTY;
1288 1542
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1543 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1544 XSRETURN_EMPTY; /* do better */
1291 1545
1292 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);
1293 1547
1294 EXTEND (SP, 2); 1548 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1554 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1555 }
1302} 1556}
1303 1557
1304void 1558void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1559render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1560 CODE:
1561 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1562 pango_opengl_render_layout_subpixel (
1308 self->pl, 1563 self->pl,
1564 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1565 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1566 self->r, self->g, self->b, self->a,
1311 flags 1567 flags
1312 ); 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);
1313 1572
1314MODULE = 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
1315 1593
1316PROTOTYPES: ENABLE 1594PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1595
1320void 1596void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1597pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1598 CODE:
1323{ 1599{
1389 glDisable (GL_ALPHA_TEST); 1665 glDisable (GL_ALPHA_TEST);
1390 glDisable (GL_BLEND); 1666 glDisable (GL_BLEND);
1391 } 1667 }
1392} 1668}
1393 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
1394IV 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)
1395 CODE: 1792 CODE:
1396{ 1793{
1397 GLint width; 1794 GLint width;
1398 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);
1400 RETVAL = width > 0; 1797 RETVAL = width > 0;
1401} 1798}
1402 OUTPUT: 1799 OUTPUT:
1403 RETVAL 1800 RETVAL
1404 1801
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1802MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1803
1407PROTOTYPES: DISABLE 1804PROTOTYPES: DISABLE
1408 1805
1409CFPlus::Map 1806DC::Map
1410new (SV *class) 1807new (SV *class)
1411 CODE: 1808 CODE:
1412 New (0, RETVAL, 1, struct map); 1809 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1810 RETVAL->x = 0;
1414 RETVAL->y = 0; 1811 RETVAL->y = 0;
1422 RETVAL->row = 0; 1819 RETVAL->row = 0;
1423 OUTPUT: 1820 OUTPUT:
1424 RETVAL 1821 RETVAL
1425 1822
1426void 1823void
1427DESTROY (CFPlus::Map self) 1824DESTROY (DC::Map self)
1428 CODE: 1825 CODE:
1429{ 1826{
1430 map_clear (self); 1827 map_clear (self);
1431 Safefree (self->face2tile); 1828 Safefree (self->face2tile);
1432 Safefree (self->tex); 1829 Safefree (self->tex);
1433 Safefree (self); 1830 Safefree (self);
1434} 1831}
1435 1832
1436void 1833void
1437resize (CFPlus::Map self, int map_width, int map_height) 1834resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1835 CODE:
1439 self->w = map_width; 1836 self->w = map_width;
1440 self->h = map_height; 1837 self->h = map_height;
1441 1838
1442void 1839void
1443clear (CFPlus::Map self) 1840clear (DC::Map self)
1444 CODE: 1841 CODE:
1445 map_clear (self); 1842 map_clear (self);
1446 1843
1447void 1844void
1448set_tileid (CFPlus::Map self, int face, int tile) 1845set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1846 CODE:
1450{ 1847{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1848 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1849 need_texid (self, tile);
1453} 1850}
1454 1851
1455void 1852void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1853set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1854 CODE:
1458{ 1855{
1459 tileid texid; 1856 tileid texid;
1460 maptex *tex; 1857 maptex *tex;
1461 1858
1474 tex->smoothtile = self->face2tile [smooth]; 1871 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1872 tex->smoothlevel = level;
1476} 1873}
1477 1874
1478void 1875void
1479set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1480 CODE: 1877 CODE:
1481{ 1878{
1482 need_texid (self, texid); 1879 need_texid (self, texid);
1483 1880
1484 { 1881 {
1503 // use uglier nearest interpolation because linear suffers 1900 // use uglier nearest interpolation because linear suffers
1504 // from transparent color bleeding and ugly wrapping effects. 1901 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1902 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1903}
1507 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
1508int 1925int
1509ox (CFPlus::Map self) 1926ox (DC::Map self)
1510 ALIAS: 1927 ALIAS:
1511 oy = 1 1928 oy = 1
1512 x = 2 1929 x = 2
1513 y = 3 1930 y = 3
1514 w = 4 1931 w = 4
1525 } 1942 }
1526 OUTPUT: 1943 OUTPUT:
1527 RETVAL 1944 RETVAL
1528 1945
1529void 1946void
1530scroll (CFPlus::Map self, int dx, int dy) 1947scroll (DC::Map self, int dx, int dy)
1531 CODE: 1948 CODE:
1532{ 1949{
1533 if (dx > 0) 1950 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1951 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1952 else if (dx < 0)
1551 self->y += MAP_EXTEND_Y; 1968 self->y += MAP_EXTEND_Y;
1552 } 1969 }
1553} 1970}
1554 1971
1555SV * 1972SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1973map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1974 CODE:
1558{ 1975{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1977 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1978 mapcell *cell;
1589 uint8_t ext, cmd; 2006 uint8_t ext, cmd;
1590 2007
1591 do 2008 do
1592 { 2009 {
1593 ext = *data++; 2010 ext = *data++;
1594 cmd = ext & 0x3f; 2011 cmd = ext & 0x7f;
1595 2012
1596 if (cmd < 4) 2013 if (cmd < 4)
1597 cell->darkness = 255 - ext * 64 + 1; 2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1598 else if (cmd == 5) // health 2015 else if (cmd == 5) // health
1599 { 2016 {
1600 cell->stat_width = 1; 2017 cell->stat_width = 1;
1601 cell->stat_hp = *data++; 2018 cell->stat_hp = *data++;
1602 } 2019 }
1603 else if (cmd == 6) // monster width 2020 else if (cmd == 6) // monster width
1604 cell->stat_width = *data++ + 1; 2021 cell->stat_width = *data++ + 1;
1605 else if (cmd == 0x47) 2022 else if (cmd == 0x47)
1606 { 2023 {
1607 if (*data == 4) 2024 if (*data == 1) cell->player = data [1];
1608 ; // 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);
1609 2028
1610 data += *data + 1; 2029 data += *data + 1;
1611 } 2030 }
1612 else if (cmd == 8) // cell flags 2031 else if (cmd == 8) // cell flags
1613 cell->flags = *data++; 2032 cell->flags = *data++;
1630 cell->tile [z] = self->face2tile [face]; 2049 cell->tile [z] = self->face2tile [face];
1631 2050
1632 if (cell->tile [z]) 2051 if (cell->tile [z])
1633 { 2052 {
1634 maptex *tex = self->tex + cell->tile [z]; 2053 maptex *tex = self->tex + cell->tile [z];
2054 tex->unused = 0;
1635 if (!tex->name) 2055 if (!tex->name)
1636 av_push (missing, newSViv (cell->tile [z])); 2056 av_push (missing, newSViv (cell->tile [z]));
1637 2057
1638 if (tex->smoothtile) 2058 if (tex->smoothtile)
1639 { 2059 {
1640 maptex *smooth = self->tex + tex->smoothtile; 2060 maptex *smooth = self->tex + tex->smoothtile;
2061 smooth->unused = 0;
1641 if (!smooth->name) 2062 if (!smooth->name)
1642 av_push (missing, newSViv (tex->smoothtile)); 2063 av_push (missing, newSViv (tex->smoothtile));
1643 } 2064 }
1644 } 2065 }
1645 } 2066 }
1646 } 2067 }
1647 else 2068 else
1648 cell->darkness = 0; 2069 CELL_CLEAR (cell);
1649 } 2070 }
1650} 2071}
1651 OUTPUT: 2072 OUTPUT:
1652 RETVAL 2073 RETVAL
1653 2074
1654SV * 2075SV *
1655mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2076mapmap (DC::Map self, int x0, int y0, int w, int h)
1656 CODE: 2077 CODE:
1657{ 2078{
1658 int x1, x; 2079 int x1, x;
1659 int y1, y; 2080 int y1, y;
1660 int z; 2081 int z;
1705} 2126}
1706 OUTPUT: 2127 OUTPUT:
1707 RETVAL 2128 RETVAL
1708 2129
1709void 2130void
1710draw (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)
1711 CODE: 2132 CODE:
1712{ 2133{
2134 int x, y, z;
2135
1713 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1714 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
1715 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)
1716 smooth_key skey; 2139 smooth_key skey;
1717 int x, y, z; 2140 int pl_x, pl_y;
1718 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;
1719 2146
2147 pl_tex.name = 0;
2148
1720 // thats current max. sorry. 2149 // that's current max. sorry.
1721 if (sw > 255) sw = 255; 2150 if (sw > 255) sw = 255;
1722 if (sh > 255) sh = 255; 2151 if (sh > 255) sh = 255;
1723 2152
1724 // clear key, in case of extra padding 2153 // clear key, in case of extra padding
1725 memset (&skey, 0, sizeof (skey)); 2154 memset (&skey, 0, sizeof (skey));
1726 2155
1727 glColor4ub (255, 255, 255, 255); 2156 memset (&key, 0, sizeof (key));
1728 2157 key.r = 255;
1729 glEnable (GL_BLEND); 2158 key.g = 255;
1730 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2159 key.b = 255;
1731 glEnable (GL_TEXTURE_2D); 2160 key.a = 255;
1732 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2161 key.mode = GL_QUADS;
1733 2162 key.format = GL_T2F_V3F;
1734 glBegin (GL_QUADS);
1735
1736 last_name = -1;
1737 2163
1738 mx += self->x; 2164 mx += self->x;
1739 my += self->y; 2165 my += self->y;
1740 2166
1741 // first pass: determine smooth_max 2167 // first pass: determine smooth_max
1758 MAX (self->tex [cell->tile [1]].smoothlevel, 2184 MAX (self->tex [cell->tile [1]].smoothlevel,
1759 self->tex [cell->tile [2]].smoothlevel)); 2185 self->tex [cell->tile [2]].smoothlevel));
1760 } 2186 }
1761 } 2187 }
1762 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
1763 for (z = 0; z <= 2; z++) 2193 for (z = 0; z <= 2; z++)
1764 { 2194 {
1765 memset (smooth_level, 0, sizeof (smooth_level)); 2195 memset (smooth_level, 0, sizeof (smooth_level));
2196 key.texname = -1;
1766 2197
1767 for (y = 0; y < sh; y++) 2198 for (y = 0; y < sh; y++)
1768 if (0 <= y + my && y + my < self->rows) 2199 if (0 <= y + my && y + my < self->rows)
1769 { 2200 {
1770 maprow *row = self->row + (y + my); 2201 maprow *row = self->row + (y + my);
1778 if (tile) 2209 if (tile)
1779 { 2210 {
1780 maptex tex = self->tex [tile]; 2211 maptex tex = self->tex [tile];
1781 int px, py; 2212 int px, py;
1782 2213
1783 // suppressing texture state switches here
1784 // is only moderately effective, but worth the extra effort
1785 if (last_name != tex.name) 2214 if (key.texname != tex.name)
1786 { 2215 {
2216 self->tex [tile].unused = 0;
2217
1787 if (!tex.name) 2218 if (!tex.name)
1788 tex = self->tex [2]; /* missing, replace by noface */ 2219 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1789 2220
1790 glEnd (); 2221 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2222 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 2223 }
1794 2224
1795 px = (x + 1) * T - tex.w; 2225 px = (x + 1) * T - tex.w;
1796 py = (y + 1) * T - tex.h; 2226 py = (y + 1) * T - tex.h;
1797 2227
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2228 if (expect_false (cell->player == player) && expect_false (z == 2))
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 { 2229 {
1805 if (cell->flags & 1) 2230 pl_x = px;
2231 pl_y = py;
2232 pl_tex = tex;
1806 { 2233 continue;
1807 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32;
1810
1811 glEnd ();
1812 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1813 glBegin (GL_QUADS);
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 }
1820 } 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);
1821 2240
1822 // update smooth hash 2241 // update smooth hash
1823 if (tex.smoothtile) 2242 if (tex.smoothtile)
1824 { 2243 {
1825 skey.tile = tex.smoothtile; 2244 skey.tile = tex.smoothtile;
1856 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);
1857 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);
1858 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);
1859 } 2278 }
1860 } 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 }
1861 } 2301 }
1862 } 2302 }
2303
2304 rc_draw (rc);
2305 rc_clear (rc);
1863 2306
1864 // go through all smoothlevels, lowest to highest, then draw. 2307 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 2308 // this is basically counting sort
1866 { 2309 {
1867 int w, b; 2310 int w, b;
1868 2311
2312 glEnable (GL_TEXTURE_2D);
2313 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2314 for (w = 0; w < 256 / 32; ++w)
1870 { 2315 {
1871 uint32_t smask = smooth_level [w]; 2316 uint32_t smask = smooth_level [w];
1872 if (smask) 2317 if (smask)
1873 for (b = 0; b < 32; ++b) 2318 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2337 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2338 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2339 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2340 float dy = tex.t * .5f ; // 2 images/column
1896 2341
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2342 if (tex.name)
1900 { 2343 {
2344 // this time avoiding texture state changes
2345 // save gobs of state changes.
1901 if (!tex.name) 2346 if (key.texname != tex.name)
1902 continue; // smoothing not yet available 2347 {
2348 self->tex [skey->tile].unused = 0;
1903 2349
1904 glEnd (); 2350 glEnd ();
1905 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2351 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1906 glBegin (GL_QUADS); 2352 glBegin (GL_QUADS);
1907 } 2353 }
1908 2354
1909 if (border) 2355 if (border)
1910 { 2356 {
1911 float ox = border * dx; 2357 float ox = border * dx;
1912 2358
1913 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2359 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2360 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2361 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2362 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1917 } 2363 }
1918 2364
1919 if (corner) 2365 if (corner)
1920 { 2366 {
1921 float ox = corner * dx; 2367 float ox = corner * dx;
1922 2368
1923 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2369 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1924 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2370 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1925 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2371 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1926 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2372 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2373 }
1927 } 2374 }
1928 } 2375 }
1929 } 2376 }
1930 } 2377 }
1931 } 2378 }
2379
2380 glEnd ();
2381 glDisable (GL_TEXTURE_2D);
2382 key.texname = -1;
1932 } 2383 }
1933 2384
1934 hv_clear (smooth); 2385 hv_clear (smooth);
1935 } 2386 }
1936 2387
1937 glEnd (); 2388 if (pl_tex.name)
2389 {
2390 maptex tex = pl_tex;
2391 int px = pl_x + sdx;
2392 int py = pl_y + sdy;
1938 2393
1939 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
1940 glDisable (GL_BLEND); 2408 glDisable (GL_BLEND);
2409 rc_free (rc);
2410 rc_free (rc_ov);
1941 2411
1942 // top layer: overlays such as the health bar 2412 // top layer: overlays such as the health bar
1943 for (y = 0; y < sh; y++) 2413 for (y = 0; y < sh; y++)
1944 if (0 <= y + my && y + my < self->rows) 2414 if (0 <= y + my && y + my < self->rows)
1945 { 2415 {
1950 { 2420 {
1951 mapcell *cell = row->col + (x + mx - row->c0); 2421 mapcell *cell = row->col + (x + mx - row->c0);
1952 2422
1953 int px = x * T; 2423 int px = x * T;
1954 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 }
1955 2431
1956 if (cell->stat_hp) 2432 if (cell->stat_hp)
1957 { 2433 {
1958 int width = cell->stat_width * T; 2434 int width = cell->stat_width * T;
1959 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1970 } 2446 }
1971 } 2447 }
1972} 2448}
1973 2449
1974void 2450void
1975draw_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)
1976 CODE: 2452 CODE:
1977{ 2453{
1978 static float color[16][3] = { 2454 static float color[16][3] = {
1979 { 0.00F, 0.00F, 0.00F }, 2455 { 0.00f, 0.00f, 0.00f },
1980 { 1.00F, 1.00F, 1.00F }, 2456 { 1.00f, 1.00f, 1.00f },
1981 { 0.00F, 0.00F, 0.55F }, 2457 { 0.00f, 0.00f, 0.55f },
1982 { 1.00F, 0.00F, 0.00F }, 2458 { 1.00f, 0.00f, 0.00f },
1983 2459
1984 { 1.00F, 0.54F, 0.00F }, 2460 { 1.00f, 0.54f, 0.00f },
1985 { 0.11F, 0.56F, 1.00F }, 2461 { 0.11f, 0.56f, 1.00f },
1986 { 0.93F, 0.46F, 0.00F }, 2462 { 0.93f, 0.46f, 0.00f },
1987 { 0.18F, 0.54F, 0.34F }, 2463 { 0.18f, 0.54f, 0.34f },
1988 2464
1989 { 0.56F, 0.73F, 0.56F }, 2465 { 0.56f, 0.73f, 0.56f },
1990 { 0.80F, 0.80F, 0.80F }, 2466 { 0.80f, 0.80f, 0.80f },
1991 { 0.55F, 0.41F, 0.13F }, 2467 { 0.55f, 0.41f, 0.13f },
1992 { 0.99F, 0.77F, 0.26F }, 2468 { 0.99f, 0.77f, 0.26f },
1993 2469
1994 { 0.74F, 0.65F, 0.41F }, 2470 { 0.74f, 0.65f, 0.41f },
1995 2471
1996 { 0.00F, 1.00F, 1.00F }, 2472 { 0.00f, 1.00f, 1.00f },
1997 { 1.00F, 0.00F, 1.00F }, 2473 { 1.00f, 0.00f, 1.00f },
1998 { 1.00F, 1.00F, 0.00F }, 2474 { 1.00f, 1.00f, 0.00f },
1999 }; 2475 };
2000 2476
2001 int x, y; 2477 int x, y;
2002 2478
2003 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 */
2004 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2486 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2005 glEnable (GL_BLEND); 2487 glEnable (GL_BLEND);
2006 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2488 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2007 glBegin (GL_QUADS); 2489 glBegin (GL_QUADS);
2008 2490
2009 for (y = 0; y < h; y++) 2491 for (y = 0; y < h; y++)
2013 2495
2014 if (m) 2496 if (m)
2015 { 2497 {
2016 float *c = color [m & 15]; 2498 float *c = color [m & 15];
2017 2499
2018 float tx1 = m & 0x40 ? 0.5 : 0.; 2500 float tx1 = m & 0x40 ? 0.5f : 0.f;
2019 float tx2 = tx1 + 0.5; 2501 float tx2 = tx1 + 0.5f;
2020 2502
2021 glColor4f (c[0], c[1], c[2], 0.75); 2503 glColor4f (c[0], c[1], c[2], 1);
2022 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2504 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2023 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2505 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2024 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2506 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2025 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2507 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2026 } 2508 }
2030 glDisable (GL_BLEND); 2512 glDisable (GL_BLEND);
2031 glDisable (GL_TEXTURE_2D); 2513 glDisable (GL_TEXTURE_2D);
2032} 2514}
2033 2515
2034void 2516void
2035fow_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)
2036 PPCODE: 2518 PPCODE:
2037{ 2519{
2038 int x, y; 2520 int x, y;
2039 int sw1 = sw + 2; 2521 int sw1 = sw + 2;
2040 int sh1 = sh + 2; 2522 int sh1 = sh + 2;
2041 int sh3 = sh * 3; 2523 int sh3 = sh * 3;
2042 int sw34 = (sw * 3 + 3) & ~3; 2524 int sw3 = sw * 3;
2043 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2044 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2045 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2046 2528
2047 SvPOK_only (darkness3_sv); 2529 SvPOK_only (darkness3_sv);
2048 SvCUR_set (darkness3_sv, sw34 * sh3); 2530 SvCUR_set (darkness3_sv, sw3 * sh3);
2049 2531
2050 mx += self->x - 1; 2532 mx += self->x - 1;
2051 my += self->y - 1; 2533 my += self->y - 1;
2052
2053 memset (darkness1, 255, sw1 * sh1);
2054 2534
2055 for (y = 0; y < sh1; y++) 2535 for (y = 0; y < sh1; y++)
2056 if (0 <= y + my && y + my < self->rows) 2536 if (0 <= y + my && y + my < self->rows)
2057 { 2537 {
2058 maprow *row = self->row + (y + my); 2538 maprow *row = self->row + (y + my);
2061 if (row->c0 <= x + mx && x + mx < row->c1) 2541 if (row->c0 <= x + mx && x + mx < row->c1)
2062 { 2542 {
2063 mapcell *cell = row->col + (x + mx - row->c0); 2543 mapcell *cell = row->col + (x + mx - row->c0);
2064 2544
2065 darkness1 [y * sw1 + x] = cell->darkness 2545 darkness1 [y * sw1 + x] = cell->darkness
2066 ? 255 - (cell->darkness - 1) 2546 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2067 : 255 - FOW_DARKNESS; 2547 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2068 } 2548 }
2069 } 2549 }
2070 2550
2071 for (y = 0; y < sh; ++y) 2551 for (y = 0; y < sh; ++y)
2072 for (x = 0; x < sw; ++x) 2552 for (x = 0; x < sw; ++x)
2091 2571
2092 uint8_t r13 = (d13 + d23 + d12) / 3; 2572 uint8_t r13 = (d13 + d23 + d12) / 3;
2093 uint8_t r23 = d23; 2573 uint8_t r23 = d23;
2094 uint8_t r33 = (d23 + d33 + d32) / 3; 2574 uint8_t r33 = (d23 + d33 + d32) / 3;
2095 2575
2096 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2576 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2097 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2577 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2098 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2099 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2579 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2100 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 */
2101 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2102 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2582 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2103 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2583 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2104 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2105 } 2585 }
2106 2586
2107 free (darkness1); 2587 free (darkness1);
2108 2588
2109 EXTEND (SP, 3); 2589 EXTEND (SP, 3);
2110 PUSHs (sv_2mortal (newSViv (sw34))); 2590 PUSHs (sv_2mortal (newSViv (sw3)));
2111 PUSHs (sv_2mortal (newSViv (sh3))); 2591 PUSHs (sv_2mortal (newSViv (sh3)));
2112 PUSHs (darkness3_sv); 2592 PUSHs (darkness3_sv);
2113} 2593}
2114 2594
2115SV * 2595SV *
2116get_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)
2117 CODE: 2597 CODE:
2118{ 2598{
2119 int x, y, x1, y1; 2599 int x, y, x1, y1;
2120 SV *data_sv = newSV (w * h * 7 + 5); 2600 SV *data_sv = newSV (w * h * 7 + 5);
2121 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2601 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2178 else 2658 else
2179 *data++ = 0; 2659 *data++ = 0;
2180 } 2660 }
2181 } 2661 }
2182 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 {
2183 SvPOK_only (data_sv); 2666 SvPOK_only (data_sv);
2184 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2667 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2668 }
2669
2185 RETVAL = data_sv; 2670 RETVAL = data_sv;
2186} 2671}
2187 OUTPUT: 2672 OUTPUT:
2188 RETVAL 2673 RETVAL
2189 2674
2190void 2675void
2191set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2676set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2192 PPCODE: 2677 PPCODE:
2193{ 2678{
2194 int x, y, z; 2679 int x, y, z;
2195 int w, h; 2680 int w, h;
2196 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;
2197 2692
2198 if (*data++ != 0) 2693 if (*data++ != 0)
2199 return; /* version mismatch */ 2694 XSRETURN_EMPTY; /* version mismatch */
2200 2695
2201 w = *data++ << 8; w |= *data++; 2696 w = *data++ << 8; w |= *data++;
2202 h = *data++ << 8; h |= *data++; 2697 h = *data++ << 8; h |= *data++;
2203 2698
2204 // 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
2216 { 2711 {
2217 maprow *row = map_get_row (self, y); 2712 maprow *row = map_get_row (self, y);
2218 2713
2219 for (x = x0; x < x1; x++) 2714 for (x = x0; x < x1; x++)
2220 { 2715 {
2716 uint8_t flags;
2717
2718 if (data + 7 >= end)
2719 XSRETURN_EMPTY;
2720
2221 uint8_t flags = *data++; 2721 flags = *data++;
2222 2722
2223 if (flags) 2723 if (flags)
2224 { 2724 {
2225 mapcell *cell = row_get_cell (row, x); 2725 mapcell *cell = row_get_cell (row, x);
2226 tileid tile[3] = { 0, 0, 0 }; 2726 tileid tile[3] = { 0, 0, 0 };
2229 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2729 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2230 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2730 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2231 2731
2232 if (cell->darkness == 0) 2732 if (cell->darkness == 0)
2233 { 2733 {
2234 cell->darkness = 0; 2734 /*cell->darkness = 0;*/
2735 EXTEND (SP, 3);
2235 2736
2236 for (z = 0; z <= 2; z++) 2737 for (z = 0; z <= 2; z++)
2237 { 2738 {
2238 tileid t = tile [z]; 2739 tileid t = tile [z];
2239 2740
2240 if (t >= self->texs || (t && !self->tex [t].name)) 2741 if (t >= self->texs || (t && !self->tex [t].name))
2241 { 2742 {
2242 XPUSHs (sv_2mortal (newSViv (t))); 2743 PUSHs (sv_2mortal (newSViv (t)));
2243 need_texid (self, t); 2744 need_texid (self, t);
2244 } 2745 }
2245 2746
2246 cell->tile [z] = t; 2747 cell->tile [z] = t;
2247 } 2748 }
2249 } 2750 }
2250 } 2751 }
2251 } 2752 }
2252} 2753}
2253 2754
2254MODULE = CFPlus PACKAGE = CFPlus::RW 2755MODULE = Deliantra::Client PACKAGE = DC::RW
2255 2756
2256CFPlus::RW 2757DC::RW
2257new (SV *class, SV *data_sv) 2758new (SV *class, SV *data_sv)
2258 CODE: 2759 CODE:
2259{ 2760{
2260 STRLEN datalen; 2761 STRLEN datalen;
2261 char *data = SvPVbyte (data_sv, datalen); 2762 char *data = SvPVbyte (data_sv, datalen);
2263 RETVAL = SDL_RWFromConstMem (data, datalen); 2764 RETVAL = SDL_RWFromConstMem (data, datalen);
2264} 2765}
2265 OUTPUT: 2766 OUTPUT:
2266 RETVAL 2767 RETVAL
2267 2768
2268CFPlus::RW 2769DC::RW
2269new_from_file (SV *class, const char *path, const char *mode = "rb") 2770new_from_file (SV *class, const char *path, const char *mode = "rb")
2270 CODE: 2771 CODE:
2271 RETVAL = SDL_RWFromFile (path, mode); 2772 RETVAL = SDL_RWFromFile (path, mode);
2272 OUTPUT: 2773 OUTPUT:
2273 RETVAL 2774 RETVAL
2274 2775
2275# fails on win32: 2776# fails on win32:
2276# CFPlus.xs(2268) : error C2059: syntax error : '(' 2777# dc.xs(2268) : error C2059: syntax error : '('
2277#void 2778#void
2278#close (CFPlus::RW self) 2779#close (DC::RW self)
2279# CODE: 2780# CODE:
2280# (self->(close)) (self); 2781# (self->(close)) (self);
2281 2782
2282MODULE = CFPlus PACKAGE = CFPlus::Channel 2783MODULE = Deliantra::Client PACKAGE = DC::Channel
2283 2784
2284PROTOTYPES: DISABLE 2785PROTOTYPES: DISABLE
2285 2786
2286CFPlus::Channel 2787DC::Channel
2287find () 2788find ()
2288 CODE: 2789 CODE:
2289{ 2790{
2290 RETVAL = Mix_GroupAvailable (-1); 2791 RETVAL = Mix_GroupAvailable (-1);
2291 2792
2304} 2805}
2305 OUTPUT: 2806 OUTPUT:
2306 RETVAL 2807 RETVAL
2307 2808
2308void 2809void
2309halt (CFPlus::Channel self) 2810halt (DC::Channel self)
2310 CODE: 2811 CODE:
2311 Mix_HaltChannel (self); 2812 Mix_HaltChannel (self);
2312 2813
2313void 2814void
2314expire (CFPlus::Channel self, int ticks = -1) 2815expire (DC::Channel self, int ticks = -1)
2315 CODE: 2816 CODE:
2316 Mix_ExpireChannel (self, ticks); 2817 Mix_ExpireChannel (self, ticks);
2317 2818
2318void 2819void
2319fade_out (CFPlus::Channel self, int ticks = -1) 2820fade_out (DC::Channel self, int ticks = -1)
2320 CODE: 2821 CODE:
2321 Mix_FadeOutChannel (self, ticks); 2822 Mix_FadeOutChannel (self, ticks);
2322 2823
2323int 2824int
2324volume (CFPlus::Channel self, int volume) 2825volume (DC::Channel self, int volume)
2325 CODE: 2826 CODE:
2326 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2827 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2327 OUTPUT: 2828 OUTPUT:
2328 RETVAL 2829 RETVAL
2329 2830
2330void 2831void
2331unregister_all_effects (CFPlus::Channel self) 2832unregister_all_effects (DC::Channel self)
2332 CODE: 2833 CODE:
2333 Mix_UnregisterAllEffects (self); 2834 Mix_UnregisterAllEffects (self);
2334 2835
2335void 2836void
2336set_panning (CFPlus::Channel self, int left, int right) 2837set_panning (DC::Channel self, int left, int right)
2337 CODE: 2838 CODE:
2338 left = CLAMP (left , 0, 255); 2839 left = CLAMP (left , 0, 255);
2339 right = CLAMP (right, 0, 255); 2840 right = CLAMP (right, 0, 255);
2340 Mix_SetPanning (self, left, right); 2841 Mix_SetPanning (self, left, right);
2341 2842
2342void 2843void
2343set_distance (CFPlus::Channel self, int distance) 2844set_distance (DC::Channel self, int distance)
2344 CODE: 2845 CODE:
2345 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2846 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2346 2847
2347void 2848void
2348set_position (CFPlus::Channel self, int angle, int distance) 2849set_position (DC::Channel self, int angle, int distance)
2349 CODE: 2850 CODE:
2350 2851
2351void 2852void
2352set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2853set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2353 CODE: 2854 CODE:
2354{ 2855{
2355 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));
2356 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;
2357 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2858 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2358} 2859}
2359 2860
2360void 2861void
2361set_reverse_stereo (CFPlus::Channel self, int flip) 2862set_reverse_stereo (DC::Channel self, int flip)
2362 CODE: 2863 CODE:
2363 Mix_SetReverseStereo (self, flip); 2864 Mix_SetReverseStereo (self, flip);
2364 2865
2365MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2866MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2366 2867
2367PROTOTYPES: DISABLE 2868PROTOTYPES: DISABLE
2368 2869
2369CFPlus::MixChunk 2870DC::MixChunk
2370new (SV *class, CFPlus::RW rwops) 2871new (SV *class, DC::RW rwops)
2371 CODE: 2872 CODE:
2372 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2873 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2373 OUTPUT: 2874 OUTPUT:
2374 RETVAL 2875 RETVAL
2375 2876
2376void 2877void
2377DESTROY (CFPlus::MixChunk self) 2878DESTROY (DC::MixChunk self)
2378 CODE: 2879 CODE:
2379 Mix_FreeChunk (self); 2880 Mix_FreeChunk (self);
2380 2881
2381int 2882int
2382volume (CFPlus::MixChunk self, int volume = -1) 2883volume (DC::MixChunk self, int volume = -1)
2383 CODE: 2884 CODE:
2384 if (items > 1) 2885 if (items > 1)
2385 volume = CLAMP (volume, 0, 128); 2886 volume = CLAMP (volume, 0, 128);
2386 RETVAL = Mix_VolumeChunk (self, volume); 2887 RETVAL = Mix_VolumeChunk (self, volume);
2387 OUTPUT: 2888 OUTPUT:
2388 RETVAL 2889 RETVAL
2389 2890
2390CFPlus::Channel 2891DC::Channel
2391play (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)
2392 CODE: 2893 CODE:
2393{ 2894{
2394 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2895 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2395 2896
2396 if (RETVAL < 0) 2897 if (RETVAL < 0)
2403 } 2904 }
2404} 2905}
2405 OUTPUT: 2906 OUTPUT:
2406 RETVAL 2907 RETVAL
2407 2908
2408MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2909MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2409 2910
2410int 2911int
2411volume (int volume = -1) 2912volume (int volume = -1)
2412 PROTOTYPE: ;$ 2913 PROTOTYPE: ;$
2413 CODE: 2914 CODE:
2425void 2926void
2426halt () 2927halt ()
2427 CODE: 2928 CODE:
2428 Mix_HaltMusic (); 2929 Mix_HaltMusic ();
2429 2930
2430CFPlus::MixMusic 2931DC::MixMusic
2431new (SV *class, CFPlus::RW rwops) 2932new (SV *class, DC::RW rwops)
2432 CODE: 2933 CODE:
2433 RETVAL = Mix_LoadMUS_RW (rwops); 2934 RETVAL = Mix_LoadMUS_RW (rwops);
2434 OUTPUT: 2935 OUTPUT:
2435 RETVAL 2936 RETVAL
2436 2937
2437void 2938void
2438DESTROY (CFPlus::MixMusic self) 2939DESTROY (DC::MixMusic self)
2439 CODE: 2940 CODE:
2440 Mix_FreeMusic (self); 2941 Mix_FreeMusic (self);
2441 2942
2442int 2943int
2443play (CFPlus::MixMusic self, int loops = -1) 2944play (DC::MixMusic self, int loops = -1)
2444 CODE: 2945 CODE:
2445 RETVAL = Mix_PlayMusic (self, loops); 2946 RETVAL = Mix_PlayMusic (self, loops);
2446 OUTPUT: 2947 OUTPUT:
2447 RETVAL 2948 RETVAL
2448 2949
2449void 2950void
2450fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2951fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2451 CODE: 2952 CODE:
2452 Mix_FadeInMusicPos (self, loops, ms, position); 2953 Mix_FadeInMusicPos (self, loops, ms, position);
2453 2954
2454MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2955MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2455 2956
2456PROTOTYPES: ENABLE 2957PROTOTYPES: ENABLE
2457 2958
2458BOOT: 2959BOOT:
2459{ 2960{
2460 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2961 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2461 static const struct { 2962 static const struct {
2462 const char *name; 2963 const char *name;
2463 IV iv; 2964 IV iv;
2464 } *civ, const_iv[] = { 2965 } *civ, const_iv[] = {
2465# define const_iv(name) { # name, (IV)name } 2966# define const_iv(name) { # name, (IV)name }
2466 const_iv (GL_VENDOR), 2967 const_iv (GL_VENDOR),
2467 const_iv (GL_VERSION), 2968 const_iv (GL_VERSION),
2468 const_iv (GL_EXTENSIONS), 2969 const_iv (GL_EXTENSIONS),
2970 const_iv (GL_MAX_TEXTURE_UNITS),
2469 const_iv (GL_COLOR_MATERIAL), 2971 const_iv (GL_COLOR_MATERIAL),
2470 const_iv (GL_SMOOTH), 2972 const_iv (GL_SMOOTH),
2471 const_iv (GL_FLAT), 2973 const_iv (GL_FLAT),
2472 const_iv (GL_DITHER), 2974 const_iv (GL_DITHER),
2473 const_iv (GL_BLEND), 2975 const_iv (GL_BLEND),
2485 const_iv (GL_ZERO), 2987 const_iv (GL_ZERO),
2486 const_iv (GL_SRC_ALPHA), 2988 const_iv (GL_SRC_ALPHA),
2487 const_iv (GL_DST_ALPHA), 2989 const_iv (GL_DST_ALPHA),
2488 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2990 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2489 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),
2490 const_iv (GL_SRC_ALPHA_SATURATE), 2996 const_iv (GL_SRC_ALPHA_SATURATE),
2491 const_iv (GL_RGB), 2997 const_iv (GL_RGB),
2492 const_iv (GL_RGBA), 2998 const_iv (GL_RGBA),
2493 const_iv (GL_RGBA4), 2999 const_iv (GL_RGBA4),
2494 const_iv (GL_RGBA8), 3000 const_iv (GL_RGBA8),
2500 const_iv (GL_INTENSITY), 3006 const_iv (GL_INTENSITY),
2501 const_iv (GL_LUMINANCE), 3007 const_iv (GL_LUMINANCE),
2502 const_iv (GL_LUMINANCE_ALPHA), 3008 const_iv (GL_LUMINANCE_ALPHA),
2503 const_iv (GL_FLOAT), 3009 const_iv (GL_FLOAT),
2504 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),
2505 const_iv (GL_COMPILE), 3017 const_iv (GL_COMPILE),
2506 const_iv (GL_PROXY_TEXTURE_1D), 3018 const_iv (GL_PROXY_TEXTURE_1D),
2507 const_iv (GL_PROXY_TEXTURE_2D), 3019 const_iv (GL_PROXY_TEXTURE_2D),
2508 const_iv (GL_TEXTURE_1D), 3020 const_iv (GL_TEXTURE_1D),
2509 const_iv (GL_TEXTURE_2D), 3021 const_iv (GL_TEXTURE_2D),
2548 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3060 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2549 const_iv (GL_POINT_SMOOTH_HINT), 3061 const_iv (GL_POINT_SMOOTH_HINT),
2550 const_iv (GL_LINE_SMOOTH_HINT), 3062 const_iv (GL_LINE_SMOOTH_HINT),
2551 const_iv (GL_POLYGON_SMOOTH_HINT), 3063 const_iv (GL_POLYGON_SMOOTH_HINT),
2552 const_iv (GL_GENERATE_MIPMAP_HINT), 3064 const_iv (GL_GENERATE_MIPMAP_HINT),
3065 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2553 const_iv (GL_FASTEST), 3066 const_iv (GL_FASTEST),
2554 const_iv (GL_DONT_CARE), 3067 const_iv (GL_DONT_CARE),
2555 const_iv (GL_NICEST), 3068 const_iv (GL_NICEST),
2556 const_iv (GL_V2F), 3069 const_iv (GL_V2F),
2557 const_iv (GL_V3F), 3070 const_iv (GL_V3F),
2558 const_iv (GL_T2F_V3F), 3071 const_iv (GL_T2F_V3F),
2559 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),
2560# undef const_iv 3076# undef const_iv
2561 }; 3077 };
2562 3078
2563 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; )
2564 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2565 3081
2566 texture_av = newAV (); 3082 texture_av = newAV ();
2567 AvREAL_off (texture_av); 3083 AvREAL_off (texture_av);
2568} 3084}
2569 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
2570char * 3095char *
2571gl_vendor () 3096gl_vendor ()
2572 CODE: 3097 CODE:
2573 RETVAL = (char *)glGetString (GL_VENDOR); 3098 RETVAL = (char *)glGetString (GL_VENDOR);
2574 OUTPUT: 3099 OUTPUT:
2623 3148
2624void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3149void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2625 CODE: 3150 CODE:
2626 gl_BlendFuncSeparate (sa, da, saa, daa); 3151 gl_BlendFuncSeparate (sa, da, saa, daa);
2627 3152
3153# void glBlendEquation (int se)
3154
2628void glDepthMask (int flag) 3155void glDepthMask (int flag)
2629 3156
2630void glLogicOp (int opcode) 3157void glLogicOp (int opcode)
2631 3158
2632void glColorMask (int red, int green, int blue, int alpha) 3159void glColorMask (int red, int green, int blue, int alpha)
2666void glRotate (float angle, float x, float y, float z) 3193void glRotate (float angle, float x, float y, float z)
2667 CODE: 3194 CODE:
2668 glRotatef (angle, x, y, z); 3195 glRotatef (angle, x, y, z);
2669 3196
2670void 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: @
2671 ALIAS: 3199 ALIAS:
2672 glColor_premultiply = 1 3200 glColor_premultiply = 1
2673 CODE: 3201 CODE:
2674 if (ix) 3202 if (ix)
2675 { 3203 {
2695 3223
2696void glRect (float x1, float y1, float x2, float y2) 3224void glRect (float x1, float y1, float x2, float y2)
2697 CODE: 3225 CODE:
2698 glRectf (x1, y1, x2, y2); 3226 glRectf (x1, y1, x2, y2);
2699 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
2700PROTOTYPES: ENABLE 3237PROTOTYPES: ENABLE
2701 3238
2702void glBegin (int mode) 3239void glBegin (int mode)
2703 3240
2704void glEnd () 3241void glEnd ()
2736void 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)
2737 CODE: 3274 CODE:
2738 if (gl.SeparableFilter2D) 3275 if (gl.SeparableFilter2D)
2739 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3276 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2740 3277
2741void 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)
2742 3279
2743void 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)
2744 3281
2745void glDrawPixels (int width, int height, int format, int type, char *pixels) 3282void glDrawPixels (int width, int height, int format, int type, char *pixels)
2746 3283
2772 3309
2773void glEndList () 3310void glEndList ()
2774 3311
2775void glCallList (int list) 3312void glCallList (int list)
2776 3313
2777MODULE = 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
2778 3320
2779PROTOTYPES: DISABLE 3321PROTOTYPES: DISABLE
2780 3322
2781void 3323void
2782find_widget (SV *self, NV x, NV y) 3324find_widget (SV *self, NV x, NV y)
2786 XPUSHs (self); 3328 XPUSHs (self);
2787} 3329}
2788 3330
2789BOOT: 3331BOOT:
2790{ 3332{
2791 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3333 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2792 3334
2793 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);
2794 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);
2795 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);
2796 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);
2797} 3339}
2798 3340
2799void 3341void
2800draw (SV *self) 3342draw (SV *self)
2801 CODE: 3343 CODE:
2805 NV x, y, w, h; 3347 NV x, y, w, h;
2806 SV *draw_x_sv = GvSV (draw_x_gv); 3348 SV *draw_x_sv = GvSV (draw_x_gv);
2807 SV *draw_y_sv = GvSV (draw_y_gv); 3349 SV *draw_y_sv = GvSV (draw_y_gv);
2808 SV *draw_w_sv = GvSV (draw_w_gv); 3350 SV *draw_w_sv = GvSV (draw_w_gv);
2809 SV *draw_h_sv = GvSV (draw_h_gv); 3351 SV *draw_h_sv = GvSV (draw_h_gv);
2810 SV *hover;
2811 double draw_x, draw_y, draw_w, draw_h; 3352 double draw_x, draw_y;
2812 3353
2813 if (!SvROK (self)) 3354 if (!SvROK (self))
2814 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3355 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2815 3356
2816 hv = (HV *)SvRV (self); 3357 hv = (HV *)SvRV (self);
2817 3358
2818 if (SvTYPE (hv) != SVt_PVHV) 3359 if (SvTYPE (hv) != SVt_PVHV)
2819 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3360 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2820 3361
2821 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.;
2822 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.;
2823 3364
2824 if (!h || !w) 3365 if (!h || !w)
2844 { 3385 {
2845 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3386 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2846 3387
2847 if (svp && SvTRUE (*svp)) 3388 if (svp && SvTRUE (*svp))
2848 { 3389 {
2849 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);
2850 glEnable (GL_BLEND); 3391 glEnable (GL_BLEND);
2851 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3392 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2852 glBegin (GL_QUADS); 3393 glBegin (GL_QUADS);
2853 glVertex2f (0, 0); 3394 glVertex2f (0, 0);
2854 glVertex2f (w, 0); 3395 glVertex2f (w, 0);
2857 glEnd (); 3398 glEnd ();
2858 glDisable (GL_BLEND); 3399 glDisable (GL_BLEND);
2859 } 3400 }
2860 } 3401 }
2861#if 0 3402#if 0
2862 if ($ENV{CFPLUS_DEBUG} & 1) { 3403 // draw borders, for debugging
2863 glPushMatrix; 3404 glPushMatrix ();
2864 glColor 1, 1, 0, 1; 3405 glColor4f (1., 1., 0., 1.);
2865 glTranslate 0.375, 0.375; 3406 glTranslatef (.5, .5, 0.);
2866 glBegin GL_LINE_LOOP; 3407 glBegin (GL_LINE_LOOP);
2867 glVertex 0 , 0; 3408 glVertex2f (0 , 0);
2868 glVertex $self->{w} - 1, 0; 3409 glVertex2f (w - 1, 0);
2869 glVertex $self->{w} - 1, $self->{h} - 1; 3410 glVertex2f (w - 1, h - 1);
2870 glVertex 0 , $self->{h} - 1; 3411 glVertex2f (0 , h - 1);
2871 glEnd; 3412 glEnd ();
2872 glPopMatrix; 3413 glPopMatrix ();
2873 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2874 }
2875#endif 3414#endif
2876 PUSHMARK (SP); 3415 PUSHMARK (SP);
2877 XPUSHs (self); 3416 XPUSHs (self);
2878 PUTBACK; 3417 PUTBACK;
2879 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