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.224 by root, Sat Aug 11 11:21:46 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;
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
723 } 935 }
724} 936}
731char * 943char *
732SDL_GetKeyName (int sym) 944SDL_GetKeyName (int sym)
733 945
734int 946int
735SDL_GetAppState () 947SDL_GetAppState ()
948
949int
950SDL_GetModState ()
736 951
737void 952void
738poll_events () 953poll_events ()
739 PPCODE: 954 PPCODE:
740{ 955{
750 { 965 {
751 case SDL_KEYDOWN: 966 case SDL_KEYDOWN:
752 case SDL_KEYUP: 967 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 968 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 969 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 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);
756 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 */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 972 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 973 break;
759 974
760 case SDL_ACTIVEEVENT: 975 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 976 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 994 x = ev.motion.x;
780 y = ev.motion.y; 995 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 996 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 997 }
783 998
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 999 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 1000 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 1001 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 1002 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1003 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1004 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 1005 }
791 break; 1006 break;
792 1007
793 case SDL_MOUSEBUTTONDOWN: 1008 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 1009 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1010 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 1011
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1012 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1014 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1015 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1020 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1021 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 1022 break;
808 } 1023 }
809 1024
810 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))));
811 } 1026 }
812} 1027}
813 1028
814int 1029int
815Mix_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)
816 POSTCALL: 1031 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1032 Mix_HookMusicFinished (music_finished);
818 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}
819 1050
820void 1051void
821Mix_CloseAudio () 1052Mix_CloseAudio ()
822 1053
823int 1054int
858 } 1089 }
859 } 1090 }
860#endif 1091#endif
861} 1092}
862 1093
863void 1094int
864add_font (char *file) 1095add_font (char *file)
865 CODE: 1096 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1097 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098 OUTPUT:
1099 RETVAL
867 1100
868void 1101void
869load_image_inline (SV *image_) 1102load_image_inline (SV *image_)
870 ALIAS: 1103 ALIAS:
871 load_image_file = 1 1104 load_image_file = 1
957void 1190void
958error (char *message) 1191error (char *message)
959 CODE: 1192 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1193 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1194#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1195 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1196#endif
964 1197
965void 1198void
966fatal (char *message) 1199fatal (char *message)
967 CODE: 1200 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1201 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1202#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1203 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1204#endif
972 _exit (1); 1205 _exit (1);
973 1206
974void 1207void
975_exit (int retval = 0) 1208_exit (int retval = 0)
987#if DEBUG 1220#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1221 VALGRIND_DO_LEAK_CHECK;
989#endif 1222#endif
990} 1223}
991 1224
992MODULE = 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
993 1233
994PROTOTYPES: DISABLE 1234PROTOTYPES: DISABLE
995 1235
996CFPlus::Font 1236DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1237new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1238 CODE:
999{ 1239{
1000 int count; 1240 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1241 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1244}
1005 OUTPUT: 1245 OUTPUT:
1006 RETVAL 1246 RETVAL
1007 1247
1008void 1248void
1009DESTROY (CFPlus::Font self) 1249DESTROY (DC::Font self)
1010 CODE: 1250 CODE:
1011 pango_font_description_free (self); 1251 pango_font_description_free (self);
1012 1252
1013void 1253void
1014make_default (CFPlus::Font self) 1254make_default (DC::Font self)
1015 PROTOTYPE: $ 1255 PROTOTYPE: $
1016 CODE: 1256 CODE:
1017 default_font = self; 1257 default_font = self;
1018 1258
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1259MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1260
1021PROTOTYPES: DISABLE 1261PROTOTYPES: DISABLE
1022 1262
1023void 1263void
1024reset_glyph_cache () 1264glyph_cache_backup ()
1025 PROTOTYPE: 1265 PROTOTYPE:
1026 CODE: 1266 CODE:
1267 tc_backup ();
1268
1269void
1270glyph_cache_restore ()
1271 PROTOTYPE:
1272 CODE:
1027 tc_clear (); 1273 tc_restore ();
1028 1274
1029CFPlus::Layout 1275DC::Layout
1030new (SV *class) 1276new (SV *class)
1031 CODE: 1277 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1278 New (0, RETVAL, 1, struct cf_layout);
1033 1279
1034 RETVAL->pl = pango_layout_new (opengl_context); 1280 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1282 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1283 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1284 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1285 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1286 RETVAL->font = 0;
1287 RETVAL->rc = rc_alloc ();
1041 1288
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1289 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1290 layout_update_font (RETVAL);
1044 OUTPUT: 1291 OUTPUT:
1045 RETVAL 1292 RETVAL
1046 1293
1047void 1294void
1048DESTROY (CFPlus::Layout self) 1295DESTROY (DC::Layout self)
1049 CODE: 1296 CODE:
1050 g_object_unref (self->pl); 1297 g_object_unref (self->pl);
1298 rc_free (self->rc);
1051 Safefree (self); 1299 Safefree (self);
1052 1300
1053void 1301void
1054set_text (CFPlus::Layout self, SV *text_) 1302set_text (DC::Layout self, SV *text_)
1055 CODE: 1303 CODE:
1056{ 1304{
1057 STRLEN textlen; 1305 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1306 char *text = SvPVutf8 (text_, textlen);
1059 1307
1060 pango_layout_set_text (self->pl, text, textlen); 1308 pango_layout_set_text (self->pl, text, textlen);
1061} 1309}
1062 1310
1063void 1311void
1064set_markup (CFPlus::Layout self, SV *text_) 1312set_markup (DC::Layout self, SV *text_)
1065 CODE: 1313 CODE:
1066{ 1314{
1067 STRLEN textlen; 1315 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1316 char *text = SvPVutf8 (text_, textlen);
1069 1317
1070 pango_layout_set_markup (self->pl, text, textlen); 1318 pango_layout_set_markup (self->pl, text, textlen);
1071} 1319}
1072 1320
1073void 1321void
1074set_shapes (CFPlus::Layout self, ...) 1322set_shapes (DC::Layout self, ...)
1075 CODE: 1323 CODE:
1076{ 1324{
1077 PangoAttrList *attrs = 0; 1325 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1326 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1327 const char *pos = text;
1114 if (attrs) 1362 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1363 pango_layout_set_attributes (self->pl, attrs);
1116} 1364}
1117 1365
1118void 1366void
1119get_shapes (CFPlus::Layout self) 1367get_shapes (DC::Layout self)
1120 PPCODE: 1368 PPCODE:
1121{ 1369{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1370 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1371
1124 do 1372 do
1125 { 1373 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1374 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1375
1128 if (run && shape_attr_p (run)) 1376 if (run && shape_attr_p (run))
1129 { 1377 {
1130 PangoRectangle extents; 1378 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1379 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1387
1140 pango_layout_iter_free (iter); 1388 pango_layout_iter_free (iter);
1141} 1389}
1142 1390
1143int 1391int
1144has_wrapped (CFPlus::Layout self) 1392has_wrapped (DC::Layout self)
1145 CODE: 1393 CODE:
1146{ 1394{
1147 int lines = 1; 1395 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1396 const char *text = pango_layout_get_text (self->pl);
1149 1397
1154} 1402}
1155 OUTPUT: 1403 OUTPUT:
1156 RETVAL 1404 RETVAL
1157 1405
1158SV * 1406SV *
1159get_text (CFPlus::Layout self) 1407get_text (DC::Layout self)
1160 CODE: 1408 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1409 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1410 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1411 OUTPUT:
1164 RETVAL 1412 RETVAL
1165 1413
1166void 1414void
1167set_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.)
1168 CODE: 1416 CODE:
1169 self->r = r; 1417 self->r = r;
1170 self->g = g; 1418 self->g = g;
1171 self->b = b; 1419 self->b = b;
1172 self->a = a; 1420 self->a = a;
1173 1421
1174void 1422void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1423set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1424 CODE:
1177 if (self->font != font) 1425 if (self->font != font)
1178 { 1426 {
1179 self->font = font; 1427 self->font = font;
1180 layout_update_font (self); 1428 layout_update_font (self);
1181 } 1429 }
1182 1430
1183void 1431void
1184set_height (CFPlus::Layout self, int base_height) 1432set_height (DC::Layout self, int base_height)
1185 CODE: 1433 CODE:
1186 if (self->base_height != base_height) 1434 if (self->base_height != base_height)
1187 { 1435 {
1188 self->base_height = base_height; 1436 self->base_height = base_height;
1189 layout_update_font (self); 1437 layout_update_font (self);
1190 } 1438 }
1191 1439
1192void 1440void
1193set_width (CFPlus::Layout self, int max_width = -1) 1441set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1442 CODE:
1195 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);
1196 1444
1197void 1445void
1198set_indent (CFPlus::Layout self, int indent) 1446set_indent (DC::Layout self, int indent)
1199 CODE: 1447 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1448 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1449
1202void 1450void
1203set_spacing (CFPlus::Layout self, int spacing) 1451set_spacing (DC::Layout self, int spacing)
1204 CODE: 1452 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1453 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1454
1207void 1455void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1456set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1457 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1458 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1459 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1460 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1461 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1462 : PANGO_ELLIPSIZE_NONE
1215 ); 1463 );
1216 1464
1217void 1465void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1466set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1467 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1468 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1469
1222void 1470void
1223size (CFPlus::Layout self) 1471size (DC::Layout self)
1224 PPCODE: 1472 PPCODE:
1225{ 1473{
1226 int w, h; 1474 int w, h;
1227 1475
1228 layout_get_pixel_size (self, &w, &h); 1476 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1479 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1480 PUSHs (sv_2mortal (newSViv (h)));
1233} 1481}
1234 1482
1235int 1483int
1236descent (CFPlus::Layout self) 1484descent (DC::Layout self)
1237 CODE: 1485 CODE:
1238{ 1486{
1239 PangoRectangle rect; 1487 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1488 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1489 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1490 RETVAL = PANGO_DESCENT (rect);
1243} 1491}
1244 OUTPUT: 1492 OUTPUT:
1245 RETVAL 1493 RETVAL
1246 1494
1247int 1495int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1496xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1497 CODE:
1250{ 1498{
1251 int index, trailing; 1499 int index, trailing;
1252 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);
1253 RETVAL = index + trailing; 1501 RETVAL = index + trailing;
1254} 1502}
1255 OUTPUT: 1503 OUTPUT:
1256 RETVAL 1504 RETVAL
1257 1505
1258void 1506void
1259cursor_pos (CFPlus::Layout self, int index) 1507cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1508 PPCODE:
1261{ 1509{
1262 PangoRectangle strong_pos; 1510 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1511 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1512
1265 EXTEND (SP, 3); 1513 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1515 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1516 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1517}
1270 1518
1271void 1519void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1520index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1521 PPCODE:
1274{ 1522{
1275 int line, x; 1523 int line, x;
1276 1524
1277 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)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1527 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1528 --line;
1529#endif
1280 EXTEND (SP, 2); 1530 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1531 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1533}
1284 1534
1285void 1535void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1536line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1537 PPCODE:
1288{ 1538{
1289 PangoLayoutLine *lp; 1539 PangoLayoutLine *lp;
1290 int index, trailing; 1540 int index, trailing;
1291 1541
1292 if (line < 0) 1542 if (line < 0)
1293 XSRETURN_EMPTY; 1543 XSRETURN_EMPTY;
1294 1544
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1545 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1546 XSRETURN_EMPTY; /* do better */
1297 1547
1298 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);
1299 1549
1300 EXTEND (SP, 2); 1550 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1556 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1557 }
1308} 1558}
1309 1559
1310void 1560void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1561render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1562 CODE:
1563 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1564 pango_opengl_render_layout_subpixel (
1314 self->pl, 1565 self->pl,
1566 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1567 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1568 self->r, self->g, self->b, self->a,
1317 flags 1569 flags
1318 ); 1570 );
1571 // we assume that context_change actually clears/frees stuff
1572 // and does not do any recomputation...
1573 pango_layout_context_changed (self->pl);
1319 1574
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1575void
1576draw (DC::Layout self)
1577 CODE:
1578{
1579 glEnable (GL_TEXTURE_2D);
1580 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1581 glEnable (GL_BLEND);
1582 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1583 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1584 glEnable (GL_ALPHA_TEST);
1585 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1586
1587 rc_draw (self->rc);
1588
1589 glDisable (GL_ALPHA_TEST);
1590 glDisable (GL_BLEND);
1591 glDisable (GL_TEXTURE_2D);
1592}
1593
1594MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1595
1322PROTOTYPES: ENABLE 1596PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1597
1326void 1598void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1599pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1600 CODE:
1329{ 1601{
1395 glDisable (GL_ALPHA_TEST); 1667 glDisable (GL_ALPHA_TEST);
1396 glDisable (GL_BLEND); 1668 glDisable (GL_BLEND);
1397 } 1669 }
1398} 1670}
1399 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
1400IV 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)
1401 CODE: 1794 CODE:
1402{ 1795{
1403 GLint width; 1796 GLint width;
1404 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);
1406 RETVAL = width > 0; 1799 RETVAL = width > 0;
1407} 1800}
1408 OUTPUT: 1801 OUTPUT:
1409 RETVAL 1802 RETVAL
1410 1803
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1804MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1805
1413PROTOTYPES: DISABLE 1806PROTOTYPES: DISABLE
1414 1807
1415CFPlus::Map 1808DC::Map
1416new (SV *class) 1809new (SV *class)
1417 CODE: 1810 CODE:
1418 New (0, RETVAL, 1, struct map); 1811 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1812 RETVAL->x = 0;
1420 RETVAL->y = 0; 1813 RETVAL->y = 0;
1428 RETVAL->row = 0; 1821 RETVAL->row = 0;
1429 OUTPUT: 1822 OUTPUT:
1430 RETVAL 1823 RETVAL
1431 1824
1432void 1825void
1433DESTROY (CFPlus::Map self) 1826DESTROY (DC::Map self)
1434 CODE: 1827 CODE:
1435{ 1828{
1436 map_clear (self); 1829 map_clear (self);
1437 Safefree (self->face2tile); 1830 Safefree (self->face2tile);
1438 Safefree (self->tex); 1831 Safefree (self->tex);
1439 Safefree (self); 1832 Safefree (self);
1440} 1833}
1441 1834
1442void 1835void
1443resize (CFPlus::Map self, int map_width, int map_height) 1836resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1837 CODE:
1445 self->w = map_width; 1838 self->w = map_width;
1446 self->h = map_height; 1839 self->h = map_height;
1447 1840
1448void 1841void
1449clear (CFPlus::Map self) 1842clear (DC::Map self)
1450 CODE: 1843 CODE:
1451 map_clear (self); 1844 map_clear (self);
1452 1845
1453void 1846void
1454set_tileid (CFPlus::Map self, int face, int tile) 1847set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1848 CODE:
1456{ 1849{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1850 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1851 need_texid (self, tile);
1459} 1852}
1460 1853
1461void 1854void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1855set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1856 CODE:
1464{ 1857{
1465 tileid texid; 1858 tileid texid;
1466 maptex *tex; 1859 maptex *tex;
1467 1860
1480 tex->smoothtile = self->face2tile [smooth]; 1873 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1874 tex->smoothlevel = level;
1482} 1875}
1483 1876
1484void 1877void
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) 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)
1486 CODE: 1879 CODE:
1487{ 1880{
1488 need_texid (self, texid); 1881 need_texid (self, texid);
1489 1882
1490 { 1883 {
1509 // use uglier nearest interpolation because linear suffers 1902 // use uglier nearest interpolation because linear suffers
1510 // from transparent color bleeding and ugly wrapping effects. 1903 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1904 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1905}
1513 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
1514int 1927int
1515ox (CFPlus::Map self) 1928ox (DC::Map self)
1516 ALIAS: 1929 ALIAS:
1517 oy = 1 1930 oy = 1
1518 x = 2 1931 x = 2
1519 y = 3 1932 y = 3
1520 w = 4 1933 w = 4
1531 } 1944 }
1532 OUTPUT: 1945 OUTPUT:
1533 RETVAL 1946 RETVAL
1534 1947
1535void 1948void
1536scroll (CFPlus::Map self, int dx, int dy) 1949scroll (DC::Map self, int dx, int dy)
1537 CODE: 1950 CODE:
1538{ 1951{
1539 if (dx > 0) 1952 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1953 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1954 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1970 self->y += MAP_EXTEND_Y;
1558 } 1971 }
1559} 1972}
1560 1973
1561SV * 1974SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1975map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1976 CODE:
1564{ 1977{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1978 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1979 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1980 mapcell *cell;
1595 uint8_t ext, cmd; 2008 uint8_t ext, cmd;
1596 2009
1597 do 2010 do
1598 { 2011 {
1599 ext = *data++; 2012 ext = *data++;
1600 cmd = ext & 0x3f; 2013 cmd = ext & 0x7f;
1601 2014
1602 if (cmd < 4) 2015 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 2016 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1604 else if (cmd == 5) // health 2017 else if (cmd == 5) // health
1605 { 2018 {
1606 cell->stat_width = 1; 2019 cell->stat_width = 1;
1607 cell->stat_hp = *data++; 2020 cell->stat_hp = *data++;
1608 } 2021 }
1609 else if (cmd == 6) // monster width 2022 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 2023 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 2024 else if (cmd == 0x47)
1612 { 2025 {
1613 if (*data == 4) 2026 if (*data == 1) cell->player = data [1];
1614 ; // 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);
1615 2030
1616 data += *data + 1; 2031 data += *data + 1;
1617 } 2032 }
1618 else if (cmd == 8) // cell flags 2033 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 2034 cell->flags = *data++;
1636 cell->tile [z] = self->face2tile [face]; 2051 cell->tile [z] = self->face2tile [face];
1637 2052
1638 if (cell->tile [z]) 2053 if (cell->tile [z])
1639 { 2054 {
1640 maptex *tex = self->tex + cell->tile [z]; 2055 maptex *tex = self->tex + cell->tile [z];
2056 tex->unused = 0;
1641 if (!tex->name) 2057 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 2058 av_push (missing, newSViv (cell->tile [z]));
1643 2059
1644 if (tex->smoothtile) 2060 if (tex->smoothtile)
1645 { 2061 {
1646 maptex *smooth = self->tex + tex->smoothtile; 2062 maptex *smooth = self->tex + tex->smoothtile;
2063 smooth->unused = 0;
1647 if (!smooth->name) 2064 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 2065 av_push (missing, newSViv (tex->smoothtile));
1649 } 2066 }
1650 } 2067 }
1651 } 2068 }
1652 } 2069 }
1653 else 2070 else
1654 cell->darkness = 0; 2071 CELL_CLEAR (cell);
1655 } 2072 }
1656} 2073}
1657 OUTPUT: 2074 OUTPUT:
1658 RETVAL 2075 RETVAL
1659 2076
1660SV * 2077SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2078mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 2079 CODE:
1663{ 2080{
1664 int x1, x; 2081 int x1, x;
1665 int y1, y; 2082 int y1, y;
1666 int z; 2083 int z;
1711} 2128}
1712 OUTPUT: 2129 OUTPUT:
1713 RETVAL 2130 RETVAL
1714 2131
1715void 2132void
1716draw (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)
1717 CODE: 2134 CODE:
1718{ 2135{
1719 int x, y, z; 2136 int x, y, z;
1720 2137
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2138 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 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
1723 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)
1724 smooth_key skey; 2141 smooth_key skey;
1725 2142 int pl_x, pl_y;
2143 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2144 rc_t *rc = rc_alloc ();
2145 rc_t *rc_ov = rc_alloc ();
1727 rc_key_t key; 2146 rc_key_t key;
1728 rc_array_t *arr; 2147 rc_array_t *arr;
1729 2148
2149 pl_tex.name = 0;
2150
1730 // thats current max. sorry. 2151 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2152 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2153 if (sh > 255) sh = 255;
1733 2154
1734 // clear key, in case of extra padding 2155 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey)); 2156 memset (&skey, 0, sizeof (skey));
1739 key.g = 255; 2160 key.g = 255;
1740 key.b = 255; 2161 key.b = 255;
1741 key.a = 255; 2162 key.a = 255;
1742 key.mode = GL_QUADS; 2163 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2164 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2165
1746 mx += self->x; 2166 mx += self->x;
1747 my += self->y; 2167 my += self->y;
1748 2168
1749 // first pass: determine smooth_max 2169 // first pass: determine smooth_max
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2193 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2194
1775 for (z = 0; z <= 2; z++) 2195 for (z = 0; z <= 2; z++)
1776 { 2196 {
1777 memset (smooth_level, 0, sizeof (smooth_level)); 2197 memset (smooth_level, 0, sizeof (smooth_level));
2198 key.texname = -1;
1778 2199
1779 for (y = 0; y < sh; y++) 2200 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2201 if (0 <= y + my && y + my < self->rows)
1781 { 2202 {
1782 maprow *row = self->row + (y + my); 2203 maprow *row = self->row + (y + my);
1790 if (tile) 2211 if (tile)
1791 { 2212 {
1792 maptex tex = self->tex [tile]; 2213 maptex tex = self->tex [tile];
1793 int px, py; 2214 int px, py;
1794 2215
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2216 if (key.texname != tex.name)
1798 { 2217 {
2218 self->tex [tile].unused = 0;
2219
1799 if (!tex.name) 2220 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2221 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2222
1802 key.texname = tex.name; 2223 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2224 arr = rc_array (rc, &key);
1804 } 2225 }
1805 2226
1806 px = (x + 1) * T - tex.w; 2227 px = (x + 1) * T - tex.w;
1807 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 }
1808 2237
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2238 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 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);
1811 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);
1812 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);
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 2242
1839 // update smooth hash 2243 // update smooth hash
1840 if (tex.smoothtile) 2244 if (tex.smoothtile)
1841 { 2245 {
1842 skey.tile = tex.smoothtile; 2246 skey.tile = tex.smoothtile;
1873 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);
1874 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);
1875 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);
1876 } 2280 }
1877 } 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 }
1878 } 2303 }
1879 } 2304 }
1880 2305
1881 rc_draw (rc); 2306 rc_draw (rc);
1882 rc_clear (rc); 2307 rc_clear (rc);
1884 // go through all smoothlevels, lowest to highest, then draw. 2309 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 2310 // this is basically counting sort
1886 { 2311 {
1887 int w, b; 2312 int w, b;
1888 2313
2314 glEnable (GL_TEXTURE_2D);
2315 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 2316 for (w = 0; w < 256 / 32; ++w)
1890 { 2317 {
1891 uint32_t smask = smooth_level [w]; 2318 uint32_t smask = smooth_level [w];
1892 if (smask) 2319 if (smask)
1893 for (b = 0; b < 32; ++b) 2320 for (b = 0; b < 32; ++b)
1918 { 2345 {
1919 // this time avoiding texture state changes 2346 // this time avoiding texture state changes
1920 // save gobs of state changes. 2347 // save gobs of state changes.
1921 if (key.texname != tex.name) 2348 if (key.texname != tex.name)
1922 { 2349 {
2350 self->tex [skey->tile].unused = 0;
2351
2352 glEnd ();
1923 key.texname = tex.name; 2353 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2354 glBegin (GL_QUADS);
1925 } 2355 }
1926 2356
1927 if (border) 2357 if (border)
1928 { 2358 {
1929 float ox = border * dx; 2359 float ox = border * dx;
1930 2360
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2361 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2362 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2363 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2364 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2365 }
1936 2366
1937 if (corner) 2367 if (corner)
1938 { 2368 {
1939 float ox = corner * dx; 2369 float ox = corner * dx;
1940 2370
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2371 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2372 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 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);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2374 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2375 }
1946 } 2376 }
1947 } 2377 }
1948 } 2378 }
1949 } 2379 }
1950 } 2380 }
2381
2382 glEnd ();
2383 glDisable (GL_TEXTURE_2D);
2384 key.texname = -1;
1951 } 2385 }
1952 2386
1953 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
1954 rc_draw (rc); 2404 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2405 }
2406
2407 rc_draw (rc_ov);
2408 rc_clear (rc_ov);
1957 2409
1958 glDisable (GL_BLEND); 2410 glDisable (GL_BLEND);
1959 rc_free (rc); 2411 rc_free (rc);
2412 rc_free (rc_ov);
1960 2413
1961 // top layer: overlays such as the health bar 2414 // top layer: overlays such as the health bar
1962 for (y = 0; y < sh; y++) 2415 for (y = 0; y < sh; y++)
1963 if (0 <= y + my && y + my < self->rows) 2416 if (0 <= y + my && y + my < self->rows)
1964 { 2417 {
1969 { 2422 {
1970 mapcell *cell = row->col + (x + mx - row->c0); 2423 mapcell *cell = row->col + (x + mx - row->c0);
1971 2424
1972 int px = x * T; 2425 int px = x * T;
1973 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 }
1974 2433
1975 if (cell->stat_hp) 2434 if (cell->stat_hp)
1976 { 2435 {
1977 int width = cell->stat_width * T; 2436 int width = cell->stat_width * T;
1978 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2437 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1989 } 2448 }
1990 } 2449 }
1991} 2450}
1992 2451
1993void 2452void
1994draw_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)
1995 CODE: 2454 CODE:
1996{ 2455{
1997 static float color[16][3] = { 2456 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2457 { 0.00f, 0.00f, 0.00f },
1999 { 1.00F, 1.00F, 1.00F }, 2458 { 1.00f, 1.00f, 1.00f },
2000 { 0.00F, 0.00F, 0.55F }, 2459 { 0.00f, 0.00f, 0.55f },
2001 { 1.00F, 0.00F, 0.00F }, 2460 { 1.00f, 0.00f, 0.00f },
2002 2461
2003 { 1.00F, 0.54F, 0.00F }, 2462 { 1.00f, 0.54f, 0.00f },
2004 { 0.11F, 0.56F, 1.00F }, 2463 { 0.11f, 0.56f, 1.00f },
2005 { 0.93F, 0.46F, 0.00F }, 2464 { 0.93f, 0.46f, 0.00f },
2006 { 0.18F, 0.54F, 0.34F }, 2465 { 0.18f, 0.54f, 0.34f },
2007 2466
2008 { 0.56F, 0.73F, 0.56F }, 2467 { 0.56f, 0.73f, 0.56f },
2009 { 0.80F, 0.80F, 0.80F }, 2468 { 0.80f, 0.80f, 0.80f },
2010 { 0.55F, 0.41F, 0.13F }, 2469 { 0.55f, 0.41f, 0.13f },
2011 { 0.99F, 0.77F, 0.26F }, 2470 { 0.99f, 0.77f, 0.26f },
2012 2471
2013 { 0.74F, 0.65F, 0.41F }, 2472 { 0.74f, 0.65f, 0.41f },
2014 2473
2015 { 0.00F, 1.00F, 1.00F }, 2474 { 0.00f, 1.00f, 1.00f },
2016 { 1.00F, 0.00F, 1.00F }, 2475 { 1.00f, 0.00f, 1.00f },
2017 { 1.00F, 1.00F, 0.00F }, 2476 { 1.00f, 1.00f, 0.00f },
2018 }; 2477 };
2019 2478
2020 int x, y; 2479 int x, y;
2021 2480
2022 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 */
2023 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2488 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2024 glEnable (GL_BLEND); 2489 glEnable (GL_BLEND);
2025 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2490 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2026 glBegin (GL_QUADS); 2491 glBegin (GL_QUADS);
2027 2492
2028 for (y = 0; y < h; y++) 2493 for (y = 0; y < h; y++)
2032 2497
2033 if (m) 2498 if (m)
2034 { 2499 {
2035 float *c = color [m & 15]; 2500 float *c = color [m & 15];
2036 2501
2037 float tx1 = m & 0x40 ? 0.5 : 0.; 2502 float tx1 = m & 0x40 ? 0.5f : 0.f;
2038 float tx2 = tx1 + 0.5; 2503 float tx2 = tx1 + 0.5f;
2039 2504
2040 glColor4f (c[0], c[1], c[2], 0.75); 2505 glColor4f (c[0], c[1], c[2], 1);
2041 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2506 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2042 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2507 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2043 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2508 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2044 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2509 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2045 } 2510 }
2049 glDisable (GL_BLEND); 2514 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2515 glDisable (GL_TEXTURE_2D);
2051} 2516}
2052 2517
2053void 2518void
2054fow_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)
2055 PPCODE: 2520 PPCODE:
2056{ 2521{
2057 int x, y; 2522 int x, y;
2058 int sw1 = sw + 2; 2523 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2524 int sh1 = sh + 2;
2060 int sh3 = sh * 3; 2525 int sh3 = sh * 3;
2061 int sw34 = (sw * 3 + 3) & ~3; 2526 int sw3 = sw * 3;
2062 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2527 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2063 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2528 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2064 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2529 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2065 2530
2066 SvPOK_only (darkness3_sv); 2531 SvPOK_only (darkness3_sv);
2067 SvCUR_set (darkness3_sv, sw34 * sh3); 2532 SvCUR_set (darkness3_sv, sw3 * sh3);
2068 2533
2069 mx += self->x - 1; 2534 mx += self->x - 1;
2070 my += self->y - 1; 2535 my += self->y - 1;
2071
2072 memset (darkness1, 255, sw1 * sh1);
2073 2536
2074 for (y = 0; y < sh1; y++) 2537 for (y = 0; y < sh1; y++)
2075 if (0 <= y + my && y + my < self->rows) 2538 if (0 <= y + my && y + my < self->rows)
2076 { 2539 {
2077 maprow *row = self->row + (y + my); 2540 maprow *row = self->row + (y + my);
2080 if (row->c0 <= x + mx && x + mx < row->c1) 2543 if (row->c0 <= x + mx && x + mx < row->c1)
2081 { 2544 {
2082 mapcell *cell = row->col + (x + mx - row->c0); 2545 mapcell *cell = row->col + (x + mx - row->c0);
2083 2546
2084 darkness1 [y * sw1 + x] = cell->darkness 2547 darkness1 [y * sw1 + x] = cell->darkness
2085 ? 255 - (cell->darkness - 1) 2548 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2086 : 255 - FOW_DARKNESS; 2549 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2087 } 2550 }
2088 } 2551 }
2089 2552
2090 for (y = 0; y < sh; ++y) 2553 for (y = 0; y < sh; ++y)
2091 for (x = 0; x < sw; ++x) 2554 for (x = 0; x < sw; ++x)
2110 2573
2111 uint8_t r13 = (d13 + d23 + d12) / 3; 2574 uint8_t r13 = (d13 + d23 + d12) / 3;
2112 uint8_t r23 = d23; 2575 uint8_t r23 = d23;
2113 uint8_t r33 = (d23 + d33 + d32) / 3; 2576 uint8_t r33 = (d23 + d33 + d32) / 3;
2114 2577
2115 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2116 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2579 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2117 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2118 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2119 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 */
2120 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2121 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2122 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2585 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2123 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2124 } 2587 }
2125 2588
2126 free (darkness1); 2589 free (darkness1);
2127 2590
2128 EXTEND (SP, 3); 2591 EXTEND (SP, 3);
2129 PUSHs (sv_2mortal (newSViv (sw34))); 2592 PUSHs (sv_2mortal (newSViv (sw3)));
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2593 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2594 PUSHs (darkness3_sv);
2132} 2595}
2133 2596
2134SV * 2597SV *
2135get_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)
2136 CODE: 2599 CODE:
2137{ 2600{
2138 int x, y, x1, y1; 2601 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2602 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2603 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2197 else 2660 else
2198 *data++ = 0; 2661 *data++ = 0;
2199 } 2662 }
2200 } 2663 }
2201 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 {
2202 SvPOK_only (data_sv); 2668 SvPOK_only (data_sv);
2203 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2669 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2670 }
2671
2204 RETVAL = data_sv; 2672 RETVAL = data_sv;
2205} 2673}
2206 OUTPUT: 2674 OUTPUT:
2207 RETVAL 2675 RETVAL
2208 2676
2209void 2677void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2678set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211 PPCODE: 2679 PPCODE:
2212{ 2680{
2213 int x, y, z; 2681 int x, y, z;
2214 int w, h; 2682 int w, h;
2215 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;
2216 2694
2217 if (*data++ != 0) 2695 if (*data++ != 0)
2218 return; /* version mismatch */ 2696 XSRETURN_EMPTY; /* version mismatch */
2219 2697
2220 w = *data++ << 8; w |= *data++; 2698 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2699 h = *data++ << 8; h |= *data++;
2222 2700
2223 // 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
2235 { 2713 {
2236 maprow *row = map_get_row (self, y); 2714 maprow *row = map_get_row (self, y);
2237 2715
2238 for (x = x0; x < x1; x++) 2716 for (x = x0; x < x1; x++)
2239 { 2717 {
2718 uint8_t flags;
2719
2720 if (data + 7 >= end)
2721 XSRETURN_EMPTY;
2722
2240 uint8_t flags = *data++; 2723 flags = *data++;
2241 2724
2242 if (flags) 2725 if (flags)
2243 { 2726 {
2244 mapcell *cell = row_get_cell (row, x); 2727 mapcell *cell = row_get_cell (row, x);
2245 tileid tile[3] = { 0, 0, 0 }; 2728 tileid tile[3] = { 0, 0, 0 };
2248 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2731 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2732 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250 2733
2251 if (cell->darkness == 0) 2734 if (cell->darkness == 0)
2252 { 2735 {
2253 cell->darkness = 0; 2736 /*cell->darkness = 0;*/
2737 EXTEND (SP, 3);
2254 2738
2255 for (z = 0; z <= 2; z++) 2739 for (z = 0; z <= 2; z++)
2256 { 2740 {
2257 tileid t = tile [z]; 2741 tileid t = tile [z];
2258 2742
2259 if (t >= self->texs || (t && !self->tex [t].name)) 2743 if (t >= self->texs || (t && !self->tex [t].name))
2260 { 2744 {
2261 XPUSHs (sv_2mortal (newSViv (t))); 2745 PUSHs (sv_2mortal (newSViv (t)));
2262 need_texid (self, t); 2746 need_texid (self, t);
2263 } 2747 }
2264 2748
2265 cell->tile [z] = t; 2749 cell->tile [z] = t;
2266 } 2750 }
2268 } 2752 }
2269 } 2753 }
2270 } 2754 }
2271} 2755}
2272 2756
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2757MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2758
2275CFPlus::RW 2759DC::RW
2276new (SV *class, SV *data_sv) 2760new (SV *class, SV *data_sv)
2277 CODE: 2761 CODE:
2278{ 2762{
2279 STRLEN datalen; 2763 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2764 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2766 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2767}
2284 OUTPUT: 2768 OUTPUT:
2285 RETVAL 2769 RETVAL
2286 2770
2287CFPlus::RW 2771DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2772new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2773 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2774 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2775 OUTPUT:
2292 RETVAL 2776 RETVAL
2293 2777
2294# fails on win32: 2778# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2779# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2780#void
2297#close (CFPlus::RW self) 2781#close (DC::RW self)
2298# CODE: 2782# CODE:
2299# (self->(close)) (self); 2783# (self->(close)) (self);
2300 2784
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2785MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2786
2303PROTOTYPES: DISABLE 2787PROTOTYPES: DISABLE
2304 2788
2305CFPlus::Channel 2789DC::Channel
2306find () 2790find ()
2307 CODE: 2791 CODE:
2308{ 2792{
2309 RETVAL = Mix_GroupAvailable (-1); 2793 RETVAL = Mix_GroupAvailable (-1);
2310 2794
2323} 2807}
2324 OUTPUT: 2808 OUTPUT:
2325 RETVAL 2809 RETVAL
2326 2810
2327void 2811void
2328halt (CFPlus::Channel self) 2812halt (DC::Channel self)
2329 CODE: 2813 CODE:
2330 Mix_HaltChannel (self); 2814 Mix_HaltChannel (self);
2331 2815
2332void 2816void
2333expire (CFPlus::Channel self, int ticks = -1) 2817expire (DC::Channel self, int ticks = -1)
2334 CODE: 2818 CODE:
2335 Mix_ExpireChannel (self, ticks); 2819 Mix_ExpireChannel (self, ticks);
2336 2820
2337void 2821void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2822fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2823 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2824 Mix_FadeOutChannel (self, ticks);
2341 2825
2342int 2826int
2343volume (CFPlus::Channel self, int volume) 2827volume (DC::Channel self, int volume)
2344 CODE: 2828 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2829 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2830 OUTPUT:
2347 RETVAL 2831 RETVAL
2348 2832
2349void 2833void
2350unregister_all_effects (CFPlus::Channel self) 2834unregister_all_effects (DC::Channel self)
2351 CODE: 2835 CODE:
2352 Mix_UnregisterAllEffects (self); 2836 Mix_UnregisterAllEffects (self);
2353 2837
2354void 2838void
2355set_panning (CFPlus::Channel self, int left, int right) 2839set_panning (DC::Channel self, int left, int right)
2356 CODE: 2840 CODE:
2357 left = CLAMP (left , 0, 255); 2841 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2842 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2843 Mix_SetPanning (self, left, right);
2360 2844
2361void 2845void
2362set_distance (CFPlus::Channel self, int distance) 2846set_distance (DC::Channel self, int distance)
2363 CODE: 2847 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2848 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2849
2366void 2850void
2367set_position (CFPlus::Channel self, int angle, int distance) 2851set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2852 CODE:
2369 2853
2370void 2854void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2855set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2856 CODE:
2373{ 2857{
2374 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));
2375 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;
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2860 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2861}
2378 2862
2379void 2863void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2864set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2865 CODE:
2382 Mix_SetReverseStereo (self, flip); 2866 Mix_SetReverseStereo (self, flip);
2383 2867
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2868MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2869
2386PROTOTYPES: DISABLE 2870PROTOTYPES: DISABLE
2387 2871
2388CFPlus::MixChunk 2872DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2873new (SV *class, DC::RW rwops)
2390 CODE: 2874 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2875 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2876 OUTPUT:
2393 RETVAL 2877 RETVAL
2394 2878
2395void 2879void
2396DESTROY (CFPlus::MixChunk self) 2880DESTROY (DC::MixChunk self)
2397 CODE: 2881 CODE:
2398 Mix_FreeChunk (self); 2882 Mix_FreeChunk (self);
2399 2883
2400int 2884int
2401volume (CFPlus::MixChunk self, int volume = -1) 2885volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2886 CODE:
2403 if (items > 1) 2887 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2888 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2889 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2890 OUTPUT:
2407 RETVAL 2891 RETVAL
2408 2892
2409CFPlus::Channel 2893DC::Channel
2410play (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)
2411 CODE: 2895 CODE:
2412{ 2896{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2897 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2898
2415 if (RETVAL < 0) 2899 if (RETVAL < 0)
2422 } 2906 }
2423} 2907}
2424 OUTPUT: 2908 OUTPUT:
2425 RETVAL 2909 RETVAL
2426 2910
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2911MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2912
2429int 2913int
2430volume (int volume = -1) 2914volume (int volume = -1)
2431 PROTOTYPE: ;$ 2915 PROTOTYPE: ;$
2432 CODE: 2916 CODE:
2444void 2928void
2445halt () 2929halt ()
2446 CODE: 2930 CODE:
2447 Mix_HaltMusic (); 2931 Mix_HaltMusic ();
2448 2932
2449CFPlus::MixMusic 2933DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2934new (SV *class, DC::RW rwops)
2451 CODE: 2935 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2936 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2937 OUTPUT:
2454 RETVAL 2938 RETVAL
2455 2939
2456void 2940void
2457DESTROY (CFPlus::MixMusic self) 2941DESTROY (DC::MixMusic self)
2458 CODE: 2942 CODE:
2459 Mix_FreeMusic (self); 2943 Mix_FreeMusic (self);
2460 2944
2461int 2945int
2462play (CFPlus::MixMusic self, int loops = -1) 2946play (DC::MixMusic self, int loops = -1)
2463 CODE: 2947 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2948 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2949 OUTPUT:
2466 RETVAL 2950 RETVAL
2467 2951
2468void 2952void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2953fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2954 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2955 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2956
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2957MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2958
2475PROTOTYPES: ENABLE 2959PROTOTYPES: ENABLE
2476 2960
2477BOOT: 2961BOOT:
2478{ 2962{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2963 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2964 static const struct {
2481 const char *name; 2965 const char *name;
2482 IV iv; 2966 IV iv;
2483 } *civ, const_iv[] = { 2967 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2968# define const_iv(name) { # name, (IV)name }
2485 const_iv (GL_VENDOR), 2969 const_iv (GL_VENDOR),
2486 const_iv (GL_VERSION), 2970 const_iv (GL_VERSION),
2487 const_iv (GL_EXTENSIONS), 2971 const_iv (GL_EXTENSIONS),
2972 const_iv (GL_MAX_TEXTURE_UNITS),
2488 const_iv (GL_COLOR_MATERIAL), 2973 const_iv (GL_COLOR_MATERIAL),
2489 const_iv (GL_SMOOTH), 2974 const_iv (GL_SMOOTH),
2490 const_iv (GL_FLAT), 2975 const_iv (GL_FLAT),
2491 const_iv (GL_DITHER), 2976 const_iv (GL_DITHER),
2492 const_iv (GL_BLEND), 2977 const_iv (GL_BLEND),
2504 const_iv (GL_ZERO), 2989 const_iv (GL_ZERO),
2505 const_iv (GL_SRC_ALPHA), 2990 const_iv (GL_SRC_ALPHA),
2506 const_iv (GL_DST_ALPHA), 2991 const_iv (GL_DST_ALPHA),
2507 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2992 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2508 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),
2509 const_iv (GL_SRC_ALPHA_SATURATE), 2998 const_iv (GL_SRC_ALPHA_SATURATE),
2510 const_iv (GL_RGB), 2999 const_iv (GL_RGB),
2511 const_iv (GL_RGBA), 3000 const_iv (GL_RGBA),
2512 const_iv (GL_RGBA4), 3001 const_iv (GL_RGBA4),
2513 const_iv (GL_RGBA8), 3002 const_iv (GL_RGBA8),
2519 const_iv (GL_INTENSITY), 3008 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 3009 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 3010 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 3011 const_iv (GL_FLOAT),
2523 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),
2524 const_iv (GL_COMPILE), 3019 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 3020 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 3021 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 3022 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 3023 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3062 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 3063 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 3064 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 3065 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 3066 const_iv (GL_GENERATE_MIPMAP_HINT),
3067 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 3068 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 3069 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 3070 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 3071 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 3072 const_iv (GL_V3F),
2577 const_iv (GL_T2F_V3F), 3073 const_iv (GL_T2F_V3F),
2578 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),
2579# undef const_iv 3078# undef const_iv
2580 }; 3079 };
2581 3080
2582 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; )
2583 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3082 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2584 3083
2585 texture_av = newAV (); 3084 texture_av = newAV ();
2586 AvREAL_off (texture_av); 3085 AvREAL_off (texture_av);
2587} 3086}
2588 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
2589char * 3097char *
2590gl_vendor () 3098gl_vendor ()
2591 CODE: 3099 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 3100 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 3101 OUTPUT:
2642 3150
2643void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3151void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2644 CODE: 3152 CODE:
2645 gl_BlendFuncSeparate (sa, da, saa, daa); 3153 gl_BlendFuncSeparate (sa, da, saa, daa);
2646 3154
3155# void glBlendEquation (int se)
3156
2647void glDepthMask (int flag) 3157void glDepthMask (int flag)
2648 3158
2649void glLogicOp (int opcode) 3159void glLogicOp (int opcode)
2650 3160
2651void glColorMask (int red, int green, int blue, int alpha) 3161void glColorMask (int red, int green, int blue, int alpha)
2685void glRotate (float angle, float x, float y, float z) 3195void glRotate (float angle, float x, float y, float z)
2686 CODE: 3196 CODE:
2687 glRotatef (angle, x, y, z); 3197 glRotatef (angle, x, y, z);
2688 3198
2689void 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: @
2690 ALIAS: 3201 ALIAS:
2691 glColor_premultiply = 1 3202 glColor_premultiply = 1
2692 CODE: 3203 CODE:
2693 if (ix) 3204 if (ix)
2694 { 3205 {
2714 3225
2715void glRect (float x1, float y1, float x2, float y2) 3226void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 3227 CODE:
2717 glRectf (x1, y1, x2, y2); 3228 glRectf (x1, y1, x2, y2);
2718 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
2719PROTOTYPES: ENABLE 3239PROTOTYPES: ENABLE
2720 3240
2721void glBegin (int mode) 3241void glBegin (int mode)
2722 3242
2723void glEnd () 3243void glEnd ()
2755void 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)
2756 CODE: 3276 CODE:
2757 if (gl.SeparableFilter2D) 3277 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3278 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 3279
2760void 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)
2761 3281
2762void 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)
2763 3283
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 3284void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 3285
2791 3311
2792void glEndList () 3312void glEndList ()
2793 3313
2794void glCallList (int list) 3314void glCallList (int list)
2795 3315
2796MODULE = 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
2797 3322
2798PROTOTYPES: DISABLE 3323PROTOTYPES: DISABLE
2799 3324
2800void 3325void
2801find_widget (SV *self, NV x, NV y) 3326find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 3330 XPUSHs (self);
2806} 3331}
2807 3332
2808BOOT: 3333BOOT:
2809{ 3334{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3335 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 3336
2812 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);
2813 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);
2814 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);
2815 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);
2816} 3341}
2817 3342
2818void 3343void
2819draw (SV *self) 3344draw (SV *self)
2820 CODE: 3345 CODE:
2824 NV x, y, w, h; 3349 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 3350 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 3351 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 3352 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 3353 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 3354 double draw_x, draw_y;
2831 3355
2832 if (!SvROK (self)) 3356 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3357 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 3358
2835 hv = (HV *)SvRV (self); 3359 hv = (HV *)SvRV (self);
2836 3360
2837 if (SvTYPE (hv) != SVt_PVHV) 3361 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3362 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 3363
2840 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.;
2841 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.;
2842 3366
2843 if (!h || !w) 3367 if (!h || !w)
2863 { 3387 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3388 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 3389
2866 if (svp && SvTRUE (*svp)) 3390 if (svp && SvTRUE (*svp))
2867 { 3391 {
2868 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);
2869 glEnable (GL_BLEND); 3393 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3394 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 3395 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 3396 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 3397 glVertex2f (w, 0);
2876 glEnd (); 3400 glEnd ();
2877 glDisable (GL_BLEND); 3401 glDisable (GL_BLEND);
2878 } 3402 }
2879 } 3403 }
2880#if 0 3404#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 3405 // draw borders, for debugging
2882 glPushMatrix; 3406 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 3407 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 3408 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 3409 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 3410 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3411 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3412 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3413 glVertex2f (0 , h - 1);
2890 glEnd; 3414 glEnd ();
2891 glPopMatrix; 3415 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3416#endif
2895 PUSHMARK (SP); 3417 PUSHMARK (SP);
2896 XPUSHs (self); 3418 XPUSHs (self);
2897 PUTBACK; 3419 PUTBACK;
2898 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