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.274 by root, Wed Aug 20 17:50:47 2008 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 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)
104
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}
95 128
96static AV *texture_av; 129static AV *texture_av;
97 130
98static struct 131static struct
99{ 132{
156{ 189{
157 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
158 191
159 while (attrs) 192 while (attrs)
160 { 193 {
161 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 195
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 197 return 1;
165 198
166 attrs = attrs->next; 199 attrs = attrs->next;
167 } 200 }
168 201
169 return 0; 202 return 0;
170} 203}
171 204
172typedef struct cf_layout { 205struct cf_layout {
173 PangoLayout *pl; 206 PangoLayout *pl;
174 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
175 int base_height; 208 int base_height;
176 DC__Font font; 209 DC__Font font;
177 rc_t *rc; 210 rc_t *rc;
178} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
179 214
180static DC__Font default_font; 215static DC__Font default_font;
181static PangoContext *opengl_context; 216static PangoContext *opengl_context;
182static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
183 218
184static void 219static void
185substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
186{ 221{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 225#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 227}
193 228
194static void 229static void
224} 259}
225 260
226typedef uint16_t tileid; 261typedef uint16_t tileid;
227typedef uint16_t faceid; 262typedef uint16_t faceid;
228 263
229typedef struct { 264struct maptex
265{
230 GLuint name; 266 GLuint name;
231 int w, h; 267 int w, h;
232 float s, t; 268 float s, t;
233 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
234 tileid smoothtile; 270 tileid smoothtile;
235 uint8_t smoothlevel; 271 uint8_t smoothlevel;
236} maptex; 272 uint8_t unused; /* set to zero on use */
273};
237 274
238typedef struct { 275struct mapcell
276{
239 uint32_t player; 277 uint32_t player;
240 tileid tile[3]; 278 tileid tile[3];
241 uint16_t darkness; 279 uint16_t darkness;
242 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
243} mapcell; 281};
244 282
245typedef struct { 283struct maprow
284{
246 int32_t c0, c1; 285 int32_t c0, c1;
247 mapcell *col; 286 mapcell *col;
248} maprow; 287};
249 288
250typedef struct map { 289struct mapgrid {
251 int x, y, w, h; 290 int x, y, w, h;
252 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
253 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
254 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
255 294
256 int32_t rows; 295 int32_t rows;
257 maprow *row; 296 maprow *row;
258} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
259 300
260static char * 301static char *
261prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
262{ 303{
263 char *p; 304 char *p;
281 322
282#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
283#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
284 325
285static void 326static void
286need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
287{ 328{
288 while (self->faces <= face) 329 while (self->faces <= face)
289 { 330 {
290 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
291 self->faces *= 2; 332 self->faces *= 2;
292 } 333 }
293} 334}
294 335
295static void 336static void
296need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
297{ 338{
298 while (self->texs <= texid) 339 while (self->texs <= texid)
299 { 340 {
300 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
301 self->texs *= 2; 342 self->texs *= 2;
302 } 343 }
303} 344}
304 345
305static maprow * 346static maprow *
306map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
307{ 348{
308 if (0 > y) 349 if (0 > y)
309 { 350 {
310 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
349 390
350 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
351} 392}
352 393
353static mapcell * 394static mapcell *
354map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
355{ 396{
356 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
357} 398}
358 399
359static void 400static void
360map_clear (DC__Map self) 401map_clear (mapgrid *self)
361{ 402{
362 int r; 403 int r;
363 404
364 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
365 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
383 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
384 (cell)->player = 0; \ 425 (cell)->player = 0; \
385 } while (0) 426 } while (0)
386 427
387static void 428static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 430{
390 int x, y; 431 int x, y;
391 maprow *row; 432 maprow *row;
392 mapcell *cell; 433 mapcell *cell;
393 434
410 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
411 } 452 }
412 } 453 }
413} 454}
414 455
415typedef struct { 456struct smooth_key
457{
416 tileid tile; 458 tileid tile;
417 uint8_t x, y, level; 459 uint8_t x, y, level;
418} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
419 479
420static void 480static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 482{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
424 484
425 if (SvIOK (*sv)) 485 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
427 else 487 else
428 sv_setiv (*sv, bits); 488 it->second |= bits;
429} 489}
430 490
431static void 491static void
432music_finished (void) 492music_finished (void)
433{ 493{
450 ev.code = 1; 510 ev.code = 1;
451 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
452 ev.data2 = 0; 512 ev.data2 = 0;
453 513
454 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
455} 522}
456 523
457static unsigned int 524static unsigned int
458minpot (unsigned int n) 525minpot (unsigned int n)
459{ 526{
527 return 0; 594 return 0;
528 595
529 return 1; 596 return 1;
530} 597}
531 598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
532static void 613static void
533deliantra_main () 614deliantra_main (SV *real_main)
534{ 615{
535 char *argv[] = { 0 }; 616 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
537} 620}
538 621
539#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
540 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 626 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 627 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
545 */ 630 */
546 extern C_LINKAGE int 631 extern C_LINKAGE int
547 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
548 { 633 {
549 deliantra_main (); 634 deliantra_main (real_main);
550 } 635 }
551 636
552 #undef main 637 #undef main
553 638
554 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
555 640
556 static void 641 static void
557 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
558 { 643 {
644 real_main = real_main_;
645
559 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 647 (main) (1, argv);
561 } 648 }
562#else 649#else
563 static void 650 static void
564 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
565 { 652 {
566 deliantra_main (); 653 deliantra_main (real_main);
567 } 654 }
568#endif 655#endif
569 656
570MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
571 658
602 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
603 690
604 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
605 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
606 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
607 744
608 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
610 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
611 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
687 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
688 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
689 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
690 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
691 828
829 const_iv (KMOD_LRAM),
830
692 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
693 832
694 const_iv (SDL_INIT_TIMER), 833 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO), 834 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO), 835 const_iv (SDL_INIT_VIDEO),
720 859
721 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
722# undef const_iv 861# undef const_iv
723 }; 862 };
724 863
725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
727 866
728 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
729 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
730} 869}
731 870
747NV ceil (NV x) 886NV ceil (NV x)
748 887
749IV minpot (UV n) 888IV minpot (UV n)
750 889
751IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
752 897
753void 898void
754pango_init () 899pango_init ()
755 CODE: 900 CODE:
756{ 901{
764#endif 909#endif
765} 910}
766 911
767char *SDL_GetError () 912char *SDL_GetError ()
768 913
769void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
770 916
771int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
772 918
773int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
774 920
775void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
776 922
777void SDL_Quit () 923void SDL_Quit ()
778 924
779int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
780 927
781int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
782 CODE: 929 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
784 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
785 OUTPUT: 932 OUTPUT:
786 RETVAL 933 RETVAL
787 934
788void 935void
843 ); 990 );
844 991
845 if (RETVAL) 992 if (RETVAL)
846 { 993 {
847 av_clear (texture_av); 994 av_clear (texture_av);
848
849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
850#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
851#include "glfunc.h" 996#include "glfunc.h"
852#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
853 } 1000 }
854} 1001}
855 OUTPUT: 1002 OUTPUT:
856 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
857 1007
858void 1008void
859SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
860 1010
861char * 1011char *
862SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
863 1014
864int 1015int
865SDL_GetAppState () 1016SDL_GetAppState ()
866 1017
867int 1018int
868SDL_GetModState () 1019SDL_GetModState ()
869 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
870void 1025void
1026SDL_PumpEvents ()
1027
1028void
871poll_events () 1029peep_events ()
872 PPCODE: 1030 PPCODE:
873{ 1031{
874 SDL_Event ev; 1032 SDL_Event ev;
875 1033
876 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
883 { 1041 {
884 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
885 case SDL_KEYUP: 1043 case SDL_KEYUP:
886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891 break; 1049 break;
892 1050
893 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
912 x = ev.motion.x; 1070 x = ev.motion.x;
913 y = ev.motion.y; 1071 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 } 1073 }
916 1074
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
919 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
920 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
921 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
942 1100
943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
944 } 1102 }
945} 1103}
946 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
947int 1118int
948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
949 POSTCALL: 1120 POSTCALL:
950 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
951 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
952 1123
953void 1124void
954Mix_QuerySpec () 1125Mix_QuerySpec ()
1013add_font (char *file) 1184add_font (char *file)
1014 CODE: 1185 CODE:
1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT: 1187 OUTPUT:
1017 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1018 1196
1019void 1197void
1020load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1021 ALIAS: 1199 ALIAS:
1022 load_image_file = 1 1200 load_image_file = 1
1068 1246
1069 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1070 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1071 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1072 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1073 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1074 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1077 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1078 1256
1138#if DEBUG 1316#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1140#endif 1318#endif
1141} 1319}
1142 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1143MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1144 1329
1145PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1146 1331
1147DC::Font 1332DC::Font
1148new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1149 CODE: 1334 CODE:
1150{ 1335{
1151 int count; 1336 int count;
1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1153 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1182 PROTOTYPE: 1367 PROTOTYPE:
1183 CODE: 1368 CODE:
1184 tc_restore (); 1369 tc_restore ();
1185 1370
1186DC::Layout 1371DC::Layout
1187new (SV *class) 1372new (SV *klass)
1188 CODE: 1373 CODE:
1189 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1190 1375
1191 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1192 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1341 1526
1342void 1527void
1343set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1344 CODE: 1529 CODE:
1345 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1346 { 1531 {
1347 self->base_height = base_height; 1532 self->base_height = base_height;
1348 layout_update_font (self); 1533 layout_update_font (self);
1349 } 1534 }
1350 1535
1351void 1536void
1578 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1579 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1580 } 1765 }
1581} 1766}
1582 1767
1768void
1769draw_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)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1583IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584 CODE: 1890 CODE:
1585{ 1891{
1586 GLint width; 1892 GLint width;
1587 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1594MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1595 1901
1596PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1597 1903
1598DC::Map 1904DC::Map
1599new (SV *class) 1905new (SV *klass)
1600 CODE: 1906 CODE:
1601 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1602 RETVAL->x = 0; 1908 RETVAL->x = 0;
1603 RETVAL->y = 0; 1909 RETVAL->y = 0;
1604 RETVAL->w = 0; 1910 RETVAL->w = 0;
1605 RETVAL->h = 0; 1911 RETVAL->h = 0;
1606 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1643 1949
1644void 1950void
1645set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1646 CODE: 1952 CODE:
1647{ 1953{
1648 tileid texid; 1954 tileid texid;
1649 maptex *tex; 1955 maptex *tex;
1650 1956
1651 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1652 return; 1958 return;
1653 1959
1654 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1655 return; 1961 return;
1656 1962
1657 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1658 1964
1659 if (!texid) 1965 if (!texid)
1660 return; 1966 return;
1661 1967
1662 tex = self->tex + texid; 1968 tex = self->tex + texid;
1691 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1997 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1692 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695} 2001}
2002
2003void
2004expire_textures (DC::Map self, int texid, int count)
2005 PPCODE:
2006 for (; texid < self->texs && count; ++texid, --count)
2007 {
2008 maptex *tex = self->tex + texid;
2009
2010 if (tex->name)
2011 {
2012 if (tex->unused)
2013 {
2014 tex->name = 0;
2015 tex->unused = 0;
2016 XPUSHs (sv_2mortal (newSViv (texid)));
2017 }
2018 else
2019 tex->unused = 1;
2020 }
2021 }
1696 2022
1697int 2023int
1698ox (DC::Map self) 2024ox (DC::Map self)
1699 ALIAS: 2025 ALIAS:
1700 oy = 1 2026 oy = 1
1740 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1741 } 2067 }
1742} 2068}
1743 2069
1744SV * 2070SV *
1745map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1746 CODE: 2072 CODE:
1747{ 2073{
1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1749 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1750 mapcell *cell; 2076 mapcell *cell;
1771 2097
1772 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1773 2099
1774 if (flags & 8) 2100 if (flags & 8)
1775 { 2101 {
2102 uint8_t ext, cmd;
2103
1776 if (extmap) 2104 do
1777 { 2105 {
1778 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1779 2108
1780 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1781 { 2112 {
1782 ext = *data++;
1783 cmd = ext & 0x7f;
1784
1785 if (cmd < 4)
1786 cell->darkness = 255 - ext * 64 + 1;
1787 else if (cmd == 5) // health
1788 {
1789 cell->stat_width = 1; 2113 cell->stat_width = 1;
1790 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1791 }
1792 else if (cmd == 6) // monster width
1793 cell->stat_width = *data++ + 1;
1794 else if (cmd == 0x47)
1795 {
1796 if (*data == 1) cell->player = data [1];
1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1800
1801 data += *data + 1;
1802 }
1803 else if (cmd == 8) // cell flags
1804 cell->flags = *data++;
1805 else if (ext & 0x40) // unknown, multibyte => skip
1806 data += *data + 1;
1807 else
1808 data++;
1809 } 2115 }
1810 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
1811 } 2133 }
1812 else 2134 while (ext & 0x80);
1813 cell->darkness = *data++ + 1;
1814 } 2135 }
1815 2136
1816 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1817 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1818 { 2139 {
1821 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1822 2143
1823 if (cell->tile [z]) 2144 if (cell->tile [z])
1824 { 2145 {
1825 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1826 if (!tex->name) 2148 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1828 2150
1829 if (tex->smoothtile) 2151 if (tex->smoothtile)
1830 { 2152 {
1831 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1832 if (!smooth->name) 2155 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1834 } 2157 }
1835 } 2158 }
1836 } 2159 }
1864 ? self->row + y 2187 ? self->row + y
1865 : 0; 2188 : 0;
1866 2189
1867 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1868 { 2191 {
1869 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1870 2193
1871 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1872 { 2195 {
1873 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1874 2197
1876 { 2199 {
1877 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1878 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1879 int a1 = tex.a; 2202 int a1 = tex.a;
1880 2203
1881 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1882 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1883 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1884 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1885 } 2208 }
1886 } 2209 }
1887 2210
1888 *map++ = (r ) 2211 *map++ = (r )
1889 | (g << 8) 2212 | (g << 8)
1890 | (b << 16) 2213 | (b << 16)
1891 | (a << 24); 2214 | (a << 24);
1892 } 2215 }
1893 } 2216 }
1894 2217
1895 RETVAL = map_sv; 2218 RETVAL = map_sv;
1896} 2219}
1897 OUTPUT: 2220 OUTPUT:
1898 RETVAL 2221 RETVAL
1899 2222
1900void 2223void
1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1902 CODE: 2225 CODE:
1903{ 2226{
1904 int x, y, z; 2227 int x, y, z;
1905 2228
1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1909 smooth_key skey;
1910 int pl_x, pl_y; 2230 int pl_x, pl_y;
1911 maptex pl_tex; 2231 maptex pl_tex;
1912 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1913 rc_key_t key; 2234 rc_key_t key;
1914 rc_array_t *arr; 2235 rc_array_t *arr;
1915 2236
1916 pl_tex.name = 0; 2237 pl_tex.name = 0;
1917 2238
1918 // thats current max. sorry. 2239 // that's current max. sorry.
1919 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1921
1922 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey));
1924 2242
1925 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1926 key.r = 255; 2244 key.r = 255;
1927 key.g = 255; 2245 key.g = 255;
1928 key.b = 255; 2246 key.b = 255;
1929 key.a = 255; 2247 key.a = 255;
1930 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933 2250
1934 mx += self->x; 2251 mx += self->x;
1935 my += self->y; 2252 my += self->y;
1936 2253
1937 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1938 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1939 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1940 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1941 2258
1942 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1943 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1944 { 2261 {
1945 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962 2279
1963 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1964 { 2281 {
1965 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2285 key.texname = -1;
1966 2286
1967 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
1969 { 2289 {
1970 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
1976 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
1977 2297
1978 if (tile) 2298 if (tile)
1979 { 2299 {
1980 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w; 2301 int px, py;
1982 int py = (y + 1) * T - tex.h;
1983 2302
1984 if (key.texname != tex.name) 2303 if (key.texname != tex.name)
1985 { 2304 {
2305 self->tex [tile].unused = 0;
2306
1986 if (!tex.name) 2307 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988 2309
1989 key.texname = tex.name; 2310 key.texname = tex.name;
1990 arr = rc_array (rc, &key); 2311 arr = rc_array (rc, &key);
1991 } 2312 }
2313
2314 px = (x + 1) * Th - tex.w;
2315 py = (y + 1) * Tw - tex.h;
1992 2316
1993 if (expect_false (cell->player == player) && expect_false (z == 2)) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
1994 { 2318 {
1995 pl_x = px; 2319 pl_x = px;
1996 pl_y = py; 2320 pl_y = py;
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2326 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2327 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2328 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005 2329
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
2009 if (cell->flags & 1)
2010 {
2011 maptex tex = self->tex [1];
2012 int px = x * T + T * 2 / 32;
2013 int py = y * T - T * 6 / 32;
2014
2015 if (tex.name)
2016 {
2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2027 }
2028 }
2029 }
2030
2031 // update smooth hash 2330 // update smooth hash
2032 if (tex.smoothtile) 2331 if (tex.smoothtile)
2033 { 2332 {
2034 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
2036 2335
2037 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
2038 2337
2039 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
2040 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
2041 2340
2042 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2050 2349
2051 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2052 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2053 2352
2054 // full tile 2353 // full tile
2055 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2056 2355
2057 // borders 2356 // borders
2058 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2059 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2358 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2060 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2359 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2061 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2062 2361
2063 // corners 2362 // corners
2064 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2065 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2364 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2066 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2365 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2067 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2367 }
2368 }
2369
2370 if (expect_false (z == 2) && expect_false (cell->flags))
2371 {
2372 // overlays such as the speech bubble, probably more to come
2373 if (cell->flags & 1)
2374 {
2375 rc_key_t key_ov = key;
2376 maptex tex = self->tex [TEXID_SPEECH];
2377 rc_array_t *arr;
2378 int px = x * Tw + Tw * 2 / 32;
2379 int py = y * Th - Th * 6 / 32;
2380
2381 key_ov.texname = tex.name;
2382 arr = rc_array (rc_ov, &key_ov);
2383
2384 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2385 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2386 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2068 } 2388 }
2069 } 2389 }
2070 } 2390 }
2071 } 2391 }
2072 2392
2078 { 2398 {
2079 int w, b; 2399 int w, b;
2080 2400
2081 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2082 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2083 for (w = 0; w < 256 / 32; ++w) 2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2084 { 2406 {
2085 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2086 if (smask) 2408 IV bits = it->second;
2087 for (b = 0; b < 32; ++b) 2409
2088 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2089 { 2413 {
2090 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
2091 HE *he; 2422 if (tex.name)
2092
2093 hv_iterinit (smooth);
2094 while ((he = hv_iternext (smooth)))
2095 { 2423 {
2096 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2097 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2098 2426 if (key.texname != tex.name)
2099 if (!(bits & 0x1000)
2100 && skey->level == level
2101 && level > smooth_max [skey->x][skey->y])
2102 { 2427 {
2103 maptex tex = self->tex [skey->tile]; 2428 self->tex [skey.tile].unused = 0;
2104 int px = (((int)skey->x) - 1) * T;
2105 int py = (((int)skey->y) - 1) * T;
2106 int border = bits & 15;
2107 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2108 float dx = tex.s * .0625f; // 16 images/row
2109 float dy = tex.t * .5f ; // 2 images/column
2110 2429
2111 if (tex.name)
2112 {
2113 // this time avoiding texture state changes
2114 // save gobs of state changes.
2115 if (key.texname != tex.name)
2116 {
2117 glEnd (); 2430 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2120 } 2433 }
2121 2434
2122 if (border) 2435 if (border)
2123 { 2436 {
2124 float ox = border * dx; 2437 float ox = border * dx;
2125 2438
2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2130 } 2443 }
2131 2444
2132 if (corner) 2445 if (corner)
2133 { 2446 {
2134 float ox = corner * dx; 2447 float ox = corner * dx;
2135 2448
2136 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2140 }
2141 }
2142 } 2453 }
2143 } 2454 }
2144 } 2455 }
2145 } 2456 }
2146 2457
2147 glEnd (); 2458 glEnd ();
2148 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1; 2460 key.texname = -1;
2150 } 2461 }
2151
2152 hv_clear (smooth);
2153 } 2462 }
2154 2463
2155 if (pl_tex.name) 2464 if (pl_tex.name)
2156 { 2465 {
2157 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2476 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168 2477
2169 rc_draw (rc); 2478 rc_draw (rc);
2170 } 2479 }
2171 2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
2172 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2173 rc_free (rc); 2485 rc_free (rc);
2486 rc_free (rc_ov);
2174 2487
2175 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
2178 { 2491 {
2181 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
2182 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
2183 { 2496 {
2184 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
2185 2498
2186 int px = x * T; 2499 int px = x * Tw;
2187 int py = y * T; 2500 int py = y * Th;
2501
2502 if (expect_false (cell->player == player))
2503 {
2504 px += sdx;
2505 py += sdy;
2506 }
2188 2507
2189 if (cell->stat_hp) 2508 if (cell->stat_hp)
2190 { 2509 {
2191 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2193 2512
2194 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
2195 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
2196 px + width - 1, py); 2515 px + width - 1, py);
2197 2516
2203 } 2522 }
2204 } 2523 }
2205} 2524}
2206 2525
2207void 2526void
2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2527draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2209 CODE: 2528 CODE:
2210{ 2529{
2211 static float color[16][3] = { 2530 static float color[16][3] = {
2212 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
2213 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
2214 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
2215 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
2216 2535
2217 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
2218 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
2219 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
2220 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
2221 2540
2222 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
2223 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
2224 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
2225 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
2226 2545
2227 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
2228 2547
2229 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
2230 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
2231 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
2232 }; 2551 };
2233 2552
2234 int x, y; 2553 int x, y;
2235 2554
2236 glEnable (GL_TEXTURE_2D); 2555 glEnable (GL_TEXTURE_2D);
2556 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2557 * but the nvidia driver (185.18.14) mishandles alpha textures
2558 * and takes the colour from god knows where instead of using
2559 * Cp. MODULATE results in the same colour, but slightly different
2560 * alpha, but atcually gives us the correct colour with nvidia.
2561 */
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
2241 2566
2242 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
2246 2571
2247 if (m) 2572 if (m)
2248 { 2573 {
2249 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2250 2575
2251 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2252 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2253 2578
2254 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 } 2584 }
2267void 2592void
2268fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2593fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2269 PPCODE: 2594 PPCODE:
2270{ 2595{
2271 int x, y; 2596 int x, y;
2272 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2273 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2274 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2275 int sw34 = (sw * 3 + 3) & ~3; 2600 int sw3 = sw * 3;
2601 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2602 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2279 2605
2280 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2281 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2282 2608
2283 mx += self->x - 1; 2609 mx += self->x - 1;
2284 my += self->y - 1; 2610 my += self->y - 1;
2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287 2611
2288 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2289 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2290 { 2614 {
2291 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2294 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2295 { 2619 {
2296 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2297 2621
2298 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2299 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2300 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2301 } 2625 }
2302 } 2626 }
2303 2627
2304 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2324 2648
2325 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2328 2652
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2657 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2338 } 2662 }
2339 2663
2340 free (darkness1); 2664 free (darkness1);
2341 2665
2342 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2343 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2344 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2345 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2346} 2670}
2347 2671
2348SV * 2672SV *
2411 else 2735 else
2412 *data++ = 0; 2736 *data++ = 0;
2413 } 2737 }
2414 } 2738 }
2415 2739
2416 /* if size is w*h + 5 then no data has been found */ 2740 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 { 2742 {
2419 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 } 2745 }
2422 2746
2423 RETVAL = data_sv; 2747 RETVAL = data_sv;
2424} 2748}
2425 OUTPUT: 2749 OUTPUT:
2426 RETVAL 2750 RETVAL
2427 2751
2428void 2752void
2435 STRLEN len; 2759 STRLEN len;
2436 uint8_t *data, *end; 2760 uint8_t *data, *end;
2437 2761
2438 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2441 end = data + len + 8; 2765 end = data + len + 8;
2442 2766
2443 if (len < 5) 2767 if (len < 5)
2444 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2445 2769
2506} 2830}
2507 2831
2508MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2509 2833
2510DC::RW 2834DC::RW
2511new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2512 CODE: 2836 CODE:
2513{ 2837{
2514 STRLEN datalen; 2838 STRLEN datalen;
2515 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2516 2840
2518} 2842}
2519 OUTPUT: 2843 OUTPUT:
2520 RETVAL 2844 RETVAL
2521 2845
2522DC::RW 2846DC::RW
2523new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2524 CODE: 2848 CODE:
2525 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2526 OUTPUT: 2850 OUTPUT:
2527 RETVAL 2851 RETVAL
2528 2852
2546 if (RETVAL < 0) 2870 if (RETVAL < 0)
2547 { 2871 {
2548 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2549 2873
2550 if (RETVAL < 0) 2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2551 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2552 2881 }
2882 else
2553 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2554 } 2884 }
2555 2885
2556 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2558} 2888}
2605void 2935void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE: 2937 CODE:
2608{ 2938{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2939 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2940 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612} 2942}
2613 2943
2614void 2944void
2615set_reverse_stereo (DC::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2618 2948
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620 2950
2621PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2622 2952
2953void
2954decoders ()
2955 PPCODE:
2956#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2957 int i, num = Mix_GetNumChunkDecoders ();
2958 EXTEND (SP, num);
2959 for (i = 0; i < num; ++i)
2960 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2961#else
2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2963#endif
2964
2623DC::MixChunk 2965DC::MixChunk
2624new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2625 CODE: 2967 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2627 OUTPUT: 2969 OUTPUT:
2628 RETVAL 2970 RETVAL
2629 2971
2659 OUTPUT: 3001 OUTPUT:
2660 RETVAL 3002 RETVAL
2661 3003
2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2663 3005
3006void
3007decoders ()
3008 PPCODE:
3009#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3010 int i, num = Mix_GetNumMusicDecoders ();
3011 EXTEND (SP, num);
3012 for (i = 0; i < num; ++i)
3013 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3014#else
3015 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3016#endif
3017
2664int 3018int
2665volume (int volume = -1) 3019volume (int volume = -1)
2666 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2667 CODE: 3021 CODE:
2668 if (items > 0) 3022 if (items > 0)
2679void 3033void
2680halt () 3034halt ()
2681 CODE: 3035 CODE:
2682 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2683 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2684DC::MixMusic 3045DC::MixMusic
2685new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
2686 CODE: 3047 CODE:
2687 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2688 OUTPUT: 3049 OUTPUT:
2689 RETVAL 3050 RETVAL
2690 3051
2718 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2719# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2723 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2724 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2725 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2726 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2727 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2739 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2740 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2741 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2742 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2743 const_iv (GL_ONE_MINUS_DST_ALPHA), 3105 const_iv (GL_ONE_MINUS_DST_ALPHA),
3106 const_iv (GL_SRC_COLOR),
3107 const_iv (GL_DST_COLOR),
3108 const_iv (GL_ONE_MINUS_SRC_COLOR),
3109 const_iv (GL_ONE_MINUS_DST_COLOR),
2744 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2745 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2746 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2747 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2748 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2816 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2817 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2818 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2820 const_iv (GL_T2F_N3F_V3F), 3186 const_iv (GL_T2F_N3F_V3F),
3187 const_iv (GL_FUNC_ADD),
3188 const_iv (GL_FUNC_SUBTRACT),
3189 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2821# undef const_iv 3190# undef const_iv
2822 }; 3191 };
2823 3192
2824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3193 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2826 3195
2827 texture_av = newAV (); 3196 texture_av = newAV ();
2828 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2829} 3198}
2830 3199
2832disable_GL_EXT_blend_func_separate () 3201disable_GL_EXT_blend_func_separate ()
2833 CODE: 3202 CODE:
2834 gl.BlendFuncSeparate = 0; 3203 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
2836 3205
2837char * 3206void
3207apple_nvidia_bug (int enable)
3208
3209const char *
2838gl_vendor () 3210gl_vendor ()
2839 CODE: 3211 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2841 OUTPUT: 3213 OUTPUT:
2842 RETVAL 3214 RETVAL
2843 3215
2844char * 3216const char *
2845gl_version () 3217gl_version ()
2846 CODE: 3218 CODE:
2847 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2848 OUTPUT: 3220 OUTPUT:
2849 RETVAL 3221 RETVAL
2850 3222
2851char * 3223const char *
2852gl_extensions () 3224gl_extensions ()
2853 CODE: 3225 CODE:
2854 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2855 OUTPUT: 3227 OUTPUT:
2856 RETVAL 3228 RETVAL
2857 3229
2858const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2859 3235
2860GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2861 CODE: 3237 CODE:
2862 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2863 OUTPUT: 3239 OUTPUT:
2871 3247
2872int glGetError () 3248int glGetError ()
2873 3249
2874void glFinish () 3250void glFinish ()
2875 3251
3252void glFlush ()
3253
2876void glClear (int mask) 3254void glClear (int mask)
2877 3255
2878void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2879 PROTOTYPE: @ 3257 PROTOTYPE: @
2880 3258
2889void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2890 3268
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE: 3270 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
2894 3274
2895void glDepthMask (int flag) 3275void glDepthMask (int flag)
2896 3276
2897void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2898 3278
2933void glRotate (float angle, float x, float y, float z) 3313void glRotate (float angle, float x, float y, float z)
2934 CODE: 3314 CODE:
2935 glRotatef (angle, x, y, z); 3315 glRotatef (angle, x, y, z);
2936 3316
2937void glColor (float r, float g, float b, float a = 1.0) 3317void glColor (float r, float g, float b, float a = 1.0)
3318 PROTOTYPE: @
2938 ALIAS: 3319 ALIAS:
2939 glColor_premultiply = 1 3320 glColor_premultiply = 1
2940 CODE: 3321 CODE:
2941 if (ix) 3322 if (ix)
2942 { 3323 {
3048 3429
3049void glEndList () 3430void glEndList ()
3050 3431
3051void glCallList (int list) 3432void glCallList (int list)
3052 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054 3440
3055PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
3056 3442
3057void 3443void
3058find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3059 PPCODE: 3445 PPCODE:
3060{ 3446{
3061 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3062 XPUSHs (self); 3448 XPUSHs (self);
3063} 3449}
3064 3450
3065BOOT: 3451BOOT:
3066{ 3452{
3074 3460
3075void 3461void
3076draw (SV *self) 3462draw (SV *self)
3077 CODE: 3463 CODE:
3078{ 3464{
3079 HV *hv; 3465 HV *hv;
3080 SV **svp; 3466 SV **svp;
3081 NV x, y, w, h; 3467 NV x, y, w, h;
3082 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3083 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3084 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3085 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines