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.265 by root, Fri Jul 18 22:56:11 2008 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 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
76#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
78 88
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 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 */
81#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
82 95
83#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
85 98
86#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
87 100
88/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
103
104#define KMOD_LRAM 0x10000 // our extension
105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
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}
90 127
91static AV *texture_av; 128static AV *texture_av;
92 129
93static struct 130static struct
94{ 131{
151{ 188{
152 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
153 190
154 while (attrs) 191 while (attrs)
155 { 192 {
156 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 194
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 196 return 1;
160 197
161 attrs = attrs->next; 198 attrs = attrs->next;
162 } 199 }
163 200
164 return 0; 201 return 0;
165} 202}
166 203
167typedef struct cf_layout { 204struct cf_layout {
168 PangoLayout *pl; 205 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
170 int base_height; 207 int base_height;
171 DC__Font font; 208 DC__Font font;
172 rc_t *rc; 209 rc_t *rc;
173} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
174 213
175static DC__Font default_font; 214static DC__Font default_font;
176static PangoContext *opengl_context; 215static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
178 217
179static void 218static void
180substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
181{ 220{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 224#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 226}
188 227
189static void 228static void
219} 258}
220 259
221typedef uint16_t tileid; 260typedef uint16_t tileid;
222typedef uint16_t faceid; 261typedef uint16_t faceid;
223 262
224typedef struct { 263struct maptex
264{
225 GLuint name; 265 GLuint name;
226 int w, h; 266 int w, h;
227 float s, t; 267 float s, t;
228 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
229 tileid smoothtile; 269 tileid smoothtile;
230 uint8_t smoothlevel; 270 uint8_t smoothlevel;
231} maptex; 271 uint8_t unused; /* set to zero on use */
272};
232 273
233typedef struct { 274struct mapcell
275{
234 uint32_t player; 276 uint32_t player;
235 tileid tile[3]; 277 tileid tile[3];
236 uint16_t darkness; 278 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 280};
239 281
240typedef struct { 282struct maprow
283{
241 int32_t c0, c1; 284 int32_t c0, c1;
242 mapcell *col; 285 mapcell *col;
243} maprow; 286};
244 287
245typedef struct map { 288struct mapgrid {
246 int x, y, w, h; 289 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
250 293
251 int32_t rows; 294 int32_t rows;
252 maprow *row; 295 maprow *row;
253} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
254 299
255static char * 300static char *
256prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
257{ 302{
258 char *p; 303 char *p;
276 321
277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 322#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)) 323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
279 324
280static void 325static void
281need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
282{ 327{
283 while (self->faces <= face) 328 while (self->faces <= face)
284 { 329 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 331 self->faces *= 2;
287 } 332 }
288} 333}
289 334
290static void 335static void
291need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
292{ 337{
293 while (self->texs <= texid) 338 while (self->texs <= texid)
294 { 339 {
295 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
296 self->texs *= 2; 341 self->texs *= 2;
297 } 342 }
298} 343}
299 344
300static maprow * 345static maprow *
301map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
302{ 347{
303 if (0 > y) 348 if (0 > y)
304 { 349 {
305 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
344 389
345 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
346} 391}
347 392
348static mapcell * 393static mapcell *
349map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
350{ 395{
351 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
352} 397}
353 398
354static void 399static void
355map_clear (DC__Map self) 400map_clear (mapgrid *self)
356{ 401{
357 int r; 402 int r;
358 403
359 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
367 self->oy = 0; 412 self->oy = 0;
368 self->row = 0; 413 self->row = 0;
369 self->rows = 0; 414 self->rows = 0;
370} 415}
371 416
417#define CELL_CLEAR(cell) \
418 do { \
419 if ((cell)->player) \
420 (cell)->tile [2] = 0; \
421 (cell)->darkness = 0; \
422 (cell)->stat_hp = 0; \
423 (cell)->flags = 0; \
424 (cell)->player = 0; \
425 } while (0)
426
372static void 427static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
374{ 429{
375 int x, y; 430 int x, y;
376 maprow *row; 431 maprow *row;
377 mapcell *cell; 432 mapcell *cell;
378 433
390 if (x >= row->c1) 445 if (x >= row->c1)
391 break; 446 break;
392 447
393 cell = row->col + x - row->c0; 448 cell = row->col + x - row->c0;
394 449
395 cell->darkness = 0; 450 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 451 }
400 } 452 }
401} 453}
402 454
403typedef struct { 455struct smooth_key
456{
404 tileid tile; 457 tileid tile;
405 uint8_t x, y, level; 458 uint8_t x, y, level;
406} smooth_key; 459
460 bool operator == (const smooth_key &o) const
461 {
462 return tile == o.tile && x == o.x && y == o.y && level == o.level;
463 }
464};
465
466typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
467
468namespace std {
469 template <>
470 struct hash<smooth_key>
471 {
472 size_t operator () (const smooth_key &v) const
473 {
474 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
475 }
476 };
477}
407 478
408static void 479static void
409smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
410{ 481{
411 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
412 483
413 if (SvIOK (*sv)) 484 if (it == h.end ())
414 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
415 else 486 else
416 sv_setiv (*sv, bits); 487 it->second |= bits;
417} 488}
418 489
419static void 490static void
420music_finished (void) 491music_finished (void)
421{ 492{
438 ev.code = 1; 509 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 511 ev.data2 = 0;
441 512
442 SDL_PushEvent ((SDL_Event *)&ev); 513 SDL_PushEvent ((SDL_Event *)&ev);
514}
515
516// approximately divide by 255
517static unsigned int
518div255 (unsigned int n)
519{
520 return (n + (n >> 8)) >> 8;
443} 521}
444 522
445static unsigned int 523static unsigned int
446minpot (unsigned int n) 524minpot (unsigned int n)
447{ 525{
514 if (!svp || !SvTRUE (*svp)) 592 if (!svp || !SvTRUE (*svp))
515 return 0; 593 return 0;
516 594
517 return 1; 595 return 1;
518} 596}
597
598/******************************************************************************/
599
600/* process keyboard modifiers */
601static int
602mod_munge (int mod)
603{
604 mod &= MOD_MASK;
605
606 if (mod & (KMOD_META | KMOD_ALT))
607 mod |= KMOD_LRAM;
608
609 return mod;
610}
611
612static void
613deliantra_main (SV *real_main)
614{
615 dSP;
616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
619}
620
621#ifdef __MACOSX__
622 static SV *real_main;
623
624 /* to due surprising braindamage on the side of SDL design, we
625 * do some mind-boggling hack here: SDL requires a custom main()
626 * on OS X, so... we provide one and call the original main(), which,
627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
628 * and which calls our main (== SDL_main) back.
629 */
630 extern C_LINKAGE int
631 main (int argc, char *argv[])
632 {
633 deliantra_main (real_main);
634 }
635
636 #undef main
637
638 extern C_LINKAGE int main (int argc, char *argv[]);
639
640 static void
641 SDL_main_hack (SV *real_main_)
642 {
643 real_main = real_main_;
644
645 char *argv[] = { "deliantra client", 0 };
646 (main) (1, argv);
647 }
648#else
649 static void
650 SDL_main_hack (SV *real_main)
651 {
652 deliantra_main (real_main);
653 }
654#endif
519 655
520MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
521 657
522PROTOTYPES: ENABLE 658PROTOTYPES: ENABLE
523 659
552 const_iv (SDL_USEREVENT), 688 const_iv (SDL_USEREVENT),
553 689
554 const_iv (SDL_APPINPUTFOCUS), 690 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 691 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 692 const_iv (SDL_APPACTIVE),
693
694
695 const_iv (SDLK_UNKNOWN),
696 const_iv (SDLK_FIRST),
697 const_iv (SDLK_BACKSPACE),
698 const_iv (SDLK_TAB),
699 const_iv (SDLK_CLEAR),
700 const_iv (SDLK_RETURN),
701 const_iv (SDLK_PAUSE),
702 const_iv (SDLK_ESCAPE),
703 const_iv (SDLK_SPACE),
704 const_iv (SDLK_EXCLAIM),
705 const_iv (SDLK_QUOTEDBL),
706 const_iv (SDLK_HASH),
707 const_iv (SDLK_DOLLAR),
708 const_iv (SDLK_AMPERSAND),
709 const_iv (SDLK_QUOTE),
710 const_iv (SDLK_LEFTPAREN),
711 const_iv (SDLK_RIGHTPAREN),
712 const_iv (SDLK_ASTERISK),
713 const_iv (SDLK_PLUS),
714 const_iv (SDLK_COMMA),
715 const_iv (SDLK_MINUS),
716 const_iv (SDLK_PERIOD),
717 const_iv (SDLK_SLASH),
718 const_iv (SDLK_0),
719 const_iv (SDLK_1),
720 const_iv (SDLK_2),
721 const_iv (SDLK_3),
722 const_iv (SDLK_4),
723 const_iv (SDLK_5),
724 const_iv (SDLK_6),
725 const_iv (SDLK_7),
726 const_iv (SDLK_8),
727 const_iv (SDLK_9),
728 const_iv (SDLK_COLON),
729 const_iv (SDLK_SEMICOLON),
730 const_iv (SDLK_LESS),
731 const_iv (SDLK_EQUALS),
732 const_iv (SDLK_GREATER),
733 const_iv (SDLK_QUESTION),
734 const_iv (SDLK_AT),
735
736 const_iv (SDLK_LEFTBRACKET),
737 const_iv (SDLK_BACKSLASH),
738 const_iv (SDLK_RIGHTBRACKET),
739 const_iv (SDLK_CARET),
740 const_iv (SDLK_UNDERSCORE),
741 const_iv (SDLK_BACKQUOTE),
742 const_iv (SDLK_DELETE),
557 743
558 const_iv (SDLK_FIRST), 744 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 745 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 746 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 747 const_iv (SDLK_KP1),
637 const_iv (KMOD_RMETA), 823 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 824 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 825 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 826 const_iv (KMOD_MODE),
641 827
828 const_iv (KMOD_LRAM),
829
642 const_iv (MIX_DEFAULT_FORMAT), 830 const_iv (MIX_DEFAULT_FORMAT),
643 831
644 const_iv (SDL_INIT_TIMER), 832 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 833 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 834 const_iv (SDL_INIT_VIDEO),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 852 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 853 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 854 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 855 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 856 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 857 const_iv (SDL_GL_SWAP_CONTROL),
858
859 const_iv (FOW_DARKNESS)
670# undef const_iv 860# undef const_iv
671 }; 861 };
672 862
673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 863 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675 865
676 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678} 868}
679 869
695NV ceil (NV x) 885NV ceil (NV x)
696 886
697IV minpot (UV n) 887IV minpot (UV n)
698 888
699IV popcount (UV n) 889IV popcount (UV n)
890
891NV distance (NV dx, NV dy)
892 CODE:
893 RETVAL = pow (dx * dx + dy * dy, 0.5);
894 OUTPUT:
895 RETVAL
700 896
701void 897void
702pango_init () 898pango_init ()
703 CODE: 899 CODE:
704{ 900{
712#endif 908#endif
713} 909}
714 910
715char *SDL_GetError () 911char *SDL_GetError ()
716 912
913void SDL_main_hack (SV *real_main)
914 PROTOTYPE: &
915
717int SDL_Init (U32 flags) 916int SDL_Init (U32 flags)
718 917
719int SDL_InitSubSystem (U32 flags) 918int SDL_InitSubSystem (U32 flags)
720 919
721void SDL_QuitSubSystem (U32 flags) 920void SDL_QuitSubSystem (U32 flags)
722 921
723void SDL_Quit () 922void SDL_Quit ()
724 923
725int SDL_GL_SetAttribute (int attr, int value) 924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
726 926
727int SDL_GL_GetAttribute (int attr) 927int SDL_GL_GetAttribute (int attr)
728 CODE: 928 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL)) 929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
730 XSRETURN_UNDEF; 930 XSRETURN_UNDEF;
731 OUTPUT: 931 OUTPUT:
732 RETVAL 932 RETVAL
733 933
734void 934void
789 ); 989 );
790 990
791 if (RETVAL) 991 if (RETVAL)
792 { 992 {
793 av_clear (texture_av); 993 av_clear (texture_av);
794
795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
796#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 994#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
797#include "glfunc.h" 995#include "glfunc.h"
798#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
799 } 999 }
800} 1000}
801 OUTPUT: 1001 OUTPUT:
802 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
803 1006
804void 1007void
805SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
806 1009
807char * 1010char *
808SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
809 1013
810int 1014int
811SDL_GetAppState () 1015SDL_GetAppState ()
812 1016
813int 1017int
814SDL_GetModState () 1018SDL_GetModState ()
815 1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
816void 1024void
1025SDL_PumpEvents ()
1026
1027void
817poll_events () 1028peep_events ()
818 PPCODE: 1029 PPCODE:
819{ 1030{
820 SDL_Event ev; 1031 SDL_Event ev;
821 1032
822 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
829 { 1040 {
830 case SDL_KEYDOWN: 1041 case SDL_KEYDOWN:
831 case SDL_KEYUP: 1042 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1043 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1044 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
834 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1045 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
835 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1046 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1047 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 1048 break;
838 1049
839 case SDL_ACTIVEEVENT: 1050 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1051 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
858 x = ev.motion.x; 1069 x = ev.motion.x;
859 y = ev.motion.y; 1070 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1071 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 1072 }
862 1073
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1074 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 1075 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 1076 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 1077 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1078 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1079 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
888 1099
889 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1100 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
890 } 1101 }
891} 1102}
892 1103
1104char *
1105SDL_AudioDriverName ()
1106 CODE:
1107{
1108 char buf [256];
1109 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1110 XSRETURN_UNDEF;
1111
1112 RETVAL = buf;
1113}
1114 OUTPUT:
1115 RETVAL
1116
893int 1117int
894Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
895 POSTCALL: 1119 POSTCALL:
896 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
897 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
898 1122
899void 1123void
900Mix_QuerySpec () 1124Mix_QuerySpec ()
959add_font (char *file) 1183add_font (char *file)
960 CODE: 1184 CODE:
961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT: 1186 OUTPUT:
963 RETVAL 1187 RETVAL
1188
1189void
1190IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1191
1192# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1193void
1194Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
964 1195
965void 1196void
966load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
967 ALIAS: 1198 ALIAS:
968 load_image_file = 1 1199 load_image_file = 1
1014 1245
1015 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
1016 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
1017 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
1018 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
1019 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1020 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1251 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1021 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1022 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1023 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
1024 1255
1084#if DEBUG 1315#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1316 VALGRIND_DO_LEAK_CHECK;
1086#endif 1317#endif
1087} 1318}
1088 1319
1320int
1321SvREFCNT (SV *sv)
1322 CODE:
1323 RETVAL = SvREFCNT (sv);
1324 OUTPUT:
1325 RETVAL
1326
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1328
1091PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1092 1330
1093DC::Font 1331DC::Font
1094new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1095 CODE: 1333 CODE:
1096{ 1334{
1097 int count; 1335 int count;
1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1099 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1128 PROTOTYPE: 1366 PROTOTYPE:
1129 CODE: 1367 CODE:
1130 tc_restore (); 1368 tc_restore ();
1131 1369
1132DC::Layout 1370DC::Layout
1133new (SV *class) 1371new (SV *klass)
1134 CODE: 1372 CODE:
1135 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1136 1374
1137 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1138 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1287 1525
1288void 1526void
1289set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1290 CODE: 1528 CODE:
1291 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1292 { 1530 {
1293 self->base_height = base_height; 1531 self->base_height = base_height;
1294 layout_update_font (self); 1532 layout_update_font (self);
1295 } 1533 }
1296 1534
1297void 1535void
1524 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1526 } 1764 }
1527} 1765}
1528 1766
1767void
1768draw_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)
1769 PROTOTYPE: @
1770 CODE:
1771{
1772 glEnable (GL_BLEND);
1773 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1774 glEnable (GL_TEXTURE_2D);
1775 glBindTexture (GL_TEXTURE_2D, name1);
1776
1777 glColor3f (intensity, intensity, intensity);
1778 glPushMatrix ();
1779 glScalef (1./3, 1./3, 1.);
1780
1781 if (blend > 0.f)
1782 {
1783 float dx3 = dx * -3.f / w;
1784 float dy3 = dy * -3.f / h;
1785 GLfloat env_color[4] = { 0., 0., 0., blend };
1786
1787 /* interpolate the two shadow textures */
1788 /* stage 0 == rgb(glcolor) + alpha(t0) */
1789 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1790
1791 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1792 gl.ActiveTexture (GL_TEXTURE1);
1793 glEnable (GL_TEXTURE_2D);
1794 glBindTexture (GL_TEXTURE_2D, name2);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1796
1797 /* rgb == rgb(glcolor) */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1801
1802 /* alpha = interpolate t0, t1 by env_alpha */
1803 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1808
1809 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1810 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1811
1812 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1813 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1814
1815 glBegin (GL_QUADS);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 gl.ActiveTexture (GL_TEXTURE0);
1824 }
1825 else
1826 {
1827 /* simple blending of one texture, also opengl <1.3 path */
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1829
1830 glBegin (GL_QUADS);
1831 glTexCoord2f (0, 0); glVertex2f (0, 0);
1832 glTexCoord2f (0, t); glVertex2f (0, h);
1833 glTexCoord2f (s, t); glVertex2f (w, h);
1834 glTexCoord2f (s, 0); glVertex2f (w, 0);
1835 glEnd ();
1836 }
1837
1838 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1839 {
1840 int x, y;
1841 int dx3 = dx * 3;
1842 int dy3 = dy * 3;
1843
1844 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1845 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1846 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1847 glTranslatef (-1., -1., 0);
1848 glBegin (GL_QUADS);
1849
1850 for (y = 1; y < h; y += 3)
1851 {
1852 int y1 = y - dy3;
1853 int y1valid = y1 >= 0 && y1 < h;
1854
1855 for (x = 1; x < w; x += 3)
1856 {
1857 int x1 = x - dx3;
1858 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 uint8_t h2;
1860
1861 if (y1valid && x1 >= 0 && x1 < w)
1862 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1863 else
1864 h2 = 1; /* out of range == invisible */
1865
1866 if (h1 || h2)
1867 {
1868 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1869 glColor4f (1., 1., 1., alpha);
1870
1871 glTexCoord2f (0, 0.); glVertex2i (x , y );
1872 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1873 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1874 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1875 }
1876 }
1877 }
1878 }
1879
1880 glEnd ();
1881
1882 glPopMatrix ();
1883
1884 glDisable (GL_TEXTURE_2D);
1885 glDisable (GL_BLEND);
1886}
1887
1529IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1888IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1530 CODE: 1889 CODE:
1531{ 1890{
1532 GLint width; 1891 GLint width;
1533 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1892 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1540MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1541 1900
1542PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1543 1902
1544DC::Map 1903DC::Map
1545new (SV *class) 1904new (SV *klass)
1546 CODE: 1905 CODE:
1547 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1548 RETVAL->x = 0; 1907 RETVAL->x = 0;
1549 RETVAL->y = 0; 1908 RETVAL->y = 0;
1550 RETVAL->w = 0; 1909 RETVAL->w = 0;
1551 RETVAL->h = 0; 1910 RETVAL->h = 0;
1552 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1589 1948
1590void 1949void
1591set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1592 CODE: 1951 CODE:
1593{ 1952{
1594 tileid texid; 1953 tileid texid;
1595 maptex *tex; 1954 maptex *tex;
1596 1955
1597 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1598 return; 1957 return;
1599 1958
1600 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1601 return; 1960 return;
1602 1961
1603 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1604 1963
1605 if (!texid) 1964 if (!texid)
1606 return; 1965 return;
1607 1966
1608 tex = self->tex + texid; 1967 tex = self->tex + texid;
1637 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1996 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1638 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 2000}
2001
2002void
2003expire_textures (DC::Map self, int texid, int count)
2004 PPCODE:
2005 for (; texid < self->texs && count; ++texid, --count)
2006 {
2007 maptex *tex = self->tex + texid;
2008
2009 if (tex->name)
2010 {
2011 if (tex->unused)
2012 {
2013 tex->name = 0;
2014 tex->unused = 0;
2015 XPUSHs (sv_2mortal (newSViv (texid)));
2016 }
2017 else
2018 tex->unused = 1;
2019 }
2020 }
1642 2021
1643int 2022int
1644ox (DC::Map self) 2023ox (DC::Map self)
1645 ALIAS: 2024 ALIAS:
1646 oy = 1 2025 oy = 1
1686 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1687 } 2066 }
1688} 2067}
1689 2068
1690SV * 2069SV *
1691map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1692 CODE: 2071 CODE:
1693{ 2072{
1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1695 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1696 mapcell *cell; 2075 mapcell *cell;
1717 2096
1718 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1719 2098
1720 if (flags & 8) 2099 if (flags & 8)
1721 { 2100 {
2101 uint8_t ext, cmd;
2102
1722 if (extmap) 2103 do
1723 { 2104 {
1724 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1725 2107
1726 do 2108 if (cmd < 4)
2109 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2110 else if (cmd == 5) // health
1727 { 2111 {
1728 ext = *data++;
1729 cmd = ext & 0x7f;
1730
1731 if (cmd < 4)
1732 cell->darkness = 255 - ext * 64 + 1;
1733 else if (cmd == 5) // health
1734 {
1735 cell->stat_width = 1; 2112 cell->stat_width = 1;
1736 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1737 }
1738 else if (cmd == 6) // monster width
1739 cell->stat_width = *data++ + 1;
1740 else if (cmd == 0x47)
1741 {
1742 if (*data == 1) cell->player = data [1];
1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1746
1747 data += *data + 1;
1748 }
1749 else if (cmd == 8) // cell flags
1750 cell->flags = *data++;
1751 else if (ext & 0x40) // unknown, multibyte => skip
1752 data += *data + 1;
1753 else
1754 data++;
1755 } 2114 }
1756 while (ext & 0x80); 2115 else if (cmd == 6) // monster width
2116 cell->stat_width = *data++ + 1;
2117 else if (cmd == 0x47)
2118 {
2119 if (*data == 1) cell->player = data [1];
2120 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2121 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2122 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2123
2124 data += *data + 1;
2125 }
2126 else if (cmd == 8) // cell flags
2127 cell->flags = *data++;
2128 else if (ext & 0x40) // unknown, multibyte => skip
2129 data += *data + 1;
2130 else
2131 data++;
1757 } 2132 }
1758 else 2133 while (ext & 0x80);
1759 cell->darkness = *data++ + 1;
1760 } 2134 }
1761 2135
1762 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
1763 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
1764 { 2138 {
1767 cell->tile [z] = self->face2tile [face]; 2141 cell->tile [z] = self->face2tile [face];
1768 2142
1769 if (cell->tile [z]) 2143 if (cell->tile [z])
1770 { 2144 {
1771 maptex *tex = self->tex + cell->tile [z]; 2145 maptex *tex = self->tex + cell->tile [z];
2146 tex->unused = 0;
1772 if (!tex->name) 2147 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 2148 av_push (missing, newSViv (cell->tile [z]));
1774 2149
1775 if (tex->smoothtile) 2150 if (tex->smoothtile)
1776 { 2151 {
1777 maptex *smooth = self->tex + tex->smoothtile; 2152 maptex *smooth = self->tex + tex->smoothtile;
2153 smooth->unused = 0;
1778 if (!smooth->name) 2154 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 2155 av_push (missing, newSViv (tex->smoothtile));
1780 } 2156 }
1781 } 2157 }
1782 } 2158 }
1783 } 2159 }
1784 else 2160 else
1785 cell->darkness = 0; 2161 CELL_CLEAR (cell);
1786 } 2162 }
1787} 2163}
1788 OUTPUT: 2164 OUTPUT:
1789 RETVAL 2165 RETVAL
1790 2166
1810 ? self->row + y 2186 ? self->row + y
1811 : 0; 2187 : 0;
1812 2188
1813 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1814 { 2190 {
1815 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1816 2192
1817 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1818 { 2194 {
1819 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1820 2196
1822 { 2198 {
1823 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1824 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1825 int a1 = tex.a; 2201 int a1 = tex.a;
1826 2202
1827 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1828 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1829 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1830 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1831 } 2207 }
1832 } 2208 }
1833 2209
1834 *map++ = (r ) 2210 *map++ = (r )
1835 | (g << 8) 2211 | (g << 8)
1836 | (b << 16) 2212 | (b << 16)
1837 | (a << 24); 2213 | (a << 24);
1838 } 2214 }
1839 } 2215 }
1840 2216
1841 RETVAL = map_sv; 2217 RETVAL = map_sv;
1842} 2218}
1843 OUTPUT: 2219 OUTPUT:
1844 RETVAL 2220 RETVAL
1845 2221
1846void 2222void
1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1848 CODE: 2224 CODE:
1849{ 2225{
1850 int x, y, z; 2226 int x, y, z;
1851 2227
1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1853 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1854 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)
1855 smooth_key skey; 2230 smooth_key skey;
1856 int pl_x, pl_y; 2231 int pl_x, pl_y;
1857 maptex pl_tex; 2232 maptex pl_tex;
1858 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2234 rc_t *rc_ov = rc_alloc ();
1859 rc_key_t key; 2235 rc_key_t key;
1860 rc_array_t *arr; 2236 rc_array_t *arr;
1861 2237
1862 pl_tex.name = 0; 2238 pl_tex.name = 0;
1863 2239
1864 // thats current max. sorry. 2240 // that's current max. sorry.
1865 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1866 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1867 2243
1868 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1869 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
1873 key.g = 255; 2249 key.g = 255;
1874 key.b = 255; 2250 key.b = 255;
1875 key.a = 255; 2251 key.a = 255;
1876 key.mode = GL_QUADS; 2252 key.mode = GL_QUADS;
1877 key.format = GL_T2F_V3F; 2253 key.format = GL_T2F_V3F;
1878 key.texname = -1;
1879 2254
1880 mx += self->x; 2255 mx += self->x;
1881 my += self->y; 2256 my += self->y;
1882 2257
1883 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
1906 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1908 2283
1909 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1910 { 2285 {
2286 smooth_hash smooth;
1911 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1912 2289
1913 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1914 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1915 { 2292 {
1916 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
1922 tileid tile = cell->tile [z]; 2299 tileid tile = cell->tile [z];
1923 2300
1924 if (tile) 2301 if (tile)
1925 { 2302 {
1926 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1927 int px = (x + 1) * T - tex.w; 2304 int px, py;
1928 int py = (y + 1) * T - tex.h;
1929 2305
1930 if (key.texname != tex.name) 2306 if (key.texname != tex.name)
1931 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1932 if (!tex.name) 2310 if (!tex.name)
1933 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1934 2312
1935 key.texname = tex.name; 2313 key.texname = tex.name;
1936 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
1937 } 2315 }
2316
2317 px = (x + 1) * Th - tex.w;
2318 py = (y + 1) * Tw - tex.h;
1938 2319
1939 if (expect_false (cell->player == player) && expect_false (z == 2)) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
1940 { 2321 {
1941 pl_x = px; 2322 pl_x = px;
1942 pl_y = py; 2323 pl_y = py;
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2329 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1949 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2330 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1950 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2331 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1951 2332
1952 if (expect_false (cell->flags) && expect_false (z == 2))
1953 {
1954 // overlays such as the speech bubble, probably more to come
1955 if (cell->flags & 1)
1956 {
1957 maptex tex = self->tex [1];
1958 int px = x * T + T * 2 / 32;
1959 int py = y * T - T * 6 / 32;
1960
1961 if (tex.name)
1962 {
1963 if (key.texname != tex.name)
1964 {
1965 key.texname = tex.name;
1966 arr = rc_array (rc, &key);
1967 }
1968
1969 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1970 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1971 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1972 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1973 }
1974 }
1975 }
1976
1977 // update smooth hash 2333 // update smooth hash
1978 if (tex.smoothtile) 2334 if (tex.smoothtile)
1979 { 2335 {
1980 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
1981 skey.level = tex.smoothlevel; 2337 skey.level = tex.smoothlevel;
1996 2352
1997 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1998 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
1999 2355
2000 // full tile 2356 // full tile
2001 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2357 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2002 2358
2003 // borders 2359 // borders
2004 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2005 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2006 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2362 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2007 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2363 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2008 2364
2009 // corners 2365 // corners
2010 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2366 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2011 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2367 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2012 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2368 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2013 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2369 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2370 }
2371 }
2372
2373 if (expect_false (z == 2) && expect_false (cell->flags))
2374 {
2375 // overlays such as the speech bubble, probably more to come
2376 if (cell->flags & 1)
2377 {
2378 rc_key_t key_ov = key;
2379 maptex tex = self->tex [TEXID_SPEECH];
2380 rc_array_t *arr;
2381 int px = x * Tw + Tw * 2 / 32;
2382 int py = y * Th - Th * 6 / 32;
2383
2384 key_ov.texname = tex.name;
2385 arr = rc_array (rc_ov, &key_ov);
2386
2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2014 } 2391 }
2015 } 2392 }
2016 } 2393 }
2017 } 2394 }
2018 2395
2034 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
2035 { 2412 {
2036 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
2037 HE *he; 2414 HE *he;
2038 2415
2039 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2040 while ((he = hv_iternext (smooth)))
2041 { 2417 {
2042 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
2043 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
2044 2420
2045 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
2046 && skey->level == level 2422 && skey.level == level
2047 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
2048 { 2424 {
2049 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
2050 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
2051 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
2052 int border = bits & 15; 2428 int border = bits & 15;
2053 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2054 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
2055 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
2056 2432
2058 { 2434 {
2059 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2060 // save gobs of state changes. 2436 // save gobs of state changes.
2061 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2062 { 2438 {
2439 self->tex [skey.tile].unused = 0;
2440
2063 glEnd (); 2441 glEnd ();
2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2065 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2066 } 2444 }
2067 2445
2068 if (border) 2446 if (border)
2069 { 2447 {
2070 float ox = border * dx; 2448 float ox = border * dx;
2071 2449
2072 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2073 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2074 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2075 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2076 } 2454 }
2077 2455
2078 if (corner) 2456 if (corner)
2079 { 2457 {
2080 float ox = corner * dx; 2458 float ox = corner * dx;
2081 2459
2082 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2083 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2084 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2085 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2086 } 2464 }
2087 } 2465 }
2088 } 2466 }
2089 } 2467 }
2090 } 2468 }
2092 2470
2093 glEnd (); 2471 glEnd ();
2094 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2095 key.texname = -1; 2473 key.texname = -1;
2096 } 2474 }
2097
2098 hv_clear (smooth);
2099 } 2475 }
2100 2476
2101 if (pl_tex.name) 2477 if (pl_tex.name)
2102 { 2478 {
2103 maptex tex = pl_tex; 2479 maptex tex = pl_tex;
2104 int px = pl_x + pdx; 2480 int px = pl_x + sdx;
2105 int py = pl_y + pdy; 2481 int py = pl_y + sdy;
2106 2482
2107 key.texname = tex.name; 2483 key.texname = tex.name;
2108 arr = rc_array (rc, &key); 2484 arr = rc_array (rc, &key);
2109 2485
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2486 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2113 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2489 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2114 2490
2115 rc_draw (rc); 2491 rc_draw (rc);
2116 } 2492 }
2117 2493
2494 rc_draw (rc_ov);
2495 rc_clear (rc_ov);
2496
2118 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
2119 rc_free (rc); 2498 rc_free (rc);
2499 rc_free (rc_ov);
2120 2500
2121 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
2122 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
2123 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
2124 { 2504 {
2127 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2128 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2129 { 2509 {
2130 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2131 2511
2132 int px = x * T; 2512 int px = x * Tw;
2133 int py = y * T; 2513 int py = y * Th;
2514
2515 if (expect_false (cell->player == player))
2516 {
2517 px += sdx;
2518 py += sdy;
2519 }
2134 2520
2135 if (cell->stat_hp) 2521 if (cell->stat_hp)
2136 { 2522 {
2137 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2138 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2139 2525
2140 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2141 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2142 px + width - 1, py); 2528 px + width - 1, py);
2143 2529
2149 } 2535 }
2150 } 2536 }
2151} 2537}
2152 2538
2153void 2539void
2154draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2540draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2155 CODE: 2541 CODE:
2156{ 2542{
2157 static float color[16][3] = { 2543 static float color[16][3] = {
2158 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
2159 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
2160 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
2161 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
2162 2548
2163 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
2164 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
2165 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
2166 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
2167 2553
2168 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
2169 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
2170 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
2171 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
2172 2558
2173 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
2174 2560
2175 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
2176 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
2177 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
2178 }; 2564 };
2179 2565
2180 int x, y; 2566 int x, y;
2181 2567
2182 glEnable (GL_TEXTURE_2D); 2568 glEnable (GL_TEXTURE_2D);
2569 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2570 * but the nvidia driver (185.18.14) mishandles alpha textures
2571 * and takes the colour from god knows where instead of using
2572 * Cp. MODULATE results in the same colour, but slightly different
2573 * alpha, but atcually gives us the correct colour with nvidia.
2574 */
2183 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2184 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2185 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2186 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
2187 2579
2188 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
2192 2584
2193 if (m) 2585 if (m)
2194 { 2586 {
2195 float *c = color [m & 15]; 2587 float *c = color [m & 15];
2196 2588
2197 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
2198 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
2199 2591
2200 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
2201 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2202 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2203 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2204 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2205 } 2597 }
2213void 2605void
2214fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2606fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2215 PPCODE: 2607 PPCODE:
2216{ 2608{
2217 int x, y; 2609 int x, y;
2218 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2219 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2220 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2221 int sw34 = (sw * 3 + 3) & ~3; 2613 int sw3 = sw * 3;
2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2222 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2223 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2224 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2225 2618
2226 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2227 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2228 2621
2229 mx += self->x - 1; 2622 mx += self->x - 1;
2230 my += self->y - 1; 2623 my += self->y - 1;
2231
2232 memset (darkness1, 255, sw1 * sh1);
2233 2624
2234 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2235 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2236 { 2627 {
2237 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
2240 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
2241 { 2632 {
2242 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
2243 2634
2244 darkness1 [y * sw1 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
2245 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2246 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2247 } 2638 }
2248 } 2639 }
2249 2640
2250 for (y = 0; y < sh; ++y) 2641 for (y = 0; y < sh; ++y)
2251 for (x = 0; x < sw; ++x) 2642 for (x = 0; x < sw; ++x)
2270 2661
2271 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2272 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2273 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2274 2665
2275 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2276 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2277 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2278 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2279 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2670 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2280 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2281 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2282 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2283 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2284 } 2675 }
2285 2676
2286 free (darkness1); 2677 free (darkness1);
2287 2678
2288 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2289 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2290 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2291 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2292} 2683}
2293 2684
2294SV * 2685SV *
2357 else 2748 else
2358 *data++ = 0; 2749 *data++ = 0;
2359 } 2750 }
2360 } 2751 }
2361 2752
2362 /* if size is w*h + 5 then no data has been found */ 2753 /* if size is w*h + 5 then no data has been found */
2363 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2364 { 2755 {
2365 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2366 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2367 } 2758 }
2368 2759
2369 RETVAL = data_sv; 2760 RETVAL = data_sv;
2370} 2761}
2371 OUTPUT: 2762 OUTPUT:
2372 RETVAL 2763 RETVAL
2373 2764
2374void 2765void
2381 STRLEN len; 2772 STRLEN len;
2382 uint8_t *data, *end; 2773 uint8_t *data, *end;
2383 2774
2384 len = SvLEN (data_sv); 2775 len = SvLEN (data_sv);
2385 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2386 data = SvPVbyte_nolen (data_sv); 2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2387 end = data + len + 8; 2778 end = data + len + 8;
2388 2779
2389 if (len < 5) 2780 if (len < 5)
2390 XSRETURN_EMPTY; 2781 XSRETURN_EMPTY;
2391 2782
2452} 2843}
2453 2844
2454MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2455 2846
2456DC::RW 2847DC::RW
2457new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2458 CODE: 2849 CODE:
2459{ 2850{
2460 STRLEN datalen; 2851 STRLEN datalen;
2461 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2462 2853
2464} 2855}
2465 OUTPUT: 2856 OUTPUT:
2466 RETVAL 2857 RETVAL
2467 2858
2468DC::RW 2859DC::RW
2469new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2470 CODE: 2861 CODE:
2471 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2472 OUTPUT: 2863 OUTPUT:
2473 RETVAL 2864 RETVAL
2474 2865
2492 if (RETVAL < 0) 2883 if (RETVAL < 0)
2493 { 2884 {
2494 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2495 2886
2496 if (RETVAL < 0) 2887 if (RETVAL < 0)
2888 {
2889 // happens sometimes, maybe it just stopped playing(?)
2890 RETVAL = Mix_GroupAvailable (-1);
2891
2892 if (RETVAL < 0)
2497 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2498 2894 }
2895 else
2499 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2500 } 2897 }
2501 2898
2502 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2503 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2504} 2901}
2551void 2948void
2552set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2553 CODE: 2950 CODE:
2554{ 2951{
2555 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2952 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2556 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2953 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2557 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2558} 2955}
2559 2956
2560void 2957void
2561set_reverse_stereo (DC::Channel self, int flip) 2958set_reverse_stereo (DC::Channel self, int flip)
2564 2961
2565MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2566 2963
2567PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2568 2965
2966void
2967decoders ()
2968 PPCODE:
2969#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2970 int i, num = Mix_GetNumChunkDecoders ();
2971 EXTEND (SP, num);
2972 for (i = 0; i < num; ++i)
2973 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2974#else
2975 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2976#endif
2977
2569DC::MixChunk 2978DC::MixChunk
2570new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2571 CODE: 2980 CODE:
2572 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2573 OUTPUT: 2982 OUTPUT:
2574 RETVAL 2983 RETVAL
2575 2984
2605 OUTPUT: 3014 OUTPUT:
2606 RETVAL 3015 RETVAL
2607 3016
2608MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2609 3018
3019void
3020decoders ()
3021 PPCODE:
3022#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3023 int i, num = Mix_GetNumMusicDecoders ();
3024 EXTEND (SP, num);
3025 for (i = 0; i < num; ++i)
3026 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3027#else
3028 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3029#endif
3030
2610int 3031int
2611volume (int volume = -1) 3032volume (int volume = -1)
2612 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2613 CODE: 3034 CODE:
2614 if (items > 0) 3035 if (items > 0)
2625void 3046void
2626halt () 3047halt ()
2627 CODE: 3048 CODE:
2628 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2629 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2630DC::MixMusic 3058DC::MixMusic
2631new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
2632 CODE: 3060 CODE:
2633 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2634 OUTPUT: 3062 OUTPUT:
2635 RETVAL 3063 RETVAL
2636 3064
2664 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2665# define const_iv(name) { # name, (IV)name } 3093# define const_iv(name) { # name, (IV)name }
2666 const_iv (GL_VENDOR), 3094 const_iv (GL_VENDOR),
2667 const_iv (GL_VERSION), 3095 const_iv (GL_VERSION),
2668 const_iv (GL_EXTENSIONS), 3096 const_iv (GL_EXTENSIONS),
3097 const_iv (GL_MAX_TEXTURE_UNITS),
2669 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2670 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2671 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2672 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2673 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
2685 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2686 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2687 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2688 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2689 const_iv (GL_ONE_MINUS_DST_ALPHA), 3118 const_iv (GL_ONE_MINUS_DST_ALPHA),
3119 const_iv (GL_SRC_COLOR),
3120 const_iv (GL_DST_COLOR),
3121 const_iv (GL_ONE_MINUS_SRC_COLOR),
3122 const_iv (GL_ONE_MINUS_DST_COLOR),
2690 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2691 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2692 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2693 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2694 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
2762 const_iv (GL_NICEST), 3195 const_iv (GL_NICEST),
2763 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2764 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2765 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2766 const_iv (GL_T2F_N3F_V3F), 3199 const_iv (GL_T2F_N3F_V3F),
3200 const_iv (GL_FUNC_ADD),
3201 const_iv (GL_FUNC_SUBTRACT),
3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2767# undef const_iv 3203# undef const_iv
2768 }; 3204 };
2769 3205
2770 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3206 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2772 3208
2773 texture_av = newAV (); 3209 texture_av = newAV ();
2774 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
2775} 3211}
2776 3212
2778disable_GL_EXT_blend_func_separate () 3214disable_GL_EXT_blend_func_separate ()
2779 CODE: 3215 CODE:
2780 gl.BlendFuncSeparate = 0; 3216 gl.BlendFuncSeparate = 0;
2781 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
2782 3218
2783char * 3219void
3220apple_nvidia_bug (int enable)
3221
3222const char *
2784gl_vendor () 3223gl_vendor ()
2785 CODE: 3224 CODE:
2786 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2787 OUTPUT: 3226 OUTPUT:
2788 RETVAL 3227 RETVAL
2789 3228
2790char * 3229const char *
2791gl_version () 3230gl_version ()
2792 CODE: 3231 CODE:
2793 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2794 OUTPUT: 3233 OUTPUT:
2795 RETVAL 3234 RETVAL
2796 3235
2797char * 3236const char *
2798gl_extensions () 3237gl_extensions ()
2799 CODE: 3238 CODE:
2800 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2801 OUTPUT: 3240 OUTPUT:
2802 RETVAL 3241 RETVAL
2803 3242
2804const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
2805 3248
2806GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
2807 CODE: 3250 CODE:
2808 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
2809 OUTPUT: 3252 OUTPUT:
2817 3260
2818int glGetError () 3261int glGetError ()
2819 3262
2820void glFinish () 3263void glFinish ()
2821 3264
3265void glFlush ()
3266
2822void glClear (int mask) 3267void glClear (int mask)
2823 3268
2824void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2825 PROTOTYPE: @ 3270 PROTOTYPE: @
2826 3271
2835void glBlendFunc (int sfactor, int dfactor) 3280void glBlendFunc (int sfactor, int dfactor)
2836 3281
2837void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2838 CODE: 3283 CODE:
2839 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
3285
3286# void glBlendEquation (int se)
2840 3287
2841void glDepthMask (int flag) 3288void glDepthMask (int flag)
2842 3289
2843void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2844 3291
2879void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2880 CODE: 3327 CODE:
2881 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2882 3329
2883void glColor (float r, float g, float b, float a = 1.0) 3330void glColor (float r, float g, float b, float a = 1.0)
3331 PROTOTYPE: @
2884 ALIAS: 3332 ALIAS:
2885 glColor_premultiply = 1 3333 glColor_premultiply = 1
2886 CODE: 3334 CODE:
2887 if (ix) 3335 if (ix)
2888 { 3336 {
2994 3442
2995void glEndList () 3443void glEndList ()
2996 3444
2997void glCallList (int list) 3445void glCallList (int list)
2998 3446
3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
2999MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3000 3453
3001PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
3002 3455
3003void 3456void
3004find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
3005 PPCODE: 3458 PPCODE:
3006{ 3459{
3007 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
3008 XPUSHs (self); 3461 XPUSHs (self);
3009} 3462}
3010 3463
3011BOOT: 3464BOOT:
3012{ 3465{
3020 3473
3021void 3474void
3022draw (SV *self) 3475draw (SV *self)
3023 CODE: 3476 CODE:
3024{ 3477{
3025 HV *hv; 3478 HV *hv;
3026 SV **svp; 3479 SV **svp;
3027 NV x, y, w, h; 3480 NV x, y, w, h;
3028 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
3029 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
3030 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
3031 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines