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.280 by root, Wed Nov 26 23:08:34 2008 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
70# include <netinet/in.h> 76# include <netinet/in.h>
71# include <netinet/tcp.h> 77# include <netinet/tcp.h>
72# include <inttypes.h> 78# include <inttypes.h>
73#endif 79#endif
74 80
75#if __GNUC__ >= 4 81#include "ecb.h"
76# define expect(expr,value) __builtin_expect ((expr),(value)) 82#include "salloc.h"
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83 83
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 85
86/* this is used as fow flag as well, so has to have a different value */
87/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 88#define FOW_DARKNESS 50
89#define DARKNESS_ADJUST(n) (n)
87 90
88#define MAP_EXTEND_X 32 91#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 92#define MAP_EXTEND_Y 512
90 93
91#define MIN_FONT_HEIGHT 10 94#define MIN_FONT_HEIGHT 10
92 95
93/* mask out modifiers we are not interested in */ 96/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 97#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 98
96#define KMOD_LRAM 0x10000 // our extension 99#define KMOD_LRAM 0x10000 // our extension
100
101#define TEXID_SPEECH 1
102#define TEXID_NOFACE 2
103
104// approximately divide by 255
105static unsigned int
106div255 (unsigned int n)
107{
108 return (n + (n >> 8)) >> 8;
109}
110
111static unsigned int
112minpot (unsigned int n)
113{
114 if (!n)
115 return 0;
116
117 --n;
118
119 n |= n >> 1;
120 n |= n >> 2;
121 n |= n >> 4;
122 n |= n >> 8;
123 n |= n >> 16;
124
125 return n + 1;
126}
127
128static char *
129fast_sv_grow (SV *sv, STRLEN need)
130{
131 STRLEN len = SvLEN (sv);
132 STRLEN want = SvCUR (sv) + need;
133
134 if (ecb_expect_false (len < want))
135 {
136 do
137 len *= 2;
138 while (len < want);
139
140 sv_grow (sv, len);
141 }
142
143 SvCUR_set (sv, want);
144 return SvEND (sv) - need;
145}
97 146
98static AV *texture_av; 147static AV *texture_av;
99 148
100static struct 149static struct
101{ 150{
158{ 207{
159 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
160 209
161 while (attrs) 210 while (attrs)
162 { 211 {
163 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 213
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 215 return 1;
167 216
168 attrs = attrs->next; 217 attrs = attrs->next;
169 } 218 }
170 219
171 return 0; 220 return 0;
172} 221}
173 222
174typedef struct cf_layout { 223struct cf_layout {
175 PangoLayout *pl; 224 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
177 int base_height; 226 int base_height;
178 DC__Font font; 227 DC__Font font;
179 rc_t *rc; 228 rc_t rc;
180} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
181 232
182static DC__Font default_font; 233static DC__Font default_font;
183static PangoContext *opengl_context; 234static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
185 236
186static void 237static void
187substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
188{ 239{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 243#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 245}
195 246
196static void 247static void
223 274
224 *w = rect.width; 275 *w = rect.width;
225 *h = rect.height; 276 *h = rect.height;
226} 277}
227 278
279/////////////////////////////////////////////////////////////////////////////
280
228typedef uint16_t tileid; 281typedef uint16_t tileid;
229typedef uint16_t faceid; 282typedef uint16_t faceid;
230 283
231typedef struct { 284struct maptex
285{
232 GLuint name; 286 GLuint name;
233 int w, h; 287 int w, h;
234 float s, t; 288 float s, t;
235 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
236 tileid smoothtile; 290 tileid smoothtile;
237 uint8_t smoothlevel; 291 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */ 292 uint8_t unused; /* set to zero on use */
239} maptex; 293};
240 294
241typedef struct { 295struct mapcell
296{
242 uint32_t player; 297 uint32_t player;
243 tileid tile[3]; 298 tileid tile[3];
244 uint16_t darkness; 299 uint16_t darkness;
245 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
246} mapcell; 301};
247 302
248typedef struct { 303struct maprow
304{
249 int32_t c0, c1; 305 int32_t c0, c1;
250 mapcell *col; 306 mapcell *col;
251} maprow; 307};
252 308
253typedef struct map { 309struct mapgrid {
254 int x, y, w, h; 310 int x, y, w, h;
255 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
256 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
257 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
258 314
259 int32_t rows; 315 int32_t rows;
260 maprow *row; 316 maprow *row;
261} *DC__Map; 317};
262 318
263static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
264prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
265{ 324{
266 char *p; 325 T *p;
267 326
268 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
269 Zero (p, inc, char); 328 Zero (p, inc, T);
270 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
271 Safefree (ptr); 330 Safefree (ptr);
272 331
273 return p; 332 ptr = p;
274} 333}
275 334
276static char * 335template<typename T>
336ecb_cold static void
277append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
278{ 338{
279 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
280 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
281
282 return ptr;
283} 341}
284
285#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
286#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
287 342
288static void 343static void
289need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
290{ 345{
291 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
292 { 347 return;
348
349 size_t newsize = minpot (face + 1);
293 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
294 self->faces *= 2; 351 self->faces = newsize;
295 }
296} 352}
297 353
298static void 354static void
299need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
300{ 356{
301 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
302 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
303 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
304 self->texs *= 2; 362 self->texs = newsize;
305 }
306} 363}
307 364
308static maprow * 365static maprow *
309map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
310{ 367{
311 if (0 > y) 368 if (0 > y)
312 { 369 {
313 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
314 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
315 372
316 self->rows += extend; 373 self->rows += extend;
317 self->y += extend; 374 self->y += extend;
318 y += extend; 375 y += extend;
319 } 376 }
320 else if (y >= self->rows) 377 else if (y >= self->rows)
321 { 378 {
322 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
323 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
324 self->rows += extend; 381 self->rows += extend;
325 } 382 }
326 383
327 return self->row + y; 384 return self->row + y;
328} 385}
338 } 395 }
339 396
340 if (row->c0 > x) 397 if (row->c0 > x)
341 { 398 {
342 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
343 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
344 row->c0 -= extend; 401 row->c0 -= extend;
345 } 402 }
346 else if (x >= row->c1) 403 else if (x >= row->c1)
347 { 404 {
348 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
349 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
350 row->c1 += extend; 407 row->c1 += extend;
351 } 408 }
352 409
353 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
354} 411}
355 412
356static mapcell * 413static mapcell *
357map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
358{ 415{
359 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
360} 417}
361 418
362static void 419static void
363map_clear (DC__Map self) 420map_clear (mapgrid *self)
364{ 421{
365 int r; 422 int r;
366 423
367 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
368 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
386 (cell)->flags = 0; \ 443 (cell)->flags = 0; \
387 (cell)->player = 0; \ 444 (cell)->player = 0; \
388 } while (0) 445 } while (0)
389 446
390static void 447static void
391map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
392{ 449{
393 int x, y; 450 int x, y;
394 maprow *row; 451 maprow *row;
395 mapcell *cell; 452 mapcell *cell;
396 453
413 CELL_CLEAR (cell); 470 CELL_CLEAR (cell);
414 } 471 }
415 } 472 }
416} 473}
417 474
418typedef struct { 475struct smooth_key
476{
419 tileid tile; 477 tileid tile;
420 uint8_t x, y, level; 478 uint8_t x, y, level;
421} smooth_key; 479
480 bool operator == (const smooth_key &o) const
481 {
482 return tile == o.tile && x == o.x && y == o.y && level == o.level;
483 }
484};
485
486typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
487
488namespace std {
489 template <>
490 struct hash<smooth_key>
491 {
492 size_t operator () (const smooth_key &v) const
493 {
494 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
495 }
496 };
497}
422 498
423static void 499static void
424smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
425{ 501{
426 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
427 503
428 if (SvIOK (*sv)) 504 if (it == h.end ())
429 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
430 else 506 else
431 sv_setiv (*sv, bits); 507 it->second |= bits;
432} 508}
433 509
434static void 510static void
435music_finished (void) 511music_finished (void)
436{ 512{
455 ev.data2 = 0; 531 ev.data2 = 0;
456 532
457 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
458} 534}
459 535
460static unsigned int
461minpot (unsigned int n)
462{
463 if (!n)
464 return 0;
465
466 --n;
467
468 n |= n >> 1;
469 n |= n >> 2;
470 n |= n >> 4;
471 n |= n >> 8;
472 n |= n >> 16;
473
474 return n + 1;
475}
476
477static unsigned int
478popcount (unsigned int n)
479{
480 n -= (n >> 1) & 0x55555555U;
481 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
482 n = ((n >> 4) + n) & 0x0f0f0f0fU;
483 n *= 0x01010101U;
484
485 return n >> 24;
486}
487
488/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
489#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
490#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
491 539
492/******************************************************************************/ 540/******************************************************************************/
545 593
546 return mod; 594 return mod;
547} 595}
548 596
549static void 597static void
550deliantra_main () 598deliantra_main (SV *real_main)
551{ 599{
552 char *argv[] = { 0 }; 600 dSP;
553 call_argv ("::main", G_DISCARD | G_VOID, argv); 601
602 PUSHMARK (SP);
603 call_sv (real_main, G_DISCARD | G_VOID);
554} 604}
555 605
556#ifdef __MACOSX__ 606#ifdef __MACOSX__
607 static SV *real_main;
608
557 /* to due surprising braindamage on the side of SDL design, we 609 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main() 610 * do some mind-boggling hack here: SDL requires a custom main()
559 * on OS X, so... we provide one and call the original main(), which, 611 * on OS X, so... we provide one and call the original main(), which,
560 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 612 * due to shared library magic, calls -lSDLmain's main, not perl's main,
561 * and which calls our main (== SDL_main) back. 613 * and which calls our main (== SDL_main) back.
562 */ 614 */
563 extern C_LINKAGE int 615 extern C_LINKAGE int
564 main (int argc, char *argv[]) 616 main (int argc, char *argv[])
565 { 617 {
566 deliantra_main (); 618 deliantra_main (real_main);
567 } 619 }
568 620
569 #undef main 621 #undef main
570 622
571 extern C_LINKAGE int main (int argc, char *argv[]); 623 extern C_LINKAGE int main (int argc, char *argv[]);
572 624
573 static void 625 static void
574 SDL_braino (void) 626 SDL_main_hack (SV *real_main_)
575 { 627 {
628 real_main = real_main_;
629
576 char *argv[] = { "deliantra client", 0 }; 630 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv); 631 (main) (1, argv);
578 } 632 }
579#else 633#else
580 static void 634 static void
581 SDL_braino (void) 635 SDL_main_hack (SV *real_main)
582 { 636 {
583 deliantra_main (); 637 deliantra_main (real_main);
584 } 638 }
585#endif 639#endif
586 640
587MODULE = Deliantra::Client PACKAGE = DC 641MODULE = Deliantra::Client PACKAGE = DC
588 642
789 843
790 const_iv (FOW_DARKNESS) 844 const_iv (FOW_DARKNESS)
791# undef const_iv 845# undef const_iv
792 }; 846 };
793 847
794 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 848 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
796 850
797 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
798 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
799} 853}
800 854
815 869
816NV ceil (NV x) 870NV ceil (NV x)
817 871
818IV minpot (UV n) 872IV minpot (UV n)
819 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
820IV popcount (UV n) 880IV popcount (UV n)
881 CODE:
882 RETVAL = ecb_popcount32 (n);
883 OUTPUT:
884 RETVAL
885
886NV distance (NV dx, NV dy)
887 CODE:
888 RETVAL = pow (dx * dx + dy * dy, 0.5);
889 OUTPUT:
890 RETVAL
821 891
822void 892void
823pango_init () 893pango_init ()
824 CODE: 894 CODE:
825{ 895{
833#endif 903#endif
834} 904}
835 905
836char *SDL_GetError () 906char *SDL_GetError ()
837 907
838void SDL_braino () 908void SDL_main_hack (SV *real_main)
909 PROTOTYPE: &
839 910
840int SDL_Init (U32 flags) 911int SDL_Init (U32 flags)
841 912
842int SDL_InitSubSystem (U32 flags) 913int SDL_InitSubSystem (U32 flags)
843 914
844void SDL_QuitSubSystem (U32 flags) 915void SDL_QuitSubSystem (U32 flags)
845 916
846void SDL_Quit () 917void SDL_Quit ()
847 918
848int SDL_GL_SetAttribute (int attr, int value) 919int SDL_GL_SetAttribute (int attr, int value)
920 C_ARGS: (SDL_GLattr)attr, value
849 921
850int SDL_GL_GetAttribute (int attr) 922int SDL_GL_GetAttribute (int attr)
851 CODE: 923 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL)) 924 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
853 XSRETURN_UNDEF; 925 XSRETURN_UNDEF;
854 OUTPUT: 926 OUTPUT:
855 RETVAL 927 RETVAL
856 928
857void 929void
912 ); 984 );
913 985
914 if (RETVAL) 986 if (RETVAL)
915 { 987 {
916 av_clear (texture_av); 988 av_clear (texture_av);
917
918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 989#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
920#include "glfunc.h" 990#include "glfunc.h"
921#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922 } 994 }
923} 995}
924 OUTPUT: 996 OUTPUT:
925 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
926 1001
927void 1002void
928SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
929 1004
930char * 1005char *
931SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
932 1008
933int 1009int
934SDL_GetAppState () 1010SDL_GetAppState ()
935 1011
936int 1012int
937SDL_GetModState () 1013SDL_GetModState ()
938 1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
939void 1019void
1020SDL_PumpEvents ()
1021
1022void
940poll_events () 1023peep_events ()
941 PPCODE: 1024 PPCODE:
942{ 1025{
943 SDL_Event ev; 1026 SDL_Event ev;
944 1027
945 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
1011 1094
1012 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1095 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1013 } 1096 }
1014} 1097}
1015 1098
1099char *
1100SDL_AudioDriverName ()
1101 CODE:
1102{
1103 char buf [256];
1104 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1105 XSRETURN_UNDEF;
1106
1107 RETVAL = buf;
1108}
1109 OUTPUT:
1110 RETVAL
1111
1016int 1112int
1017Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1113Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1018 POSTCALL: 1114 POSTCALL:
1019 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
1020 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
1021 1117
1022void 1118void
1023Mix_QuerySpec () 1119Mix_QuerySpec ()
1082add_font (char *file) 1178add_font (char *file)
1083 CODE: 1179 CODE:
1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1180 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT: 1181 OUTPUT:
1086 RETVAL 1182 RETVAL
1183
1184void
1185IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1186
1187# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1188void
1189Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1087 1190
1088void 1191void
1089load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
1090 ALIAS: 1193 ALIAS:
1091 load_image_file = 1 1194 load_image_file = 1
1137 1240
1138 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
1139 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
1140 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
1141 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
1142 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1143 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1246 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1144 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1145 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1146 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
1147 1250
1219MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1220 1323
1221PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1222 1325
1223DC::Font 1326DC::Font
1224new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1225 CODE: 1328 CODE:
1226{ 1329{
1227 int count; 1330 int count;
1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1229 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1258 PROTOTYPE: 1361 PROTOTYPE:
1259 CODE: 1362 CODE:
1260 tc_restore (); 1363 tc_restore ();
1261 1364
1262DC::Layout 1365DC::Layout
1263new (SV *class) 1366new (SV *klass)
1264 CODE: 1367 CODE:
1265 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1266 1369
1267 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1268 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1269 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1270 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1271 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1272 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1273 RETVAL->font = 0; 1376 RETVAL->font = 0;
1274 RETVAL->rc = rc_alloc ();
1275 1377
1276 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1277 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1278 OUTPUT: 1380 OUTPUT:
1279 RETVAL 1381 RETVAL
1280 1382
1281void 1383void
1282DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1283 CODE: 1385 CODE:
1284 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1285 rc_free (self->rc);
1286 Safefree (self); 1387 delete self;
1287 1388
1288void 1389void
1289set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1290 CODE: 1391 CODE:
1291{ 1392{
1417 1518
1418void 1519void
1419set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1420 CODE: 1521 CODE:
1421 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1422 { 1523 {
1423 self->base_height = base_height; 1524 self->base_height = base_height;
1424 layout_update_font (self); 1525 layout_update_font (self);
1425 } 1526 }
1426 1527
1427void 1528void
1545} 1646}
1546 1647
1547void 1648void
1548render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1549 CODE: 1650 CODE:
1550 rc_clear (self->rc); 1651 self->rc.clear ();
1551 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1552 self->pl, 1653 self->pl,
1553 self->rc, 1654 &self->rc,
1554 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1555 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1556 flags 1657 flags
1557 ); 1658 );
1558 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1569 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1570 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1571 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1572 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1573 1674
1574 rc_draw (self->rc); 1675 self->rc.draw ();
1575 1676
1576 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1577 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1578 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1579} 1680}
1654 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1656 } 1757 }
1657} 1758}
1658 1759
1760void
1761draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1762 PROTOTYPE: @
1763 CODE:
1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1767 glEnable (GL_TEXTURE_2D);
1768 glBindTexture (GL_TEXTURE_2D, name1);
1769
1770 glColor3f (intensity, intensity, intensity);
1771 glPushMatrix ();
1772 glScalef (1./3, 1./3, 1.);
1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
1829 }
1830
1831 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1832 {
1833 int x, y;
1834 int dx3 = dx * 3;
1835 int dy3 = dy * 3;
1836
1837 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1838 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1839 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1840 glTranslatef (-1., -1., 0);
1841 glBegin (GL_QUADS);
1842
1843 for (y = 1; y < h; y += 3)
1844 {
1845 int y1 = y - dy3;
1846 int y1valid = y1 >= 0 && y1 < h;
1847
1848 for (x = 1; x < w; x += 3)
1849 {
1850 int x1 = x - dx3;
1851 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1852 uint8_t h2;
1853
1854 if (y1valid && x1 >= 0 && x1 < w)
1855 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1856 else
1857 h2 = 1; /* out of range == invisible */
1858
1859 if (h1 || h2)
1860 {
1861 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1862 glColor4f (1., 1., 1., alpha);
1863
1864 glTexCoord2f (0, 0.); glVertex2i (x , y );
1865 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1866 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1867 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1868 }
1869 }
1870 }
1871 }
1872
1873 glEnd ();
1874
1875 glPopMatrix ();
1876
1877 glDisable (GL_TEXTURE_2D);
1878 glDisable (GL_BLEND);
1879}
1880
1659IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1881IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1660 CODE: 1882 CODE:
1661{ 1883{
1662 GLint width; 1884 GLint width;
1663 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1885 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1670MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1671 1893
1672PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1673 1895
1674DC::Map 1896DC::Map
1675new (SV *class) 1897new (SV *klass)
1676 CODE: 1898 CODE:
1677 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1678 RETVAL->x = 0; 1900 RETVAL->x = 0;
1679 RETVAL->y = 0; 1901 RETVAL->y = 0;
1680 RETVAL->w = 0; 1902 RETVAL->w = 0;
1681 RETVAL->h = 0; 1903 RETVAL->h = 0;
1682 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1719 1941
1720void 1942void
1721set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1722 CODE: 1944 CODE:
1723{ 1945{
1724 tileid texid; 1946 tileid texid;
1725 maptex *tex; 1947 maptex *tex;
1726 1948
1727 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1728 return; 1950 return;
1729 1951
1730 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1731 return; 1953 return;
1732 1954
1733 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1734 1956
1735 if (!texid) 1957 if (!texid)
1736 return; 1958 return;
1737 1959
1738 tex = self->tex + texid; 1960 tex = self->tex + texid;
1771} 1993}
1772 1994
1773void 1995void
1774expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1775 PPCODE: 1997 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1777 { 1999 {
1778 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1779 2001
1780 if (tex->name) 2002 if (tex->name)
1781 { 2003 {
1782 if (tex->unused) 2004 if (tex->unused)
1783 { 2005 {
1784 tex->name = 0; 2006 tex->name = 0;
1785 tex->unused = 0, 2007 tex->unused = 0;
1786 XPUSHs (sv_2mortal (newSViv (texid))); 2008 XPUSHs (sv_2mortal (newSViv (texid)));
1787 } 2009 }
1788 else 2010 else
1789 tex->unused = 1; 2011 tex->unused = 1;
1790 } 2012 }
1828 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1829 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1830 2052
1831 while (self->y < 0) 2053 while (self->y < 0)
1832 { 2054 {
1833 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1834 2056
1835 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1836 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1837 } 2059 }
1838} 2060}
1839 2061
1840SV * 2062SV *
1841map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1842 CODE: 2064 CODE:
1843{ 2065{
1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1845 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1846 mapcell *cell; 2068 mapcell *cell;
1867 2089
1868 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1869 2091
1870 if (flags & 8) 2092 if (flags & 8)
1871 { 2093 {
2094 uint8_t ext, cmd;
2095
1872 if (extmap) 2096 do
1873 { 2097 {
1874 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1875 2100
1876 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
1877 { 2104 {
1878 ext = *data++;
1879 cmd = ext & 0x7f;
1880
1881 if (cmd < 4)
1882 cell->darkness = 255 - ext * 64 + 1;
1883 else if (cmd == 5) // health
1884 {
1885 cell->stat_width = 1; 2105 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1887 }
1888 else if (cmd == 6) // monster width
1889 cell->stat_width = *data++ + 1;
1890 else if (cmd == 0x47)
1891 {
1892 if (*data == 1) cell->player = data [1];
1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1896
1897 data += *data + 1;
1898 }
1899 else if (cmd == 8) // cell flags
1900 cell->flags = *data++;
1901 else if (ext & 0x40) // unknown, multibyte => skip
1902 data += *data + 1;
1903 else
1904 data++;
1905 } 2107 }
1906 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
1907 } 2125 }
1908 else 2126 while (ext & 0x80);
1909 cell->darkness = *data++ + 1;
1910 } 2127 }
1911 2128
1912 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1913 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1914 { 2131 {
1962 ? self->row + y 2179 ? self->row + y
1963 : 0; 2180 : 0;
1964 2181
1965 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1966 { 2183 {
1967 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1968 2185
1969 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1970 { 2187 {
1971 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1972 2189
1974 { 2191 {
1975 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1976 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1977 int a1 = tex.a; 2194 int a1 = tex.a;
1978 2195
1979 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1980 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1981 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1982 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1983 } 2200 }
1984 } 2201 }
1985 2202
1986 *map++ = (r ) 2203 *map++ = (r )
1987 | (g << 8) 2204 | (g << 8)
1988 | (b << 16) 2205 | (b << 16)
1989 | (a << 24); 2206 | (a << 24);
1990 } 2207 }
1991 } 2208 }
1992 2209
1993 RETVAL = map_sv; 2210 RETVAL = map_sv;
1994} 2211}
1995 OUTPUT: 2212 OUTPUT:
1996 RETVAL 2213 RETVAL
1997 2214
1998void 2215void
1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2000 CODE: 2217 CODE:
2001{ 2218{
2002 int x, y, z; 2219 int x, y, z;
2003 2220
2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2221 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2007 smooth_key skey;
2008 int pl_x, pl_y; 2222 int pl_x, pl_y;
2009 maptex pl_tex; 2223 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2225 rc_t rc_ov;
2011 rc_key_t key; 2226 rc_key_t key;
2012 rc_array_t *arr; 2227 rc_t::array_t *arr;
2013 2228
2014 pl_tex.name = 0; 2229 pl_tex.name = 0;
2015 2230
2016 // thats current max. sorry. 2231 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
2019
2020 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey));
2022 2234
2023 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
2024 key.r = 255; 2236 key.r = 255;
2025 key.g = 255; 2237 key.g = 255;
2026 key.b = 255; 2238 key.b = 255;
2027 key.a = 255; 2239 key.a = 255;
2028 key.mode = GL_QUADS; 2240 key.mode = GL_QUADS;
2029 key.format = GL_T2F_V3F; 2241 key.format = GL_T2F_V3F;
2030 key.texname = -1;
2031 2242
2032 mx += self->x; 2243 mx += self->x;
2033 my += self->y; 2244 my += self->y;
2034 2245
2035 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
2036 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
2037 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
2038 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2039 2250
2040 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
2041 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
2042 { 2253 {
2043 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
2058 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2059 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2060 2271
2061 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
2062 { 2273 {
2063 memset (smooth_level, 0, sizeof (smooth_level)); 2274 std::bitset<256> smooth_level; // one bit for every possible smooth level
2275 smooth_key skey;
2276 smooth_hash smooth;
2277 key.texname = -1;
2064 2278
2065 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
2066 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
2067 { 2281 {
2068 maprow *row = self->row + (y + my); 2282 maprow *row = self->row + (y + my);
2074 tileid tile = cell->tile [z]; 2288 tileid tile = cell->tile [z];
2075 2289
2076 if (tile) 2290 if (tile)
2077 { 2291 {
2078 maptex tex = self->tex [tile]; 2292 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2293 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2294
2082 if (key.texname != tex.name) 2295 if (key.texname != tex.name)
2083 { 2296 {
2084 self->tex [tile].unused = 0; 2297 self->tex [tile].unused = 0;
2085 2298
2086 if (!tex.name) 2299 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2301
2089 key.texname = tex.name; 2302 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
2091 } 2304 }
2092 2305
2306 px = (x + 1) * Th - tex.w;
2307 py = (y + 1) * Tw - tex.h;
2308
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2094 { 2310 {
2095 pl_x = px; 2311 pl_x = px;
2096 pl_y = py; 2312 pl_y = py;
2097 pl_tex = tex; 2313 pl_tex = tex;
2098 continue; 2314 continue;
2099 } 2315 }
2100 2316
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2319 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2105
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 // overlays such as the speech bubble, probably more to come
2109 if (cell->flags & 1)
2110 {
2111 maptex tex = self->tex [1];
2112 int px = x * T + T * 2 / 32;
2113 int py = y * T - T * 6 / 32;
2114
2115 if (tex.name)
2116 {
2117 if (key.texname != tex.name)
2118 {
2119 key.texname = tex.name;
2120 arr = rc_array (rc, &key);
2121 }
2122
2123 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2127 }
2128 }
2129 }
2130 2321
2131 // update smooth hash 2322 // update smooth hash
2132 if (tex.smoothtile) 2323 if (tex.smoothtile)
2133 { 2324 {
2134 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
2135 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
2136 2327
2137 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
2138 2329
2139 // add bits to current tile and all neighbours. skey.x|y is 2330 // add bits to current tile and all neighbours. skey.x|y is
2140 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
2141 2332
2142 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
2150 2341
2151 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2152 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
2153 2344
2154 // full tile 2345 // full tile
2155 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2346 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2156 2347
2157 // borders 2348 // borders
2158 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2349 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2159 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2350 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2160 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2351 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2161 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2352 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2162 2353
2163 // corners 2354 // corners
2164 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2355 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2165 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2356 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2166 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2357 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2167 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2358 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2359 }
2360 }
2361
2362 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2363 {
2364 // overlays such as the speech bubble, probably more to come
2365 if (cell->flags & 1)
2366 {
2367 rc_key_t key_ov = key;
2368 maptex tex = self->tex[TEXID_SPEECH];
2369 int px = x * Tw + Tw * 2 / 32;
2370 int py = y * Th - Th * 6 / 32;
2371
2372 key_ov.texname = tex.name;
2373 rc_t::array_t &arr = rc_ov.array (key_ov);
2374
2375 arr.t2f_v3f (0 , 0 , px , py , 0);
2376 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2377 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2378 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2168 } 2379 }
2169 } 2380 }
2170 } 2381 }
2171 } 2382 }
2172 2383
2173 rc_draw (rc); 2384 rc.draw ();
2174 rc_clear (rc); 2385 rc.clear ();
2175 2386
2176 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2177 // this is basically counting sort 2388 // this is basically counting sort
2178 { 2389 {
2179 int w, b; 2390 int w, b;
2180 2391
2181 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2182 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2183 for (w = 0; w < 256 / 32; ++w) 2394 for (int level = 0; level < smooth_level.size (); ++level)
2395 if (smooth_level[level])
2396 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2184 { 2397 {
2185 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2186 if (smask) 2399 IV bits = it->second;
2187 for (b = 0; b < 32; ++b) 2400
2188 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2189 { 2404 {
2190 int level = (w << 5) | b; 2405 maptex tex = self->tex [skey.tile];
2406 int px = (((int)skey.x) - 1) * Tw;
2407 int py = (((int)skey.y) - 1) * Th;
2408 int border = bits & 15;
2409 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2410 float dx = tex.s * .0625f; // 16 images/row
2411 float dy = tex.t * .5f ; // 2 images/column
2412
2191 HE *he; 2413 if (tex.name)
2192
2193 hv_iterinit (smooth);
2194 while ((he = hv_iternext (smooth)))
2195 { 2414 {
2196 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
2197 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
2198 2417 if (key.texname != tex.name)
2199 if (!(bits & 0x1000)
2200 && skey->level == level
2201 && level > smooth_max [skey->x][skey->y])
2202 { 2418 {
2203 maptex tex = self->tex [skey->tile];
2204 int px = (((int)skey->x) - 1) * T;
2205 int py = (((int)skey->y) - 1) * T;
2206 int border = bits & 15;
2207 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2208 float dx = tex.s * .0625f; // 16 images/row
2209 float dy = tex.t * .5f ; // 2 images/column
2210
2211 if (tex.name)
2212 {
2213 // this time avoiding texture state changes
2214 // save gobs of state changes.
2215 if (key.texname != tex.name)
2216 {
2217 self->tex [skey->tile].unused = 0; 2419 self->tex [skey.tile].unused = 0;
2218 2420
2219 glEnd (); 2421 glEnd ();
2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2221 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2222 } 2424 }
2223 2425
2224 if (border) 2426 if (border)
2225 { 2427 {
2226 float ox = border * dx; 2428 float ox = border * dx;
2227 2429
2228 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2229 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2230 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2231 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2232 } 2434 }
2233 2435
2234 if (corner) 2436 if (corner)
2235 { 2437 {
2236 float ox = corner * dx; 2438 float ox = corner * dx;
2237 2439
2238 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2239 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2240 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2241 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2242 }
2243 }
2244 } 2444 }
2245 } 2445 }
2246 } 2446 }
2247 } 2447 }
2248 2448
2249 glEnd (); 2449 glEnd ();
2250 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2251 key.texname = -1; 2451 key.texname = -1;
2252 } 2452 }
2253
2254 hv_clear (smooth);
2255 } 2453 }
2256 2454
2257 if (pl_tex.name) 2455 if (pl_tex.name)
2258 { 2456 {
2259 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2260 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2261 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2262 2460
2263 key.texname = tex.name; 2461 key.texname = tex.name;
2264 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2265 2463
2266 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2267 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2268 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2466 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2270 2468
2271 rc_draw (rc); 2469 rc.draw ();
2272 } 2470 }
2273 2471
2472 rc_ov.draw ();
2473 rc_ov.clear ();
2474
2274 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2275 rc_free (rc);
2276 2476
2277 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2278 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2279 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2280 { 2480 {
2283 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2284 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2285 { 2485 {
2286 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2287 2487
2288 int px = x * T; 2488 int px = x * Tw;
2289 int py = y * T; 2489 int py = y * Th;
2290 2490
2291 if (expect_false (cell->player == player)) 2491 if (ecb_expect_false (cell->player == player))
2292 { 2492 {
2293 px += sdx; 2493 px += sdx;
2294 py += sdy; 2494 py += sdy;
2295 } 2495 }
2296 2496
2297 if (cell->stat_hp) 2497 if (cell->stat_hp)
2298 { 2498 {
2299 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2301 2501
2302 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2303 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2304 px + width - 1, py); 2504 px + width - 1, py);
2305 2505
2311 } 2511 }
2312 } 2512 }
2313} 2513}
2314 2514
2315void 2515void
2316draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2516draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2317 CODE: 2517 CODE:
2318{ 2518{
2319 static float color[16][3] = { 2519 static float color[16][3] = {
2320 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
2321 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2322 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2323 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2324 2524
2325 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2326 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2327 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2328 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2329 2529
2330 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2331 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2332 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2333 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2334 2534
2335 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2336 2536
2337 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2338 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2339 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2340 }; 2540 };
2341 2541
2342 int x, y; 2542 int x, y;
2343 2543
2344 glEnable (GL_TEXTURE_2D); 2544 glEnable (GL_TEXTURE_2D);
2545 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2546 * but the nvidia driver (185.18.14) mishandles alpha textures
2547 * and takes the colour from god knows where instead of using
2548 * Cp. MODULATE results in the same colour, but slightly different
2549 * alpha, but atcually gives us the correct colour with nvidia.
2550 */
2345 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2347 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2553 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348 glBegin (GL_QUADS); 2554 glBegin (GL_QUADS);
2349 2555
2350 for (y = 0; y < h; y++) 2556 for (y = 0; y < h; y++)
2354 2560
2355 if (m) 2561 if (m)
2356 { 2562 {
2357 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2358 2564
2359 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2360 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2361 2567
2362 glColor4f (c[0], c[1], c[2], 0.75); 2568 glColor4f (c[0], c[1], c[2], 1);
2363 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2572 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367 } 2573 }
2375void 2581void
2376fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2582fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2377 PPCODE: 2583 PPCODE:
2378{ 2584{
2379 int x, y; 2585 int x, y;
2380 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2381 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2382 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2383 int sw34 = (sw * 3 + 3) & ~3; 2589 int sw3 = sw * 3;
2590 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2591 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2384 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2385 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2386 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2387 2594
2388 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2389 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2390 2597
2391 mx += self->x - 1; 2598 mx += self->x - 1;
2392 my += self->y - 1; 2599 my += self->y - 1;
2393
2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395 2600
2396 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2397 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2398 { 2603 {
2399 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
2402 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2403 { 2608 {
2404 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2405 2610
2406 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2407 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409 } 2614 }
2410 } 2615 }
2411 2616
2412 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2413 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
2432 2637
2433 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2434 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2435 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2436 2641
2437 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2442 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446 } 2651 }
2447 2652
2448 free (darkness1); 2653 free (darkness1);
2449 2654
2450 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2451 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2452 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2453 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2454} 2659}
2455 2660
2456SV * 2661SV *
2519 else 2724 else
2520 *data++ = 0; 2725 *data++ = 0;
2521 } 2726 }
2522 } 2727 }
2523 2728
2524 /* if size is w*h + 5 then no data has been found */ 2729 /* if size is w*h + 5 then no data has been found */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2730 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 { 2731 {
2527 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 } 2734 }
2530 2735
2531 RETVAL = data_sv; 2736 RETVAL = data_sv;
2532} 2737}
2533 OUTPUT: 2738 OUTPUT:
2534 RETVAL 2739 RETVAL
2535 2740
2536void 2741void
2543 STRLEN len; 2748 STRLEN len;
2544 uint8_t *data, *end; 2749 uint8_t *data, *end;
2545 2750
2546 len = SvLEN (data_sv); 2751 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2752 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv); 2753 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2549 end = data + len + 8; 2754 end = data + len + 8;
2550 2755
2551 if (len < 5) 2756 if (len < 5)
2552 XSRETURN_EMPTY; 2757 XSRETURN_EMPTY;
2553 2758
2614} 2819}
2615 2820
2616MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2617 2822
2618DC::RW 2823DC::RW
2619new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2620 CODE: 2825 CODE:
2621{ 2826{
2622 STRLEN datalen; 2827 STRLEN datalen;
2623 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2624 2829
2626} 2831}
2627 OUTPUT: 2832 OUTPUT:
2628 RETVAL 2833 RETVAL
2629 2834
2630DC::RW 2835DC::RW
2631new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2632 CODE: 2837 CODE:
2633 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2634 OUTPUT: 2839 OUTPUT:
2635 RETVAL 2840 RETVAL
2636 2841
2654 if (RETVAL < 0) 2859 if (RETVAL < 0)
2655 { 2860 {
2656 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2657 2862
2658 if (RETVAL < 0) 2863 if (RETVAL < 0)
2864 {
2865 // happens sometimes, maybe it just stopped playing(?)
2866 RETVAL = Mix_GroupAvailable (-1);
2867
2868 if (RETVAL < 0)
2659 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2660 2870 }
2871 else
2661 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2662 } 2873 }
2663 2874
2664 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2665 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2666} 2877}
2713void 2924void
2714set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715 CODE: 2926 CODE:
2716{ 2927{
2717 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2928 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2718 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2929 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720} 2931}
2721 2932
2722void 2933void
2723set_reverse_stereo (DC::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
2726 2937
2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728 2939
2729PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2730 2941
2942void
2943decoders ()
2944 PPCODE:
2945#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2946 int i, num = Mix_GetNumChunkDecoders ();
2947 EXTEND (SP, num);
2948 for (i = 0; i < num; ++i)
2949 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2950#else
2951 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2952#endif
2953
2731DC::MixChunk 2954DC::MixChunk
2732new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2733 CODE: 2956 CODE:
2734 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2735 OUTPUT: 2958 OUTPUT:
2736 RETVAL 2959 RETVAL
2737 2960
2767 OUTPUT: 2990 OUTPUT:
2768 RETVAL 2991 RETVAL
2769 2992
2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771 2994
2995void
2996decoders ()
2997 PPCODE:
2998#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2999 int i, num = Mix_GetNumMusicDecoders ();
3000 EXTEND (SP, num);
3001 for (i = 0; i < num; ++i)
3002 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3003#else
3004 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3005#endif
3006
2772int 3007int
2773volume (int volume = -1) 3008volume (int volume = -1)
2774 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2775 CODE: 3010 CODE:
2776 if (items > 0) 3011 if (items > 0)
2787void 3022void
2788halt () 3023halt ()
2789 CODE: 3024 CODE:
2790 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2791 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2792DC::MixMusic 3034DC::MixMusic
2793new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2794 CODE: 3036 CODE:
2795 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2796 OUTPUT: 3038 OUTPUT:
2797 RETVAL 3039 RETVAL
2798 3040
2826 } *civ, const_iv[] = { 3068 } *civ, const_iv[] = {
2827# define const_iv(name) { # name, (IV)name } 3069# define const_iv(name) { # name, (IV)name }
2828 const_iv (GL_VENDOR), 3070 const_iv (GL_VENDOR),
2829 const_iv (GL_VERSION), 3071 const_iv (GL_VERSION),
2830 const_iv (GL_EXTENSIONS), 3072 const_iv (GL_EXTENSIONS),
3073 const_iv (GL_MAX_TEXTURE_UNITS),
2831 const_iv (GL_COLOR_MATERIAL), 3074 const_iv (GL_COLOR_MATERIAL),
2832 const_iv (GL_SMOOTH), 3075 const_iv (GL_SMOOTH),
2833 const_iv (GL_FLAT), 3076 const_iv (GL_FLAT),
2834 const_iv (GL_DITHER), 3077 const_iv (GL_DITHER),
2835 const_iv (GL_BLEND), 3078 const_iv (GL_BLEND),
2847 const_iv (GL_ZERO), 3090 const_iv (GL_ZERO),
2848 const_iv (GL_SRC_ALPHA), 3091 const_iv (GL_SRC_ALPHA),
2849 const_iv (GL_DST_ALPHA), 3092 const_iv (GL_DST_ALPHA),
2850 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3093 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851 const_iv (GL_ONE_MINUS_DST_ALPHA), 3094 const_iv (GL_ONE_MINUS_DST_ALPHA),
3095 const_iv (GL_SRC_COLOR),
3096 const_iv (GL_DST_COLOR),
3097 const_iv (GL_ONE_MINUS_SRC_COLOR),
3098 const_iv (GL_ONE_MINUS_DST_COLOR),
2852 const_iv (GL_SRC_ALPHA_SATURATE), 3099 const_iv (GL_SRC_ALPHA_SATURATE),
2853 const_iv (GL_RGB), 3100 const_iv (GL_RGB),
2854 const_iv (GL_RGBA), 3101 const_iv (GL_RGBA),
2855 const_iv (GL_RGBA4), 3102 const_iv (GL_RGBA4),
2856 const_iv (GL_RGBA8), 3103 const_iv (GL_RGBA8),
2924 const_iv (GL_NICEST), 3171 const_iv (GL_NICEST),
2925 const_iv (GL_V2F), 3172 const_iv (GL_V2F),
2926 const_iv (GL_V3F), 3173 const_iv (GL_V3F),
2927 const_iv (GL_T2F_V3F), 3174 const_iv (GL_T2F_V3F),
2928 const_iv (GL_T2F_N3F_V3F), 3175 const_iv (GL_T2F_N3F_V3F),
3176 const_iv (GL_FUNC_ADD),
3177 const_iv (GL_FUNC_SUBTRACT),
3178 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2929# undef const_iv 3179# undef const_iv
2930 }; 3180 };
2931 3181
2932 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3182 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2933 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2934 3184
2935 texture_av = newAV (); 3185 texture_av = newAV ();
2936 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
2937} 3187}
2938 3188
2940disable_GL_EXT_blend_func_separate () 3190disable_GL_EXT_blend_func_separate ()
2941 CODE: 3191 CODE:
2942 gl.BlendFuncSeparate = 0; 3192 gl.BlendFuncSeparate = 0;
2943 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
2944 3194
2945char * 3195void
3196apple_nvidia_bug (int enable)
3197
3198const char *
2946gl_vendor () 3199gl_vendor ()
2947 CODE: 3200 CODE:
2948 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
2949 OUTPUT: 3202 OUTPUT:
2950 RETVAL 3203 RETVAL
2951 3204
2952char * 3205const char *
2953gl_version () 3206gl_version ()
2954 CODE: 3207 CODE:
2955 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
2956 OUTPUT: 3209 OUTPUT:
2957 RETVAL 3210 RETVAL
2958 3211
2959char * 3212const char *
2960gl_extensions () 3213gl_extensions ()
2961 CODE: 3214 CODE:
2962 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2963 OUTPUT: 3216 OUTPUT:
2964 RETVAL 3217 RETVAL
2965 3218
2966const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
2967 3224
2968GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
2969 CODE: 3226 CODE:
2970 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
2971 OUTPUT: 3228 OUTPUT:
2979 3236
2980int glGetError () 3237int glGetError ()
2981 3238
2982void glFinish () 3239void glFinish ()
2983 3240
3241void glFlush ()
3242
2984void glClear (int mask) 3243void glClear (int mask)
2985 3244
2986void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
2987 PROTOTYPE: @ 3246 PROTOTYPE: @
2988 3247
2997void glBlendFunc (int sfactor, int dfactor) 3256void glBlendFunc (int sfactor, int dfactor)
2998 3257
2999void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3258void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000 CODE: 3259 CODE:
3001 gl_BlendFuncSeparate (sa, da, saa, daa); 3260 gl_BlendFuncSeparate (sa, da, saa, daa);
3261
3262# void glBlendEquation (int se)
3002 3263
3003void glDepthMask (int flag) 3264void glDepthMask (int flag)
3004 3265
3005void glLogicOp (int opcode) 3266void glLogicOp (int opcode)
3006 3267
3157 3418
3158void glEndList () 3419void glEndList ()
3159 3420
3160void glCallList (int list) 3421void glCallList (int list)
3161 3422
3423void c_init ()
3424 CODE:
3425 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3426 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3427
3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3428MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163 3429
3164PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
3165 3431
3166void 3432void
3167find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
3168 PPCODE: 3434 PPCODE:
3169{ 3435{
3170 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
3171 XPUSHs (self); 3437 XPUSHs (self);
3172} 3438}
3173 3439
3174BOOT: 3440BOOT:
3175{ 3441{
3183 3449
3184void 3450void
3185draw (SV *self) 3451draw (SV *self)
3186 CODE: 3452 CODE:
3187{ 3453{
3188 HV *hv; 3454 HV *hv;
3189 SV **svp; 3455 SV **svp;
3190 NV x, y, w, h; 3456 NV x, y, w, h;
3191 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
3192 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
3193 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
3194 SV *draw_h_sv = GvSV (draw_h_gv); 3460 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines