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.207 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 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
88/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90
61#if 0 91#if 1
62# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
63#else 93#else
64# define PARACHUTE 0 94# define PARACHUTE 0
65#endif 95#endif
66 96
107 av_push (texture_av, (SV *)(size_t)name); 137 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 138 glDeleteTextures (1, &name);
109} 139}
110 140
111#include "texcache.c" 141#include "texcache.c"
142#include "rendercache.c"
112 143
113#include "pango-font.c" 144#include "pango-font.c"
114#include "pango-fontmap.c" 145#include "pango-fontmap.c"
115#include "pango-render.c" 146#include "pango-render.c"
116 147
148typedef IV DC__Channel;
149typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 150typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 151typedef Mix_Music *DC__MixMusic;
119 152
120typedef PangoFontDescription *CFPlus__Font; 153typedef PangoFontDescription *DC__Font;
121 154
122static int 155static int
123shape_attr_p (PangoLayoutRun *run) 156shape_attr_p (PangoLayoutRun *run)
124{ 157{
125 GSList *attrs = run->item->analysis.extra_attrs; 158 GSList *attrs = run->item->analysis.extra_attrs;
139 172
140typedef struct cf_layout { 173typedef struct cf_layout {
141 PangoLayout *pl; 174 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 175 float r, g, b, a; // default color for rgba mode
143 int base_height; 176 int base_height;
144 CFPlus__Font font; 177 DC__Font font;
178 rc_t *rc;
145} *CFPlus__Layout; 179} *DC__Layout;
146 180
147static CFPlus__Font default_font; 181static DC__Font default_font;
148static PangoContext *opengl_context; 182static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 183static PangoFontMap *opengl_fontmap;
150 184
151static void 185static void
152substitute_func (FcPattern *pattern, gpointer data) 186substitute_func (FcPattern *pattern, gpointer data)
157#endif 191#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 192 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 193}
160 194
161static void 195static void
162layout_update_font (CFPlus__Layout self) 196layout_update_font (DC__Layout self)
163{ 197{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 198 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
166 */ 200 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
168 202
169 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 205
172 pango_layout_set_font_description (self->pl, font); 206 pango_layout_set_font_description (self->pl, font);
173} 207}
174 208
175static void 209static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 210layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 211{
178 PangoRectangle rect; 212 PangoRectangle rect;
179 213
180 // get_pixel_* wrongly rounds down 214 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 215 pango_layout_get_extents (self->pl, 0, &rect);
192 226
193typedef uint16_t tileid; 227typedef uint16_t tileid;
194typedef uint16_t faceid; 228typedef uint16_t faceid;
195 229
196typedef struct { 230typedef struct {
197 int name; 231 GLuint name;
198 int w, h; 232 int w, h;
199 float s, t; 233 float s, t;
200 uint8_t r, g, b, a; 234 uint8_t r, g, b, a;
201 tileid smoothtile; 235 tileid smoothtile;
202 uint8_t smoothlevel; 236 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 254 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 255 int texs; maptex *tex; // [tileid]
222 256
223 int32_t rows; 257 int32_t rows;
224 maprow *row; 258 maprow *row;
225} *CFPlus__Map; 259} *DC__Map;
226 260
227static char * 261static char *
228prepend (char *ptr, int sze, int inc) 262prepend (char *ptr, int sze, int inc)
229{ 263{
230 char *p; 264 char *p;
268 self->texs *= 2; 302 self->texs *= 2;
269 } 303 }
270} 304}
271 305
272static maprow * 306static maprow *
273map_get_row (CFPlus__Map self, int y) 307map_get_row (DC__Map self, int y)
274{ 308{
275 if (0 > y) 309 if (0 > y)
276 { 310 {
277 int extend = - y + MAP_EXTEND_Y; 311 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 312 Prepend (maprow, self->row, self->rows, extend);
316 350
317 return row->col + (x - row->c0); 351 return row->col + (x - row->c0);
318} 352}
319 353
320static mapcell * 354static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 355map_get_cell (DC__Map self, int x, int y)
322{ 356{
323 return row_get_cell (map_get_row (self, y), x); 357 return row_get_cell (map_get_row (self, y), x);
324} 358}
325 359
326static void 360static void
327map_clear (CFPlus__Map self) 361map_clear (DC__Map self)
328{ 362{
329 int r; 363 int r;
330 364
331 for (r = 0; r < self->rows; r++) 365 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 366 Safefree (self->row[r].col);
340 self->row = 0; 374 self->row = 0;
341 self->rows = 0; 375 self->rows = 0;
342} 376}
343 377
344static void 378static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 379map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 380{
347 int x, y; 381 int x, y;
348 maprow *row; 382 maprow *row;
349 mapcell *cell; 383 mapcell *cell;
350 384
429 n |= n >> 16; 463 n |= n >> 16;
430 464
431 return n + 1; 465 return n + 1;
432} 466}
433 467
468static unsigned int
469popcount (unsigned int n)
470{
471 n -= (n >> 1) & 0x55555555U;
472 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
473 n = ((n >> 4) + n) & 0x0f0f0f0fU;
474 n *= 0x01010101U;
475
476 return n >> 24;
477}
478
434/* SDL should provide this, really. */ 479/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 480#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 481#define SDLK_MODIFIER_MAX 314
437 482
438/******************************************************************************/ 483/******************************************************************************/
439 484
485static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
486static GV *hover_gv;
487
440static int 488static int
441within_widget (SV *widget, NV x, NV y) 489within_widget (SV *widget, NV x, NV y)
442{ 490{
443 HV *self; 491 HV *self;
444 SV **svp; 492 SV **svp;
473 return 0; 521 return 0;
474 522
475 return 1; 523 return 1;
476} 524}
477 525
478MODULE = CFPlus PACKAGE = CFPlus 526MODULE = Deliantra::Client PACKAGE = DC
479 527
480PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
481 529
482BOOT: 530BOOT:
483{ 531{
484 HV *stash = gv_stashpv ("CFPlus", 1); 532 HV *stash = gv_stashpv ("DC", 1);
485 static const struct { 533 static const struct {
486 const char *name; 534 const char *name;
487 IV iv; 535 IV iv;
488 } *civ, const_iv[] = { 536 } *civ, const_iv[] = {
489# define const_iv(name) { # name, (IV)name } 537# define const_iv(name) { # name, (IV)name }
511 559
512 const_iv (SDL_APPINPUTFOCUS), 560 const_iv (SDL_APPINPUTFOCUS),
513 const_iv (SDL_APPMOUSEFOCUS), 561 const_iv (SDL_APPMOUSEFOCUS),
514 const_iv (SDL_APPACTIVE), 562 const_iv (SDL_APPACTIVE),
515 563
564 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST),
516 const_iv (SDLK_KP0), 566 const_iv (SDLK_KP0),
517 const_iv (SDLK_KP1), 567 const_iv (SDLK_KP1),
518 const_iv (SDLK_KP2), 568 const_iv (SDLK_KP2),
519 const_iv (SDLK_KP3), 569 const_iv (SDLK_KP3),
520 const_iv (SDLK_KP4), 570 const_iv (SDLK_KP4),
592 const_iv (KMOD_LMETA), 642 const_iv (KMOD_LMETA),
593 const_iv (KMOD_RMETA), 643 const_iv (KMOD_RMETA),
594 const_iv (KMOD_NUM), 644 const_iv (KMOD_NUM),
595 const_iv (KMOD_CAPS), 645 const_iv (KMOD_CAPS),
596 const_iv (KMOD_MODE), 646 const_iv (KMOD_MODE),
647
648 const_iv (MIX_DEFAULT_FORMAT),
597# undef const_iv 649# undef const_iv
598 }; 650 };
599 651
600 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
601 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
619 671
620NV floor (NV x) 672NV floor (NV x)
621 673
622NV ceil (NV x) 674NV ceil (NV x)
623 675
676IV minpot (UV n)
677
678IV popcount (UV n)
679
624void 680void
625pango_init () 681pango_init ()
626 CODE: 682 CODE:
627{ 683{
628 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
629 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 685 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); 686 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
687 /*pango_context_set_font_description (opengl_context, default_font);*/
688#if PANGO_VERSION_CHECK (1, 15, 2)
689 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif
631} 692}
632 693
633char * 694char *
634SDL_GetError () 695SDL_GetError ()
635 696
667 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
668 729
669 if (m && m != (SDL_Rect **)-1) 730 if (m && m != (SDL_Rect **)-1)
670 while (*m) 731 while (*m)
671 { 732 {
672 if ((*m)->w >= 640 && (*m)->h >= 480) 733 if ((*m)->w >= 800 && (*m)->h >= 480)
673 { 734 {
674 AV *av = newAV (); 735 AV *av = newAV ();
675 av_push (av, newSViv ((*m)->w)); 736 av_push (av, newSViv ((*m)->w));
676 av_push (av, newSViv ((*m)->h)); 737 av_push (av, newSViv ((*m)->h));
677 av_push (av, newSViv (rgb)); 738 av_push (av, newSViv (rgb));
701 762
702 if (RETVAL) 763 if (RETVAL)
703 { 764 {
704 av_clear (texture_av); 765 av_clear (texture_av);
705 766
706 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
707#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 768#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
708#include "glfunc.h" 769#include "glfunc.h"
709#undef GL_FUNC 770#undef GL_FUNC
710 } 771 }
711} 772}
718char * 779char *
719SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
720 781
721int 782int
722SDL_GetAppState () 783SDL_GetAppState ()
784
785int
786SDL_GetModState ()
723 787
724void 788void
725poll_events () 789poll_events ()
726 PPCODE: 790 PPCODE:
727{ 791{
737 { 801 {
738 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
739 case SDL_KEYUP: 803 case SDL_KEYUP:
740 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
741 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
742 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 806 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 */ 807 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); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
745 break; 809 break;
746 810
747 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
748 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
766 x = ev.motion.x; 830 x = ev.motion.x;
767 y = ev.motion.y; 831 y = ev.motion.y;
768 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
769 } 833 }
770 834
771 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
772 hv_store (hv, "state", 5, newSViv (state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
773 hv_store (hv, "x", 1, newSViv (x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
774 hv_store (hv, "y", 1, newSViv (y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
775 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
776 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
777 } 841 }
778 break; 842 break;
779 843
780 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
781 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
782 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
783 847
784 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
785 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
786 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
787 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
792 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 856 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
793 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 857 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
794 break; 858 break;
795 } 859 }
796 860
797 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 861 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
798 } 862 }
799} 863}
800 864
801int 865int
802Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 866Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
803 POSTCALL: 867 POSTCALL:
804 Mix_HookMusicFinished (music_finished); 868 Mix_HookMusicFinished (music_finished);
805 Mix_ChannelFinished (channel_finished); 869 Mix_ChannelFinished (channel_finished);
806 870
807void 871void
872Mix_QuerySpec ()
873 PPCODE:
874{
875 int freq, channels;
876 Uint16 format;
877
878 if (Mix_QuerySpec (&freq, &format, &channels))
879 {
880 EXTEND (SP, 3);
881 PUSHs (sv_2mortal (newSViv (freq)));
882 PUSHs (sv_2mortal (newSViv (format)));
883 PUSHs (sv_2mortal (newSViv (channels)));
884 }
885}
886
887void
808Mix_CloseAudio () 888Mix_CloseAudio ()
809 889
810int 890int
811Mix_AllocateChannels (int numchans = -1) 891Mix_AllocateChannels (int numchans = -1)
892
893const char *
894Mix_GetError ()
812 895
813void 896void
814lowdelay (int fd, int val = 1) 897lowdelay (int fd, int val = 1)
815 CODE: 898 CODE:
816 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 899 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
842 } 925 }
843 } 926 }
844#endif 927#endif
845} 928}
846 929
847void 930int
848add_font (char *file) 931add_font (char *file)
849 CODE: 932 CODE:
850 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
851 936
852void 937void
853load_image_inline (SV *image_) 938load_image_inline (SV *image_)
854 ALIAS: 939 ALIAS:
855 load_image_file = 1 940 load_image_file = 1
858 STRLEN image_len; 943 STRLEN image_len;
859 char *image = (char *)SvPVbyte (image_, image_len); 944 char *image = (char *)SvPVbyte (image_, image_len);
860 SDL_Surface *surface, *surface2; 945 SDL_Surface *surface, *surface2;
861 SDL_PixelFormat fmt; 946 SDL_PixelFormat fmt;
862 SDL_RWops *rw = ix 947 SDL_RWops *rw = ix
863 ? SDL_RWFromFile (image, "r") 948 ? SDL_RWFromFile (image, "rb")
864 : SDL_RWFromConstMem (image, image_len); 949 : SDL_RWFromConstMem (image, image_len);
865 950
866 if (!rw) 951 if (!rw)
867 croak ("load_image: %s", SDL_GetError ()); 952 croak ("load_image: %s", SDL_GetError ());
868 953
941void 1026void
942error (char *message) 1027error (char *message)
943 CODE: 1028 CODE:
944 fprintf (stderr, "ERROR: %s\n", message); 1029 fprintf (stderr, "ERROR: %s\n", message);
945#ifdef _WIN32 1030#ifdef _WIN32
946 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1031 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
947#endif 1032#endif
948 1033
949void 1034void
950fatal (char *message) 1035fatal (char *message)
951 CODE: 1036 CODE:
952 fprintf (stderr, "FATAL: %s\n", message); 1037 fprintf (stderr, "FATAL: %s\n", message);
953#ifdef _WIN32 1038#ifdef _WIN32
954 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1039 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
955#endif 1040#endif
956 _exit (1); 1041 _exit (1);
957 1042
958void 1043void
959_exit (int retval = 0) 1044_exit (int retval = 0)
971#if DEBUG 1056#if DEBUG
972 VALGRIND_DO_LEAK_CHECK; 1057 VALGRIND_DO_LEAK_CHECK;
973#endif 1058#endif
974} 1059}
975 1060
976MODULE = CFPlus PACKAGE = CFPlus::Font 1061MODULE = Deliantra::Client PACKAGE = DC::Font
977 1062
978PROTOTYPES: DISABLE 1063PROTOTYPES: DISABLE
979 1064
980CFPlus::Font 1065DC::Font
981new_from_file (SV *class, char *path, int id = 0) 1066new_from_file (SV *class, char *path, int id = 0)
982 CODE: 1067 CODE:
983{ 1068{
984 int count; 1069 int count;
985 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
988} 1073}
989 OUTPUT: 1074 OUTPUT:
990 RETVAL 1075 RETVAL
991 1076
992void 1077void
993DESTROY (CFPlus::Font self) 1078DESTROY (DC::Font self)
994 CODE: 1079 CODE:
995 pango_font_description_free (self); 1080 pango_font_description_free (self);
996 1081
997void 1082void
998make_default (CFPlus::Font self) 1083make_default (DC::Font self)
999 PROTOTYPE: $ 1084 PROTOTYPE: $
1000 CODE: 1085 CODE:
1001 default_font = self; 1086 default_font = self;
1002 1087
1003MODULE = CFPlus PACKAGE = CFPlus::Layout 1088MODULE = Deliantra::Client PACKAGE = DC::Layout
1004 1089
1005PROTOTYPES: DISABLE 1090PROTOTYPES: DISABLE
1006 1091
1007void 1092void
1008reset_glyph_cache () 1093glyph_cache_backup ()
1009 PROTOTYPE: 1094 PROTOTYPE:
1010 CODE: 1095 CODE:
1096 tc_backup ();
1097
1098void
1099glyph_cache_restore ()
1100 PROTOTYPE:
1101 CODE:
1011 tc_clear (); 1102 tc_restore ();
1012 1103
1013CFPlus::Layout 1104DC::Layout
1014new (SV *class) 1105new (SV *class)
1015 CODE: 1106 CODE:
1016 New (0, RETVAL, 1, struct cf_layout); 1107 New (0, RETVAL, 1, struct cf_layout);
1017 1108
1018 RETVAL->pl = pango_layout_new (opengl_context); 1109 RETVAL->pl = pango_layout_new (opengl_context);
1020 RETVAL->g = 1.; 1111 RETVAL->g = 1.;
1021 RETVAL->b = 1.; 1112 RETVAL->b = 1.;
1022 RETVAL->a = 1.; 1113 RETVAL->a = 1.;
1023 RETVAL->base_height = MIN_FONT_HEIGHT; 1114 RETVAL->base_height = MIN_FONT_HEIGHT;
1024 RETVAL->font = 0; 1115 RETVAL->font = 0;
1116 RETVAL->rc = rc_alloc ();
1025 1117
1026 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1118 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1027 layout_update_font (RETVAL); 1119 layout_update_font (RETVAL);
1028 OUTPUT: 1120 OUTPUT:
1029 RETVAL 1121 RETVAL
1030 1122
1031void 1123void
1032DESTROY (CFPlus::Layout self) 1124DESTROY (DC::Layout self)
1033 CODE: 1125 CODE:
1034 g_object_unref (self->pl); 1126 g_object_unref (self->pl);
1127 rc_free (self->rc);
1035 Safefree (self); 1128 Safefree (self);
1036 1129
1037void 1130void
1038set_text (CFPlus::Layout self, SV *text_) 1131set_text (DC::Layout self, SV *text_)
1039 CODE: 1132 CODE:
1040{ 1133{
1041 STRLEN textlen; 1134 STRLEN textlen;
1042 char *text = SvPVutf8 (text_, textlen); 1135 char *text = SvPVutf8 (text_, textlen);
1043 1136
1044 pango_layout_set_text (self->pl, text, textlen); 1137 pango_layout_set_text (self->pl, text, textlen);
1045} 1138}
1046 1139
1047void 1140void
1048set_markup (CFPlus::Layout self, SV *text_) 1141set_markup (DC::Layout self, SV *text_)
1049 CODE: 1142 CODE:
1050{ 1143{
1051 STRLEN textlen; 1144 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1145 char *text = SvPVutf8 (text_, textlen);
1053 1146
1054 pango_layout_set_markup (self->pl, text, textlen); 1147 pango_layout_set_markup (self->pl, text, textlen);
1055} 1148}
1056 1149
1057void 1150void
1058set_shapes (CFPlus::Layout self, ...) 1151set_shapes (DC::Layout self, ...)
1059 CODE: 1152 CODE:
1060{ 1153{
1061 PangoAttrList *attrs = 0; 1154 PangoAttrList *attrs = 0;
1062 const char *text = pango_layout_get_text (self->pl); 1155 const char *text = pango_layout_get_text (self->pl);
1063 const char *pos = text; 1156 const char *pos = text;
1098 if (attrs) 1191 if (attrs)
1099 pango_layout_set_attributes (self->pl, attrs); 1192 pango_layout_set_attributes (self->pl, attrs);
1100} 1193}
1101 1194
1102void 1195void
1103get_shapes (CFPlus::Layout self) 1196get_shapes (DC::Layout self)
1104 PPCODE: 1197 PPCODE:
1105{ 1198{
1106 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1107 1200
1108 do 1201 do
1109 { 1202 {
1110 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1111 1204
1112 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
1113 { 1206 {
1114 PangoRectangle extents; 1207 PangoRectangle extents;
1115 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
1123 1216
1124 pango_layout_iter_free (iter); 1217 pango_layout_iter_free (iter);
1125} 1218}
1126 1219
1127int 1220int
1128has_wrapped (CFPlus::Layout self) 1221has_wrapped (DC::Layout self)
1129 CODE: 1222 CODE:
1130{ 1223{
1131 int lines = 1; 1224 int lines = 1;
1132 const char *text = pango_layout_get_text (self->pl); 1225 const char *text = pango_layout_get_text (self->pl);
1133 1226
1138} 1231}
1139 OUTPUT: 1232 OUTPUT:
1140 RETVAL 1233 RETVAL
1141 1234
1142SV * 1235SV *
1143get_text (CFPlus::Layout self) 1236get_text (DC::Layout self)
1144 CODE: 1237 CODE:
1145 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1238 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1146 sv_utf8_decode (RETVAL); 1239 sv_utf8_decode (RETVAL);
1147 OUTPUT: 1240 OUTPUT:
1148 RETVAL 1241 RETVAL
1149 1242
1150void 1243void
1151set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1244set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1152 CODE: 1245 CODE:
1153 self->r = r; 1246 self->r = r;
1154 self->g = g; 1247 self->g = g;
1155 self->b = b; 1248 self->b = b;
1156 self->a = a; 1249 self->a = a;
1157 1250
1158void 1251void
1159set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1252set_font (DC::Layout self, DC::Font font = 0)
1160 CODE: 1253 CODE:
1161 if (self->font != font) 1254 if (self->font != font)
1162 { 1255 {
1163 self->font = font; 1256 self->font = font;
1164 layout_update_font (self); 1257 layout_update_font (self);
1165 } 1258 }
1166 1259
1167void 1260void
1168set_height (CFPlus::Layout self, int base_height) 1261set_height (DC::Layout self, int base_height)
1169 CODE: 1262 CODE:
1170 if (self->base_height != base_height) 1263 if (self->base_height != base_height)
1171 { 1264 {
1172 self->base_height = base_height; 1265 self->base_height = base_height;
1173 layout_update_font (self); 1266 layout_update_font (self);
1174 } 1267 }
1175 1268
1176void 1269void
1177set_width (CFPlus::Layout self, int max_width = -1) 1270set_width (DC::Layout self, int max_width = -1)
1178 CODE: 1271 CODE:
1179 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1272 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1180 1273
1181void 1274void
1182set_indent (CFPlus::Layout self, int indent) 1275set_indent (DC::Layout self, int indent)
1183 CODE: 1276 CODE:
1184 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1277 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1185 1278
1186void 1279void
1187set_spacing (CFPlus::Layout self, int spacing) 1280set_spacing (DC::Layout self, int spacing)
1188 CODE: 1281 CODE:
1189 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1282 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1190 1283
1191void 1284void
1192set_ellipsise (CFPlus::Layout self, int ellipsise) 1285set_ellipsise (DC::Layout self, int ellipsise)
1193 CODE: 1286 CODE:
1194 pango_layout_set_ellipsize (self->pl, 1287 pango_layout_set_ellipsize (self->pl,
1195 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1288 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1196 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1289 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1197 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1290 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1198 : PANGO_ELLIPSIZE_NONE 1291 : PANGO_ELLIPSIZE_NONE
1199 ); 1292 );
1200 1293
1201void 1294void
1202set_single_paragraph_mode (CFPlus::Layout self, int spm) 1295set_single_paragraph_mode (DC::Layout self, int spm)
1203 CODE: 1296 CODE:
1204 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1297 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1205 1298
1206void 1299void
1207size (CFPlus::Layout self) 1300size (DC::Layout self)
1208 PPCODE: 1301 PPCODE:
1209{ 1302{
1210 int w, h; 1303 int w, h;
1211 1304
1212 layout_get_pixel_size (self, &w, &h); 1305 layout_get_pixel_size (self, &w, &h);
1215 PUSHs (sv_2mortal (newSViv (w))); 1308 PUSHs (sv_2mortal (newSViv (w)));
1216 PUSHs (sv_2mortal (newSViv (h))); 1309 PUSHs (sv_2mortal (newSViv (h)));
1217} 1310}
1218 1311
1219int 1312int
1220descent (CFPlus::Layout self) 1313descent (DC::Layout self)
1221 CODE: 1314 CODE:
1222{ 1315{
1223 PangoRectangle rect; 1316 PangoRectangle rect;
1224 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1225 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1226 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1227} 1320}
1228 OUTPUT: 1321 OUTPUT:
1229 RETVAL 1322 RETVAL
1230 1323
1231int 1324int
1232xy_to_index (CFPlus::Layout self, int x, int y) 1325xy_to_index (DC::Layout self, int x, int y)
1233 CODE: 1326 CODE:
1234{ 1327{
1235 int index, trailing; 1328 int index, trailing;
1236 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1329 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1237 RETVAL = index + trailing; 1330 RETVAL = index + trailing;
1238} 1331}
1239 OUTPUT: 1332 OUTPUT:
1240 RETVAL 1333 RETVAL
1241 1334
1242void 1335void
1243cursor_pos (CFPlus::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1244 PPCODE: 1337 PPCODE:
1245{ 1338{
1246 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1247 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1248 1341
1249 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1250 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1251 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1252 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1253} 1346}
1254 1347
1255void 1348void
1256index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1257 PPCODE: 1350 PPCODE:
1258{ 1351{
1259 int line, x; 1352 int line, x;
1260 1353
1261 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1354 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1355#if !PANGO_VERSION_CHECK (1, 17, 3)
1262 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1263 1357 --line;
1358#endif
1264 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1265 PUSHs (sv_2mortal (newSViv (line - 1))); 1360 PUSHs (sv_2mortal (newSViv (line)));
1266 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1361 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1267} 1362}
1268 1363
1269void 1364void
1270line_x_to_index (CFPlus::Layout self, int line, int x) 1365line_x_to_index (DC::Layout self, int line, int x)
1271 PPCODE: 1366 PPCODE:
1272{ 1367{
1273 PangoLayoutLine *lp; 1368 PangoLayoutLine *lp;
1274 int index, trailing; 1369 int index, trailing;
1275 1370
1276 if (line < 0) 1371 if (line < 0)
1277 XSRETURN_EMPTY; 1372 XSRETURN_EMPTY;
1278 1373
1279 if (!(lp = pango_layout_get_line (self->pl, line))) 1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1280 XSRETURN_EMPTY; /* do better */ 1375 XSRETURN_EMPTY; /* do better */
1281 1376
1282 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1377 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1283 1378
1284 EXTEND (SP, 2); 1379 EXTEND (SP, 2);
1290 PUSHs (sv_2mortal (newSViv (trailing))); 1385 PUSHs (sv_2mortal (newSViv (trailing)));
1291 } 1386 }
1292} 1387}
1293 1388
1294void 1389void
1295render (CFPlus::Layout self, float x, float y, int flags = 0) 1390render (DC::Layout self, float x, float y, int flags = 0)
1296 PPCODE: 1391 CODE:
1392 rc_clear (self->rc);
1297 pango_opengl_render_layout_subpixel ( 1393 pango_opengl_render_layout_subpixel (
1298 self->pl, 1394 self->pl,
1395 self->rc,
1299 x * PANGO_SCALE, y * PANGO_SCALE, 1396 x * PANGO_SCALE, y * PANGO_SCALE,
1300 self->r, self->g, self->b, self->a, 1397 self->r, self->g, self->b, self->a,
1301 flags 1398 flags
1302 ); 1399 );
1400 // we assume that context_change actually clears/frees stuff
1401 // and does not do any recomputation...
1402 pango_layout_context_changed (self->pl);
1303 1403
1304MODULE = CFPlus PACKAGE = CFPlus::Texture 1404void
1405draw (DC::Layout self)
1406 CODE:
1407{
1408 glEnable (GL_TEXTURE_2D);
1409 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1410 glEnable (GL_BLEND);
1411 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1412 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1413 glEnable (GL_ALPHA_TEST);
1414 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1415
1416 rc_draw (self->rc);
1417
1418 glDisable (GL_ALPHA_TEST);
1419 glDisable (GL_BLEND);
1420 glDisable (GL_TEXTURE_2D);
1421}
1422
1423MODULE = Deliantra::Client PACKAGE = DC::Texture
1305 1424
1306PROTOTYPES: ENABLE 1425PROTOTYPES: ENABLE
1307
1308int minpot (int n)
1309 1426
1310void 1427void
1311pad (SV *data_, int ow, int oh, int nw, int nh) 1428pad (SV *data_, int ow, int oh, int nw, int nh)
1312 CODE: 1429 CODE:
1313{ 1430{
1340 HV *hv = (HV *)SvRV (self); 1457 HV *hv = (HV *)SvRV (self);
1341 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1458 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1342 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1459 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1343 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1460 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1344 1461
1462 if (name <= 0)
1463 XSRETURN_EMPTY;
1464
1345 if (items < 5) 1465 if (items < 5)
1346 { 1466 {
1347 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1467 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1348 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1468 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1349 } 1469 }
1387 RETVAL = width > 0; 1507 RETVAL = width > 0;
1388} 1508}
1389 OUTPUT: 1509 OUTPUT:
1390 RETVAL 1510 RETVAL
1391 1511
1392MODULE = CFPlus PACKAGE = CFPlus::Map 1512MODULE = Deliantra::Client PACKAGE = DC::Map
1393 1513
1394PROTOTYPES: DISABLE 1514PROTOTYPES: DISABLE
1395 1515
1396CFPlus::Map 1516DC::Map
1397new (SV *class) 1517new (SV *class)
1398 CODE: 1518 CODE:
1399 New (0, RETVAL, 1, struct map); 1519 New (0, RETVAL, 1, struct map);
1400 RETVAL->x = 0; 1520 RETVAL->x = 0;
1401 RETVAL->y = 0; 1521 RETVAL->y = 0;
1409 RETVAL->row = 0; 1529 RETVAL->row = 0;
1410 OUTPUT: 1530 OUTPUT:
1411 RETVAL 1531 RETVAL
1412 1532
1413void 1533void
1414DESTROY (CFPlus::Map self) 1534DESTROY (DC::Map self)
1415 CODE: 1535 CODE:
1416{ 1536{
1417 map_clear (self); 1537 map_clear (self);
1418 Safefree (self->face2tile); 1538 Safefree (self->face2tile);
1419 Safefree (self->tex); 1539 Safefree (self->tex);
1420 Safefree (self); 1540 Safefree (self);
1421} 1541}
1422 1542
1423void 1543void
1424resize (CFPlus::Map self, int map_width, int map_height) 1544resize (DC::Map self, int map_width, int map_height)
1425 CODE: 1545 CODE:
1426 self->w = map_width; 1546 self->w = map_width;
1427 self->h = map_height; 1547 self->h = map_height;
1428 1548
1429void 1549void
1430clear (CFPlus::Map self) 1550clear (DC::Map self)
1431 CODE: 1551 CODE:
1432 map_clear (self); 1552 map_clear (self);
1433 1553
1434void 1554void
1435set_tileid (CFPlus::Map self, int face, int tile) 1555set_tileid (DC::Map self, int face, int tile)
1436 CODE: 1556 CODE:
1437{ 1557{
1438 need_facenum (self, face); self->face2tile [face] = tile; 1558 need_facenum (self, face); self->face2tile [face] = tile;
1439 need_texid (self, tile); 1559 need_texid (self, tile);
1440} 1560}
1441 1561
1442void 1562void
1443set_smooth (CFPlus::Map self, int face, int smooth, int level) 1563set_smooth (DC::Map self, int face, int smooth, int level)
1444 CODE: 1564 CODE:
1445{ 1565{
1446 tileid texid; 1566 tileid texid;
1447 maptex *tex; 1567 maptex *tex;
1448 1568
1461 tex->smoothtile = self->face2tile [smooth]; 1581 tex->smoothtile = self->face2tile [smooth];
1462 tex->smoothlevel = level; 1582 tex->smoothlevel = level;
1463} 1583}
1464 1584
1465void 1585void
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) 1586set_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: 1587 CODE:
1468{ 1588{
1469 need_texid (self, texid); 1589 need_texid (self, texid);
1470 1590
1471 { 1591 {
1491 // from transparent color bleeding and ugly wrapping effects. 1611 // from transparent color bleeding and ugly wrapping effects.
1492 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1493} 1613}
1494 1614
1495int 1615int
1496ox (CFPlus::Map self) 1616ox (DC::Map self)
1497 ALIAS: 1617 ALIAS:
1498 oy = 1 1618 oy = 1
1499 x = 2 1619 x = 2
1500 y = 3 1620 y = 3
1501 w = 4 1621 w = 4
1512 } 1632 }
1513 OUTPUT: 1633 OUTPUT:
1514 RETVAL 1634 RETVAL
1515 1635
1516void 1636void
1517scroll (CFPlus::Map self, int dx, int dy) 1637scroll (DC::Map self, int dx, int dy)
1518 CODE: 1638 CODE:
1519{ 1639{
1520 if (dx > 0) 1640 if (dx > 0)
1521 map_blank (self, self->x, self->y, dx, self->h); 1641 map_blank (self, self->x, self->y, dx, self->h);
1522 else if (dx < 0) 1642 else if (dx < 0)
1537 self->rows += MAP_EXTEND_Y; 1657 self->rows += MAP_EXTEND_Y;
1538 self->y += MAP_EXTEND_Y; 1658 self->y += MAP_EXTEND_Y;
1539 } 1659 }
1540} 1660}
1541 1661
1542void 1662SV *
1543map1a_update (CFPlus::Map self, SV *data_, int extmap) 1663map1a_update (DC::Map self, SV *data_, int extmap)
1544 CODE: 1664 CODE:
1545{ 1665{
1546 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1547 uint8_t *data_end = (uint8_t *)SvEND (data_); 1667 uint8_t *data_end = (uint8_t *)SvEND (data_);
1548 mapcell *cell; 1668 mapcell *cell;
1549 int x, y, flags; 1669 int x, y, z, flags;
1670 AV *missing = newAV ();
1671 RETVAL = newRV_noinc ((SV *)missing);
1550 1672
1551 while (data < data_end - 1) 1673 while (data < data_end - 1)
1552 { 1674 {
1553 flags = (data [0] << 8) + data [1]; data += 2; 1675 flags = (data [0] << 8) + data [1]; data += 2;
1554 1676
1574 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1575 1697
1576 do 1698 do
1577 { 1699 {
1578 ext = *data++; 1700 ext = *data++;
1579 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1580 1702
1581 if (cmd < 4) 1703 if (cmd < 4)
1582 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1583 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1584 { 1706 {
1587 } 1709 }
1588 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1589 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1590 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1591 { 1713 {
1592 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1593 ; // decode player count 1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1594 1718
1595 data += *data + 1; 1719 data += *data + 1;
1596 } 1720 }
1597 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1598 cell->flags = *data++; 1722 cell->flags = *data++;
1605 } 1729 }
1606 else 1730 else
1607 cell->darkness = *data++ + 1; 1731 cell->darkness = *data++ + 1;
1608 } 1732 }
1609 1733
1734 for (z = 0; z <= 2; ++z)
1610 if (flags & 4) 1735 if (flags & (4 >> z))
1611 { 1736 {
1612 faceid face = (data [0] << 8) + data [1]; data += 2; 1737 faceid face = (data [0] << 8) + data [1]; data += 2;
1613 need_facenum (self, face); 1738 need_facenum (self, face);
1614 cell->tile [0] = self->face2tile [face]; 1739 cell->tile [z] = self->face2tile [face];
1740
1741 if (cell->tile [z])
1742 {
1743 maptex *tex = self->tex + cell->tile [z];
1744 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z]));
1746
1747 if (tex->smoothtile)
1748 {
1749 maptex *smooth = self->tex + tex->smoothtile;
1750 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile));
1752 }
1753 }
1615 } 1754 }
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 } 1755 }
1631 else 1756 else
1632 cell->darkness = 0; 1757 cell->darkness = 0;
1633 } 1758 }
1634} 1759}
1760 OUTPUT:
1761 RETVAL
1635 1762
1636SV * 1763SV *
1637mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1764mapmap (DC::Map self, int x0, int y0, int w, int h)
1638 CODE: 1765 CODE:
1639{ 1766{
1640 int x1, x; 1767 int x1, x;
1641 int y1, y; 1768 int y1, y;
1642 int z; 1769 int z;
1687} 1814}
1688 OUTPUT: 1815 OUTPUT:
1689 RETVAL 1816 RETVAL
1690 1817
1691void 1818void
1692draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1693 CODE: 1820 CODE:
1694{ 1821{
1822 int x, y, z;
1823
1695 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1696 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1825 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) 1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1698 smooth_key skey; 1827 smooth_key skey;
1699 int x, y, z; 1828 int pl_x, pl_y;
1700 int last_name; 1829 maptex pl_tex;
1830 rc_t *rc = rc_alloc ();
1831 rc_key_t key;
1832 rc_array_t *arr;
1833
1834 pl_tex.name = 0;
1701 1835
1702 // thats current max. sorry. 1836 // thats current max. sorry.
1703 if (sw > 255) sw = 255; 1837 if (sw > 255) sw = 255;
1704 if (sh > 255) sh = 255; 1838 if (sh > 255) sh = 255;
1705 1839
1706 // clear key, in case of extra padding 1840 // clear key, in case of extra padding
1707 memset (&skey, 0, sizeof (skey)); 1841 memset (&skey, 0, sizeof (skey));
1708 1842
1709 glColor4ub (255, 255, 255, 255); 1843 memset (&key, 0, sizeof (key));
1710 1844 key.r = 255;
1711 glEnable (GL_BLEND); 1845 key.g = 255;
1712 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1846 key.b = 255;
1713 glEnable (GL_TEXTURE_2D); 1847 key.a = 255;
1714 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1848 key.mode = GL_QUADS;
1715 1849 key.format = GL_T2F_V3F;
1716 glBegin (GL_QUADS); 1850 key.texname = -1;
1717
1718 last_name = 0;
1719 1851
1720 mx += self->x; 1852 mx += self->x;
1721 my += self->y; 1853 my += self->y;
1722 1854
1723 // first pass: determine smooth_max 1855 // first pass: determine smooth_max
1739 MAX (self->tex [cell->tile [0]].smoothlevel, 1871 MAX (self->tex [cell->tile [0]].smoothlevel,
1740 MAX (self->tex [cell->tile [1]].smoothlevel, 1872 MAX (self->tex [cell->tile [1]].smoothlevel,
1741 self->tex [cell->tile [2]].smoothlevel)); 1873 self->tex [cell->tile [2]].smoothlevel));
1742 } 1874 }
1743 } 1875 }
1876
1877 glEnable (GL_BLEND);
1878 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1744 1880
1745 for (z = 0; z <= 2; z++) 1881 for (z = 0; z <= 2; z++)
1746 { 1882 {
1747 memset (smooth_level, 0, sizeof (smooth_level)); 1883 memset (smooth_level, 0, sizeof (smooth_level));
1748 1884
1761 { 1897 {
1762 maptex tex = self->tex [tile]; 1898 maptex tex = self->tex [tile];
1763 int px = (x + 1) * T - tex.w; 1899 int px = (x + 1) * T - tex.w;
1764 int py = (y + 1) * T - tex.h; 1900 int py = (y + 1) * T - tex.h;
1765 1901
1766 // suppressing texture state switches here
1767 // is only moderately effective, but worth the extra effort
1768 if (last_name != tex.name) 1902 if (key.texname != tex.name)
1769 { 1903 {
1770 if (!tex.name) 1904 if (!tex.name)
1771 tex = self->tex [2]; /* missing, replace by noface */ 1905 tex = self->tex [2]; /* missing, replace by noface */
1772 1906
1773 glEnd (); 1907 key.texname = tex.name;
1774 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1908 arr = rc_array (rc, &key);
1775 glBegin (GL_QUADS);
1776 } 1909 }
1777 1910
1778 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1911 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 { 1912 {
1913 pl_x = px;
1914 pl_y = py;
1915 pl_tex = tex;
1916 continue;
1917 }
1918
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1921 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1923
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1785 if (cell->flags & 1) 1927 if (cell->flags & 1)
1786 { 1928 {
1787 maptex tex = self->tex [1]; 1929 maptex tex = self->tex [1];
1788 int px = x * T + T * 2 / 32; 1930 int px = x * T + T * 2 / 32;
1789 int py = y * T - T * 6 / 32; 1931 int py = y * T - T * 6 / 32;
1790 1932
1933 if (tex.name)
1791 glEnd (); 1934 {
1792 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1793 glBegin (GL_QUADS); 1945 }
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 } 1946 }
1800 } 1947 }
1801 1948
1802 // update smooth hash 1949 // update smooth hash
1803 if (tex.smoothtile) 1950 if (tex.smoothtile)
1839 } 1986 }
1840 } 1987 }
1841 } 1988 }
1842 } 1989 }
1843 1990
1991 rc_draw (rc);
1992 rc_clear (rc);
1993
1844 // go through all smoothlevels, lowest to highest, then draw. 1994 // go through all smoothlevels, lowest to highest, then draw.
1845 // this is basically counting sort 1995 // this is basically counting sort
1846 { 1996 {
1847 int w, b; 1997 int w, b;
1848 1998
1999 glEnable (GL_TEXTURE_2D);
2000 glBegin (GL_QUADS);
1849 for (w = 0; w < 256 / 32; ++w) 2001 for (w = 0; w < 256 / 32; ++w)
1850 { 2002 {
1851 uint32_t smask = smooth_level [w]; 2003 uint32_t smask = smooth_level [w];
1852 if (smask) 2004 if (smask)
1853 for (b = 0; b < 32; ++b) 2005 for (b = 0; b < 32; ++b)
1872 int border = bits & 15; 2024 int border = bits & 15;
1873 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2025 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1874 float dx = tex.s * .0625f; // 16 images/row 2026 float dx = tex.s * .0625f; // 16 images/row
1875 float dy = tex.t * .5f ; // 2 images/column 2027 float dy = tex.t * .5f ; // 2 images/column
1876 2028
1877 // this time naively avoiding texture state changes
1878 // save gobs of state changes.
1879 if (last_name != tex.name) 2029 if (tex.name)
1880 { 2030 {
2031 // this time avoiding texture state changes
2032 // save gobs of state changes.
1881 if (!tex.name) 2033 if (key.texname != tex.name)
1882 continue; // smoothing not yet available 2034 {
1883
1884 glEnd (); 2035 glEnd ();
1885 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1886 glBegin (GL_QUADS); 2037 glBegin (GL_QUADS);
1887 } 2038 }
1888 2039
1889 if (border) 2040 if (border)
1890 { 2041 {
1891 float ox = border * dx; 2042 float ox = border * dx;
1892 2043
1893 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1894 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1895 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1896 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1897 } 2048 }
1898 2049
1899 if (corner) 2050 if (corner)
1900 { 2051 {
1901 float ox = corner * dx; 2052 float ox = corner * dx;
1902 2053
1903 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2054 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2058 }
1907 } 2059 }
1908 } 2060 }
1909 } 2061 }
1910 } 2062 }
1911 } 2063 }
2064
2065 glEnd ();
2066 glDisable (GL_TEXTURE_2D);
2067 key.texname = -1;
1912 } 2068 }
1913 2069
1914 hv_clear (smooth); 2070 hv_clear (smooth);
1915 } 2071 }
1916 2072
1917 glEnd (); 2073 if (pl_tex.name)
2074 {
2075 maptex tex = pl_tex;
2076 int px = pl_x + pdx;
2077 int py = pl_y + pdy;
1918 2078
1919 glDisable (GL_TEXTURE_2D); 2079 key.texname = tex.name;
2080 arr = rc_array (rc, &key);
2081
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2083 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2084 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086
2087 rc_draw (rc);
2088 }
2089
1920 glDisable (GL_BLEND); 2090 glDisable (GL_BLEND);
2091 rc_free (rc);
1921 2092
1922 // top layer: overlays such as the health bar 2093 // top layer: overlays such as the health bar
1923 for (y = 0; y < sh; y++) 2094 for (y = 0; y < sh; y++)
1924 if (0 <= y + my && y + my < self->rows) 2095 if (0 <= y + my && y + my < self->rows)
1925 { 2096 {
1950 } 2121 }
1951 } 2122 }
1952} 2123}
1953 2124
1954void 2125void
1955draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2126draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1956 CODE: 2127 CODE:
1957{ 2128{
1958 static float color[16][3] = { 2129 static float color[16][3] = {
1959 { 0.00F, 0.00F, 0.00F }, 2130 { 0.00F, 0.00F, 0.00F },
1960 { 1.00F, 1.00F, 1.00F }, 2131 { 1.00F, 1.00F, 1.00F },
2010 glDisable (GL_BLEND); 2181 glDisable (GL_BLEND);
2011 glDisable (GL_TEXTURE_2D); 2182 glDisable (GL_TEXTURE_2D);
2012} 2183}
2013 2184
2014void 2185void
2015fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2186fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2016 PPCODE: 2187 PPCODE:
2017{ 2188{
2018 int x, y; 2189 int x, y;
2019 int sw1 = sw + 2; 2190 int sw1 = sw + 2;
2020 int sh1 = sh + 2; 2191 int sh1 = sh + 2;
2091 PUSHs (sv_2mortal (newSViv (sh3))); 2262 PUSHs (sv_2mortal (newSViv (sh3)));
2092 PUSHs (darkness3_sv); 2263 PUSHs (darkness3_sv);
2093} 2264}
2094 2265
2095SV * 2266SV *
2096get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2267get_rect (DC::Map self, int x0, int y0, int w, int h)
2097 CODE: 2268 CODE:
2098{ 2269{
2099 int x, y, x1, y1; 2270 int x, y, x1, y1;
2100 SV *data_sv = newSV (w * h * 7 + 5); 2271 SV *data_sv = newSV (w * h * 7 + 5);
2101 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2272 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2158 else 2329 else
2159 *data++ = 0; 2330 *data++ = 0;
2160 } 2331 }
2161 } 2332 }
2162 2333
2334 /* if size is w*h + 5 then no data has been found */
2335 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2336 {
2163 SvPOK_only (data_sv); 2337 SvPOK_only (data_sv);
2164 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 }
2340
2165 RETVAL = data_sv; 2341 RETVAL = data_sv;
2166} 2342}
2167 OUTPUT: 2343 OUTPUT:
2168 RETVAL 2344 RETVAL
2169 2345
2170void 2346void
2171set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2347set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2172 PPCODE: 2348 PPCODE:
2173{ 2349{
2174 int x, y, z; 2350 int x, y, z;
2175 int w, h; 2351 int w, h;
2176 int x1, y1; 2352 int x1, y1;
2353 STRLEN len;
2354 uint8_t *data, *end;
2355
2356 len = SvLEN (data_sv);
2357 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2358 data = SvPVbyte_nolen (data_sv);
2359 end = data + len + 8;
2360
2361 if (len < 5)
2362 XSRETURN_EMPTY;
2177 2363
2178 if (*data++ != 0) 2364 if (*data++ != 0)
2179 return; /* version mismatch */ 2365 XSRETURN_EMPTY; /* version mismatch */
2180 2366
2181 w = *data++ << 8; w |= *data++; 2367 w = *data++ << 8; w |= *data++;
2182 h = *data++ << 8; h |= *data++; 2368 h = *data++ << 8; h |= *data++;
2183 2369
2184 // we need to do this 'cause we don't keep an absolute coord system for rows 2370 // we need to do this 'cause we don't keep an absolute coord system for rows
2196 { 2382 {
2197 maprow *row = map_get_row (self, y); 2383 maprow *row = map_get_row (self, y);
2198 2384
2199 for (x = x0; x < x1; x++) 2385 for (x = x0; x < x1; x++)
2200 { 2386 {
2387 uint8_t flags;
2388
2389 if (data + 7 >= end)
2390 XSRETURN_EMPTY;
2391
2201 uint8_t flags = *data++; 2392 flags = *data++;
2202 2393
2203 if (flags) 2394 if (flags)
2204 { 2395 {
2205 mapcell *cell = row_get_cell (row, x); 2396 mapcell *cell = row_get_cell (row, x);
2206 tileid tile[3] = { 0, 0, 0 }; 2397 tileid tile[3] = { 0, 0, 0 };
2209 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2400 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2210 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2401 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2211 2402
2212 if (cell->darkness == 0) 2403 if (cell->darkness == 0)
2213 { 2404 {
2214 cell->darkness = 0; 2405 /*cell->darkness = 0;*/
2406 EXTEND (SP, 3);
2215 2407
2216 for (z = 0; z <= 2; z++) 2408 for (z = 0; z <= 2; z++)
2217 { 2409 {
2218 tileid t = tile [z]; 2410 tileid t = tile [z];
2219 2411
2220 if (t >= self->texs || (t && !self->tex [t].name)) 2412 if (t >= self->texs || (t && !self->tex [t].name))
2221 { 2413 {
2222 XPUSHs (sv_2mortal (newSViv (t))); 2414 PUSHs (sv_2mortal (newSViv (t)));
2223 need_texid (self, t); 2415 need_texid (self, t);
2224 } 2416 }
2225 2417
2226 cell->tile [z] = t; 2418 cell->tile [z] = t;
2227 } 2419 }
2229 } 2421 }
2230 } 2422 }
2231 } 2423 }
2232} 2424}
2233 2425
2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2426MODULE = Deliantra::Client PACKAGE = DC::RW
2427
2428DC::RW
2429new (SV *class, SV *data_sv)
2430 CODE:
2431{
2432 STRLEN datalen;
2433 char *data = SvPVbyte (data_sv, datalen);
2434
2435 RETVAL = SDL_RWFromConstMem (data, datalen);
2436}
2437 OUTPUT:
2438 RETVAL
2439
2440DC::RW
2441new_from_file (SV *class, const char *path, const char *mode = "rb")
2442 CODE:
2443 RETVAL = SDL_RWFromFile (path, mode);
2444 OUTPUT:
2445 RETVAL
2446
2447# fails on win32:
2448# dc.xs(2268) : error C2059: syntax error : '('
2449#void
2450#close (DC::RW self)
2451# CODE:
2452# (self->(close)) (self);
2453
2454MODULE = Deliantra::Client PACKAGE = DC::Channel
2235 2455
2236PROTOTYPES: DISABLE 2456PROTOTYPES: DISABLE
2237 2457
2238CFPlus::MixChunk 2458DC::Channel
2239new_from_file (SV *class, char *path) 2459find ()
2240 CODE: 2460 CODE:
2241 RETVAL = Mix_LoadWAV (path); 2461{
2462 RETVAL = Mix_GroupAvailable (-1);
2463
2464 if (RETVAL < 0)
2465 {
2466 RETVAL = Mix_GroupOldest (-1);
2467
2468 if (RETVAL < 0)
2469 XSRETURN_UNDEF;
2470
2471 Mix_HaltChannel (RETVAL);
2472 }
2473
2474 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128);
2476}
2242 OUTPUT: 2477 OUTPUT:
2243 RETVAL 2478 RETVAL
2244 2479
2245void 2480void
2481halt (DC::Channel self)
2482 CODE:
2483 Mix_HaltChannel (self);
2484
2485void
2486expire (DC::Channel self, int ticks = -1)
2487 CODE:
2488 Mix_ExpireChannel (self, ticks);
2489
2490void
2491fade_out (DC::Channel self, int ticks = -1)
2492 CODE:
2493 Mix_FadeOutChannel (self, ticks);
2494
2495int
2496volume (DC::Channel self, int volume)
2497 CODE:
2498 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2499 OUTPUT:
2500 RETVAL
2501
2502void
2503unregister_all_effects (DC::Channel self)
2504 CODE:
2505 Mix_UnregisterAllEffects (self);
2506
2507void
2508set_panning (DC::Channel self, int left, int right)
2509 CODE:
2510 left = CLAMP (left , 0, 255);
2511 right = CLAMP (right, 0, 255);
2512 Mix_SetPanning (self, left, right);
2513
2514void
2515set_distance (DC::Channel self, int distance)
2516 CODE:
2517 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2518
2519void
2520set_position (DC::Channel self, int angle, int distance)
2521 CODE:
2522
2523void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE:
2526{
2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2528 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530}
2531
2532void
2533set_reverse_stereo (DC::Channel self, int flip)
2534 CODE:
2535 Mix_SetReverseStereo (self, flip);
2536
2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2538
2539PROTOTYPES: DISABLE
2540
2541DC::MixChunk
2542new (SV *class, DC::RW rwops)
2543 CODE:
2544 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2545 OUTPUT:
2546 RETVAL
2547
2548void
2246DESTROY (CFPlus::MixChunk self) 2549DESTROY (DC::MixChunk self)
2247 CODE: 2550 CODE:
2248 Mix_FreeChunk (self); 2551 Mix_FreeChunk (self);
2249 2552
2250int 2553int
2251volume (CFPlus::MixChunk self, int volume = -1) 2554volume (DC::MixChunk self, int volume = -1)
2252 CODE: 2555 CODE:
2556 if (items > 1)
2557 volume = CLAMP (volume, 0, 128);
2253 RETVAL = Mix_VolumeChunk (self, volume); 2558 RETVAL = Mix_VolumeChunk (self, volume);
2254 OUTPUT: 2559 OUTPUT:
2255 RETVAL 2560 RETVAL
2256 2561
2257int 2562DC::Channel
2258play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2563play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2259 CODE: 2564 CODE:
2565{
2260 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2566 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2567
2568 if (RETVAL < 0)
2569 XSRETURN_UNDEF;
2570
2571 if (channel < 0)
2572 {
2573 Mix_UnregisterAllEffects (RETVAL);
2574 Mix_Volume (RETVAL, 128);
2575 }
2576}
2261 OUTPUT: 2577 OUTPUT:
2262 RETVAL 2578 RETVAL
2263 2579
2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2265 2581
2266int 2582int
2267volume (int volume = -1) 2583volume (int volume = -1)
2268 PROTOTYPE: ;$ 2584 PROTOTYPE: ;$
2269 CODE: 2585 CODE:
2586 if (items > 0)
2587 volume = CLAMP (volume, 0, 128);
2270 RETVAL = Mix_VolumeMusic (volume); 2588 RETVAL = Mix_VolumeMusic (volume);
2271 OUTPUT: 2589 OUTPUT:
2272 RETVAL 2590 RETVAL
2273 2591
2592void
2593fade_out (int ms)
2594 CODE:
2595 Mix_FadeOutMusic (ms);
2596
2597void
2598halt ()
2599 CODE:
2600 Mix_HaltMusic ();
2601
2602DC::MixMusic
2603new (SV *class, DC::RW rwops)
2604 CODE:
2605 RETVAL = Mix_LoadMUS_RW (rwops);
2606 OUTPUT:
2607 RETVAL
2608
2609void
2610DESTROY (DC::MixMusic self)
2611 CODE:
2612 Mix_FreeMusic (self);
2613
2274int 2614int
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) 2615play (DC::MixMusic self, int loops = -1)
2295 CODE: 2616 CODE:
2296 RETVAL = Mix_PlayMusic (self, loops); 2617 RETVAL = Mix_PlayMusic (self, loops);
2297 OUTPUT: 2618 OUTPUT:
2298 RETVAL 2619 RETVAL
2299 2620
2300int 2621void
2301fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2622fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2302 CODE: 2623 CODE:
2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2624 Mix_FadeInMusicPos (self, loops, ms, position);
2304 OUTPUT:
2305 RETVAL
2306 2625
2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2626MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2308 2627
2309PROTOTYPES: ENABLE 2628PROTOTYPES: ENABLE
2310 2629
2311BOOT: 2630BOOT:
2312{ 2631{
2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2632 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2314 static const struct { 2633 static const struct {
2315 const char *name; 2634 const char *name;
2316 IV iv; 2635 IV iv;
2317 } *civ, const_iv[] = { 2636 } *civ, const_iv[] = {
2318# define const_iv(name) { # name, (IV)name } 2637# define const_iv(name) { # name, (IV)name }
2353 const_iv (GL_INTENSITY), 2672 const_iv (GL_INTENSITY),
2354 const_iv (GL_LUMINANCE), 2673 const_iv (GL_LUMINANCE),
2355 const_iv (GL_LUMINANCE_ALPHA), 2674 const_iv (GL_LUMINANCE_ALPHA),
2356 const_iv (GL_FLOAT), 2675 const_iv (GL_FLOAT),
2357 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2676 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2677 const_iv (GL_COMPRESSED_ALPHA_ARB),
2678 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2679 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2680 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2681 const_iv (GL_COMPRESSED_RGB_ARB),
2682 const_iv (GL_COMPRESSED_RGBA_ARB),
2358 const_iv (GL_COMPILE), 2683 const_iv (GL_COMPILE),
2359 const_iv (GL_PROXY_TEXTURE_1D), 2684 const_iv (GL_PROXY_TEXTURE_1D),
2360 const_iv (GL_PROXY_TEXTURE_2D), 2685 const_iv (GL_PROXY_TEXTURE_2D),
2361 const_iv (GL_TEXTURE_1D), 2686 const_iv (GL_TEXTURE_1D),
2362 const_iv (GL_TEXTURE_2D), 2687 const_iv (GL_TEXTURE_2D),
2386 const_iv (GL_COLOR_LOGIC_OP), 2711 const_iv (GL_COLOR_LOGIC_OP),
2387 const_iv (GL_SEPARABLE_2D), 2712 const_iv (GL_SEPARABLE_2D),
2388 const_iv (GL_CONVOLUTION_2D), 2713 const_iv (GL_CONVOLUTION_2D),
2389 const_iv (GL_CONVOLUTION_BORDER_MODE), 2714 const_iv (GL_CONVOLUTION_BORDER_MODE),
2390 const_iv (GL_CONSTANT_BORDER), 2715 const_iv (GL_CONSTANT_BORDER),
2716 const_iv (GL_POINTS),
2391 const_iv (GL_LINES), 2717 const_iv (GL_LINES),
2392 const_iv (GL_LINE_STRIP), 2718 const_iv (GL_LINE_STRIP),
2393 const_iv (GL_LINE_LOOP), 2719 const_iv (GL_LINE_LOOP),
2394 const_iv (GL_QUADS), 2720 const_iv (GL_QUADS),
2395 const_iv (GL_QUAD_STRIP), 2721 const_iv (GL_QUAD_STRIP),
2396 const_iv (GL_TRIANGLES), 2722 const_iv (GL_TRIANGLES),
2397 const_iv (GL_TRIANGLE_STRIP), 2723 const_iv (GL_TRIANGLE_STRIP),
2398 const_iv (GL_TRIANGLE_FAN), 2724 const_iv (GL_TRIANGLE_FAN),
2725 const_iv (GL_POLYGON),
2399 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2726 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400 const_iv (GL_POINT_SMOOTH_HINT), 2727 const_iv (GL_POINT_SMOOTH_HINT),
2401 const_iv (GL_LINE_SMOOTH_HINT), 2728 const_iv (GL_LINE_SMOOTH_HINT),
2402 const_iv (GL_POLYGON_SMOOTH_HINT), 2729 const_iv (GL_POLYGON_SMOOTH_HINT),
2403 const_iv (GL_GENERATE_MIPMAP_HINT), 2730 const_iv (GL_GENERATE_MIPMAP_HINT),
2731 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2404 const_iv (GL_FASTEST), 2732 const_iv (GL_FASTEST),
2405 const_iv (GL_DONT_CARE), 2733 const_iv (GL_DONT_CARE),
2406 const_iv (GL_NICEST), 2734 const_iv (GL_NICEST),
2407 const_iv (GL_V2F), 2735 const_iv (GL_V2F),
2408 const_iv (GL_V3F), 2736 const_iv (GL_V3F),
2416 2744
2417 texture_av = newAV (); 2745 texture_av = newAV ();
2418 AvREAL_off (texture_av); 2746 AvREAL_off (texture_av);
2419} 2747}
2420 2748
2749void
2750disable_GL_EXT_blend_func_separate ()
2751 CODE:
2752 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0;
2754
2421char * 2755char *
2422gl_vendor () 2756gl_vendor ()
2423 CODE: 2757 CODE:
2424 RETVAL = (char *)glGetString (GL_VENDOR); 2758 RETVAL = (char *)glGetString (GL_VENDOR);
2425 OUTPUT: 2759 OUTPUT:
2497# near_ and far_ are due to microsofts buggy "c" compiler 2831# near_ and far_ are due to microsofts buggy "c" compiler
2498void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2832void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2499 2833
2500# near_ and far_ are due to microsofts buggy "c" compiler 2834# near_ and far_ are due to microsofts buggy "c" compiler
2501void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2835void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2836
2837PROTOTYPES: DISABLE
2502 2838
2503void glViewport (int x, int y, int width, int height) 2839void glViewport (int x, int y, int width, int height)
2504 2840
2505void glScissor (int x, int y, int width, int height) 2841void glScissor (int x, int y, int width, int height)
2506 2842
2514 2850
2515void glRotate (float angle, float x, float y, float z) 2851void glRotate (float angle, float x, float y, float z)
2516 CODE: 2852 CODE:
2517 glRotatef (angle, x, y, z); 2853 glRotatef (angle, x, y, z);
2518 2854
2519void glBegin (int mode)
2520
2521void glEnd ()
2522
2523void glColor (float r, float g, float b, float a = 1.0) 2855void glColor (float r, float g, float b, float a = 1.0)
2524 PROTOTYPE: @
2525 ALIAS: 2856 ALIAS:
2526 glColor_premultiply = 1 2857 glColor_premultiply = 1
2527 CODE: 2858 CODE:
2528 if (ix) 2859 if (ix)
2529 { 2860 {
2532 b *= a; 2863 b *= a;
2533 } 2864 }
2534 // microsoft visual "c" rounds instead of truncating... 2865 // microsoft visual "c" rounds instead of truncating...
2535 glColor4f (r, g, b, a); 2866 glColor4f (r, g, b, a);
2536 2867
2537void glInterleavedArrays (int format, int stride, char *data)
2538
2539void glDrawElements (int mode, int count, int type, char *indices)
2540
2541# 1.2 void glDrawRangeElements (int mode, int start, int end
2542
2543void glRasterPos (float x, float y, float z = 0.) 2868void glRasterPos (float x, float y, float z = 0.)
2544 CODE: 2869 CODE:
2545 glRasterPos3f (0, 0, z); 2870 glRasterPos3f (0, 0, z);
2546 glBitmap (0, 0, 0, 0, x, y, 0); 2871 glBitmap (0, 0, 0, 0, x, y, 0);
2547 2872
2551 2876
2552void glTexCoord (float s, float t) 2877void glTexCoord (float s, float t)
2553 CODE: 2878 CODE:
2554 glTexCoord2f (s, t); 2879 glTexCoord2f (s, t);
2555 2880
2881void glRect (float x1, float y1, float x2, float y2)
2882 CODE:
2883 glRectf (x1, y1, x2, y2);
2884
2885void glRect_lineloop (float x1, float y1, float x2, float y2)
2886 CODE:
2887 glBegin (GL_LINE_LOOP);
2888 glVertex2f (x1, y1);
2889 glVertex2f (x2, y1);
2890 glVertex2f (x2, y2);
2891 glVertex2f (x1, y2);
2892 glEnd ();
2893
2894PROTOTYPES: ENABLE
2895
2896void glBegin (int mode)
2897
2898void glEnd ()
2899
2900void glPointSize (GLfloat size)
2901
2902void glLineWidth (GLfloat width)
2903
2904void glInterleavedArrays (int format, int stride, char *data)
2905
2906void glDrawElements (int mode, int count, int type, char *indices)
2907
2908# 1.2 void glDrawRangeElements (int mode, int start, int end
2909
2556void glTexEnv (int target, int pname, float param) 2910void glTexEnv (int target, int pname, float param)
2557 CODE: 2911 CODE:
2558 glTexEnvf (target, pname, param); 2912 glTexEnvf (target, pname, param);
2559 2913
2560void glTexParameter (int target, int pname, float param) 2914void glTexParameter (int target, int pname, float param)
2576void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2930void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2577 CODE: 2931 CODE:
2578 if (gl.SeparableFilter2D) 2932 if (gl.SeparableFilter2D)
2579 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2933 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2580 2934
2581void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2935void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2582 2936
2583void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2937void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2584 2938
2585void glDrawPixels (int width, int height, int format, int type, char *pixels) 2939void glDrawPixels (int width, int height, int format, int type, char *pixels)
2586 2940
2612 2966
2613void glEndList () 2967void glEndList ()
2614 2968
2615void glCallList (int list) 2969void glCallList (int list)
2616 2970
2617MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2618 2972
2619PROTOTYPES: DISABLE 2973PROTOTYPES: DISABLE
2620 2974
2621void 2975void
2622find_widget (SV *widget, NV x, NV y) 2976find_widget (SV *self, NV x, NV y)
2623 PPCODE: 2977 PPCODE:
2624{ 2978{
2625 if (within_widget (widget, x, y)) 2979 if (within_widget (self, x, y))
2626 XPUSHs (widget); 2980 XPUSHs (self);
2627} 2981}
2628 2982
2983BOOT:
2984{
2985 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2986
2987 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2988 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2989 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2990 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2991}
2992
2993void
2994draw (SV *self)
2995 CODE:
2996{
2997 HV *hv;
2998 SV **svp;
2999 NV x, y, w, h;
3000 SV *draw_x_sv = GvSV (draw_x_gv);
3001 SV *draw_y_sv = GvSV (draw_y_gv);
3002 SV *draw_w_sv = GvSV (draw_w_gv);
3003 SV *draw_h_sv = GvSV (draw_h_gv);
3004 double draw_x, draw_y;
3005
3006 if (!SvROK (self))
3007 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3008
3009 hv = (HV *)SvRV (self);
3010
3011 if (SvTYPE (hv) != SVt_PVHV)
3012 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3013
3014 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3015 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3016
3017 if (!h || !w)
3018 XSRETURN_EMPTY;
3019
3020 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3021 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3022
3023 draw_x = SvNV (draw_x_sv) + x;
3024 draw_y = SvNV (draw_y_sv) + y;
3025
3026 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3027 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3028 XSRETURN_EMPTY;
3029
3030 sv_setnv (draw_x_sv, draw_x);
3031 sv_setnv (draw_y_sv, draw_y);
3032
3033 glPushMatrix ();
3034 glTranslated (x, y, 0);
3035
3036 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3037 {
3038 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3039
3040 if (svp && SvTRUE (*svp))
3041 {
3042 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3043 glEnable (GL_BLEND);
3044 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3045 glBegin (GL_QUADS);
3046 glVertex2f (0, 0);
3047 glVertex2f (w, 0);
3048 glVertex2f (w, h);
3049 glVertex2f (0, h);
3050 glEnd ();
3051 glDisable (GL_BLEND);
3052 }
3053 }
3054#if 0
3055 // draw borders, for debugging
3056 glPushMatrix ();
3057 glColor4f (1., 1., 0., 1.);
3058 glTranslatef (.5, .5, 0.);
3059 glBegin (GL_LINE_LOOP);
3060 glVertex2f (0 , 0);
3061 glVertex2f (w - 1, 0);
3062 glVertex2f (w - 1, h - 1);
3063 glVertex2f (0 , h - 1);
3064 glEnd ();
3065 glPopMatrix ();
3066#endif
3067 PUSHMARK (SP);
3068 XPUSHs (self);
3069 PUTBACK;
3070 call_method ("_draw", G_VOID | G_DISCARD);
3071 SPAGAIN;
3072
3073 glPopMatrix ();
3074
3075 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3076 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3077}
3078

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines