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.298 by root, Tue Dec 22 00:46:05 2009 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 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 atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
33 38
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 40
36#include <SDL.h> 41#include <SDL.h>
37#include <SDL_thread.h> 42#include <SDL_thread.h>
48#endif 53#endif
49 54
50#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
52 57
53#include <glib/gmacros.h> 58#include <glib.h>
54 59
55#include <pango/pango.h> 60#include <pango/pango.h>
56 61
57#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
100#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
101 106
102#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
104 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}
128
105static AV *texture_av; 129static AV *texture_av;
106 130
107static struct 131static struct
108{ 132{
109#define GL_FUNC(ptr,name) ptr name; 133#define GL_FUNC(ptr,name) ptr name;
165{ 189{
166 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
167 191
168 while (attrs) 192 while (attrs)
169 { 193 {
170 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
171 195
172 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
173 return 1; 197 return 1;
174 198
175 attrs = attrs->next; 199 attrs = attrs->next;
176 } 200 }
177 201
178 return 0; 202 return 0;
179} 203}
180 204
181typedef struct cf_layout { 205struct cf_layout {
182 PangoLayout *pl; 206 PangoLayout *pl;
183 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
184 int base_height; 208 int base_height;
185 DC__Font font; 209 DC__Font font;
186 rc_t *rc; 210 rc_t rc;
187} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
188 214
189static DC__Font default_font; 215static DC__Font default_font;
190static PangoContext *opengl_context; 216static PangoContext *opengl_context;
191static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
192 218
193static void 219static void
194substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
195{ 221{
196 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
197#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
198 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199#endif 225#endif
200 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201} 227}
202 228
203static void 229static void
233} 259}
234 260
235typedef uint16_t tileid; 261typedef uint16_t tileid;
236typedef uint16_t faceid; 262typedef uint16_t faceid;
237 263
238typedef struct { 264struct maptex
265{
239 GLuint name; 266 GLuint name;
240 int w, h; 267 int w, h;
241 float s, t; 268 float s, t;
242 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
243 tileid smoothtile; 270 tileid smoothtile;
244 uint8_t smoothlevel; 271 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
246} maptex; 273};
247 274
248typedef struct { 275struct mapcell
276{
249 uint32_t player; 277 uint32_t player;
250 tileid tile[3]; 278 tileid tile[3];
251 uint16_t darkness; 279 uint16_t darkness;
252 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
253} mapcell; 281};
254 282
255typedef struct { 283struct maprow
284{
256 int32_t c0, c1; 285 int32_t c0, c1;
257 mapcell *col; 286 mapcell *col;
258} maprow; 287};
259 288
260typedef struct map { 289struct mapgrid {
261 int x, y, w, h; 290 int x, y, w, h;
262 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
263 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
264 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
265 294
266 int32_t rows; 295 int32_t rows;
267 maprow *row; 296 maprow *row;
268} *DC__Map; 297};
269 298
270static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
271prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
272{ 304{
273 char *p; 305 T *p;
274 306
275 New (0, p, sze + inc, char); 307 Newxz (p, sze + inc, T);
276 Zero (p, inc, char);
277 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
278 Safefree (ptr); 309 Safefree (ptr);
279 310
280 return p; 311 ptr = p;
281} 312}
282 313
283static char * 314template<typename T>
284append (char *ptr, int sze, int inc)
285{
286 Renew (ptr, sze + inc, char);
287 Zero (ptr + sze, inc, char);
288
289 return ptr;
290}
291
292#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
293#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
294
295static void 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
296need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
297{ 324{
298 while (self->faces <= face) 325 while (self->faces <= face)
299 { 326 {
300 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
301 self->faces *= 2; 328 self->faces *= 2;
302 } 329 }
303} 330}
304 331
305static void 332static void
306need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
307{ 334{
308 while (self->texs <= texid) 335 while (self->texs <= texid)
309 { 336 {
310 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
311 self->texs *= 2; 338 self->texs *= 2;
312 } 339 }
313} 340}
314 341
315static maprow * 342static maprow *
316map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
317{ 344{
318 if (0 > y) 345 if (0 > y)
319 { 346 {
320 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
321 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
322 349
323 self->rows += extend; 350 self->rows += extend;
324 self->y += extend; 351 self->y += extend;
325 y += extend; 352 y += extend;
326 } 353 }
327 else if (y >= self->rows) 354 else if (y >= self->rows)
328 { 355 {
329 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
330 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
331 self->rows += extend; 358 self->rows += extend;
332 } 359 }
333 360
334 return self->row + y; 361 return self->row + y;
335} 362}
345 } 372 }
346 373
347 if (row->c0 > x) 374 if (row->c0 > x)
348 { 375 {
349 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
350 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
351 row->c0 -= extend; 378 row->c0 -= extend;
352 } 379 }
353 else if (x >= row->c1) 380 else if (x >= row->c1)
354 { 381 {
355 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
356 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
357 row->c1 += extend; 384 row->c1 += extend;
358 } 385 }
359 386
360 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
361} 388}
362 389
363static mapcell * 390static mapcell *
364map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
365{ 392{
366 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
367} 394}
368 395
369static void 396static void
370map_clear (DC__Map self) 397map_clear (mapgrid *self)
371{ 398{
372 int r; 399 int r;
373 400
374 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
375 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
393 (cell)->flags = 0; \ 420 (cell)->flags = 0; \
394 (cell)->player = 0; \ 421 (cell)->player = 0; \
395 } while (0) 422 } while (0)
396 423
397static void 424static void
398map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
399{ 426{
400 int x, y; 427 int x, y;
401 maprow *row; 428 maprow *row;
402 mapcell *cell; 429 mapcell *cell;
403 430
420 CELL_CLEAR (cell); 447 CELL_CLEAR (cell);
421 } 448 }
422 } 449 }
423} 450}
424 451
425typedef struct { 452struct smooth_key
453{
426 tileid tile; 454 tileid tile;
427 uint8_t x, y, level; 455 uint8_t x, y, level;
428} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
429 475
430static void 476static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 478{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
434 480
435 if (SvIOK (*sv)) 481 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
437 else 483 else
438 sv_setiv (*sv, bits); 484 it->second |= bits;
439} 485}
440 486
441static void 487static void
442music_finished (void) 488music_finished (void)
443{ 489{
460 ev.code = 1; 506 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 508 ev.data2 = 0;
463 509
464 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
465} 518}
466 519
467static unsigned int 520static unsigned int
468minpot (unsigned int n) 521minpot (unsigned int n)
469{ 522{
552 605
553 return mod; 606 return mod;
554} 607}
555 608
556static void 609static void
557deliantra_main () 610deliantra_main (SV *real_main)
558{ 611{
559 char *argv[] = { 0 }; 612 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
561} 616}
562 617
563#ifdef __MACOSX__ 618#ifdef __MACOSX__
619 static SV *real_main;
620
564 /* to due surprising braindamage on the side of SDL design, we 621 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 622 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which, 623 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 625 * and which calls our main (== SDL_main) back.
569 */ 626 */
570 extern C_LINKAGE int 627 extern C_LINKAGE int
571 main (int argc, char *argv[]) 628 main (int argc, char *argv[])
572 { 629 {
573 deliantra_main (); 630 deliantra_main (real_main);
574 } 631 }
575 632
576 #undef main 633 #undef main
577 634
578 extern C_LINKAGE int main (int argc, char *argv[]); 635 extern C_LINKAGE int main (int argc, char *argv[]);
579 636
580 static void 637 static void
581 SDL_braino (void) 638 SDL_main_hack (SV *real_main_)
582 { 639 {
640 real_main = real_main_;
641
583 char *argv[] = { "deliantra client", 0 }; 642 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 643 (main) (1, argv);
585 } 644 }
586#else 645#else
587 static void 646 static void
588 SDL_braino (void) 647 SDL_main_hack (SV *real_main)
589 { 648 {
590 deliantra_main (); 649 deliantra_main (real_main);
591 } 650 }
592#endif 651#endif
593 652
594MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
595 654
796 855
797 const_iv (FOW_DARKNESS) 856 const_iv (FOW_DARKNESS)
798# undef const_iv 857# undef const_iv
799 }; 858 };
800 859
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 862
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 865}
807 866
846#endif 905#endif
847} 906}
848 907
849char *SDL_GetError () 908char *SDL_GetError ()
850 909
851void SDL_braino () 910void SDL_main_hack (SV *real_main)
911 PROTOTYPE: &
852 912
853int SDL_Init (U32 flags) 913int SDL_Init (U32 flags)
854 914
855int SDL_InitSubSystem (U32 flags) 915int SDL_InitSubSystem (U32 flags)
856 916
857void SDL_QuitSubSystem (U32 flags) 917void SDL_QuitSubSystem (U32 flags)
858 918
859void SDL_Quit () 919void SDL_Quit ()
860 920
861int SDL_GL_SetAttribute (int attr, int value) 921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
862 923
863int SDL_GL_GetAttribute (int attr) 924int SDL_GL_GetAttribute (int attr)
864 CODE: 925 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 927 XSRETURN_UNDEF;
867 OUTPUT: 928 OUTPUT:
868 RETVAL 929 RETVAL
869 930
870void 931void
925 ); 986 );
926 987
927 if (RETVAL) 988 if (RETVAL)
928 { 989 {
929 av_clear (texture_av); 990 av_clear (texture_av);
930
931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 992#include "glfunc.h"
934#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
935 } 996 }
936} 997}
937 OUTPUT: 998 OUTPUT:
938 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
939 1003
940void 1004void
941SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
942 1006
943char * 1007char *
944SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
945 1010
946int 1011int
947SDL_GetAppState () 1012SDL_GetAppState ()
948 1013
949int 1014int
950SDL_GetModState () 1015SDL_GetModState ()
951 1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
952void 1021void
1022SDL_PumpEvents ()
1023
1024void
953poll_events () 1025peep_events ()
954 PPCODE: 1026 PPCODE:
955{ 1027{
956 SDL_Event ev; 1028 SDL_Event ev;
957 1029
958 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
1024 1096
1025 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1026 } 1098 }
1027} 1099}
1028 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
1029int 1114int
1030Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1031 POSTCALL: 1116 POSTCALL:
1032 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
1033 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
1034 1119
1035void 1120void
1036Mix_QuerySpec () 1121Mix_QuerySpec ()
1095add_font (char *file) 1180add_font (char *file)
1096 CODE: 1181 CODE:
1097 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098 OUTPUT: 1183 OUTPUT:
1099 RETVAL 1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1100 1192
1101void 1193void
1102load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
1103 ALIAS: 1195 ALIAS:
1104 load_image_file = 1 1196 load_image_file = 1
1150 1242
1151 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
1152 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
1153 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
1154 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
1155 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1156 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1157 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1158 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1159 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
1160 1252
1232MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1233 1325
1234PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1235 1327
1236DC::Font 1328DC::Font
1237new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1238 CODE: 1330 CODE:
1239{ 1331{
1240 int count; 1332 int count;
1241 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1242 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1271 PROTOTYPE: 1363 PROTOTYPE:
1272 CODE: 1364 CODE:
1273 tc_restore (); 1365 tc_restore ();
1274 1366
1275DC::Layout 1367DC::Layout
1276new (SV *class) 1368new (SV *klass)
1277 CODE: 1369 CODE:
1278 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1279 1371
1280 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1281 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1282 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1283 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1284 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1285 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1286 RETVAL->font = 0; 1378 RETVAL->font = 0;
1287 RETVAL->rc = rc_alloc ();
1288 1379
1289 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1290 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1291 OUTPUT: 1382 OUTPUT:
1292 RETVAL 1383 RETVAL
1293 1384
1294void 1385void
1295DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1296 CODE: 1387 CODE:
1297 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1298 rc_free (self->rc);
1299 Safefree (self); 1389 delete self;
1300 1390
1301void 1391void
1302set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1303 CODE: 1393 CODE:
1304{ 1394{
1430 1520
1431void 1521void
1432set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1433 CODE: 1523 CODE:
1434 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1435 { 1525 {
1436 self->base_height = base_height; 1526 self->base_height = base_height;
1437 layout_update_font (self); 1527 layout_update_font (self);
1438 } 1528 }
1439 1529
1440void 1530void
1558} 1648}
1559 1649
1560void 1650void
1561render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1562 CODE: 1652 CODE:
1563 rc_clear (self->rc); 1653 self->rc.clear ();
1564 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1565 self->pl, 1655 self->pl,
1566 self->rc, 1656 &self->rc,
1567 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1568 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1569 flags 1659 flags
1570 ); 1660 );
1571 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1582 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1583 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1584 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1585 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1586 1676
1587 rc_draw (self->rc); 1677 self->rc.draw ();
1588 1678
1589 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1590 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1591 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1592} 1682}
1672void 1762void
1673draw_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) 1763draw_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)
1674 PROTOTYPE: @ 1764 PROTOTYPE: @
1675 CODE: 1765 CODE:
1676{ 1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glEnable (GL_TEXTURE_2D); 1769 glEnable (GL_TEXTURE_2D);
1678 glEnable (GL_BLEND);
1679 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680 glBindTexture (GL_TEXTURE_2D, name1); 1770 glBindTexture (GL_TEXTURE_2D, name1);
1681 1771
1682 glColor3f (intensity, intensity, intensity); 1772 glColor3f (intensity, intensity, intensity);
1683 glPushMatrix (); 1773 glPushMatrix ();
1684 glScalef (1./3, 1./3, 1.); 1774 glScalef (1./3, 1./3, 1.);
1699 glBindTexture (GL_TEXTURE_2D, name2); 1789 glBindTexture (GL_TEXTURE_2D, name2);
1700 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701 1791
1702 /* rgb == rgb(glcolor) */ 1792 /* rgb == rgb(glcolor) */
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1793 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706 1796
1707 /* alpha = interpolate t0, t1 by env_alpha */ 1797 /* alpha = interpolate t0, t1 by env_alpha */
1708 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1798 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709 1799
1804MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1805 1895
1806PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1807 1897
1808DC::Map 1898DC::Map
1809new (SV *class) 1899new (SV *klass)
1810 CODE: 1900 CODE:
1811 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1812 RETVAL->x = 0; 1902 RETVAL->x = 0;
1813 RETVAL->y = 0; 1903 RETVAL->y = 0;
1814 RETVAL->w = 0; 1904 RETVAL->w = 0;
1815 RETVAL->h = 0; 1905 RETVAL->h = 0;
1816 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1853 1943
1854void 1944void
1855set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1856 CODE: 1946 CODE:
1857{ 1947{
1858 tileid texid; 1948 tileid texid;
1859 maptex *tex; 1949 maptex *tex;
1860 1950
1861 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1862 return; 1952 return;
1863 1953
1864 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1865 return; 1955 return;
1866 1956
1867 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1868 1958
1869 if (!texid) 1959 if (!texid)
1870 return; 1960 return;
1871 1961
1872 tex = self->tex + texid; 1962 tex = self->tex + texid;
1905} 1995}
1906 1996
1907void 1997void
1908expire_textures (DC::Map self, int texid, int count) 1998expire_textures (DC::Map self, int texid, int count)
1909 PPCODE: 1999 PPCODE:
1910 for (; texid < self->texs && count; ++texid, --count) 2000 for (; texid < self->texs && count; ++texid, --count)
1911 { 2001 {
1912 maptex *tex = self->tex + texid; 2002 maptex *tex = self->tex + texid;
1913 2003
1914 if (tex->name) 2004 if (tex->name)
1915 { 2005 {
1962 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1963 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1964 2054
1965 while (self->y < 0) 2055 while (self->y < 0)
1966 { 2056 {
1967 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1968 2058
1969 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1970 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1971 } 2061 }
1972} 2062}
1973 2063
1974SV * 2064SV *
1975map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1976 CODE: 2066 CODE:
1977{ 2067{
1978 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1979 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1980 mapcell *cell; 2070 mapcell *cell;
2001 2091
2002 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
2003 2093
2004 if (flags & 8) 2094 if (flags & 8)
2005 { 2095 {
2096 uint8_t ext, cmd;
2097
2006 if (extmap) 2098 do
2007 { 2099 {
2008 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
2009 2102
2010 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
2011 { 2106 {
2012 ext = *data++;
2013 cmd = ext & 0x7f;
2014
2015 if (cmd < 4)
2016 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2017 else if (cmd == 5) // health
2018 {
2019 cell->stat_width = 1; 2107 cell->stat_width = 1;
2020 cell->stat_hp = *data++; 2108 cell->stat_hp = *data++;
2021 }
2022 else if (cmd == 6) // monster width
2023 cell->stat_width = *data++ + 1;
2024 else if (cmd == 0x47)
2025 {
2026 if (*data == 1) cell->player = data [1];
2027 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2028 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2029 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2030
2031 data += *data + 1;
2032 }
2033 else if (cmd == 8) // cell flags
2034 cell->flags = *data++;
2035 else if (ext & 0x40) // unknown, multibyte => skip
2036 data += *data + 1;
2037 else
2038 data++;
2039 } 2109 }
2040 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
2041 } 2127 }
2042 else 2128 while (ext & 0x80);
2043 cell->darkness = *data++ + 1;
2044 } 2129 }
2045 2130
2046 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
2047 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
2048 { 2133 {
2096 ? self->row + y 2181 ? self->row + y
2097 : 0; 2182 : 0;
2098 2183
2099 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
2100 { 2185 {
2101 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
2102 2187
2103 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
2104 { 2189 {
2105 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
2106 2191
2108 { 2193 {
2109 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
2110 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
2111 int a1 = tex.a; 2196 int a1 = tex.a;
2112 2197
2113 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
2114 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
2115 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
2116 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
2117 } 2202 }
2118 } 2203 }
2119 2204
2120 *map++ = (r ) 2205 *map++ = (r )
2121 | (g << 8) 2206 | (g << 8)
2122 | (b << 16) 2207 | (b << 16)
2123 | (a << 24); 2208 | (a << 24);
2124 } 2209 }
2125 } 2210 }
2126 2211
2127 RETVAL = map_sv; 2212 RETVAL = map_sv;
2128} 2213}
2129 OUTPUT: 2214 OUTPUT:
2130 RETVAL 2215 RETVAL
2131 2216
2132void 2217void
2133draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2218draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2134 CODE: 2219 CODE:
2135{ 2220{
2136 int x, y, z; 2221 int x, y, z;
2137 2222
2138 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2139 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2140 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2223 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2141 smooth_key skey;
2142 int pl_x, pl_y; 2224 int pl_x, pl_y;
2143 maptex pl_tex; 2225 maptex pl_tex;
2144 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2145 rc_t *rc_ov = rc_alloc (); 2227 rc_t rc_ov;
2146 rc_key_t key; 2228 rc_key_t key;
2147 rc_array_t *arr; 2229 rc_t::array_t *arr;
2148 2230
2149 pl_tex.name = 0; 2231 pl_tex.name = 0;
2150 2232
2151 // that's current max. sorry. 2233 // that's current max. sorry.
2152 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
2153 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
2154
2155 // clear key, in case of extra padding
2156 memset (&skey, 0, sizeof (skey));
2157 2236
2158 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
2159 key.r = 255; 2238 key.r = 255;
2160 key.g = 255; 2239 key.g = 255;
2161 key.b = 255; 2240 key.b = 255;
2167 my += self->y; 2246 my += self->y;
2168 2247
2169 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
2170 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
2171 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
2172 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2173 2252
2174 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
2175 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
2176 { 2255 {
2177 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2194 2273
2195 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
2196 { 2275 {
2197 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2198 key.texname = -1; 2279 key.texname = -1;
2199 2280
2200 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
2201 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
2202 { 2283 {
2219 2300
2220 if (!tex.name) 2301 if (!tex.name)
2221 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2222 2303
2223 key.texname = tex.name; 2304 key.texname = tex.name;
2224 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
2225 } 2306 }
2226 2307
2227 px = (x + 1) * T - tex.w; 2308 px = (x + 1) * Th - tex.w;
2228 py = (y + 1) * T - tex.h; 2309 py = (y + 1) * Tw - tex.h;
2229 2310
2230 if (expect_false (cell->player == player) && expect_false (z == 2)) 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
2231 { 2312 {
2232 pl_x = px; 2313 pl_x = px;
2233 pl_y = py; 2314 pl_y = py;
2234 pl_tex = tex; 2315 pl_tex = tex;
2235 continue; 2316 continue;
2236 } 2317 }
2237 2318
2238 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2239 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2240 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2321 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2241 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2242 2323
2243 // update smooth hash 2324 // update smooth hash
2244 if (tex.smoothtile) 2325 if (tex.smoothtile)
2245 { 2326 {
2246 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
2247 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
2248 2329
2249 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
2250 2331
2251 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
2252 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
2253 2334
2254 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
2262 2343
2263 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2264 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
2265 2346
2266 // full tile 2347 // full tile
2267 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2268 2349
2269 // borders 2350 // borders
2270 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2271 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2352 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2272 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2353 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2273 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2274 2355
2275 // corners 2356 // corners
2276 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2277 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2358 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2278 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2359 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2279 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2280 } 2361 }
2281 } 2362 }
2282 2363
2283 if (expect_false (z == 2) && expect_false (cell->flags)) 2364 if (expect_false (z == 2) && expect_false (cell->flags))
2284 { 2365 {
2285 // overlays such as the speech bubble, probably more to come 2366 // overlays such as the speech bubble, probably more to come
2286 if (cell->flags & 1) 2367 if (cell->flags & 1)
2287 { 2368 {
2288 rc_key_t key_ov = key; 2369 rc_key_t key_ov = key;
2289 maptex tex = self->tex [TEXID_SPEECH]; 2370 maptex tex = self->tex[TEXID_SPEECH];
2290 rc_array_t *arr;
2291 int px = x * T + T * 2 / 32; 2371 int px = x * Tw + Tw * 2 / 32;
2292 int py = y * T - T * 6 / 32; 2372 int py = y * Th - Th * 6 / 32;
2293 2373
2294 key_ov.texname = tex.name; 2374 key_ov.texname = tex.name;
2295 arr = rc_array (rc_ov, &key_ov); 2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2296 2376
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2301 } 2381 }
2302 } 2382 }
2303 } 2383 }
2304 } 2384 }
2305 2385
2306 rc_draw (rc); 2386 rc.draw ();
2307 rc_clear (rc); 2387 rc.clear ();
2308 2388
2309 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
2310 // this is basically counting sort 2390 // this is basically counting sort
2311 { 2391 {
2312 int w, b; 2392 int w, b;
2313 2393
2314 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
2315 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
2316 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2317 { 2399 {
2318 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
2319 if (smask) 2401 IV bits = it->second;
2320 for (b = 0; b < 32; ++b) 2402
2321 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
2322 { 2406 {
2323 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
2324 HE *he; 2415 if (tex.name)
2325
2326 hv_iterinit (smooth);
2327 while ((he = hv_iternext (smooth)))
2328 { 2416 {
2329 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
2330 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
2331 2419 if (key.texname != tex.name)
2332 if (!(bits & 0x1000)
2333 && skey->level == level
2334 && level > smooth_max [skey->x][skey->y])
2335 { 2420 {
2336 maptex tex = self->tex [skey->tile];
2337 int px = (((int)skey->x) - 1) * T;
2338 int py = (((int)skey->y) - 1) * T;
2339 int border = bits & 15;
2340 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2341 float dx = tex.s * .0625f; // 16 images/row
2342 float dy = tex.t * .5f ; // 2 images/column
2343
2344 if (tex.name)
2345 {
2346 // this time avoiding texture state changes
2347 // save gobs of state changes.
2348 if (key.texname != tex.name)
2349 {
2350 self->tex [skey->tile].unused = 0; 2421 self->tex [skey.tile].unused = 0;
2351 2422
2352 glEnd (); 2423 glEnd ();
2353 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2354 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2355 } 2426 }
2356 2427
2357 if (border) 2428 if (border)
2358 { 2429 {
2359 float ox = border * dx; 2430 float ox = border * dx;
2360 2431
2361 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2362 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2363 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2364 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2365 } 2436 }
2366 2437
2367 if (corner) 2438 if (corner)
2368 { 2439 {
2369 float ox = corner * dx; 2440 float ox = corner * dx;
2370 2441
2371 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2372 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2373 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2374 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2375 }
2376 }
2377 } 2446 }
2378 } 2447 }
2379 } 2448 }
2380 } 2449 }
2381 2450
2382 glEnd (); 2451 glEnd ();
2383 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2384 key.texname = -1; 2453 key.texname = -1;
2385 } 2454 }
2386
2387 hv_clear (smooth);
2388 } 2455 }
2389 2456
2390 if (pl_tex.name) 2457 if (pl_tex.name)
2391 { 2458 {
2392 maptex tex = pl_tex; 2459 maptex tex = pl_tex;
2393 int px = pl_x + sdx; 2460 int px = pl_x + sdx;
2394 int py = pl_y + sdy; 2461 int py = pl_y + sdy;
2395 2462
2396 key.texname = tex.name; 2463 key.texname = tex.name;
2397 arr = rc_array (rc, &key); 2464 rc_t::array_t &arr = rc.array (key);
2398 2465
2399 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2400 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2401 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2468 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2402 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2403 2470
2404 rc_draw (rc); 2471 rc.draw ();
2405 } 2472 }
2406 2473
2407 rc_draw (rc_ov); 2474 rc_ov.draw ();
2408 rc_clear (rc_ov); 2475 rc_ov.clear ();
2409 2476
2410 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2411 rc_free (rc);
2412 rc_free (rc_ov);
2413 2478
2414 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2415 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2416 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2417 { 2482 {
2420 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2421 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2422 { 2487 {
2423 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2424 2489
2425 int px = x * T; 2490 int px = x * Tw;
2426 int py = y * T; 2491 int py = y * Th;
2427 2492
2428 if (expect_false (cell->player == player)) 2493 if (expect_false (cell->player == player))
2429 { 2494 {
2430 px += sdx; 2495 px += sdx;
2431 py += sdy; 2496 py += sdy;
2432 } 2497 }
2433 2498
2434 if (cell->stat_hp) 2499 if (cell->stat_hp)
2435 { 2500 {
2436 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2437 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2438 2503
2439 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2440 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2441 px + width - 1, py); 2506 px + width - 1, py);
2442 2507
2522 int x, y; 2587 int x, y;
2523 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2524 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2525 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2526 int sw3 = sw * 3; 2591 int sw3 = sw * 3;
2527 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2528 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2529 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2595 memset (darkness1, 0, sw1*sh1);
2530 2596
2531 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2532 SvCUR_set (darkness3_sv, sw3 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2533 2599
2534 mx += self->x - 1; 2600 mx += self->x - 1;
2660 else 2726 else
2661 *data++ = 0; 2727 *data++ = 0;
2662 } 2728 }
2663 } 2729 }
2664 2730
2665 /* if size is w*h + 5 then no data has been found */ 2731 /* if size is w*h + 5 then no data has been found */
2666 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2667 { 2733 {
2668 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2669 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2670 } 2736 }
2671 2737
2672 RETVAL = data_sv; 2738 RETVAL = data_sv;
2673} 2739}
2674 OUTPUT: 2740 OUTPUT:
2675 RETVAL 2741 RETVAL
2676 2742
2677void 2743void
2684 STRLEN len; 2750 STRLEN len;
2685 uint8_t *data, *end; 2751 uint8_t *data, *end;
2686 2752
2687 len = SvLEN (data_sv); 2753 len = SvLEN (data_sv);
2688 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2689 data = SvPVbyte_nolen (data_sv); 2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2690 end = data + len + 8; 2756 end = data + len + 8;
2691 2757
2692 if (len < 5) 2758 if (len < 5)
2693 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2694 2760
2755} 2821}
2756 2822
2757MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2758 2824
2759DC::RW 2825DC::RW
2760new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2761 CODE: 2827 CODE:
2762{ 2828{
2763 STRLEN datalen; 2829 STRLEN datalen;
2764 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2765 2831
2767} 2833}
2768 OUTPUT: 2834 OUTPUT:
2769 RETVAL 2835 RETVAL
2770 2836
2771DC::RW 2837DC::RW
2772new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2773 CODE: 2839 CODE:
2774 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2775 OUTPUT: 2841 OUTPUT:
2776 RETVAL 2842 RETVAL
2777 2843
2795 if (RETVAL < 0) 2861 if (RETVAL < 0)
2796 { 2862 {
2797 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2798 2864
2799 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2800 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2801 2872 }
2873 else
2802 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2803 } 2875 }
2804 2876
2805 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2806 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2807} 2879}
2867 2939
2868MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2869 2941
2870PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2871 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2872DC::MixChunk 2956DC::MixChunk
2873new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2874 CODE: 2958 CODE:
2875 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2876 OUTPUT: 2960 OUTPUT:
2877 RETVAL 2961 RETVAL
2878 2962
2908 OUTPUT: 2992 OUTPUT:
2909 RETVAL 2993 RETVAL
2910 2994
2911MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2912 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2913int 3009int
2914volume (int volume = -1) 3010volume (int volume = -1)
2915 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2916 CODE: 3012 CODE:
2917 if (items > 0) 3013 if (items > 0)
2928void 3024void
2929halt () 3025halt ()
2930 CODE: 3026 CODE:
2931 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2932 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2933DC::MixMusic 3036DC::MixMusic
2934new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2935 CODE: 3038 CODE:
2936 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2937 OUTPUT: 3040 OUTPUT:
2938 RETVAL 3041 RETVAL
2939 3042
3076 const_iv (GL_FUNC_SUBTRACT), 3179 const_iv (GL_FUNC_SUBTRACT),
3077 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3078# undef const_iv 3181# undef const_iv
3079 }; 3182 };
3080 3183
3081 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3082 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3083 3186
3084 texture_av = newAV (); 3187 texture_av = newAV ();
3085 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
3086} 3189}
3087 3190
3092 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
3093 3196
3094void 3197void
3095apple_nvidia_bug (int enable) 3198apple_nvidia_bug (int enable)
3096 3199
3097char * 3200const char *
3098gl_vendor () 3201gl_vendor ()
3099 CODE: 3202 CODE:
3100 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
3101 OUTPUT: 3204 OUTPUT:
3102 RETVAL 3205 RETVAL
3103 3206
3104char * 3207const char *
3105gl_version () 3208gl_version ()
3106 CODE: 3209 CODE:
3107 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
3108 OUTPUT: 3211 OUTPUT:
3109 RETVAL 3212 RETVAL
3110 3213
3111char * 3214const char *
3112gl_extensions () 3215gl_extensions ()
3113 CODE: 3216 CODE:
3114 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3115 OUTPUT: 3218 OUTPUT:
3116 RETVAL 3219 RETVAL
3117 3220
3118const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
3119 3226
3120GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
3121 CODE: 3228 CODE:
3122 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
3123 OUTPUT: 3230 OUTPUT:
3130 RETVAL 3237 RETVAL
3131 3238
3132int glGetError () 3239int glGetError ()
3133 3240
3134void glFinish () 3241void glFinish ()
3242
3243void glFlush ()
3135 3244
3136void glClear (int mask) 3245void glClear (int mask)
3137 3246
3138void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
3139 PROTOTYPE: @ 3248 PROTOTYPE: @
3324 3433
3325void 3434void
3326find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
3327 PPCODE: 3436 PPCODE:
3328{ 3437{
3329 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
3330 XPUSHs (self); 3439 XPUSHs (self);
3331} 3440}
3332 3441
3333BOOT: 3442BOOT:
3334{ 3443{
3342 3451
3343void 3452void
3344draw (SV *self) 3453draw (SV *self)
3345 CODE: 3454 CODE:
3346{ 3455{
3347 HV *hv; 3456 HV *hv;
3348 SV **svp; 3457 SV **svp;
3349 NV x, y, w, h; 3458 NV x, y, w, h;
3350 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
3351 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
3352 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
3353 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines