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.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define 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
81#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
83 89
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
87 96
88#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
90 99
91#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
92 101
93/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 104
96#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
97 128
98static AV *texture_av; 129static AV *texture_av;
99 130
100static struct 131static struct
101{ 132{
158{ 189{
159 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
160 191
161 while (attrs) 192 while (attrs)
162 { 193 {
163 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 195
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 197 return 1;
167 198
168 attrs = attrs->next; 199 attrs = attrs->next;
169 } 200 }
170 201
171 return 0; 202 return 0;
172} 203}
173 204
174typedef struct cf_layout { 205struct cf_layout {
175 PangoLayout *pl; 206 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
177 int base_height; 208 int base_height;
178 DC__Font font; 209 DC__Font font;
179 rc_t *rc; 210 rc_t rc;
180} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
181 214
182static DC__Font default_font; 215static DC__Font default_font;
183static PangoContext *opengl_context; 216static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
185 218
186static void 219static void
187substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
188{ 221{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 225#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 227}
195 228
196static void 229static void
226} 259}
227 260
228typedef uint16_t tileid; 261typedef uint16_t tileid;
229typedef uint16_t faceid; 262typedef uint16_t faceid;
230 263
231typedef struct { 264struct maptex
265{
232 GLuint name; 266 GLuint name;
233 int w, h; 267 int w, h;
234 float s, t; 268 float s, t;
235 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
236 tileid smoothtile; 270 tileid smoothtile;
237 uint8_t smoothlevel; 271 uint8_t smoothlevel;
238} maptex; 272 uint8_t unused; /* set to zero on use */
273};
239 274
240typedef struct { 275struct mapcell
276{
241 uint32_t player; 277 uint32_t player;
242 tileid tile[3]; 278 tileid tile[3];
243 uint16_t darkness; 279 uint16_t darkness;
244 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
245} mapcell; 281};
246 282
247typedef struct { 283struct maprow
284{
248 int32_t c0, c1; 285 int32_t c0, c1;
249 mapcell *col; 286 mapcell *col;
250} maprow; 287};
251 288
252typedef struct map { 289struct mapgrid {
253 int x, y, w, h; 290 int x, y, w, h;
254 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
255 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
256 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
257 294
258 int32_t rows; 295 int32_t rows;
259 maprow *row; 296 maprow *row;
260} *DC__Map; 297};
261 298
262static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
263prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
264{ 304{
265 char *p; 305 T *p;
266 306
267 New (0, p, sze + inc, char); 307 Newxz (p, sze + inc, T);
268 Zero (p, inc, char);
269 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
270 Safefree (ptr); 309 Safefree (ptr);
271 310
272 return p; 311 ptr = p;
273} 312}
274 313
275static char * 314template<typename T>
276append (char *ptr, int sze, int inc)
277{
278 Renew (ptr, sze + inc, char);
279 Zero (ptr + sze, inc, char);
280
281 return ptr;
282}
283
284#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
285#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
286
287static void 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
288need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
289{ 324{
290 while (self->faces <= face) 325 while (self->faces <= face)
291 { 326 {
292 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
293 self->faces *= 2; 328 self->faces *= 2;
294 } 329 }
295} 330}
296 331
297static void 332static void
298need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
299{ 334{
300 while (self->texs <= texid) 335 while (self->texs <= texid)
301 { 336 {
302 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
303 self->texs *= 2; 338 self->texs *= 2;
304 } 339 }
305} 340}
306 341
307static maprow * 342static maprow *
308map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
309{ 344{
310 if (0 > y) 345 if (0 > y)
311 { 346 {
312 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
313 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
314 349
315 self->rows += extend; 350 self->rows += extend;
316 self->y += extend; 351 self->y += extend;
317 y += extend; 352 y += extend;
318 } 353 }
319 else if (y >= self->rows) 354 else if (y >= self->rows)
320 { 355 {
321 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
322 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
323 self->rows += extend; 358 self->rows += extend;
324 } 359 }
325 360
326 return self->row + y; 361 return self->row + y;
327} 362}
337 } 372 }
338 373
339 if (row->c0 > x) 374 if (row->c0 > x)
340 { 375 {
341 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
342 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
343 row->c0 -= extend; 378 row->c0 -= extend;
344 } 379 }
345 else if (x >= row->c1) 380 else if (x >= row->c1)
346 { 381 {
347 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
348 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
349 row->c1 += extend; 384 row->c1 += extend;
350 } 385 }
351 386
352 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
353} 388}
354 389
355static mapcell * 390static mapcell *
356map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
357{ 392{
358 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
359} 394}
360 395
361static void 396static void
362map_clear (DC__Map self) 397map_clear (mapgrid *self)
363{ 398{
364 int r; 399 int r;
365 400
366 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
367 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
385 (cell)->flags = 0; \ 420 (cell)->flags = 0; \
386 (cell)->player = 0; \ 421 (cell)->player = 0; \
387 } while (0) 422 } while (0)
388 423
389static void 424static void
390map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
391{ 426{
392 int x, y; 427 int x, y;
393 maprow *row; 428 maprow *row;
394 mapcell *cell; 429 mapcell *cell;
395 430
412 CELL_CLEAR (cell); 447 CELL_CLEAR (cell);
413 } 448 }
414 } 449 }
415} 450}
416 451
417typedef struct { 452struct smooth_key
453{
418 tileid tile; 454 tileid tile;
419 uint8_t x, y, level; 455 uint8_t x, y, level;
420} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
421 475
422static void 476static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
424{ 478{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
426 480
427 if (SvIOK (*sv)) 481 if (it == h.end ())
428 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
429 else 483 else
430 sv_setiv (*sv, bits); 484 it->second |= bits;
431} 485}
432 486
433static void 487static void
434music_finished (void) 488music_finished (void)
435{ 489{
452 ev.code = 1; 506 ev.code = 1;
453 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
454 ev.data2 = 0; 508 ev.data2 = 0;
455 509
456 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
457} 518}
458 519
459static unsigned int 520static unsigned int
460minpot (unsigned int n) 521minpot (unsigned int n)
461{ 522{
529 return 0; 590 return 0;
530 591
531 return 1; 592 return 1;
532} 593}
533 594
595/******************************************************************************/
596
534/* process keyboard modifiers */ 597/* process keyboard modifiers */
535static int 598static int
536mod_munge (int mod) 599mod_munge (int mod)
537{ 600{
538 mod &= MOD_MASK; 601 mod &= MOD_MASK;
542 605
543 return mod; 606 return mod;
544} 607}
545 608
546static void 609static void
547deliantra_main () 610deliantra_main (SV *real_main)
548{ 611{
549 char *argv[] = { 0 }; 612 dSP;
550 call_argv ("::main", G_DISCARD | G_VOID, argv); 613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
551} 616}
552 617
553#ifdef __MACOSX__ 618#ifdef __MACOSX__
619 static SV *real_main;
620
554 /* to due surprising braindamage on the side of SDL design, we 621 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main() 622 * do some mind-boggling hack here: SDL requires a custom main()
556 * on OS X, so... we provide one and call the original main(), which, 623 * on OS X, so... we provide one and call the original main(), which,
557 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
558 * and which calls our main (== SDL_main) back. 625 * and which calls our main (== SDL_main) back.
559 */ 626 */
560 extern C_LINKAGE int 627 extern C_LINKAGE int
561 main (int argc, char *argv[]) 628 main (int argc, char *argv[])
562 { 629 {
563 deliantra_main (); 630 deliantra_main (real_main);
564 } 631 }
565 632
566 #undef main 633 #undef main
567 634
568 extern C_LINKAGE int main (int argc, char *argv[]); 635 extern C_LINKAGE int main (int argc, char *argv[]);
569 636
570 static void 637 static void
571 SDL_braino (void) 638 SDL_main_hack (SV *real_main_)
572 { 639 {
640 real_main = real_main_;
641
573 char *argv[] = { "deliantra client", 0 }; 642 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv); 643 (main) (1, argv);
575 } 644 }
576#else 645#else
577 static void 646 static void
578 SDL_braino (void) 647 SDL_main_hack (SV *real_main)
579 { 648 {
580 deliantra_main (); 649 deliantra_main (real_main);
581 } 650 }
582#endif 651#endif
583 652
584MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
585 654
786 855
787 const_iv (FOW_DARKNESS) 856 const_iv (FOW_DARKNESS)
788# undef const_iv 857# undef const_iv
789 }; 858 };
790 859
791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
793 862
794 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
796} 865}
797 866
813NV ceil (NV x) 882NV ceil (NV x)
814 883
815IV minpot (UV n) 884IV minpot (UV n)
816 885
817IV popcount (UV n) 886IV popcount (UV n)
887
888NV distance (NV dx, NV dy)
889 CODE:
890 RETVAL = pow (dx * dx + dy * dy, 0.5);
891 OUTPUT:
892 RETVAL
818 893
819void 894void
820pango_init () 895pango_init ()
821 CODE: 896 CODE:
822{ 897{
830#endif 905#endif
831} 906}
832 907
833char *SDL_GetError () 908char *SDL_GetError ()
834 909
835void SDL_braino () 910void SDL_main_hack (SV *real_main)
911 PROTOTYPE: &
836 912
837int SDL_Init (U32 flags) 913int SDL_Init (U32 flags)
838 914
839int SDL_InitSubSystem (U32 flags) 915int SDL_InitSubSystem (U32 flags)
840 916
841void SDL_QuitSubSystem (U32 flags) 917void SDL_QuitSubSystem (U32 flags)
842 918
843void SDL_Quit () 919void SDL_Quit ()
844 920
845int SDL_GL_SetAttribute (int attr, int value) 921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
846 923
847int SDL_GL_GetAttribute (int attr) 924int SDL_GL_GetAttribute (int attr)
848 CODE: 925 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL)) 926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
850 XSRETURN_UNDEF; 927 XSRETURN_UNDEF;
851 OUTPUT: 928 OUTPUT:
852 RETVAL 929 RETVAL
853 930
854void 931void
909 ); 986 );
910 987
911 if (RETVAL) 988 if (RETVAL)
912 { 989 {
913 av_clear (texture_av); 990 av_clear (texture_av);
914
915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
917#include "glfunc.h" 992#include "glfunc.h"
918#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
919 } 996 }
920} 997}
921 OUTPUT: 998 OUTPUT:
922 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
923 1003
924void 1004void
925SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
926 1006
927char * 1007char *
928SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
929 1010
930int 1011int
931SDL_GetAppState () 1012SDL_GetAppState ()
932 1013
933int 1014int
934SDL_GetModState () 1015SDL_GetModState ()
935 1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
936void 1021void
1022SDL_PumpEvents ()
1023
1024void
937poll_events () 1025peep_events ()
938 PPCODE: 1026 PPCODE:
939{ 1027{
940 SDL_Event ev; 1028 SDL_Event ev;
941 1029
942 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
1008 1096
1009 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1010 } 1098 }
1011} 1099}
1012 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
1013int 1114int
1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1015 POSTCALL: 1116 POSTCALL:
1016 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
1017 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
1018 1119
1019void 1120void
1020Mix_QuerySpec () 1121Mix_QuerySpec ()
1079add_font (char *file) 1180add_font (char *file)
1080 CODE: 1181 CODE:
1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT: 1183 OUTPUT:
1083 RETVAL 1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1084 1192
1085void 1193void
1086load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
1087 ALIAS: 1195 ALIAS:
1088 load_image_file = 1 1196 load_image_file = 1
1134 1242
1135 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
1136 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
1137 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
1138 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
1139 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1140 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1141 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1142 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1143 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
1144 1252
1204#if DEBUG 1312#if DEBUG
1205 VALGRIND_DO_LEAK_CHECK; 1313 VALGRIND_DO_LEAK_CHECK;
1206#endif 1314#endif
1207} 1315}
1208 1316
1317int
1318SvREFCNT (SV *sv)
1319 CODE:
1320 RETVAL = SvREFCNT (sv);
1321 OUTPUT:
1322 RETVAL
1323
1209MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1210 1325
1211PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1212 1327
1213DC::Font 1328DC::Font
1214new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1215 CODE: 1330 CODE:
1216{ 1331{
1217 int count; 1332 int count;
1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1219 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1248 PROTOTYPE: 1363 PROTOTYPE:
1249 CODE: 1364 CODE:
1250 tc_restore (); 1365 tc_restore ();
1251 1366
1252DC::Layout 1367DC::Layout
1253new (SV *class) 1368new (SV *klass)
1254 CODE: 1369 CODE:
1255 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1256 1371
1257 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1258 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1259 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1260 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1261 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1262 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1263 RETVAL->font = 0; 1378 RETVAL->font = 0;
1264 RETVAL->rc = rc_alloc ();
1265 1379
1266 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1267 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1268 OUTPUT: 1382 OUTPUT:
1269 RETVAL 1383 RETVAL
1270 1384
1271void 1385void
1272DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1273 CODE: 1387 CODE:
1274 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1275 rc_free (self->rc);
1276 Safefree (self); 1389 delete self;
1277 1390
1278void 1391void
1279set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1280 CODE: 1393 CODE:
1281{ 1394{
1407 1520
1408void 1521void
1409set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1410 CODE: 1523 CODE:
1411 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1412 { 1525 {
1413 self->base_height = base_height; 1526 self->base_height = base_height;
1414 layout_update_font (self); 1527 layout_update_font (self);
1415 } 1528 }
1416 1529
1417void 1530void
1535} 1648}
1536 1649
1537void 1650void
1538render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1539 CODE: 1652 CODE:
1540 rc_clear (self->rc); 1653 self->rc.clear ();
1541 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1542 self->pl, 1655 self->pl,
1543 self->rc, 1656 &self->rc,
1544 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1545 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1546 flags 1659 flags
1547 ); 1660 );
1548 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1559 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1560 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1561 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1562 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1563 1676
1564 rc_draw (self->rc); 1677 self->rc.draw ();
1565 1678
1566 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1567 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1568 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1569} 1682}
1644 glDisable (GL_ALPHA_TEST); 1757 glDisable (GL_ALPHA_TEST);
1645 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1646 } 1759 }
1647} 1760}
1648 1761
1762void
1763draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1764 PROTOTYPE: @
1765 CODE:
1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1769 glEnable (GL_TEXTURE_2D);
1770 glBindTexture (GL_TEXTURE_2D, name1);
1771
1772 glColor3f (intensity, intensity, intensity);
1773 glPushMatrix ();
1774 glScalef (1./3, 1./3, 1.);
1775
1776 if (blend > 0.f)
1777 {
1778 float dx3 = dx * -3.f / w;
1779 float dy3 = dy * -3.f / h;
1780 GLfloat env_color[4] = { 0., 0., 0., blend };
1781
1782 /* interpolate the two shadow textures */
1783 /* stage 0 == rgb(glcolor) + alpha(t0) */
1784 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1785
1786 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1787 gl.ActiveTexture (GL_TEXTURE1);
1788 glEnable (GL_TEXTURE_2D);
1789 glBindTexture (GL_TEXTURE_2D, name2);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1791
1792 /* rgb == rgb(glcolor) */
1793 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1796
1797 /* alpha = interpolate t0, t1 by env_alpha */
1798 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1799
1800 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1802 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1806
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1809
1810 glBegin (GL_QUADS);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1813 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1815 glEnd ();
1816
1817 glDisable (GL_TEXTURE_2D);
1818 gl.ActiveTexture (GL_TEXTURE0);
1819 }
1820 else
1821 {
1822 /* simple blending of one texture, also opengl <1.3 path */
1823 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1824
1825 glBegin (GL_QUADS);
1826 glTexCoord2f (0, 0); glVertex2f (0, 0);
1827 glTexCoord2f (0, t); glVertex2f (0, h);
1828 glTexCoord2f (s, t); glVertex2f (w, h);
1829 glTexCoord2f (s, 0); glVertex2f (w, 0);
1830 glEnd ();
1831 }
1832
1833 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1834 {
1835 int x, y;
1836 int dx3 = dx * 3;
1837 int dy3 = dy * 3;
1838
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1840 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1841 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1842 glTranslatef (-1., -1., 0);
1843 glBegin (GL_QUADS);
1844
1845 for (y = 1; y < h; y += 3)
1846 {
1847 int y1 = y - dy3;
1848 int y1valid = y1 >= 0 && y1 < h;
1849
1850 for (x = 1; x < w; x += 3)
1851 {
1852 int x1 = x - dx3;
1853 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1854 uint8_t h2;
1855
1856 if (y1valid && x1 >= 0 && x1 < w)
1857 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 else
1859 h2 = 1; /* out of range == invisible */
1860
1861 if (h1 || h2)
1862 {
1863 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1864 glColor4f (1., 1., 1., alpha);
1865
1866 glTexCoord2f (0, 0.); glVertex2i (x , y );
1867 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1868 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1869 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1870 }
1871 }
1872 }
1873 }
1874
1875 glEnd ();
1876
1877 glPopMatrix ();
1878
1879 glDisable (GL_TEXTURE_2D);
1880 glDisable (GL_BLEND);
1881}
1882
1649IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1883IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1650 CODE: 1884 CODE:
1651{ 1885{
1652 GLint width; 1886 GLint width;
1653 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1887 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1660MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1661 1895
1662PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1663 1897
1664DC::Map 1898DC::Map
1665new (SV *class) 1899new (SV *klass)
1666 CODE: 1900 CODE:
1667 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1668 RETVAL->x = 0; 1902 RETVAL->x = 0;
1669 RETVAL->y = 0; 1903 RETVAL->y = 0;
1670 RETVAL->w = 0; 1904 RETVAL->w = 0;
1671 RETVAL->h = 0; 1905 RETVAL->h = 0;
1672 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1709 1943
1710void 1944void
1711set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1712 CODE: 1946 CODE:
1713{ 1947{
1714 tileid texid; 1948 tileid texid;
1715 maptex *tex; 1949 maptex *tex;
1716 1950
1717 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1718 return; 1952 return;
1719 1953
1720 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1721 return; 1955 return;
1722 1956
1723 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1724 1958
1725 if (!texid) 1959 if (!texid)
1726 return; 1960 return;
1727 1961
1728 tex = self->tex + texid; 1962 tex = self->tex + texid;
1757 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1991 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1758 // use uglier nearest interpolation because linear suffers 1992 // use uglier nearest interpolation because linear suffers
1759 // from transparent color bleeding and ugly wrapping effects. 1993 // from transparent color bleeding and ugly wrapping effects.
1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1994 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1761} 1995}
1996
1997void
1998expire_textures (DC::Map self, int texid, int count)
1999 PPCODE:
2000 for (; texid < self->texs && count; ++texid, --count)
2001 {
2002 maptex *tex = self->tex + texid;
2003
2004 if (tex->name)
2005 {
2006 if (tex->unused)
2007 {
2008 tex->name = 0;
2009 tex->unused = 0;
2010 XPUSHs (sv_2mortal (newSViv (texid)));
2011 }
2012 else
2013 tex->unused = 1;
2014 }
2015 }
1762 2016
1763int 2017int
1764ox (DC::Map self) 2018ox (DC::Map self)
1765 ALIAS: 2019 ALIAS:
1766 oy = 1 2020 oy = 1
1798 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1799 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1800 2054
1801 while (self->y < 0) 2055 while (self->y < 0)
1802 { 2056 {
1803 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1804 2058
1805 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1806 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1807 } 2061 }
1808} 2062}
1809 2063
1810SV * 2064SV *
1811map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1812 CODE: 2066 CODE:
1813{ 2067{
1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1815 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1816 mapcell *cell; 2070 mapcell *cell;
1837 2091
1838 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1839 2093
1840 if (flags & 8) 2094 if (flags & 8)
1841 { 2095 {
2096 uint8_t ext, cmd;
2097
1842 if (extmap) 2098 do
1843 { 2099 {
1844 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1845 2102
1846 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
1847 { 2106 {
1848 ext = *data++;
1849 cmd = ext & 0x7f;
1850
1851 if (cmd < 4)
1852 cell->darkness = 255 - ext * 64 + 1;
1853 else if (cmd == 5) // health
1854 {
1855 cell->stat_width = 1; 2107 cell->stat_width = 1;
1856 cell->stat_hp = *data++; 2108 cell->stat_hp = *data++;
1857 }
1858 else if (cmd == 6) // monster width
1859 cell->stat_width = *data++ + 1;
1860 else if (cmd == 0x47)
1861 {
1862 if (*data == 1) cell->player = data [1];
1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1866
1867 data += *data + 1;
1868 }
1869 else if (cmd == 8) // cell flags
1870 cell->flags = *data++;
1871 else if (ext & 0x40) // unknown, multibyte => skip
1872 data += *data + 1;
1873 else
1874 data++;
1875 } 2109 }
1876 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
1877 } 2127 }
1878 else 2128 while (ext & 0x80);
1879 cell->darkness = *data++ + 1;
1880 } 2129 }
1881 2130
1882 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
1883 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
1884 { 2133 {
1887 cell->tile [z] = self->face2tile [face]; 2136 cell->tile [z] = self->face2tile [face];
1888 2137
1889 if (cell->tile [z]) 2138 if (cell->tile [z])
1890 { 2139 {
1891 maptex *tex = self->tex + cell->tile [z]; 2140 maptex *tex = self->tex + cell->tile [z];
2141 tex->unused = 0;
1892 if (!tex->name) 2142 if (!tex->name)
1893 av_push (missing, newSViv (cell->tile [z])); 2143 av_push (missing, newSViv (cell->tile [z]));
1894 2144
1895 if (tex->smoothtile) 2145 if (tex->smoothtile)
1896 { 2146 {
1897 maptex *smooth = self->tex + tex->smoothtile; 2147 maptex *smooth = self->tex + tex->smoothtile;
2148 smooth->unused = 0;
1898 if (!smooth->name) 2149 if (!smooth->name)
1899 av_push (missing, newSViv (tex->smoothtile)); 2150 av_push (missing, newSViv (tex->smoothtile));
1900 } 2151 }
1901 } 2152 }
1902 } 2153 }
1930 ? self->row + y 2181 ? self->row + y
1931 : 0; 2182 : 0;
1932 2183
1933 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
1934 { 2185 {
1935 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
1936 2187
1937 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
1938 { 2189 {
1939 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
1940 2191
1942 { 2193 {
1943 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
1944 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
1945 int a1 = tex.a; 2196 int a1 = tex.a;
1946 2197
1947 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
1948 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
1949 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
1950 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
1951 } 2202 }
1952 } 2203 }
1953 2204
1954 *map++ = (r ) 2205 *map++ = (r )
1955 | (g << 8) 2206 | (g << 8)
1956 | (b << 16) 2207 | (b << 16)
1957 | (a << 24); 2208 | (a << 24);
1958 } 2209 }
1959 } 2210 }
1960 2211
1961 RETVAL = map_sv; 2212 RETVAL = map_sv;
1962} 2213}
1963 OUTPUT: 2214 OUTPUT:
1964 RETVAL 2215 RETVAL
1965 2216
1966void 2217void
1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2218draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1968 CODE: 2219 CODE:
1969{ 2220{
1970 int x, y, z; 2221 int x, y, z;
1971 2222
1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2223 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1975 smooth_key skey;
1976 int pl_x, pl_y; 2224 int pl_x, pl_y;
1977 maptex pl_tex; 2225 maptex pl_tex;
1978 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2227 rc_t rc_ov;
1979 rc_key_t key; 2228 rc_key_t key;
1980 rc_array_t *arr; 2229 rc_t::array_t *arr;
1981 2230
1982 pl_tex.name = 0; 2231 pl_tex.name = 0;
1983 2232
1984 // thats current max. sorry. 2233 // that's current max. sorry.
1985 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1986 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1987
1988 // clear key, in case of extra padding
1989 memset (&skey, 0, sizeof (skey));
1990 2236
1991 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
1992 key.r = 255; 2238 key.r = 255;
1993 key.g = 255; 2239 key.g = 255;
1994 key.b = 255; 2240 key.b = 255;
1995 key.a = 255; 2241 key.a = 255;
1996 key.mode = GL_QUADS; 2242 key.mode = GL_QUADS;
1997 key.format = GL_T2F_V3F; 2243 key.format = GL_T2F_V3F;
1998 key.texname = -1;
1999 2244
2000 mx += self->x; 2245 mx += self->x;
2001 my += self->y; 2246 my += self->y;
2002 2247
2003 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
2004 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
2005 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
2006 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2007 2252
2008 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
2009 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
2010 { 2255 {
2011 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2028 2273
2029 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
2030 { 2275 {
2031 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2279 key.texname = -1;
2032 2280
2033 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
2035 { 2283 {
2036 maprow *row = self->row + (y + my); 2284 maprow *row = self->row + (y + my);
2042 tileid tile = cell->tile [z]; 2290 tileid tile = cell->tile [z];
2043 2291
2044 if (tile) 2292 if (tile)
2045 { 2293 {
2046 maptex tex = self->tex [tile]; 2294 maptex tex = self->tex [tile];
2047 int px = (x + 1) * T - tex.w; 2295 int px, py;
2048 int py = (y + 1) * T - tex.h;
2049 2296
2050 if (key.texname != tex.name) 2297 if (key.texname != tex.name)
2051 { 2298 {
2299 self->tex [tile].unused = 0;
2300
2052 if (!tex.name) 2301 if (!tex.name)
2053 tex = self->tex [2]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2054 2303
2055 key.texname = tex.name; 2304 key.texname = tex.name;
2056 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
2057 } 2306 }
2307
2308 px = (x + 1) * Th - tex.w;
2309 py = (y + 1) * Tw - tex.h;
2058 2310
2059 if (expect_false (cell->player == player) && expect_false (z == 2)) 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
2060 { 2312 {
2061 pl_x = px; 2313 pl_x = px;
2062 pl_y = py; 2314 pl_y = py;
2063 pl_tex = tex; 2315 pl_tex = tex;
2064 continue; 2316 continue;
2065 } 2317 }
2066 2318
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2321 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2071
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
2075 if (cell->flags & 1)
2076 {
2077 maptex tex = self->tex [1];
2078 int px = x * T + T * 2 / 32;
2079 int py = y * T - T * 6 / 32;
2080
2081 if (tex.name)
2082 {
2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093 }
2094 }
2095 }
2096 2323
2097 // update smooth hash 2324 // update smooth hash
2098 if (tex.smoothtile) 2325 if (tex.smoothtile)
2099 { 2326 {
2100 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
2101 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
2102 2329
2103 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
2104 2331
2105 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
2106 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
2107 2334
2108 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
2116 2343
2117 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2118 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
2119 2346
2120 // full tile 2347 // full tile
2121 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2122 2349
2123 // borders 2350 // borders
2124 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2125 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2352 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2126 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2353 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2127 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2128 2355
2129 // corners 2356 // corners
2130 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2131 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2358 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2132 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2359 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2133 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2361 }
2362 }
2363
2364 if (expect_false (z == 2) && expect_false (cell->flags))
2365 {
2366 // overlays such as the speech bubble, probably more to come
2367 if (cell->flags & 1)
2368 {
2369 rc_key_t key_ov = key;
2370 maptex tex = self->tex[TEXID_SPEECH];
2371 int px = x * Tw + Tw * 2 / 32;
2372 int py = y * Th - Th * 6 / 32;
2373
2374 key_ov.texname = tex.name;
2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2376
2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2134 } 2381 }
2135 } 2382 }
2136 } 2383 }
2137 } 2384 }
2138 2385
2139 rc_draw (rc); 2386 rc.draw ();
2140 rc_clear (rc); 2387 rc.clear ();
2141 2388
2142 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
2143 // this is basically counting sort 2390 // this is basically counting sort
2144 { 2391 {
2145 int w, b; 2392 int w, b;
2146 2393
2147 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
2148 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
2149 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2150 { 2399 {
2151 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
2152 if (smask) 2401 IV bits = it->second;
2153 for (b = 0; b < 32; ++b) 2402
2154 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
2155 { 2406 {
2156 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
2157 HE *he; 2415 if (tex.name)
2158
2159 hv_iterinit (smooth);
2160 while ((he = hv_iternext (smooth)))
2161 { 2416 {
2162 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
2163 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
2164 2419 if (key.texname != tex.name)
2165 if (!(bits & 0x1000)
2166 && skey->level == level
2167 && level > smooth_max [skey->x][skey->y])
2168 { 2420 {
2169 maptex tex = self->tex [skey->tile]; 2421 self->tex [skey.tile].unused = 0;
2170 int px = (((int)skey->x) - 1) * T;
2171 int py = (((int)skey->y) - 1) * T;
2172 int border = bits & 15;
2173 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174 float dx = tex.s * .0625f; // 16 images/row
2175 float dy = tex.t * .5f ; // 2 images/column
2176 2422
2177 if (tex.name)
2178 {
2179 // this time avoiding texture state changes
2180 // save gobs of state changes.
2181 if (key.texname != tex.name)
2182 {
2183 glEnd (); 2423 glEnd ();
2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2185 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2186 } 2426 }
2187 2427
2188 if (border) 2428 if (border)
2189 { 2429 {
2190 float ox = border * dx; 2430 float ox = border * dx;
2191 2431
2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2196 } 2436 }
2197 2437
2198 if (corner) 2438 if (corner)
2199 { 2439 {
2200 float ox = corner * dx; 2440 float ox = corner * dx;
2201 2441
2202 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2206 }
2207 }
2208 } 2446 }
2209 } 2447 }
2210 } 2448 }
2211 } 2449 }
2212 2450
2213 glEnd (); 2451 glEnd ();
2214 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1; 2453 key.texname = -1;
2216 } 2454 }
2217
2218 hv_clear (smooth);
2219 } 2455 }
2220 2456
2221 if (pl_tex.name) 2457 if (pl_tex.name)
2222 { 2458 {
2223 maptex tex = pl_tex; 2459 maptex tex = pl_tex;
2224 int px = pl_x + sdx; 2460 int px = pl_x + sdx;
2225 int py = pl_y + sdy; 2461 int py = pl_y + sdy;
2226 2462
2227 key.texname = tex.name; 2463 key.texname = tex.name;
2228 arr = rc_array (rc, &key); 2464 rc_t::array_t &arr = rc.array (key);
2229 2465
2230 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2231 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2232 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2468 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2234 2470
2235 rc_draw (rc); 2471 rc.draw ();
2236 } 2472 }
2237 2473
2474 rc_ov.draw ();
2475 rc_ov.clear ();
2476
2238 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2239 rc_free (rc);
2240 2478
2241 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2242 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2243 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2244 { 2482 {
2247 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2248 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2249 { 2487 {
2250 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2251 2489
2252 int px = x * T; 2490 int px = x * Tw;
2253 int py = y * T; 2491 int py = y * Th;
2492
2493 if (expect_false (cell->player == player))
2494 {
2495 px += sdx;
2496 py += sdy;
2497 }
2254 2498
2255 if (cell->stat_hp) 2499 if (cell->stat_hp)
2256 { 2500 {
2257 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2258 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2259 2503
2260 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2261 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2262 px + width - 1, py); 2506 px + width - 1, py);
2263 2507
2269 } 2513 }
2270 } 2514 }
2271} 2515}
2272 2516
2273void 2517void
2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2518draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2275 CODE: 2519 CODE:
2276{ 2520{
2277 static float color[16][3] = { 2521 static float color[16][3] = {
2278 { 0.00F, 0.00F, 0.00F }, 2522 { 0.00f, 0.00f, 0.00f },
2279 { 1.00F, 1.00F, 1.00F }, 2523 { 1.00f, 1.00f, 1.00f },
2280 { 0.00F, 0.00F, 0.55F }, 2524 { 0.00f, 0.00f, 0.55f },
2281 { 1.00F, 0.00F, 0.00F }, 2525 { 1.00f, 0.00f, 0.00f },
2282 2526
2283 { 1.00F, 0.54F, 0.00F }, 2527 { 1.00f, 0.54f, 0.00f },
2284 { 0.11F, 0.56F, 1.00F }, 2528 { 0.11f, 0.56f, 1.00f },
2285 { 0.93F, 0.46F, 0.00F }, 2529 { 0.93f, 0.46f, 0.00f },
2286 { 0.18F, 0.54F, 0.34F }, 2530 { 0.18f, 0.54f, 0.34f },
2287 2531
2288 { 0.56F, 0.73F, 0.56F }, 2532 { 0.56f, 0.73f, 0.56f },
2289 { 0.80F, 0.80F, 0.80F }, 2533 { 0.80f, 0.80f, 0.80f },
2290 { 0.55F, 0.41F, 0.13F }, 2534 { 0.55f, 0.41f, 0.13f },
2291 { 0.99F, 0.77F, 0.26F }, 2535 { 0.99f, 0.77f, 0.26f },
2292 2536
2293 { 0.74F, 0.65F, 0.41F }, 2537 { 0.74f, 0.65f, 0.41f },
2294 2538
2295 { 0.00F, 1.00F, 1.00F }, 2539 { 0.00f, 1.00f, 1.00f },
2296 { 1.00F, 0.00F, 1.00F }, 2540 { 1.00f, 0.00f, 1.00f },
2297 { 1.00F, 1.00F, 0.00F }, 2541 { 1.00f, 1.00f, 0.00f },
2298 }; 2542 };
2299 2543
2300 int x, y; 2544 int x, y;
2301 2545
2302 glEnable (GL_TEXTURE_2D); 2546 glEnable (GL_TEXTURE_2D);
2547 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2548 * but the nvidia driver (185.18.14) mishandles alpha textures
2549 * and takes the colour from god knows where instead of using
2550 * Cp. MODULATE results in the same colour, but slightly different
2551 * alpha, but atcually gives us the correct colour with nvidia.
2552 */
2303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2304 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2305 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2555 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2306 glBegin (GL_QUADS); 2556 glBegin (GL_QUADS);
2307 2557
2308 for (y = 0; y < h; y++) 2558 for (y = 0; y < h; y++)
2312 2562
2313 if (m) 2563 if (m)
2314 { 2564 {
2315 float *c = color [m & 15]; 2565 float *c = color [m & 15];
2316 2566
2317 float tx1 = m & 0x40 ? 0.5 : 0.; 2567 float tx1 = m & 0x40 ? 0.5f : 0.f;
2318 float tx2 = tx1 + 0.5; 2568 float tx2 = tx1 + 0.5f;
2319 2569
2320 glColor4f (c[0], c[1], c[2], 0.75); 2570 glColor4f (c[0], c[1], c[2], 1);
2321 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2571 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2322 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2572 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2323 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2573 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2324 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2574 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2325 } 2575 }
2333void 2583void
2334fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2584fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2335 PPCODE: 2585 PPCODE:
2336{ 2586{
2337 int x, y; 2587 int x, y;
2338 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2339 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2340 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2341 int sw34 = (sw * 3 + 3) & ~3; 2591 int sw3 = sw * 3;
2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2342 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2343 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2344 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2345 2596
2346 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2347 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2348 2599
2349 mx += self->x - 1; 2600 mx += self->x - 1;
2350 my += self->y - 1; 2601 my += self->y - 1;
2351
2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353 2602
2354 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2355 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2356 { 2605 {
2357 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2360 if (row->c0 <= x + mx && x + mx < row->c1) 2609 if (row->c0 <= x + mx && x + mx < row->c1)
2361 { 2610 {
2362 mapcell *cell = row->col + (x + mx - row->c0); 2611 mapcell *cell = row->col + (x + mx - row->c0);
2363 2612
2364 darkness1 [y * sw1 + x] = cell->darkness 2613 darkness1 [y * sw1 + x] = cell->darkness
2365 ? 255 - (cell->darkness - 1) 2614 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2366 : 255 - FOW_DARKNESS; 2615 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2367 } 2616 }
2368 } 2617 }
2369 2618
2370 for (y = 0; y < sh; ++y) 2619 for (y = 0; y < sh; ++y)
2371 for (x = 0; x < sw; ++x) 2620 for (x = 0; x < sw; ++x)
2390 2639
2391 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2392 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2393 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2394 2643
2395 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2396 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2398 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2399 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2401 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2402 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2404 } 2653 }
2405 2654
2406 free (darkness1); 2655 free (darkness1);
2407 2656
2408 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2409 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2410 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2411 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2412} 2661}
2413 2662
2414SV * 2663SV *
2477 else 2726 else
2478 *data++ = 0; 2727 *data++ = 0;
2479 } 2728 }
2480 } 2729 }
2481 2730
2482 /* if size is w*h + 5 then no data has been found */ 2731 /* if size is w*h + 5 then no data has been found */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 { 2733 {
2485 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 } 2736 }
2488 2737
2489 RETVAL = data_sv; 2738 RETVAL = data_sv;
2490} 2739}
2491 OUTPUT: 2740 OUTPUT:
2492 RETVAL 2741 RETVAL
2493 2742
2494void 2743void
2501 STRLEN len; 2750 STRLEN len;
2502 uint8_t *data, *end; 2751 uint8_t *data, *end;
2503 2752
2504 len = SvLEN (data_sv); 2753 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv); 2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2507 end = data + len + 8; 2756 end = data + len + 8;
2508 2757
2509 if (len < 5) 2758 if (len < 5)
2510 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2511 2760
2572} 2821}
2573 2822
2574MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2575 2824
2576DC::RW 2825DC::RW
2577new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2578 CODE: 2827 CODE:
2579{ 2828{
2580 STRLEN datalen; 2829 STRLEN datalen;
2581 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2582 2831
2584} 2833}
2585 OUTPUT: 2834 OUTPUT:
2586 RETVAL 2835 RETVAL
2587 2836
2588DC::RW 2837DC::RW
2589new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2590 CODE: 2839 CODE:
2591 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2592 OUTPUT: 2841 OUTPUT:
2593 RETVAL 2842 RETVAL
2594 2843
2612 if (RETVAL < 0) 2861 if (RETVAL < 0)
2613 { 2862 {
2614 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2615 2864
2616 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2617 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2618 2872 }
2873 else
2619 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2620 } 2875 }
2621 2876
2622 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2623 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2624} 2879}
2671void 2926void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2927set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE: 2928 CODE:
2674{ 2929{
2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2930 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2931 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2932 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678} 2933}
2679 2934
2680void 2935void
2681set_reverse_stereo (DC::Channel self, int flip) 2936set_reverse_stereo (DC::Channel self, int flip)
2684 2939
2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686 2941
2687PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2688 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2689DC::MixChunk 2956DC::MixChunk
2690new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2691 CODE: 2958 CODE:
2692 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2693 OUTPUT: 2960 OUTPUT:
2694 RETVAL 2961 RETVAL
2695 2962
2725 OUTPUT: 2992 OUTPUT:
2726 RETVAL 2993 RETVAL
2727 2994
2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2729 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2730int 3009int
2731volume (int volume = -1) 3010volume (int volume = -1)
2732 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2733 CODE: 3012 CODE:
2734 if (items > 0) 3013 if (items > 0)
2745void 3024void
2746halt () 3025halt ()
2747 CODE: 3026 CODE:
2748 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2749 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2750DC::MixMusic 3036DC::MixMusic
2751new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2752 CODE: 3038 CODE:
2753 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2754 OUTPUT: 3040 OUTPUT:
2755 RETVAL 3041 RETVAL
2756 3042
2784 } *civ, const_iv[] = { 3070 } *civ, const_iv[] = {
2785# define const_iv(name) { # name, (IV)name } 3071# define const_iv(name) { # name, (IV)name }
2786 const_iv (GL_VENDOR), 3072 const_iv (GL_VENDOR),
2787 const_iv (GL_VERSION), 3073 const_iv (GL_VERSION),
2788 const_iv (GL_EXTENSIONS), 3074 const_iv (GL_EXTENSIONS),
3075 const_iv (GL_MAX_TEXTURE_UNITS),
2789 const_iv (GL_COLOR_MATERIAL), 3076 const_iv (GL_COLOR_MATERIAL),
2790 const_iv (GL_SMOOTH), 3077 const_iv (GL_SMOOTH),
2791 const_iv (GL_FLAT), 3078 const_iv (GL_FLAT),
2792 const_iv (GL_DITHER), 3079 const_iv (GL_DITHER),
2793 const_iv (GL_BLEND), 3080 const_iv (GL_BLEND),
2805 const_iv (GL_ZERO), 3092 const_iv (GL_ZERO),
2806 const_iv (GL_SRC_ALPHA), 3093 const_iv (GL_SRC_ALPHA),
2807 const_iv (GL_DST_ALPHA), 3094 const_iv (GL_DST_ALPHA),
2808 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3095 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2809 const_iv (GL_ONE_MINUS_DST_ALPHA), 3096 const_iv (GL_ONE_MINUS_DST_ALPHA),
3097 const_iv (GL_SRC_COLOR),
3098 const_iv (GL_DST_COLOR),
3099 const_iv (GL_ONE_MINUS_SRC_COLOR),
3100 const_iv (GL_ONE_MINUS_DST_COLOR),
2810 const_iv (GL_SRC_ALPHA_SATURATE), 3101 const_iv (GL_SRC_ALPHA_SATURATE),
2811 const_iv (GL_RGB), 3102 const_iv (GL_RGB),
2812 const_iv (GL_RGBA), 3103 const_iv (GL_RGBA),
2813 const_iv (GL_RGBA4), 3104 const_iv (GL_RGBA4),
2814 const_iv (GL_RGBA8), 3105 const_iv (GL_RGBA8),
2882 const_iv (GL_NICEST), 3173 const_iv (GL_NICEST),
2883 const_iv (GL_V2F), 3174 const_iv (GL_V2F),
2884 const_iv (GL_V3F), 3175 const_iv (GL_V3F),
2885 const_iv (GL_T2F_V3F), 3176 const_iv (GL_T2F_V3F),
2886 const_iv (GL_T2F_N3F_V3F), 3177 const_iv (GL_T2F_N3F_V3F),
3178 const_iv (GL_FUNC_ADD),
3179 const_iv (GL_FUNC_SUBTRACT),
3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2887# undef const_iv 3181# undef const_iv
2888 }; 3182 };
2889 3183
2890 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2892 3186
2893 texture_av = newAV (); 3187 texture_av = newAV ();
2894 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
2895} 3189}
2896 3190
2898disable_GL_EXT_blend_func_separate () 3192disable_GL_EXT_blend_func_separate ()
2899 CODE: 3193 CODE:
2900 gl.BlendFuncSeparate = 0; 3194 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
2902 3196
2903char * 3197void
3198apple_nvidia_bug (int enable)
3199
3200const char *
2904gl_vendor () 3201gl_vendor ()
2905 CODE: 3202 CODE:
2906 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
2907 OUTPUT: 3204 OUTPUT:
2908 RETVAL 3205 RETVAL
2909 3206
2910char * 3207const char *
2911gl_version () 3208gl_version ()
2912 CODE: 3209 CODE:
2913 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
2914 OUTPUT: 3211 OUTPUT:
2915 RETVAL 3212 RETVAL
2916 3213
2917char * 3214const char *
2918gl_extensions () 3215gl_extensions ()
2919 CODE: 3216 CODE:
2920 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2921 OUTPUT: 3218 OUTPUT:
2922 RETVAL 3219 RETVAL
2923 3220
2924const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
2925 3226
2926GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
2927 CODE: 3228 CODE:
2928 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
2929 OUTPUT: 3230 OUTPUT:
2937 3238
2938int glGetError () 3239int glGetError ()
2939 3240
2940void glFinish () 3241void glFinish ()
2941 3242
3243void glFlush ()
3244
2942void glClear (int mask) 3245void glClear (int mask)
2943 3246
2944void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
2945 PROTOTYPE: @ 3248 PROTOTYPE: @
2946 3249
2955void glBlendFunc (int sfactor, int dfactor) 3258void glBlendFunc (int sfactor, int dfactor)
2956 3259
2957void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3260void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2958 CODE: 3261 CODE:
2959 gl_BlendFuncSeparate (sa, da, saa, daa); 3262 gl_BlendFuncSeparate (sa, da, saa, daa);
3263
3264# void glBlendEquation (int se)
2960 3265
2961void glDepthMask (int flag) 3266void glDepthMask (int flag)
2962 3267
2963void glLogicOp (int opcode) 3268void glLogicOp (int opcode)
2964 3269
2999void glRotate (float angle, float x, float y, float z) 3304void glRotate (float angle, float x, float y, float z)
3000 CODE: 3305 CODE:
3001 glRotatef (angle, x, y, z); 3306 glRotatef (angle, x, y, z);
3002 3307
3003void glColor (float r, float g, float b, float a = 1.0) 3308void glColor (float r, float g, float b, float a = 1.0)
3309 PROTOTYPE: @
3004 ALIAS: 3310 ALIAS:
3005 glColor_premultiply = 1 3311 glColor_premultiply = 1
3006 CODE: 3312 CODE:
3007 if (ix) 3313 if (ix)
3008 { 3314 {
3114 3420
3115void glEndList () 3421void glEndList ()
3116 3422
3117void glCallList (int list) 3423void glCallList (int list)
3118 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120 3431
3121PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
3122 3433
3123void 3434void
3124find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
3125 PPCODE: 3436 PPCODE:
3126{ 3437{
3127 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
3128 XPUSHs (self); 3439 XPUSHs (self);
3129} 3440}
3130 3441
3131BOOT: 3442BOOT:
3132{ 3443{
3140 3451
3141void 3452void
3142draw (SV *self) 3453draw (SV *self)
3143 CODE: 3454 CODE:
3144{ 3455{
3145 HV *hv; 3456 HV *hv;
3146 SV **svp; 3457 SV **svp;
3147 NV x, y, w, h; 3458 NV x, y, w, h;
3148 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
3149 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
3150 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
3151 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines