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.208 by root, Sat Jul 21 16:07:53 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 2008 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>
38#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
39 46
40#include <glib/gmacros.h> 47#include <glib/gmacros.h>
41 48
42#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
43 61
44#ifndef _WIN32 62#ifndef _WIN32
45# include <sys/types.h> 63# include <sys/types.h>
46# include <sys/socket.h> 64# include <sys/socket.h>
47# include <netinet/in.h> 65# include <netinet/in.h>
48# include <netinet/tcp.h> 66# include <netinet/tcp.h>
49# include <inttypes.h> 67# include <inttypes.h>
50#endif 68#endif
51 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 80
54#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
55 82
56#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
58 85
59#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
60 87
61#if 0 88/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else
64# define PARACHUTE 0
65#endif
66 90
67static AV *texture_av; 91static AV *texture_av;
68 92
69static struct 93static struct
70{ 94{
107 av_push (texture_av, (SV *)(size_t)name); 131 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 132 glDeleteTextures (1, &name);
109} 133}
110 134
111#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
112 137
113#include "pango-font.c" 138#include "pango-font.c"
114#include "pango-fontmap.c" 139#include "pango-fontmap.c"
115#include "pango-render.c" 140#include "pango-render.c"
116 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
119 146
120typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
121 148
122static int 149static int
123shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
124{ 151{
125 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
139 166
140typedef struct cf_layout { 167typedef struct cf_layout {
141 PangoLayout *pl; 168 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
143 int base_height; 170 int base_height;
144 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
145} *CFPlus__Layout; 173} *DC__Layout;
146 174
147static CFPlus__Font default_font; 175static DC__Font default_font;
148static PangoContext *opengl_context; 176static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
150 178
151static void 179static void
152substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
157#endif 185#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 187}
160 188
161static void 189static void
162layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
163{ 191{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
166 */ 194 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
168 196
169 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 199
172 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
173} 201}
174 202
175static void 203static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 205{
178 PangoRectangle rect; 206 PangoRectangle rect;
179 207
180 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
192 220
193typedef uint16_t tileid; 221typedef uint16_t tileid;
194typedef uint16_t faceid; 222typedef uint16_t faceid;
195 223
196typedef struct { 224typedef struct {
197 int name; 225 GLuint name;
198 int w, h; 226 int w, h;
199 float s, t; 227 float s, t;
200 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
201 tileid smoothtile; 229 tileid smoothtile;
202 uint8_t smoothlevel; 230 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
222 250
223 int32_t rows; 251 int32_t rows;
224 maprow *row; 252 maprow *row;
225} *CFPlus__Map; 253} *DC__Map;
226 254
227static char * 255static char *
228prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
229{ 257{
230 char *p; 258 char *p;
268 self->texs *= 2; 296 self->texs *= 2;
269 } 297 }
270} 298}
271 299
272static maprow * 300static maprow *
273map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
274{ 302{
275 if (0 > y) 303 if (0 > y)
276 { 304 {
277 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
316 344
317 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
318} 346}
319 347
320static mapcell * 348static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
322{ 350{
323 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
324} 352}
325 353
326static void 354static void
327map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
328{ 356{
329 int r; 357 int r;
330 358
331 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
339 self->oy = 0; 367 self->oy = 0;
340 self->row = 0; 368 self->row = 0;
341 self->rows = 0; 369 self->rows = 0;
342} 370}
343 371
372#define CELL_CLEAR(cell) \
373 do { \
374 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \
377 (cell)->player = 0; \
378 } while (0)
379
344static void 380static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 381map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 382{
347 int x, y; 383 int x, y;
348 maprow *row; 384 maprow *row;
349 mapcell *cell; 385 mapcell *cell;
350 386
362 if (x >= row->c1) 398 if (x >= row->c1)
363 break; 399 break;
364 400
365 cell = row->col + x - row->c0; 401 cell = row->col + x - row->c0;
366 402
367 cell->darkness = 0; 403 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 404 }
372 } 405 }
373} 406}
374 407
375typedef struct { 408typedef struct {
429 n |= n >> 16; 462 n |= n >> 16;
430 463
431 return n + 1; 464 return n + 1;
432} 465}
433 466
467static unsigned int
468popcount (unsigned int n)
469{
470 n -= (n >> 1) & 0x55555555U;
471 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
472 n = ((n >> 4) + n) & 0x0f0f0f0fU;
473 n *= 0x01010101U;
474
475 return n >> 24;
476}
477
434/* SDL should provide this, really. */ 478/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 479#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 480#define SDLK_MODIFIER_MAX 314
437 481
438/******************************************************************************/ 482/******************************************************************************/
439 483
484static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
485static GV *hover_gv;
486
440static int 487static int
441within_widget (SV *widget, NV x, NV y) 488within_widget (SV *widget, NV x, NV y)
442{ 489{
443 HV *self; 490 HV *self;
444 SV **svp; 491 SV **svp;
473 return 0; 520 return 0;
474 521
475 return 1; 522 return 1;
476} 523}
477 524
478MODULE = CFPlus PACKAGE = CFPlus 525MODULE = Deliantra::Client PACKAGE = DC
479 526
480PROTOTYPES: ENABLE 527PROTOTYPES: ENABLE
481 528
482BOOT: 529BOOT:
483{ 530{
484 HV *stash = gv_stashpv ("CFPlus", 1); 531 HV *stash = gv_stashpv ("DC", 1);
485 static const struct { 532 static const struct {
486 const char *name; 533 const char *name;
487 IV iv; 534 IV iv;
488 } *civ, const_iv[] = { 535 } *civ, const_iv[] = {
489# define const_iv(name) { # name, (IV)name } 536# define const_iv(name) { # name, (IV)name }
511 558
512 const_iv (SDL_APPINPUTFOCUS), 559 const_iv (SDL_APPINPUTFOCUS),
513 const_iv (SDL_APPMOUSEFOCUS), 560 const_iv (SDL_APPMOUSEFOCUS),
514 const_iv (SDL_APPACTIVE), 561 const_iv (SDL_APPACTIVE),
515 562
563 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST),
516 const_iv (SDLK_KP0), 565 const_iv (SDLK_KP0),
517 const_iv (SDLK_KP1), 566 const_iv (SDLK_KP1),
518 const_iv (SDLK_KP2), 567 const_iv (SDLK_KP2),
519 const_iv (SDLK_KP3), 568 const_iv (SDLK_KP3),
520 const_iv (SDLK_KP4), 569 const_iv (SDLK_KP4),
592 const_iv (KMOD_LMETA), 641 const_iv (KMOD_LMETA),
593 const_iv (KMOD_RMETA), 642 const_iv (KMOD_RMETA),
594 const_iv (KMOD_NUM), 643 const_iv (KMOD_NUM),
595 const_iv (KMOD_CAPS), 644 const_iv (KMOD_CAPS),
596 const_iv (KMOD_MODE), 645 const_iv (KMOD_MODE),
646
647 const_iv (MIX_DEFAULT_FORMAT),
648
649 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO),
652 const_iv (SDL_INIT_CDROM),
653 const_iv (SDL_INIT_JOYSTICK),
654 const_iv (SDL_INIT_EVERYTHING),
655 const_iv (SDL_INIT_NOPARACHUTE),
656 const_iv (SDL_INIT_EVENTTHREAD),
657
658 const_iv (SDL_GL_RED_SIZE),
659 const_iv (SDL_GL_GREEN_SIZE),
660 const_iv (SDL_GL_BLUE_SIZE),
661 const_iv (SDL_GL_ALPHA_SIZE),
662 const_iv (SDL_GL_DOUBLEBUFFER),
663 const_iv (SDL_GL_BUFFER_SIZE),
664 const_iv (SDL_GL_DEPTH_SIZE),
665 const_iv (SDL_GL_STENCIL_SIZE),
666 const_iv (SDL_GL_ACCUM_RED_SIZE),
667 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
668 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL)
597# undef const_iv 675# undef const_iv
598 }; 676 };
599 677
600 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
601 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
619 697
620NV floor (NV x) 698NV floor (NV x)
621 699
622NV ceil (NV x) 700NV ceil (NV x)
623 701
702IV minpot (UV n)
703
704IV popcount (UV n)
705
624void 706void
625pango_init () 707pango_init ()
626 CODE: 708 CODE:
627{ 709{
628 opengl_fontmap = pango_opengl_font_map_new (); 710 opengl_fontmap = pango_opengl_font_map_new ();
629 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 711 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
630 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 712 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
713 /*pango_context_set_font_description (opengl_context, default_font);*/
714#if PANGO_VERSION_CHECK (1, 15, 2)
715 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
716 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
717#endif
631} 718}
632 719
633char *
634SDL_GetError () 720char *SDL_GetError ()
635 721
636int 722int SDL_Init (U32 flags)
637SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
638 723
639void 724int SDL_InitSubSystem (U32 flags)
725
726void SDL_QuitSubSystem (U32 flags)
727
640SDL_Quit () 728void SDL_Quit ()
729
730int SDL_GL_SetAttribute (int attr, int value)
731
732int SDL_GL_GetAttribute (int attr)
733 CODE:
734 if (SDL_GL_GetAttribute (attr, &RETVAL))
735 XSRETURN_UNDEF;
736 OUTPUT:
737 RETVAL
641 738
642void 739void
643SDL_ListModes (int rgb, int alpha) 740SDL_ListModes (int rgb, int alpha)
644 PPCODE: 741 PPCODE:
645{ 742{
657 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 754 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
658 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 755 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
659 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
660 757
661 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 758 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
662#if SDL_VERSION_ATLEAST(1,2,10)
663 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
664 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 759 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
665#endif
666 760
667 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 761 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
668 762
669 if (m && m != (SDL_Rect **)-1) 763 if (m && m != (SDL_Rect **)-1)
670 while (*m) 764 while (*m)
671 { 765 {
672 if ((*m)->w >= 640 && (*m)->h >= 480) 766 if ((*m)->w >= 400 && (*m)->h >= 300)
673 { 767 {
674 AV *av = newAV (); 768 AV *av = newAV ();
675 av_push (av, newSViv ((*m)->w)); 769 av_push (av, newSViv ((*m)->w));
676 av_push (av, newSViv ((*m)->h)); 770 av_push (av, newSViv ((*m)->h));
677 av_push (av, newSViv (rgb)); 771 av_push (av, newSViv (rgb));
701 795
702 if (RETVAL) 796 if (RETVAL)
703 { 797 {
704 av_clear (texture_av); 798 av_clear (texture_av);
705 799
706 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 800 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
707#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 801#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
708#include "glfunc.h" 802#include "glfunc.h"
709#undef GL_FUNC 803#undef GL_FUNC
710 } 804 }
711} 805}
718char * 812char *
719SDL_GetKeyName (int sym) 813SDL_GetKeyName (int sym)
720 814
721int 815int
722SDL_GetAppState () 816SDL_GetAppState ()
817
818int
819SDL_GetModState ()
723 820
724void 821void
725poll_events () 822poll_events ()
726 PPCODE: 823 PPCODE:
727{ 824{
737 { 834 {
738 case SDL_KEYDOWN: 835 case SDL_KEYDOWN:
739 case SDL_KEYUP: 836 case SDL_KEYUP:
740 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
741 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
742 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 839 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
743 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 840 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
744 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
745 break; 842 break;
746 843
747 case SDL_ACTIVEEVENT: 844 case SDL_ACTIVEEVENT:
748 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
766 x = ev.motion.x; 863 x = ev.motion.x;
767 y = ev.motion.y; 864 y = ev.motion.y;
768 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
769 } 866 }
770 867
771 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
772 hv_store (hv, "state", 5, newSViv (state), 0); 869 hv_store (hv, "state", 5, newSViv (state), 0);
773 hv_store (hv, "x", 1, newSViv (x), 0); 870 hv_store (hv, "x", 1, newSViv (x), 0);
774 hv_store (hv, "y", 1, newSViv (y), 0); 871 hv_store (hv, "y", 1, newSViv (y), 0);
775 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 872 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
776 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 873 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
777 } 874 }
778 break; 875 break;
779 876
780 case SDL_MOUSEBUTTONDOWN: 877 case SDL_MOUSEBUTTONDOWN:
781 case SDL_MOUSEBUTTONUP: 878 case SDL_MOUSEBUTTONUP:
782 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 879 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
783 880
784 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 881 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
785 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 882 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
786 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 883 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
787 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 884 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
792 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 889 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
793 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 890 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
794 break; 891 break;
795 } 892 }
796 893
797 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 894 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
798 } 895 }
799} 896}
800 897
801int 898int
802Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 899Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
803 POSTCALL: 900 POSTCALL:
804 Mix_HookMusicFinished (music_finished); 901 Mix_HookMusicFinished (music_finished);
805 Mix_ChannelFinished (channel_finished); 902 Mix_ChannelFinished (channel_finished);
806 903
807void 904void
905Mix_QuerySpec ()
906 PPCODE:
907{
908 int freq, channels;
909 Uint16 format;
910
911 if (Mix_QuerySpec (&freq, &format, &channels))
912 {
913 EXTEND (SP, 3);
914 PUSHs (sv_2mortal (newSViv (freq)));
915 PUSHs (sv_2mortal (newSViv (format)));
916 PUSHs (sv_2mortal (newSViv (channels)));
917 }
918}
919
920void
808Mix_CloseAudio () 921Mix_CloseAudio ()
809 922
810int 923int
811Mix_AllocateChannels (int numchans = -1) 924Mix_AllocateChannels (int numchans = -1)
925
926const char *
927Mix_GetError ()
812 928
813void 929void
814lowdelay (int fd, int val = 1) 930lowdelay (int fd, int val = 1)
815 CODE: 931 CODE:
816 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 932 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
842 } 958 }
843 } 959 }
844#endif 960#endif
845} 961}
846 962
847void 963int
848add_font (char *file) 964add_font (char *file)
849 CODE: 965 CODE:
850 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT:
968 RETVAL
851 969
852void 970void
853load_image_inline (SV *image_) 971load_image_inline (SV *image_)
854 ALIAS: 972 ALIAS:
855 load_image_file = 1 973 load_image_file = 1
858 STRLEN image_len; 976 STRLEN image_len;
859 char *image = (char *)SvPVbyte (image_, image_len); 977 char *image = (char *)SvPVbyte (image_, image_len);
860 SDL_Surface *surface, *surface2; 978 SDL_Surface *surface, *surface2;
861 SDL_PixelFormat fmt; 979 SDL_PixelFormat fmt;
862 SDL_RWops *rw = ix 980 SDL_RWops *rw = ix
863 ? SDL_RWFromFile (image, "r") 981 ? SDL_RWFromFile (image, "rb")
864 : SDL_RWFromConstMem (image, image_len); 982 : SDL_RWFromConstMem (image, image_len);
865 983
866 if (!rw) 984 if (!rw)
867 croak ("load_image: %s", SDL_GetError ()); 985 croak ("load_image: %s", SDL_GetError ());
868 986
941void 1059void
942error (char *message) 1060error (char *message)
943 CODE: 1061 CODE:
944 fprintf (stderr, "ERROR: %s\n", message); 1062 fprintf (stderr, "ERROR: %s\n", message);
945#ifdef _WIN32 1063#ifdef _WIN32
946 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
947#endif 1065#endif
948 1066
949void 1067void
950fatal (char *message) 1068fatal (char *message)
951 CODE: 1069 CODE:
952 fprintf (stderr, "FATAL: %s\n", message); 1070 fprintf (stderr, "FATAL: %s\n", message);
953#ifdef _WIN32 1071#ifdef _WIN32
954 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1072 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
955#endif 1073#endif
956 _exit (1); 1074 _exit (1);
957 1075
958void 1076void
959_exit (int retval = 0) 1077_exit (int retval = 0)
971#if DEBUG 1089#if DEBUG
972 VALGRIND_DO_LEAK_CHECK; 1090 VALGRIND_DO_LEAK_CHECK;
973#endif 1091#endif
974} 1092}
975 1093
976MODULE = CFPlus PACKAGE = CFPlus::Font 1094MODULE = Deliantra::Client PACKAGE = DC::Font
977 1095
978PROTOTYPES: DISABLE 1096PROTOTYPES: DISABLE
979 1097
980CFPlus::Font 1098DC::Font
981new_from_file (SV *class, char *path, int id = 0) 1099new_from_file (SV *class, char *path, int id = 0)
982 CODE: 1100 CODE:
983{ 1101{
984 int count; 1102 int count;
985 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1103 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
988} 1106}
989 OUTPUT: 1107 OUTPUT:
990 RETVAL 1108 RETVAL
991 1109
992void 1110void
993DESTROY (CFPlus::Font self) 1111DESTROY (DC::Font self)
994 CODE: 1112 CODE:
995 pango_font_description_free (self); 1113 pango_font_description_free (self);
996 1114
997void 1115void
998make_default (CFPlus::Font self) 1116make_default (DC::Font self)
999 PROTOTYPE: $ 1117 PROTOTYPE: $
1000 CODE: 1118 CODE:
1001 default_font = self; 1119 default_font = self;
1002 1120
1003MODULE = CFPlus PACKAGE = CFPlus::Layout 1121MODULE = Deliantra::Client PACKAGE = DC::Layout
1004 1122
1005PROTOTYPES: DISABLE 1123PROTOTYPES: DISABLE
1006 1124
1007void 1125void
1008reset_glyph_cache () 1126glyph_cache_backup ()
1009 PROTOTYPE: 1127 PROTOTYPE:
1010 CODE: 1128 CODE:
1129 tc_backup ();
1130
1131void
1132glyph_cache_restore ()
1133 PROTOTYPE:
1134 CODE:
1011 tc_clear (); 1135 tc_restore ();
1012 1136
1013CFPlus::Layout 1137DC::Layout
1014new (SV *class) 1138new (SV *class)
1015 CODE: 1139 CODE:
1016 New (0, RETVAL, 1, struct cf_layout); 1140 New (0, RETVAL, 1, struct cf_layout);
1017 1141
1018 RETVAL->pl = pango_layout_new (opengl_context); 1142 RETVAL->pl = pango_layout_new (opengl_context);
1020 RETVAL->g = 1.; 1144 RETVAL->g = 1.;
1021 RETVAL->b = 1.; 1145 RETVAL->b = 1.;
1022 RETVAL->a = 1.; 1146 RETVAL->a = 1.;
1023 RETVAL->base_height = MIN_FONT_HEIGHT; 1147 RETVAL->base_height = MIN_FONT_HEIGHT;
1024 RETVAL->font = 0; 1148 RETVAL->font = 0;
1149 RETVAL->rc = rc_alloc ();
1025 1150
1026 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1151 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1027 layout_update_font (RETVAL); 1152 layout_update_font (RETVAL);
1028 OUTPUT: 1153 OUTPUT:
1029 RETVAL 1154 RETVAL
1030 1155
1031void 1156void
1032DESTROY (CFPlus::Layout self) 1157DESTROY (DC::Layout self)
1033 CODE: 1158 CODE:
1034 g_object_unref (self->pl); 1159 g_object_unref (self->pl);
1160 rc_free (self->rc);
1035 Safefree (self); 1161 Safefree (self);
1036 1162
1037void 1163void
1038set_text (CFPlus::Layout self, SV *text_) 1164set_text (DC::Layout self, SV *text_)
1039 CODE: 1165 CODE:
1040{ 1166{
1041 STRLEN textlen; 1167 STRLEN textlen;
1042 char *text = SvPVutf8 (text_, textlen); 1168 char *text = SvPVutf8 (text_, textlen);
1043 1169
1044 pango_layout_set_text (self->pl, text, textlen); 1170 pango_layout_set_text (self->pl, text, textlen);
1045} 1171}
1046 1172
1047void 1173void
1048set_markup (CFPlus::Layout self, SV *text_) 1174set_markup (DC::Layout self, SV *text_)
1049 CODE: 1175 CODE:
1050{ 1176{
1051 STRLEN textlen; 1177 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
1053 1179
1054 pango_layout_set_markup (self->pl, text, textlen); 1180 pango_layout_set_markup (self->pl, text, textlen);
1055} 1181}
1056 1182
1057void 1183void
1058set_shapes (CFPlus::Layout self, ...) 1184set_shapes (DC::Layout self, ...)
1059 CODE: 1185 CODE:
1060{ 1186{
1061 PangoAttrList *attrs = 0; 1187 PangoAttrList *attrs = 0;
1062 const char *text = pango_layout_get_text (self->pl); 1188 const char *text = pango_layout_get_text (self->pl);
1063 const char *pos = text; 1189 const char *pos = text;
1098 if (attrs) 1224 if (attrs)
1099 pango_layout_set_attributes (self->pl, attrs); 1225 pango_layout_set_attributes (self->pl, attrs);
1100} 1226}
1101 1227
1102void 1228void
1103get_shapes (CFPlus::Layout self) 1229get_shapes (DC::Layout self)
1104 PPCODE: 1230 PPCODE:
1105{ 1231{
1106 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1232 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1107 1233
1108 do 1234 do
1109 { 1235 {
1110 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1236 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1111 1237
1112 if (run && shape_attr_p (run)) 1238 if (run && shape_attr_p (run))
1113 { 1239 {
1114 PangoRectangle extents; 1240 PangoRectangle extents;
1115 pango_layout_iter_get_run_extents (iter, 0, &extents); 1241 pango_layout_iter_get_run_extents (iter, 0, &extents);
1123 1249
1124 pango_layout_iter_free (iter); 1250 pango_layout_iter_free (iter);
1125} 1251}
1126 1252
1127int 1253int
1128has_wrapped (CFPlus::Layout self) 1254has_wrapped (DC::Layout self)
1129 CODE: 1255 CODE:
1130{ 1256{
1131 int lines = 1; 1257 int lines = 1;
1132 const char *text = pango_layout_get_text (self->pl); 1258 const char *text = pango_layout_get_text (self->pl);
1133 1259
1138} 1264}
1139 OUTPUT: 1265 OUTPUT:
1140 RETVAL 1266 RETVAL
1141 1267
1142SV * 1268SV *
1143get_text (CFPlus::Layout self) 1269get_text (DC::Layout self)
1144 CODE: 1270 CODE:
1145 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1271 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1146 sv_utf8_decode (RETVAL); 1272 sv_utf8_decode (RETVAL);
1147 OUTPUT: 1273 OUTPUT:
1148 RETVAL 1274 RETVAL
1149 1275
1150void 1276void
1151set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1277set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1152 CODE: 1278 CODE:
1153 self->r = r; 1279 self->r = r;
1154 self->g = g; 1280 self->g = g;
1155 self->b = b; 1281 self->b = b;
1156 self->a = a; 1282 self->a = a;
1157 1283
1158void 1284void
1159set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1285set_font (DC::Layout self, DC::Font font = 0)
1160 CODE: 1286 CODE:
1161 if (self->font != font) 1287 if (self->font != font)
1162 { 1288 {
1163 self->font = font; 1289 self->font = font;
1164 layout_update_font (self); 1290 layout_update_font (self);
1165 } 1291 }
1166 1292
1167void 1293void
1168set_height (CFPlus::Layout self, int base_height) 1294set_height (DC::Layout self, int base_height)
1169 CODE: 1295 CODE:
1170 if (self->base_height != base_height) 1296 if (self->base_height != base_height)
1171 { 1297 {
1172 self->base_height = base_height; 1298 self->base_height = base_height;
1173 layout_update_font (self); 1299 layout_update_font (self);
1174 } 1300 }
1175 1301
1176void 1302void
1177set_width (CFPlus::Layout self, int max_width = -1) 1303set_width (DC::Layout self, int max_width = -1)
1178 CODE: 1304 CODE:
1179 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1305 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1180 1306
1181void 1307void
1182set_indent (CFPlus::Layout self, int indent) 1308set_indent (DC::Layout self, int indent)
1183 CODE: 1309 CODE:
1184 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1310 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1185 1311
1186void 1312void
1187set_spacing (CFPlus::Layout self, int spacing) 1313set_spacing (DC::Layout self, int spacing)
1188 CODE: 1314 CODE:
1189 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1315 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1190 1316
1191void 1317void
1192set_ellipsise (CFPlus::Layout self, int ellipsise) 1318set_ellipsise (DC::Layout self, int ellipsise)
1193 CODE: 1319 CODE:
1194 pango_layout_set_ellipsize (self->pl, 1320 pango_layout_set_ellipsize (self->pl,
1195 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1321 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1196 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1322 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1197 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1323 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1198 : PANGO_ELLIPSIZE_NONE 1324 : PANGO_ELLIPSIZE_NONE
1199 ); 1325 );
1200 1326
1201void 1327void
1202set_single_paragraph_mode (CFPlus::Layout self, int spm) 1328set_single_paragraph_mode (DC::Layout self, int spm)
1203 CODE: 1329 CODE:
1204 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1330 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1205 1331
1206void 1332void
1207size (CFPlus::Layout self) 1333size (DC::Layout self)
1208 PPCODE: 1334 PPCODE:
1209{ 1335{
1210 int w, h; 1336 int w, h;
1211 1337
1212 layout_get_pixel_size (self, &w, &h); 1338 layout_get_pixel_size (self, &w, &h);
1215 PUSHs (sv_2mortal (newSViv (w))); 1341 PUSHs (sv_2mortal (newSViv (w)));
1216 PUSHs (sv_2mortal (newSViv (h))); 1342 PUSHs (sv_2mortal (newSViv (h)));
1217} 1343}
1218 1344
1219int 1345int
1220descent (CFPlus::Layout self) 1346descent (DC::Layout self)
1221 CODE: 1347 CODE:
1222{ 1348{
1223 PangoRectangle rect; 1349 PangoRectangle rect;
1224 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1350 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1225 pango_layout_line_get_pixel_extents (line, 0, &rect); 1351 pango_layout_line_get_pixel_extents (line, 0, &rect);
1226 RETVAL = PANGO_DESCENT (rect); 1352 RETVAL = PANGO_DESCENT (rect);
1227} 1353}
1228 OUTPUT: 1354 OUTPUT:
1229 RETVAL 1355 RETVAL
1230 1356
1231int 1357int
1232xy_to_index (CFPlus::Layout self, int x, int y) 1358xy_to_index (DC::Layout self, int x, int y)
1233 CODE: 1359 CODE:
1234{ 1360{
1235 int index, trailing; 1361 int index, trailing;
1236 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1362 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1237 RETVAL = index + trailing; 1363 RETVAL = index + trailing;
1238} 1364}
1239 OUTPUT: 1365 OUTPUT:
1240 RETVAL 1366 RETVAL
1241 1367
1242void 1368void
1243cursor_pos (CFPlus::Layout self, int index) 1369cursor_pos (DC::Layout self, int index)
1244 PPCODE: 1370 PPCODE:
1245{ 1371{
1246 PangoRectangle strong_pos; 1372 PangoRectangle pos;
1247 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1373 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1248 1374
1249 EXTEND (SP, 3); 1375 EXTEND (SP, 3);
1250 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1376 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1251 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1377 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1252 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1253} 1379}
1254 1380
1255void 1381void
1256index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1382index_to_line_x (DC::Layout self, int index, int trailing = 0)
1257 PPCODE: 1383 PPCODE:
1258{ 1384{
1259 int line, x; 1385 int line, x;
1260 1386
1261 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1387 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1388#if !PANGO_VERSION_CHECK (1, 17, 3)
1262 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1389 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1263 1390 --line;
1391#endif
1264 EXTEND (SP, 2); 1392 EXTEND (SP, 2);
1265 PUSHs (sv_2mortal (newSViv (line - 1))); 1393 PUSHs (sv_2mortal (newSViv (line)));
1266 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1394 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1267} 1395}
1268 1396
1269void 1397void
1270line_x_to_index (CFPlus::Layout self, int line, int x) 1398line_x_to_index (DC::Layout self, int line, int x)
1271 PPCODE: 1399 PPCODE:
1272{ 1400{
1273 PangoLayoutLine *lp; 1401 PangoLayoutLine *lp;
1274 int index, trailing; 1402 int index, trailing;
1275 1403
1276 if (line < 0) 1404 if (line < 0)
1277 XSRETURN_EMPTY; 1405 XSRETURN_EMPTY;
1278 1406
1279 if (!(lp = pango_layout_get_line (self->pl, line))) 1407 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1280 XSRETURN_EMPTY; /* do better */ 1408 XSRETURN_EMPTY; /* do better */
1281 1409
1282 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1410 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1283 1411
1284 EXTEND (SP, 2); 1412 EXTEND (SP, 2);
1290 PUSHs (sv_2mortal (newSViv (trailing))); 1418 PUSHs (sv_2mortal (newSViv (trailing)));
1291 } 1419 }
1292} 1420}
1293 1421
1294void 1422void
1295render (CFPlus::Layout self, float x, float y, int flags = 0) 1423render (DC::Layout self, float x, float y, int flags = 0)
1296 PPCODE: 1424 CODE:
1425 rc_clear (self->rc);
1297 pango_opengl_render_layout_subpixel ( 1426 pango_opengl_render_layout_subpixel (
1298 self->pl, 1427 self->pl,
1428 self->rc,
1299 x * PANGO_SCALE, y * PANGO_SCALE, 1429 x * PANGO_SCALE, y * PANGO_SCALE,
1300 self->r, self->g, self->b, self->a, 1430 self->r, self->g, self->b, self->a,
1301 flags 1431 flags
1302 ); 1432 );
1433 // we assume that context_change actually clears/frees stuff
1434 // and does not do any recomputation...
1435 pango_layout_context_changed (self->pl);
1303 1436
1304MODULE = CFPlus PACKAGE = CFPlus::Texture 1437void
1438draw (DC::Layout self)
1439 CODE:
1440{
1441 glEnable (GL_TEXTURE_2D);
1442 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1443 glEnable (GL_BLEND);
1444 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1445 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1446 glEnable (GL_ALPHA_TEST);
1447 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1448
1449 rc_draw (self->rc);
1450
1451 glDisable (GL_ALPHA_TEST);
1452 glDisable (GL_BLEND);
1453 glDisable (GL_TEXTURE_2D);
1454}
1455
1456MODULE = Deliantra::Client PACKAGE = DC::Texture
1305 1457
1306PROTOTYPES: ENABLE 1458PROTOTYPES: ENABLE
1307
1308int minpot (int n)
1309 1459
1310void 1460void
1311pad (SV *data_, int ow, int oh, int nw, int nh) 1461pad (SV *data_, int ow, int oh, int nw, int nh)
1312 CODE: 1462 CODE:
1313{ 1463{
1340 HV *hv = (HV *)SvRV (self); 1490 HV *hv = (HV *)SvRV (self);
1341 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1491 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1342 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1492 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1343 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1493 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1344 1494
1495 if (name <= 0)
1496 XSRETURN_EMPTY;
1497
1345 if (items < 5) 1498 if (items < 5)
1346 { 1499 {
1347 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1500 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1348 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1501 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1349 } 1502 }
1387 RETVAL = width > 0; 1540 RETVAL = width > 0;
1388} 1541}
1389 OUTPUT: 1542 OUTPUT:
1390 RETVAL 1543 RETVAL
1391 1544
1392MODULE = CFPlus PACKAGE = CFPlus::Map 1545MODULE = Deliantra::Client PACKAGE = DC::Map
1393 1546
1394PROTOTYPES: DISABLE 1547PROTOTYPES: DISABLE
1395 1548
1396CFPlus::Map 1549DC::Map
1397new (SV *class) 1550new (SV *class)
1398 CODE: 1551 CODE:
1399 New (0, RETVAL, 1, struct map); 1552 New (0, RETVAL, 1, struct map);
1400 RETVAL->x = 0; 1553 RETVAL->x = 0;
1401 RETVAL->y = 0; 1554 RETVAL->y = 0;
1409 RETVAL->row = 0; 1562 RETVAL->row = 0;
1410 OUTPUT: 1563 OUTPUT:
1411 RETVAL 1564 RETVAL
1412 1565
1413void 1566void
1414DESTROY (CFPlus::Map self) 1567DESTROY (DC::Map self)
1415 CODE: 1568 CODE:
1416{ 1569{
1417 map_clear (self); 1570 map_clear (self);
1418 Safefree (self->face2tile); 1571 Safefree (self->face2tile);
1419 Safefree (self->tex); 1572 Safefree (self->tex);
1420 Safefree (self); 1573 Safefree (self);
1421} 1574}
1422 1575
1423void 1576void
1424resize (CFPlus::Map self, int map_width, int map_height) 1577resize (DC::Map self, int map_width, int map_height)
1425 CODE: 1578 CODE:
1426 self->w = map_width; 1579 self->w = map_width;
1427 self->h = map_height; 1580 self->h = map_height;
1428 1581
1429void 1582void
1430clear (CFPlus::Map self) 1583clear (DC::Map self)
1431 CODE: 1584 CODE:
1432 map_clear (self); 1585 map_clear (self);
1433 1586
1434void 1587void
1435set_tileid (CFPlus::Map self, int face, int tile) 1588set_tileid (DC::Map self, int face, int tile)
1436 CODE: 1589 CODE:
1437{ 1590{
1438 need_facenum (self, face); self->face2tile [face] = tile; 1591 need_facenum (self, face); self->face2tile [face] = tile;
1439 need_texid (self, tile); 1592 need_texid (self, tile);
1440} 1593}
1441 1594
1442void 1595void
1443set_smooth (CFPlus::Map self, int face, int smooth, int level) 1596set_smooth (DC::Map self, int face, int smooth, int level)
1444 CODE: 1597 CODE:
1445{ 1598{
1446 tileid texid; 1599 tileid texid;
1447 maptex *tex; 1600 maptex *tex;
1448 1601
1461 tex->smoothtile = self->face2tile [smooth]; 1614 tex->smoothtile = self->face2tile [smooth];
1462 tex->smoothlevel = level; 1615 tex->smoothlevel = level;
1463} 1616}
1464 1617
1465void 1618void
1466set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1619set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1467 CODE: 1620 CODE:
1468{ 1621{
1469 need_texid (self, texid); 1622 need_texid (self, texid);
1470 1623
1471 { 1624 {
1491 // from transparent color bleeding and ugly wrapping effects. 1644 // from transparent color bleeding and ugly wrapping effects.
1492 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1493} 1646}
1494 1647
1495int 1648int
1496ox (CFPlus::Map self) 1649ox (DC::Map self)
1497 ALIAS: 1650 ALIAS:
1498 oy = 1 1651 oy = 1
1499 x = 2 1652 x = 2
1500 y = 3 1653 y = 3
1501 w = 4 1654 w = 4
1512 } 1665 }
1513 OUTPUT: 1666 OUTPUT:
1514 RETVAL 1667 RETVAL
1515 1668
1516void 1669void
1517scroll (CFPlus::Map self, int dx, int dy) 1670scroll (DC::Map self, int dx, int dy)
1518 CODE: 1671 CODE:
1519{ 1672{
1520 if (dx > 0) 1673 if (dx > 0)
1521 map_blank (self, self->x, self->y, dx, self->h); 1674 map_blank (self, self->x, self->y, dx, self->h);
1522 else if (dx < 0) 1675 else if (dx < 0)
1537 self->rows += MAP_EXTEND_Y; 1690 self->rows += MAP_EXTEND_Y;
1538 self->y += MAP_EXTEND_Y; 1691 self->y += MAP_EXTEND_Y;
1539 } 1692 }
1540} 1693}
1541 1694
1542void 1695SV *
1543map1a_update (CFPlus::Map self, SV *data_, int extmap) 1696map1a_update (DC::Map self, SV *data_, int extmap)
1544 CODE: 1697 CODE:
1545{ 1698{
1546 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1699 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1547 uint8_t *data_end = (uint8_t *)SvEND (data_); 1700 uint8_t *data_end = (uint8_t *)SvEND (data_);
1548 mapcell *cell; 1701 mapcell *cell;
1549 int x, y, flags; 1702 int x, y, z, flags;
1703 AV *missing = newAV ();
1704 RETVAL = newRV_noinc ((SV *)missing);
1550 1705
1551 while (data < data_end - 1) 1706 while (data < data_end - 1)
1552 { 1707 {
1553 flags = (data [0] << 8) + data [1]; data += 2; 1708 flags = (data [0] << 8) + data [1]; data += 2;
1554 1709
1574 uint8_t ext, cmd; 1729 uint8_t ext, cmd;
1575 1730
1576 do 1731 do
1577 { 1732 {
1578 ext = *data++; 1733 ext = *data++;
1579 cmd = ext & 0x3f; 1734 cmd = ext & 0x7f;
1580 1735
1581 if (cmd < 4) 1736 if (cmd < 4)
1582 cell->darkness = 255 - ext * 64 + 1; 1737 cell->darkness = 255 - ext * 64 + 1;
1583 else if (cmd == 5) // health 1738 else if (cmd == 5) // health
1584 { 1739 {
1587 } 1742 }
1588 else if (cmd == 6) // monster width 1743 else if (cmd == 6) // monster width
1589 cell->stat_width = *data++ + 1; 1744 cell->stat_width = *data++ + 1;
1590 else if (cmd == 0x47) 1745 else if (cmd == 0x47)
1591 { 1746 {
1592 if (*data == 4) 1747 if (*data == 1) cell->player = data [1];
1593 ; // decode player count 1748 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1749 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1750 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1594 1751
1595 data += *data + 1; 1752 data += *data + 1;
1596 } 1753 }
1597 else if (cmd == 8) // cell flags 1754 else if (cmd == 8) // cell flags
1598 cell->flags = *data++; 1755 cell->flags = *data++;
1605 } 1762 }
1606 else 1763 else
1607 cell->darkness = *data++ + 1; 1764 cell->darkness = *data++ + 1;
1608 } 1765 }
1609 1766
1767 for (z = 0; z <= 2; ++z)
1610 if (flags & 4) 1768 if (flags & (4 >> z))
1611 { 1769 {
1612 faceid face = (data [0] << 8) + data [1]; data += 2; 1770 faceid face = (data [0] << 8) + data [1]; data += 2;
1613 need_facenum (self, face); 1771 need_facenum (self, face);
1614 cell->tile [0] = self->face2tile [face]; 1772 cell->tile [z] = self->face2tile [face];
1773
1774 if (cell->tile [z])
1775 {
1776 maptex *tex = self->tex + cell->tile [z];
1777 if (!tex->name)
1778 av_push (missing, newSViv (cell->tile [z]));
1779
1780 if (tex->smoothtile)
1781 {
1782 maptex *smooth = self->tex + tex->smoothtile;
1783 if (!smooth->name)
1784 av_push (missing, newSViv (tex->smoothtile));
1785 }
1786 }
1615 } 1787 }
1616
1617 if (flags & 2)
1618 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face);
1621 cell->tile [1] = self->face2tile [face];
1622 }
1623
1624 if (flags & 1)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [2] = self->face2tile [face];
1629 }
1630 } 1788 }
1631 else 1789 else
1632 cell->darkness = 0; 1790 CELL_CLEAR (cell);
1633 } 1791 }
1634} 1792}
1793 OUTPUT:
1794 RETVAL
1635 1795
1636SV * 1796SV *
1637mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1797mapmap (DC::Map self, int x0, int y0, int w, int h)
1638 CODE: 1798 CODE:
1639{ 1799{
1640 int x1, x; 1800 int x1, x;
1641 int y1, y; 1801 int y1, y;
1642 int z; 1802 int z;
1687} 1847}
1688 OUTPUT: 1848 OUTPUT:
1689 RETVAL 1849 RETVAL
1690 1850
1691void 1851void
1692draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1693 CODE: 1853 CODE:
1694{ 1854{
1855 int x, y, z;
1856
1695 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1696 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1858 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1697 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1698 smooth_key skey; 1860 smooth_key skey;
1699 int x, y, z; 1861 int pl_x, pl_y;
1700 int last_name; 1862 maptex pl_tex;
1863 rc_t *rc = rc_alloc ();
1864 rc_key_t key;
1865 rc_array_t *arr;
1866
1867 pl_tex.name = 0;
1701 1868
1702 // thats current max. sorry. 1869 // thats current max. sorry.
1703 if (sw > 255) sw = 255; 1870 if (sw > 255) sw = 255;
1704 if (sh > 255) sh = 255; 1871 if (sh > 255) sh = 255;
1705 1872
1706 // clear key, in case of extra padding 1873 // clear key, in case of extra padding
1707 memset (&skey, 0, sizeof (skey)); 1874 memset (&skey, 0, sizeof (skey));
1708 1875
1709 glColor4ub (255, 255, 255, 255); 1876 memset (&key, 0, sizeof (key));
1710 1877 key.r = 255;
1711 glEnable (GL_BLEND); 1878 key.g = 255;
1712 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1879 key.b = 255;
1713 glEnable (GL_TEXTURE_2D); 1880 key.a = 255;
1714 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1881 key.mode = GL_QUADS;
1715 1882 key.format = GL_T2F_V3F;
1716 glBegin (GL_QUADS); 1883 key.texname = -1;
1717
1718 last_name = 0;
1719 1884
1720 mx += self->x; 1885 mx += self->x;
1721 my += self->y; 1886 my += self->y;
1722 1887
1723 // first pass: determine smooth_max 1888 // first pass: determine smooth_max
1739 MAX (self->tex [cell->tile [0]].smoothlevel, 1904 MAX (self->tex [cell->tile [0]].smoothlevel,
1740 MAX (self->tex [cell->tile [1]].smoothlevel, 1905 MAX (self->tex [cell->tile [1]].smoothlevel,
1741 self->tex [cell->tile [2]].smoothlevel)); 1906 self->tex [cell->tile [2]].smoothlevel));
1742 } 1907 }
1743 } 1908 }
1909
1910 glEnable (GL_BLEND);
1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1744 1913
1745 for (z = 0; z <= 2; z++) 1914 for (z = 0; z <= 2; z++)
1746 { 1915 {
1747 memset (smooth_level, 0, sizeof (smooth_level)); 1916 memset (smooth_level, 0, sizeof (smooth_level));
1748 1917
1761 { 1930 {
1762 maptex tex = self->tex [tile]; 1931 maptex tex = self->tex [tile];
1763 int px = (x + 1) * T - tex.w; 1932 int px = (x + 1) * T - tex.w;
1764 int py = (y + 1) * T - tex.h; 1933 int py = (y + 1) * T - tex.h;
1765 1934
1766 // suppressing texture state switches here
1767 // is only moderately effective, but worth the extra effort
1768 if (last_name != tex.name) 1935 if (key.texname != tex.name)
1769 { 1936 {
1770 if (!tex.name) 1937 if (!tex.name)
1771 tex = self->tex [2]; /* missing, replace by noface */ 1938 tex = self->tex [2]; /* missing, replace by noface */
1772 1939
1773 glEnd (); 1940 key.texname = tex.name;
1774 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1941 arr = rc_array (rc, &key);
1775 glBegin (GL_QUADS);
1776 } 1942 }
1777 1943
1778 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1944 if (expect_false (cell->player == player) && expect_false (z == 2))
1779 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1780 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1781 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1782
1783 if (cell->flags && z == 2)
1784 { 1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1951
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1954 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1956
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1785 if (cell->flags & 1) 1960 if (cell->flags & 1)
1786 { 1961 {
1787 maptex tex = self->tex [1]; 1962 maptex tex = self->tex [1];
1788 int px = x * T + T * 2 / 32; 1963 int px = x * T + T * 2 / 32;
1789 int py = y * T - T * 6 / 32; 1964 int py = y * T - T * 6 / 32;
1790 1965
1966 if (tex.name)
1791 glEnd (); 1967 {
1792 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1793 glBegin (GL_QUADS); 1978 }
1794
1795 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1796 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1797 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1798 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1799 } 1979 }
1800 } 1980 }
1801 1981
1802 // update smooth hash 1982 // update smooth hash
1803 if (tex.smoothtile) 1983 if (tex.smoothtile)
1839 } 2019 }
1840 } 2020 }
1841 } 2021 }
1842 } 2022 }
1843 2023
2024 rc_draw (rc);
2025 rc_clear (rc);
2026
1844 // go through all smoothlevels, lowest to highest, then draw. 2027 // go through all smoothlevels, lowest to highest, then draw.
1845 // this is basically counting sort 2028 // this is basically counting sort
1846 { 2029 {
1847 int w, b; 2030 int w, b;
1848 2031
2032 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS);
1849 for (w = 0; w < 256 / 32; ++w) 2034 for (w = 0; w < 256 / 32; ++w)
1850 { 2035 {
1851 uint32_t smask = smooth_level [w]; 2036 uint32_t smask = smooth_level [w];
1852 if (smask) 2037 if (smask)
1853 for (b = 0; b < 32; ++b) 2038 for (b = 0; b < 32; ++b)
1872 int border = bits & 15; 2057 int border = bits & 15;
1873 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2058 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1874 float dx = tex.s * .0625f; // 16 images/row 2059 float dx = tex.s * .0625f; // 16 images/row
1875 float dy = tex.t * .5f ; // 2 images/column 2060 float dy = tex.t * .5f ; // 2 images/column
1876 2061
1877 // this time naively avoiding texture state changes
1878 // save gobs of state changes.
1879 if (last_name != tex.name) 2062 if (tex.name)
1880 { 2063 {
2064 // this time avoiding texture state changes
2065 // save gobs of state changes.
1881 if (!tex.name) 2066 if (key.texname != tex.name)
1882 continue; // smoothing not yet available 2067 {
1883
1884 glEnd (); 2068 glEnd ();
1885 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1886 glBegin (GL_QUADS); 2070 glBegin (GL_QUADS);
1887 } 2071 }
1888 2072
1889 if (border) 2073 if (border)
1890 { 2074 {
1891 float ox = border * dx; 2075 float ox = border * dx;
1892 2076
1893 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1894 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1895 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1896 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1897 } 2081 }
1898 2082
1899 if (corner) 2083 if (corner)
1900 { 2084 {
1901 float ox = corner * dx; 2085 float ox = corner * dx;
1902 2086
1903 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2087 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2091 }
1907 } 2092 }
1908 } 2093 }
1909 } 2094 }
1910 } 2095 }
1911 } 2096 }
2097
2098 glEnd ();
2099 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1;
1912 } 2101 }
1913 2102
1914 hv_clear (smooth); 2103 hv_clear (smooth);
1915 } 2104 }
1916 2105
1917 glEnd (); 2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
1918 2111
1919 glDisable (GL_TEXTURE_2D); 2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
2120 rc_draw (rc);
2121 }
2122
1920 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
2124 rc_free (rc);
1921 2125
1922 // top layer: overlays such as the health bar 2126 // top layer: overlays such as the health bar
1923 for (y = 0; y < sh; y++) 2127 for (y = 0; y < sh; y++)
1924 if (0 <= y + my && y + my < self->rows) 2128 if (0 <= y + my && y + my < self->rows)
1925 { 2129 {
1950 } 2154 }
1951 } 2155 }
1952} 2156}
1953 2157
1954void 2158void
1955draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1956 CODE: 2160 CODE:
1957{ 2161{
1958 static float color[16][3] = { 2162 static float color[16][3] = {
1959 { 0.00F, 0.00F, 0.00F }, 2163 { 0.00F, 0.00F, 0.00F },
1960 { 1.00F, 1.00F, 1.00F }, 2164 { 1.00F, 1.00F, 1.00F },
2010 glDisable (GL_BLEND); 2214 glDisable (GL_BLEND);
2011 glDisable (GL_TEXTURE_2D); 2215 glDisable (GL_TEXTURE_2D);
2012} 2216}
2013 2217
2014void 2218void
2015fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2219fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2016 PPCODE: 2220 PPCODE:
2017{ 2221{
2018 int x, y; 2222 int x, y;
2019 int sw1 = sw + 2; 2223 int sw1 = sw + 2;
2020 int sh1 = sh + 2; 2224 int sh1 = sh + 2;
2091 PUSHs (sv_2mortal (newSViv (sh3))); 2295 PUSHs (sv_2mortal (newSViv (sh3)));
2092 PUSHs (darkness3_sv); 2296 PUSHs (darkness3_sv);
2093} 2297}
2094 2298
2095SV * 2299SV *
2096get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2300get_rect (DC::Map self, int x0, int y0, int w, int h)
2097 CODE: 2301 CODE:
2098{ 2302{
2099 int x, y, x1, y1; 2303 int x, y, x1, y1;
2100 SV *data_sv = newSV (w * h * 7 + 5); 2304 SV *data_sv = newSV (w * h * 7 + 5);
2101 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2305 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2158 else 2362 else
2159 *data++ = 0; 2363 *data++ = 0;
2160 } 2364 }
2161 } 2365 }
2162 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
2163 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
2164 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
2165 RETVAL = data_sv; 2374 RETVAL = data_sv;
2166} 2375}
2167 OUTPUT: 2376 OUTPUT:
2168 RETVAL 2377 RETVAL
2169 2378
2170void 2379void
2171set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2172 PPCODE: 2381 PPCODE:
2173{ 2382{
2174 int x, y, z; 2383 int x, y, z;
2175 int w, h; 2384 int w, h;
2176 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
2177 2396
2178 if (*data++ != 0) 2397 if (*data++ != 0)
2179 return; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
2180 2399
2181 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
2182 h = *data++ << 8; h |= *data++; 2401 h = *data++ << 8; h |= *data++;
2183 2402
2184 // we need to do this 'cause we don't keep an absolute coord system for rows 2403 // we need to do this 'cause we don't keep an absolute coord system for rows
2196 { 2415 {
2197 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
2198 2417
2199 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
2200 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
2201 uint8_t flags = *data++; 2425 flags = *data++;
2202 2426
2203 if (flags) 2427 if (flags)
2204 { 2428 {
2205 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2206 tileid tile[3] = { 0, 0, 0 }; 2430 tileid tile[3] = { 0, 0, 0 };
2209 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2210 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2211 2435
2212 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
2213 { 2437 {
2214 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
2215 2440
2216 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
2217 { 2442 {
2218 tileid t = tile [z]; 2443 tileid t = tile [z];
2219 2444
2220 if (t >= self->texs || (t && !self->tex [t].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2221 { 2446 {
2222 XPUSHs (sv_2mortal (newSViv (t))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2223 need_texid (self, t); 2448 need_texid (self, t);
2224 } 2449 }
2225 2450
2226 cell->tile [z] = t; 2451 cell->tile [z] = t;
2227 } 2452 }
2229 } 2454 }
2230 } 2455 }
2231 } 2456 }
2232} 2457}
2233 2458
2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2459MODULE = Deliantra::Client PACKAGE = DC::RW
2460
2461DC::RW
2462new (SV *class, SV *data_sv)
2463 CODE:
2464{
2465 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen);
2467
2468 RETVAL = SDL_RWFromConstMem (data, datalen);
2469}
2470 OUTPUT:
2471 RETVAL
2472
2473DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb")
2475 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT:
2478 RETVAL
2479
2480# fails on win32:
2481# dc.xs(2268) : error C2059: syntax error : '('
2482#void
2483#close (DC::RW self)
2484# CODE:
2485# (self->(close)) (self);
2486
2487MODULE = Deliantra::Client PACKAGE = DC::Channel
2235 2488
2236PROTOTYPES: DISABLE 2489PROTOTYPES: DISABLE
2237 2490
2238CFPlus::MixChunk 2491DC::Channel
2239new_from_file (SV *class, char *path) 2492find ()
2240 CODE: 2493 CODE:
2241 RETVAL = Mix_LoadWAV (path); 2494{
2495 RETVAL = Mix_GroupAvailable (-1);
2496
2497 if (RETVAL < 0)
2498 {
2499 RETVAL = Mix_GroupOldest (-1);
2500
2501 if (RETVAL < 0)
2502 XSRETURN_UNDEF;
2503
2504 Mix_HaltChannel (RETVAL);
2505 }
2506
2507 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128);
2509}
2242 OUTPUT: 2510 OUTPUT:
2243 RETVAL 2511 RETVAL
2244 2512
2245void 2513void
2514halt (DC::Channel self)
2515 CODE:
2516 Mix_HaltChannel (self);
2517
2518void
2519expire (DC::Channel self, int ticks = -1)
2520 CODE:
2521 Mix_ExpireChannel (self, ticks);
2522
2523void
2524fade_out (DC::Channel self, int ticks = -1)
2525 CODE:
2526 Mix_FadeOutChannel (self, ticks);
2527
2528int
2529volume (DC::Channel self, int volume)
2530 CODE:
2531 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2532 OUTPUT:
2533 RETVAL
2534
2535void
2536unregister_all_effects (DC::Channel self)
2537 CODE:
2538 Mix_UnregisterAllEffects (self);
2539
2540void
2541set_panning (DC::Channel self, int left, int right)
2542 CODE:
2543 left = CLAMP (left , 0, 255);
2544 right = CLAMP (right, 0, 255);
2545 Mix_SetPanning (self, left, right);
2546
2547void
2548set_distance (DC::Channel self, int distance)
2549 CODE:
2550 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2551
2552void
2553set_position (DC::Channel self, int angle, int distance)
2554 CODE:
2555
2556void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE:
2559{
2560 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563}
2564
2565void
2566set_reverse_stereo (DC::Channel self, int flip)
2567 CODE:
2568 Mix_SetReverseStereo (self, flip);
2569
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571
2572PROTOTYPES: DISABLE
2573
2574DC::MixChunk
2575new (SV *class, DC::RW rwops)
2576 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT:
2579 RETVAL
2580
2581void
2246DESTROY (CFPlus::MixChunk self) 2582DESTROY (DC::MixChunk self)
2247 CODE: 2583 CODE:
2248 Mix_FreeChunk (self); 2584 Mix_FreeChunk (self);
2249 2585
2250int 2586int
2251volume (CFPlus::MixChunk self, int volume = -1) 2587volume (DC::MixChunk self, int volume = -1)
2252 CODE: 2588 CODE:
2589 if (items > 1)
2590 volume = CLAMP (volume, 0, 128);
2253 RETVAL = Mix_VolumeChunk (self, volume); 2591 RETVAL = Mix_VolumeChunk (self, volume);
2254 OUTPUT: 2592 OUTPUT:
2255 RETVAL 2593 RETVAL
2256 2594
2257int 2595DC::Channel
2258play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2596play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2259 CODE: 2597 CODE:
2598{
2260 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2599 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2600
2601 if (RETVAL < 0)
2602 XSRETURN_UNDEF;
2603
2604 if (channel < 0)
2605 {
2606 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128);
2608 }
2609}
2261 OUTPUT: 2610 OUTPUT:
2262 RETVAL 2611 RETVAL
2263 2612
2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2265 2614
2266int 2615int
2267volume (int volume = -1) 2616volume (int volume = -1)
2268 PROTOTYPE: ;$ 2617 PROTOTYPE: ;$
2269 CODE: 2618 CODE:
2619 if (items > 0)
2620 volume = CLAMP (volume, 0, 128);
2270 RETVAL = Mix_VolumeMusic (volume); 2621 RETVAL = Mix_VolumeMusic (volume);
2271 OUTPUT: 2622 OUTPUT:
2272 RETVAL 2623 RETVAL
2273 2624
2625void
2626fade_out (int ms)
2627 CODE:
2628 Mix_FadeOutMusic (ms);
2629
2630void
2631halt ()
2632 CODE:
2633 Mix_HaltMusic ();
2634
2635DC::MixMusic
2636new (SV *class, DC::RW rwops)
2637 CODE:
2638 RETVAL = Mix_LoadMUS_RW (rwops);
2639 OUTPUT:
2640 RETVAL
2641
2642void
2643DESTROY (DC::MixMusic self)
2644 CODE:
2645 Mix_FreeMusic (self);
2646
2274int 2647int
2275fade_out (int ms)
2276 CODE:
2277 RETVAL = Mix_FadeOutMusic (ms);
2278 OUTPUT:
2279 RETVAL
2280
2281CFPlus::MixMusic
2282new_from_file (SV *class, char *path)
2283 CODE:
2284 RETVAL = Mix_LoadMUS (path);
2285 OUTPUT:
2286 RETVAL
2287
2288void
2289DESTROY (CFPlus::MixMusic self)
2290 CODE:
2291 Mix_FreeMusic (self);
2292
2293int
2294play (CFPlus::MixMusic self, int loops = -1) 2648play (DC::MixMusic self, int loops = -1)
2295 CODE: 2649 CODE:
2296 RETVAL = Mix_PlayMusic (self, loops); 2650 RETVAL = Mix_PlayMusic (self, loops);
2297 OUTPUT: 2651 OUTPUT:
2298 RETVAL 2652 RETVAL
2299 2653
2300int 2654void
2301fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2655fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2302 CODE: 2656 CODE:
2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2657 Mix_FadeInMusicPos (self, loops, ms, position);
2304 OUTPUT:
2305 RETVAL
2306 2658
2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2659MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2308 2660
2309PROTOTYPES: ENABLE 2661PROTOTYPES: ENABLE
2310 2662
2311BOOT: 2663BOOT:
2312{ 2664{
2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2665 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2314 static const struct { 2666 static const struct {
2315 const char *name; 2667 const char *name;
2316 IV iv; 2668 IV iv;
2317 } *civ, const_iv[] = { 2669 } *civ, const_iv[] = {
2318# define const_iv(name) { # name, (IV)name } 2670# define const_iv(name) { # name, (IV)name }
2353 const_iv (GL_INTENSITY), 2705 const_iv (GL_INTENSITY),
2354 const_iv (GL_LUMINANCE), 2706 const_iv (GL_LUMINANCE),
2355 const_iv (GL_LUMINANCE_ALPHA), 2707 const_iv (GL_LUMINANCE_ALPHA),
2356 const_iv (GL_FLOAT), 2708 const_iv (GL_FLOAT),
2357 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2709 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2710 const_iv (GL_COMPRESSED_ALPHA_ARB),
2711 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2712 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2713 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2714 const_iv (GL_COMPRESSED_RGB_ARB),
2715 const_iv (GL_COMPRESSED_RGBA_ARB),
2358 const_iv (GL_COMPILE), 2716 const_iv (GL_COMPILE),
2359 const_iv (GL_PROXY_TEXTURE_1D), 2717 const_iv (GL_PROXY_TEXTURE_1D),
2360 const_iv (GL_PROXY_TEXTURE_2D), 2718 const_iv (GL_PROXY_TEXTURE_2D),
2361 const_iv (GL_TEXTURE_1D), 2719 const_iv (GL_TEXTURE_1D),
2362 const_iv (GL_TEXTURE_2D), 2720 const_iv (GL_TEXTURE_2D),
2401 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2759 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2402 const_iv (GL_POINT_SMOOTH_HINT), 2760 const_iv (GL_POINT_SMOOTH_HINT),
2403 const_iv (GL_LINE_SMOOTH_HINT), 2761 const_iv (GL_LINE_SMOOTH_HINT),
2404 const_iv (GL_POLYGON_SMOOTH_HINT), 2762 const_iv (GL_POLYGON_SMOOTH_HINT),
2405 const_iv (GL_GENERATE_MIPMAP_HINT), 2763 const_iv (GL_GENERATE_MIPMAP_HINT),
2764 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2406 const_iv (GL_FASTEST), 2765 const_iv (GL_FASTEST),
2407 const_iv (GL_DONT_CARE), 2766 const_iv (GL_DONT_CARE),
2408 const_iv (GL_NICEST), 2767 const_iv (GL_NICEST),
2409 const_iv (GL_V2F), 2768 const_iv (GL_V2F),
2410 const_iv (GL_V3F), 2769 const_iv (GL_V3F),
2418 2777
2419 texture_av = newAV (); 2778 texture_av = newAV ();
2420 AvREAL_off (texture_av); 2779 AvREAL_off (texture_av);
2421} 2780}
2422 2781
2782void
2783disable_GL_EXT_blend_func_separate ()
2784 CODE:
2785 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0;
2787
2423char * 2788char *
2424gl_vendor () 2789gl_vendor ()
2425 CODE: 2790 CODE:
2426 RETVAL = (char *)glGetString (GL_VENDOR); 2791 RETVAL = (char *)glGetString (GL_VENDOR);
2427 OUTPUT: 2792 OUTPUT:
2544 2909
2545void glTexCoord (float s, float t) 2910void glTexCoord (float s, float t)
2546 CODE: 2911 CODE:
2547 glTexCoord2f (s, t); 2912 glTexCoord2f (s, t);
2548 2913
2914void glRect (float x1, float y1, float x2, float y2)
2915 CODE:
2916 glRectf (x1, y1, x2, y2);
2917
2918void glRect_lineloop (float x1, float y1, float x2, float y2)
2919 CODE:
2920 glBegin (GL_LINE_LOOP);
2921 glVertex2f (x1, y1);
2922 glVertex2f (x2, y1);
2923 glVertex2f (x2, y2);
2924 glVertex2f (x1, y2);
2925 glEnd ();
2926
2549PROTOTYPES: ENABLE 2927PROTOTYPES: ENABLE
2550 2928
2551void glBegin (int mode) 2929void glBegin (int mode)
2552 2930
2553void glEnd () 2931void glEnd ()
2585void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2963void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2586 CODE: 2964 CODE:
2587 if (gl.SeparableFilter2D) 2965 if (gl.SeparableFilter2D)
2588 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2589 2967
2590void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2968void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2591 2969
2592void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2593 2971
2594void glDrawPixels (int width, int height, int format, int type, char *pixels) 2972void glDrawPixels (int width, int height, int format, int type, char *pixels)
2595 2973
2621 2999
2622void glEndList () 3000void glEndList ()
2623 3001
2624void glCallList (int list) 3002void glCallList (int list)
2625 3003
2626MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2627 3005
2628PROTOTYPES: DISABLE 3006PROTOTYPES: DISABLE
2629 3007
2630void 3008void
2631find_widget (SV *widget, NV x, NV y) 3009find_widget (SV *self, NV x, NV y)
2632 PPCODE: 3010 PPCODE:
2633{ 3011{
2634 if (within_widget (widget, x, y)) 3012 if (within_widget (self, x, y))
2635 XPUSHs (widget); 3013 XPUSHs (self);
2636} 3014}
2637 3015
3016BOOT:
3017{
3018 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3019
3020 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3021 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3022 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3023 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3024}
3025
3026void
3027draw (SV *self)
3028 CODE:
3029{
3030 HV *hv;
3031 SV **svp;
3032 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv);
3036 SV *draw_h_sv = GvSV (draw_h_gv);
3037 double draw_x, draw_y;
3038
3039 if (!SvROK (self))
3040 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3041
3042 hv = (HV *)SvRV (self);
3043
3044 if (SvTYPE (hv) != SVt_PVHV)
3045 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3046
3047 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3048 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3049
3050 if (!h || !w)
3051 XSRETURN_EMPTY;
3052
3053 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3054 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3055
3056 draw_x = SvNV (draw_x_sv) + x;
3057 draw_y = SvNV (draw_y_sv) + y;
3058
3059 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3060 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3061 XSRETURN_EMPTY;
3062
3063 sv_setnv (draw_x_sv, draw_x);
3064 sv_setnv (draw_y_sv, draw_y);
3065
3066 glPushMatrix ();
3067 glTranslated (x, y, 0);
3068
3069 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3070 {
3071 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3072
3073 if (svp && SvTRUE (*svp))
3074 {
3075 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3076 glEnable (GL_BLEND);
3077 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3078 glBegin (GL_QUADS);
3079 glVertex2f (0, 0);
3080 glVertex2f (w, 0);
3081 glVertex2f (w, h);
3082 glVertex2f (0, h);
3083 glEnd ();
3084 glDisable (GL_BLEND);
3085 }
3086 }
3087#if 0
3088 // draw borders, for debugging
3089 glPushMatrix ();
3090 glColor4f (1., 1., 0., 1.);
3091 glTranslatef (.5, .5, 0.);
3092 glBegin (GL_LINE_LOOP);
3093 glVertex2f (0 , 0);
3094 glVertex2f (w - 1, 0);
3095 glVertex2f (w - 1, h - 1);
3096 glVertex2f (0 , h - 1);
3097 glEnd ();
3098 glPopMatrix ();
3099#endif
3100 PUSHMARK (SP);
3101 XPUSHs (self);
3102 PUTBACK;
3103 call_method ("_draw", G_VOID | G_DISCARD);
3104 SPAGAIN;
3105
3106 glPopMatrix ();
3107
3108 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3109 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3110}
3111

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines