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.266 by root, Sun Jul 20 02:51:40 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>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
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);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
78 89
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 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 */
81#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
82 96
83#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
85 99
86#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
87 101
88/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
89#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}
90 128
91static AV *texture_av; 129static AV *texture_av;
92 130
93static struct 131static struct
94{ 132{
151{ 189{
152 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
153 191
154 while (attrs) 192 while (attrs)
155 { 193 {
156 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 195
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 197 return 1;
160 198
161 attrs = attrs->next; 199 attrs = attrs->next;
162 } 200 }
163 201
164 return 0; 202 return 0;
165} 203}
166 204
167typedef struct cf_layout { 205struct cf_layout {
168 PangoLayout *pl; 206 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
170 int base_height; 208 int base_height;
171 DC__Font font; 209 DC__Font font;
172 rc_t *rc; 210 rc_t *rc;
173} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
174 214
175static DC__Font default_font; 215static DC__Font default_font;
176static PangoContext *opengl_context; 216static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
178 218
179static void 219static void
180substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
181{ 221{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 225#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 227}
188 228
189static void 229static void
219} 259}
220 260
221typedef uint16_t tileid; 261typedef uint16_t tileid;
222typedef uint16_t faceid; 262typedef uint16_t faceid;
223 263
224typedef struct { 264struct maptex
265{
225 GLuint name; 266 GLuint name;
226 int w, h; 267 int w, h;
227 float s, t; 268 float s, t;
228 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
229 tileid smoothtile; 270 tileid smoothtile;
230 uint8_t smoothlevel; 271 uint8_t smoothlevel;
231} maptex; 272 uint8_t unused; /* set to zero on use */
273};
232 274
233typedef struct { 275struct mapcell
276{
234 uint32_t player; 277 uint32_t player;
235 tileid tile[3]; 278 tileid tile[3];
236 uint16_t darkness; 279 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 281};
239 282
240typedef struct { 283struct maprow
284{
241 int32_t c0, c1; 285 int32_t c0, c1;
242 mapcell *col; 286 mapcell *col;
243} maprow; 287};
244 288
245typedef struct map { 289struct mapgrid {
246 int x, y, w, h; 290 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
250 294
251 int32_t rows; 295 int32_t rows;
252 maprow *row; 296 maprow *row;
253} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
254 300
255static char * 301static char *
256prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
257{ 303{
258 char *p; 304 char *p;
276 322
277#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))
278#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))
279 325
280static void 326static void
281need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
282{ 328{
283 while (self->faces <= face) 329 while (self->faces <= face)
284 { 330 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 332 self->faces *= 2;
287 } 333 }
288} 334}
289 335
290static void 336static void
291need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
292{ 338{
293 while (self->texs <= texid) 339 while (self->texs <= texid)
294 { 340 {
295 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
296 self->texs *= 2; 342 self->texs *= 2;
297 } 343 }
298} 344}
299 345
300static maprow * 346static maprow *
301map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
302{ 348{
303 if (0 > y) 349 if (0 > y)
304 { 350 {
305 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
344 390
345 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
346} 392}
347 393
348static mapcell * 394static mapcell *
349map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
350{ 396{
351 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
352} 398}
353 399
354static void 400static void
355map_clear (DC__Map self) 401map_clear (mapgrid *self)
356{ 402{
357 int r; 403 int r;
358 404
359 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
367 self->oy = 0; 413 self->oy = 0;
368 self->row = 0; 414 self->row = 0;
369 self->rows = 0; 415 self->rows = 0;
370} 416}
371 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
372static void 428static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
374{ 430{
375 int x, y; 431 int x, y;
376 maprow *row; 432 maprow *row;
377 mapcell *cell; 433 mapcell *cell;
378 434
390 if (x >= row->c1) 446 if (x >= row->c1)
391 break; 447 break;
392 448
393 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
394 450
395 cell->darkness = 0; 451 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 452 }
400 } 453 }
401} 454}
402 455
403typedef struct { 456struct smooth_key
457{
404 tileid tile; 458 tileid tile;
405 uint8_t x, y, level; 459 uint8_t x, y, level;
406} 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}
407 479
408static void 480static void
409smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
410{ 482{
411 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
412 484
413 if (SvIOK (*sv)) 485 if (it == h.end ())
414 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
415 else 487 else
416 sv_setiv (*sv, bits); 488 it->second |= bits;
417} 489}
418 490
419static void 491static void
420music_finished (void) 492music_finished (void)
421{ 493{
438 ev.code = 1; 510 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 512 ev.data2 = 0;
441 513
442 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;
443} 522}
444 523
445static unsigned int 524static unsigned int
446minpot (unsigned int n) 525minpot (unsigned int n)
447{ 526{
514 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
515 return 0; 594 return 0;
516 595
517 return 1; 596 return 1;
518} 597}
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
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
519 656
520MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
521 658
522PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
523 660
552 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
553 690
554 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
556 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),
557 744
558 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
637 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
641 828
829 const_iv (KMOD_LRAM),
830
642 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
643 832
644 const_iv (SDL_INIT_TIMER), 833 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 834 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 835 const_iv (SDL_INIT_VIDEO),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 854 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 857 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
670# undef const_iv 861# undef const_iv
671 }; 862 };
672 863
673 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--)
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675 866
676 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678} 869}
679 870
695NV ceil (NV x) 886NV ceil (NV x)
696 887
697IV minpot (UV n) 888IV minpot (UV n)
698 889
699IV 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
700 897
701void 898void
702pango_init () 899pango_init ()
703 CODE: 900 CODE:
704{ 901{
712#endif 909#endif
713} 910}
714 911
715char *SDL_GetError () 912char *SDL_GetError ()
716 913
914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
916
717int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
718 918
719int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
720 920
721void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
722 922
723void SDL_Quit () 923void SDL_Quit ()
724 924
725int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
726 927
727int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
728 CODE: 929 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
730 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
731 OUTPUT: 932 OUTPUT:
732 RETVAL 933 RETVAL
733 934
734void 935void
789 ); 990 );
790 991
791 if (RETVAL) 992 if (RETVAL)
792 { 993 {
793 av_clear (texture_av); 994 av_clear (texture_av);
794
795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
796#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);
797#include "glfunc.h" 996#include "glfunc.h"
798#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
799 } 1000 }
800} 1001}
801 OUTPUT: 1002 OUTPUT:
802 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
803 1007
804void 1008void
805SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
806 1010
807char * 1011char *
808SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
809 1014
810int 1015int
811SDL_GetAppState () 1016SDL_GetAppState ()
812 1017
813int 1018int
814SDL_GetModState () 1019SDL_GetModState ()
815 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
816void 1025void
1026SDL_PumpEvents ()
1027
1028void
817poll_events () 1029peep_events ()
818 PPCODE: 1030 PPCODE:
819{ 1031{
820 SDL_Event ev; 1032 SDL_Event ev;
821 1033
822 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
829 { 1041 {
830 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
831 case SDL_KEYUP: 1043 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
834 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);
835 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 */
836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 1049 break;
838 1050
839 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
858 x = ev.motion.x; 1070 x = ev.motion.x;
859 y = ev.motion.y; 1071 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 1073 }
862 1074
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
888 1100
889 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))));
890 } 1102 }
891} 1103}
892 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
893int 1118int
894Mix_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)
895 POSTCALL: 1120 POSTCALL:
896 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
897 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
898 1123
899void 1124void
900Mix_QuerySpec () 1125Mix_QuerySpec ()
959add_font (char *file) 1184add_font (char *file)
960 CODE: 1185 CODE:
961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT: 1187 OUTPUT:
963 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)
964 1196
965void 1197void
966load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
967 ALIAS: 1199 ALIAS:
968 load_image_file = 1 1200 load_image_file = 1
1014 1246
1015 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1016 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1017 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1018 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1019 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1020 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)));
1021 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1022 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1023 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1024 1256
1084#if DEBUG 1316#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1086#endif 1318#endif
1087} 1319}
1088 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1329
1091PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1092 1331
1093DC::Font 1332DC::Font
1094new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1095 CODE: 1334 CODE:
1096{ 1335{
1097 int count; 1336 int count;
1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1099 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1128 PROTOTYPE: 1367 PROTOTYPE:
1129 CODE: 1368 CODE:
1130 tc_restore (); 1369 tc_restore ();
1131 1370
1132DC::Layout 1371DC::Layout
1133new (SV *class) 1372new (SV *klass)
1134 CODE: 1373 CODE:
1135 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1136 1375
1137 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1138 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1287 1526
1288void 1527void
1289set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1290 CODE: 1529 CODE:
1291 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1292 { 1531 {
1293 self->base_height = base_height; 1532 self->base_height = base_height;
1294 layout_update_font (self); 1533 layout_update_font (self);
1295 } 1534 }
1296 1535
1297void 1536void
1524 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1526 } 1765 }
1527} 1766}
1528 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
1529IV 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)
1530 CODE: 1890 CODE:
1531{ 1891{
1532 GLint width; 1892 GLint width;
1533 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);
1540MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1541 1901
1542PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1543 1903
1544DC::Map 1904DC::Map
1545new (SV *class) 1905new (SV *klass)
1546 CODE: 1906 CODE:
1547 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1548 RETVAL->x = 0; 1908 RETVAL->x = 0;
1549 RETVAL->y = 0; 1909 RETVAL->y = 0;
1550 RETVAL->w = 0; 1910 RETVAL->w = 0;
1551 RETVAL->h = 0; 1911 RETVAL->h = 0;
1552 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1589 1949
1590void 1950void
1591set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1592 CODE: 1952 CODE:
1593{ 1953{
1594 tileid texid; 1954 tileid texid;
1595 maptex *tex; 1955 maptex *tex;
1596 1956
1597 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1598 return; 1958 return;
1599 1959
1600 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1601 return; 1961 return;
1602 1962
1603 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1604 1964
1605 if (!texid) 1965 if (!texid)
1606 return; 1966 return;
1607 1967
1608 tex = self->tex + texid; 1968 tex = self->tex + texid;
1637 //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);
1638 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 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 }
1642 2022
1643int 2023int
1644ox (DC::Map self) 2024ox (DC::Map self)
1645 ALIAS: 2025 ALIAS:
1646 oy = 1 2026 oy = 1
1686 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1687 } 2067 }
1688} 2068}
1689 2069
1690SV * 2070SV *
1691map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1692 CODE: 2072 CODE:
1693{ 2073{
1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1695 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1696 mapcell *cell; 2076 mapcell *cell;
1717 2097
1718 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1719 2099
1720 if (flags & 8) 2100 if (flags & 8)
1721 { 2101 {
2102 uint8_t ext, cmd;
2103
1722 if (extmap) 2104 do
1723 { 2105 {
1724 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1725 2108
1726 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
1727 { 2112 {
1728 ext = *data++;
1729 cmd = ext & 0x7f;
1730
1731 if (cmd < 4)
1732 cell->darkness = 255 - ext * 64 + 1;
1733 else if (cmd == 5) // health
1734 {
1735 cell->stat_width = 1; 2113 cell->stat_width = 1;
1736 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1737 }
1738 else if (cmd == 6) // monster width
1739 cell->stat_width = *data++ + 1;
1740 else if (cmd == 0x47)
1741 {
1742 if (*data == 1) cell->player = data [1];
1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1746
1747 data += *data + 1;
1748 }
1749 else if (cmd == 8) // cell flags
1750 cell->flags = *data++;
1751 else if (ext & 0x40) // unknown, multibyte => skip
1752 data += *data + 1;
1753 else
1754 data++;
1755 } 2115 }
1756 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++;
1757 } 2133 }
1758 else 2134 while (ext & 0x80);
1759 cell->darkness = *data++ + 1;
1760 } 2135 }
1761 2136
1762 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1763 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1764 { 2139 {
1767 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1768 2143
1769 if (cell->tile [z]) 2144 if (cell->tile [z])
1770 { 2145 {
1771 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1772 if (!tex->name) 2148 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1774 2150
1775 if (tex->smoothtile) 2151 if (tex->smoothtile)
1776 { 2152 {
1777 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1778 if (!smooth->name) 2155 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1780 } 2157 }
1781 } 2158 }
1782 } 2159 }
1783 } 2160 }
1784 else 2161 else
1785 { 2162 CELL_CLEAR (cell);
1786 cell->darkness = 0;
1787 cell->stat_hp = 0;
1788 cell->flags = 0;
1789 cell->player = 0;
1790 }
1791 } 2163 }
1792} 2164}
1793 OUTPUT: 2165 OUTPUT:
1794 RETVAL 2166 RETVAL
1795 2167
1815 ? self->row + y 2187 ? self->row + y
1816 : 0; 2188 : 0;
1817 2189
1818 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1819 { 2191 {
1820 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1821 2193
1822 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1823 { 2195 {
1824 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1825 2197
1827 { 2199 {
1828 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1829 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1830 int a1 = tex.a; 2202 int a1 = tex.a;
1831 2203
1832 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1833 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1834 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1835 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1836 } 2208 }
1837 } 2209 }
1838 2210
1839 *map++ = (r ) 2211 *map++ = (r )
1840 | (g << 8) 2212 | (g << 8)
1841 | (b << 16) 2213 | (b << 16)
1842 | (a << 24); 2214 | (a << 24);
1843 } 2215 }
1844 } 2216 }
1845 2217
1846 RETVAL = map_sv; 2218 RETVAL = map_sv;
1847} 2219}
1848 OUTPUT: 2220 OUTPUT:
1849 RETVAL 2221 RETVAL
1850 2222
1851void 2223void
1852draw (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)
1853 CODE: 2225 CODE:
1854{ 2226{
1855 int x, y, z; 2227 int x, y, z;
1856 2228
1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1858 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1859 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!
1860 smooth_key skey;
1861 int pl_x, pl_y; 2230 int pl_x, pl_y;
1862 maptex pl_tex; 2231 maptex pl_tex;
1863 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1864 rc_key_t key; 2234 rc_key_t key;
1865 rc_array_t *arr; 2235 rc_array_t *arr;
1866 2236
1867 pl_tex.name = 0; 2237 pl_tex.name = 0;
1868 2238
1869 // thats current max. sorry. 2239 // that's current max. sorry.
1870 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1871 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1872
1873 // clear key, in case of extra padding
1874 memset (&skey, 0, sizeof (skey));
1875 2242
1876 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1877 key.r = 255; 2244 key.r = 255;
1878 key.g = 255; 2245 key.g = 255;
1879 key.b = 255; 2246 key.b = 255;
1880 key.a = 255; 2247 key.a = 255;
1881 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1882 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
1883 key.texname = -1;
1884 2250
1885 mx += self->x; 2251 mx += self->x;
1886 my += self->y; 2252 my += self->y;
1887 2253
1888 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1889 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1890 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1891 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1892 2258
1893 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1894 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1895 { 2261 {
1896 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1913 2279
1914 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1915 { 2281 {
1916 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;
1917 2286
1918 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
1919 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
1920 { 2289 {
1921 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
1927 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
1928 2297
1929 if (tile) 2298 if (tile)
1930 { 2299 {
1931 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
1932 int px = (x + 1) * T - tex.w; 2301 int px, py;
1933 int py = (y + 1) * T - tex.h;
1934 2302
1935 if (key.texname != tex.name) 2303 if (key.texname != tex.name)
1936 { 2304 {
2305 self->tex [tile].unused = 0;
2306
1937 if (!tex.name) 2307 if (!tex.name)
1938 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1939 2309
1940 key.texname = tex.name; 2310 key.texname = tex.name;
1941 arr = rc_array (rc, &key); 2311 arr = rc_array (rc, &key);
1942 } 2312 }
2313
2314 px = (x + 1) * Th - tex.w;
2315 py = (y + 1) * Tw - tex.h;
1943 2316
1944 if (expect_false (cell->player == player) && expect_false (z == 2)) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
1945 { 2318 {
1946 pl_x = px; 2319 pl_x = px;
1947 pl_y = py; 2320 pl_y = py;
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 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);
1954 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);
1955 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);
1956 2329
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1960 if (cell->flags & 1)
1961 {
1962 maptex tex = self->tex [1];
1963 int px = x * T + T * 2 / 32;
1964 int py = y * T - T * 6 / 32;
1965
1966 if (tex.name)
1967 {
1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978 }
1979 }
1980 }
1981
1982 // update smooth hash 2330 // update smooth hash
1983 if (tex.smoothtile) 2331 if (tex.smoothtile)
1984 { 2332 {
1985 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
1986 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
1987 2335
1988 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
1989 2337
1990 // 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
1991 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
1992 2340
1993 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2001 2349
2002 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2003 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2004 2352
2005 // full tile 2353 // full tile
2006 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);
2007 2355
2008 // borders 2356 // borders
2009 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);
2010 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);
2011 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);
2012 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);
2013 2361
2014 // corners 2362 // corners
2015 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);
2016 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);
2017 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);
2018 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);
2019 } 2388 }
2020 } 2389 }
2021 } 2390 }
2022 } 2391 }
2023 2392
2029 { 2398 {
2030 int w, b; 2399 int w, b;
2031 2400
2032 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2034 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)
2035 { 2406 {
2036 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2037 if (smask) 2408 IV bits = it->second;
2038 for (b = 0; b < 32; ++b) 2409
2039 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2040 { 2413 {
2041 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
2042 HE *he; 2422 if (tex.name)
2043
2044 hv_iterinit (smooth);
2045 while ((he = hv_iternext (smooth)))
2046 { 2423 {
2047 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2048 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2049 2426 if (key.texname != tex.name)
2050 if (!(bits & 0x1000)
2051 && skey->level == level
2052 && level > smooth_max [skey->x][skey->y])
2053 { 2427 {
2054 maptex tex = self->tex [skey->tile]; 2428 self->tex [skey.tile].unused = 0;
2055 int px = (((int)skey->x) - 1) * T;
2056 int py = (((int)skey->y) - 1) * T;
2057 int border = bits & 15;
2058 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2059 float dx = tex.s * .0625f; // 16 images/row
2060 float dy = tex.t * .5f ; // 2 images/column
2061 2429
2062 if (tex.name)
2063 {
2064 // this time avoiding texture state changes
2065 // save gobs of state changes.
2066 if (key.texname != tex.name)
2067 {
2068 glEnd (); 2430 glEnd ();
2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2070 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2071 } 2433 }
2072 2434
2073 if (border) 2435 if (border)
2074 { 2436 {
2075 float ox = border * dx; 2437 float ox = border * dx;
2076 2438
2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2081 } 2443 }
2082 2444
2083 if (corner) 2445 if (corner)
2084 { 2446 {
2085 float ox = corner * dx; 2447 float ox = corner * dx;
2086 2448
2087 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2091 }
2092 }
2093 } 2453 }
2094 } 2454 }
2095 } 2455 }
2096 } 2456 }
2097 2457
2098 glEnd (); 2458 glEnd ();
2099 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1; 2460 key.texname = -1;
2101 } 2461 }
2102
2103 hv_clear (smooth);
2104 } 2462 }
2105 2463
2106 if (pl_tex.name) 2464 if (pl_tex.name)
2107 { 2465 {
2108 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2118 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);
2119 2477
2120 rc_draw (rc); 2478 rc_draw (rc);
2121 } 2479 }
2122 2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
2123 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2124 rc_free (rc); 2485 rc_free (rc);
2486 rc_free (rc_ov);
2125 2487
2126 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
2127 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
2128 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
2129 { 2491 {
2132 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
2133 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
2134 { 2496 {
2135 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
2136 2498
2137 int px = x * T; 2499 int px = x * Tw;
2138 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 }
2139 2507
2140 if (cell->stat_hp) 2508 if (cell->stat_hp)
2141 { 2509 {
2142 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
2143 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2144 2512
2145 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
2146 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
2147 px + width - 1, py); 2515 px + width - 1, py);
2148 2516
2154 } 2522 }
2155 } 2523 }
2156} 2524}
2157 2525
2158void 2526void
2159draw_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)
2160 CODE: 2528 CODE:
2161{ 2529{
2162 static float color[16][3] = { 2530 static float color[16][3] = {
2163 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
2164 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
2165 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
2166 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
2167 2535
2168 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
2169 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
2170 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
2171 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
2172 2540
2173 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
2174 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
2175 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
2176 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
2177 2545
2178 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
2179 2547
2180 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
2181 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
2182 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
2183 }; 2551 };
2184 2552
2185 int x, y; 2553 int x, y;
2186 2554
2187 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 */
2188 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2189 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
2192 2566
2193 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
2197 2571
2198 if (m) 2572 if (m)
2199 { 2573 {
2200 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2201 2575
2202 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2203 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2204 2578
2205 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2206 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2207 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2208 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2209 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2210 } 2584 }
2218void 2592void
2219fow_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)
2220 PPCODE: 2594 PPCODE:
2221{ 2595{
2222 int x, y; 2596 int x, y;
2223 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2224 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2225 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2226 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);
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2230 2605
2231 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2232 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2233 2608
2234 mx += self->x - 1; 2609 mx += self->x - 1;
2235 my += self->y - 1; 2610 my += self->y - 1;
2236
2237 memset (darkness1, 255, sw1 * sh1);
2238 2611
2239 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2240 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2241 { 2614 {
2242 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2245 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2246 { 2619 {
2247 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2248 2621
2249 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2250 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2251 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2252 } 2625 }
2253 } 2626 }
2254 2627
2255 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2275 2648
2276 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2279 2652
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2284 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 */
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2289 } 2662 }
2290 2663
2291 free (darkness1); 2664 free (darkness1);
2292 2665
2293 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2294 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2295 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2296 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2297} 2670}
2298 2671
2299SV * 2672SV *
2362 else 2735 else
2363 *data++ = 0; 2736 *data++ = 0;
2364 } 2737 }
2365 } 2738 }
2366 2739
2367 /* 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 */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 { 2742 {
2370 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 } 2745 }
2373 2746
2374 RETVAL = data_sv; 2747 RETVAL = data_sv;
2375} 2748}
2376 OUTPUT: 2749 OUTPUT:
2377 RETVAL 2750 RETVAL
2378 2751
2379void 2752void
2386 STRLEN len; 2759 STRLEN len;
2387 uint8_t *data, *end; 2760 uint8_t *data, *end;
2388 2761
2389 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2392 end = data + len + 8; 2765 end = data + len + 8;
2393 2766
2394 if (len < 5) 2767 if (len < 5)
2395 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2396 2769
2457} 2830}
2458 2831
2459MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2460 2833
2461DC::RW 2834DC::RW
2462new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2463 CODE: 2836 CODE:
2464{ 2837{
2465 STRLEN datalen; 2838 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2467 2840
2469} 2842}
2470 OUTPUT: 2843 OUTPUT:
2471 RETVAL 2844 RETVAL
2472 2845
2473DC::RW 2846DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2475 CODE: 2848 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT: 2850 OUTPUT:
2478 RETVAL 2851 RETVAL
2479 2852
2497 if (RETVAL < 0) 2870 if (RETVAL < 0)
2498 { 2871 {
2499 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2500 2873
2501 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)
2502 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2503 2881 }
2882 else
2504 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2505 } 2884 }
2506 2885
2507 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2509} 2888}
2556void 2935void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE: 2937 CODE:
2559{ 2938{
2560 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));
2561 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;
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563} 2942}
2564 2943
2565void 2944void
2566set_reverse_stereo (DC::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2569 2948
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571 2950
2572PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2573 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
2574DC::MixChunk 2965DC::MixChunk
2575new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2576 CODE: 2967 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT: 2969 OUTPUT:
2579 RETVAL 2970 RETVAL
2580 2971
2610 OUTPUT: 3001 OUTPUT:
2611 RETVAL 3002 RETVAL
2612 3003
2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2614 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
2615int 3018int
2616volume (int volume = -1) 3019volume (int volume = -1)
2617 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2618 CODE: 3021 CODE:
2619 if (items > 0) 3022 if (items > 0)
2630void 3033void
2631halt () 3034halt ()
2632 CODE: 3035 CODE:
2633 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2634 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2635DC::MixMusic 3045DC::MixMusic
2636new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
2637 CODE: 3047 CODE:
2638 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2639 OUTPUT: 3049 OUTPUT:
2640 RETVAL 3050 RETVAL
2641 3051
2669 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2670# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2674 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2675 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2676 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2677 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2678 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2690 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2691 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2692 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2693 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2694 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),
2695 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2696 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2697 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2698 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2699 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2767 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2768 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2769 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2770 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2771 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),
2772# undef const_iv 3190# undef const_iv
2773 }; 3191 };
2774 3192
2775 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--)
2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2777 3195
2778 texture_av = newAV (); 3196 texture_av = newAV ();
2779 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2780} 3198}
2781 3199
2783disable_GL_EXT_blend_func_separate () 3201disable_GL_EXT_blend_func_separate ()
2784 CODE: 3202 CODE:
2785 gl.BlendFuncSeparate = 0; 3203 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
2787 3205
2788char * 3206void
3207apple_nvidia_bug (int enable)
3208
3209const char *
2789gl_vendor () 3210gl_vendor ()
2790 CODE: 3211 CODE:
2791 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2792 OUTPUT: 3213 OUTPUT:
2793 RETVAL 3214 RETVAL
2794 3215
2795char * 3216const char *
2796gl_version () 3217gl_version ()
2797 CODE: 3218 CODE:
2798 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2799 OUTPUT: 3220 OUTPUT:
2800 RETVAL 3221 RETVAL
2801 3222
2802char * 3223const char *
2803gl_extensions () 3224gl_extensions ()
2804 CODE: 3225 CODE:
2805 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2806 OUTPUT: 3227 OUTPUT:
2807 RETVAL 3228 RETVAL
2808 3229
2809const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2810 3235
2811GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2812 CODE: 3237 CODE:
2813 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2814 OUTPUT: 3239 OUTPUT:
2822 3247
2823int glGetError () 3248int glGetError ()
2824 3249
2825void glFinish () 3250void glFinish ()
2826 3251
3252void glFlush ()
3253
2827void glClear (int mask) 3254void glClear (int mask)
2828 3255
2829void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2830 PROTOTYPE: @ 3257 PROTOTYPE: @
2831 3258
2840void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2841 3268
2842void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2843 CODE: 3270 CODE:
2844 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
2845 3274
2846void glDepthMask (int flag) 3275void glDepthMask (int flag)
2847 3276
2848void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2849 3278
2884void glRotate (float angle, float x, float y, float z) 3313void glRotate (float angle, float x, float y, float z)
2885 CODE: 3314 CODE:
2886 glRotatef (angle, x, y, z); 3315 glRotatef (angle, x, y, z);
2887 3316
2888void 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: @
2889 ALIAS: 3319 ALIAS:
2890 glColor_premultiply = 1 3320 glColor_premultiply = 1
2891 CODE: 3321 CODE:
2892 if (ix) 3322 if (ix)
2893 { 3323 {
2999 3429
3000void glEndList () 3430void glEndList ()
3001 3431
3002void glCallList (int list) 3432void glCallList (int list)
3003 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005 3440
3006PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
3007 3442
3008void 3443void
3009find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3010 PPCODE: 3445 PPCODE:
3011{ 3446{
3012 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3013 XPUSHs (self); 3448 XPUSHs (self);
3014} 3449}
3015 3450
3016BOOT: 3451BOOT:
3017{ 3452{
3025 3460
3026void 3461void
3027draw (SV *self) 3462draw (SV *self)
3028 CODE: 3463 CODE:
3029{ 3464{
3030 HV *hv; 3465 HV *hv;
3031 SV **svp; 3466 SV **svp;
3032 NV x, y, w, h; 3467 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3036 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