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.227 by root, Mon Aug 13 14:15:09 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;
155 rc_t *rc; 184 rc_t *rc;
156} *CFPlus__Layout; 185} *DC__Layout;
157 186
158static CFPlus__Font default_font; 187static DC__Font default_font;
159static PangoContext *opengl_context; 188static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 189static PangoFontMap *opengl_fontmap;
161 190
162static void 191static void
163substitute_func (FcPattern *pattern, gpointer data) 192substitute_func (FcPattern *pattern, gpointer data)
168#endif 197#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 198 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 199}
171 200
172static void 201static void
173layout_update_font (CFPlus__Layout self) 202layout_update_font (DC__Layout self)
174{ 203{
175 /* 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
176 * reasonably well with bitstream vera 205 * reasonably well with dejavu/bistream fonts
177 */ 206 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 207 PangoFontDescription *font = self->font ? self->font : default_font;
179 208
180 pango_font_description_set_absolute_size (font, 209 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 210 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 211
183 pango_layout_set_font_description (self->pl, font); 212 pango_layout_set_font_description (self->pl, font);
184} 213}
185 214
186static void 215static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 216layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 217{
189 PangoRectangle rect; 218 PangoRectangle rect;
190 219
191 // get_pixel_* wrongly rounds down 220 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 221 pango_layout_get_extents (self->pl, 0, &rect);
203 232
204typedef uint16_t tileid; 233typedef uint16_t tileid;
205typedef uint16_t faceid; 234typedef uint16_t faceid;
206 235
207typedef struct { 236typedef struct {
208 int name; 237 GLuint name;
209 int w, h; 238 int w, h;
210 float s, t; 239 float s, t;
211 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
212 tileid smoothtile; 241 tileid smoothtile;
213 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
214} maptex; 244} maptex;
215 245
216typedef struct { 246typedef struct {
217 uint32_t player; 247 uint32_t player;
218 tileid tile[3]; 248 tileid tile[3];
231 int faces; tileid *face2tile; // [faceid] 261 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 262 int texs; maptex *tex; // [tileid]
233 263
234 int32_t rows; 264 int32_t rows;
235 maprow *row; 265 maprow *row;
236} *CFPlus__Map; 266} *DC__Map;
237 267
238static char * 268static char *
239prepend (char *ptr, int sze, int inc) 269prepend (char *ptr, int sze, int inc)
240{ 270{
241 char *p; 271 char *p;
279 self->texs *= 2; 309 self->texs *= 2;
280 } 310 }
281} 311}
282 312
283static maprow * 313static maprow *
284map_get_row (CFPlus__Map self, int y) 314map_get_row (DC__Map self, int y)
285{ 315{
286 if (0 > y) 316 if (0 > y)
287 { 317 {
288 int extend = - y + MAP_EXTEND_Y; 318 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 319 Prepend (maprow, self->row, self->rows, extend);
327 357
328 return row->col + (x - row->c0); 358 return row->col + (x - row->c0);
329} 359}
330 360
331static mapcell * 361static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 362map_get_cell (DC__Map self, int x, int y)
333{ 363{
334 return row_get_cell (map_get_row (self, y), x); 364 return row_get_cell (map_get_row (self, y), x);
335} 365}
336 366
337static void 367static void
338map_clear (CFPlus__Map self) 368map_clear (DC__Map self)
339{ 369{
340 int r; 370 int r;
341 371
342 for (r = 0; r < self->rows; r++) 372 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 373 Safefree (self->row[r].col);
350 self->oy = 0; 380 self->oy = 0;
351 self->row = 0; 381 self->row = 0;
352 self->rows = 0; 382 self->rows = 0;
353} 383}
354 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
355static void 395static void
356map_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)
357{ 397{
358 int x, y; 398 int x, y;
359 maprow *row; 399 maprow *row;
360 mapcell *cell; 400 mapcell *cell;
361 401
373 if (x >= row->c1) 413 if (x >= row->c1)
374 break; 414 break;
375 415
376 cell = row->col + x - row->c0; 416 cell = row->col + x - row->c0;
377 417
378 cell->darkness = 0; 418 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 419 }
383 } 420 }
384} 421}
385 422
386typedef struct { 423typedef struct {
440 n |= n >> 16; 477 n |= n >> 16;
441 478
442 return n + 1; 479 return n + 1;
443} 480}
444 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
445/* SDL should provide this, really. */ 493/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 494#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 495#define SDLK_MODIFIER_MAX 314
448 496
449/******************************************************************************/ 497/******************************************************************************/
487 return 0; 535 return 0;
488 536
489 return 1; 537 return 1;
490} 538}
491 539
492MODULE = 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
493 593
494PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
495 595
496BOOT: 596BOOT:
497{ 597{
498 HV *stash = gv_stashpv ("CFPlus", 1); 598 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 599 static const struct {
500 const char *name; 600 const char *name;
501 IV iv; 601 IV iv;
502 } *civ, const_iv[] = { 602 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 603# define const_iv(name) { # name, (IV)name }
525 625
526 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 628 const_iv (SDL_APPACTIVE),
529 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),
530 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 684 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 685 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 686 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 758 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
610 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)
611# undef const_iv 796# undef const_iv
612 }; 797 };
613 798
614 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; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 818
634NV floor (NV x) 819NV floor (NV x)
635 820
636NV ceil (NV x) 821NV ceil (NV x)
637 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
638void 833void
639pango_init () 834pango_init ()
640 CODE: 835 CODE:
641{ 836{
642 opengl_fontmap = pango_opengl_font_map_new (); 837 opengl_fontmap = pango_opengl_font_map_new ();
643 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);
644 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
645} 845}
646 846
647char *
648SDL_GetError () 847char *SDL_GetError ()
649 848
650int 849void SDL_braino ()
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 850
653void 851int SDL_Init (U32 flags)
852
853int SDL_InitSubSystem (U32 flags)
854
855void SDL_QuitSubSystem (U32 flags)
856
654SDL_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
655 867
656void 868void
657SDL_ListModes (int rgb, int alpha) 869SDL_ListModes (int rgb, int alpha)
658 PPCODE: 870 PPCODE:
659{ 871{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 886
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 887 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676#if SDL_VERSION_ATLEAST(1,2,10)
677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 888 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 889
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 890 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 891
683 if (m && m != (SDL_Rect **)-1) 892 if (m && m != (SDL_Rect **)-1)
684 while (*m) 893 while (*m)
685 { 894 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 895 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 896 {
688 AV *av = newAV (); 897 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 898 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 899 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 900 av_push (av, newSViv (rgb));
715 924
716 if (RETVAL) 925 if (RETVAL)
717 { 926 {
718 av_clear (texture_av); 927 av_clear (texture_av);
719 928
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 929 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#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);
722#include "glfunc.h" 931#include "glfunc.h"
723#undef GL_FUNC 932#undef GL_FUNC
724 } 933 }
725} 934}
732char * 941char *
733SDL_GetKeyName (int sym) 942SDL_GetKeyName (int sym)
734 943
735int 944int
736SDL_GetAppState () 945SDL_GetAppState ()
946
947int
948SDL_GetModState ()
737 949
738void 950void
739poll_events () 951poll_events ()
740 PPCODE: 952 PPCODE:
741{ 953{
751 { 963 {
752 case SDL_KEYDOWN: 964 case SDL_KEYDOWN:
753 case SDL_KEYUP: 965 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 966 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 967 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 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);
757 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 */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 970 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 971 break;
760 972
761 case SDL_ACTIVEEVENT: 973 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 974 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 992 x = ev.motion.x;
781 y = ev.motion.y; 993 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 994 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 995 }
784 996
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 998 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 999 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 1000 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1001 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1002 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 1003 }
792 break; 1004 break;
793 1005
794 case SDL_MOUSEBUTTONDOWN: 1006 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 1007 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1008 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 1009
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1010 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1011 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1012 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1013 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1018 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1019 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1020 break;
809 } 1021 }
810 1022
811 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))));
812 } 1024 }
813} 1025}
814 1026
815int 1027int
816Mix_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)
817 POSTCALL: 1029 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1030 Mix_HookMusicFinished (music_finished);
819 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}
820 1048
821void 1049void
822Mix_CloseAudio () 1050Mix_CloseAudio ()
823 1051
824int 1052int
859 } 1087 }
860 } 1088 }
861#endif 1089#endif
862} 1090}
863 1091
864void 1092int
865add_font (char *file) 1093add_font (char *file)
866 CODE: 1094 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1095 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096 OUTPUT:
1097 RETVAL
868 1098
869void 1099void
870load_image_inline (SV *image_) 1100load_image_inline (SV *image_)
871 ALIAS: 1101 ALIAS:
872 load_image_file = 1 1102 load_image_file = 1
958void 1188void
959error (char *message) 1189error (char *message)
960 CODE: 1190 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1191 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1192#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1193 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1194#endif
965 1195
966void 1196void
967fatal (char *message) 1197fatal (char *message)
968 CODE: 1198 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1199 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1200#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1201 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1202#endif
973 _exit (1); 1203 _exit (1);
974 1204
975void 1205void
976_exit (int retval = 0) 1206_exit (int retval = 0)
988#if DEBUG 1218#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1219 VALGRIND_DO_LEAK_CHECK;
990#endif 1220#endif
991} 1221}
992 1222
993MODULE = 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
994 1231
995PROTOTYPES: DISABLE 1232PROTOTYPES: DISABLE
996 1233
997CFPlus::Font 1234DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1235new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1236 CODE:
1000{ 1237{
1001 int count; 1238 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1239 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1242}
1006 OUTPUT: 1243 OUTPUT:
1007 RETVAL 1244 RETVAL
1008 1245
1009void 1246void
1010DESTROY (CFPlus::Font self) 1247DESTROY (DC::Font self)
1011 CODE: 1248 CODE:
1012 pango_font_description_free (self); 1249 pango_font_description_free (self);
1013 1250
1014void 1251void
1015make_default (CFPlus::Font self) 1252make_default (DC::Font self)
1016 PROTOTYPE: $ 1253 PROTOTYPE: $
1017 CODE: 1254 CODE:
1018 default_font = self; 1255 default_font = self;
1019 1256
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1257MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1258
1022PROTOTYPES: DISABLE 1259PROTOTYPES: DISABLE
1023 1260
1024void 1261void
1025reset_glyph_cache () 1262glyph_cache_backup ()
1026 PROTOTYPE: 1263 PROTOTYPE:
1027 CODE: 1264 CODE:
1265 tc_backup ();
1266
1267void
1268glyph_cache_restore ()
1269 PROTOTYPE:
1270 CODE:
1028 tc_clear (); 1271 tc_restore ();
1029 1272
1030CFPlus::Layout 1273DC::Layout
1031new (SV *class) 1274new (SV *class)
1032 CODE: 1275 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1276 New (0, RETVAL, 1, struct cf_layout);
1034 1277
1035 RETVAL->pl = pango_layout_new (opengl_context); 1278 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1288 layout_update_font (RETVAL);
1046 OUTPUT: 1289 OUTPUT:
1047 RETVAL 1290 RETVAL
1048 1291
1049void 1292void
1050DESTROY (CFPlus::Layout self) 1293DESTROY (DC::Layout self)
1051 CODE: 1294 CODE:
1052 g_object_unref (self->pl); 1295 g_object_unref (self->pl);
1053 rc_free (self->rc); 1296 rc_free (self->rc);
1054 Safefree (self); 1297 Safefree (self);
1055 1298
1056void 1299void
1057set_text (CFPlus::Layout self, SV *text_) 1300set_text (DC::Layout self, SV *text_)
1058 CODE: 1301 CODE:
1059{ 1302{
1060 STRLEN textlen; 1303 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1304 char *text = SvPVutf8 (text_, textlen);
1062 1305
1063 pango_layout_set_text (self->pl, text, textlen); 1306 pango_layout_set_text (self->pl, text, textlen);
1064} 1307}
1065 1308
1066void 1309void
1067set_markup (CFPlus::Layout self, SV *text_) 1310set_markup (DC::Layout self, SV *text_)
1068 CODE: 1311 CODE:
1069{ 1312{
1070 STRLEN textlen; 1313 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1314 char *text = SvPVutf8 (text_, textlen);
1072 1315
1073 pango_layout_set_markup (self->pl, text, textlen); 1316 pango_layout_set_markup (self->pl, text, textlen);
1074} 1317}
1075 1318
1076void 1319void
1077set_shapes (CFPlus::Layout self, ...) 1320set_shapes (DC::Layout self, ...)
1078 CODE: 1321 CODE:
1079{ 1322{
1080 PangoAttrList *attrs = 0; 1323 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1324 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1325 const char *pos = text;
1117 if (attrs) 1360 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1361 pango_layout_set_attributes (self->pl, attrs);
1119} 1362}
1120 1363
1121void 1364void
1122get_shapes (CFPlus::Layout self) 1365get_shapes (DC::Layout self)
1123 PPCODE: 1366 PPCODE:
1124{ 1367{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1368 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1369
1127 do 1370 do
1128 { 1371 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1372 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1373
1131 if (run && shape_attr_p (run)) 1374 if (run && shape_attr_p (run))
1132 { 1375 {
1133 PangoRectangle extents; 1376 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1377 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1385
1143 pango_layout_iter_free (iter); 1386 pango_layout_iter_free (iter);
1144} 1387}
1145 1388
1146int 1389int
1147has_wrapped (CFPlus::Layout self) 1390has_wrapped (DC::Layout self)
1148 CODE: 1391 CODE:
1149{ 1392{
1150 int lines = 1; 1393 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1394 const char *text = pango_layout_get_text (self->pl);
1152 1395
1157} 1400}
1158 OUTPUT: 1401 OUTPUT:
1159 RETVAL 1402 RETVAL
1160 1403
1161SV * 1404SV *
1162get_text (CFPlus::Layout self) 1405get_text (DC::Layout self)
1163 CODE: 1406 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1407 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1408 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1409 OUTPUT:
1167 RETVAL 1410 RETVAL
1168 1411
1169void 1412void
1170set_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.)
1171 CODE: 1414 CODE:
1172 self->r = r; 1415 self->r = r;
1173 self->g = g; 1416 self->g = g;
1174 self->b = b; 1417 self->b = b;
1175 self->a = a; 1418 self->a = a;
1176 1419
1177void 1420void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1421set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1422 CODE:
1180 if (self->font != font) 1423 if (self->font != font)
1181 { 1424 {
1182 self->font = font; 1425 self->font = font;
1183 layout_update_font (self); 1426 layout_update_font (self);
1184 } 1427 }
1185 1428
1186void 1429void
1187set_height (CFPlus::Layout self, int base_height) 1430set_height (DC::Layout self, int base_height)
1188 CODE: 1431 CODE:
1189 if (self->base_height != base_height) 1432 if (self->base_height != base_height)
1190 { 1433 {
1191 self->base_height = base_height; 1434 self->base_height = base_height;
1192 layout_update_font (self); 1435 layout_update_font (self);
1193 } 1436 }
1194 1437
1195void 1438void
1196set_width (CFPlus::Layout self, int max_width = -1) 1439set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1440 CODE:
1198 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);
1199 1442
1200void 1443void
1201set_indent (CFPlus::Layout self, int indent) 1444set_indent (DC::Layout self, int indent)
1202 CODE: 1445 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1446 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1447
1205void 1448void
1206set_spacing (CFPlus::Layout self, int spacing) 1449set_spacing (DC::Layout self, int spacing)
1207 CODE: 1450 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1451 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1452
1210void 1453void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1454set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1455 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1456 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1457 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1458 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1459 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1460 : PANGO_ELLIPSIZE_NONE
1218 ); 1461 );
1219 1462
1220void 1463void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1464set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1465 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1466 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1467
1225void 1468void
1226size (CFPlus::Layout self) 1469size (DC::Layout self)
1227 PPCODE: 1470 PPCODE:
1228{ 1471{
1229 int w, h; 1472 int w, h;
1230 1473
1231 layout_get_pixel_size (self, &w, &h); 1474 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1477 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1478 PUSHs (sv_2mortal (newSViv (h)));
1236} 1479}
1237 1480
1238int 1481int
1239descent (CFPlus::Layout self) 1482descent (DC::Layout self)
1240 CODE: 1483 CODE:
1241{ 1484{
1242 PangoRectangle rect; 1485 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1486 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1487 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1488 RETVAL = PANGO_DESCENT (rect);
1246} 1489}
1247 OUTPUT: 1490 OUTPUT:
1248 RETVAL 1491 RETVAL
1249 1492
1250int 1493int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1494xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1495 CODE:
1253{ 1496{
1254 int index, trailing; 1497 int index, trailing;
1255 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);
1256 RETVAL = index + trailing; 1499 RETVAL = index + trailing;
1257} 1500}
1258 OUTPUT: 1501 OUTPUT:
1259 RETVAL 1502 RETVAL
1260 1503
1261void 1504void
1262cursor_pos (CFPlus::Layout self, int index) 1505cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1506 PPCODE:
1264{ 1507{
1265 PangoRectangle strong_pos; 1508 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1509 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1510
1268 EXTEND (SP, 3); 1511 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1515}
1273 1516
1274void 1517void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1518index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1519 PPCODE:
1277{ 1520{
1278 int line, x; 1521 int line, x;
1279 1522
1280 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)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1525 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1526 --line;
1527#endif
1283 EXTEND (SP, 2); 1528 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1529 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1531}
1287 1532
1288void 1533void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1534line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1535 PPCODE:
1291{ 1536{
1292 PangoLayoutLine *lp; 1537 PangoLayoutLine *lp;
1293 int index, trailing; 1538 int index, trailing;
1294 1539
1295 if (line < 0) 1540 if (line < 0)
1296 XSRETURN_EMPTY; 1541 XSRETURN_EMPTY;
1297 1542
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1543 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1544 XSRETURN_EMPTY; /* do better */
1300 1545
1301 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);
1302 1547
1303 EXTEND (SP, 2); 1548 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1554 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1555 }
1311} 1556}
1312 1557
1313void 1558void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1559render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1560 CODE:
1316 rc_clear (self->rc); 1561 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1562 pango_opengl_render_layout_subpixel (
1318 self->pl, 1563 self->pl,
1319 self->rc, 1564 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1569 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1570 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1571 pango_layout_context_changed (self->pl);
1327 1572
1328void 1573void
1329draw (CFPlus::Layout self) 1574draw (DC::Layout self)
1330 CODE: 1575 CODE:
1331{ 1576{
1332 glEnable (GL_TEXTURE_2D); 1577 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1578 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1579 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1587 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1589 glDisable (GL_TEXTURE_2D);
1345} 1590}
1346 1591
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1592MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1593
1349PROTOTYPES: ENABLE 1594PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1595
1353void 1596void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1597pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1598 CODE:
1356{ 1599{
1422 glDisable (GL_ALPHA_TEST); 1665 glDisable (GL_ALPHA_TEST);
1423 glDisable (GL_BLEND); 1666 glDisable (GL_BLEND);
1424 } 1667 }
1425} 1668}
1426 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
1427IV 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)
1428 CODE: 1792 CODE:
1429{ 1793{
1430 GLint width; 1794 GLint width;
1431 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);
1433 RETVAL = width > 0; 1797 RETVAL = width > 0;
1434} 1798}
1435 OUTPUT: 1799 OUTPUT:
1436 RETVAL 1800 RETVAL
1437 1801
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1802MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1803
1440PROTOTYPES: DISABLE 1804PROTOTYPES: DISABLE
1441 1805
1442CFPlus::Map 1806DC::Map
1443new (SV *class) 1807new (SV *class)
1444 CODE: 1808 CODE:
1445 New (0, RETVAL, 1, struct map); 1809 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1810 RETVAL->x = 0;
1447 RETVAL->y = 0; 1811 RETVAL->y = 0;
1455 RETVAL->row = 0; 1819 RETVAL->row = 0;
1456 OUTPUT: 1820 OUTPUT:
1457 RETVAL 1821 RETVAL
1458 1822
1459void 1823void
1460DESTROY (CFPlus::Map self) 1824DESTROY (DC::Map self)
1461 CODE: 1825 CODE:
1462{ 1826{
1463 map_clear (self); 1827 map_clear (self);
1464 Safefree (self->face2tile); 1828 Safefree (self->face2tile);
1465 Safefree (self->tex); 1829 Safefree (self->tex);
1466 Safefree (self); 1830 Safefree (self);
1467} 1831}
1468 1832
1469void 1833void
1470resize (CFPlus::Map self, int map_width, int map_height) 1834resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1835 CODE:
1472 self->w = map_width; 1836 self->w = map_width;
1473 self->h = map_height; 1837 self->h = map_height;
1474 1838
1475void 1839void
1476clear (CFPlus::Map self) 1840clear (DC::Map self)
1477 CODE: 1841 CODE:
1478 map_clear (self); 1842 map_clear (self);
1479 1843
1480void 1844void
1481set_tileid (CFPlus::Map self, int face, int tile) 1845set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1846 CODE:
1483{ 1847{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1848 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1849 need_texid (self, tile);
1486} 1850}
1487 1851
1488void 1852void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1853set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1854 CODE:
1491{ 1855{
1492 tileid texid; 1856 tileid texid;
1493 maptex *tex; 1857 maptex *tex;
1494 1858
1507 tex->smoothtile = self->face2tile [smooth]; 1871 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1872 tex->smoothlevel = level;
1509} 1873}
1510 1874
1511void 1875void
1512set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1513 CODE: 1877 CODE:
1514{ 1878{
1515 need_texid (self, texid); 1879 need_texid (self, texid);
1516 1880
1517 { 1881 {
1536 // use uglier nearest interpolation because linear suffers 1900 // use uglier nearest interpolation because linear suffers
1537 // from transparent color bleeding and ugly wrapping effects. 1901 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1902 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1903}
1540 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
1541int 1925int
1542ox (CFPlus::Map self) 1926ox (DC::Map self)
1543 ALIAS: 1927 ALIAS:
1544 oy = 1 1928 oy = 1
1545 x = 2 1929 x = 2
1546 y = 3 1930 y = 3
1547 w = 4 1931 w = 4
1558 } 1942 }
1559 OUTPUT: 1943 OUTPUT:
1560 RETVAL 1944 RETVAL
1561 1945
1562void 1946void
1563scroll (CFPlus::Map self, int dx, int dy) 1947scroll (DC::Map self, int dx, int dy)
1564 CODE: 1948 CODE:
1565{ 1949{
1566 if (dx > 0) 1950 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1951 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1952 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1968 self->y += MAP_EXTEND_Y;
1585 } 1969 }
1586} 1970}
1587 1971
1588SV * 1972SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1973map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1974 CODE:
1591{ 1975{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1977 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1978 mapcell *cell;
1622 uint8_t ext, cmd; 2006 uint8_t ext, cmd;
1623 2007
1624 do 2008 do
1625 { 2009 {
1626 ext = *data++; 2010 ext = *data++;
1627 cmd = ext & 0x3f; 2011 cmd = ext & 0x7f;
1628 2012
1629 if (cmd < 4) 2013 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1631 else if (cmd == 5) // health 2015 else if (cmd == 5) // health
1632 { 2016 {
1633 cell->stat_width = 1; 2017 cell->stat_width = 1;
1634 cell->stat_hp = *data++; 2018 cell->stat_hp = *data++;
1635 } 2019 }
1636 else if (cmd == 6) // monster width 2020 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 2021 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 2022 else if (cmd == 0x47)
1639 { 2023 {
1640 if (*data == 4) 2024 if (*data == 1) cell->player = data [1];
1641 ; // 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);
1642 2028
1643 data += *data + 1; 2029 data += *data + 1;
1644 } 2030 }
1645 else if (cmd == 8) // cell flags 2031 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 2032 cell->flags = *data++;
1663 cell->tile [z] = self->face2tile [face]; 2049 cell->tile [z] = self->face2tile [face];
1664 2050
1665 if (cell->tile [z]) 2051 if (cell->tile [z])
1666 { 2052 {
1667 maptex *tex = self->tex + cell->tile [z]; 2053 maptex *tex = self->tex + cell->tile [z];
2054 tex->unused = 0;
1668 if (!tex->name) 2055 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z])); 2056 av_push (missing, newSViv (cell->tile [z]));
1670 2057
1671 if (tex->smoothtile) 2058 if (tex->smoothtile)
1672 { 2059 {
1673 maptex *smooth = self->tex + tex->smoothtile; 2060 maptex *smooth = self->tex + tex->smoothtile;
2061 smooth->unused = 0;
1674 if (!smooth->name) 2062 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile)); 2063 av_push (missing, newSViv (tex->smoothtile));
1676 } 2064 }
1677 } 2065 }
1678 } 2066 }
1679 } 2067 }
1680 else 2068 else
1681 cell->darkness = 0; 2069 CELL_CLEAR (cell);
1682 } 2070 }
1683} 2071}
1684 OUTPUT: 2072 OUTPUT:
1685 RETVAL 2073 RETVAL
1686 2074
1687SV * 2075SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2076mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 2077 CODE:
1690{ 2078{
1691 int x1, x; 2079 int x1, x;
1692 int y1, y; 2080 int y1, y;
1693 int z; 2081 int z;
1738} 2126}
1739 OUTPUT: 2127 OUTPUT:
1740 RETVAL 2128 RETVAL
1741 2129
1742void 2130void
1743draw (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)
1744 CODE: 2132 CODE:
1745{ 2133{
1746 int x, y, z; 2134 int x, y, z;
1747 2135
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 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
1750 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2138 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 2139 smooth_key skey;
1752 2140 int pl_x, pl_y;
2141 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 2142 rc_t *rc = rc_alloc ();
2143 rc_t *rc_ov = rc_alloc ();
1754 rc_key_t key; 2144 rc_key_t key;
1755 rc_array_t *arr; 2145 rc_array_t *arr;
1756 2146
2147 pl_tex.name = 0;
2148
1757 // thats current max. sorry. 2149 // that's current max. sorry.
1758 if (sw > 255) sw = 255; 2150 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 2151 if (sh > 255) sh = 255;
1760 2152
1761 // clear key, in case of extra padding 2153 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey)); 2154 memset (&skey, 0, sizeof (skey));
1766 key.g = 255; 2158 key.g = 255;
1767 key.b = 255; 2159 key.b = 255;
1768 key.a = 255; 2160 key.a = 255;
1769 key.mode = GL_QUADS; 2161 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F; 2162 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772 2163
1773 mx += self->x; 2164 mx += self->x;
1774 my += self->y; 2165 my += self->y;
1775 2166
1776 // first pass: determine smooth_max 2167 // first pass: determine smooth_max
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2191 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801 2192
1802 for (z = 0; z <= 2; z++) 2193 for (z = 0; z <= 2; z++)
1803 { 2194 {
1804 memset (smooth_level, 0, sizeof (smooth_level)); 2195 memset (smooth_level, 0, sizeof (smooth_level));
2196 key.texname = -1;
1805 2197
1806 for (y = 0; y < sh; y++) 2198 for (y = 0; y < sh; y++)
1807 if (0 <= y + my && y + my < self->rows) 2199 if (0 <= y + my && y + my < self->rows)
1808 { 2200 {
1809 maprow *row = self->row + (y + my); 2201 maprow *row = self->row + (y + my);
1819 maptex tex = self->tex [tile]; 2211 maptex tex = self->tex [tile];
1820 int px, py; 2212 int px, py;
1821 2213
1822 if (key.texname != tex.name) 2214 if (key.texname != tex.name)
1823 { 2215 {
2216 self->tex [tile].unused = 0;
2217
1824 if (!tex.name) 2218 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 2219 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1826 2220
1827 key.texname = tex.name; 2221 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 2222 arr = rc_array (rc, &key);
1829 } 2223 }
1830 2224
1831 px = (x + 1) * T - tex.w; 2225 px = (x + 1) * T - tex.w;
1832 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 }
1833 2235
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2236 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 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);
1836 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);
1837 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);
1838
1839 if (cell->flags && z == 2)
1840 {
1841 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1)
1843 {
1844 maptex tex = self->tex [1];
1845 int px = x * T + T * 2 / 32;
1846 int py = y * T - T * 6 / 32;
1847
1848 if (tex.name)
1849 {
1850 if (key.texname != tex.name)
1851 {
1852 key.texname = tex.name;
1853 arr = rc_array (rc, &key);
1854 }
1855
1856 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1857 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1858 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1859 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1860 }
1861 }
1862 }
1863 2240
1864 // update smooth hash 2241 // update smooth hash
1865 if (tex.smoothtile) 2242 if (tex.smoothtile)
1866 { 2243 {
1867 skey.tile = tex.smoothtile; 2244 skey.tile = tex.smoothtile;
1896 // corners 2273 // corners
1897 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2274 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1898 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);
1899 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);
1900 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);
2278 }
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);
1901 } 2299 }
1902 } 2300 }
1903 } 2301 }
1904 } 2302 }
1905 2303
1945 { 2343 {
1946 // this time avoiding texture state changes 2344 // this time avoiding texture state changes
1947 // save gobs of state changes. 2345 // save gobs of state changes.
1948 if (key.texname != tex.name) 2346 if (key.texname != tex.name)
1949 { 2347 {
2348 self->tex [skey->tile].unused = 0;
2349
1950 glEnd (); 2350 glEnd ();
1951 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2351 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1952 glBegin (GL_QUADS); 2352 glBegin (GL_QUADS);
1953 } 2353 }
1954 2354
1983 } 2383 }
1984 2384
1985 hv_clear (smooth); 2385 hv_clear (smooth);
1986 } 2386 }
1987 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
2402 rc_draw (rc);
2403 }
2404
2405 rc_draw (rc_ov);
2406 rc_clear (rc_ov);
2407
1988 glDisable (GL_BLEND); 2408 glDisable (GL_BLEND);
1989 rc_free (rc); 2409 rc_free (rc);
2410 rc_free (rc_ov);
1990 2411
1991 // top layer: overlays such as the health bar 2412 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2413 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2414 if (0 <= y + my && y + my < self->rows)
1994 { 2415 {
1999 { 2420 {
2000 mapcell *cell = row->col + (x + mx - row->c0); 2421 mapcell *cell = row->col + (x + mx - row->c0);
2001 2422
2002 int px = x * T; 2423 int px = x * T;
2003 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 }
2004 2431
2005 if (cell->stat_hp) 2432 if (cell->stat_hp)
2006 { 2433 {
2007 int width = cell->stat_width * T; 2434 int width = cell->stat_width * T;
2008 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2019 } 2446 }
2020 } 2447 }
2021} 2448}
2022 2449
2023void 2450void
2024draw_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)
2025 CODE: 2452 CODE:
2026{ 2453{
2027 static float color[16][3] = { 2454 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2455 { 0.00f, 0.00f, 0.00f },
2029 { 1.00F, 1.00F, 1.00F }, 2456 { 1.00f, 1.00f, 1.00f },
2030 { 0.00F, 0.00F, 0.55F }, 2457 { 0.00f, 0.00f, 0.55f },
2031 { 1.00F, 0.00F, 0.00F }, 2458 { 1.00f, 0.00f, 0.00f },
2032 2459
2033 { 1.00F, 0.54F, 0.00F }, 2460 { 1.00f, 0.54f, 0.00f },
2034 { 0.11F, 0.56F, 1.00F }, 2461 { 0.11f, 0.56f, 1.00f },
2035 { 0.93F, 0.46F, 0.00F }, 2462 { 0.93f, 0.46f, 0.00f },
2036 { 0.18F, 0.54F, 0.34F }, 2463 { 0.18f, 0.54f, 0.34f },
2037 2464
2038 { 0.56F, 0.73F, 0.56F }, 2465 { 0.56f, 0.73f, 0.56f },
2039 { 0.80F, 0.80F, 0.80F }, 2466 { 0.80f, 0.80f, 0.80f },
2040 { 0.55F, 0.41F, 0.13F }, 2467 { 0.55f, 0.41f, 0.13f },
2041 { 0.99F, 0.77F, 0.26F }, 2468 { 0.99f, 0.77f, 0.26f },
2042 2469
2043 { 0.74F, 0.65F, 0.41F }, 2470 { 0.74f, 0.65f, 0.41f },
2044 2471
2045 { 0.00F, 1.00F, 1.00F }, 2472 { 0.00f, 1.00f, 1.00f },
2046 { 1.00F, 0.00F, 1.00F }, 2473 { 1.00f, 0.00f, 1.00f },
2047 { 1.00F, 1.00F, 0.00F }, 2474 { 1.00f, 1.00f, 0.00f },
2048 }; 2475 };
2049 2476
2050 int x, y; 2477 int x, y;
2051 2478
2052 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 */
2053 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2486 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2054 glEnable (GL_BLEND); 2487 glEnable (GL_BLEND);
2055 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2488 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2056 glBegin (GL_QUADS); 2489 glBegin (GL_QUADS);
2057 2490
2058 for (y = 0; y < h; y++) 2491 for (y = 0; y < h; y++)
2062 2495
2063 if (m) 2496 if (m)
2064 { 2497 {
2065 float *c = color [m & 15]; 2498 float *c = color [m & 15];
2066 2499
2067 float tx1 = m & 0x40 ? 0.5 : 0.; 2500 float tx1 = m & 0x40 ? 0.5f : 0.f;
2068 float tx2 = tx1 + 0.5; 2501 float tx2 = tx1 + 0.5f;
2069 2502
2070 glColor4f (c[0], c[1], c[2], 0.75); 2503 glColor4f (c[0], c[1], c[2], 1);
2071 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2504 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2072 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2505 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2073 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2506 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2074 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2507 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2075 } 2508 }
2079 glDisable (GL_BLEND); 2512 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2513 glDisable (GL_TEXTURE_2D);
2081} 2514}
2082 2515
2083void 2516void
2084fow_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)
2085 PPCODE: 2518 PPCODE:
2086{ 2519{
2087 int x, y; 2520 int x, y;
2088 int sw1 = sw + 2; 2521 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2522 int sh1 = sh + 2;
2090 int sh3 = sh * 3; 2523 int sh3 = sh * 3;
2091 int sw34 = (sw * 3 + 3) & ~3; 2524 int sw3 = sw * 3;
2092 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2093 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2094 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2095 2528
2096 SvPOK_only (darkness3_sv); 2529 SvPOK_only (darkness3_sv);
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2530 SvCUR_set (darkness3_sv, sw3 * sh3);
2098 2531
2099 mx += self->x - 1; 2532 mx += self->x - 1;
2100 my += self->y - 1; 2533 my += self->y - 1;
2101
2102 memset (darkness1, 255, sw1 * sh1);
2103 2534
2104 for (y = 0; y < sh1; y++) 2535 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2536 if (0 <= y + my && y + my < self->rows)
2106 { 2537 {
2107 maprow *row = self->row + (y + my); 2538 maprow *row = self->row + (y + my);
2110 if (row->c0 <= x + mx && x + mx < row->c1) 2541 if (row->c0 <= x + mx && x + mx < row->c1)
2111 { 2542 {
2112 mapcell *cell = row->col + (x + mx - row->c0); 2543 mapcell *cell = row->col + (x + mx - row->c0);
2113 2544
2114 darkness1 [y * sw1 + x] = cell->darkness 2545 darkness1 [y * sw1 + x] = cell->darkness
2115 ? 255 - (cell->darkness - 1) 2546 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2116 : 255 - FOW_DARKNESS; 2547 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2117 } 2548 }
2118 } 2549 }
2119 2550
2120 for (y = 0; y < sh; ++y) 2551 for (y = 0; y < sh; ++y)
2121 for (x = 0; x < sw; ++x) 2552 for (x = 0; x < sw; ++x)
2140 2571
2141 uint8_t r13 = (d13 + d23 + d12) / 3; 2572 uint8_t r13 = (d13 + d23 + d12) / 3;
2142 uint8_t r23 = d23; 2573 uint8_t r23 = d23;
2143 uint8_t r33 = (d23 + d33 + d32) / 3; 2574 uint8_t r33 = (d23 + d33 + d32) / 3;
2144 2575
2145 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2576 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2146 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2577 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2147 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2148 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2579 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2149 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 */
2150 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2151 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2582 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2152 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2583 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2153 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2154 } 2585 }
2155 2586
2156 free (darkness1); 2587 free (darkness1);
2157 2588
2158 EXTEND (SP, 3); 2589 EXTEND (SP, 3);
2159 PUSHs (sv_2mortal (newSViv (sw34))); 2590 PUSHs (sv_2mortal (newSViv (sw3)));
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2591 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2592 PUSHs (darkness3_sv);
2162} 2593}
2163 2594
2164SV * 2595SV *
2165get_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)
2166 CODE: 2597 CODE:
2167{ 2598{
2168 int x, y, x1, y1; 2599 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2600 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2601 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2658 else
2228 *data++ = 0; 2659 *data++ = 0;
2229 } 2660 }
2230 } 2661 }
2231 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 {
2232 SvPOK_only (data_sv); 2666 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2667 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2668 }
2669
2234 RETVAL = data_sv; 2670 RETVAL = data_sv;
2235} 2671}
2236 OUTPUT: 2672 OUTPUT:
2237 RETVAL 2673 RETVAL
2238 2674
2239void 2675void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2676set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2677 PPCODE:
2242{ 2678{
2243 int x, y, z; 2679 int x, y, z;
2244 int w, h; 2680 int w, h;
2245 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;
2246 2692
2247 if (*data++ != 0) 2693 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2694 XSRETURN_EMPTY; /* version mismatch */
2249 2695
2250 w = *data++ << 8; w |= *data++; 2696 w = *data++ << 8; w |= *data++;
2265 { 2711 {
2266 maprow *row = map_get_row (self, y); 2712 maprow *row = map_get_row (self, y);
2267 2713
2268 for (x = x0; x < x1; x++) 2714 for (x = x0; x < x1; x++)
2269 { 2715 {
2716 uint8_t flags;
2717
2718 if (data + 7 >= end)
2719 XSRETURN_EMPTY;
2720
2270 uint8_t flags = *data++; 2721 flags = *data++;
2271 2722
2272 if (flags) 2723 if (flags)
2273 { 2724 {
2274 mapcell *cell = row_get_cell (row, x); 2725 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2726 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2729 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2730 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2731
2281 if (cell->darkness == 0) 2732 if (cell->darkness == 0)
2282 { 2733 {
2283 cell->darkness = 0; 2734 /*cell->darkness = 0;*/
2735 EXTEND (SP, 3);
2284 2736
2285 for (z = 0; z <= 2; z++) 2737 for (z = 0; z <= 2; z++)
2286 { 2738 {
2287 tileid t = tile [z]; 2739 tileid t = tile [z];
2288 2740
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2741 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2742 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2743 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2744 need_texid (self, t);
2293 } 2745 }
2294 2746
2295 cell->tile [z] = t; 2747 cell->tile [z] = t;
2296 } 2748 }
2298 } 2750 }
2299 } 2751 }
2300 } 2752 }
2301} 2753}
2302 2754
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2755MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2756
2305CFPlus::RW 2757DC::RW
2306new (SV *class, SV *data_sv) 2758new (SV *class, SV *data_sv)
2307 CODE: 2759 CODE:
2308{ 2760{
2309 STRLEN datalen; 2761 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2762 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2764 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2765}
2314 OUTPUT: 2766 OUTPUT:
2315 RETVAL 2767 RETVAL
2316 2768
2317CFPlus::RW 2769DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2770new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2771 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2772 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2773 OUTPUT:
2322 RETVAL 2774 RETVAL
2323 2775
2324# fails on win32: 2776# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2777# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2778#void
2327#close (CFPlus::RW self) 2779#close (DC::RW self)
2328# CODE: 2780# CODE:
2329# (self->(close)) (self); 2781# (self->(close)) (self);
2330 2782
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2783MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2784
2333PROTOTYPES: DISABLE 2785PROTOTYPES: DISABLE
2334 2786
2335CFPlus::Channel 2787DC::Channel
2336find () 2788find ()
2337 CODE: 2789 CODE:
2338{ 2790{
2339 RETVAL = Mix_GroupAvailable (-1); 2791 RETVAL = Mix_GroupAvailable (-1);
2340 2792
2353} 2805}
2354 OUTPUT: 2806 OUTPUT:
2355 RETVAL 2807 RETVAL
2356 2808
2357void 2809void
2358halt (CFPlus::Channel self) 2810halt (DC::Channel self)
2359 CODE: 2811 CODE:
2360 Mix_HaltChannel (self); 2812 Mix_HaltChannel (self);
2361 2813
2362void 2814void
2363expire (CFPlus::Channel self, int ticks = -1) 2815expire (DC::Channel self, int ticks = -1)
2364 CODE: 2816 CODE:
2365 Mix_ExpireChannel (self, ticks); 2817 Mix_ExpireChannel (self, ticks);
2366 2818
2367void 2819void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2820fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2821 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2822 Mix_FadeOutChannel (self, ticks);
2371 2823
2372int 2824int
2373volume (CFPlus::Channel self, int volume) 2825volume (DC::Channel self, int volume)
2374 CODE: 2826 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2827 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2828 OUTPUT:
2377 RETVAL 2829 RETVAL
2378 2830
2379void 2831void
2380unregister_all_effects (CFPlus::Channel self) 2832unregister_all_effects (DC::Channel self)
2381 CODE: 2833 CODE:
2382 Mix_UnregisterAllEffects (self); 2834 Mix_UnregisterAllEffects (self);
2383 2835
2384void 2836void
2385set_panning (CFPlus::Channel self, int left, int right) 2837set_panning (DC::Channel self, int left, int right)
2386 CODE: 2838 CODE:
2387 left = CLAMP (left , 0, 255); 2839 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2840 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2841 Mix_SetPanning (self, left, right);
2390 2842
2391void 2843void
2392set_distance (CFPlus::Channel self, int distance) 2844set_distance (DC::Channel self, int distance)
2393 CODE: 2845 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2846 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2847
2396void 2848void
2397set_position (CFPlus::Channel self, int angle, int distance) 2849set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2850 CODE:
2399 2851
2400void 2852void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2853set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2854 CODE:
2403{ 2855{
2404 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));
2405 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;
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2858 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2859}
2408 2860
2409void 2861void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2862set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2863 CODE:
2412 Mix_SetReverseStereo (self, flip); 2864 Mix_SetReverseStereo (self, flip);
2413 2865
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2866MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2867
2416PROTOTYPES: DISABLE 2868PROTOTYPES: DISABLE
2417 2869
2418CFPlus::MixChunk 2870DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2871new (SV *class, DC::RW rwops)
2420 CODE: 2872 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2873 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2874 OUTPUT:
2423 RETVAL 2875 RETVAL
2424 2876
2425void 2877void
2426DESTROY (CFPlus::MixChunk self) 2878DESTROY (DC::MixChunk self)
2427 CODE: 2879 CODE:
2428 Mix_FreeChunk (self); 2880 Mix_FreeChunk (self);
2429 2881
2430int 2882int
2431volume (CFPlus::MixChunk self, int volume = -1) 2883volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2884 CODE:
2433 if (items > 1) 2885 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2886 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2887 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2888 OUTPUT:
2437 RETVAL 2889 RETVAL
2438 2890
2439CFPlus::Channel 2891DC::Channel
2440play (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)
2441 CODE: 2893 CODE:
2442{ 2894{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2895 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2896
2445 if (RETVAL < 0) 2897 if (RETVAL < 0)
2452 } 2904 }
2453} 2905}
2454 OUTPUT: 2906 OUTPUT:
2455 RETVAL 2907 RETVAL
2456 2908
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2909MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2910
2459int 2911int
2460volume (int volume = -1) 2912volume (int volume = -1)
2461 PROTOTYPE: ;$ 2913 PROTOTYPE: ;$
2462 CODE: 2914 CODE:
2474void 2926void
2475halt () 2927halt ()
2476 CODE: 2928 CODE:
2477 Mix_HaltMusic (); 2929 Mix_HaltMusic ();
2478 2930
2479CFPlus::MixMusic 2931DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2932new (SV *class, DC::RW rwops)
2481 CODE: 2933 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2934 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2935 OUTPUT:
2484 RETVAL 2936 RETVAL
2485 2937
2486void 2938void
2487DESTROY (CFPlus::MixMusic self) 2939DESTROY (DC::MixMusic self)
2488 CODE: 2940 CODE:
2489 Mix_FreeMusic (self); 2941 Mix_FreeMusic (self);
2490 2942
2491int 2943int
2492play (CFPlus::MixMusic self, int loops = -1) 2944play (DC::MixMusic self, int loops = -1)
2493 CODE: 2945 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2946 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2947 OUTPUT:
2496 RETVAL 2948 RETVAL
2497 2949
2498void 2950void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2951fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2952 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2953 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2954
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2955MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2956
2505PROTOTYPES: ENABLE 2957PROTOTYPES: ENABLE
2506 2958
2507BOOT: 2959BOOT:
2508{ 2960{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2961 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2962 static const struct {
2511 const char *name; 2963 const char *name;
2512 IV iv; 2964 IV iv;
2513 } *civ, const_iv[] = { 2965 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2966# define const_iv(name) { # name, (IV)name }
2515 const_iv (GL_VENDOR), 2967 const_iv (GL_VENDOR),
2516 const_iv (GL_VERSION), 2968 const_iv (GL_VERSION),
2517 const_iv (GL_EXTENSIONS), 2969 const_iv (GL_EXTENSIONS),
2970 const_iv (GL_MAX_TEXTURE_UNITS),
2518 const_iv (GL_COLOR_MATERIAL), 2971 const_iv (GL_COLOR_MATERIAL),
2519 const_iv (GL_SMOOTH), 2972 const_iv (GL_SMOOTH),
2520 const_iv (GL_FLAT), 2973 const_iv (GL_FLAT),
2521 const_iv (GL_DITHER), 2974 const_iv (GL_DITHER),
2522 const_iv (GL_BLEND), 2975 const_iv (GL_BLEND),
2534 const_iv (GL_ZERO), 2987 const_iv (GL_ZERO),
2535 const_iv (GL_SRC_ALPHA), 2988 const_iv (GL_SRC_ALPHA),
2536 const_iv (GL_DST_ALPHA), 2989 const_iv (GL_DST_ALPHA),
2537 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2990 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2538 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),
2539 const_iv (GL_SRC_ALPHA_SATURATE), 2996 const_iv (GL_SRC_ALPHA_SATURATE),
2540 const_iv (GL_RGB), 2997 const_iv (GL_RGB),
2541 const_iv (GL_RGBA), 2998 const_iv (GL_RGBA),
2542 const_iv (GL_RGBA4), 2999 const_iv (GL_RGBA4),
2543 const_iv (GL_RGBA8), 3000 const_iv (GL_RGBA8),
2549 const_iv (GL_INTENSITY), 3006 const_iv (GL_INTENSITY),
2550 const_iv (GL_LUMINANCE), 3007 const_iv (GL_LUMINANCE),
2551 const_iv (GL_LUMINANCE_ALPHA), 3008 const_iv (GL_LUMINANCE_ALPHA),
2552 const_iv (GL_FLOAT), 3009 const_iv (GL_FLOAT),
2553 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),
2554 const_iv (GL_COMPILE), 3017 const_iv (GL_COMPILE),
2555 const_iv (GL_PROXY_TEXTURE_1D), 3018 const_iv (GL_PROXY_TEXTURE_1D),
2556 const_iv (GL_PROXY_TEXTURE_2D), 3019 const_iv (GL_PROXY_TEXTURE_2D),
2557 const_iv (GL_TEXTURE_1D), 3020 const_iv (GL_TEXTURE_1D),
2558 const_iv (GL_TEXTURE_2D), 3021 const_iv (GL_TEXTURE_2D),
2597 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3060 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598 const_iv (GL_POINT_SMOOTH_HINT), 3061 const_iv (GL_POINT_SMOOTH_HINT),
2599 const_iv (GL_LINE_SMOOTH_HINT), 3062 const_iv (GL_LINE_SMOOTH_HINT),
2600 const_iv (GL_POLYGON_SMOOTH_HINT), 3063 const_iv (GL_POLYGON_SMOOTH_HINT),
2601 const_iv (GL_GENERATE_MIPMAP_HINT), 3064 const_iv (GL_GENERATE_MIPMAP_HINT),
3065 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602 const_iv (GL_FASTEST), 3066 const_iv (GL_FASTEST),
2603 const_iv (GL_DONT_CARE), 3067 const_iv (GL_DONT_CARE),
2604 const_iv (GL_NICEST), 3068 const_iv (GL_NICEST),
2605 const_iv (GL_V2F), 3069 const_iv (GL_V2F),
2606 const_iv (GL_V3F), 3070 const_iv (GL_V3F),
2607 const_iv (GL_T2F_V3F), 3071 const_iv (GL_T2F_V3F),
2608 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),
2609# undef const_iv 3076# undef const_iv
2610 }; 3077 };
2611 3078
2612 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; )
2613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2614 3081
2615 texture_av = newAV (); 3082 texture_av = newAV ();
2616 AvREAL_off (texture_av); 3083 AvREAL_off (texture_av);
2617} 3084}
2618 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
2619char * 3095char *
2620gl_vendor () 3096gl_vendor ()
2621 CODE: 3097 CODE:
2622 RETVAL = (char *)glGetString (GL_VENDOR); 3098 RETVAL = (char *)glGetString (GL_VENDOR);
2623 OUTPUT: 3099 OUTPUT:
2672 3148
2673void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3149void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2674 CODE: 3150 CODE:
2675 gl_BlendFuncSeparate (sa, da, saa, daa); 3151 gl_BlendFuncSeparate (sa, da, saa, daa);
2676 3152
3153# void glBlendEquation (int se)
3154
2677void glDepthMask (int flag) 3155void glDepthMask (int flag)
2678 3156
2679void glLogicOp (int opcode) 3157void glLogicOp (int opcode)
2680 3158
2681void glColorMask (int red, int green, int blue, int alpha) 3159void glColorMask (int red, int green, int blue, int alpha)
2715void glRotate (float angle, float x, float y, float z) 3193void glRotate (float angle, float x, float y, float z)
2716 CODE: 3194 CODE:
2717 glRotatef (angle, x, y, z); 3195 glRotatef (angle, x, y, z);
2718 3196
2719void 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: @
2720 ALIAS: 3199 ALIAS:
2721 glColor_premultiply = 1 3200 glColor_premultiply = 1
2722 CODE: 3201 CODE:
2723 if (ix) 3202 if (ix)
2724 { 3203 {
2744 3223
2745void glRect (float x1, float y1, float x2, float y2) 3224void glRect (float x1, float y1, float x2, float y2)
2746 CODE: 3225 CODE:
2747 glRectf (x1, y1, x2, y2); 3226 glRectf (x1, y1, x2, y2);
2748 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
2749PROTOTYPES: ENABLE 3237PROTOTYPES: ENABLE
2750 3238
2751void glBegin (int mode) 3239void glBegin (int mode)
2752 3240
2753void glEnd () 3241void glEnd ()
2785void 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)
2786 CODE: 3274 CODE:
2787 if (gl.SeparableFilter2D) 3275 if (gl.SeparableFilter2D)
2788 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3276 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789 3277
2790void 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)
2791 3279
2792void 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)
2793 3281
2794void glDrawPixels (int width, int height, int format, int type, char *pixels) 3282void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795 3283
2821 3309
2822void glEndList () 3310void glEndList ()
2823 3311
2824void glCallList (int list) 3312void glCallList (int list)
2825 3313
2826MODULE = 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
2827 3320
2828PROTOTYPES: DISABLE 3321PROTOTYPES: DISABLE
2829 3322
2830void 3323void
2831find_widget (SV *self, NV x, NV y) 3324find_widget (SV *self, NV x, NV y)
2835 XPUSHs (self); 3328 XPUSHs (self);
2836} 3329}
2837 3330
2838BOOT: 3331BOOT:
2839{ 3332{
2840 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3333 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841 3334
2842 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);
2843 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);
2844 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);
2845 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);
2846} 3339}
2847 3340
2848void 3341void
2849draw (SV *self) 3342draw (SV *self)
2850 CODE: 3343 CODE:
2854 NV x, y, w, h; 3347 NV x, y, w, h;
2855 SV *draw_x_sv = GvSV (draw_x_gv); 3348 SV *draw_x_sv = GvSV (draw_x_gv);
2856 SV *draw_y_sv = GvSV (draw_y_gv); 3349 SV *draw_y_sv = GvSV (draw_y_gv);
2857 SV *draw_w_sv = GvSV (draw_w_gv); 3350 SV *draw_w_sv = GvSV (draw_w_gv);
2858 SV *draw_h_sv = GvSV (draw_h_gv); 3351 SV *draw_h_sv = GvSV (draw_h_gv);
2859 SV *hover;
2860 double draw_x, draw_y, draw_w, draw_h; 3352 double draw_x, draw_y;
2861 3353
2862 if (!SvROK (self)) 3354 if (!SvROK (self))
2863 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3355 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2864 3356
2865 hv = (HV *)SvRV (self); 3357 hv = (HV *)SvRV (self);
2866 3358
2867 if (SvTYPE (hv) != SVt_PVHV) 3359 if (SvTYPE (hv) != SVt_PVHV)
2868 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3360 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2869 3361
2870 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.;
2871 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.;
2872 3364
2873 if (!h || !w) 3365 if (!h || !w)
2893 { 3385 {
2894 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3386 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2895 3387
2896 if (svp && SvTRUE (*svp)) 3388 if (svp && SvTRUE (*svp))
2897 { 3389 {
2898 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);
2899 glEnable (GL_BLEND); 3391 glEnable (GL_BLEND);
2900 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3392 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2901 glBegin (GL_QUADS); 3393 glBegin (GL_QUADS);
2902 glVertex2f (0, 0); 3394 glVertex2f (0, 0);
2903 glVertex2f (w, 0); 3395 glVertex2f (w, 0);
2906 glEnd (); 3398 glEnd ();
2907 glDisable (GL_BLEND); 3399 glDisable (GL_BLEND);
2908 } 3400 }
2909 } 3401 }
2910#if 0 3402#if 0
2911 if ($ENV{CFPLUS_DEBUG} & 1) { 3403 // draw borders, for debugging
2912 glPushMatrix; 3404 glPushMatrix ();
2913 glColor 1, 1, 0, 1; 3405 glColor4f (1., 1., 0., 1.);
2914 glTranslate 0.375, 0.375; 3406 glTranslatef (.5, .5, 0.);
2915 glBegin GL_LINE_LOOP; 3407 glBegin (GL_LINE_LOOP);
2916 glVertex 0 , 0; 3408 glVertex2f (0 , 0);
2917 glVertex $self->{w} - 1, 0; 3409 glVertex2f (w - 1, 0);
2918 glVertex $self->{w} - 1, $self->{h} - 1; 3410 glVertex2f (w - 1, h - 1);
2919 glVertex 0 , $self->{h} - 1; 3411 glVertex2f (0 , h - 1);
2920 glEnd; 3412 glEnd ();
2921 glPopMatrix; 3413 glPopMatrix ();
2922 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2923 }
2924#endif 3414#endif
2925 PUSHMARK (SP); 3415 PUSHMARK (SP);
2926 XPUSHs (self); 3416 XPUSHs (self);
2927 PUTBACK; 3417 PUTBACK;
2928 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