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.270 by root, Sun Jul 20 15:05:13 2008 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 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>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
78 89
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
82 96
83#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
85 99
86#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
87 101
88/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
104
105#define KMOD_LRAM 0x10000 // our extension
106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
90 128
91static AV *texture_av; 129static AV *texture_av;
92 130
93static struct 131static struct
94{ 132{
151{ 189{
152 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
153 191
154 while (attrs) 192 while (attrs)
155 { 193 {
156 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 195
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 197 return 1;
160 198
161 attrs = attrs->next; 199 attrs = attrs->next;
162 } 200 }
163 201
164 return 0; 202 return 0;
165} 203}
166 204
167typedef struct cf_layout { 205struct cf_layout {
168 PangoLayout *pl; 206 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
170 int base_height; 208 int base_height;
171 DC__Font font; 209 DC__Font font;
172 rc_t *rc; 210 rc_t *rc;
173} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
174 214
175static DC__Font default_font; 215static DC__Font default_font;
176static PangoContext *opengl_context; 216static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
178 218
179static void 219static void
180substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
181{ 221{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 225#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 227}
188 228
189static void 229static void
219} 259}
220 260
221typedef uint16_t tileid; 261typedef uint16_t tileid;
222typedef uint16_t faceid; 262typedef uint16_t faceid;
223 263
224typedef struct { 264struct maptex
265{
225 GLuint name; 266 GLuint name;
226 int w, h; 267 int w, h;
227 float s, t; 268 float s, t;
228 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
229 tileid smoothtile; 270 tileid smoothtile;
230 uint8_t smoothlevel; 271 uint8_t smoothlevel;
231} maptex; 272 uint8_t unused; /* set to zero on use */
273};
232 274
233typedef struct { 275struct mapcell
276{
234 uint32_t player; 277 uint32_t player;
235 tileid tile[3]; 278 tileid tile[3];
236 uint16_t darkness; 279 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 281};
239 282
240typedef struct { 283struct maprow
284{
241 int32_t c0, c1; 285 int32_t c0, c1;
242 mapcell *col; 286 mapcell *col;
243} maprow; 287};
244 288
245typedef struct map { 289struct mapgrid {
246 int x, y, w, h; 290 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
250 294
251 int32_t rows; 295 int32_t rows;
252 maprow *row; 296 maprow *row;
253} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
254 300
255static char * 301static char *
256prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
257{ 303{
258 char *p; 304 char *p;
276 322
277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
278#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
279 325
280static void 326static void
281need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
282{ 328{
283 while (self->faces <= face) 329 while (self->faces <= face)
284 { 330 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 332 self->faces *= 2;
287 } 333 }
288} 334}
289 335
290static void 336static void
291need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
292{ 338{
293 while (self->texs <= texid) 339 while (self->texs <= texid)
294 { 340 {
295 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
296 self->texs *= 2; 342 self->texs *= 2;
297 } 343 }
298} 344}
299 345
300static maprow * 346static maprow *
301map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
302{ 348{
303 if (0 > y) 349 if (0 > y)
304 { 350 {
305 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
344 390
345 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
346} 392}
347 393
348static mapcell * 394static mapcell *
349map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
350{ 396{
351 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
352} 398}
353 399
354static void 400static void
355map_clear (DC__Map self) 401map_clear (mapgrid *self)
356{ 402{
357 int r; 403 int r;
358 404
359 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
378 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
379 (cell)->player = 0; \ 425 (cell)->player = 0; \
380 } while (0) 426 } while (0)
381 427
382static void 428static void
383map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
384{ 430{
385 int x, y; 431 int x, y;
386 maprow *row; 432 maprow *row;
387 mapcell *cell; 433 mapcell *cell;
388 434
405 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
406 } 452 }
407 } 453 }
408} 454}
409 455
410typedef struct { 456struct smooth_key
457{
411 tileid tile; 458 tileid tile;
412 uint8_t x, y, level; 459 uint8_t x, y, level;
413} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
414 479
415static void 480static void
416smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
417{ 482{
418 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
419 484
420 if (SvIOK (*sv)) 485 if (it == h.end ())
421 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
422 else 487 else
423 sv_setiv (*sv, bits); 488 it->second |= bits;
424} 489}
425 490
426static void 491static void
427music_finished (void) 492music_finished (void)
428{ 493{
445 ev.code = 1; 510 ev.code = 1;
446 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
447 ev.data2 = 0; 512 ev.data2 = 0;
448 513
449 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
450} 522}
451 523
452static unsigned int 524static unsigned int
453minpot (unsigned int n) 525minpot (unsigned int n)
454{ 526{
521 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
522 return 0; 594 return 0;
523 595
524 return 1; 596 return 1;
525} 597}
598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
526 656
527MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
528 658
529PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
530 660
559 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
560 690
561 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
563 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
564 744
565 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
648 828
829 const_iv (KMOD_LRAM),
830
649 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
650 832
651 const_iv (SDL_INIT_TIMER), 833 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 834 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 835 const_iv (SDL_INIT_VIDEO),
677 859
678 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
679# undef const_iv 861# undef const_iv
680 }; 862 };
681 863
682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
684 866
685 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
686 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
687} 869}
688 870
701 883
702NV floor (NV x) 884NV floor (NV x)
703 885
704NV ceil (NV x) 886NV ceil (NV x)
705 887
706NV ceilabs (NV x) 888IV minpot (UV n)
889
890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
707 CODE: 893 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x); 894 RETVAL = pow (dx * dx + dy * dy, 0.5);
709 OUTPUT: 895 OUTPUT:
710 RETVAL 896 RETVAL
711
712IV minpot (UV n)
713
714IV popcount (UV n)
715 897
716void 898void
717pango_init () 899pango_init ()
718 CODE: 900 CODE:
719{ 901{
727#endif 909#endif
728} 910}
729 911
730char *SDL_GetError () 912char *SDL_GetError ()
731 913
914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
916
732int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
733 918
734int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
735 920
736void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
737 922
738void SDL_Quit () 923void SDL_Quit ()
739 924
740int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
741 927
742int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
743 CODE: 929 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
745 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
746 OUTPUT: 932 OUTPUT:
747 RETVAL 933 RETVAL
748 934
749void 935void
804 ); 990 );
805 991
806 if (RETVAL) 992 if (RETVAL)
807 { 993 {
808 av_clear (texture_av); 994 av_clear (texture_av);
809
810 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
811#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
812#include "glfunc.h" 996#include "glfunc.h"
813#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
814 } 1000 }
815} 1001}
816 OUTPUT: 1002 OUTPUT:
817 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
818 1007
819void 1008void
820SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
821 1010
822char * 1011char *
823SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
824 1014
825int 1015int
826SDL_GetAppState () 1016SDL_GetAppState ()
827 1017
828int 1018int
829SDL_GetModState () 1019SDL_GetModState ()
830 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
831void 1025void
1026SDL_PumpEvents ()
1027
1028void
832poll_events () 1029peep_events ()
833 PPCODE: 1030 PPCODE:
834{ 1031{
835 SDL_Event ev; 1032 SDL_Event ev;
836 1033
837 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
844 { 1041 {
845 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
846 case SDL_KEYUP: 1043 case SDL_KEYUP:
847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
849 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
850 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
852 break; 1049 break;
853 1050
854 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
873 x = ev.motion.x; 1070 x = ev.motion.x;
874 y = ev.motion.y; 1071 y = ev.motion.y;
875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
876 } 1073 }
877 1074
878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
879 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
880 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
881 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
882 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
883 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
903 1100
904 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
905 } 1102 }
906} 1103}
907 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
908int 1118int
909Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
910 POSTCALL: 1120 POSTCALL:
911 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
912 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
913 1123
914void 1124void
915Mix_QuerySpec () 1125Mix_QuerySpec ()
974add_font (char *file) 1184add_font (char *file)
975 CODE: 1185 CODE:
976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT: 1187 OUTPUT:
978 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
979 1196
980void 1197void
981load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
982 ALIAS: 1199 ALIAS:
983 load_image_file = 1 1200 load_image_file = 1
1029 1246
1030 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1031 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1032 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1033 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1034 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1035 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1036 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1037 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1038 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1039 1256
1099#if DEBUG 1316#if DEBUG
1100 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1101#endif 1318#endif
1102} 1319}
1103 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1104MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1105 1329
1106PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1107 1331
1108DC::Font 1332DC::Font
1109new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1110 CODE: 1334 CODE:
1111{ 1335{
1112 int count; 1336 int count;
1113 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1114 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1143 PROTOTYPE: 1367 PROTOTYPE:
1144 CODE: 1368 CODE:
1145 tc_restore (); 1369 tc_restore ();
1146 1370
1147DC::Layout 1371DC::Layout
1148new (SV *class) 1372new (SV *klass)
1149 CODE: 1373 CODE:
1150 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1151 1375
1152 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1153 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1302 1526
1303void 1527void
1304set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1305 CODE: 1529 CODE:
1306 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1307 { 1531 {
1308 self->base_height = base_height; 1532 self->base_height = base_height;
1309 layout_update_font (self); 1533 layout_update_font (self);
1310 } 1534 }
1311 1535
1312void 1536void
1539 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1540 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1541 } 1765 }
1542} 1766}
1543 1767
1768void
1769draw_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)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1544IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1545 CODE: 1890 CODE:
1546{ 1891{
1547 GLint width; 1892 GLint width;
1548 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1555MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1556 1901
1557PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1558 1903
1559DC::Map 1904DC::Map
1560new (SV *class) 1905new (SV *klass)
1561 CODE: 1906 CODE:
1562 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1563 RETVAL->x = 0; 1908 RETVAL->x = 0;
1564 RETVAL->y = 0; 1909 RETVAL->y = 0;
1565 RETVAL->w = 0; 1910 RETVAL->w = 0;
1566 RETVAL->h = 0; 1911 RETVAL->h = 0;
1567 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1604 1949
1605void 1950void
1606set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1607 CODE: 1952 CODE:
1608{ 1953{
1609 tileid texid; 1954 tileid texid;
1610 maptex *tex; 1955 maptex *tex;
1611 1956
1612 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1613 return; 1958 return;
1614 1959
1615 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1616 return; 1961 return;
1617 1962
1618 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1619 1964
1620 if (!texid) 1965 if (!texid)
1621 return; 1966 return;
1622 1967
1623 tex = self->tex + texid; 1968 tex = self->tex + texid;
1652 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1997 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1653 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1654 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1656} 2001}
2002
2003void
2004expire_textures (DC::Map self, int texid, int count)
2005 PPCODE:
2006 for (; texid < self->texs && count; ++texid, --count)
2007 {
2008 maptex *tex = self->tex + texid;
2009
2010 if (tex->name)
2011 {
2012 if (tex->unused)
2013 {
2014 tex->name = 0;
2015 tex->unused = 0;
2016 XPUSHs (sv_2mortal (newSViv (texid)));
2017 }
2018 else
2019 tex->unused = 1;
2020 }
2021 }
1657 2022
1658int 2023int
1659ox (DC::Map self) 2024ox (DC::Map self)
1660 ALIAS: 2025 ALIAS:
1661 oy = 1 2026 oy = 1
1701 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1702 } 2067 }
1703} 2068}
1704 2069
1705SV * 2070SV *
1706map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1707 CODE: 2072 CODE:
1708{ 2073{
1709 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1710 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1711 mapcell *cell; 2076 mapcell *cell;
1732 2097
1733 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1734 2099
1735 if (flags & 8) 2100 if (flags & 8)
1736 { 2101 {
2102 uint8_t ext, cmd;
2103
1737 if (extmap) 2104 do
1738 { 2105 {
1739 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1740 2108
1741 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1742 { 2112 {
1743 ext = *data++;
1744 cmd = ext & 0x7f;
1745
1746 if (cmd < 4)
1747 cell->darkness = 255 - ext * 64 + 1;
1748 else if (cmd == 5) // health
1749 {
1750 cell->stat_width = 1; 2113 cell->stat_width = 1;
1751 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1752 }
1753 else if (cmd == 6) // monster width
1754 cell->stat_width = *data++ + 1;
1755 else if (cmd == 0x47)
1756 {
1757 if (*data == 1) cell->player = data [1];
1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1761
1762 data += *data + 1;
1763 }
1764 else if (cmd == 8) // cell flags
1765 cell->flags = *data++;
1766 else if (ext & 0x40) // unknown, multibyte => skip
1767 data += *data + 1;
1768 else
1769 data++;
1770 } 2115 }
1771 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
1772 } 2133 }
1773 else 2134 while (ext & 0x80);
1774 cell->darkness = *data++ + 1;
1775 } 2135 }
1776 2136
1777 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1778 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1779 { 2139 {
1782 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1783 2143
1784 if (cell->tile [z]) 2144 if (cell->tile [z])
1785 { 2145 {
1786 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1787 if (!tex->name) 2148 if (!tex->name)
1788 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1789 2150
1790 if (tex->smoothtile) 2151 if (tex->smoothtile)
1791 { 2152 {
1792 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1793 if (!smooth->name) 2155 if (!smooth->name)
1794 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1795 } 2157 }
1796 } 2158 }
1797 } 2159 }
1825 ? self->row + y 2187 ? self->row + y
1826 : 0; 2188 : 0;
1827 2189
1828 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1829 { 2191 {
1830 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1831 2193
1832 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1833 { 2195 {
1834 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1835 2197
1837 { 2199 {
1838 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1839 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1840 int a1 = tex.a; 2202 int a1 = tex.a;
1841 2203
1842 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1843 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1844 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1845 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1846 } 2208 }
1847 } 2209 }
1848 2210
1849 *map++ = (r ) 2211 *map++ = (r )
1850 | (g << 8) 2212 | (g << 8)
1851 | (b << 16) 2213 | (b << 16)
1852 | (a << 24); 2214 | (a << 24);
1853 } 2215 }
1854 } 2216 }
1855 2217
1856 RETVAL = map_sv; 2218 RETVAL = map_sv;
1857} 2219}
1858 OUTPUT: 2220 OUTPUT:
1859 RETVAL 2221 RETVAL
1860 2222
1861void 2223void
1862draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1863 CODE: 2225 CODE:
1864{ 2226{
1865 int x, y, z; 2227 int x, y, z;
1866 2228
1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1868 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1870 smooth_key skey;
1871 int pl_x, pl_y; 2230 int pl_x, pl_y;
1872 maptex pl_tex; 2231 maptex pl_tex;
1873 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1874 rc_key_t key; 2234 rc_key_t key;
1875 rc_array_t *arr; 2235 rc_array_t *arr;
1876 2236
1877 pl_tex.name = 0; 2237 pl_tex.name = 0;
1878 2238
1879 // thats current max. sorry. 2239 // that's current max. sorry.
1880 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1881 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1882
1883 // clear key, in case of extra padding
1884 memset (&skey, 0, sizeof (skey));
1885 2242
1886 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1887 key.r = 255; 2244 key.r = 255;
1888 key.g = 255; 2245 key.g = 255;
1889 key.b = 255; 2246 key.b = 255;
1890 key.a = 255; 2247 key.a = 255;
1891 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1892 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
1893 key.texname = -1;
1894 2250
1895 mx += self->x; 2251 mx += self->x;
1896 my += self->y; 2252 my += self->y;
1897 2253
1898 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1899 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1900 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1901 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1902 2258
1903 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1904 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1905 { 2261 {
1906 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1921 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1922 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1923 2279
1924 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1925 { 2281 {
1926 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2285 key.texname = -1;
1927 2286
1928 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
1929 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
1930 { 2289 {
1931 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
1937 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
1938 2297
1939 if (tile) 2298 if (tile)
1940 { 2299 {
1941 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
1942 int px = (x + 1) * T - tex.w; 2301 int px, py;
1943 int py = (y + 1) * T - tex.h;
1944 2302
1945 if (key.texname != tex.name) 2303 if (key.texname != tex.name)
1946 { 2304 {
2305 self->tex [tile].unused = 0;
2306
1947 if (!tex.name) 2307 if (!tex.name)
1948 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1949 2309
1950 key.texname = tex.name; 2310 key.texname = tex.name;
1951 arr = rc_array (rc, &key); 2311 arr = rc_array (rc, &key);
1952 } 2312 }
2313
2314 px = (x + 1) * Th - tex.w;
2315 py = (y + 1) * Tw - tex.h;
1953 2316
1954 if (expect_false (cell->player == player) && expect_false (z == 2)) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
1955 { 2318 {
1956 pl_x = px; 2319 pl_x = px;
1957 pl_y = py; 2320 pl_y = py;
1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1963 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2326 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1964 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2327 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2328 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1966 2329
1967 if (expect_false (cell->flags) && expect_false (z == 2))
1968 {
1969 // overlays such as the speech bubble, probably more to come
1970 if (cell->flags & 1)
1971 {
1972 maptex tex = self->tex [1];
1973 int px = x * T + T * 2 / 32;
1974 int py = y * T - T * 6 / 32;
1975
1976 if (tex.name)
1977 {
1978 if (key.texname != tex.name)
1979 {
1980 key.texname = tex.name;
1981 arr = rc_array (rc, &key);
1982 }
1983
1984 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1988 }
1989 }
1990 }
1991
1992 // update smooth hash 2330 // update smooth hash
1993 if (tex.smoothtile) 2331 if (tex.smoothtile)
1994 { 2332 {
1995 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
1996 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
1997 2335
1998 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
1999 2337
2000 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
2001 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
2002 2340
2003 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2011 2349
2012 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2013 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2014 2352
2015 // full tile 2353 // full tile
2016 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2017 2355
2018 // borders 2356 // borders
2019 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2020 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2358 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2021 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2359 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2022 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2023 2361
2024 // corners 2362 // corners
2025 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2026 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2364 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2027 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2365 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2028 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2367 }
2368 }
2369
2370 if (expect_false (z == 2) && expect_false (cell->flags))
2371 {
2372 // overlays such as the speech bubble, probably more to come
2373 if (cell->flags & 1)
2374 {
2375 rc_key_t key_ov = key;
2376 maptex tex = self->tex [TEXID_SPEECH];
2377 rc_array_t *arr;
2378 int px = x * Tw + Tw * 2 / 32;
2379 int py = y * Th - Th * 6 / 32;
2380
2381 key_ov.texname = tex.name;
2382 arr = rc_array (rc_ov, &key_ov);
2383
2384 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2385 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2386 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2029 } 2388 }
2030 } 2389 }
2031 } 2390 }
2032 } 2391 }
2033 2392
2039 { 2398 {
2040 int w, b; 2399 int w, b;
2041 2400
2042 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2043 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2044 for (w = 0; w < 256 / 32; ++w) 2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2045 { 2406 {
2046 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2047 if (smask) 2408 IV bits = it->second;
2048 for (b = 0; b < 32; ++b) 2409
2049 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2050 { 2413 {
2051 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
2052 HE *he; 2422 if (tex.name)
2053
2054 hv_iterinit (smooth);
2055 while ((he = hv_iternext (smooth)))
2056 { 2423 {
2057 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2058 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2059 2426 if (key.texname != tex.name)
2060 if (!(bits & 0x1000)
2061 && skey->level == level
2062 && level > smooth_max [skey->x][skey->y])
2063 { 2427 {
2064 maptex tex = self->tex [skey->tile]; 2428 self->tex [skey.tile].unused = 0;
2065 int px = (((int)skey->x) - 1) * T;
2066 int py = (((int)skey->y) - 1) * T;
2067 int border = bits & 15;
2068 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2069 float dx = tex.s * .0625f; // 16 images/row
2070 float dy = tex.t * .5f ; // 2 images/column
2071 2429
2072 if (tex.name)
2073 {
2074 // this time avoiding texture state changes
2075 // save gobs of state changes.
2076 if (key.texname != tex.name)
2077 {
2078 glEnd (); 2430 glEnd ();
2079 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2080 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2081 } 2433 }
2082 2434
2083 if (border) 2435 if (border)
2084 { 2436 {
2085 float ox = border * dx; 2437 float ox = border * dx;
2086 2438
2087 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2091 } 2443 }
2092 2444
2093 if (corner) 2445 if (corner)
2094 { 2446 {
2095 float ox = corner * dx; 2447 float ox = corner * dx;
2096 2448
2097 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2098 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2099 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2100 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2101 }
2102 }
2103 } 2453 }
2104 } 2454 }
2105 } 2455 }
2106 } 2456 }
2107 2457
2108 glEnd (); 2458 glEnd ();
2109 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2110 key.texname = -1; 2460 key.texname = -1;
2111 } 2461 }
2112
2113 hv_clear (smooth);
2114 } 2462 }
2115 2463
2116 if (pl_tex.name) 2464 if (pl_tex.name)
2117 { 2465 {
2118 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2476 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129 2477
2130 rc_draw (rc); 2478 rc_draw (rc);
2131 } 2479 }
2132 2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
2133 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2134 rc_free (rc); 2485 rc_free (rc);
2486 rc_free (rc_ov);
2135 2487
2136 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
2137 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
2138 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
2139 { 2491 {
2142 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2496 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
2146 2498
2147 int px = x * T; 2499 int px = x * Tw;
2148 int py = y * T; 2500 int py = y * Th;
2501
2502 if (expect_false (cell->player == player))
2503 {
2504 px += sdx;
2505 py += sdy;
2506 }
2149 2507
2150 if (cell->stat_hp) 2508 if (cell->stat_hp)
2151 { 2509 {
2152 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
2153 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2154 2512
2155 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
2156 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
2157 px + width - 1, py); 2515 px + width - 1, py);
2158 2516
2164 } 2522 }
2165 } 2523 }
2166} 2524}
2167 2525
2168void 2526void
2169draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2527draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2170 CODE: 2528 CODE:
2171{ 2529{
2172 static float color[16][3] = { 2530 static float color[16][3] = {
2173 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
2174 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
2175 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
2176 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
2177 2535
2178 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
2179 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
2180 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
2181 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
2182 2540
2183 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
2184 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
2185 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
2186 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
2187 2545
2188 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
2189 2547
2190 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
2191 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
2192 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
2193 }; 2551 };
2194 2552
2195 int x, y; 2553 int x, y;
2196 2554
2197 glEnable (GL_TEXTURE_2D); 2555 glEnable (GL_TEXTURE_2D);
2556 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2557 * but the nvidia driver (185.18.14) mishandles alpha textures
2558 * and takes the colour from god knows where instead of using
2559 * Cp. MODULATE results in the same colour, but slightly different
2560 * alpha, but atcually gives us the correct colour with nvidia.
2561 */
2198 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2199 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
2200 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2201 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
2202 2566
2203 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
2207 2571
2208 if (m) 2572 if (m)
2209 { 2573 {
2210 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2211 2575
2212 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2213 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2214 2578
2215 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2216 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2217 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2218 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2219 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2220 } 2584 }
2228void 2592void
2229fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2593fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2230 PPCODE: 2594 PPCODE:
2231{ 2595{
2232 int x, y; 2596 int x, y;
2233 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2234 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2235 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2236 int sw34 = (sw * 3 + 3) & ~3; 2600 int sw3 = sw * 3;
2601 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2602 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2237 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2238 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2239 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2240 2605
2241 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2242 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2243 2608
2244 mx += self->x - 1; 2609 mx += self->x - 1;
2245 my += self->y - 1; 2610 my += self->y - 1;
2246
2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2248 2611
2249 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2250 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2251 { 2614 {
2252 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2255 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2256 { 2619 {
2257 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2258 2621
2259 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2260 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2261 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2262 } 2625 }
2263 } 2626 }
2264 2627
2265 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2266 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2285 2648
2286 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2287 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2288 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2289 2652
2290 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2291 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2292 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2293 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2294 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2657 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2295 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2296 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2297 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2298 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2299 } 2662 }
2300 2663
2301 free (darkness1); 2664 free (darkness1);
2302 2665
2303 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2304 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2305 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2306 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2307} 2670}
2308 2671
2309SV * 2672SV *
2372 else 2735 else
2373 *data++ = 0; 2736 *data++ = 0;
2374 } 2737 }
2375 } 2738 }
2376 2739
2377 /* if size is w*h + 5 then no data has been found */ 2740 /* if size is w*h + 5 then no data has been found */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 { 2742 {
2380 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 } 2745 }
2383 2746
2384 RETVAL = data_sv; 2747 RETVAL = data_sv;
2385} 2748}
2386 OUTPUT: 2749 OUTPUT:
2387 RETVAL 2750 RETVAL
2388 2751
2389void 2752void
2396 STRLEN len; 2759 STRLEN len;
2397 uint8_t *data, *end; 2760 uint8_t *data, *end;
2398 2761
2399 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2402 end = data + len + 8; 2765 end = data + len + 8;
2403 2766
2404 if (len < 5) 2767 if (len < 5)
2405 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2406 2769
2467} 2830}
2468 2831
2469MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2470 2833
2471DC::RW 2834DC::RW
2472new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2473 CODE: 2836 CODE:
2474{ 2837{
2475 STRLEN datalen; 2838 STRLEN datalen;
2476 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2477 2840
2479} 2842}
2480 OUTPUT: 2843 OUTPUT:
2481 RETVAL 2844 RETVAL
2482 2845
2483DC::RW 2846DC::RW
2484new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2485 CODE: 2848 CODE:
2486 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2487 OUTPUT: 2850 OUTPUT:
2488 RETVAL 2851 RETVAL
2489 2852
2507 if (RETVAL < 0) 2870 if (RETVAL < 0)
2508 { 2871 {
2509 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2510 2873
2511 if (RETVAL < 0) 2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2512 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2513 2881 }
2882 else
2514 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2515 } 2884 }
2516 2885
2517 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2518 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2519} 2888}
2566void 2935void
2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2568 CODE: 2937 CODE:
2569{ 2938{
2570 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2939 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2571 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2940 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2573} 2942}
2574 2943
2575void 2944void
2576set_reverse_stereo (DC::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2579 2948
2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2581 2950
2582PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2583 2952
2953void
2954decoders ()
2955 PPCODE:
2956#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2957 int i, num = Mix_GetNumChunkDecoders ();
2958 EXTEND (SP, num);
2959 for (i = 0; i < num; ++i)
2960 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2961#else
2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2963#endif
2964
2584DC::MixChunk 2965DC::MixChunk
2585new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2586 CODE: 2967 CODE:
2587 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2588 OUTPUT: 2969 OUTPUT:
2589 RETVAL 2970 RETVAL
2590 2971
2620 OUTPUT: 3001 OUTPUT:
2621 RETVAL 3002 RETVAL
2622 3003
2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2624 3005
3006void
3007decoders ()
3008 PPCODE:
3009#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3010 int i, num = Mix_GetNumMusicDecoders ();
3011 EXTEND (SP, num);
3012 for (i = 0; i < num; ++i)
3013 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3014#else
3015 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3016#endif
3017
2625int 3018int
2626volume (int volume = -1) 3019volume (int volume = -1)
2627 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2628 CODE: 3021 CODE:
2629 if (items > 0) 3022 if (items > 0)
2640void 3033void
2641halt () 3034halt ()
2642 CODE: 3035 CODE:
2643 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2644 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2645DC::MixMusic 3045DC::MixMusic
2646new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
2647 CODE: 3047 CODE:
2648 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2649 OUTPUT: 3049 OUTPUT:
2650 RETVAL 3050 RETVAL
2651 3051
2679 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2680# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2681 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2682 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2683 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2684 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2685 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2686 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2687 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2688 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2700 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2701 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2702 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2703 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2704 const_iv (GL_ONE_MINUS_DST_ALPHA), 3105 const_iv (GL_ONE_MINUS_DST_ALPHA),
3106 const_iv (GL_SRC_COLOR),
3107 const_iv (GL_DST_COLOR),
3108 const_iv (GL_ONE_MINUS_SRC_COLOR),
3109 const_iv (GL_ONE_MINUS_DST_COLOR),
2705 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2706 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2707 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2708 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2709 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2777 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2778 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2779 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2780 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2781 const_iv (GL_T2F_N3F_V3F), 3186 const_iv (GL_T2F_N3F_V3F),
3187 const_iv (GL_FUNC_ADD),
3188 const_iv (GL_FUNC_SUBTRACT),
3189 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2782# undef const_iv 3190# undef const_iv
2783 }; 3191 };
2784 3192
2785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3193 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2786 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2787 3195
2788 texture_av = newAV (); 3196 texture_av = newAV ();
2789 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2790} 3198}
2791 3199
2793disable_GL_EXT_blend_func_separate () 3201disable_GL_EXT_blend_func_separate ()
2794 CODE: 3202 CODE:
2795 gl.BlendFuncSeparate = 0; 3203 gl.BlendFuncSeparate = 0;
2796 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
2797 3205
2798char * 3206void
3207apple_nvidia_bug (int enable)
3208
3209const char *
2799gl_vendor () 3210gl_vendor ()
2800 CODE: 3211 CODE:
2801 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2802 OUTPUT: 3213 OUTPUT:
2803 RETVAL 3214 RETVAL
2804 3215
2805char * 3216const char *
2806gl_version () 3217gl_version ()
2807 CODE: 3218 CODE:
2808 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2809 OUTPUT: 3220 OUTPUT:
2810 RETVAL 3221 RETVAL
2811 3222
2812char * 3223const char *
2813gl_extensions () 3224gl_extensions ()
2814 CODE: 3225 CODE:
2815 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2816 OUTPUT: 3227 OUTPUT:
2817 RETVAL 3228 RETVAL
2818 3229
2819const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2820 3235
2821GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2822 CODE: 3237 CODE:
2823 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2824 OUTPUT: 3239 OUTPUT:
2832 3247
2833int glGetError () 3248int glGetError ()
2834 3249
2835void glFinish () 3250void glFinish ()
2836 3251
3252void glFlush ()
3253
2837void glClear (int mask) 3254void glClear (int mask)
2838 3255
2839void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2840 PROTOTYPE: @ 3257 PROTOTYPE: @
2841 3258
2850void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2851 3268
2852void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2853 CODE: 3270 CODE:
2854 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
2855 3274
2856void glDepthMask (int flag) 3275void glDepthMask (int flag)
2857 3276
2858void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2859 3278
2894void glRotate (float angle, float x, float y, float z) 3313void glRotate (float angle, float x, float y, float z)
2895 CODE: 3314 CODE:
2896 glRotatef (angle, x, y, z); 3315 glRotatef (angle, x, y, z);
2897 3316
2898void glColor (float r, float g, float b, float a = 1.0) 3317void glColor (float r, float g, float b, float a = 1.0)
3318 PROTOTYPE: @
2899 ALIAS: 3319 ALIAS:
2900 glColor_premultiply = 1 3320 glColor_premultiply = 1
2901 CODE: 3321 CODE:
2902 if (ix) 3322 if (ix)
2903 { 3323 {
3009 3429
3010void glEndList () 3430void glEndList ()
3011 3431
3012void glCallList (int list) 3432void glCallList (int list)
3013 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3015 3440
3016PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
3017 3442
3018void 3443void
3019find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3020 PPCODE: 3445 PPCODE:
3021{ 3446{
3022 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3023 XPUSHs (self); 3448 XPUSHs (self);
3024} 3449}
3025 3450
3026BOOT: 3451BOOT:
3027{ 3452{
3035 3460
3036void 3461void
3037draw (SV *self) 3462draw (SV *self)
3038 CODE: 3463 CODE:
3039{ 3464{
3040 HV *hv; 3465 HV *hv;
3041 SV **svp; 3466 SV **svp;
3042 NV x, y, w, h; 3467 NV x, y, w, h;
3043 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3044 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3045 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3046 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines