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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines