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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines