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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines