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.297 by root, Tue Dec 22 00:08:11 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines