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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines