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.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
52#endif
53
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#include <pango/pango.h> 59#include <pango/pango.h>
50 60
51#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
65# include <netinet/in.h> 75# include <netinet/in.h>
66# include <netinet/tcp.h> 76# include <netinet/tcp.h>
67# include <inttypes.h> 77# include <inttypes.h>
68#endif 78#endif
69 79
80#if __GNUC__ >= 4
81# define expect(expr,value) __builtin_expect ((expr),(value))
82#else
83# define expect(expr,value) (expr)
84#endif
85
86#define expect_false(expr) expect ((expr) != 0, 0)
87#define expect_true(expr) expect ((expr) != 0, 1)
88
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
72#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
73 95
74#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
76 98
77#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
78 100
79/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 103
82#if 0 104#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 105
84#else 106#define TEXID_SPEECH 1
85# define PARACHUTE 0 107#define TEXID_NOFACE 2
86#endif 108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
87 127
88static AV *texture_av; 128static AV *texture_av;
89 129
90static struct 130static struct
91{ 131{
148{ 188{
149 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
150 190
151 while (attrs) 191 while (attrs)
152 { 192 {
153 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
154 194
155 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
156 return 1; 196 return 1;
157 197
158 attrs = attrs->next; 198 attrs = attrs->next;
176static void 216static void
177substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
178{ 218{
179 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
180#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
181 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
182#endif 222#endif
183 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
184} 224}
185 225
186static void 226static void
187layout_update_font (DC__Layout self) 227layout_update_font (DC__Layout self)
188{ 228{
189 /* use a random scale factor to account for unknown descenders, 0.8 works 229 /* use a random scale factor to account for unknown descenders, 0.8 works
190 * reasonably well with bitstream vera 230 * reasonably well with dejavu/bistream fonts
191 */ 231 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 232 PangoFontDescription *font = self->font ? self->font : default_font;
193 233
194 pango_font_description_set_absolute_size (font, 234 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 235 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
223 int w, h; 263 int w, h;
224 float s, t; 264 float s, t;
225 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
226 tileid smoothtile; 266 tileid smoothtile;
227 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */
228} maptex; 269} maptex;
229 270
230typedef struct { 271typedef struct {
231 uint32_t player; 272 uint32_t player;
232 tileid tile[3]; 273 tileid tile[3];
364 self->oy = 0; 405 self->oy = 0;
365 self->row = 0; 406 self->row = 0;
366 self->rows = 0; 407 self->rows = 0;
367} 408}
368 409
410#define CELL_CLEAR(cell) \
411 do { \
412 if ((cell)->player) \
413 (cell)->tile [2] = 0; \
414 (cell)->darkness = 0; \
415 (cell)->stat_hp = 0; \
416 (cell)->flags = 0; \
417 (cell)->player = 0; \
418 } while (0)
419
369static void 420static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 422{
372 int x, y; 423 int x, y;
373 maprow *row; 424 maprow *row;
387 if (x >= row->c1) 438 if (x >= row->c1)
388 break; 439 break;
389 440
390 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
391 442
392 cell->darkness = 0; 443 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 444 }
397 } 445 }
398} 446}
399 447
400typedef struct { 448struct smooth_key
449{
401 tileid tile; 450 tileid tile;
402 uint8_t x, y, level; 451 uint8_t x, y, level;
403} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
404 471
405static void 472static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 474{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
409 476
410 if (SvIOK (*sv)) 477 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
412 else 479 else
413 sv_setiv (*sv, bits); 480 it->second |= bits;
414} 481}
415 482
416static void 483static void
417music_finished (void) 484music_finished (void)
418{ 485{
435 ev.code = 1; 502 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 504 ev.data2 = 0;
438 505
439 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
440} 514}
441 515
442static unsigned int 516static unsigned int
443minpot (unsigned int n) 517minpot (unsigned int n)
444{ 518{
511 if (!svp || !SvTRUE (*svp)) 585 if (!svp || !SvTRUE (*svp))
512 return 0; 586 return 0;
513 587
514 return 1; 588 return 1;
515} 589}
590
591/******************************************************************************/
592
593/* process keyboard modifiers */
594static int
595mod_munge (int mod)
596{
597 mod &= MOD_MASK;
598
599 if (mod & (KMOD_META | KMOD_ALT))
600 mod |= KMOD_LRAM;
601
602 return mod;
603}
604
605static void
606deliantra_main (SV *real_main)
607{
608 dSP;
609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
612}
613
614#ifdef __MACOSX__
615 static SV *real_main;
616
617 /* to due surprising braindamage on the side of SDL design, we
618 * do some mind-boggling hack here: SDL requires a custom main()
619 * on OS X, so... we provide one and call the original main(), which,
620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
621 * and which calls our main (== SDL_main) back.
622 */
623 extern C_LINKAGE int
624 main (int argc, char *argv[])
625 {
626 deliantra_main (real_main);
627 }
628
629 #undef main
630
631 extern C_LINKAGE int main (int argc, char *argv[]);
632
633 static void
634 SDL_main_hack (SV *real_main_)
635 {
636 real_main = real_main_;
637
638 char *argv[] = { "deliantra client", 0 };
639 (main) (1, argv);
640 }
641#else
642 static void
643 SDL_main_hack (SV *real_main)
644 {
645 deliantra_main (real_main);
646 }
647#endif
516 648
517MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
518 650
519PROTOTYPES: ENABLE 651PROTOTYPES: ENABLE
520 652
549 const_iv (SDL_USEREVENT), 681 const_iv (SDL_USEREVENT),
550 682
551 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 685 const_iv (SDL_APPACTIVE),
686
687
688 const_iv (SDLK_UNKNOWN),
689 const_iv (SDLK_FIRST),
690 const_iv (SDLK_BACKSPACE),
691 const_iv (SDLK_TAB),
692 const_iv (SDLK_CLEAR),
693 const_iv (SDLK_RETURN),
694 const_iv (SDLK_PAUSE),
695 const_iv (SDLK_ESCAPE),
696 const_iv (SDLK_SPACE),
697 const_iv (SDLK_EXCLAIM),
698 const_iv (SDLK_QUOTEDBL),
699 const_iv (SDLK_HASH),
700 const_iv (SDLK_DOLLAR),
701 const_iv (SDLK_AMPERSAND),
702 const_iv (SDLK_QUOTE),
703 const_iv (SDLK_LEFTPAREN),
704 const_iv (SDLK_RIGHTPAREN),
705 const_iv (SDLK_ASTERISK),
706 const_iv (SDLK_PLUS),
707 const_iv (SDLK_COMMA),
708 const_iv (SDLK_MINUS),
709 const_iv (SDLK_PERIOD),
710 const_iv (SDLK_SLASH),
711 const_iv (SDLK_0),
712 const_iv (SDLK_1),
713 const_iv (SDLK_2),
714 const_iv (SDLK_3),
715 const_iv (SDLK_4),
716 const_iv (SDLK_5),
717 const_iv (SDLK_6),
718 const_iv (SDLK_7),
719 const_iv (SDLK_8),
720 const_iv (SDLK_9),
721 const_iv (SDLK_COLON),
722 const_iv (SDLK_SEMICOLON),
723 const_iv (SDLK_LESS),
724 const_iv (SDLK_EQUALS),
725 const_iv (SDLK_GREATER),
726 const_iv (SDLK_QUESTION),
727 const_iv (SDLK_AT),
728
729 const_iv (SDLK_LEFTBRACKET),
730 const_iv (SDLK_BACKSLASH),
731 const_iv (SDLK_RIGHTBRACKET),
732 const_iv (SDLK_CARET),
733 const_iv (SDLK_UNDERSCORE),
734 const_iv (SDLK_BACKQUOTE),
735 const_iv (SDLK_DELETE),
554 736
555 const_iv (SDLK_FIRST), 737 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 738 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 819 const_iv (KMOD_MODE),
638 820
821 const_iv (KMOD_LRAM),
822
639 const_iv (MIX_DEFAULT_FORMAT), 823 const_iv (MIX_DEFAULT_FORMAT),
824
825 const_iv (SDL_INIT_TIMER),
826 const_iv (SDL_INIT_AUDIO),
827 const_iv (SDL_INIT_VIDEO),
828 const_iv (SDL_INIT_CDROM),
829 const_iv (SDL_INIT_JOYSTICK),
830 const_iv (SDL_INIT_EVERYTHING),
831 const_iv (SDL_INIT_NOPARACHUTE),
832 const_iv (SDL_INIT_EVENTTHREAD),
833
834 const_iv (SDL_GL_RED_SIZE),
835 const_iv (SDL_GL_GREEN_SIZE),
836 const_iv (SDL_GL_BLUE_SIZE),
837 const_iv (SDL_GL_ALPHA_SIZE),
838 const_iv (SDL_GL_DOUBLEBUFFER),
839 const_iv (SDL_GL_BUFFER_SIZE),
840 const_iv (SDL_GL_DEPTH_SIZE),
841 const_iv (SDL_GL_STENCIL_SIZE),
842 const_iv (SDL_GL_ACCUM_RED_SIZE),
843 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
844 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
845 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
846 const_iv (SDL_GL_STEREO),
847 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
848 const_iv (SDL_GL_MULTISAMPLESAMPLES),
849 const_iv (SDL_GL_ACCELERATED_VISUAL),
850 const_iv (SDL_GL_SWAP_CONTROL),
851
852 const_iv (FOW_DARKNESS)
640# undef const_iv 853# undef const_iv
641 }; 854 };
642 855
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 856 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 858
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 861}
649 862
665NV ceil (NV x) 878NV ceil (NV x)
666 879
667IV minpot (UV n) 880IV minpot (UV n)
668 881
669IV popcount (UV n) 882IV popcount (UV n)
883
884NV distance (NV dx, NV dy)
885 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT:
888 RETVAL
670 889
671void 890void
672pango_init () 891pango_init ()
673 CODE: 892 CODE:
674{ 893{
675 opengl_fontmap = pango_opengl_font_map_new (); 894 opengl_fontmap = pango_opengl_font_map_new ();
676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 895 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 896 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
897 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 898#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 899 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 900 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 901#endif
682} 902}
683 903
684char *
685SDL_GetError () 904char *SDL_GetError ()
686 905
687int 906void SDL_main_hack (SV *real_main)
688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 907 PROTOTYPE: &
689 908
690void 909int SDL_Init (U32 flags)
910
911int SDL_InitSubSystem (U32 flags)
912
913void SDL_QuitSubSystem (U32 flags)
914
691SDL_Quit () 915void SDL_Quit ()
916
917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
919
920int SDL_GL_GetAttribute (int attr)
921 CODE:
922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
923 XSRETURN_UNDEF;
924 OUTPUT:
925 RETVAL
692 926
693void 927void
694SDL_ListModes (int rgb, int alpha) 928SDL_ListModes (int rgb, int alpha)
695 PPCODE: 929 PPCODE:
696{ 930{
708 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711 945
712 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 946 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
713#if SDL_VERSION_ATLEAST(1,2,10)
714 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
715 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 947 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716#endif
717 948
718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 949 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
719 950
720 if (m && m != (SDL_Rect **)-1) 951 if (m && m != (SDL_Rect **)-1)
721 while (*m) 952 while (*m)
722 { 953 {
723 if ((*m)->w >= 800 && (*m)->h >= 480) 954 if ((*m)->w >= 400 && (*m)->h >= 300)
724 { 955 {
725 AV *av = newAV (); 956 AV *av = newAV ();
726 av_push (av, newSViv ((*m)->w)); 957 av_push (av, newSViv ((*m)->w));
727 av_push (av, newSViv ((*m)->h)); 958 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb)); 959 av_push (av, newSViv (rgb));
751 ); 982 );
752 983
753 if (RETVAL) 984 if (RETVAL)
754 { 985 {
755 av_clear (texture_av); 986 av_clear (texture_av);
756
757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
758#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
759#include "glfunc.h" 988#include "glfunc.h"
760#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
761 } 992 }
762} 993}
763 OUTPUT: 994 OUTPUT:
764 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
765 999
766void 1000void
767SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
768 1002
769char * 1003char *
770SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
771 1006
772int 1007int
773SDL_GetAppState () 1008SDL_GetAppState ()
774 1009
775int 1010int
776SDL_GetModState () 1011SDL_GetModState ()
777 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
778void 1017void
1018SDL_PumpEvents ()
1019
1020void
779poll_events () 1021peep_events ()
780 PPCODE: 1022 PPCODE:
781{ 1023{
782 SDL_Event ev; 1024 SDL_Event ev;
783 1025
784 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
791 { 1033 {
792 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
793 case SDL_KEYUP: 1035 case SDL_KEYUP:
794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
796 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1038 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
797 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1039 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
799 break; 1041 break;
800 1042
801 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
820 x = ev.motion.x; 1062 x = ev.motion.x;
821 y = ev.motion.y; 1063 y = ev.motion.y;
822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
823 } 1065 }
824 1066
825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
826 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
827 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
828 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
829 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
830 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
850 1092
851 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
852 } 1094 }
853} 1095}
854 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
855int 1110int
856Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
857 POSTCALL: 1112 POSTCALL:
858 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
859 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
860 1115
861void 1116void
862Mix_QuerySpec () 1117Mix_QuerySpec ()
915 } 1170 }
916 } 1171 }
917#endif 1172#endif
918} 1173}
919 1174
920void 1175int
921add_font (char *file) 1176add_font (char *file)
922 CODE: 1177 CODE:
923 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1179 OUTPUT:
1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
924 1188
925void 1189void
926load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
927 ALIAS: 1191 ALIAS:
928 load_image_file = 1 1192 load_image_file = 1
974 1238
975 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
976 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
977 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
978 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
979 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
980 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
981 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
982 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
983 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
984 1248
1044#if DEBUG 1308#if DEBUG
1045 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1046#endif 1310#endif
1047} 1311}
1048 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1049MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1050 1321
1051PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1052 1323
1053DC::Font 1324DC::Font
1054new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1055 CODE: 1326 CODE:
1056{ 1327{
1057 int count; 1328 int count;
1058 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1059 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1088 PROTOTYPE: 1359 PROTOTYPE:
1089 CODE: 1360 CODE:
1090 tc_restore (); 1361 tc_restore ();
1091 1362
1092DC::Layout 1363DC::Layout
1093new (SV *class) 1364new (SV *klass)
1094 CODE: 1365 CODE:
1095 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1096 1367
1097 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1098 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1247 1518
1248void 1519void
1249set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1250 CODE: 1521 CODE:
1251 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1252 { 1523 {
1253 self->base_height = base_height; 1524 self->base_height = base_height;
1254 layout_update_font (self); 1525 layout_update_font (self);
1255 } 1526 }
1256 1527
1257void 1528void
1484 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1485 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1486 } 1757 }
1487} 1758}
1488 1759
1760void
1761draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1762 PROTOTYPE: @
1763 CODE:
1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1767 glEnable (GL_TEXTURE_2D);
1768 glBindTexture (GL_TEXTURE_2D, name1);
1769
1770 glColor3f (intensity, intensity, intensity);
1771 glPushMatrix ();
1772 glScalef (1./3, 1./3, 1.);
1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
1829 }
1830
1831 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1832 {
1833 int x, y;
1834 int dx3 = dx * 3;
1835 int dy3 = dy * 3;
1836
1837 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1838 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1839 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1840 glTranslatef (-1., -1., 0);
1841 glBegin (GL_QUADS);
1842
1843 for (y = 1; y < h; y += 3)
1844 {
1845 int y1 = y - dy3;
1846 int y1valid = y1 >= 0 && y1 < h;
1847
1848 for (x = 1; x < w; x += 3)
1849 {
1850 int x1 = x - dx3;
1851 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1852 uint8_t h2;
1853
1854 if (y1valid && x1 >= 0 && x1 < w)
1855 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1856 else
1857 h2 = 1; /* out of range == invisible */
1858
1859 if (h1 || h2)
1860 {
1861 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1862 glColor4f (1., 1., 1., alpha);
1863
1864 glTexCoord2f (0, 0.); glVertex2i (x , y );
1865 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1866 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1867 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1868 }
1869 }
1870 }
1871 }
1872
1873 glEnd ();
1874
1875 glPopMatrix ();
1876
1877 glDisable (GL_TEXTURE_2D);
1878 glDisable (GL_BLEND);
1879}
1880
1489IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1881IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1490 CODE: 1882 CODE:
1491{ 1883{
1492 GLint width; 1884 GLint width;
1493 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1885 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1500MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1501 1893
1502PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1503 1895
1504DC::Map 1896DC::Map
1505new (SV *class) 1897new (SV *klass)
1506 CODE: 1898 CODE:
1507 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1508 RETVAL->x = 0; 1900 RETVAL->x = 0;
1509 RETVAL->y = 0; 1901 RETVAL->y = 0;
1510 RETVAL->w = 0; 1902 RETVAL->w = 0;
1549 1941
1550void 1942void
1551set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1552 CODE: 1944 CODE:
1553{ 1945{
1554 tileid texid; 1946 tileid texid;
1555 maptex *tex; 1947 maptex *tex;
1556 1948
1557 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1558 return; 1950 return;
1559 1951
1560 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1561 return; 1953 return;
1562 1954
1563 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1564 1956
1565 if (!texid) 1957 if (!texid)
1566 return; 1958 return;
1567 1959
1568 tex = self->tex + texid; 1960 tex = self->tex + texid;
1597 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1989 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1598 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1599 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1601} 1993}
1994
1995void
1996expire_textures (DC::Map self, int texid, int count)
1997 PPCODE:
1998 for (; texid < self->texs && count; ++texid, --count)
1999 {
2000 maptex *tex = self->tex + texid;
2001
2002 if (tex->name)
2003 {
2004 if (tex->unused)
2005 {
2006 tex->name = 0;
2007 tex->unused = 0;
2008 XPUSHs (sv_2mortal (newSViv (texid)));
2009 }
2010 else
2011 tex->unused = 1;
2012 }
2013 }
1602 2014
1603int 2015int
1604ox (DC::Map self) 2016ox (DC::Map self)
1605 ALIAS: 2017 ALIAS:
1606 oy = 1 2018 oy = 1
1646 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1647 } 2059 }
1648} 2060}
1649 2061
1650SV * 2062SV *
1651map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1652 CODE: 2064 CODE:
1653{ 2065{
1654 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1655 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1656 mapcell *cell; 2068 mapcell *cell;
1677 2089
1678 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1679 2091
1680 if (flags & 8) 2092 if (flags & 8)
1681 { 2093 {
2094 uint8_t ext, cmd;
2095
1682 if (extmap) 2096 do
1683 { 2097 {
1684 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1685 2100
1686 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
1687 { 2104 {
1688 ext = *data++;
1689 cmd = ext & 0x3f;
1690
1691 if (cmd < 4)
1692 cell->darkness = 255 - ext * 64 + 1;
1693 else if (cmd == 5) // health
1694 {
1695 cell->stat_width = 1; 2105 cell->stat_width = 1;
1696 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1697 }
1698 else if (cmd == 6) // monster width
1699 cell->stat_width = *data++ + 1;
1700 else if (cmd == 0x47)
1701 {
1702 if (*data == 4)
1703 ; // decode player count
1704
1705 data += *data + 1;
1706 }
1707 else if (cmd == 8) // cell flags
1708 cell->flags = *data++;
1709 else if (ext & 0x40) // unknown, multibyte => skip
1710 data += *data + 1;
1711 else
1712 data++;
1713 } 2107 }
1714 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
1715 } 2125 }
1716 else 2126 while (ext & 0x80);
1717 cell->darkness = *data++ + 1;
1718 } 2127 }
1719 2128
1720 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1721 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1722 { 2131 {
1725 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1726 2135
1727 if (cell->tile [z]) 2136 if (cell->tile [z])
1728 { 2137 {
1729 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1730 if (!tex->name) 2140 if (!tex->name)
1731 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1732 2142
1733 if (tex->smoothtile) 2143 if (tex->smoothtile)
1734 { 2144 {
1735 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1736 if (!smooth->name) 2147 if (!smooth->name)
1737 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1738 } 2149 }
1739 } 2150 }
1740 } 2151 }
1741 } 2152 }
1742 else 2153 else
1743 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1744 } 2155 }
1745} 2156}
1746 OUTPUT: 2157 OUTPUT:
1747 RETVAL 2158 RETVAL
1748 2159
1768 ? self->row + y 2179 ? self->row + y
1769 : 0; 2180 : 0;
1770 2181
1771 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1772 { 2183 {
1773 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1774 2185
1775 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1776 { 2187 {
1777 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1778 2189
1780 { 2191 {
1781 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1782 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1783 int a1 = tex.a; 2194 int a1 = tex.a;
1784 2195
1785 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1786 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1787 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1788 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1789 } 2200 }
1790 } 2201 }
1791 2202
1792 *map++ = (r ) 2203 *map++ = (r )
1793 | (g << 8) 2204 | (g << 8)
1794 | (b << 16) 2205 | (b << 16)
1795 | (a << 24); 2206 | (a << 24);
1796 } 2207 }
1797 } 2208 }
1798 2209
1799 RETVAL = map_sv; 2210 RETVAL = map_sv;
1800} 2211}
1801 OUTPUT: 2212 OUTPUT:
1802 RETVAL 2213 RETVAL
1803 2214
1804void 2215void
1805draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1806 CODE: 2217 CODE:
1807{ 2218{
1808 int x, y, z; 2219 int x, y, z;
1809 2220
1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1811 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1812 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1813 smooth_key skey; 2223 smooth_key skey;
1814 2224 int pl_x, pl_y;
2225 maptex pl_tex;
1815 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1816 rc_key_t key; 2228 rc_key_t key;
1817 rc_array_t *arr; 2229 rc_array_t *arr;
1818 2230
2231 pl_tex.name = 0;
2232
1819 // thats current max. sorry. 2233 // that's current max. sorry.
1820 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1821 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1822 2236
1823 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1824 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1828 key.g = 255; 2242 key.g = 255;
1829 key.b = 255; 2243 key.b = 255;
1830 key.a = 255; 2244 key.a = 255;
1831 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1832 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1833 key.texname = -1;
1834 2247
1835 mx += self->x; 2248 mx += self->x;
1836 my += self->y; 2249 my += self->y;
1837 2250
1838 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
1861 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1863 2276
1864 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1865 { 2278 {
2279 smooth_hash smooth;
1866 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1867 2282
1868 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1869 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1870 { 2285 {
1871 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
1881 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1882 int px, py; 2297 int px, py;
1883 2298
1884 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1885 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1886 if (!tex.name) 2303 if (!tex.name)
1887 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1888 2305
1889 key.texname = tex.name; 2306 key.texname = tex.name;
1890 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1891 } 2308 }
1892 2309
1893 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
1894 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2312
2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2314 {
2315 pl_x = px;
2316 pl_y = py;
2317 pl_tex = tex;
2318 continue;
2319 }
1895 2320
1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1898 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2323 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1899 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2324 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1900
1901 if (cell->flags && z == 2)
1902 {
1903 // overlays such as the speech bubble, probably more to come
1904 if (cell->flags & 1)
1905 {
1906 maptex tex = self->tex [1];
1907 int px = x * T + T * 2 / 32;
1908 int py = y * T - T * 6 / 32;
1909
1910 if (tex.name)
1911 {
1912 if (key.texname != tex.name)
1913 {
1914 key.texname = tex.name;
1915 arr = rc_array (rc, &key);
1916 }
1917
1918 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1919 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1920 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1921 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1922 }
1923 }
1924 }
1925 2325
1926 // update smooth hash 2326 // update smooth hash
1927 if (tex.smoothtile) 2327 if (tex.smoothtile)
1928 { 2328 {
1929 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
1945 2345
1946 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1947 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
1948 2348
1949 // full tile 2349 // full tile
1950 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2350 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1951 2351
1952 // borders 2352 // borders
1953 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2353 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1954 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2354 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1955 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2355 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1956 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2356 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1957 2357
1958 // corners 2358 // corners
1959 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2359 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1960 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2360 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1961 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2361 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1962 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2362 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2363 }
2364 }
2365
2366 if (expect_false (z == 2) && expect_false (cell->flags))
2367 {
2368 // overlays such as the speech bubble, probably more to come
2369 if (cell->flags & 1)
2370 {
2371 rc_key_t key_ov = key;
2372 maptex tex = self->tex [TEXID_SPEECH];
2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32;
2376
2377 key_ov.texname = tex.name;
2378 arr = rc_array (rc_ov, &key_ov);
2379
2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1963 } 2384 }
1964 } 2385 }
1965 } 2386 }
1966 } 2387 }
1967 2388
1983 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
1984 { 2405 {
1985 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
1986 HE *he; 2407 HE *he;
1987 2408
1988 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1989 while ((he = hv_iternext (smooth)))
1990 { 2410 {
1991 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
1992 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
1993 2413
1994 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
1995 && skey->level == level 2415 && skey.level == level
1996 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
1997 { 2417 {
1998 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
1999 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2000 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2001 int border = bits & 15; 2421 int border = bits & 15;
2002 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2003 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2004 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2005 2425
2007 { 2427 {
2008 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2009 // save gobs of state changes. 2429 // save gobs of state changes.
2010 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2011 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
2012 glEnd (); 2434 glEnd ();
2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2014 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2015 } 2437 }
2016 2438
2017 if (border) 2439 if (border)
2018 { 2440 {
2019 float ox = border * dx; 2441 float ox = border * dx;
2020 2442
2021 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2022 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2023 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2024 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2025 } 2447 }
2026 2448
2027 if (corner) 2449 if (corner)
2028 { 2450 {
2029 float ox = corner * dx; 2451 float ox = corner * dx;
2030 2452
2031 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2032 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2033 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2034 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2035 } 2457 }
2036 } 2458 }
2037 } 2459 }
2038 } 2460 }
2039 } 2461 }
2041 2463
2042 glEnd (); 2464 glEnd ();
2043 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2044 key.texname = -1; 2466 key.texname = -1;
2045 } 2467 }
2046
2047 hv_clear (smooth);
2048 } 2468 }
2469
2470 if (pl_tex.name)
2471 {
2472 maptex tex = pl_tex;
2473 int px = pl_x + sdx;
2474 int py = pl_y + sdy;
2475
2476 key.texname = tex.name;
2477 arr = rc_array (rc, &key);
2478
2479 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2480 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2481 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2482 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2483
2484 rc_draw (rc);
2485 }
2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
2049 2489
2050 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2051 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2052 2493
2053 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2054 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2055 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2056 { 2497 {
2059 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2060 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2061 { 2502 {
2062 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2063 2504
2064 int px = x * T; 2505 int px = x * Tw;
2065 int py = y * T; 2506 int py = y * Th;
2507
2508 if (expect_false (cell->player == player))
2509 {
2510 px += sdx;
2511 py += sdy;
2512 }
2066 2513
2067 if (cell->stat_hp) 2514 if (cell->stat_hp)
2068 { 2515 {
2069 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2070 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2071 2518
2072 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2073 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2074 px + width - 1, py); 2521 px + width - 1, py);
2075 2522
2081 } 2528 }
2082 } 2529 }
2083} 2530}
2084 2531
2085void 2532void
2086draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2533draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2087 CODE: 2534 CODE:
2088{ 2535{
2089 static float color[16][3] = { 2536 static float color[16][3] = {
2090 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2091 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2092 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2093 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2094 2541
2095 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2096 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2097 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2098 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2099 2546
2100 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2101 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2102 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2103 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2104 2551
2105 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2106 2553
2107 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2108 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2109 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2110 }; 2557 };
2111 2558
2112 int x, y; 2559 int x, y;
2113 2560
2114 glEnable (GL_TEXTURE_2D); 2561 glEnable (GL_TEXTURE_2D);
2562 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2563 * but the nvidia driver (185.18.14) mishandles alpha textures
2564 * and takes the colour from god knows where instead of using
2565 * Cp. MODULATE results in the same colour, but slightly different
2566 * alpha, but atcually gives us the correct colour with nvidia.
2567 */
2115 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2116 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2117 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2118 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2119 2572
2120 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2124 2577
2125 if (m) 2578 if (m)
2126 { 2579 {
2127 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2128 2581
2129 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2130 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2131 2584
2132 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2133 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2134 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2135 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2136 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2137 } 2590 }
2145void 2598void
2146fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2599fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2147 PPCODE: 2600 PPCODE:
2148{ 2601{
2149 int x, y; 2602 int x, y;
2150 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2151 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2152 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2153 int sw34 = (sw * 3 + 3) & ~3; 2606 int sw3 = sw * 3;
2607 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2608 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2154 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2155 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2156 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2157 2611
2158 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2159 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2160 2614
2161 mx += self->x - 1; 2615 mx += self->x - 1;
2162 my += self->y - 1; 2616 my += self->y - 1;
2163
2164 memset (darkness1, 255, sw1 * sh1);
2165 2617
2166 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2167 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2168 { 2620 {
2169 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2172 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2173 { 2625 {
2174 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2175 2627
2176 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2177 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2178 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2179 } 2631 }
2180 } 2632 }
2181 2633
2182 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2183 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2202 2654
2203 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2204 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2205 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2206 2658
2207 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2208 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2209 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2210 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2211 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2663 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2212 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2213 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2214 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2215 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2216 } 2668 }
2217 2669
2218 free (darkness1); 2670 free (darkness1);
2219 2671
2220 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2221 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2222 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2223 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2224} 2676}
2225 2677
2226SV * 2678SV *
2289 else 2741 else
2290 *data++ = 0; 2742 *data++ = 0;
2291 } 2743 }
2292 } 2744 }
2293 2745
2746 /* if size is w*h + 5 then no data has been found */
2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2748 {
2294 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2295 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2751 }
2752
2296 RETVAL = data_sv; 2753 RETVAL = data_sv;
2297} 2754}
2298 OUTPUT: 2755 OUTPUT:
2299 RETVAL 2756 RETVAL
2300 2757
2301void 2758void
2302set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2759set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2303 PPCODE: 2760 PPCODE:
2304{ 2761{
2305 int x, y, z; 2762 int x, y, z;
2306 int w, h; 2763 int w, h;
2307 int x1, y1; 2764 int x1, y1;
2765 STRLEN len;
2766 uint8_t *data, *end;
2767
2768 len = SvLEN (data_sv);
2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2771 end = data + len + 8;
2772
2773 if (len < 5)
2774 XSRETURN_EMPTY;
2308 2775
2309 if (*data++ != 0) 2776 if (*data++ != 0)
2310 XSRETURN_EMPTY; /* version mismatch */ 2777 XSRETURN_EMPTY; /* version mismatch */
2311 2778
2312 w = *data++ << 8; w |= *data++; 2779 w = *data++ << 8; w |= *data++;
2327 { 2794 {
2328 maprow *row = map_get_row (self, y); 2795 maprow *row = map_get_row (self, y);
2329 2796
2330 for (x = x0; x < x1; x++) 2797 for (x = x0; x < x1; x++)
2331 { 2798 {
2799 uint8_t flags;
2800
2801 if (data + 7 >= end)
2802 XSRETURN_EMPTY;
2803
2332 uint8_t flags = *data++; 2804 flags = *data++;
2333 2805
2334 if (flags) 2806 if (flags)
2335 { 2807 {
2336 mapcell *cell = row_get_cell (row, x); 2808 mapcell *cell = row_get_cell (row, x);
2337 tileid tile[3] = { 0, 0, 0 }; 2809 tileid tile[3] = { 0, 0, 0 };
2340 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2812 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2341 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2813 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2342 2814
2343 if (cell->darkness == 0) 2815 if (cell->darkness == 0)
2344 { 2816 {
2345 cell->darkness = 0; 2817 /*cell->darkness = 0;*/
2818 EXTEND (SP, 3);
2346 2819
2347 for (z = 0; z <= 2; z++) 2820 for (z = 0; z <= 2; z++)
2348 { 2821 {
2349 tileid t = tile [z]; 2822 tileid t = tile [z];
2350 2823
2351 if (t >= self->texs || (t && !self->tex [t].name)) 2824 if (t >= self->texs || (t && !self->tex [t].name))
2352 { 2825 {
2353 XPUSHs (sv_2mortal (newSViv (t))); 2826 PUSHs (sv_2mortal (newSViv (t)));
2354 need_texid (self, t); 2827 need_texid (self, t);
2355 } 2828 }
2356 2829
2357 cell->tile [z] = t; 2830 cell->tile [z] = t;
2358 } 2831 }
2363} 2836}
2364 2837
2365MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2366 2839
2367DC::RW 2840DC::RW
2368new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2369 CODE: 2842 CODE:
2370{ 2843{
2371 STRLEN datalen; 2844 STRLEN datalen;
2372 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2373 2846
2375} 2848}
2376 OUTPUT: 2849 OUTPUT:
2377 RETVAL 2850 RETVAL
2378 2851
2379DC::RW 2852DC::RW
2380new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2381 CODE: 2854 CODE:
2382 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2383 OUTPUT: 2856 OUTPUT:
2384 RETVAL 2857 RETVAL
2385 2858
2403 if (RETVAL < 0) 2876 if (RETVAL < 0)
2404 { 2877 {
2405 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2406 2879
2407 if (RETVAL < 0) 2880 if (RETVAL < 0)
2881 {
2882 // happens sometimes, maybe it just stopped playing(?)
2883 RETVAL = Mix_GroupAvailable (-1);
2884
2885 if (RETVAL < 0)
2408 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2409 2887 }
2888 else
2410 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2411 } 2890 }
2412 2891
2413 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2414 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2415} 2894}
2462void 2941void
2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2464 CODE: 2943 CODE:
2465{ 2944{
2466 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2945 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2467 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2946 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2469} 2948}
2470 2949
2471void 2950void
2472set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2475 2954
2476MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2477 2956
2478PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2479 2958
2959void
2960decoders ()
2961 PPCODE:
2962#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2963 int i, num = Mix_GetNumChunkDecoders ();
2964 EXTEND (SP, num);
2965 for (i = 0; i < num; ++i)
2966 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2967#else
2968 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2969#endif
2970
2480DC::MixChunk 2971DC::MixChunk
2481new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2482 CODE: 2973 CODE:
2483 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2484 OUTPUT: 2975 OUTPUT:
2485 RETVAL 2976 RETVAL
2486 2977
2516 OUTPUT: 3007 OUTPUT:
2517 RETVAL 3008 RETVAL
2518 3009
2519MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2520 3011
3012void
3013decoders ()
3014 PPCODE:
3015#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3016 int i, num = Mix_GetNumMusicDecoders ();
3017 EXTEND (SP, num);
3018 for (i = 0; i < num; ++i)
3019 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3020#else
3021 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3022#endif
3023
2521int 3024int
2522volume (int volume = -1) 3025volume (int volume = -1)
2523 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2524 CODE: 3027 CODE:
2525 if (items > 0) 3028 if (items > 0)
2536void 3039void
2537halt () 3040halt ()
2538 CODE: 3041 CODE:
2539 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2540 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2541DC::MixMusic 3051DC::MixMusic
2542new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2543 CODE: 3053 CODE:
2544 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2545 OUTPUT: 3055 OUTPUT:
2546 RETVAL 3056 RETVAL
2547 3057
2575 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2576# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2577 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2578 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2579 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2580 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2581 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2582 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2583 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2584 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2596 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2597 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2598 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2599 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2600 const_iv (GL_ONE_MINUS_DST_ALPHA), 3111 const_iv (GL_ONE_MINUS_DST_ALPHA),
3112 const_iv (GL_SRC_COLOR),
3113 const_iv (GL_DST_COLOR),
3114 const_iv (GL_ONE_MINUS_SRC_COLOR),
3115 const_iv (GL_ONE_MINUS_DST_COLOR),
2601 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2602 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2603 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2604 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2605 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2673 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2674 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2675 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2676 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2677 const_iv (GL_T2F_N3F_V3F), 3192 const_iv (GL_T2F_N3F_V3F),
3193 const_iv (GL_FUNC_ADD),
3194 const_iv (GL_FUNC_SUBTRACT),
3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2678# undef const_iv 3196# undef const_iv
2679 }; 3197 };
2680 3198
2681 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3199 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2682 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2683 3201
2684 texture_av = newAV (); 3202 texture_av = newAV ();
2685 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2686} 3204}
2687 3205
2689disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2690 CODE: 3208 CODE:
2691 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2693 3211
2694char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2695gl_vendor () 3216gl_vendor ()
2696 CODE: 3217 CODE:
2697 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2698 OUTPUT: 3219 OUTPUT:
2699 RETVAL 3220 RETVAL
2700 3221
2701char * 3222const char *
2702gl_version () 3223gl_version ()
2703 CODE: 3224 CODE:
2704 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2705 OUTPUT: 3226 OUTPUT:
2706 RETVAL 3227 RETVAL
2707 3228
2708char * 3229const char *
2709gl_extensions () 3230gl_extensions ()
2710 CODE: 3231 CODE:
2711 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2712 OUTPUT: 3233 OUTPUT:
2713 RETVAL 3234 RETVAL
2714 3235
2715const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2716 3241
2717GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2718 CODE: 3243 CODE:
2719 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2720 OUTPUT: 3245 OUTPUT:
2728 3253
2729int glGetError () 3254int glGetError ()
2730 3255
2731void glFinish () 3256void glFinish ()
2732 3257
3258void glFlush ()
3259
2733void glClear (int mask) 3260void glClear (int mask)
2734 3261
2735void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2736 PROTOTYPE: @ 3263 PROTOTYPE: @
2737 3264
2746void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2747 3274
2748void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2749 CODE: 3276 CODE:
2750 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2751 3280
2752void glDepthMask (int flag) 3281void glDepthMask (int flag)
2753 3282
2754void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2755 3284
2790void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2791 CODE: 3320 CODE:
2792 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2793 3322
2794void glColor (float r, float g, float b, float a = 1.0) 3323void glColor (float r, float g, float b, float a = 1.0)
3324 PROTOTYPE: @
2795 ALIAS: 3325 ALIAS:
2796 glColor_premultiply = 1 3326 glColor_premultiply = 1
2797 CODE: 3327 CODE:
2798 if (ix) 3328 if (ix)
2799 { 3329 {
2905 3435
2906void glEndList () 3436void glEndList ()
2907 3437
2908void glCallList (int list) 3438void glCallList (int list)
2909 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
2910MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2911 3446
2912PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
2913 3448
2914void 3449void
2915find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
2916 PPCODE: 3451 PPCODE:
2917{ 3452{
2918 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
2919 XPUSHs (self); 3454 XPUSHs (self);
2920} 3455}
2921 3456
2922BOOT: 3457BOOT:
2923{ 3458{
2931 3466
2932void 3467void
2933draw (SV *self) 3468draw (SV *self)
2934 CODE: 3469 CODE:
2935{ 3470{
2936 HV *hv; 3471 HV *hv;
2937 SV **svp; 3472 SV **svp;
2938 NV x, y, w, h; 3473 NV x, y, w, h;
2939 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
2940 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
2941 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
2942 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines