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.277 by root, Mon Sep 1 06:18:09 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{
544 605
545 return mod; 606 return mod;
546} 607}
547 608
548static void 609static void
549deliantra_main () 610deliantra_main (SV *real_main)
550{ 611{
551 char *argv[] = { 0 }; 612 dSP;
552 call_argv ("::main", G_DISCARD | G_VOID, argv); 613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
553} 616}
554 617
555#ifdef __MACOSX__ 618#ifdef __MACOSX__
619 static SV *real_main;
620
556 /* to due surprising braindamage on the side of SDL design, we 621 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main() 622 * do some mind-boggling hack here: SDL requires a custom main()
558 * 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,
559 * 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,
560 * and which calls our main (== SDL_main) back. 625 * and which calls our main (== SDL_main) back.
561 */ 626 */
562 extern C_LINKAGE int 627 extern C_LINKAGE int
563 main (int argc, char *argv[]) 628 main (int argc, char *argv[])
564 { 629 {
565 deliantra_main (); 630 deliantra_main (real_main);
566 } 631 }
567 632
568 #undef main 633 #undef main
569 634
570 extern C_LINKAGE int main (int argc, char *argv[]); 635 extern C_LINKAGE int main (int argc, char *argv[]);
571 636
572 static void 637 static void
573 SDL_braino (void) 638 SDL_main_hack (SV *real_main_)
574 { 639 {
640 real_main = real_main_;
641
575 char *argv[] = { "deliantra client", 0 }; 642 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv); 643 (main) (1, argv);
577 } 644 }
578#else 645#else
579 static void 646 static void
580 SDL_braino (void) 647 SDL_main_hack (SV *real_main)
581 { 648 {
582 deliantra_main (); 649 deliantra_main (real_main);
583 } 650 }
584#endif 651#endif
585 652
586MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
587 654
788 855
789 const_iv (FOW_DARKNESS) 856 const_iv (FOW_DARKNESS)
790# undef const_iv 857# undef const_iv
791 }; 858 };
792 859
793 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--)
794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795 862
796 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
797 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
798} 865}
799 866
815NV ceil (NV x) 882NV ceil (NV x)
816 883
817IV minpot (UV n) 884IV minpot (UV n)
818 885
819IV 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
820 893
821void 894void
822pango_init () 895pango_init ()
823 CODE: 896 CODE:
824{ 897{
832#endif 905#endif
833} 906}
834 907
835char *SDL_GetError () 908char *SDL_GetError ()
836 909
837void SDL_braino () 910void SDL_main_hack (SV *real_main)
911 PROTOTYPE: &
838 912
839int SDL_Init (U32 flags) 913int SDL_Init (U32 flags)
840 914
841int SDL_InitSubSystem (U32 flags) 915int SDL_InitSubSystem (U32 flags)
842 916
843void SDL_QuitSubSystem (U32 flags) 917void SDL_QuitSubSystem (U32 flags)
844 918
845void SDL_Quit () 919void SDL_Quit ()
846 920
847int SDL_GL_SetAttribute (int attr, int value) 921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
848 923
849int SDL_GL_GetAttribute (int attr) 924int SDL_GL_GetAttribute (int attr)
850 CODE: 925 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL)) 926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
852 XSRETURN_UNDEF; 927 XSRETURN_UNDEF;
853 OUTPUT: 928 OUTPUT:
854 RETVAL 929 RETVAL
855 930
856void 931void
911 ); 986 );
912 987
913 if (RETVAL) 988 if (RETVAL)
914 { 989 {
915 av_clear (texture_av); 990 av_clear (texture_av);
916
917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918#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);
919#include "glfunc.h" 992#include "glfunc.h"
920#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921 } 996 }
922} 997}
923 OUTPUT: 998 OUTPUT:
924 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
925 1003
926void 1004void
927SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
928 1006
929char * 1007char *
930SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
931 1010
932int 1011int
933SDL_GetAppState () 1012SDL_GetAppState ()
934 1013
935int 1014int
936SDL_GetModState () 1015SDL_GetModState ()
937 1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
938void 1021void
1022SDL_PumpEvents ()
1023
1024void
939poll_events () 1025peep_events ()
940 PPCODE: 1026 PPCODE:
941{ 1027{
942 SDL_Event ev; 1028 SDL_Event ev;
943 1029
944 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
1010 1096
1011 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))));
1012 } 1098 }
1013} 1099}
1014 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
1015int 1114int
1016Mix_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)
1017 POSTCALL: 1116 POSTCALL:
1018 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
1019 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
1020 1119
1021void 1120void
1022Mix_QuerySpec () 1121Mix_QuerySpec ()
1081add_font (char *file) 1180add_font (char *file)
1082 CODE: 1181 CODE:
1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT: 1183 OUTPUT:
1085 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)
1086 1192
1087void 1193void
1088load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
1089 ALIAS: 1195 ALIAS:
1090 load_image_file = 1 1196 load_image_file = 1
1136 1242
1137 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
1138 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
1139 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
1140 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
1141 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1142 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)));
1143 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1144 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1145 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
1146 1252
1206#if DEBUG 1312#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1313 VALGRIND_DO_LEAK_CHECK;
1208#endif 1314#endif
1209} 1315}
1210 1316
1317int
1318SvREFCNT (SV *sv)
1319 CODE:
1320 RETVAL = SvREFCNT (sv);
1321 OUTPUT:
1322 RETVAL
1323
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1325
1213PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1214 1327
1215DC::Font 1328DC::Font
1216new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1217 CODE: 1330 CODE:
1218{ 1331{
1219 int count; 1332 int count;
1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1221 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1250 PROTOTYPE: 1363 PROTOTYPE:
1251 CODE: 1364 CODE:
1252 tc_restore (); 1365 tc_restore ();
1253 1366
1254DC::Layout 1367DC::Layout
1255new (SV *class) 1368new (SV *klass)
1256 CODE: 1369 CODE:
1257 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1258 1371
1259 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1260 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1261 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1262 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1263 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1264 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1265 RETVAL->font = 0; 1378 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
1267 1379
1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1269 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1270 OUTPUT: 1382 OUTPUT:
1271 RETVAL 1383 RETVAL
1272 1384
1273void 1385void
1274DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1275 CODE: 1387 CODE:
1276 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1277 rc_free (self->rc);
1278 Safefree (self); 1389 delete self;
1279 1390
1280void 1391void
1281set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1282 CODE: 1393 CODE:
1283{ 1394{
1409 1520
1410void 1521void
1411set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1412 CODE: 1523 CODE:
1413 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1414 { 1525 {
1415 self->base_height = base_height; 1526 self->base_height = base_height;
1416 layout_update_font (self); 1527 layout_update_font (self);
1417 } 1528 }
1418 1529
1419void 1530void
1537} 1648}
1538 1649
1539void 1650void
1540render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1541 CODE: 1652 CODE:
1542 rc_clear (self->rc); 1653 self->rc.clear ();
1543 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1544 self->pl, 1655 self->pl,
1545 self->rc, 1656 &self->rc,
1546 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1547 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1548 flags 1659 flags
1549 ); 1660 );
1550 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1565 1676
1566 rc_draw (self->rc); 1677 self->rc.draw ();
1567 1678
1568 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1571} 1682}
1646 glDisable (GL_ALPHA_TEST); 1757 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1648 } 1759 }
1649} 1760}
1650 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
1651IV 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)
1652 CODE: 1884 CODE:
1653{ 1885{
1654 GLint width; 1886 GLint width;
1655 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);
1662MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1663 1895
1664PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1665 1897
1666DC::Map 1898DC::Map
1667new (SV *class) 1899new (SV *klass)
1668 CODE: 1900 CODE:
1669 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1670 RETVAL->x = 0; 1902 RETVAL->x = 0;
1671 RETVAL->y = 0; 1903 RETVAL->y = 0;
1672 RETVAL->w = 0; 1904 RETVAL->w = 0;
1673 RETVAL->h = 0; 1905 RETVAL->h = 0;
1674 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1711 1943
1712void 1944void
1713set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1714 CODE: 1946 CODE:
1715{ 1947{
1716 tileid texid; 1948 tileid texid;
1717 maptex *tex; 1949 maptex *tex;
1718 1950
1719 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1720 return; 1952 return;
1721 1953
1722 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1723 return; 1955 return;
1724 1956
1725 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1726 1958
1727 if (!texid) 1959 if (!texid)
1728 return; 1960 return;
1729 1961
1730 tex = self->tex + texid; 1962 tex = self->tex + texid;
1759 //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);
1760 // use uglier nearest interpolation because linear suffers 1992 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1993 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1994 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 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 }
1764 2016
1765int 2017int
1766ox (DC::Map self) 2018ox (DC::Map self)
1767 ALIAS: 2019 ALIAS:
1768 oy = 1 2020 oy = 1
1800 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1801 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1802 2054
1803 while (self->y < 0) 2055 while (self->y < 0)
1804 { 2056 {
1805 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1806 2058
1807 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1808 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1809 } 2061 }
1810} 2062}
1811 2063
1812SV * 2064SV *
1813map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1814 CODE: 2066 CODE:
1815{ 2067{
1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1817 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1818 mapcell *cell; 2070 mapcell *cell;
1839 2091
1840 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1841 2093
1842 if (flags & 8) 2094 if (flags & 8)
1843 { 2095 {
2096 uint8_t ext, cmd;
2097
1844 if (extmap) 2098 do
1845 { 2099 {
1846 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1847 2102
1848 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
1849 { 2106 {
1850 ext = *data++;
1851 cmd = ext & 0x7f;
1852
1853 if (cmd < 4)
1854 cell->darkness = 255 - ext * 64 + 1;
1855 else if (cmd == 5) // health
1856 {
1857 cell->stat_width = 1; 2107 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2108 cell->stat_hp = *data++;
1859 }
1860 else if (cmd == 6) // monster width
1861 cell->stat_width = *data++ + 1;
1862 else if (cmd == 0x47)
1863 {
1864 if (*data == 1) cell->player = data [1];
1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1868
1869 data += *data + 1;
1870 }
1871 else if (cmd == 8) // cell flags
1872 cell->flags = *data++;
1873 else if (ext & 0x40) // unknown, multibyte => skip
1874 data += *data + 1;
1875 else
1876 data++;
1877 } 2109 }
1878 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++;
1879 } 2127 }
1880 else 2128 while (ext & 0x80);
1881 cell->darkness = *data++ + 1;
1882 } 2129 }
1883 2130
1884 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
1885 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
1886 { 2133 {
1889 cell->tile [z] = self->face2tile [face]; 2136 cell->tile [z] = self->face2tile [face];
1890 2137
1891 if (cell->tile [z]) 2138 if (cell->tile [z])
1892 { 2139 {
1893 maptex *tex = self->tex + cell->tile [z]; 2140 maptex *tex = self->tex + cell->tile [z];
2141 tex->unused = 0;
1894 if (!tex->name) 2142 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2143 av_push (missing, newSViv (cell->tile [z]));
1896 2144
1897 if (tex->smoothtile) 2145 if (tex->smoothtile)
1898 { 2146 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2147 maptex *smooth = self->tex + tex->smoothtile;
2148 smooth->unused = 0;
1900 if (!smooth->name) 2149 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2150 av_push (missing, newSViv (tex->smoothtile));
1902 } 2151 }
1903 } 2152 }
1904 } 2153 }
1932 ? self->row + y 2181 ? self->row + y
1933 : 0; 2182 : 0;
1934 2183
1935 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
1936 { 2185 {
1937 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2187
1939 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
1940 { 2189 {
1941 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
1942 2191
1944 { 2193 {
1945 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2196 int a1 = tex.a;
1948 2197
1949 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
1953 } 2202 }
1954 } 2203 }
1955 2204
1956 *map++ = (r ) 2205 *map++ = (r )
1957 | (g << 8) 2206 | (g << 8)
1958 | (b << 16) 2207 | (b << 16)
1959 | (a << 24); 2208 | (a << 24);
1960 } 2209 }
1961 } 2210 }
1962 2211
1963 RETVAL = map_sv; 2212 RETVAL = map_sv;
1964} 2213}
1965 OUTPUT: 2214 OUTPUT:
1966 RETVAL 2215 RETVAL
1967 2216
1968void 2217void
1969draw (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)
1970 CODE: 2219 CODE:
1971{ 2220{
1972 int x, y, z; 2221 int x, y, z;
1973 2222
1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976 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!
1977 smooth_key skey;
1978 int pl_x, pl_y; 2224 int pl_x, pl_y;
1979 maptex pl_tex; 2225 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2227 rc_t rc_ov;
1981 rc_key_t key; 2228 rc_key_t key;
1982 rc_array_t *arr; 2229 rc_t::array_t *arr;
1983 2230
1984 pl_tex.name = 0; 2231 pl_tex.name = 0;
1985 2232
1986 // thats current max. sorry. 2233 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1989
1990 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey));
1992 2236
1993 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
1994 key.r = 255; 2238 key.r = 255;
1995 key.g = 255; 2239 key.g = 255;
1996 key.b = 255; 2240 key.b = 255;
1997 key.a = 255; 2241 key.a = 255;
1998 key.mode = GL_QUADS; 2242 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2243 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2244
2002 mx += self->x; 2245 mx += self->x;
2003 my += self->y; 2246 my += self->y;
2004 2247
2005 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
2006 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
2007 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
2008 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2009 2252
2010 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
2011 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
2012 { 2255 {
2013 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2273
2031 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
2032 { 2275 {
2033 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;
2034 2280
2035 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
2037 { 2283 {
2038 maprow *row = self->row + (y + my); 2284 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2290 tileid tile = cell->tile [z];
2045 2291
2046 if (tile) 2292 if (tile)
2047 { 2293 {
2048 maptex tex = self->tex [tile]; 2294 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2295 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2296
2052 if (key.texname != tex.name) 2297 if (key.texname != tex.name)
2053 { 2298 {
2299 self->tex [tile].unused = 0;
2300
2054 if (!tex.name) 2301 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2303
2057 key.texname = tex.name; 2304 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
2059 } 2306 }
2307
2308 px = (x + 1) * Th - tex.w;
2309 py = (y + 1) * Tw - tex.h;
2060 2310
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
2062 { 2312 {
2063 pl_x = px; 2313 pl_x = px;
2064 pl_y = py; 2314 pl_y = py;
2065 pl_tex = tex; 2315 pl_tex = tex;
2066 continue; 2316 continue;
2067 } 2317 }
2068 2318
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2071 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);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2073
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
2077 if (cell->flags & 1)
2078 {
2079 maptex tex = self->tex [1];
2080 int px = x * T + T * 2 / 32;
2081 int py = y * T - T * 6 / 32;
2082
2083 if (tex.name)
2084 {
2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095 }
2096 }
2097 }
2098 2323
2099 // update smooth hash 2324 // update smooth hash
2100 if (tex.smoothtile) 2325 if (tex.smoothtile)
2101 { 2326 {
2102 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
2104 2329
2105 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
2106 2331
2107 // 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
2108 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
2109 2334
2110 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
2118 2343
2119 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2120 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
2121 2346
2122 // full tile 2347 // full tile
2123 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);
2124 2349
2125 // borders 2350 // borders
2126 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);
2127 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);
2128 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);
2129 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);
2130 2355
2131 // corners 2356 // corners
2132 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);
2133 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);
2134 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);
2135 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);
2136 } 2381 }
2137 } 2382 }
2138 } 2383 }
2139 } 2384 }
2140 2385
2141 rc_draw (rc); 2386 rc.draw ();
2142 rc_clear (rc); 2387 rc.clear ();
2143 2388
2144 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
2145 // this is basically counting sort 2390 // this is basically counting sort
2146 { 2391 {
2147 int w, b; 2392 int w, b;
2148 2393
2149 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
2151 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)
2152 { 2399 {
2153 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
2154 if (smask) 2401 IV bits = it->second;
2155 for (b = 0; b < 32; ++b) 2402
2156 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
2157 { 2406 {
2158 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
2159 HE *he; 2415 if (tex.name)
2160
2161 hv_iterinit (smooth);
2162 while ((he = hv_iternext (smooth)))
2163 { 2416 {
2164 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
2165 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
2166 2419 if (key.texname != tex.name)
2167 if (!(bits & 0x1000)
2168 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y])
2170 { 2420 {
2171 maptex tex = self->tex [skey->tile]; 2421 self->tex [skey.tile].unused = 0;
2172 int px = (((int)skey->x) - 1) * T;
2173 int py = (((int)skey->y) - 1) * T;
2174 int border = bits & 15;
2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176 float dx = tex.s * .0625f; // 16 images/row
2177 float dy = tex.t * .5f ; // 2 images/column
2178 2422
2179 if (tex.name)
2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
2183 if (key.texname != tex.name)
2184 {
2185 glEnd (); 2423 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2188 } 2426 }
2189 2427
2190 if (border) 2428 if (border)
2191 { 2429 {
2192 float ox = border * dx; 2430 float ox = border * dx;
2193 2431
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2436 }
2199 2437
2200 if (corner) 2438 if (corner)
2201 { 2439 {
2202 float ox = corner * dx; 2440 float ox = corner * dx;
2203 2441
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 }
2209 }
2210 } 2446 }
2211 } 2447 }
2212 } 2448 }
2213 } 2449 }
2214 2450
2215 glEnd (); 2451 glEnd ();
2216 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1; 2453 key.texname = -1;
2218 } 2454 }
2219
2220 hv_clear (smooth);
2221 } 2455 }
2222 2456
2223 if (pl_tex.name) 2457 if (pl_tex.name)
2224 { 2458 {
2225 maptex tex = pl_tex; 2459 maptex tex = pl_tex;
2226 int px = pl_x + sdx; 2460 int px = pl_x + sdx;
2227 int py = pl_y + sdy; 2461 int py = pl_y + sdy;
2228 2462
2229 key.texname = tex.name; 2463 key.texname = tex.name;
2230 arr = rc_array (rc, &key); 2464 rc_t::array_t &arr = rc.array (key);
2231 2465
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2234 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);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2236 2470
2237 rc_draw (rc); 2471 rc.draw ();
2238 } 2472 }
2239 2473
2474 rc_ov.draw ();
2475 rc_ov.clear ();
2476
2240 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2241 rc_free (rc);
2242 2478
2243 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2246 { 2482 {
2249 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2487 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2253 2489
2254 int px = x * T; 2490 int px = x * Tw;
2255 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 }
2256 2498
2257 if (cell->stat_hp) 2499 if (cell->stat_hp)
2258 { 2500 {
2259 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2260 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2261 2503
2262 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2263 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2264 px + width - 1, py); 2506 px + width - 1, py);
2265 2507
2271 } 2513 }
2272 } 2514 }
2273} 2515}
2274 2516
2275void 2517void
2276draw_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)
2277 CODE: 2519 CODE:
2278{ 2520{
2279 static float color[16][3] = { 2521 static float color[16][3] = {
2280 { 0.00F, 0.00F, 0.00F }, 2522 { 0.00f, 0.00f, 0.00f },
2281 { 1.00F, 1.00F, 1.00F }, 2523 { 1.00f, 1.00f, 1.00f },
2282 { 0.00F, 0.00F, 0.55F }, 2524 { 0.00f, 0.00f, 0.55f },
2283 { 1.00F, 0.00F, 0.00F }, 2525 { 1.00f, 0.00f, 0.00f },
2284 2526
2285 { 1.00F, 0.54F, 0.00F }, 2527 { 1.00f, 0.54f, 0.00f },
2286 { 0.11F, 0.56F, 1.00F }, 2528 { 0.11f, 0.56f, 1.00f },
2287 { 0.93F, 0.46F, 0.00F }, 2529 { 0.93f, 0.46f, 0.00f },
2288 { 0.18F, 0.54F, 0.34F }, 2530 { 0.18f, 0.54f, 0.34f },
2289 2531
2290 { 0.56F, 0.73F, 0.56F }, 2532 { 0.56f, 0.73f, 0.56f },
2291 { 0.80F, 0.80F, 0.80F }, 2533 { 0.80f, 0.80f, 0.80f },
2292 { 0.55F, 0.41F, 0.13F }, 2534 { 0.55f, 0.41f, 0.13f },
2293 { 0.99F, 0.77F, 0.26F }, 2535 { 0.99f, 0.77f, 0.26f },
2294 2536
2295 { 0.74F, 0.65F, 0.41F }, 2537 { 0.74f, 0.65f, 0.41f },
2296 2538
2297 { 0.00F, 1.00F, 1.00F }, 2539 { 0.00f, 1.00f, 1.00f },
2298 { 1.00F, 0.00F, 1.00F }, 2540 { 1.00f, 0.00f, 1.00f },
2299 { 1.00F, 1.00F, 0.00F }, 2541 { 1.00f, 1.00f, 0.00f },
2300 }; 2542 };
2301 2543
2302 int x, y; 2544 int x, y;
2303 2545
2304 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 */
2305 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2306 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2307 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2555 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2308 glBegin (GL_QUADS); 2556 glBegin (GL_QUADS);
2309 2557
2310 for (y = 0; y < h; y++) 2558 for (y = 0; y < h; y++)
2314 2562
2315 if (m) 2563 if (m)
2316 { 2564 {
2317 float *c = color [m & 15]; 2565 float *c = color [m & 15];
2318 2566
2319 float tx1 = m & 0x40 ? 0.5 : 0.; 2567 float tx1 = m & 0x40 ? 0.5f : 0.f;
2320 float tx2 = tx1 + 0.5; 2568 float tx2 = tx1 + 0.5f;
2321 2569
2322 glColor4f (c[0], c[1], c[2], 0.75); 2570 glColor4f (c[0], c[1], c[2], 1);
2323 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2571 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2324 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2572 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2325 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2573 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2326 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2574 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2327 } 2575 }
2335void 2583void
2336fow_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)
2337 PPCODE: 2585 PPCODE:
2338{ 2586{
2339 int x, y; 2587 int x, y;
2340 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2341 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2342 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2343 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);
2344 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2345 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2346 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2347 2596
2348 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2349 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2350 2599
2351 mx += self->x - 1; 2600 mx += self->x - 1;
2352 my += self->y - 1; 2601 my += self->y - 1;
2353
2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2355 2602
2356 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2357 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2358 { 2605 {
2359 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2362 if (row->c0 <= x + mx && x + mx < row->c1) 2609 if (row->c0 <= x + mx && x + mx < row->c1)
2363 { 2610 {
2364 mapcell *cell = row->col + (x + mx - row->c0); 2611 mapcell *cell = row->col + (x + mx - row->c0);
2365 2612
2366 darkness1 [y * sw1 + x] = cell->darkness 2613 darkness1 [y * sw1 + x] = cell->darkness
2367 ? 255 - (cell->darkness - 1) 2614 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2368 : 255 - FOW_DARKNESS; 2615 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2369 } 2616 }
2370 } 2617 }
2371 2618
2372 for (y = 0; y < sh; ++y) 2619 for (y = 0; y < sh; ++y)
2373 for (x = 0; x < sw; ++x) 2620 for (x = 0; x < sw; ++x)
2392 2639
2393 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2394 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2395 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2396 2643
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2398 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2399 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2401 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 */
2402 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2404 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2405 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2406 } 2653 }
2407 2654
2408 free (darkness1); 2655 free (darkness1);
2409 2656
2410 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2411 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2412 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2413 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2414} 2661}
2415 2662
2416SV * 2663SV *
2479 else 2726 else
2480 *data++ = 0; 2727 *data++ = 0;
2481 } 2728 }
2482 } 2729 }
2483 2730
2484 /* 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 */
2485 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2486 { 2733 {
2487 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2489 } 2736 }
2490 2737
2491 RETVAL = data_sv; 2738 RETVAL = data_sv;
2492} 2739}
2493 OUTPUT: 2740 OUTPUT:
2494 RETVAL 2741 RETVAL
2495 2742
2496void 2743void
2503 STRLEN len; 2750 STRLEN len;
2504 uint8_t *data, *end; 2751 uint8_t *data, *end;
2505 2752
2506 len = SvLEN (data_sv); 2753 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv); 2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2509 end = data + len + 8; 2756 end = data + len + 8;
2510 2757
2511 if (len < 5) 2758 if (len < 5)
2512 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2513 2760
2574} 2821}
2575 2822
2576MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2577 2824
2578DC::RW 2825DC::RW
2579new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2580 CODE: 2827 CODE:
2581{ 2828{
2582 STRLEN datalen; 2829 STRLEN datalen;
2583 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2584 2831
2586} 2833}
2587 OUTPUT: 2834 OUTPUT:
2588 RETVAL 2835 RETVAL
2589 2836
2590DC::RW 2837DC::RW
2591new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2592 CODE: 2839 CODE:
2593 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2594 OUTPUT: 2841 OUTPUT:
2595 RETVAL 2842 RETVAL
2596 2843
2614 if (RETVAL < 0) 2861 if (RETVAL < 0)
2615 { 2862 {
2616 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2617 2864
2618 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)
2619 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2620 2872 }
2873 else
2621 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2622 } 2875 }
2623 2876
2624 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2625 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2626} 2879}
2673void 2926void
2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2927set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675 CODE: 2928 CODE:
2676{ 2929{
2677 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));
2678 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;
2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2932 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680} 2933}
2681 2934
2682void 2935void
2683set_reverse_stereo (DC::Channel self, int flip) 2936set_reverse_stereo (DC::Channel self, int flip)
2686 2939
2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688 2941
2689PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2690 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
2691DC::MixChunk 2956DC::MixChunk
2692new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2693 CODE: 2958 CODE:
2694 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2695 OUTPUT: 2960 OUTPUT:
2696 RETVAL 2961 RETVAL
2697 2962
2727 OUTPUT: 2992 OUTPUT:
2728 RETVAL 2993 RETVAL
2729 2994
2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2731 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
2732int 3009int
2733volume (int volume = -1) 3010volume (int volume = -1)
2734 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2735 CODE: 3012 CODE:
2736 if (items > 0) 3013 if (items > 0)
2747void 3024void
2748halt () 3025halt ()
2749 CODE: 3026 CODE:
2750 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2751 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2752DC::MixMusic 3036DC::MixMusic
2753new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2754 CODE: 3038 CODE:
2755 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2756 OUTPUT: 3040 OUTPUT:
2757 RETVAL 3041 RETVAL
2758 3042
2786 } *civ, const_iv[] = { 3070 } *civ, const_iv[] = {
2787# define const_iv(name) { # name, (IV)name } 3071# define const_iv(name) { # name, (IV)name }
2788 const_iv (GL_VENDOR), 3072 const_iv (GL_VENDOR),
2789 const_iv (GL_VERSION), 3073 const_iv (GL_VERSION),
2790 const_iv (GL_EXTENSIONS), 3074 const_iv (GL_EXTENSIONS),
3075 const_iv (GL_MAX_TEXTURE_UNITS),
2791 const_iv (GL_COLOR_MATERIAL), 3076 const_iv (GL_COLOR_MATERIAL),
2792 const_iv (GL_SMOOTH), 3077 const_iv (GL_SMOOTH),
2793 const_iv (GL_FLAT), 3078 const_iv (GL_FLAT),
2794 const_iv (GL_DITHER), 3079 const_iv (GL_DITHER),
2795 const_iv (GL_BLEND), 3080 const_iv (GL_BLEND),
2807 const_iv (GL_ZERO), 3092 const_iv (GL_ZERO),
2808 const_iv (GL_SRC_ALPHA), 3093 const_iv (GL_SRC_ALPHA),
2809 const_iv (GL_DST_ALPHA), 3094 const_iv (GL_DST_ALPHA),
2810 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3095 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2811 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),
2812 const_iv (GL_SRC_ALPHA_SATURATE), 3101 const_iv (GL_SRC_ALPHA_SATURATE),
2813 const_iv (GL_RGB), 3102 const_iv (GL_RGB),
2814 const_iv (GL_RGBA), 3103 const_iv (GL_RGBA),
2815 const_iv (GL_RGBA4), 3104 const_iv (GL_RGBA4),
2816 const_iv (GL_RGBA8), 3105 const_iv (GL_RGBA8),
2884 const_iv (GL_NICEST), 3173 const_iv (GL_NICEST),
2885 const_iv (GL_V2F), 3174 const_iv (GL_V2F),
2886 const_iv (GL_V3F), 3175 const_iv (GL_V3F),
2887 const_iv (GL_T2F_V3F), 3176 const_iv (GL_T2F_V3F),
2888 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),
2889# undef const_iv 3181# undef const_iv
2890 }; 3182 };
2891 3183
2892 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--)
2893 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2894 3186
2895 texture_av = newAV (); 3187 texture_av = newAV ();
2896 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
2897} 3189}
2898 3190
2900disable_GL_EXT_blend_func_separate () 3192disable_GL_EXT_blend_func_separate ()
2901 CODE: 3193 CODE:
2902 gl.BlendFuncSeparate = 0; 3194 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
2904 3196
2905char * 3197void
3198apple_nvidia_bug (int enable)
3199
3200const char *
2906gl_vendor () 3201gl_vendor ()
2907 CODE: 3202 CODE:
2908 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
2909 OUTPUT: 3204 OUTPUT:
2910 RETVAL 3205 RETVAL
2911 3206
2912char * 3207const char *
2913gl_version () 3208gl_version ()
2914 CODE: 3209 CODE:
2915 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
2916 OUTPUT: 3211 OUTPUT:
2917 RETVAL 3212 RETVAL
2918 3213
2919char * 3214const char *
2920gl_extensions () 3215gl_extensions ()
2921 CODE: 3216 CODE:
2922 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2923 OUTPUT: 3218 OUTPUT:
2924 RETVAL 3219 RETVAL
2925 3220
2926const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
2927 3226
2928GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
2929 CODE: 3228 CODE:
2930 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
2931 OUTPUT: 3230 OUTPUT:
2939 3238
2940int glGetError () 3239int glGetError ()
2941 3240
2942void glFinish () 3241void glFinish ()
2943 3242
3243void glFlush ()
3244
2944void glClear (int mask) 3245void glClear (int mask)
2945 3246
2946void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
2947 PROTOTYPE: @ 3248 PROTOTYPE: @
2948 3249
2957void glBlendFunc (int sfactor, int dfactor) 3258void glBlendFunc (int sfactor, int dfactor)
2958 3259
2959void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3260void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2960 CODE: 3261 CODE:
2961 gl_BlendFuncSeparate (sa, da, saa, daa); 3262 gl_BlendFuncSeparate (sa, da, saa, daa);
3263
3264# void glBlendEquation (int se)
2962 3265
2963void glDepthMask (int flag) 3266void glDepthMask (int flag)
2964 3267
2965void glLogicOp (int opcode) 3268void glLogicOp (int opcode)
2966 3269
3001void glRotate (float angle, float x, float y, float z) 3304void glRotate (float angle, float x, float y, float z)
3002 CODE: 3305 CODE:
3003 glRotatef (angle, x, y, z); 3306 glRotatef (angle, x, y, z);
3004 3307
3005void 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: @
3006 ALIAS: 3310 ALIAS:
3007 glColor_premultiply = 1 3311 glColor_premultiply = 1
3008 CODE: 3312 CODE:
3009 if (ix) 3313 if (ix)
3010 { 3314 {
3116 3420
3117void glEndList () 3421void glEndList ()
3118 3422
3119void glCallList (int list) 3423void glCallList (int list)
3120 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
3121MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3122 3431
3123PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
3124 3433
3125void 3434void
3126find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
3127 PPCODE: 3436 PPCODE:
3128{ 3437{
3129 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
3130 XPUSHs (self); 3439 XPUSHs (self);
3131} 3440}
3132 3441
3133BOOT: 3442BOOT:
3134{ 3443{
3142 3451
3143void 3452void
3144draw (SV *self) 3453draw (SV *self)
3145 CODE: 3454 CODE:
3146{ 3455{
3147 HV *hv; 3456 HV *hv;
3148 SV **svp; 3457 SV **svp;
3149 NV x, y, w, h; 3458 NV x, y, w, h;
3150 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
3151 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
3152 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
3153 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