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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
34#include <SDL_mixer.h> 41#include <SDL_mixer.h>
35#include <SDL_opengl.h> 42#include <SDL_opengl.h>
36 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
37#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
39 51
40#include <glib/gmacros.h> 52#include <glib/gmacros.h>
41 53
42#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
43 66
44#ifndef _WIN32 67#ifndef _WIN32
45# include <sys/types.h> 68# include <sys/types.h>
46# include <sys/socket.h> 69# include <sys/socket.h>
47# include <netinet/in.h> 70# include <netinet/in.h>
48# include <netinet/tcp.h> 71# include <netinet/tcp.h>
49# include <inttypes.h> 72# include <inttypes.h>
50#endif 73#endif
51 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 85
54#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
55 88
56#define MAP_EXTEND_X 32 89#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 90#define MAP_EXTEND_Y 512
58 91
59#define MIN_FONT_HEIGHT 10 92#define MIN_FONT_HEIGHT 10
60 93
61#if 0 94/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 95#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 96
64# define PARACHUTE 0 97#define KMOD_LRAM 0x10000 // our extension
65#endif 98
99#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3
66 102
67static AV *texture_av; 103static AV *texture_av;
68 104
69static struct 105static struct
70{ 106{
107 av_push (texture_av, (SV *)(size_t)name); 143 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 144 glDeleteTextures (1, &name);
109} 145}
110 146
111#include "texcache.c" 147#include "texcache.c"
148#include "rendercache.c"
112 149
113#include "pango-font.c" 150#include "pango-font.c"
114#include "pango-fontmap.c" 151#include "pango-fontmap.c"
115#include "pango-render.c" 152#include "pango-render.c"
116 153
154typedef IV DC__Channel;
155typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 156typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 157typedef Mix_Music *DC__MixMusic;
119 158
120typedef PangoFontDescription *CFPlus__Font; 159typedef PangoFontDescription *DC__Font;
121 160
122static int 161static int
123shape_attr_p (PangoLayoutRun *run) 162shape_attr_p (PangoLayoutRun *run)
124{ 163{
125 GSList *attrs = run->item->analysis.extra_attrs; 164 GSList *attrs = run->item->analysis.extra_attrs;
139 178
140typedef struct cf_layout { 179typedef struct cf_layout {
141 PangoLayout *pl; 180 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 181 float r, g, b, a; // default color for rgba mode
143 int base_height; 182 int base_height;
144 CFPlus__Font font; 183 DC__Font font;
184 rc_t *rc;
145} *CFPlus__Layout; 185} *DC__Layout;
146 186
147static CFPlus__Font default_font; 187static DC__Font default_font;
148static PangoContext *opengl_context; 188static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 189static PangoFontMap *opengl_fontmap;
150 190
151static void 191static void
152substitute_func (FcPattern *pattern, gpointer data) 192substitute_func (FcPattern *pattern, gpointer data)
157#endif 197#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 198 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 199}
160 200
161static void 201static void
162layout_update_font (CFPlus__Layout self) 202layout_update_font (DC__Layout self)
163{ 203{
164 /* 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
165 * reasonably well with bitstream vera 205 * reasonably well with dejavu/bistream fonts
166 */ 206 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 207 PangoFontDescription *font = self->font ? self->font : default_font;
168 208
169 pango_font_description_set_absolute_size (font, 209 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 210 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 211
172 pango_layout_set_font_description (self->pl, font); 212 pango_layout_set_font_description (self->pl, font);
173} 213}
174 214
175static void 215static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 216layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 217{
178 PangoRectangle rect; 218 PangoRectangle rect;
179 219
180 // get_pixel_* wrongly rounds down 220 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 221 pango_layout_get_extents (self->pl, 0, &rect);
192 232
193typedef uint16_t tileid; 233typedef uint16_t tileid;
194typedef uint16_t faceid; 234typedef uint16_t faceid;
195 235
196typedef struct { 236typedef struct {
197 int name; 237 GLuint name;
198 int w, h; 238 int w, h;
199 float s, t; 239 float s, t;
200 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
201 tileid smoothtile; 241 tileid smoothtile;
202 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
203} maptex; 244} maptex;
204 245
205typedef struct { 246typedef struct {
206 uint32_t player; 247 uint32_t player;
207 tileid tile[3]; 248 tileid tile[3];
220 int faces; tileid *face2tile; // [faceid] 261 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 262 int texs; maptex *tex; // [tileid]
222 263
223 int32_t rows; 264 int32_t rows;
224 maprow *row; 265 maprow *row;
225} *CFPlus__Map; 266} *DC__Map;
226 267
227static char * 268static char *
228prepend (char *ptr, int sze, int inc) 269prepend (char *ptr, int sze, int inc)
229{ 270{
230 char *p; 271 char *p;
268 self->texs *= 2; 309 self->texs *= 2;
269 } 310 }
270} 311}
271 312
272static maprow * 313static maprow *
273map_get_row (CFPlus__Map self, int y) 314map_get_row (DC__Map self, int y)
274{ 315{
275 if (0 > y) 316 if (0 > y)
276 { 317 {
277 int extend = - y + MAP_EXTEND_Y; 318 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 319 Prepend (maprow, self->row, self->rows, extend);
316 357
317 return row->col + (x - row->c0); 358 return row->col + (x - row->c0);
318} 359}
319 360
320static mapcell * 361static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 362map_get_cell (DC__Map self, int x, int y)
322{ 363{
323 return row_get_cell (map_get_row (self, y), x); 364 return row_get_cell (map_get_row (self, y), x);
324} 365}
325 366
326static void 367static void
327map_clear (CFPlus__Map self) 368map_clear (DC__Map self)
328{ 369{
329 int r; 370 int r;
330 371
331 for (r = 0; r < self->rows; r++) 372 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 373 Safefree (self->row[r].col);
339 self->oy = 0; 380 self->oy = 0;
340 self->row = 0; 381 self->row = 0;
341 self->rows = 0; 382 self->rows = 0;
342} 383}
343 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
344static void 395static void
345map_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)
346{ 397{
347 int x, y; 398 int x, y;
348 maprow *row; 399 maprow *row;
349 mapcell *cell; 400 mapcell *cell;
350 401
362 if (x >= row->c1) 413 if (x >= row->c1)
363 break; 414 break;
364 415
365 cell = row->col + x - row->c0; 416 cell = row->col + x - row->c0;
366 417
367 cell->darkness = 0; 418 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 419 }
372 } 420 }
373} 421}
374 422
375typedef struct { 423typedef struct {
429 n |= n >> 16; 477 n |= n >> 16;
430 478
431 return n + 1; 479 return n + 1;
432} 480}
433 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
434/* SDL should provide this, really. */ 493/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 494#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 495#define SDLK_MODIFIER_MAX 314
437 496
438/******************************************************************************/ 497/******************************************************************************/
476 return 0; 535 return 0;
477 536
478 return 1; 537 return 1;
479} 538}
480 539
481MODULE = 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
482 593
483PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
484 595
485BOOT: 596BOOT:
486{ 597{
487 HV *stash = gv_stashpv ("CFPlus", 1); 598 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 599 static const struct {
489 const char *name; 600 const char *name;
490 IV iv; 601 IV iv;
491 } *civ, const_iv[] = { 602 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 603# define const_iv(name) { # name, (IV)name }
514 625
515 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 628 const_iv (SDL_APPACTIVE),
518 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),
519 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 684 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 685 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 686 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 758 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
599 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)
600# undef const_iv 796# undef const_iv
601 }; 797 };
602 798
603 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; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 818
623NV floor (NV x) 819NV floor (NV x)
624 820
625NV ceil (NV x) 821NV ceil (NV x)
626 822
823IV minpot (UV n)
824
825IV popcount (UV n)
826
627void 827void
628pango_init () 828pango_init ()
629 CODE: 829 CODE:
630{ 830{
631 opengl_fontmap = pango_opengl_font_map_new (); 831 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 832 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 833 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
834 /*pango_context_set_font_description (opengl_context, default_font);*/
835#if PANGO_VERSION_CHECK (1, 15, 2)
836 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
837 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
838#endif
634} 839}
635 840
636char *
637SDL_GetError () 841char *SDL_GetError ()
638 842
639int 843void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 844
642void 845int SDL_Init (U32 flags)
846
847int SDL_InitSubSystem (U32 flags)
848
849void SDL_QuitSubSystem (U32 flags)
850
643SDL_Quit () 851void SDL_Quit ()
852
853int SDL_GL_SetAttribute (int attr, int value)
854
855int SDL_GL_GetAttribute (int attr)
856 CODE:
857 if (SDL_GL_GetAttribute (attr, &RETVAL))
858 XSRETURN_UNDEF;
859 OUTPUT:
860 RETVAL
644 861
645void 862void
646SDL_ListModes (int rgb, int alpha) 863SDL_ListModes (int rgb, int alpha)
647 PPCODE: 864 PPCODE:
648{ 865{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 879 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 880
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 881 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 882 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 883
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 884 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 885
672 if (m && m != (SDL_Rect **)-1) 886 if (m && m != (SDL_Rect **)-1)
673 while (*m) 887 while (*m)
674 { 888 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 889 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 890 {
677 AV *av = newAV (); 891 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 892 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 893 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 894 av_push (av, newSViv (rgb));
704 918
705 if (RETVAL) 919 if (RETVAL)
706 { 920 {
707 av_clear (texture_av); 921 av_clear (texture_av);
708 922
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 923 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 924#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 925#include "glfunc.h"
712#undef GL_FUNC 926#undef GL_FUNC
713 } 927 }
714} 928}
721char * 935char *
722SDL_GetKeyName (int sym) 936SDL_GetKeyName (int sym)
723 937
724int 938int
725SDL_GetAppState () 939SDL_GetAppState ()
940
941int
942SDL_GetModState ()
726 943
727void 944void
728poll_events () 945poll_events ()
729 PPCODE: 946 PPCODE:
730{ 947{
740 { 957 {
741 case SDL_KEYDOWN: 958 case SDL_KEYDOWN:
742 case SDL_KEYUP: 959 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 960 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 961 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 962 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 963 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 964 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 965 break;
749 966
750 case SDL_ACTIVEEVENT: 967 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 968 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 986 x = ev.motion.x;
770 y = ev.motion.y; 987 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 988 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 989 }
773 990
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 991 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 992 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 993 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 994 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 995 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 996 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 997 }
781 break; 998 break;
782 999
783 case SDL_MOUSEBUTTONDOWN: 1000 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1001 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1003
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1004 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1005 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1006 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1007 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1012 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1013 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1014 break;
798 } 1015 }
799 1016
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1017 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 1018 }
802} 1019}
803 1020
804int 1021int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1022Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1023 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1024 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1025 Mix_ChannelFinished (channel_finished);
809 1026
810void 1027void
1028Mix_QuerySpec ()
1029 PPCODE:
1030{
1031 int freq, channels;
1032 Uint16 format;
1033
1034 if (Mix_QuerySpec (&freq, &format, &channels))
1035 {
1036 EXTEND (SP, 3);
1037 PUSHs (sv_2mortal (newSViv (freq)));
1038 PUSHs (sv_2mortal (newSViv (format)));
1039 PUSHs (sv_2mortal (newSViv (channels)));
1040 }
1041}
1042
1043void
811Mix_CloseAudio () 1044Mix_CloseAudio ()
812 1045
813int 1046int
814Mix_AllocateChannels (int numchans = -1) 1047Mix_AllocateChannels (int numchans = -1)
1048
1049const char *
1050Mix_GetError ()
815 1051
816void 1052void
817lowdelay (int fd, int val = 1) 1053lowdelay (int fd, int val = 1)
818 CODE: 1054 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1055 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1081 }
846 } 1082 }
847#endif 1083#endif
848} 1084}
849 1085
850void 1086int
851add_font (char *file) 1087add_font (char *file)
852 CODE: 1088 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT:
1091 RETVAL
854 1092
855void 1093void
856load_image_inline (SV *image_) 1094load_image_inline (SV *image_)
857 ALIAS: 1095 ALIAS:
858 load_image_file = 1 1096 load_image_file = 1
861 STRLEN image_len; 1099 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1100 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1101 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1102 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1103 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1104 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1105 : SDL_RWFromConstMem (image, image_len);
868 1106
869 if (!rw) 1107 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1108 croak ("load_image: %s", SDL_GetError ());
871 1109
944void 1182void
945error (char *message) 1183error (char *message)
946 CODE: 1184 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1185 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1186#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1188#endif
951 1189
952void 1190void
953fatal (char *message) 1191fatal (char *message)
954 CODE: 1192 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1193 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1194#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1195 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1196#endif
959 _exit (1); 1197 _exit (1);
960 1198
961void 1199void
962_exit (int retval = 0) 1200_exit (int retval = 0)
974#if DEBUG 1212#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1213 VALGRIND_DO_LEAK_CHECK;
976#endif 1214#endif
977} 1215}
978 1216
979MODULE = CFPlus PACKAGE = CFPlus::Font 1217int
1218SvREFCNT (SV *sv)
1219 CODE:
1220 RETVAL = SvREFCNT (sv);
1221 OUTPUT:
1222 RETVAL
1223
1224MODULE = Deliantra::Client PACKAGE = DC::Font
980 1225
981PROTOTYPES: DISABLE 1226PROTOTYPES: DISABLE
982 1227
983CFPlus::Font 1228DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1229new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1230 CODE:
986{ 1231{
987 int count; 1232 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1233 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1236}
992 OUTPUT: 1237 OUTPUT:
993 RETVAL 1238 RETVAL
994 1239
995void 1240void
996DESTROY (CFPlus::Font self) 1241DESTROY (DC::Font self)
997 CODE: 1242 CODE:
998 pango_font_description_free (self); 1243 pango_font_description_free (self);
999 1244
1000void 1245void
1001make_default (CFPlus::Font self) 1246make_default (DC::Font self)
1002 PROTOTYPE: $ 1247 PROTOTYPE: $
1003 CODE: 1248 CODE:
1004 default_font = self; 1249 default_font = self;
1005 1250
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1251MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1252
1008PROTOTYPES: DISABLE 1253PROTOTYPES: DISABLE
1009 1254
1010void 1255void
1011reset_glyph_cache () 1256glyph_cache_backup ()
1012 PROTOTYPE: 1257 PROTOTYPE:
1013 CODE: 1258 CODE:
1259 tc_backup ();
1260
1261void
1262glyph_cache_restore ()
1263 PROTOTYPE:
1264 CODE:
1014 tc_clear (); 1265 tc_restore ();
1015 1266
1016CFPlus::Layout 1267DC::Layout
1017new (SV *class) 1268new (SV *class)
1018 CODE: 1269 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1270 New (0, RETVAL, 1, struct cf_layout);
1020 1271
1021 RETVAL->pl = pango_layout_new (opengl_context); 1272 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1274 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1275 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1276 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1277 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1278 RETVAL->font = 0;
1279 RETVAL->rc = rc_alloc ();
1028 1280
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1281 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1282 layout_update_font (RETVAL);
1031 OUTPUT: 1283 OUTPUT:
1032 RETVAL 1284 RETVAL
1033 1285
1034void 1286void
1035DESTROY (CFPlus::Layout self) 1287DESTROY (DC::Layout self)
1036 CODE: 1288 CODE:
1037 g_object_unref (self->pl); 1289 g_object_unref (self->pl);
1290 rc_free (self->rc);
1038 Safefree (self); 1291 Safefree (self);
1039 1292
1040void 1293void
1041set_text (CFPlus::Layout self, SV *text_) 1294set_text (DC::Layout self, SV *text_)
1042 CODE: 1295 CODE:
1043{ 1296{
1044 STRLEN textlen; 1297 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1298 char *text = SvPVutf8 (text_, textlen);
1046 1299
1047 pango_layout_set_text (self->pl, text, textlen); 1300 pango_layout_set_text (self->pl, text, textlen);
1048} 1301}
1049 1302
1050void 1303void
1051set_markup (CFPlus::Layout self, SV *text_) 1304set_markup (DC::Layout self, SV *text_)
1052 CODE: 1305 CODE:
1053{ 1306{
1054 STRLEN textlen; 1307 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1308 char *text = SvPVutf8 (text_, textlen);
1056 1309
1057 pango_layout_set_markup (self->pl, text, textlen); 1310 pango_layout_set_markup (self->pl, text, textlen);
1058} 1311}
1059 1312
1060void 1313void
1061set_shapes (CFPlus::Layout self, ...) 1314set_shapes (DC::Layout self, ...)
1062 CODE: 1315 CODE:
1063{ 1316{
1064 PangoAttrList *attrs = 0; 1317 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1318 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1319 const char *pos = text;
1101 if (attrs) 1354 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1355 pango_layout_set_attributes (self->pl, attrs);
1103} 1356}
1104 1357
1105void 1358void
1106get_shapes (CFPlus::Layout self) 1359get_shapes (DC::Layout self)
1107 PPCODE: 1360 PPCODE:
1108{ 1361{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1362 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1363
1111 do 1364 do
1112 { 1365 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1366 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1367
1115 if (run && shape_attr_p (run)) 1368 if (run && shape_attr_p (run))
1116 { 1369 {
1117 PangoRectangle extents; 1370 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1371 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1379
1127 pango_layout_iter_free (iter); 1380 pango_layout_iter_free (iter);
1128} 1381}
1129 1382
1130int 1383int
1131has_wrapped (CFPlus::Layout self) 1384has_wrapped (DC::Layout self)
1132 CODE: 1385 CODE:
1133{ 1386{
1134 int lines = 1; 1387 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1136 1389
1141} 1394}
1142 OUTPUT: 1395 OUTPUT:
1143 RETVAL 1396 RETVAL
1144 1397
1145SV * 1398SV *
1146get_text (CFPlus::Layout self) 1399get_text (DC::Layout self)
1147 CODE: 1400 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1401 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1402 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1403 OUTPUT:
1151 RETVAL 1404 RETVAL
1152 1405
1153void 1406void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1407set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1408 CODE:
1156 self->r = r; 1409 self->r = r;
1157 self->g = g; 1410 self->g = g;
1158 self->b = b; 1411 self->b = b;
1159 self->a = a; 1412 self->a = a;
1160 1413
1161void 1414void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1415set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1416 CODE:
1164 if (self->font != font) 1417 if (self->font != font)
1165 { 1418 {
1166 self->font = font; 1419 self->font = font;
1167 layout_update_font (self); 1420 layout_update_font (self);
1168 } 1421 }
1169 1422
1170void 1423void
1171set_height (CFPlus::Layout self, int base_height) 1424set_height (DC::Layout self, int base_height)
1172 CODE: 1425 CODE:
1173 if (self->base_height != base_height) 1426 if (self->base_height != base_height)
1174 { 1427 {
1175 self->base_height = base_height; 1428 self->base_height = base_height;
1176 layout_update_font (self); 1429 layout_update_font (self);
1177 } 1430 }
1178 1431
1179void 1432void
1180set_width (CFPlus::Layout self, int max_width = -1) 1433set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1434 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1435 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1436
1184void 1437void
1185set_indent (CFPlus::Layout self, int indent) 1438set_indent (DC::Layout self, int indent)
1186 CODE: 1439 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1440 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1441
1189void 1442void
1190set_spacing (CFPlus::Layout self, int spacing) 1443set_spacing (DC::Layout self, int spacing)
1191 CODE: 1444 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1445 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1446
1194void 1447void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1448set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1449 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1450 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1451 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1452 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1453 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1454 : PANGO_ELLIPSIZE_NONE
1202 ); 1455 );
1203 1456
1204void 1457void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1458set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1459 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1460 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1461
1209void 1462void
1210size (CFPlus::Layout self) 1463size (DC::Layout self)
1211 PPCODE: 1464 PPCODE:
1212{ 1465{
1213 int w, h; 1466 int w, h;
1214 1467
1215 layout_get_pixel_size (self, &w, &h); 1468 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1471 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1472 PUSHs (sv_2mortal (newSViv (h)));
1220} 1473}
1221 1474
1222int 1475int
1223descent (CFPlus::Layout self) 1476descent (DC::Layout self)
1224 CODE: 1477 CODE:
1225{ 1478{
1226 PangoRectangle rect; 1479 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1480 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1481 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1482 RETVAL = PANGO_DESCENT (rect);
1230} 1483}
1231 OUTPUT: 1484 OUTPUT:
1232 RETVAL 1485 RETVAL
1233 1486
1234int 1487int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1488xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1489 CODE:
1237{ 1490{
1238 int index, trailing; 1491 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1492 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1493 RETVAL = index + trailing;
1241} 1494}
1242 OUTPUT: 1495 OUTPUT:
1243 RETVAL 1496 RETVAL
1244 1497
1245void 1498void
1246cursor_pos (CFPlus::Layout self, int index) 1499cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1500 PPCODE:
1248{ 1501{
1249 PangoRectangle strong_pos; 1502 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1503 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1504
1252 EXTEND (SP, 3); 1505 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1508 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1509}
1257 1510
1258void 1511void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1512index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1513 PPCODE:
1261{ 1514{
1262 int line, x; 1515 int line, x;
1263 1516
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1517 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1518#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1519 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1520 --line;
1521#endif
1267 EXTEND (SP, 2); 1522 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1523 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1524 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1525}
1271 1526
1272void 1527void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1528line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1529 PPCODE:
1275{ 1530{
1276 PangoLayoutLine *lp; 1531 PangoLayoutLine *lp;
1277 int index, trailing; 1532 int index, trailing;
1278 1533
1279 if (line < 0) 1534 if (line < 0)
1280 XSRETURN_EMPTY; 1535 XSRETURN_EMPTY;
1281 1536
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1537 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1538 XSRETURN_EMPTY; /* do better */
1284 1539
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1540 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1541
1287 EXTEND (SP, 2); 1542 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1548 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1549 }
1295} 1550}
1296 1551
1297void 1552void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1553render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1554 CODE:
1555 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1556 pango_opengl_render_layout_subpixel (
1301 self->pl, 1557 self->pl,
1558 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1559 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1560 self->r, self->g, self->b, self->a,
1304 flags 1561 flags
1305 ); 1562 );
1563 // we assume that context_change actually clears/frees stuff
1564 // and does not do any recomputation...
1565 pango_layout_context_changed (self->pl);
1306 1566
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1567void
1568draw (DC::Layout self)
1569 CODE:
1570{
1571 glEnable (GL_TEXTURE_2D);
1572 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1573 glEnable (GL_BLEND);
1574 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1575 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1576 glEnable (GL_ALPHA_TEST);
1577 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1578
1579 rc_draw (self->rc);
1580
1581 glDisable (GL_ALPHA_TEST);
1582 glDisable (GL_BLEND);
1583 glDisable (GL_TEXTURE_2D);
1584}
1585
1586MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1587
1309PROTOTYPES: ENABLE 1588PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1589
1313void 1590void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1591pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1592 CODE:
1316{ 1593{
1343 HV *hv = (HV *)SvRV (self); 1620 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1621 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1622 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1623 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1624
1625 if (name <= 0)
1626 XSRETURN_EMPTY;
1627
1348 if (items < 5) 1628 if (items < 5)
1349 { 1629 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1630 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1631 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1632 }
1379 glDisable (GL_ALPHA_TEST); 1659 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1660 glDisable (GL_BLEND);
1381 } 1661 }
1382} 1662}
1383 1663
1664void
1665draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1666 PROTOTYPE: @
1667 CODE:
1668{
1669 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1);
1673
1674 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.);
1677
1678 if (blend > 0.f)
1679 {
1680 float S2, T2; /* 0. 0. for texture 2 */
1681 float w = w1 > w2 ? w1 : w2;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend };
1684
1685 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1688
1689 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1690 gl.ActiveTexture (GL_TEXTURE1);
1691 glEnable (GL_TEXTURE_2D);
1692 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694
1695 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699
1700 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1706
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712
1713 s1 *= w / w1;
1714 t1 *= h / h1;
1715
1716 dx *= -3.f / w2;
1717 dy *= -3.f / h2;
1718 dx *= w / w2;
1719 dy *= h / h2;
1720
1721 s2 *= w / w2;
1722 t2 *= h / h2;
1723
1724 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1728 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1729 glEnd ();
1730
1731 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0);
1733 }
1734 else
1735 {
1736 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738
1739 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1744 glEnd ();
1745 }
1746
1747 glPopMatrix ();
1748
1749 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND);
1751}
1752
1384IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1753IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1385 CODE: 1754 CODE:
1386{ 1755{
1387 GLint width; 1756 GLint width;
1388 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1757 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1390 RETVAL = width > 0; 1759 RETVAL = width > 0;
1391} 1760}
1392 OUTPUT: 1761 OUTPUT:
1393 RETVAL 1762 RETVAL
1394 1763
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1764MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1765
1397PROTOTYPES: DISABLE 1766PROTOTYPES: DISABLE
1398 1767
1399CFPlus::Map 1768DC::Map
1400new (SV *class) 1769new (SV *class)
1401 CODE: 1770 CODE:
1402 New (0, RETVAL, 1, struct map); 1771 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1772 RETVAL->x = 0;
1404 RETVAL->y = 0; 1773 RETVAL->y = 0;
1412 RETVAL->row = 0; 1781 RETVAL->row = 0;
1413 OUTPUT: 1782 OUTPUT:
1414 RETVAL 1783 RETVAL
1415 1784
1416void 1785void
1417DESTROY (CFPlus::Map self) 1786DESTROY (DC::Map self)
1418 CODE: 1787 CODE:
1419{ 1788{
1420 map_clear (self); 1789 map_clear (self);
1421 Safefree (self->face2tile); 1790 Safefree (self->face2tile);
1422 Safefree (self->tex); 1791 Safefree (self->tex);
1423 Safefree (self); 1792 Safefree (self);
1424} 1793}
1425 1794
1426void 1795void
1427resize (CFPlus::Map self, int map_width, int map_height) 1796resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1797 CODE:
1429 self->w = map_width; 1798 self->w = map_width;
1430 self->h = map_height; 1799 self->h = map_height;
1431 1800
1432void 1801void
1433clear (CFPlus::Map self) 1802clear (DC::Map self)
1434 CODE: 1803 CODE:
1435 map_clear (self); 1804 map_clear (self);
1436 1805
1437void 1806void
1438set_tileid (CFPlus::Map self, int face, int tile) 1807set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1808 CODE:
1440{ 1809{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1810 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1811 need_texid (self, tile);
1443} 1812}
1444 1813
1445void 1814void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1815set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1816 CODE:
1448{ 1817{
1449 tileid texid; 1818 tileid texid;
1450 maptex *tex; 1819 maptex *tex;
1451 1820
1464 tex->smoothtile = self->face2tile [smooth]; 1833 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1834 tex->smoothlevel = level;
1466} 1835}
1467 1836
1468void 1837void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1838set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1839 CODE:
1471{ 1840{
1472 need_texid (self, texid); 1841 need_texid (self, texid);
1473 1842
1474 { 1843 {
1493 // use uglier nearest interpolation because linear suffers 1862 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1863 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1864 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1865}
1497 1866
1867void
1868expire_textures (DC::Map self, int texid, int count)
1869 PPCODE:
1870 for (; texid < self->texs && count; ++texid, --count)
1871 {
1872 maptex *tex = self->tex + texid;
1873
1874 if (tex->name)
1875 {
1876 if (tex->unused)
1877 {
1878 tex->name = 0;
1879 tex->unused = 0;
1880 XPUSHs (sv_2mortal (newSViv (texid)));
1881 }
1882 else
1883 tex->unused = 1;
1884 }
1885 }
1886
1498int 1887int
1499ox (CFPlus::Map self) 1888ox (DC::Map self)
1500 ALIAS: 1889 ALIAS:
1501 oy = 1 1890 oy = 1
1502 x = 2 1891 x = 2
1503 y = 3 1892 y = 3
1504 w = 4 1893 w = 4
1515 } 1904 }
1516 OUTPUT: 1905 OUTPUT:
1517 RETVAL 1906 RETVAL
1518 1907
1519void 1908void
1520scroll (CFPlus::Map self, int dx, int dy) 1909scroll (DC::Map self, int dx, int dy)
1521 CODE: 1910 CODE:
1522{ 1911{
1523 if (dx > 0) 1912 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1913 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1914 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1929 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1930 self->y += MAP_EXTEND_Y;
1542 } 1931 }
1543} 1932}
1544 1933
1545void 1934SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1935map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1936 CODE:
1548{ 1937{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1938 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1939 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1940 mapcell *cell;
1552 int x, y, flags; 1941 int x, y, z, flags;
1942 AV *missing = newAV ();
1943 RETVAL = newRV_noinc ((SV *)missing);
1553 1944
1554 while (data < data_end - 1) 1945 while (data < data_end - 1)
1555 { 1946 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1947 flags = (data [0] << 8) + data [1]; data += 2;
1557 1948
1577 uint8_t ext, cmd; 1968 uint8_t ext, cmd;
1578 1969
1579 do 1970 do
1580 { 1971 {
1581 ext = *data++; 1972 ext = *data++;
1582 cmd = ext & 0x3f; 1973 cmd = ext & 0x7f;
1583 1974
1584 if (cmd < 4) 1975 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1976 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1977 else if (cmd == 5) // health
1587 { 1978 {
1590 } 1981 }
1591 else if (cmd == 6) // monster width 1982 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1983 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1984 else if (cmd == 0x47)
1594 { 1985 {
1595 if (*data == 4) 1986 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1987 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1988 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1989 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1990
1598 data += *data + 1; 1991 data += *data + 1;
1599 } 1992 }
1600 else if (cmd == 8) // cell flags 1993 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1994 cell->flags = *data++;
1608 } 2001 }
1609 else 2002 else
1610 cell->darkness = *data++ + 1; 2003 cell->darkness = *data++ + 1;
1611 } 2004 }
1612 2005
2006 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 2007 if (flags & (4 >> z))
1614 { 2008 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 2009 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 2010 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 2011 cell->tile [z] = self->face2tile [face];
2012
2013 if (cell->tile [z])
2014 {
2015 maptex *tex = self->tex + cell->tile [z];
2016 tex->unused = 0;
2017 if (!tex->name)
2018 av_push (missing, newSViv (cell->tile [z]));
2019
2020 if (tex->smoothtile)
2021 {
2022 maptex *smooth = self->tex + tex->smoothtile;
2023 smooth->unused = 0;
2024 if (!smooth->name)
2025 av_push (missing, newSViv (tex->smoothtile));
2026 }
2027 }
1618 } 2028 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 2029 }
1634 else 2030 else
1635 cell->darkness = 0; 2031 CELL_CLEAR (cell);
1636 } 2032 }
1637} 2033}
2034 OUTPUT:
2035 RETVAL
1638 2036
1639SV * 2037SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2038mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 2039 CODE:
1642{ 2040{
1643 int x1, x; 2041 int x1, x;
1644 int y1, y; 2042 int y1, y;
1645 int z; 2043 int z;
1690} 2088}
1691 OUTPUT: 2089 OUTPUT:
1692 RETVAL 2090 RETVAL
1693 2091
1694void 2092void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2093draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 2094 CODE:
1697{ 2095{
2096 int x, y, z;
2097
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2099 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2100 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 2101 smooth_key skey;
1702 int x, y, z; 2102 int pl_x, pl_y;
1703 int last_name; 2103 maptex pl_tex;
2104 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc ();
2106 rc_key_t key;
2107 rc_array_t *arr, *arr_hidden;
1704 2108
2109 pl_tex.name = 0;
2110
1705 // thats current max. sorry. 2111 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2112 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2113 if (sh > 255) sh = 255;
1708 2114
1709 // clear key, in case of extra padding 2115 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2116 memset (&skey, 0, sizeof (skey));
1711 2117
1712 glColor4ub (255, 255, 255, 255); 2118 memset (&key, 0, sizeof (key));
1713 2119 key.r = 255;
1714 glEnable (GL_BLEND); 2120 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2121 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 2122 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2123 key.mode = GL_QUADS;
1718 2124 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2125
1723 mx += self->x; 2126 mx += self->x;
1724 my += self->y; 2127 my += self->y;
1725 2128
1726 // first pass: determine smooth_max 2129 // first pass: determine smooth_max
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2146 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2147 self->tex [cell->tile [2]].smoothlevel));
1745 } 2148 }
1746 } 2149 }
1747 2150
2151 glEnable (GL_BLEND);
2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
1748 for (z = 0; z <= 2; z++) 2158 for (z = 0; z <= 2; z++)
1749 { 2159 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2160 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1;
1751 2162
1752 for (y = 0; y < sh; y++) 2163 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2164 if (0 <= y + my && y + my < self->rows)
1754 { 2165 {
1755 maprow *row = self->row + (y + my); 2166 maprow *row = self->row + (y + my);
1761 tileid tile = cell->tile [z]; 2172 tileid tile = cell->tile [z];
1762 2173
1763 if (tile) 2174 if (tile)
1764 { 2175 {
1765 maptex tex = self->tex [tile]; 2176 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2177 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2178
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2179 if (key.texname != tex.name)
1772 { 2180 {
2181 self->tex [tile].unused = 0;
2182
1773 if (!tex.name) 2183 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2185
1776 glEnd (); 2186 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2187 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2188 }
1780 2189
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2190 px = (x + 1) * T - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2191 py = (y + 1) * T - tex.h;
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785 2192
1786 if (cell->flags && z == 2) 2193 if (expect_false (cell->player == player) && expect_false (z == 2))
1787 { 2194 {
1788 if (cell->flags & 1) 2195 pl_x = px;
2196 pl_y = py;
2197 pl_tex = tex;
1789 { 2198 continue;
1790 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32;
1793
1794 glEnd ();
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1796 glBegin (GL_QUADS);
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 }
1803 } 2199 }
2200
2201 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2202 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2203 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2204 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1804 2205
1805 // update smooth hash 2206 // update smooth hash
1806 if (tex.smoothtile) 2207 if (tex.smoothtile)
1807 { 2208 {
1808 skey.tile = tex.smoothtile; 2209 skey.tile = tex.smoothtile;
1839 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2240 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1840 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2241 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1841 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2242 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1842 } 2243 }
1843 } 2244 }
2245
2246 if (expect_false (z == 2))
2247 {
2248 /* draw question marks on top of hidden spaces */
2249 if (!cell->darkness)
2250 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32;
2270 int py = y * T - T * 6 / 32;
2271
2272 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov);
2274
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2277 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2279 }
2280 }
2281 }
1844 } 2282 }
1845 } 2283 }
2284
2285 rc_draw (rc);
2286 rc_clear (rc);
1846 2287
1847 // go through all smoothlevels, lowest to highest, then draw. 2288 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2289 // this is basically counting sort
1849 { 2290 {
1850 int w, b; 2291 int w, b;
1851 2292
2293 glEnable (GL_TEXTURE_2D);
2294 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2295 for (w = 0; w < 256 / 32; ++w)
1853 { 2296 {
1854 uint32_t smask = smooth_level [w]; 2297 uint32_t smask = smooth_level [w];
1855 if (smask) 2298 if (smask)
1856 for (b = 0; b < 32; ++b) 2299 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2318 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2319 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2320 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2321 float dy = tex.t * .5f ; // 2 images/column
1879 2322
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2323 if (tex.name)
1883 { 2324 {
2325 // this time avoiding texture state changes
2326 // save gobs of state changes.
1884 if (!tex.name) 2327 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2328 {
2329 self->tex [skey->tile].unused = 0;
1886 2330
1887 glEnd (); 2331 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2333 glBegin (GL_QUADS);
1890 } 2334 }
1891 2335
1892 if (border) 2336 if (border)
1893 { 2337 {
1894 float ox = border * dx; 2338 float ox = border * dx;
1895 2339
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2340 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2341 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2342 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2343 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2344 }
1901 2345
1902 if (corner) 2346 if (corner)
1903 { 2347 {
1904 float ox = corner * dx; 2348 float ox = corner * dx;
1905 2349
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2350 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2351 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2352 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2353 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2354 }
1910 } 2355 }
1911 } 2356 }
1912 } 2357 }
1913 } 2358 }
1914 } 2359 }
2360
2361 glEnd ();
2362 glDisable (GL_TEXTURE_2D);
2363 key.texname = -1;
1915 } 2364 }
1916 2365
1917 hv_clear (smooth); 2366 hv_clear (smooth);
1918 } 2367 }
1919 2368
1920 glEnd (); 2369 if (pl_tex.name)
2370 {
2371 maptex tex = pl_tex;
2372 int px = pl_x + sdx;
2373 int py = pl_y + sdy;
1921 2374
1922 glDisable (GL_TEXTURE_2D); 2375 key.texname = tex.name;
2376 arr = rc_array (rc, &key);
2377
2378 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2379 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2380 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2381 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2382
2383 rc_draw (rc);
2384 }
2385
2386 rc_draw (rc_ov);
2387 rc_clear (rc_ov);
2388
1923 glDisable (GL_BLEND); 2389 glDisable (GL_BLEND);
2390 rc_free (rc);
2391 rc_free (rc_ov);
1924 2392
1925 // top layer: overlays such as the health bar 2393 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2394 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2395 if (0 <= y + my && y + my < self->rows)
1928 { 2396 {
1933 { 2401 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2402 mapcell *cell = row->col + (x + mx - row->c0);
1935 2403
1936 int px = x * T; 2404 int px = x * T;
1937 int py = y * T; 2405 int py = y * T;
2406
2407 if (expect_false (cell->player == player))
2408 {
2409 px += sdx;
2410 py += sdy;
2411 }
1938 2412
1939 if (cell->stat_hp) 2413 if (cell->stat_hp)
1940 { 2414 {
1941 int width = cell->stat_width * T; 2415 int width = cell->stat_width * T;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1953 } 2427 }
1954 } 2428 }
1955} 2429}
1956 2430
1957void 2431void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2432draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2433 CODE:
1960{ 2434{
1961 static float color[16][3] = { 2435 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2436 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2437 { 1.00F, 1.00F, 1.00F },
1982 }; 2456 };
1983 2457
1984 int x, y; 2458 int x, y;
1985 2459
1986 glEnable (GL_TEXTURE_2D); 2460 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia.
2466 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2468 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2469 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2470 glBegin (GL_QUADS);
1991 2471
1992 for (y = 0; y < h; y++) 2472 for (y = 0; y < h; y++)
1999 float *c = color [m & 15]; 2479 float *c = color [m & 15];
2000 2480
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2481 float tx1 = m & 0x40 ? 0.5 : 0.;
2002 float tx2 = tx1 + 0.5; 2482 float tx2 = tx1 + 0.5;
2003 2483
2004 glColor4f (c[0], c[1], c[2], 0.75); 2484 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2488 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2489 }
2013 glDisable (GL_BLEND); 2493 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2494 glDisable (GL_TEXTURE_2D);
2015} 2495}
2016 2496
2017void 2497void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2498fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2499 PPCODE:
2020{ 2500{
2021 int x, y; 2501 int x, y;
2022 int sw1 = sw + 2; 2502 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2503 int sh1 = sh + 2;
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2511 SvCUR_set (darkness3_sv, sw34 * sh3);
2032 2512
2033 mx += self->x - 1; 2513 mx += self->x - 1;
2034 my += self->y - 1; 2514 my += self->y - 1;
2035 2515
2036 memset (darkness1, 255, sw1 * sh1); 2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2037 2517
2038 for (y = 0; y < sh1; y++) 2518 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2519 if (0 <= y + my && y + my < self->rows)
2040 { 2520 {
2041 maprow *row = self->row + (y + my); 2521 maprow *row = self->row + (y + my);
2044 if (row->c0 <= x + mx && x + mx < row->c1) 2524 if (row->c0 <= x + mx && x + mx < row->c1)
2045 { 2525 {
2046 mapcell *cell = row->col + (x + mx - row->c0); 2526 mapcell *cell = row->col + (x + mx - row->c0);
2047 2527
2048 darkness1 [y * sw1 + x] = cell->darkness 2528 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1) 2529 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2050 : 255 - FOW_DARKNESS; 2530 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2051 } 2531 }
2052 } 2532 }
2053 2533
2054 for (y = 0; y < sh; ++y) 2534 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x) 2535 for (x = 0; x < sw; ++x)
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2574 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2575 PUSHs (darkness3_sv);
2096} 2576}
2097 2577
2098SV * 2578SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2579get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2580 CODE:
2101{ 2581{
2102 int x, y, x1, y1; 2582 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2583 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2584 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2641 else
2162 *data++ = 0; 2642 *data++ = 0;
2163 } 2643 }
2164 } 2644 }
2165 2645
2646 /* if size is w*h + 5 then no data has been found */
2647 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2648 {
2166 SvPOK_only (data_sv); 2649 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2650 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651 }
2652
2168 RETVAL = data_sv; 2653 RETVAL = data_sv;
2169} 2654}
2170 OUTPUT: 2655 OUTPUT:
2171 RETVAL 2656 RETVAL
2172 2657
2173void 2658void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2659set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2660 PPCODE:
2176{ 2661{
2177 int x, y, z; 2662 int x, y, z;
2178 int w, h; 2663 int w, h;
2179 int x1, y1; 2664 int x1, y1;
2665 STRLEN len;
2666 uint8_t *data, *end;
2667
2668 len = SvLEN (data_sv);
2669 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2670 data = SvPVbyte_nolen (data_sv);
2671 end = data + len + 8;
2672
2673 if (len < 5)
2674 XSRETURN_EMPTY;
2180 2675
2181 if (*data++ != 0) 2676 if (*data++ != 0)
2182 return; /* version mismatch */ 2677 XSRETURN_EMPTY; /* version mismatch */
2183 2678
2184 w = *data++ << 8; w |= *data++; 2679 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2680 h = *data++ << 8; h |= *data++;
2186 2681
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2682 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2694 {
2200 maprow *row = map_get_row (self, y); 2695 maprow *row = map_get_row (self, y);
2201 2696
2202 for (x = x0; x < x1; x++) 2697 for (x = x0; x < x1; x++)
2203 { 2698 {
2699 uint8_t flags;
2700
2701 if (data + 7 >= end)
2702 XSRETURN_EMPTY;
2703
2204 uint8_t flags = *data++; 2704 flags = *data++;
2205 2705
2206 if (flags) 2706 if (flags)
2207 { 2707 {
2208 mapcell *cell = row_get_cell (row, x); 2708 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2709 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2712 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2713 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2714
2215 if (cell->darkness == 0) 2715 if (cell->darkness == 0)
2216 { 2716 {
2217 cell->darkness = 0; 2717 /*cell->darkness = 0;*/
2718 EXTEND (SP, 3);
2218 2719
2219 for (z = 0; z <= 2; z++) 2720 for (z = 0; z <= 2; z++)
2220 { 2721 {
2221 tileid t = tile [z]; 2722 tileid t = tile [z];
2222 2723
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2724 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2725 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2726 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2727 need_texid (self, t);
2227 } 2728 }
2228 2729
2229 cell->tile [z] = t; 2730 cell->tile [z] = t;
2230 } 2731 }
2232 } 2733 }
2233 } 2734 }
2234 } 2735 }
2235} 2736}
2236 2737
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2738MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2739
2239PROTOTYPES: DISABLE 2740DC::RW
2240 2741new (SV *class, SV *data_sv)
2241CFPlus::MixChunk
2242new_from_file (SV *class, char *path)
2243 CODE: 2742 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2743{
2744 STRLEN datalen;
2745 char *data = SvPVbyte (data_sv, datalen);
2746
2747 RETVAL = SDL_RWFromConstMem (data, datalen);
2748}
2245 OUTPUT: 2749 OUTPUT:
2246 RETVAL 2750 RETVAL
2247 2751
2752DC::RW
2753new_from_file (SV *class, const char *path, const char *mode = "rb")
2754 CODE:
2755 RETVAL = SDL_RWFromFile (path, mode);
2756 OUTPUT:
2757 RETVAL
2758
2759# fails on win32:
2760# dc.xs(2268) : error C2059: syntax error : '('
2248void 2761#void
2762#close (DC::RW self)
2763# CODE:
2764# (self->(close)) (self);
2765
2766MODULE = Deliantra::Client PACKAGE = DC::Channel
2767
2768PROTOTYPES: DISABLE
2769
2770DC::Channel
2771find ()
2772 CODE:
2773{
2774 RETVAL = Mix_GroupAvailable (-1);
2775
2776 if (RETVAL < 0)
2777 {
2778 RETVAL = Mix_GroupOldest (-1);
2779
2780 if (RETVAL < 0)
2781 XSRETURN_UNDEF;
2782
2783 Mix_HaltChannel (RETVAL);
2784 }
2785
2786 Mix_UnregisterAllEffects (RETVAL);
2787 Mix_Volume (RETVAL, 128);
2788}
2789 OUTPUT:
2790 RETVAL
2791
2792void
2793halt (DC::Channel self)
2794 CODE:
2795 Mix_HaltChannel (self);
2796
2797void
2798expire (DC::Channel self, int ticks = -1)
2799 CODE:
2800 Mix_ExpireChannel (self, ticks);
2801
2802void
2803fade_out (DC::Channel self, int ticks = -1)
2804 CODE:
2805 Mix_FadeOutChannel (self, ticks);
2806
2807int
2808volume (DC::Channel self, int volume)
2809 CODE:
2810 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2811 OUTPUT:
2812 RETVAL
2813
2814void
2815unregister_all_effects (DC::Channel self)
2816 CODE:
2817 Mix_UnregisterAllEffects (self);
2818
2819void
2820set_panning (DC::Channel self, int left, int right)
2821 CODE:
2822 left = CLAMP (left , 0, 255);
2823 right = CLAMP (right, 0, 255);
2824 Mix_SetPanning (self, left, right);
2825
2826void
2827set_distance (DC::Channel self, int distance)
2828 CODE:
2829 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2830
2831void
2832set_position (DC::Channel self, int angle, int distance)
2833 CODE:
2834
2835void
2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2837 CODE:
2838{
2839 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2840 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842}
2843
2844void
2845set_reverse_stereo (DC::Channel self, int flip)
2846 CODE:
2847 Mix_SetReverseStereo (self, flip);
2848
2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850
2851PROTOTYPES: DISABLE
2852
2853DC::MixChunk
2854new (SV *class, DC::RW rwops)
2855 CODE:
2856 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2857 OUTPUT:
2858 RETVAL
2859
2860void
2249DESTROY (CFPlus::MixChunk self) 2861DESTROY (DC::MixChunk self)
2250 CODE: 2862 CODE:
2251 Mix_FreeChunk (self); 2863 Mix_FreeChunk (self);
2252 2864
2253int 2865int
2254volume (CFPlus::MixChunk self, int volume = -1) 2866volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2867 CODE:
2868 if (items > 1)
2869 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2870 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2871 OUTPUT:
2258 RETVAL 2872 RETVAL
2259 2873
2260int 2874DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2875play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2876 CODE:
2877{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2878 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2879
2880 if (RETVAL < 0)
2881 XSRETURN_UNDEF;
2882
2883 if (channel < 0)
2884 {
2885 Mix_UnregisterAllEffects (RETVAL);
2886 Mix_Volume (RETVAL, 128);
2887 }
2888}
2264 OUTPUT: 2889 OUTPUT:
2265 RETVAL 2890 RETVAL
2266 2891
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2893
2269int 2894int
2270volume (int volume = -1) 2895volume (int volume = -1)
2271 PROTOTYPE: ;$ 2896 PROTOTYPE: ;$
2272 CODE: 2897 CODE:
2898 if (items > 0)
2899 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2900 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2901 OUTPUT:
2275 RETVAL 2902 RETVAL
2276 2903
2277int 2904void
2278fade_out (int ms) 2905fade_out (int ms)
2279 CODE: 2906 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 2907 Mix_FadeOutMusic (ms);
2908
2909void
2910halt ()
2911 CODE:
2912 Mix_HaltMusic ();
2913
2914DC::MixMusic
2915new (SV *class, DC::RW rwops)
2916 CODE:
2917 RETVAL = Mix_LoadMUS_RW (rwops);
2281 OUTPUT: 2918 OUTPUT:
2282 RETVAL 2919 RETVAL
2283 2920
2284CFPlus::MixMusic
2285new_from_file (SV *class, char *path)
2286 CODE:
2287 RETVAL = Mix_LoadMUS (path);
2288 OUTPUT:
2289 RETVAL
2290
2291void 2921void
2292DESTROY (CFPlus::MixMusic self) 2922DESTROY (DC::MixMusic self)
2293 CODE: 2923 CODE:
2294 Mix_FreeMusic (self); 2924 Mix_FreeMusic (self);
2295 2925
2296int 2926int
2297play (CFPlus::MixMusic self, int loops = -1) 2927play (DC::MixMusic self, int loops = -1)
2298 CODE: 2928 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2929 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2930 OUTPUT:
2301 RETVAL 2931 RETVAL
2302 2932
2303int 2933void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2934fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2935 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2936 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2937
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2938MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2939
2312PROTOTYPES: ENABLE 2940PROTOTYPES: ENABLE
2313 2941
2314BOOT: 2942BOOT:
2315{ 2943{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2944 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2945 static const struct {
2318 const char *name; 2946 const char *name;
2319 IV iv; 2947 IV iv;
2320 } *civ, const_iv[] = { 2948 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2949# define const_iv(name) { # name, (IV)name }
2322 const_iv (GL_VENDOR), 2950 const_iv (GL_VENDOR),
2323 const_iv (GL_VERSION), 2951 const_iv (GL_VERSION),
2324 const_iv (GL_EXTENSIONS), 2952 const_iv (GL_EXTENSIONS),
2953 const_iv (GL_MAX_TEXTURE_UNITS),
2325 const_iv (GL_COLOR_MATERIAL), 2954 const_iv (GL_COLOR_MATERIAL),
2326 const_iv (GL_SMOOTH), 2955 const_iv (GL_SMOOTH),
2327 const_iv (GL_FLAT), 2956 const_iv (GL_FLAT),
2328 const_iv (GL_DITHER), 2957 const_iv (GL_DITHER),
2329 const_iv (GL_BLEND), 2958 const_iv (GL_BLEND),
2341 const_iv (GL_ZERO), 2970 const_iv (GL_ZERO),
2342 const_iv (GL_SRC_ALPHA), 2971 const_iv (GL_SRC_ALPHA),
2343 const_iv (GL_DST_ALPHA), 2972 const_iv (GL_DST_ALPHA),
2344 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2973 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2345 const_iv (GL_ONE_MINUS_DST_ALPHA), 2974 const_iv (GL_ONE_MINUS_DST_ALPHA),
2975 const_iv (GL_SRC_COLOR),
2976 const_iv (GL_DST_COLOR),
2977 const_iv (GL_ONE_MINUS_SRC_COLOR),
2978 const_iv (GL_ONE_MINUS_DST_COLOR),
2346 const_iv (GL_SRC_ALPHA_SATURATE), 2979 const_iv (GL_SRC_ALPHA_SATURATE),
2347 const_iv (GL_RGB), 2980 const_iv (GL_RGB),
2348 const_iv (GL_RGBA), 2981 const_iv (GL_RGBA),
2349 const_iv (GL_RGBA4), 2982 const_iv (GL_RGBA4),
2350 const_iv (GL_RGBA8), 2983 const_iv (GL_RGBA8),
2356 const_iv (GL_INTENSITY), 2989 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2990 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2991 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2992 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2993 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2994 const_iv (GL_COMPRESSED_ALPHA_ARB),
2995 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2996 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2997 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2998 const_iv (GL_COMPRESSED_RGB_ARB),
2999 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 3000 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 3001 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 3002 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 3003 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 3004 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3043 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 3044 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 3045 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 3046 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 3047 const_iv (GL_GENERATE_MIPMAP_HINT),
3048 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 3049 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 3050 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 3051 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 3052 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 3053 const_iv (GL_V3F),
2414 const_iv (GL_T2F_V3F), 3054 const_iv (GL_T2F_V3F),
2415 const_iv (GL_T2F_N3F_V3F), 3055 const_iv (GL_T2F_N3F_V3F),
3056 const_iv (GL_FUNC_ADD),
3057 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2416# undef const_iv 3059# undef const_iv
2417 }; 3060 };
2418 3061
2419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3062 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2421 3064
2422 texture_av = newAV (); 3065 texture_av = newAV ();
2423 AvREAL_off (texture_av); 3066 AvREAL_off (texture_av);
2424} 3067}
2425 3068
3069void
3070disable_GL_EXT_blend_func_separate ()
3071 CODE:
3072 gl.BlendFuncSeparate = 0;
3073 gl.BlendFuncSeparateEXT = 0;
3074
3075void
3076apple_nvidia_bug (int enable)
3077
2426char * 3078char *
2427gl_vendor () 3079gl_vendor ()
2428 CODE: 3080 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 3081 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 3082 OUTPUT:
2479 3131
2480void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3132void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2481 CODE: 3133 CODE:
2482 gl_BlendFuncSeparate (sa, da, saa, daa); 3134 gl_BlendFuncSeparate (sa, da, saa, daa);
2483 3135
3136# void glBlendEquation (int se)
3137
2484void glDepthMask (int flag) 3138void glDepthMask (int flag)
2485 3139
2486void glLogicOp (int opcode) 3140void glLogicOp (int opcode)
2487 3141
2488void glColorMask (int red, int green, int blue, int alpha) 3142void glColorMask (int red, int green, int blue, int alpha)
2522void glRotate (float angle, float x, float y, float z) 3176void glRotate (float angle, float x, float y, float z)
2523 CODE: 3177 CODE:
2524 glRotatef (angle, x, y, z); 3178 glRotatef (angle, x, y, z);
2525 3179
2526void glColor (float r, float g, float b, float a = 1.0) 3180void glColor (float r, float g, float b, float a = 1.0)
3181 PROTOTYPE: @
2527 ALIAS: 3182 ALIAS:
2528 glColor_premultiply = 1 3183 glColor_premultiply = 1
2529 CODE: 3184 CODE:
2530 if (ix) 3185 if (ix)
2531 { 3186 {
2547 3202
2548void glTexCoord (float s, float t) 3203void glTexCoord (float s, float t)
2549 CODE: 3204 CODE:
2550 glTexCoord2f (s, t); 3205 glTexCoord2f (s, t);
2551 3206
3207void glRect (float x1, float y1, float x2, float y2)
3208 CODE:
3209 glRectf (x1, y1, x2, y2);
3210
3211void glRect_lineloop (float x1, float y1, float x2, float y2)
3212 CODE:
3213 glBegin (GL_LINE_LOOP);
3214 glVertex2f (x1, y1);
3215 glVertex2f (x2, y1);
3216 glVertex2f (x2, y2);
3217 glVertex2f (x1, y2);
3218 glEnd ();
3219
2552PROTOTYPES: ENABLE 3220PROTOTYPES: ENABLE
2553 3221
2554void glBegin (int mode) 3222void glBegin (int mode)
2555 3223
2556void glEnd () 3224void glEnd ()
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3256void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 3257 CODE:
2590 if (gl.SeparableFilter2D) 3258 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3259 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 3260
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3261void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 3262
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3263void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 3264
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 3265void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 3266
2624 3292
2625void glEndList () 3293void glEndList ()
2626 3294
2627void glCallList (int list) 3295void glCallList (int list)
2628 3296
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 3298
2631PROTOTYPES: DISABLE 3299PROTOTYPES: DISABLE
2632 3300
2633void 3301void
2634find_widget (SV *self, NV x, NV y) 3302find_widget (SV *self, NV x, NV y)
2638 XPUSHs (self); 3306 XPUSHs (self);
2639} 3307}
2640 3308
2641BOOT: 3309BOOT:
2642{ 3310{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3311 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 3312
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3313 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2646 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3314 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2647 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3315 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2648 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3316 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 3317}
2650 3318
2651void 3319void
2652draw (SV *self) 3320draw (SV *self)
2653 CODE: 3321 CODE:
2657 NV x, y, w, h; 3325 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 3326 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 3327 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 3328 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 3329 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 3330 double draw_x, draw_y;
2664 3331
2665 if (!SvROK (self)) 3332 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3333 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 3334
2668 hv = (HV *)SvRV (self); 3335 hv = (HV *)SvRV (self);
2669 3336
2670 if (SvTYPE (hv) != SVt_PVHV) 3337 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 3339
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3340 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2674 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3341 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 3342
2676 if (!h || !w) 3343 if (!h || !w)
2696 { 3363 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3364 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 3365
2699 if (svp && SvTRUE (*svp)) 3366 if (svp && SvTRUE (*svp))
2700 { 3367 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3368 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 3369 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3370 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 3371 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 3372 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 3373 glVertex2f (w, 0);
2709 glEnd (); 3376 glEnd ();
2710 glDisable (GL_BLEND); 3377 glDisable (GL_BLEND);
2711 } 3378 }
2712 } 3379 }
2713#if 0 3380#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 3381 // draw borders, for debugging
2715 glPushMatrix; 3382 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 3383 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 3384 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 3385 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 3386 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 3387 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 3388 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 3389 glVertex2f (0 , h - 1);
2723 glEnd; 3390 glEnd ();
2724 glPopMatrix; 3391 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 3392#endif
2728 PUSHMARK (SP); 3393 PUSHMARK (SP);
2729 XPUSHs (self); 3394 XPUSHs (self);
2730 PUTBACK; 3395 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 3396 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines