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.203 by root, Thu Jul 19 13:45:16 2007 UTC vs.
Revision 1.258 by root, Thu Apr 10 14:35:50 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>
56#define MAP_EXTEND_X 32 74#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 75#define MAP_EXTEND_Y 512
58 76
59#define MIN_FONT_HEIGHT 10 77#define MIN_FONT_HEIGHT 10
60 78
79/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
61#if 0 82#if 0
62# define PARACHUTE SDL_INIT_NOPARACHUTE 83# define PARACHUTE SDL_INIT_NOPARACHUTE
63#else 84#else
64# define PARACHUTE 0 85# define PARACHUTE 0
65#endif 86#endif
107 av_push (texture_av, (SV *)(size_t)name); 128 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 129 glDeleteTextures (1, &name);
109} 130}
110 131
111#include "texcache.c" 132#include "texcache.c"
133#include "rendercache.c"
112 134
113#include "pango-font.c" 135#include "pango-font.c"
114#include "pango-fontmap.c" 136#include "pango-fontmap.c"
115#include "pango-render.c" 137#include "pango-render.c"
116 138
139typedef IV DC__Channel;
140typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 141typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 142typedef Mix_Music *DC__MixMusic;
119 143
120typedef PangoFontDescription *CFPlus__Font; 144typedef PangoFontDescription *DC__Font;
121 145
122static int 146static int
123shape_attr_p (PangoLayoutRun *run) 147shape_attr_p (PangoLayoutRun *run)
124{ 148{
125 GSList *attrs = run->item->analysis.extra_attrs; 149 GSList *attrs = run->item->analysis.extra_attrs;
139 163
140typedef struct cf_layout { 164typedef struct cf_layout {
141 PangoLayout *pl; 165 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 166 float r, g, b, a; // default color for rgba mode
143 int base_height; 167 int base_height;
144 CFPlus__Font font; 168 DC__Font font;
169 rc_t *rc;
145} *CFPlus__Layout; 170} *DC__Layout;
146 171
147static CFPlus__Font default_font; 172static DC__Font default_font;
148static PangoContext *opengl_context; 173static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 174static PangoFontMap *opengl_fontmap;
150 175
151static void 176static void
152substitute_func (FcPattern *pattern, gpointer data) 177substitute_func (FcPattern *pattern, gpointer data)
157#endif 182#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 183 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 184}
160 185
161static void 186static void
162layout_update_font (CFPlus__Layout self) 187layout_update_font (DC__Layout self)
163{ 188{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 189 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 190 * reasonably well with dejavu/bistream fonts
166 */ 191 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
168 193
169 pango_font_description_set_absolute_size (font, 194 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 196
172 pango_layout_set_font_description (self->pl, font); 197 pango_layout_set_font_description (self->pl, font);
173} 198}
174 199
175static void 200static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 201layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 202{
178 PangoRectangle rect; 203 PangoRectangle rect;
179 204
180 // get_pixel_* wrongly rounds down 205 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 206 pango_layout_get_extents (self->pl, 0, &rect);
192 217
193typedef uint16_t tileid; 218typedef uint16_t tileid;
194typedef uint16_t faceid; 219typedef uint16_t faceid;
195 220
196typedef struct { 221typedef struct {
197 int name; 222 GLuint name;
198 int w, h; 223 int w, h;
199 float s, t; 224 float s, t;
200 uint8_t r, g, b, a; 225 uint8_t r, g, b, a;
201 tileid smoothtile; 226 tileid smoothtile;
202 uint8_t smoothlevel; 227 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 245 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 246 int texs; maptex *tex; // [tileid]
222 247
223 int32_t rows; 248 int32_t rows;
224 maprow *row; 249 maprow *row;
225} *CFPlus__Map; 250} *DC__Map;
226 251
227static char * 252static char *
228prepend (char *ptr, int sze, int inc) 253prepend (char *ptr, int sze, int inc)
229{ 254{
230 char *p; 255 char *p;
268 self->texs *= 2; 293 self->texs *= 2;
269 } 294 }
270} 295}
271 296
272static maprow * 297static maprow *
273map_get_row (CFPlus__Map self, int y) 298map_get_row (DC__Map self, int y)
274{ 299{
275 if (0 > y) 300 if (0 > y)
276 { 301 {
277 int extend = - y + MAP_EXTEND_Y; 302 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 303 Prepend (maprow, self->row, self->rows, extend);
316 341
317 return row->col + (x - row->c0); 342 return row->col + (x - row->c0);
318} 343}
319 344
320static mapcell * 345static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 346map_get_cell (DC__Map self, int x, int y)
322{ 347{
323 return row_get_cell (map_get_row (self, y), x); 348 return row_get_cell (map_get_row (self, y), x);
324} 349}
325 350
326static void 351static void
327map_clear (CFPlus__Map self) 352map_clear (DC__Map self)
328{ 353{
329 int r; 354 int r;
330 355
331 for (r = 0; r < self->rows; r++) 356 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 357 Safefree (self->row[r].col);
340 self->row = 0; 365 self->row = 0;
341 self->rows = 0; 366 self->rows = 0;
342} 367}
343 368
344static void 369static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 370map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 371{
347 int x, y; 372 int x, y;
348 maprow *row; 373 maprow *row;
349 mapcell *cell; 374 mapcell *cell;
350 375
429 n |= n >> 16; 454 n |= n >> 16;
430 455
431 return n + 1; 456 return n + 1;
432} 457}
433 458
459static unsigned int
460popcount (unsigned int n)
461{
462 n -= (n >> 1) & 0x55555555U;
463 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
464 n = ((n >> 4) + n) & 0x0f0f0f0fU;
465 n *= 0x01010101U;
466
467 return n >> 24;
468}
469
434/* SDL should provide this, really. */ 470/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 471#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 472#define SDLK_MODIFIER_MAX 314
437 473
438MODULE = CFPlus PACKAGE = CFPlus 474/******************************************************************************/
475
476static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
477static GV *hover_gv;
478
479static int
480within_widget (SV *widget, NV x, NV y)
481{
482 HV *self;
483 SV **svp;
484 NV wx, ww, wy, wh;
485
486 if (!SvROK (widget))
487 return 0;
488
489 self = (HV *)SvRV (widget);
490
491 if (SvTYPE (self) != SVt_PVHV)
492 return 0;
493
494 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
495 if (y < wy)
496 return 0;
497
498 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
499 if (y >= wy + wh)
500 return 0;
501
502 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
503 if (x < wx)
504 return 0;
505
506 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
507 if (x >= wx + ww)
508 return 0;
509
510 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
511 if (!svp || !SvTRUE (*svp))
512 return 0;
513
514 return 1;
515}
516
517MODULE = Deliantra::Client PACKAGE = DC
439 518
440PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
441 520
442BOOT: 521BOOT:
443{ 522{
444 HV *stash = gv_stashpv ("CFPlus", 1); 523 HV *stash = gv_stashpv ("DC", 1);
445 static const struct { 524 static const struct {
446 const char *name; 525 const char *name;
447 IV iv; 526 IV iv;
448 } *civ, const_iv[] = { 527 } *civ, const_iv[] = {
449# define const_iv(name) { # name, (IV)name } 528# define const_iv(name) { # name, (IV)name }
471 550
472 const_iv (SDL_APPINPUTFOCUS), 551 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS), 552 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE), 553 const_iv (SDL_APPACTIVE),
475 554
555 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST),
476 const_iv (SDLK_KP0), 557 const_iv (SDLK_KP0),
477 const_iv (SDLK_KP1), 558 const_iv (SDLK_KP1),
478 const_iv (SDLK_KP2), 559 const_iv (SDLK_KP2),
479 const_iv (SDLK_KP3), 560 const_iv (SDLK_KP3),
480 const_iv (SDLK_KP4), 561 const_iv (SDLK_KP4),
552 const_iv (KMOD_LMETA), 633 const_iv (KMOD_LMETA),
553 const_iv (KMOD_RMETA), 634 const_iv (KMOD_RMETA),
554 const_iv (KMOD_NUM), 635 const_iv (KMOD_NUM),
555 const_iv (KMOD_CAPS), 636 const_iv (KMOD_CAPS),
556 const_iv (KMOD_MODE), 637 const_iv (KMOD_MODE),
638
639 const_iv (MIX_DEFAULT_FORMAT),
557# undef const_iv 640# undef const_iv
558 }; 641 };
559 642
560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
579 662
580NV floor (NV x) 663NV floor (NV x)
581 664
582NV ceil (NV x) 665NV ceil (NV x)
583 666
667IV minpot (UV n)
668
669IV popcount (UV n)
670
584void 671void
585pango_init () 672pango_init ()
586 CODE: 673 CODE:
587{ 674{
588 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
678 /*pango_context_set_font_description (opengl_context, default_font);*/
679#if PANGO_VERSION_CHECK (1, 15, 2)
680 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif
591} 683}
592 684
593char * 685char *
594SDL_GetError () 686SDL_GetError ()
595 687
627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
628 720
629 if (m && m != (SDL_Rect **)-1) 721 if (m && m != (SDL_Rect **)-1)
630 while (*m) 722 while (*m)
631 { 723 {
632 if ((*m)->w >= 640 && (*m)->h >= 480) 724 if ((*m)->w >= 800 && (*m)->h >= 480)
633 { 725 {
634 AV *av = newAV (); 726 AV *av = newAV ();
635 av_push (av, newSViv ((*m)->w)); 727 av_push (av, newSViv ((*m)->w));
636 av_push (av, newSViv ((*m)->h)); 728 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb)); 729 av_push (av, newSViv (rgb));
661 753
662 if (RETVAL) 754 if (RETVAL)
663 { 755 {
664 av_clear (texture_av); 756 av_clear (texture_av);
665 757
666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
668#include "glfunc.h" 760#include "glfunc.h"
669#undef GL_FUNC 761#undef GL_FUNC
670 } 762 }
671} 763}
678char * 770char *
679SDL_GetKeyName (int sym) 771SDL_GetKeyName (int sym)
680 772
681int 773int
682SDL_GetAppState () 774SDL_GetAppState ()
775
776int
777SDL_GetModState ()
683 778
684void 779void
685poll_events () 780poll_events ()
686 PPCODE: 781 PPCODE:
687{ 782{
697 { 792 {
698 case SDL_KEYDOWN: 793 case SDL_KEYDOWN:
699 case SDL_KEYUP: 794 case SDL_KEYUP:
700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
705 break; 800 break;
706 801
707 case SDL_ACTIVEEVENT: 802 case SDL_ACTIVEEVENT:
708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
726 x = ev.motion.x; 821 x = ev.motion.x;
727 y = ev.motion.y; 822 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 } 824 }
730 825
731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
732 hv_store (hv, "state", 5, newSViv (state), 0); 827 hv_store (hv, "state", 5, newSViv (state), 0);
733 hv_store (hv, "x", 1, newSViv (x), 0); 828 hv_store (hv, "x", 1, newSViv (x), 0);
734 hv_store (hv, "y", 1, newSViv (y), 0); 829 hv_store (hv, "y", 1, newSViv (y), 0);
735 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 830 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
736 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 831 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 } 832 }
738 break; 833 break;
739 834
740 case SDL_MOUSEBUTTONDOWN: 835 case SDL_MOUSEBUTTONDOWN:
741 case SDL_MOUSEBUTTONUP: 836 case SDL_MOUSEBUTTONUP:
742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 837 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
743 838
744 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 839 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
745 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 840 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
746 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 841 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
747 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 842 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 847 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 848 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
754 break; 849 break;
755 } 850 }
756 851
757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 852 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
758 } 853 }
759} 854}
760 855
761int 856int
762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 857Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
763 POSTCALL: 858 POSTCALL:
764 Mix_HookMusicFinished (music_finished); 859 Mix_HookMusicFinished (music_finished);
765 Mix_ChannelFinished (channel_finished); 860 Mix_ChannelFinished (channel_finished);
766 861
767void 862void
863Mix_QuerySpec ()
864 PPCODE:
865{
866 int freq, channels;
867 Uint16 format;
868
869 if (Mix_QuerySpec (&freq, &format, &channels))
870 {
871 EXTEND (SP, 3);
872 PUSHs (sv_2mortal (newSViv (freq)));
873 PUSHs (sv_2mortal (newSViv (format)));
874 PUSHs (sv_2mortal (newSViv (channels)));
875 }
876}
877
878void
768Mix_CloseAudio () 879Mix_CloseAudio ()
769 880
770int 881int
771Mix_AllocateChannels (int numchans = -1) 882Mix_AllocateChannels (int numchans = -1)
883
884const char *
885Mix_GetError ()
772 886
773void 887void
774lowdelay (int fd, int val = 1) 888lowdelay (int fd, int val = 1)
775 CODE: 889 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 890 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
802 } 916 }
803 } 917 }
804#endif 918#endif
805} 919}
806 920
807void 921int
808add_font (char *file) 922add_font (char *file)
809 CODE: 923 CODE:
810 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT:
926 RETVAL
811 927
812void 928void
813load_image_inline (SV *image_) 929load_image_inline (SV *image_)
814 ALIAS: 930 ALIAS:
815 load_image_file = 1 931 load_image_file = 1
818 STRLEN image_len; 934 STRLEN image_len;
819 char *image = (char *)SvPVbyte (image_, image_len); 935 char *image = (char *)SvPVbyte (image_, image_len);
820 SDL_Surface *surface, *surface2; 936 SDL_Surface *surface, *surface2;
821 SDL_PixelFormat fmt; 937 SDL_PixelFormat fmt;
822 SDL_RWops *rw = ix 938 SDL_RWops *rw = ix
823 ? SDL_RWFromFile (image, "r") 939 ? SDL_RWFromFile (image, "rb")
824 : SDL_RWFromConstMem (image, image_len); 940 : SDL_RWFromConstMem (image, image_len);
825 941
826 if (!rw) 942 if (!rw)
827 croak ("load_image: %s", SDL_GetError ()); 943 croak ("load_image: %s", SDL_GetError ());
828 944
901void 1017void
902error (char *message) 1018error (char *message)
903 CODE: 1019 CODE:
904 fprintf (stderr, "ERROR: %s\n", message); 1020 fprintf (stderr, "ERROR: %s\n", message);
905#ifdef _WIN32 1021#ifdef _WIN32
906 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1022 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
907#endif 1023#endif
908 1024
909void 1025void
910fatal (char *message) 1026fatal (char *message)
911 CODE: 1027 CODE:
912 fprintf (stderr, "FATAL: %s\n", message); 1028 fprintf (stderr, "FATAL: %s\n", message);
913#ifdef _WIN32 1029#ifdef _WIN32
914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1030 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
915#endif 1031#endif
916 _exit (1); 1032 _exit (1);
917 1033
918void 1034void
919_exit (int retval = 0) 1035_exit (int retval = 0)
931#if DEBUG 1047#if DEBUG
932 VALGRIND_DO_LEAK_CHECK; 1048 VALGRIND_DO_LEAK_CHECK;
933#endif 1049#endif
934} 1050}
935 1051
936MODULE = CFPlus PACKAGE = CFPlus::Font 1052MODULE = Deliantra::Client PACKAGE = DC::Font
937 1053
938CFPlus::Font 1054PROTOTYPES: DISABLE
1055
1056DC::Font
939new_from_file (SV *class, char *path, int id = 0) 1057new_from_file (SV *class, char *path, int id = 0)
940 CODE: 1058 CODE:
941{ 1059{
942 int count; 1060 int count;
943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
946} 1064}
947 OUTPUT: 1065 OUTPUT:
948 RETVAL 1066 RETVAL
949 1067
950void 1068void
951DESTROY (CFPlus::Font self) 1069DESTROY (DC::Font self)
952 CODE: 1070 CODE:
953 pango_font_description_free (self); 1071 pango_font_description_free (self);
954 1072
955void 1073void
956make_default (CFPlus::Font self) 1074make_default (DC::Font self)
1075 PROTOTYPE: $
957 CODE: 1076 CODE:
958 default_font = self; 1077 default_font = self;
959 1078
960MODULE = CFPlus PACKAGE = CFPlus::Layout 1079MODULE = Deliantra::Client PACKAGE = DC::Layout
961 1080
1081PROTOTYPES: DISABLE
1082
962void 1083void
963reset_glyph_cache () 1084glyph_cache_backup ()
1085 PROTOTYPE:
964 CODE: 1086 CODE:
1087 tc_backup ();
1088
1089void
1090glyph_cache_restore ()
1091 PROTOTYPE:
1092 CODE:
965 tc_clear (); 1093 tc_restore ();
966 1094
967CFPlus::Layout 1095DC::Layout
968new (SV *class) 1096new (SV *class)
969 CODE: 1097 CODE:
970 New (0, RETVAL, 1, struct cf_layout); 1098 New (0, RETVAL, 1, struct cf_layout);
971 1099
972 RETVAL->pl = pango_layout_new (opengl_context); 1100 RETVAL->pl = pango_layout_new (opengl_context);
974 RETVAL->g = 1.; 1102 RETVAL->g = 1.;
975 RETVAL->b = 1.; 1103 RETVAL->b = 1.;
976 RETVAL->a = 1.; 1104 RETVAL->a = 1.;
977 RETVAL->base_height = MIN_FONT_HEIGHT; 1105 RETVAL->base_height = MIN_FONT_HEIGHT;
978 RETVAL->font = 0; 1106 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
979 1108
980 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
981 layout_update_font (RETVAL); 1110 layout_update_font (RETVAL);
982 OUTPUT: 1111 OUTPUT:
983 RETVAL 1112 RETVAL
984 1113
985void 1114void
986DESTROY (CFPlus::Layout self) 1115DESTROY (DC::Layout self)
987 CODE: 1116 CODE:
988 g_object_unref (self->pl); 1117 g_object_unref (self->pl);
1118 rc_free (self->rc);
989 Safefree (self); 1119 Safefree (self);
990 1120
991void 1121void
992set_text (CFPlus::Layout self, SV *text_) 1122set_text (DC::Layout self, SV *text_)
993 CODE: 1123 CODE:
994{ 1124{
995 STRLEN textlen; 1125 STRLEN textlen;
996 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
997 1127
998 pango_layout_set_text (self->pl, text, textlen); 1128 pango_layout_set_text (self->pl, text, textlen);
999} 1129}
1000 1130
1001void 1131void
1002set_markup (CFPlus::Layout self, SV *text_) 1132set_markup (DC::Layout self, SV *text_)
1003 CODE: 1133 CODE:
1004{ 1134{
1005 STRLEN textlen; 1135 STRLEN textlen;
1006 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1007 1137
1008 pango_layout_set_markup (self->pl, text, textlen); 1138 pango_layout_set_markup (self->pl, text, textlen);
1009} 1139}
1010 1140
1011void 1141void
1012set_shapes (CFPlus::Layout self, ...) 1142set_shapes (DC::Layout self, ...)
1013 CODE: 1143 CODE:
1014{ 1144{
1015 PangoAttrList *attrs = 0; 1145 PangoAttrList *attrs = 0;
1016 const char *text = pango_layout_get_text (self->pl); 1146 const char *text = pango_layout_get_text (self->pl);
1017 const char *pos = text; 1147 const char *pos = text;
1052 if (attrs) 1182 if (attrs)
1053 pango_layout_set_attributes (self->pl, attrs); 1183 pango_layout_set_attributes (self->pl, attrs);
1054} 1184}
1055 1185
1056void 1186void
1057get_shapes (CFPlus::Layout self) 1187get_shapes (DC::Layout self)
1058 PPCODE: 1188 PPCODE:
1059{ 1189{
1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1190 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1061 1191
1062 do 1192 do
1063 { 1193 {
1064 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1194 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1065 1195
1066 if (run && shape_attr_p (run)) 1196 if (run && shape_attr_p (run))
1067 { 1197 {
1068 PangoRectangle extents; 1198 PangoRectangle extents;
1069 pango_layout_iter_get_run_extents (iter, 0, &extents); 1199 pango_layout_iter_get_run_extents (iter, 0, &extents);
1077 1207
1078 pango_layout_iter_free (iter); 1208 pango_layout_iter_free (iter);
1079} 1209}
1080 1210
1081int 1211int
1082has_wrapped (CFPlus::Layout self) 1212has_wrapped (DC::Layout self)
1083 CODE: 1213 CODE:
1084{ 1214{
1085 int lines = 1; 1215 int lines = 1;
1086 const char *text = pango_layout_get_text (self->pl); 1216 const char *text = pango_layout_get_text (self->pl);
1087 1217
1092} 1222}
1093 OUTPUT: 1223 OUTPUT:
1094 RETVAL 1224 RETVAL
1095 1225
1096SV * 1226SV *
1097get_text (CFPlus::Layout self) 1227get_text (DC::Layout self)
1098 CODE: 1228 CODE:
1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1229 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1100 sv_utf8_decode (RETVAL); 1230 sv_utf8_decode (RETVAL);
1101 OUTPUT: 1231 OUTPUT:
1102 RETVAL 1232 RETVAL
1103 1233
1104void 1234void
1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1235set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1106 CODE: 1236 CODE:
1107 self->r = r; 1237 self->r = r;
1108 self->g = g; 1238 self->g = g;
1109 self->b = b; 1239 self->b = b;
1110 self->a = a; 1240 self->a = a;
1111 1241
1112void 1242void
1113set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1243set_font (DC::Layout self, DC::Font font = 0)
1114 CODE: 1244 CODE:
1115 if (self->font != font) 1245 if (self->font != font)
1116 { 1246 {
1117 self->font = font; 1247 self->font = font;
1118 layout_update_font (self); 1248 layout_update_font (self);
1119 } 1249 }
1120 1250
1121void 1251void
1122set_height (CFPlus::Layout self, int base_height) 1252set_height (DC::Layout self, int base_height)
1123 CODE: 1253 CODE:
1124 if (self->base_height != base_height) 1254 if (self->base_height != base_height)
1125 { 1255 {
1126 self->base_height = base_height; 1256 self->base_height = base_height;
1127 layout_update_font (self); 1257 layout_update_font (self);
1128 } 1258 }
1129 1259
1130void 1260void
1131set_width (CFPlus::Layout self, int max_width = -1) 1261set_width (DC::Layout self, int max_width = -1)
1132 CODE: 1262 CODE:
1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1263 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1134 1264
1135void 1265void
1136set_indent (CFPlus::Layout self, int indent) 1266set_indent (DC::Layout self, int indent)
1137 CODE: 1267 CODE:
1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1268 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1139 1269
1140void 1270void
1141set_spacing (CFPlus::Layout self, int spacing) 1271set_spacing (DC::Layout self, int spacing)
1142 CODE: 1272 CODE:
1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1273 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1144 1274
1145void 1275void
1146set_ellipsise (CFPlus::Layout self, int ellipsise) 1276set_ellipsise (DC::Layout self, int ellipsise)
1147 CODE: 1277 CODE:
1148 pango_layout_set_ellipsize (self->pl, 1278 pango_layout_set_ellipsize (self->pl,
1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1279 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1280 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1281 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1152 : PANGO_ELLIPSIZE_NONE 1282 : PANGO_ELLIPSIZE_NONE
1153 ); 1283 );
1154 1284
1155void 1285void
1156set_single_paragraph_mode (CFPlus::Layout self, int spm) 1286set_single_paragraph_mode (DC::Layout self, int spm)
1157 CODE: 1287 CODE:
1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1288 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1159 1289
1160void 1290void
1161size (CFPlus::Layout self) 1291size (DC::Layout self)
1162 PPCODE: 1292 PPCODE:
1163{ 1293{
1164 int w, h; 1294 int w, h;
1165 1295
1166 layout_get_pixel_size (self, &w, &h); 1296 layout_get_pixel_size (self, &w, &h);
1169 PUSHs (sv_2mortal (newSViv (w))); 1299 PUSHs (sv_2mortal (newSViv (w)));
1170 PUSHs (sv_2mortal (newSViv (h))); 1300 PUSHs (sv_2mortal (newSViv (h)));
1171} 1301}
1172 1302
1173int 1303int
1174descent (CFPlus::Layout self) 1304descent (DC::Layout self)
1175 CODE: 1305 CODE:
1176{ 1306{
1177 PangoRectangle rect; 1307 PangoRectangle rect;
1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1308 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1179 pango_layout_line_get_pixel_extents (line, 0, &rect); 1309 pango_layout_line_get_pixel_extents (line, 0, &rect);
1180 RETVAL = PANGO_DESCENT (rect); 1310 RETVAL = PANGO_DESCENT (rect);
1181} 1311}
1182 OUTPUT: 1312 OUTPUT:
1183 RETVAL 1313 RETVAL
1184 1314
1185int 1315int
1186xy_to_index (CFPlus::Layout self, int x, int y) 1316xy_to_index (DC::Layout self, int x, int y)
1187 CODE: 1317 CODE:
1188{ 1318{
1189 int index, trailing; 1319 int index, trailing;
1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1320 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1191 RETVAL = index + trailing; 1321 RETVAL = index + trailing;
1192} 1322}
1193 OUTPUT: 1323 OUTPUT:
1194 RETVAL 1324 RETVAL
1195 1325
1196void 1326void
1197cursor_pos (CFPlus::Layout self, int index) 1327cursor_pos (DC::Layout self, int index)
1198 PPCODE: 1328 PPCODE:
1199{ 1329{
1200 PangoRectangle strong_pos; 1330 PangoRectangle pos;
1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1331 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1202 1332
1203 EXTEND (SP, 3); 1333 EXTEND (SP, 3);
1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1334 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1335 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1336 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1207} 1337}
1208 1338
1209void 1339void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1340index_to_line_x (DC::Layout self, int index, int trailing = 0)
1211 PPCODE: 1341 PPCODE:
1212{ 1342{
1213 int line, x; 1343 int line, x;
1214 1344
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1345 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1346#if !PANGO_VERSION_CHECK (1, 17, 3)
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1347 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217 1348 --line;
1349#endif
1218 EXTEND (SP, 2); 1350 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1))); 1351 PUSHs (sv_2mortal (newSViv (line)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1352 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221} 1353}
1222 1354
1223void 1355void
1224line_x_to_index (CFPlus::Layout self, int line, int x) 1356line_x_to_index (DC::Layout self, int line, int x)
1225 PPCODE: 1357 PPCODE:
1226{ 1358{
1227 PangoLayoutLine *lp; 1359 PangoLayoutLine *lp;
1228 int index, trailing; 1360 int index, trailing;
1229 1361
1230 if (line < 0) 1362 if (line < 0)
1231 XSRETURN_EMPTY; 1363 XSRETURN_EMPTY;
1232 1364
1233 if (!(lp = pango_layout_get_line (self->pl, line))) 1365 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */ 1366 XSRETURN_EMPTY; /* do better */
1235 1367
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1368 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237 1369
1238 EXTEND (SP, 2); 1370 EXTEND (SP, 2);
1244 PUSHs (sv_2mortal (newSViv (trailing))); 1376 PUSHs (sv_2mortal (newSViv (trailing)));
1245 } 1377 }
1246} 1378}
1247 1379
1248void 1380void
1249render (CFPlus::Layout self, float x, float y, int flags = 0) 1381render (DC::Layout self, float x, float y, int flags = 0)
1250 PPCODE: 1382 CODE:
1383 rc_clear (self->rc);
1251 pango_opengl_render_layout_subpixel ( 1384 pango_opengl_render_layout_subpixel (
1252 self->pl, 1385 self->pl,
1386 self->rc,
1253 x * PANGO_SCALE, y * PANGO_SCALE, 1387 x * PANGO_SCALE, y * PANGO_SCALE,
1254 self->r, self->g, self->b, self->a, 1388 self->r, self->g, self->b, self->a,
1255 flags 1389 flags
1256 ); 1390 );
1391 // we assume that context_change actually clears/frees stuff
1392 // and does not do any recomputation...
1393 pango_layout_context_changed (self->pl);
1257 1394
1258MODULE = CFPlus PACKAGE = CFPlus::Texture 1395void
1396draw (DC::Layout self)
1397 CODE:
1398{
1399 glEnable (GL_TEXTURE_2D);
1400 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1401 glEnable (GL_BLEND);
1402 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1403 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_ALPHA_TEST);
1405 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1259 1406
1260int minpot (int n) 1407 rc_draw (self->rc);
1408
1409 glDisable (GL_ALPHA_TEST);
1410 glDisable (GL_BLEND);
1411 glDisable (GL_TEXTURE_2D);
1412}
1413
1414MODULE = Deliantra::Client PACKAGE = DC::Texture
1415
1416PROTOTYPES: ENABLE
1261 1417
1262void 1418void
1263pad (SV *data_, int ow, int oh, int nw, int nh) 1419pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE: 1420 CODE:
1265{ 1421{
1292 HV *hv = (HV *)SvRV (self); 1448 HV *hv = (HV *)SvRV (self);
1293 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1449 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1294 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1450 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1295 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1451 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1296 1452
1453 if (name <= 0)
1454 XSRETURN_EMPTY;
1455
1297 if (items < 5) 1456 if (items < 5)
1298 { 1457 {
1299 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1458 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1300 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1459 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1301 } 1460 }
1339 RETVAL = width > 0; 1498 RETVAL = width > 0;
1340} 1499}
1341 OUTPUT: 1500 OUTPUT:
1342 RETVAL 1501 RETVAL
1343 1502
1344MODULE = CFPlus PACKAGE = CFPlus::Map 1503MODULE = Deliantra::Client PACKAGE = DC::Map
1345 1504
1346CFPlus::Map 1505PROTOTYPES: DISABLE
1506
1507DC::Map
1347new (SV *class) 1508new (SV *class)
1348 CODE: 1509 CODE:
1349 New (0, RETVAL, 1, struct map); 1510 New (0, RETVAL, 1, struct map);
1350 RETVAL->x = 0; 1511 RETVAL->x = 0;
1351 RETVAL->y = 0; 1512 RETVAL->y = 0;
1359 RETVAL->row = 0; 1520 RETVAL->row = 0;
1360 OUTPUT: 1521 OUTPUT:
1361 RETVAL 1522 RETVAL
1362 1523
1363void 1524void
1364DESTROY (CFPlus::Map self) 1525DESTROY (DC::Map self)
1365 CODE: 1526 CODE:
1366{ 1527{
1367 map_clear (self); 1528 map_clear (self);
1368 Safefree (self->face2tile); 1529 Safefree (self->face2tile);
1369 Safefree (self->tex); 1530 Safefree (self->tex);
1370 Safefree (self); 1531 Safefree (self);
1371} 1532}
1372 1533
1373void 1534void
1374resize (CFPlus::Map self, int map_width, int map_height) 1535resize (DC::Map self, int map_width, int map_height)
1375 CODE: 1536 CODE:
1376 self->w = map_width; 1537 self->w = map_width;
1377 self->h = map_height; 1538 self->h = map_height;
1378 1539
1379void 1540void
1380clear (CFPlus::Map self) 1541clear (DC::Map self)
1381 CODE: 1542 CODE:
1382 map_clear (self); 1543 map_clear (self);
1383 1544
1384void 1545void
1385set_tileid (CFPlus::Map self, int face, int tile) 1546set_tileid (DC::Map self, int face, int tile)
1386 CODE: 1547 CODE:
1387{ 1548{
1388 need_facenum (self, face); self->face2tile [face] = tile; 1549 need_facenum (self, face); self->face2tile [face] = tile;
1389 need_texid (self, tile); 1550 need_texid (self, tile);
1390} 1551}
1391 1552
1392void 1553void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level) 1554set_smooth (DC::Map self, int face, int smooth, int level)
1394 CODE: 1555 CODE:
1395{ 1556{
1396 tileid texid; 1557 tileid texid;
1397 maptex *tex; 1558 maptex *tex;
1398 1559
1411 tex->smoothtile = self->face2tile [smooth]; 1572 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level; 1573 tex->smoothlevel = level;
1413} 1574}
1414 1575
1415void 1576void
1416set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1577set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1417 CODE: 1578 CODE:
1418{ 1579{
1419 need_texid (self, texid); 1580 need_texid (self, texid);
1420 1581
1421 { 1582 {
1441 // from transparent color bleeding and ugly wrapping effects. 1602 // from transparent color bleeding and ugly wrapping effects.
1442 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1443} 1604}
1444 1605
1445int 1606int
1446ox (CFPlus::Map self) 1607ox (DC::Map self)
1447 ALIAS: 1608 ALIAS:
1448 oy = 1 1609 oy = 1
1449 x = 2 1610 x = 2
1450 y = 3 1611 y = 3
1451 w = 4 1612 w = 4
1462 } 1623 }
1463 OUTPUT: 1624 OUTPUT:
1464 RETVAL 1625 RETVAL
1465 1626
1466void 1627void
1467scroll (CFPlus::Map self, int dx, int dy) 1628scroll (DC::Map self, int dx, int dy)
1468 CODE: 1629 CODE:
1469{ 1630{
1470 if (dx > 0) 1631 if (dx > 0)
1471 map_blank (self, self->x, self->y, dx, self->h); 1632 map_blank (self, self->x, self->y, dx, self->h);
1472 else if (dx < 0) 1633 else if (dx < 0)
1487 self->rows += MAP_EXTEND_Y; 1648 self->rows += MAP_EXTEND_Y;
1488 self->y += MAP_EXTEND_Y; 1649 self->y += MAP_EXTEND_Y;
1489 } 1650 }
1490} 1651}
1491 1652
1492void 1653SV *
1493map1a_update (CFPlus::Map self, SV *data_, int extmap) 1654map1a_update (DC::Map self, SV *data_, int extmap)
1494 CODE: 1655 CODE:
1495{ 1656{
1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1497 uint8_t *data_end = (uint8_t *)SvEND (data_); 1658 uint8_t *data_end = (uint8_t *)SvEND (data_);
1498 mapcell *cell; 1659 mapcell *cell;
1499 int x, y, flags; 1660 int x, y, z, flags;
1661 AV *missing = newAV ();
1662 RETVAL = newRV_noinc ((SV *)missing);
1500 1663
1501 while (data < data_end - 1) 1664 while (data < data_end - 1)
1502 { 1665 {
1503 flags = (data [0] << 8) + data [1]; data += 2; 1666 flags = (data [0] << 8) + data [1]; data += 2;
1504 1667
1555 } 1718 }
1556 else 1719 else
1557 cell->darkness = *data++ + 1; 1720 cell->darkness = *data++ + 1;
1558 } 1721 }
1559 1722
1723 for (z = 0; z <= 2; ++z)
1560 if (flags & 4) 1724 if (flags & (4 >> z))
1561 { 1725 {
1562 faceid face = (data [0] << 8) + data [1]; data += 2; 1726 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face); 1727 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face]; 1728 cell->tile [z] = self->face2tile [face];
1729
1730 if (cell->tile [z])
1731 {
1732 maptex *tex = self->tex + cell->tile [z];
1733 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z]));
1735
1736 if (tex->smoothtile)
1737 {
1738 maptex *smooth = self->tex + tex->smoothtile;
1739 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile));
1741 }
1742 }
1565 } 1743 }
1566
1567 if (flags & 2)
1568 {
1569 faceid face = (data [0] << 8) + data [1]; data += 2;
1570 need_facenum (self, face);
1571 cell->tile [1] = self->face2tile [face];
1572 }
1573
1574 if (flags & 1)
1575 {
1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [2] = self->face2tile [face];
1579 }
1580 } 1744 }
1581 else 1745 else
1582 cell->darkness = 0; 1746 cell->darkness = 0;
1583 } 1747 }
1584} 1748}
1749 OUTPUT:
1750 RETVAL
1585 1751
1586SV * 1752SV *
1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1753mapmap (DC::Map self, int x0, int y0, int w, int h)
1588 CODE: 1754 CODE:
1589{ 1755{
1590 int x1, x; 1756 int x1, x;
1591 int y1, y; 1757 int y1, y;
1592 int z; 1758 int z;
1637} 1803}
1638 OUTPUT: 1804 OUTPUT:
1639 RETVAL 1805 RETVAL
1640 1806
1641void 1807void
1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1808draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1643 CODE: 1809 CODE:
1644{ 1810{
1811 int x, y, z;
1812
1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1647 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1648 smooth_key skey; 1816 smooth_key skey;
1649 int x, y, z; 1817
1650 int last_name; 1818 rc_t *rc = rc_alloc ();
1819 rc_key_t key;
1820 rc_array_t *arr;
1651 1821
1652 // thats current max. sorry. 1822 // thats current max. sorry.
1653 if (sw > 255) sw = 255; 1823 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255; 1824 if (sh > 255) sh = 255;
1655 1825
1656 // clear key, in case of extra padding 1826 // clear key, in case of extra padding
1657 memset (&skey, 0, sizeof (skey)); 1827 memset (&skey, 0, sizeof (skey));
1658 1828
1659 glColor4ub (255, 255, 255, 255); 1829 memset (&key, 0, sizeof (key));
1660 1830 key.r = 255;
1661 glEnable (GL_BLEND); 1831 key.g = 255;
1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1832 key.b = 255;
1663 glEnable (GL_TEXTURE_2D); 1833 key.a = 255;
1664 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1834 key.mode = GL_QUADS;
1665 1835 key.format = GL_T2F_V3F;
1666 glBegin (GL_QUADS); 1836 key.texname = -1;
1667
1668 last_name = 0;
1669 1837
1670 mx += self->x; 1838 mx += self->x;
1671 my += self->y; 1839 my += self->y;
1672 1840
1673 // first pass: determine smooth_max 1841 // first pass: determine smooth_max
1689 MAX (self->tex [cell->tile [0]].smoothlevel, 1857 MAX (self->tex [cell->tile [0]].smoothlevel,
1690 MAX (self->tex [cell->tile [1]].smoothlevel, 1858 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel)); 1859 self->tex [cell->tile [2]].smoothlevel));
1692 } 1860 }
1693 } 1861 }
1862
1863 glEnable (GL_BLEND);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1694 1866
1695 for (z = 0; z <= 2; z++) 1867 for (z = 0; z <= 2; z++)
1696 { 1868 {
1697 memset (smooth_level, 0, sizeof (smooth_level)); 1869 memset (smooth_level, 0, sizeof (smooth_level));
1698 1870
1708 tileid tile = cell->tile [z]; 1880 tileid tile = cell->tile [z];
1709 1881
1710 if (tile) 1882 if (tile)
1711 { 1883 {
1712 maptex tex = self->tex [tile]; 1884 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w; 1885 int px, py;
1714 int py = (y + 1) * T - tex.h;
1715 1886
1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name) 1887 if (key.texname != tex.name)
1719 { 1888 {
1720 if (!tex.name) 1889 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */ 1890 tex = self->tex [2]; /* missing, replace by noface */
1722 1891
1723 glEnd (); 1892 key.texname = tex.name;
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1893 arr = rc_array (rc, &key);
1725 glBegin (GL_QUADS);
1726 } 1894 }
1727 1895
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1896 px = (x + 1) * T - tex.w;
1897 py = (y + 1) * T - tex.h;
1898
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1729 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1730 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1731 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1732 1903
1733 if (cell->flags && z == 2) 1904 if (cell->flags && z == 2)
1734 { 1905 {
1906 // overlays such as the speech bubble, probably more to come
1735 if (cell->flags & 1) 1907 if (cell->flags & 1)
1736 { 1908 {
1737 maptex tex = self->tex [1]; 1909 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32; 1910 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32; 1911 int py = y * T - T * 6 / 32;
1740 1912
1913 if (tex.name)
1741 glEnd (); 1914 {
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1743 glBegin (GL_QUADS); 1925 }
1744
1745 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1746 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1747 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1748 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1749 } 1926 }
1750 } 1927 }
1751 1928
1752 // update smooth hash 1929 // update smooth hash
1753 if (tex.smoothtile) 1930 if (tex.smoothtile)
1789 } 1966 }
1790 } 1967 }
1791 } 1968 }
1792 } 1969 }
1793 1970
1971 rc_draw (rc);
1972 rc_clear (rc);
1973
1794 // go through all smoothlevels, lowest to highest, then draw. 1974 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort 1975 // this is basically counting sort
1796 { 1976 {
1797 int w, b; 1977 int w, b;
1798 1978
1979 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS);
1799 for (w = 0; w < 256 / 32; ++w) 1981 for (w = 0; w < 256 / 32; ++w)
1800 { 1982 {
1801 uint32_t smask = smooth_level [w]; 1983 uint32_t smask = smooth_level [w];
1802 if (smask) 1984 if (smask)
1803 for (b = 0; b < 32; ++b) 1985 for (b = 0; b < 32; ++b)
1822 int border = bits & 15; 2004 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2005 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row 2006 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column 2007 float dy = tex.t * .5f ; // 2 images/column
1826 2008
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name) 2009 if (tex.name)
1830 { 2010 {
2011 // this time avoiding texture state changes
2012 // save gobs of state changes.
1831 if (!tex.name) 2013 if (key.texname != tex.name)
1832 continue; // smoothing not yet available 2014 {
1833
1834 glEnd (); 2015 glEnd ();
1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1836 glBegin (GL_QUADS); 2017 glBegin (GL_QUADS);
1837 } 2018 }
1838 2019
1839 if (border) 2020 if (border)
1840 { 2021 {
1841 float ox = border * dx; 2022 float ox = border * dx;
1842 2023
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1847 } 2028 }
1848 2029
1849 if (corner) 2030 if (corner)
1850 { 2031 {
1851 float ox = corner * dx; 2032 float ox = corner * dx;
1852 2033
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2034 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2038 }
1857 } 2039 }
1858 } 2040 }
1859 } 2041 }
1860 } 2042 }
1861 } 2043 }
2044
2045 glEnd ();
2046 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1;
1862 } 2048 }
1863 2049
1864 hv_clear (smooth); 2050 hv_clear (smooth);
1865 } 2051 }
1866 2052
1867 glEnd ();
1868
1869 glDisable (GL_TEXTURE_2D);
1870 glDisable (GL_BLEND); 2053 glDisable (GL_BLEND);
2054 rc_free (rc);
1871 2055
1872 // top layer: overlays such as the health bar 2056 // top layer: overlays such as the health bar
1873 for (y = 0; y < sh; y++) 2057 for (y = 0; y < sh; y++)
1874 if (0 <= y + my && y + my < self->rows) 2058 if (0 <= y + my && y + my < self->rows)
1875 { 2059 {
1900 } 2084 }
1901 } 2085 }
1902} 2086}
1903 2087
1904void 2088void
1905draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1906 CODE: 2090 CODE:
1907{ 2091{
1908 static float color[16][3] = { 2092 static float color[16][3] = {
1909 { 0.00F, 0.00F, 0.00F }, 2093 { 0.00F, 0.00F, 0.00F },
1910 { 1.00F, 1.00F, 1.00F }, 2094 { 1.00F, 1.00F, 1.00F },
1960 glDisable (GL_BLEND); 2144 glDisable (GL_BLEND);
1961 glDisable (GL_TEXTURE_2D); 2145 glDisable (GL_TEXTURE_2D);
1962} 2146}
1963 2147
1964void 2148void
1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2149fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1966 PPCODE: 2150 PPCODE:
1967{ 2151{
1968 int x, y; 2152 int x, y;
2153 int sw1 = sw + 2;
2154 int sh1 = sh + 2;
2155 int sh3 = sh * 3;
1969 int sw4 = (sw + 3) & ~3; 2156 int sw34 = (sw * 3 + 3) & ~3;
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1972 2160
1973 memset (darkness, 255, sw4 * sh);
1974 SvPOK_only (darkness_sv); 2161 SvPOK_only (darkness3_sv);
1975 SvCUR_set (darkness_sv, sw4 * sh); 2162 SvCUR_set (darkness3_sv, sw34 * sh3);
1976 2163
1977 mx += self->x; 2164 mx += self->x - 1;
1978 my += self->y; 2165 my += self->y - 1;
1979 2166
2167 memset (darkness1, 255, sw1 * sh1);
2168
1980 for (y = 0; y < sh; y++) 2169 for (y = 0; y < sh1; y++)
1981 if (0 <= y + my && y + my < self->rows) 2170 if (0 <= y + my && y + my < self->rows)
1982 { 2171 {
1983 maprow *row = self->row + (y + my); 2172 maprow *row = self->row + (y + my);
1984 2173
1985 for (x = 0; x < sw; x++) 2174 for (x = 0; x < sw1; x++)
1986 if (row->c0 <= x + mx && x + mx < row->c1) 2175 if (row->c0 <= x + mx && x + mx < row->c1)
1987 { 2176 {
1988 mapcell *cell = row->col + (x + mx - row->c0); 2177 mapcell *cell = row->col + (x + mx - row->c0);
1989 2178
1990 darkness[y * sw4 + x] = cell->darkness 2179 darkness1 [y * sw1 + x] = cell->darkness
1991 ? 255 - (cell->darkness - 1) 2180 ? 255 - (cell->darkness - 1)
1992 : 255 - FOW_DARKNESS; 2181 : 255 - FOW_DARKNESS;
1993 } 2182 }
1994 } 2183 }
1995 2184
1996 if (smoothing)
1997 {
1998 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
1999 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2000
2001 SvPOK_only (darkness2_sv);
2002 SvCUR_set (darkness2_sv, sw4 * sh);
2003
2004 for (y = 0; y < sh; ++y) 2185 for (y = 0; y < sh; ++y)
2005 for (x = 0; x < sw4; ++x) 2186 for (x = 0; x < sw; ++x)
2006 { 2187 {
2007 float *f = (float *)matrix; 2188 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2008 int dx, dy; 2189 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2009 float sum = 0.f; 2190 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2191 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2192 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2193 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2194 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2195 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2196 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2010 2197
2011 for (dy = -1; dy <= 1; ++dy) 2198 uint8_t r11 = (d11 + d21 + d12) / 3;
2012 for (dx = -1; dx <= 1; ++dx) 2199 uint8_t r21 = d21;
2013 { 2200 uint8_t r31 = (d21 + d31 + d32) / 3;
2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
2016 2201
2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2202 uint8_t r12 = d12;
2018 } 2203 uint8_t r22 = d22;
2204 uint8_t r32 = d32;
2019 2205
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2206 uint8_t r13 = (d13 + d23 + d12) / 3;
2021 } 2207 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3;
2022 2209
2023 darkness_sv = darkness2_sv; 2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2214 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2024 } 2219 }
2220
2221 free (darkness1);
2025 2222
2026 EXTEND (SP, 3); 2223 EXTEND (SP, 3);
2027 PUSHs (sv_2mortal (newSViv (sw4))); 2224 PUSHs (sv_2mortal (newSViv (sw34)));
2028 PUSHs (sv_2mortal (newSViv (sh))); 2225 PUSHs (sv_2mortal (newSViv (sh3)));
2029 PUSHs (darkness_sv); 2226 PUSHs (darkness3_sv);
2030} 2227}
2031 2228
2032SV * 2229SV *
2033get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2230get_rect (DC::Map self, int x0, int y0, int w, int h)
2034 CODE: 2231 CODE:
2035{ 2232{
2036 int x, y, x1, y1; 2233 int x, y, x1, y1;
2037 SV *data_sv = newSV (w * h * 7 + 5); 2234 SV *data_sv = newSV (w * h * 7 + 5);
2038 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2235 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2103} 2300}
2104 OUTPUT: 2301 OUTPUT:
2105 RETVAL 2302 RETVAL
2106 2303
2107void 2304void
2108set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2305set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2109 PPCODE: 2306 PPCODE:
2110{ 2307{
2111 int x, y, z; 2308 int x, y, z;
2112 int w, h; 2309 int w, h;
2113 int x1, y1; 2310 int x1, y1;
2114 2311
2115 if (*data++ != 0) 2312 if (*data++ != 0)
2116 return; /* version mismatch */ 2313 XSRETURN_EMPTY; /* version mismatch */
2117 2314
2118 w = *data++ << 8; w |= *data++; 2315 w = *data++ << 8; w |= *data++;
2119 h = *data++ << 8; h |= *data++; 2316 h = *data++ << 8; h |= *data++;
2120 2317
2121 // we need to do this 'cause we don't keep an absolute coord system for rows 2318 // we need to do this 'cause we don't keep an absolute coord system for rows
2166 } 2363 }
2167 } 2364 }
2168 } 2365 }
2169} 2366}
2170 2367
2171MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2368MODULE = Deliantra::Client PACKAGE = DC::RW
2172 2369
2173CFPlus::MixChunk 2370DC::RW
2174new_from_file (SV *class, char *path) 2371new (SV *class, SV *data_sv)
2175 CODE: 2372 CODE:
2176 RETVAL = Mix_LoadWAV (path); 2373{
2374 STRLEN datalen;
2375 char *data = SvPVbyte (data_sv, datalen);
2376
2377 RETVAL = SDL_RWFromConstMem (data, datalen);
2378}
2177 OUTPUT: 2379 OUTPUT:
2178 RETVAL 2380 RETVAL
2179 2381
2382DC::RW
2383new_from_file (SV *class, const char *path, const char *mode = "rb")
2384 CODE:
2385 RETVAL = SDL_RWFromFile (path, mode);
2386 OUTPUT:
2387 RETVAL
2388
2389# fails on win32:
2390# dc.xs(2268) : error C2059: syntax error : '('
2180void 2391#void
2392#close (DC::RW self)
2393# CODE:
2394# (self->(close)) (self);
2395
2396MODULE = Deliantra::Client PACKAGE = DC::Channel
2397
2398PROTOTYPES: DISABLE
2399
2400DC::Channel
2401find ()
2402 CODE:
2403{
2404 RETVAL = Mix_GroupAvailable (-1);
2405
2406 if (RETVAL < 0)
2407 {
2408 RETVAL = Mix_GroupOldest (-1);
2409
2410 if (RETVAL < 0)
2411 XSRETURN_UNDEF;
2412
2413 Mix_HaltChannel (RETVAL);
2414 }
2415
2416 Mix_UnregisterAllEffects (RETVAL);
2417 Mix_Volume (RETVAL, 128);
2418}
2419 OUTPUT:
2420 RETVAL
2421
2422void
2423halt (DC::Channel self)
2424 CODE:
2425 Mix_HaltChannel (self);
2426
2427void
2428expire (DC::Channel self, int ticks = -1)
2429 CODE:
2430 Mix_ExpireChannel (self, ticks);
2431
2432void
2433fade_out (DC::Channel self, int ticks = -1)
2434 CODE:
2435 Mix_FadeOutChannel (self, ticks);
2436
2437int
2438volume (DC::Channel self, int volume)
2439 CODE:
2440 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2441 OUTPUT:
2442 RETVAL
2443
2444void
2445unregister_all_effects (DC::Channel self)
2446 CODE:
2447 Mix_UnregisterAllEffects (self);
2448
2449void
2450set_panning (DC::Channel self, int left, int right)
2451 CODE:
2452 left = CLAMP (left , 0, 255);
2453 right = CLAMP (right, 0, 255);
2454 Mix_SetPanning (self, left, right);
2455
2456void
2457set_distance (DC::Channel self, int distance)
2458 CODE:
2459 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2460
2461void
2462set_position (DC::Channel self, int angle, int distance)
2463 CODE:
2464
2465void
2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2467 CODE:
2468{
2469 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2470 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2472}
2473
2474void
2475set_reverse_stereo (DC::Channel self, int flip)
2476 CODE:
2477 Mix_SetReverseStereo (self, flip);
2478
2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2480
2481PROTOTYPES: DISABLE
2482
2483DC::MixChunk
2484new (SV *class, DC::RW rwops)
2485 CODE:
2486 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2487 OUTPUT:
2488 RETVAL
2489
2490void
2181DESTROY (CFPlus::MixChunk self) 2491DESTROY (DC::MixChunk self)
2182 CODE: 2492 CODE:
2183 Mix_FreeChunk (self); 2493 Mix_FreeChunk (self);
2184 2494
2185int 2495int
2186volume (CFPlus::MixChunk self, int volume = -1) 2496volume (DC::MixChunk self, int volume = -1)
2187 CODE: 2497 CODE:
2498 if (items > 1)
2499 volume = CLAMP (volume, 0, 128);
2188 RETVAL = Mix_VolumeChunk (self, volume); 2500 RETVAL = Mix_VolumeChunk (self, volume);
2189 OUTPUT: 2501 OUTPUT:
2190 RETVAL 2502 RETVAL
2191 2503
2192int 2504DC::Channel
2193play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2505play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2194 CODE: 2506 CODE:
2507{
2195 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2508 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2509
2510 if (RETVAL < 0)
2511 XSRETURN_UNDEF;
2512
2513 if (channel < 0)
2514 {
2515 Mix_UnregisterAllEffects (RETVAL);
2516 Mix_Volume (RETVAL, 128);
2517 }
2518}
2196 OUTPUT: 2519 OUTPUT:
2197 RETVAL 2520 RETVAL
2198 2521
2199MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2200 2523
2201int 2524int
2202volume (int volume = -1) 2525volume (int volume = -1)
2526 PROTOTYPE: ;$
2203 CODE: 2527 CODE:
2528 if (items > 0)
2529 volume = CLAMP (volume, 0, 128);
2204 RETVAL = Mix_VolumeMusic (volume); 2530 RETVAL = Mix_VolumeMusic (volume);
2205 OUTPUT: 2531 OUTPUT:
2206 RETVAL 2532 RETVAL
2207 2533
2534void
2535fade_out (int ms)
2536 CODE:
2537 Mix_FadeOutMusic (ms);
2538
2539void
2540halt ()
2541 CODE:
2542 Mix_HaltMusic ();
2543
2544DC::MixMusic
2545new (SV *class, DC::RW rwops)
2546 CODE:
2547 RETVAL = Mix_LoadMUS_RW (rwops);
2548 OUTPUT:
2549 RETVAL
2550
2551void
2552DESTROY (DC::MixMusic self)
2553 CODE:
2554 Mix_FreeMusic (self);
2555
2208int 2556int
2209fade_out (int ms)
2210 CODE:
2211 RETVAL = Mix_FadeOutMusic (ms);
2212 OUTPUT:
2213 RETVAL
2214
2215CFPlus::MixMusic
2216new_from_file (SV *class, char *path)
2217 CODE:
2218 RETVAL = Mix_LoadMUS (path);
2219 OUTPUT:
2220 RETVAL
2221
2222void
2223DESTROY (CFPlus::MixMusic self)
2224 CODE:
2225 Mix_FreeMusic (self);
2226
2227int
2228play (CFPlus::MixMusic self, int loops = -1) 2557play (DC::MixMusic self, int loops = -1)
2229 CODE: 2558 CODE:
2230 RETVAL = Mix_PlayMusic (self, loops); 2559 RETVAL = Mix_PlayMusic (self, loops);
2231 OUTPUT: 2560 OUTPUT:
2232 RETVAL 2561 RETVAL
2233 2562
2234int 2563void
2235fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2564fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2236 CODE: 2565 CODE:
2237 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2566 Mix_FadeInMusicPos (self, loops, ms, position);
2238 OUTPUT:
2239 RETVAL
2240 2567
2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2568MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2569
2570PROTOTYPES: ENABLE
2242 2571
2243BOOT: 2572BOOT:
2244{ 2573{
2245 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2574 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2246 static const struct { 2575 static const struct {
2247 const char *name; 2576 const char *name;
2248 IV iv; 2577 IV iv;
2249 } *civ, const_iv[] = { 2578 } *civ, const_iv[] = {
2250# define const_iv(name) { # name, (IV)name } 2579# define const_iv(name) { # name, (IV)name }
2262 const_iv (GL_ALPHA_TEST), 2591 const_iv (GL_ALPHA_TEST),
2263 const_iv (GL_NORMALIZE), 2592 const_iv (GL_NORMALIZE),
2264 const_iv (GL_RESCALE_NORMAL), 2593 const_iv (GL_RESCALE_NORMAL),
2265 const_iv (GL_FRONT), 2594 const_iv (GL_FRONT),
2266 const_iv (GL_BACK), 2595 const_iv (GL_BACK),
2596 const_iv (GL_AUX0),
2267 const_iv (GL_AND), 2597 const_iv (GL_AND),
2268 const_iv (GL_ONE), 2598 const_iv (GL_ONE),
2269 const_iv (GL_ZERO), 2599 const_iv (GL_ZERO),
2270 const_iv (GL_SRC_ALPHA), 2600 const_iv (GL_SRC_ALPHA),
2271 const_iv (GL_DST_ALPHA), 2601 const_iv (GL_DST_ALPHA),
2284 const_iv (GL_INTENSITY), 2614 const_iv (GL_INTENSITY),
2285 const_iv (GL_LUMINANCE), 2615 const_iv (GL_LUMINANCE),
2286 const_iv (GL_LUMINANCE_ALPHA), 2616 const_iv (GL_LUMINANCE_ALPHA),
2287 const_iv (GL_FLOAT), 2617 const_iv (GL_FLOAT),
2288 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2618 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2619 const_iv (GL_COMPRESSED_ALPHA_ARB),
2620 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2621 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2622 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2623 const_iv (GL_COMPRESSED_RGB_ARB),
2624 const_iv (GL_COMPRESSED_RGBA_ARB),
2289 const_iv (GL_COMPILE), 2625 const_iv (GL_COMPILE),
2290 const_iv (GL_PROXY_TEXTURE_1D), 2626 const_iv (GL_PROXY_TEXTURE_1D),
2291 const_iv (GL_PROXY_TEXTURE_2D), 2627 const_iv (GL_PROXY_TEXTURE_2D),
2292 const_iv (GL_TEXTURE_1D), 2628 const_iv (GL_TEXTURE_1D),
2293 const_iv (GL_TEXTURE_2D), 2629 const_iv (GL_TEXTURE_2D),
2317 const_iv (GL_COLOR_LOGIC_OP), 2653 const_iv (GL_COLOR_LOGIC_OP),
2318 const_iv (GL_SEPARABLE_2D), 2654 const_iv (GL_SEPARABLE_2D),
2319 const_iv (GL_CONVOLUTION_2D), 2655 const_iv (GL_CONVOLUTION_2D),
2320 const_iv (GL_CONVOLUTION_BORDER_MODE), 2656 const_iv (GL_CONVOLUTION_BORDER_MODE),
2321 const_iv (GL_CONSTANT_BORDER), 2657 const_iv (GL_CONSTANT_BORDER),
2658 const_iv (GL_POINTS),
2322 const_iv (GL_LINES), 2659 const_iv (GL_LINES),
2323 const_iv (GL_LINE_STRIP), 2660 const_iv (GL_LINE_STRIP),
2324 const_iv (GL_LINE_LOOP), 2661 const_iv (GL_LINE_LOOP),
2325 const_iv (GL_QUADS), 2662 const_iv (GL_QUADS),
2326 const_iv (GL_QUAD_STRIP), 2663 const_iv (GL_QUAD_STRIP),
2327 const_iv (GL_TRIANGLES), 2664 const_iv (GL_TRIANGLES),
2328 const_iv (GL_TRIANGLE_STRIP), 2665 const_iv (GL_TRIANGLE_STRIP),
2329 const_iv (GL_TRIANGLE_FAN), 2666 const_iv (GL_TRIANGLE_FAN),
2667 const_iv (GL_POLYGON),
2330 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2668 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2669 const_iv (GL_POINT_SMOOTH_HINT),
2670 const_iv (GL_LINE_SMOOTH_HINT),
2671 const_iv (GL_POLYGON_SMOOTH_HINT),
2672 const_iv (GL_GENERATE_MIPMAP_HINT),
2673 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2331 const_iv (GL_FASTEST), 2674 const_iv (GL_FASTEST),
2675 const_iv (GL_DONT_CARE),
2676 const_iv (GL_NICEST),
2332 const_iv (GL_V2F), 2677 const_iv (GL_V2F),
2333 const_iv (GL_V3F), 2678 const_iv (GL_V3F),
2334 const_iv (GL_T2F_V3F), 2679 const_iv (GL_T2F_V3F),
2335 const_iv (GL_T2F_N3F_V3F), 2680 const_iv (GL_T2F_N3F_V3F),
2336# undef const_iv 2681# undef const_iv
2341 2686
2342 texture_av = newAV (); 2687 texture_av = newAV ();
2343 AvREAL_off (texture_av); 2688 AvREAL_off (texture_av);
2344} 2689}
2345 2690
2691void
2692disable_GL_EXT_blend_func_separate ()
2693 CODE:
2694 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0;
2696
2346char * 2697char *
2347gl_vendor () 2698gl_vendor ()
2348 CODE: 2699 CODE:
2349 RETVAL = (char *)glGetString (GL_VENDOR); 2700 RETVAL = (char *)glGetString (GL_VENDOR);
2350 OUTPUT: 2701 OUTPUT:
2422# near_ and far_ are due to microsofts buggy "c" compiler 2773# near_ and far_ are due to microsofts buggy "c" compiler
2423void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2774void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2424 2775
2425# near_ and far_ are due to microsofts buggy "c" compiler 2776# near_ and far_ are due to microsofts buggy "c" compiler
2426void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2777void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2778
2779PROTOTYPES: DISABLE
2427 2780
2428void glViewport (int x, int y, int width, int height) 2781void glViewport (int x, int y, int width, int height)
2429 2782
2430void glScissor (int x, int y, int width, int height) 2783void glScissor (int x, int y, int width, int height)
2431 2784
2439 2792
2440void glRotate (float angle, float x, float y, float z) 2793void glRotate (float angle, float x, float y, float z)
2441 CODE: 2794 CODE:
2442 glRotatef (angle, x, y, z); 2795 glRotatef (angle, x, y, z);
2443 2796
2444void glBegin (int mode)
2445
2446void glEnd ()
2447
2448void glColor (float r, float g, float b, float a = 1.0) 2797void glColor (float r, float g, float b, float a = 1.0)
2449 PROTOTYPE: @
2450 ALIAS: 2798 ALIAS:
2451 glColor_premultiply = 1 2799 glColor_premultiply = 1
2452 CODE: 2800 CODE:
2453 if (ix) 2801 if (ix)
2454 { 2802 {
2457 b *= a; 2805 b *= a;
2458 } 2806 }
2459 // microsoft visual "c" rounds instead of truncating... 2807 // microsoft visual "c" rounds instead of truncating...
2460 glColor4f (r, g, b, a); 2808 glColor4f (r, g, b, a);
2461 2809
2462void glInterleavedArrays (int format, int stride, char *data)
2463
2464void glDrawElements (int mode, int count, int type, char *indices)
2465
2466# 1.2 void glDrawRangeElements (int mode, int start, int end
2467
2468void glRasterPos (float x, float y, float z = 0.) 2810void glRasterPos (float x, float y, float z = 0.)
2469 CODE: 2811 CODE:
2470 glRasterPos3f (0, 0, z); 2812 glRasterPos3f (0, 0, z);
2471 glBitmap (0, 0, 0, 0, x, y, 0); 2813 glBitmap (0, 0, 0, 0, x, y, 0);
2472 2814
2476 2818
2477void glTexCoord (float s, float t) 2819void glTexCoord (float s, float t)
2478 CODE: 2820 CODE:
2479 glTexCoord2f (s, t); 2821 glTexCoord2f (s, t);
2480 2822
2823void glRect (float x1, float y1, float x2, float y2)
2824 CODE:
2825 glRectf (x1, y1, x2, y2);
2826
2827void glRect_lineloop (float x1, float y1, float x2, float y2)
2828 CODE:
2829 glBegin (GL_LINE_LOOP);
2830 glVertex2f (x1, y1);
2831 glVertex2f (x2, y1);
2832 glVertex2f (x2, y2);
2833 glVertex2f (x1, y2);
2834 glEnd ();
2835
2836PROTOTYPES: ENABLE
2837
2838void glBegin (int mode)
2839
2840void glEnd ()
2841
2842void glPointSize (GLfloat size)
2843
2844void glLineWidth (GLfloat width)
2845
2846void glInterleavedArrays (int format, int stride, char *data)
2847
2848void glDrawElements (int mode, int count, int type, char *indices)
2849
2850# 1.2 void glDrawRangeElements (int mode, int start, int end
2851
2481void glTexEnv (int target, int pname, float param) 2852void glTexEnv (int target, int pname, float param)
2482 CODE: 2853 CODE:
2483 glTexEnvf (target, pname, param); 2854 glTexEnvf (target, pname, param);
2484 2855
2485void glTexParameter (int target, int pname, float param) 2856void glTexParameter (int target, int pname, float param)
2501void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2872void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2502 CODE: 2873 CODE:
2503 if (gl.SeparableFilter2D) 2874 if (gl.SeparableFilter2D)
2504 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2875 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2505 2876
2506void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2877void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2507 2878
2508void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2879void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2509 2880
2510void glDrawPixels (int width, int height, int format, int type, char *pixels) 2881void glDrawPixels (int width, int height, int format, int type, char *pixels)
2511 2882
2537 2908
2538void glEndList () 2909void glEndList ()
2539 2910
2540void glCallList (int list) 2911void glCallList (int list)
2541 2912
2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2914
2915PROTOTYPES: DISABLE
2916
2917void
2918find_widget (SV *self, NV x, NV y)
2919 PPCODE:
2920{
2921 if (within_widget (self, x, y))
2922 XPUSHs (self);
2923}
2924
2925BOOT:
2926{
2927 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2928
2929 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2930 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2931 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2932 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2933}
2934
2935void
2936draw (SV *self)
2937 CODE:
2938{
2939 HV *hv;
2940 SV **svp;
2941 NV x, y, w, h;
2942 SV *draw_x_sv = GvSV (draw_x_gv);
2943 SV *draw_y_sv = GvSV (draw_y_gv);
2944 SV *draw_w_sv = GvSV (draw_w_gv);
2945 SV *draw_h_sv = GvSV (draw_h_gv);
2946 double draw_x, draw_y;
2947
2948 if (!SvROK (self))
2949 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2950
2951 hv = (HV *)SvRV (self);
2952
2953 if (SvTYPE (hv) != SVt_PVHV)
2954 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2955
2956 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2957 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2958
2959 if (!h || !w)
2960 XSRETURN_EMPTY;
2961
2962 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2963 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2964
2965 draw_x = SvNV (draw_x_sv) + x;
2966 draw_y = SvNV (draw_y_sv) + y;
2967
2968 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2969 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2970 XSRETURN_EMPTY;
2971
2972 sv_setnv (draw_x_sv, draw_x);
2973 sv_setnv (draw_y_sv, draw_y);
2974
2975 glPushMatrix ();
2976 glTranslated (x, y, 0);
2977
2978 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2979 {
2980 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2981
2982 if (svp && SvTRUE (*svp))
2983 {
2984 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2985 glEnable (GL_BLEND);
2986 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2987 glBegin (GL_QUADS);
2988 glVertex2f (0, 0);
2989 glVertex2f (w, 0);
2990 glVertex2f (w, h);
2991 glVertex2f (0, h);
2992 glEnd ();
2993 glDisable (GL_BLEND);
2994 }
2995 }
2996#if 0
2997 // draw borders, for debugging
2998 glPushMatrix ();
2999 glColor4f (1., 1., 0., 1.);
3000 glTranslatef (.5, .5, 0.);
3001 glBegin (GL_LINE_LOOP);
3002 glVertex2f (0 , 0);
3003 glVertex2f (w - 1, 0);
3004 glVertex2f (w - 1, h - 1);
3005 glVertex2f (0 , h - 1);
3006 glEnd ();
3007 glPopMatrix ();
3008#endif
3009 PUSHMARK (SP);
3010 XPUSHs (self);
3011 PUTBACK;
3012 call_method ("_draw", G_VOID | G_DISCARD);
3013 SPAGAIN;
3014
3015 glPopMatrix ();
3016
3017 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3018 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3019}
3020

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines