ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.296 by root, Mon Dec 21 23:52:34 2009 UTC

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