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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines