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