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.270 by root, Sun Jul 20 15:05:13 2008 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 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>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
52#endif
53
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#include <pango/pango.h> 59#include <pango/pango.h>
50 60
51#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
78 88
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
82 95
83#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
85 98
86#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
87 100
88/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
103
104#define KMOD_LRAM 0x10000 // our extension
105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
90 127
91static AV *texture_av; 128static AV *texture_av;
92 129
93static struct 130static struct
94{ 131{
151{ 188{
152 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
153 190
154 while (attrs) 191 while (attrs)
155 { 192 {
156 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 194
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 196 return 1;
160 197
161 attrs = attrs->next; 198 attrs = attrs->next;
162 } 199 }
163 200
164 return 0; 201 return 0;
165} 202}
166 203
167typedef struct cf_layout { 204struct cf_layout {
168 PangoLayout *pl; 205 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
170 int base_height; 207 int base_height;
171 DC__Font font; 208 DC__Font font;
172 rc_t *rc; 209 rc_t *rc;
173} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
174 213
175static DC__Font default_font; 214static DC__Font default_font;
176static PangoContext *opengl_context; 215static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
178 217
179static void 218static void
180substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
181{ 220{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 224#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 226}
188 227
189static void 228static void
219} 258}
220 259
221typedef uint16_t tileid; 260typedef uint16_t tileid;
222typedef uint16_t faceid; 261typedef uint16_t faceid;
223 262
224typedef struct { 263struct maptex
264{
225 GLuint name; 265 GLuint name;
226 int w, h; 266 int w, h;
227 float s, t; 267 float s, t;
228 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
229 tileid smoothtile; 269 tileid smoothtile;
230 uint8_t smoothlevel; 270 uint8_t smoothlevel;
231} maptex; 271 uint8_t unused; /* set to zero on use */
272};
232 273
233typedef struct { 274struct mapcell
275{
234 uint32_t player; 276 uint32_t player;
235 tileid tile[3]; 277 tileid tile[3];
236 uint16_t darkness; 278 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 280};
239 281
240typedef struct { 282struct maprow
283{
241 int32_t c0, c1; 284 int32_t c0, c1;
242 mapcell *col; 285 mapcell *col;
243} maprow; 286};
244 287
245typedef struct map { 288struct mapgrid {
246 int x, y, w, h; 289 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
250 293
251 int32_t rows; 294 int32_t rows;
252 maprow *row; 295 maprow *row;
253} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
254 299
255static char * 300static char *
256prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
257{ 302{
258 char *p; 303 char *p;
276 321
277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 322#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)) 323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
279 324
280static void 325static void
281need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
282{ 327{
283 while (self->faces <= face) 328 while (self->faces <= face)
284 { 329 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 331 self->faces *= 2;
287 } 332 }
288} 333}
289 334
290static void 335static void
291need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
292{ 337{
293 while (self->texs <= texid) 338 while (self->texs <= texid)
294 { 339 {
295 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
296 self->texs *= 2; 341 self->texs *= 2;
297 } 342 }
298} 343}
299 344
300static maprow * 345static maprow *
301map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
302{ 347{
303 if (0 > y) 348 if (0 > y)
304 { 349 {
305 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
344 389
345 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
346} 391}
347 392
348static mapcell * 393static mapcell *
349map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
350{ 395{
351 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
352} 397}
353 398
354static void 399static void
355map_clear (DC__Map self) 400map_clear (mapgrid *self)
356{ 401{
357 int r; 402 int r;
358 403
359 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
378 (cell)->flags = 0; \ 423 (cell)->flags = 0; \
379 (cell)->player = 0; \ 424 (cell)->player = 0; \
380 } while (0) 425 } while (0)
381 426
382static void 427static void
383map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
384{ 429{
385 int x, y; 430 int x, y;
386 maprow *row; 431 maprow *row;
387 mapcell *cell; 432 mapcell *cell;
388 433
405 CELL_CLEAR (cell); 450 CELL_CLEAR (cell);
406 } 451 }
407 } 452 }
408} 453}
409 454
410typedef struct { 455struct smooth_key
456{
411 tileid tile; 457 tileid tile;
412 uint8_t x, y, level; 458 uint8_t x, y, level;
413} smooth_key; 459
460 bool operator == (const smooth_key &o) const
461 {
462 return tile == o.tile && x == o.x && y == o.y && level == o.level;
463 }
464};
465
466typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
467
468namespace std {
469 template <>
470 struct hash<smooth_key>
471 {
472 size_t operator () (const smooth_key &v) const
473 {
474 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
475 }
476 };
477}
414 478
415static void 479static void
416smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
417{ 481{
418 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
419 483
420 if (SvIOK (*sv)) 484 if (it == h.end ())
421 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
422 else 486 else
423 sv_setiv (*sv, bits); 487 it->second |= bits;
424} 488}
425 489
426static void 490static void
427music_finished (void) 491music_finished (void)
428{ 492{
445 ev.code = 1; 509 ev.code = 1;
446 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
447 ev.data2 = 0; 511 ev.data2 = 0;
448 512
449 SDL_PushEvent ((SDL_Event *)&ev); 513 SDL_PushEvent ((SDL_Event *)&ev);
514}
515
516// approximately divide by 255
517static unsigned int
518div255 (unsigned int n)
519{
520 return (n + (n >> 8)) >> 8;
450} 521}
451 522
452static unsigned int 523static unsigned int
453minpot (unsigned int n) 524minpot (unsigned int n)
454{ 525{
521 if (!svp || !SvTRUE (*svp)) 592 if (!svp || !SvTRUE (*svp))
522 return 0; 593 return 0;
523 594
524 return 1; 595 return 1;
525} 596}
597
598/******************************************************************************/
599
600/* process keyboard modifiers */
601static int
602mod_munge (int mod)
603{
604 mod &= MOD_MASK;
605
606 if (mod & (KMOD_META | KMOD_ALT))
607 mod |= KMOD_LRAM;
608
609 return mod;
610}
611
612static void
613deliantra_main (SV *real_main)
614{
615 dSP;
616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
619}
620
621#ifdef __MACOSX__
622 static SV *real_main;
623
624 /* to due surprising braindamage on the side of SDL design, we
625 * do some mind-boggling hack here: SDL requires a custom main()
626 * on OS X, so... we provide one and call the original main(), which,
627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
628 * and which calls our main (== SDL_main) back.
629 */
630 extern C_LINKAGE int
631 main (int argc, char *argv[])
632 {
633 deliantra_main (real_main);
634 }
635
636 #undef main
637
638 extern C_LINKAGE int main (int argc, char *argv[]);
639
640 static void
641 SDL_main_hack (SV *real_main_)
642 {
643 real_main = real_main_;
644
645 char *argv[] = { "deliantra client", 0 };
646 (main) (1, argv);
647 }
648#else
649 static void
650 SDL_main_hack (SV *real_main)
651 {
652 deliantra_main (real_main);
653 }
654#endif
526 655
527MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
528 657
529PROTOTYPES: ENABLE 658PROTOTYPES: ENABLE
530 659
559 const_iv (SDL_USEREVENT), 688 const_iv (SDL_USEREVENT),
560 689
561 const_iv (SDL_APPINPUTFOCUS), 690 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 691 const_iv (SDL_APPMOUSEFOCUS),
563 const_iv (SDL_APPACTIVE), 692 const_iv (SDL_APPACTIVE),
693
694
695 const_iv (SDLK_UNKNOWN),
696 const_iv (SDLK_FIRST),
697 const_iv (SDLK_BACKSPACE),
698 const_iv (SDLK_TAB),
699 const_iv (SDLK_CLEAR),
700 const_iv (SDLK_RETURN),
701 const_iv (SDLK_PAUSE),
702 const_iv (SDLK_ESCAPE),
703 const_iv (SDLK_SPACE),
704 const_iv (SDLK_EXCLAIM),
705 const_iv (SDLK_QUOTEDBL),
706 const_iv (SDLK_HASH),
707 const_iv (SDLK_DOLLAR),
708 const_iv (SDLK_AMPERSAND),
709 const_iv (SDLK_QUOTE),
710 const_iv (SDLK_LEFTPAREN),
711 const_iv (SDLK_RIGHTPAREN),
712 const_iv (SDLK_ASTERISK),
713 const_iv (SDLK_PLUS),
714 const_iv (SDLK_COMMA),
715 const_iv (SDLK_MINUS),
716 const_iv (SDLK_PERIOD),
717 const_iv (SDLK_SLASH),
718 const_iv (SDLK_0),
719 const_iv (SDLK_1),
720 const_iv (SDLK_2),
721 const_iv (SDLK_3),
722 const_iv (SDLK_4),
723 const_iv (SDLK_5),
724 const_iv (SDLK_6),
725 const_iv (SDLK_7),
726 const_iv (SDLK_8),
727 const_iv (SDLK_9),
728 const_iv (SDLK_COLON),
729 const_iv (SDLK_SEMICOLON),
730 const_iv (SDLK_LESS),
731 const_iv (SDLK_EQUALS),
732 const_iv (SDLK_GREATER),
733 const_iv (SDLK_QUESTION),
734 const_iv (SDLK_AT),
735
736 const_iv (SDLK_LEFTBRACKET),
737 const_iv (SDLK_BACKSLASH),
738 const_iv (SDLK_RIGHTBRACKET),
739 const_iv (SDLK_CARET),
740 const_iv (SDLK_UNDERSCORE),
741 const_iv (SDLK_BACKQUOTE),
742 const_iv (SDLK_DELETE),
564 743
565 const_iv (SDLK_FIRST), 744 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 745 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 746 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 747 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 823 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 824 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 825 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 826 const_iv (KMOD_MODE),
648 827
828 const_iv (KMOD_LRAM),
829
649 const_iv (MIX_DEFAULT_FORMAT), 830 const_iv (MIX_DEFAULT_FORMAT),
650 831
651 const_iv (SDL_INIT_TIMER), 832 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 833 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 834 const_iv (SDL_INIT_VIDEO),
677 858
678 const_iv (FOW_DARKNESS) 859 const_iv (FOW_DARKNESS)
679# undef const_iv 860# undef const_iv
680 }; 861 };
681 862
682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 863 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
684 865
685 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
686 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
687} 868}
688 869
701 882
702NV floor (NV x) 883NV floor (NV x)
703 884
704NV ceil (NV x) 885NV ceil (NV x)
705 886
706NV ceilabs (NV x) 887IV minpot (UV n)
888
889IV popcount (UV n)
890
891NV distance (NV dx, NV dy)
707 CODE: 892 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x); 893 RETVAL = pow (dx * dx + dy * dy, 0.5);
709 OUTPUT: 894 OUTPUT:
710 RETVAL 895 RETVAL
711
712IV minpot (UV n)
713
714IV popcount (UV n)
715 896
716void 897void
717pango_init () 898pango_init ()
718 CODE: 899 CODE:
719{ 900{
727#endif 908#endif
728} 909}
729 910
730char *SDL_GetError () 911char *SDL_GetError ()
731 912
913void SDL_main_hack (SV *real_main)
914 PROTOTYPE: &
915
732int SDL_Init (U32 flags) 916int SDL_Init (U32 flags)
733 917
734int SDL_InitSubSystem (U32 flags) 918int SDL_InitSubSystem (U32 flags)
735 919
736void SDL_QuitSubSystem (U32 flags) 920void SDL_QuitSubSystem (U32 flags)
737 921
738void SDL_Quit () 922void SDL_Quit ()
739 923
740int SDL_GL_SetAttribute (int attr, int value) 924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
741 926
742int SDL_GL_GetAttribute (int attr) 927int SDL_GL_GetAttribute (int attr)
743 CODE: 928 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL)) 929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
745 XSRETURN_UNDEF; 930 XSRETURN_UNDEF;
746 OUTPUT: 931 OUTPUT:
747 RETVAL 932 RETVAL
748 933
749void 934void
804 ); 989 );
805 990
806 if (RETVAL) 991 if (RETVAL)
807 { 992 {
808 av_clear (texture_av); 993 av_clear (texture_av);
809
810 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
811#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 994#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
812#include "glfunc.h" 995#include "glfunc.h"
813#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
814 } 999 }
815} 1000}
816 OUTPUT: 1001 OUTPUT:
817 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
818 1006
819void 1007void
820SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
821 1009
822char * 1010char *
823SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
824 1013
825int 1014int
826SDL_GetAppState () 1015SDL_GetAppState ()
827 1016
828int 1017int
829SDL_GetModState () 1018SDL_GetModState ()
830 1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
831void 1024void
1025SDL_PumpEvents ()
1026
1027void
832poll_events () 1028peep_events ()
833 PPCODE: 1029 PPCODE:
834{ 1030{
835 SDL_Event ev; 1031 SDL_Event ev;
836 1032
837 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
844 { 1040 {
845 case SDL_KEYDOWN: 1041 case SDL_KEYDOWN:
846 case SDL_KEYUP: 1042 case SDL_KEYUP:
847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1043 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1044 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
849 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1045 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
850 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1046 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1047 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
852 break; 1048 break;
853 1049
854 case SDL_ACTIVEEVENT: 1050 case SDL_ACTIVEEVENT:
855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1051 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
873 x = ev.motion.x; 1069 x = ev.motion.x;
874 y = ev.motion.y; 1070 y = ev.motion.y;
875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1071 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
876 } 1072 }
877 1073
878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1074 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
879 hv_store (hv, "state", 5, newSViv (state), 0); 1075 hv_store (hv, "state", 5, newSViv (state), 0);
880 hv_store (hv, "x", 1, newSViv (x), 0); 1076 hv_store (hv, "x", 1, newSViv (x), 0);
881 hv_store (hv, "y", 1, newSViv (y), 0); 1077 hv_store (hv, "y", 1, newSViv (y), 0);
882 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1078 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
883 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1079 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
903 1099
904 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1100 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
905 } 1101 }
906} 1102}
907 1103
1104char *
1105SDL_AudioDriverName ()
1106 CODE:
1107{
1108 char buf [256];
1109 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1110 XSRETURN_UNDEF;
1111
1112 RETVAL = buf;
1113}
1114 OUTPUT:
1115 RETVAL
1116
908int 1117int
909Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
910 POSTCALL: 1119 POSTCALL:
911 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
912 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
913 1122
914void 1123void
915Mix_QuerySpec () 1124Mix_QuerySpec ()
974add_font (char *file) 1183add_font (char *file)
975 CODE: 1184 CODE:
976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT: 1186 OUTPUT:
978 RETVAL 1187 RETVAL
1188
1189void
1190IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1191
1192# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1193void
1194Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
979 1195
980void 1196void
981load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
982 ALIAS: 1198 ALIAS:
983 load_image_file = 1 1199 load_image_file = 1
1029 1245
1030 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
1031 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
1032 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
1033 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
1034 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1035 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1251 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1036 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1037 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1038 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
1039 1255
1099#if DEBUG 1315#if DEBUG
1100 VALGRIND_DO_LEAK_CHECK; 1316 VALGRIND_DO_LEAK_CHECK;
1101#endif 1317#endif
1102} 1318}
1103 1319
1320int
1321SvREFCNT (SV *sv)
1322 CODE:
1323 RETVAL = SvREFCNT (sv);
1324 OUTPUT:
1325 RETVAL
1326
1104MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1105 1328
1106PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1107 1330
1108DC::Font 1331DC::Font
1109new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1110 CODE: 1333 CODE:
1111{ 1334{
1112 int count; 1335 int count;
1113 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1114 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1143 PROTOTYPE: 1366 PROTOTYPE:
1144 CODE: 1367 CODE:
1145 tc_restore (); 1368 tc_restore ();
1146 1369
1147DC::Layout 1370DC::Layout
1148new (SV *class) 1371new (SV *klass)
1149 CODE: 1372 CODE:
1150 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1151 1374
1152 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1153 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1302 1525
1303void 1526void
1304set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1305 CODE: 1528 CODE:
1306 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1307 { 1530 {
1308 self->base_height = base_height; 1531 self->base_height = base_height;
1309 layout_update_font (self); 1532 layout_update_font (self);
1310 } 1533 }
1311 1534
1312void 1535void
1539 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1540 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1541 } 1764 }
1542} 1765}
1543 1766
1767void
1768draw_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)
1769 PROTOTYPE: @
1770 CODE:
1771{
1772 glEnable (GL_BLEND);
1773 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1774 glEnable (GL_TEXTURE_2D);
1775 glBindTexture (GL_TEXTURE_2D, name1);
1776
1777 glColor3f (intensity, intensity, intensity);
1778 glPushMatrix ();
1779 glScalef (1./3, 1./3, 1.);
1780
1781 if (blend > 0.f)
1782 {
1783 float dx3 = dx * -3.f / w;
1784 float dy3 = dy * -3.f / h;
1785 GLfloat env_color[4] = { 0., 0., 0., blend };
1786
1787 /* interpolate the two shadow textures */
1788 /* stage 0 == rgb(glcolor) + alpha(t0) */
1789 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1790
1791 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1792 gl.ActiveTexture (GL_TEXTURE1);
1793 glEnable (GL_TEXTURE_2D);
1794 glBindTexture (GL_TEXTURE_2D, name2);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1796
1797 /* rgb == rgb(glcolor) */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1801
1802 /* alpha = interpolate t0, t1 by env_alpha */
1803 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1808
1809 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1810 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1811
1812 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1813 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1814
1815 glBegin (GL_QUADS);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 gl.ActiveTexture (GL_TEXTURE0);
1824 }
1825 else
1826 {
1827 /* simple blending of one texture, also opengl <1.3 path */
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1829
1830 glBegin (GL_QUADS);
1831 glTexCoord2f (0, 0); glVertex2f (0, 0);
1832 glTexCoord2f (0, t); glVertex2f (0, h);
1833 glTexCoord2f (s, t); glVertex2f (w, h);
1834 glTexCoord2f (s, 0); glVertex2f (w, 0);
1835 glEnd ();
1836 }
1837
1838 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1839 {
1840 int x, y;
1841 int dx3 = dx * 3;
1842 int dy3 = dy * 3;
1843
1844 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1845 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1846 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1847 glTranslatef (-1., -1., 0);
1848 glBegin (GL_QUADS);
1849
1850 for (y = 1; y < h; y += 3)
1851 {
1852 int y1 = y - dy3;
1853 int y1valid = y1 >= 0 && y1 < h;
1854
1855 for (x = 1; x < w; x += 3)
1856 {
1857 int x1 = x - dx3;
1858 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 uint8_t h2;
1860
1861 if (y1valid && x1 >= 0 && x1 < w)
1862 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1863 else
1864 h2 = 1; /* out of range == invisible */
1865
1866 if (h1 || h2)
1867 {
1868 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1869 glColor4f (1., 1., 1., alpha);
1870
1871 glTexCoord2f (0, 0.); glVertex2i (x , y );
1872 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1873 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1874 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1875 }
1876 }
1877 }
1878 }
1879
1880 glEnd ();
1881
1882 glPopMatrix ();
1883
1884 glDisable (GL_TEXTURE_2D);
1885 glDisable (GL_BLEND);
1886}
1887
1544IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1888IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1545 CODE: 1889 CODE:
1546{ 1890{
1547 GLint width; 1891 GLint width;
1548 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1892 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1555MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1556 1900
1557PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1558 1902
1559DC::Map 1903DC::Map
1560new (SV *class) 1904new (SV *klass)
1561 CODE: 1905 CODE:
1562 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1563 RETVAL->x = 0; 1907 RETVAL->x = 0;
1564 RETVAL->y = 0; 1908 RETVAL->y = 0;
1565 RETVAL->w = 0; 1909 RETVAL->w = 0;
1566 RETVAL->h = 0; 1910 RETVAL->h = 0;
1567 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1604 1948
1605void 1949void
1606set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1607 CODE: 1951 CODE:
1608{ 1952{
1609 tileid texid; 1953 tileid texid;
1610 maptex *tex; 1954 maptex *tex;
1611 1955
1612 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1613 return; 1957 return;
1614 1958
1615 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1616 return; 1960 return;
1617 1961
1618 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1619 1963
1620 if (!texid) 1964 if (!texid)
1621 return; 1965 return;
1622 1966
1623 tex = self->tex + texid; 1967 tex = self->tex + texid;
1652 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1996 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1653 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1654 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1656} 2000}
2001
2002void
2003expire_textures (DC::Map self, int texid, int count)
2004 PPCODE:
2005 for (; texid < self->texs && count; ++texid, --count)
2006 {
2007 maptex *tex = self->tex + texid;
2008
2009 if (tex->name)
2010 {
2011 if (tex->unused)
2012 {
2013 tex->name = 0;
2014 tex->unused = 0;
2015 XPUSHs (sv_2mortal (newSViv (texid)));
2016 }
2017 else
2018 tex->unused = 1;
2019 }
2020 }
1657 2021
1658int 2022int
1659ox (DC::Map self) 2023ox (DC::Map self)
1660 ALIAS: 2024 ALIAS:
1661 oy = 1 2025 oy = 1
1701 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1702 } 2066 }
1703} 2067}
1704 2068
1705SV * 2069SV *
1706map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1707 CODE: 2071 CODE:
1708{ 2072{
1709 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1710 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1711 mapcell *cell; 2075 mapcell *cell;
1732 2096
1733 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1734 2098
1735 if (flags & 8) 2099 if (flags & 8)
1736 { 2100 {
2101 uint8_t ext, cmd;
2102
1737 if (extmap) 2103 do
1738 { 2104 {
1739 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1740 2107
1741 do 2108 if (cmd < 4)
2109 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2110 else if (cmd == 5) // health
1742 { 2111 {
1743 ext = *data++;
1744 cmd = ext & 0x7f;
1745
1746 if (cmd < 4)
1747 cell->darkness = 255 - ext * 64 + 1;
1748 else if (cmd == 5) // health
1749 {
1750 cell->stat_width = 1; 2112 cell->stat_width = 1;
1751 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1752 }
1753 else if (cmd == 6) // monster width
1754 cell->stat_width = *data++ + 1;
1755 else if (cmd == 0x47)
1756 {
1757 if (*data == 1) cell->player = data [1];
1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1761
1762 data += *data + 1;
1763 }
1764 else if (cmd == 8) // cell flags
1765 cell->flags = *data++;
1766 else if (ext & 0x40) // unknown, multibyte => skip
1767 data += *data + 1;
1768 else
1769 data++;
1770 } 2114 }
1771 while (ext & 0x80); 2115 else if (cmd == 6) // monster width
2116 cell->stat_width = *data++ + 1;
2117 else if (cmd == 0x47)
2118 {
2119 if (*data == 1) cell->player = data [1];
2120 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2121 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2122 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2123
2124 data += *data + 1;
2125 }
2126 else if (cmd == 8) // cell flags
2127 cell->flags = *data++;
2128 else if (ext & 0x40) // unknown, multibyte => skip
2129 data += *data + 1;
2130 else
2131 data++;
1772 } 2132 }
1773 else 2133 while (ext & 0x80);
1774 cell->darkness = *data++ + 1;
1775 } 2134 }
1776 2135
1777 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
1778 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
1779 { 2138 {
1782 cell->tile [z] = self->face2tile [face]; 2141 cell->tile [z] = self->face2tile [face];
1783 2142
1784 if (cell->tile [z]) 2143 if (cell->tile [z])
1785 { 2144 {
1786 maptex *tex = self->tex + cell->tile [z]; 2145 maptex *tex = self->tex + cell->tile [z];
2146 tex->unused = 0;
1787 if (!tex->name) 2147 if (!tex->name)
1788 av_push (missing, newSViv (cell->tile [z])); 2148 av_push (missing, newSViv (cell->tile [z]));
1789 2149
1790 if (tex->smoothtile) 2150 if (tex->smoothtile)
1791 { 2151 {
1792 maptex *smooth = self->tex + tex->smoothtile; 2152 maptex *smooth = self->tex + tex->smoothtile;
2153 smooth->unused = 0;
1793 if (!smooth->name) 2154 if (!smooth->name)
1794 av_push (missing, newSViv (tex->smoothtile)); 2155 av_push (missing, newSViv (tex->smoothtile));
1795 } 2156 }
1796 } 2157 }
1797 } 2158 }
1825 ? self->row + y 2186 ? self->row + y
1826 : 0; 2187 : 0;
1827 2188
1828 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1829 { 2190 {
1830 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1831 2192
1832 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1833 { 2194 {
1834 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1835 2196
1837 { 2198 {
1838 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1839 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1840 int a1 = tex.a; 2201 int a1 = tex.a;
1841 2202
1842 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1843 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1844 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1845 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1846 } 2207 }
1847 } 2208 }
1848 2209
1849 *map++ = (r ) 2210 *map++ = (r )
1850 | (g << 8) 2211 | (g << 8)
1851 | (b << 16) 2212 | (b << 16)
1852 | (a << 24); 2213 | (a << 24);
1853 } 2214 }
1854 } 2215 }
1855 2216
1856 RETVAL = map_sv; 2217 RETVAL = map_sv;
1857} 2218}
1858 OUTPUT: 2219 OUTPUT:
1859 RETVAL 2220 RETVAL
1860 2221
1861void 2222void
1862draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1863 CODE: 2224 CODE:
1864{ 2225{
1865 int x, y, z; 2226 int x, y, z;
1866 2227
1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1868 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1869 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)
1870 smooth_key skey; 2230 smooth_key skey;
1871 int pl_x, pl_y; 2231 int pl_x, pl_y;
1872 maptex pl_tex; 2232 maptex pl_tex;
1873 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2234 rc_t *rc_ov = rc_alloc ();
1874 rc_key_t key; 2235 rc_key_t key;
1875 rc_array_t *arr; 2236 rc_array_t *arr;
1876 2237
1877 pl_tex.name = 0; 2238 pl_tex.name = 0;
1878 2239
1879 // thats current max. sorry. 2240 // that's current max. sorry.
1880 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1881 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1882 2243
1883 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1884 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
1888 key.g = 255; 2249 key.g = 255;
1889 key.b = 255; 2250 key.b = 255;
1890 key.a = 255; 2251 key.a = 255;
1891 key.mode = GL_QUADS; 2252 key.mode = GL_QUADS;
1892 key.format = GL_T2F_V3F; 2253 key.format = GL_T2F_V3F;
1893 key.texname = -1;
1894 2254
1895 mx += self->x; 2255 mx += self->x;
1896 my += self->y; 2256 my += self->y;
1897 2257
1898 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
1921 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1922 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1923 2283
1924 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1925 { 2285 {
2286 smooth_hash smooth;
1926 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1927 2289
1928 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1929 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1930 { 2292 {
1931 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
1937 tileid tile = cell->tile [z]; 2299 tileid tile = cell->tile [z];
1938 2300
1939 if (tile) 2301 if (tile)
1940 { 2302 {
1941 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1942 int px = (x + 1) * T - tex.w; 2304 int px, py;
1943 int py = (y + 1) * T - tex.h;
1944 2305
1945 if (key.texname != tex.name) 2306 if (key.texname != tex.name)
1946 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1947 if (!tex.name) 2310 if (!tex.name)
1948 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1949 2312
1950 key.texname = tex.name; 2313 key.texname = tex.name;
1951 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
1952 } 2315 }
2316
2317 px = (x + 1) * Th - tex.w;
2318 py = (y + 1) * Tw - tex.h;
1953 2319
1954 if (expect_false (cell->player == player) && expect_false (z == 2)) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
1955 { 2321 {
1956 pl_x = px; 2322 pl_x = px;
1957 pl_y = py; 2323 pl_y = py;
1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1963 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2329 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1964 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2330 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2331 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1966 2332
1967 if (expect_false (cell->flags) && expect_false (z == 2))
1968 {
1969 // overlays such as the speech bubble, probably more to come
1970 if (cell->flags & 1)
1971 {
1972 maptex tex = self->tex [1];
1973 int px = x * T + T * 2 / 32;
1974 int py = y * T - T * 6 / 32;
1975
1976 if (tex.name)
1977 {
1978 if (key.texname != tex.name)
1979 {
1980 key.texname = tex.name;
1981 arr = rc_array (rc, &key);
1982 }
1983
1984 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1988 }
1989 }
1990 }
1991
1992 // update smooth hash 2333 // update smooth hash
1993 if (tex.smoothtile) 2334 if (tex.smoothtile)
1994 { 2335 {
1995 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
1996 skey.level = tex.smoothlevel; 2337 skey.level = tex.smoothlevel;
2011 2352
2012 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2013 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
2014 2355
2015 // full tile 2356 // full tile
2016 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2357 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2017 2358
2018 // borders 2359 // borders
2019 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2020 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2021 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2362 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2022 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2363 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2023 2364
2024 // corners 2365 // corners
2025 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2366 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2026 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2367 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2027 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2368 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2028 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2369 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2370 }
2371 }
2372
2373 if (expect_false (z == 2) && expect_false (cell->flags))
2374 {
2375 // overlays such as the speech bubble, probably more to come
2376 if (cell->flags & 1)
2377 {
2378 rc_key_t key_ov = key;
2379 maptex tex = self->tex [TEXID_SPEECH];
2380 rc_array_t *arr;
2381 int px = x * Tw + Tw * 2 / 32;
2382 int py = y * Th - Th * 6 / 32;
2383
2384 key_ov.texname = tex.name;
2385 arr = rc_array (rc_ov, &key_ov);
2386
2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2029 } 2391 }
2030 } 2392 }
2031 } 2393 }
2032 } 2394 }
2033 2395
2049 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
2050 { 2412 {
2051 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
2052 HE *he; 2414 HE *he;
2053 2415
2054 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2055 while ((he = hv_iternext (smooth)))
2056 { 2417 {
2057 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
2058 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
2059 2420
2060 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
2061 && skey->level == level 2422 && skey.level == level
2062 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
2063 { 2424 {
2064 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
2065 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
2066 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
2067 int border = bits & 15; 2428 int border = bits & 15;
2068 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2069 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
2070 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
2071 2432
2073 { 2434 {
2074 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2075 // save gobs of state changes. 2436 // save gobs of state changes.
2076 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2077 { 2438 {
2439 self->tex [skey.tile].unused = 0;
2440
2078 glEnd (); 2441 glEnd ();
2079 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2080 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2081 } 2444 }
2082 2445
2083 if (border) 2446 if (border)
2084 { 2447 {
2085 float ox = border * dx; 2448 float ox = border * dx;
2086 2449
2087 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2091 } 2454 }
2092 2455
2093 if (corner) 2456 if (corner)
2094 { 2457 {
2095 float ox = corner * dx; 2458 float ox = corner * dx;
2096 2459
2097 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2098 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2099 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2100 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2101 } 2464 }
2102 } 2465 }
2103 } 2466 }
2104 } 2467 }
2105 } 2468 }
2107 2470
2108 glEnd (); 2471 glEnd ();
2109 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2110 key.texname = -1; 2473 key.texname = -1;
2111 } 2474 }
2112
2113 hv_clear (smooth);
2114 } 2475 }
2115 2476
2116 if (pl_tex.name) 2477 if (pl_tex.name)
2117 { 2478 {
2118 maptex tex = pl_tex; 2479 maptex tex = pl_tex;
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2489 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129 2490
2130 rc_draw (rc); 2491 rc_draw (rc);
2131 } 2492 }
2132 2493
2494 rc_draw (rc_ov);
2495 rc_clear (rc_ov);
2496
2133 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
2134 rc_free (rc); 2498 rc_free (rc);
2499 rc_free (rc_ov);
2135 2500
2136 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
2137 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
2138 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
2139 { 2504 {
2142 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2509 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2146 2511
2147 int px = x * T; 2512 int px = x * Tw;
2148 int py = y * T; 2513 int py = y * Th;
2514
2515 if (expect_false (cell->player == player))
2516 {
2517 px += sdx;
2518 py += sdy;
2519 }
2149 2520
2150 if (cell->stat_hp) 2521 if (cell->stat_hp)
2151 { 2522 {
2152 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2153 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2154 2525
2155 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2156 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2157 px + width - 1, py); 2528 px + width - 1, py);
2158 2529
2164 } 2535 }
2165 } 2536 }
2166} 2537}
2167 2538
2168void 2539void
2169draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2540draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2170 CODE: 2541 CODE:
2171{ 2542{
2172 static float color[16][3] = { 2543 static float color[16][3] = {
2173 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
2174 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
2175 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
2176 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
2177 2548
2178 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
2179 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
2180 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
2181 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
2182 2553
2183 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
2184 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
2185 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
2186 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
2187 2558
2188 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
2189 2560
2190 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
2191 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
2192 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
2193 }; 2564 };
2194 2565
2195 int x, y; 2566 int x, y;
2196 2567
2197 glEnable (GL_TEXTURE_2D); 2568 glEnable (GL_TEXTURE_2D);
2569 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2570 * but the nvidia driver (185.18.14) mishandles alpha textures
2571 * and takes the colour from god knows where instead of using
2572 * Cp. MODULATE results in the same colour, but slightly different
2573 * alpha, but atcually gives us the correct colour with nvidia.
2574 */
2198 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2199 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2200 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2201 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
2202 2579
2203 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
2207 2584
2208 if (m) 2585 if (m)
2209 { 2586 {
2210 float *c = color [m & 15]; 2587 float *c = color [m & 15];
2211 2588
2212 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
2213 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
2214 2591
2215 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
2216 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2217 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2218 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2219 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2220 } 2597 }
2228void 2605void
2229fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2606fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2230 PPCODE: 2607 PPCODE:
2231{ 2608{
2232 int x, y; 2609 int x, y;
2233 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2234 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2235 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2236 int sw34 = (sw * 3 + 3) & ~3; 2613 int sw3 = sw * 3;
2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2237 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2238 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2239 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2240 2618
2241 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2242 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2243 2621
2244 mx += self->x - 1; 2622 mx += self->x - 1;
2245 my += self->y - 1; 2623 my += self->y - 1;
2246
2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2248 2624
2249 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2250 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2251 { 2627 {
2252 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
2255 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
2256 { 2632 {
2257 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
2258 2634
2259 darkness1 [y * sw1 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
2260 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2261 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2262 } 2638 }
2263 } 2639 }
2264 2640
2265 for (y = 0; y < sh; ++y) 2641 for (y = 0; y < sh; ++y)
2266 for (x = 0; x < sw; ++x) 2642 for (x = 0; x < sw; ++x)
2285 2661
2286 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2287 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2288 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2289 2665
2290 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2291 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2292 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2293 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2294 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2670 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2295 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2296 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2297 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2298 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2299 } 2675 }
2300 2676
2301 free (darkness1); 2677 free (darkness1);
2302 2678
2303 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2304 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2305 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2306 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2307} 2683}
2308 2684
2309SV * 2685SV *
2372 else 2748 else
2373 *data++ = 0; 2749 *data++ = 0;
2374 } 2750 }
2375 } 2751 }
2376 2752
2377 /* if size is w*h + 5 then no data has been found */ 2753 /* if size is w*h + 5 then no data has been found */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 { 2755 {
2380 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 } 2758 }
2383 2759
2384 RETVAL = data_sv; 2760 RETVAL = data_sv;
2385} 2761}
2386 OUTPUT: 2762 OUTPUT:
2387 RETVAL 2763 RETVAL
2388 2764
2389void 2765void
2396 STRLEN len; 2772 STRLEN len;
2397 uint8_t *data, *end; 2773 uint8_t *data, *end;
2398 2774
2399 len = SvLEN (data_sv); 2775 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv); 2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2402 end = data + len + 8; 2778 end = data + len + 8;
2403 2779
2404 if (len < 5) 2780 if (len < 5)
2405 XSRETURN_EMPTY; 2781 XSRETURN_EMPTY;
2406 2782
2467} 2843}
2468 2844
2469MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2470 2846
2471DC::RW 2847DC::RW
2472new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2473 CODE: 2849 CODE:
2474{ 2850{
2475 STRLEN datalen; 2851 STRLEN datalen;
2476 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2477 2853
2479} 2855}
2480 OUTPUT: 2856 OUTPUT:
2481 RETVAL 2857 RETVAL
2482 2858
2483DC::RW 2859DC::RW
2484new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2485 CODE: 2861 CODE:
2486 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2487 OUTPUT: 2863 OUTPUT:
2488 RETVAL 2864 RETVAL
2489 2865
2507 if (RETVAL < 0) 2883 if (RETVAL < 0)
2508 { 2884 {
2509 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2510 2886
2511 if (RETVAL < 0) 2887 if (RETVAL < 0)
2888 {
2889 // happens sometimes, maybe it just stopped playing(?)
2890 RETVAL = Mix_GroupAvailable (-1);
2891
2892 if (RETVAL < 0)
2512 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2513 2894 }
2895 else
2514 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2515 } 2897 }
2516 2898
2517 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2518 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2519} 2901}
2566void 2948void
2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2568 CODE: 2950 CODE:
2569{ 2951{
2570 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2952 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2571 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2953 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2573} 2955}
2574 2956
2575void 2957void
2576set_reverse_stereo (DC::Channel self, int flip) 2958set_reverse_stereo (DC::Channel self, int flip)
2579 2961
2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2581 2963
2582PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2583 2965
2966void
2967decoders ()
2968 PPCODE:
2969#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2970 int i, num = Mix_GetNumChunkDecoders ();
2971 EXTEND (SP, num);
2972 for (i = 0; i < num; ++i)
2973 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2974#else
2975 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2976#endif
2977
2584DC::MixChunk 2978DC::MixChunk
2585new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2586 CODE: 2980 CODE:
2587 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2588 OUTPUT: 2982 OUTPUT:
2589 RETVAL 2983 RETVAL
2590 2984
2620 OUTPUT: 3014 OUTPUT:
2621 RETVAL 3015 RETVAL
2622 3016
2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2624 3018
3019void
3020decoders ()
3021 PPCODE:
3022#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3023 int i, num = Mix_GetNumMusicDecoders ();
3024 EXTEND (SP, num);
3025 for (i = 0; i < num; ++i)
3026 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3027#else
3028 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3029#endif
3030
2625int 3031int
2626volume (int volume = -1) 3032volume (int volume = -1)
2627 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2628 CODE: 3034 CODE:
2629 if (items > 0) 3035 if (items > 0)
2640void 3046void
2641halt () 3047halt ()
2642 CODE: 3048 CODE:
2643 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2644 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2645DC::MixMusic 3058DC::MixMusic
2646new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
2647 CODE: 3060 CODE:
2648 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2649 OUTPUT: 3062 OUTPUT:
2650 RETVAL 3063 RETVAL
2651 3064
2679 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2680# define const_iv(name) { # name, (IV)name } 3093# define const_iv(name) { # name, (IV)name }
2681 const_iv (GL_VENDOR), 3094 const_iv (GL_VENDOR),
2682 const_iv (GL_VERSION), 3095 const_iv (GL_VERSION),
2683 const_iv (GL_EXTENSIONS), 3096 const_iv (GL_EXTENSIONS),
3097 const_iv (GL_MAX_TEXTURE_UNITS),
2684 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2685 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2686 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2687 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2688 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
2700 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2701 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2702 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2703 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2704 const_iv (GL_ONE_MINUS_DST_ALPHA), 3118 const_iv (GL_ONE_MINUS_DST_ALPHA),
3119 const_iv (GL_SRC_COLOR),
3120 const_iv (GL_DST_COLOR),
3121 const_iv (GL_ONE_MINUS_SRC_COLOR),
3122 const_iv (GL_ONE_MINUS_DST_COLOR),
2705 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2706 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2707 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2708 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2709 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
2777 const_iv (GL_NICEST), 3195 const_iv (GL_NICEST),
2778 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2779 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2780 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2781 const_iv (GL_T2F_N3F_V3F), 3199 const_iv (GL_T2F_N3F_V3F),
3200 const_iv (GL_FUNC_ADD),
3201 const_iv (GL_FUNC_SUBTRACT),
3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2782# undef const_iv 3203# undef const_iv
2783 }; 3204 };
2784 3205
2785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3206 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2786 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2787 3208
2788 texture_av = newAV (); 3209 texture_av = newAV ();
2789 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
2790} 3211}
2791 3212
2793disable_GL_EXT_blend_func_separate () 3214disable_GL_EXT_blend_func_separate ()
2794 CODE: 3215 CODE:
2795 gl.BlendFuncSeparate = 0; 3216 gl.BlendFuncSeparate = 0;
2796 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
2797 3218
2798char * 3219void
3220apple_nvidia_bug (int enable)
3221
3222const char *
2799gl_vendor () 3223gl_vendor ()
2800 CODE: 3224 CODE:
2801 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2802 OUTPUT: 3226 OUTPUT:
2803 RETVAL 3227 RETVAL
2804 3228
2805char * 3229const char *
2806gl_version () 3230gl_version ()
2807 CODE: 3231 CODE:
2808 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2809 OUTPUT: 3233 OUTPUT:
2810 RETVAL 3234 RETVAL
2811 3235
2812char * 3236const char *
2813gl_extensions () 3237gl_extensions ()
2814 CODE: 3238 CODE:
2815 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2816 OUTPUT: 3240 OUTPUT:
2817 RETVAL 3241 RETVAL
2818 3242
2819const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
2820 3248
2821GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
2822 CODE: 3250 CODE:
2823 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
2824 OUTPUT: 3252 OUTPUT:
2832 3260
2833int glGetError () 3261int glGetError ()
2834 3262
2835void glFinish () 3263void glFinish ()
2836 3264
3265void glFlush ()
3266
2837void glClear (int mask) 3267void glClear (int mask)
2838 3268
2839void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2840 PROTOTYPE: @ 3270 PROTOTYPE: @
2841 3271
2850void glBlendFunc (int sfactor, int dfactor) 3280void glBlendFunc (int sfactor, int dfactor)
2851 3281
2852void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2853 CODE: 3283 CODE:
2854 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
3285
3286# void glBlendEquation (int se)
2855 3287
2856void glDepthMask (int flag) 3288void glDepthMask (int flag)
2857 3289
2858void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2859 3291
2894void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2895 CODE: 3327 CODE:
2896 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2897 3329
2898void glColor (float r, float g, float b, float a = 1.0) 3330void glColor (float r, float g, float b, float a = 1.0)
3331 PROTOTYPE: @
2899 ALIAS: 3332 ALIAS:
2900 glColor_premultiply = 1 3333 glColor_premultiply = 1
2901 CODE: 3334 CODE:
2902 if (ix) 3335 if (ix)
2903 { 3336 {
3009 3442
3010void glEndList () 3443void glEndList ()
3011 3444
3012void glCallList (int list) 3445void glCallList (int list)
3013 3446
3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3015 3453
3016PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
3017 3455
3018void 3456void
3019find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
3020 PPCODE: 3458 PPCODE:
3021{ 3459{
3022 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
3023 XPUSHs (self); 3461 XPUSHs (self);
3024} 3462}
3025 3463
3026BOOT: 3464BOOT:
3027{ 3465{
3035 3473
3036void 3474void
3037draw (SV *self) 3475draw (SV *self)
3038 CODE: 3476 CODE:
3039{ 3477{
3040 HV *hv; 3478 HV *hv;
3041 SV **svp; 3479 SV **svp;
3042 NV x, y, w, h; 3480 NV x, y, w, h;
3043 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
3044 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
3045 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
3046 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines