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.329 by root, Sun Nov 18 13:07:51 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines