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.271 by root, Sun Jul 20 15:09:29 2008 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 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);
378 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
379 (cell)->player = 0; \ 425 (cell)->player = 0; \
380 } while (0) 426 } while (0)
381 427
382static void 428static void
383map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
384{ 430{
385 int x, y; 431 int x, y;
386 maprow *row; 432 maprow *row;
387 mapcell *cell; 433 mapcell *cell;
388 434
405 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
406 } 452 }
407 } 453 }
408} 454}
409 455
410typedef struct { 456struct smooth_key
457{
411 tileid tile; 458 tileid tile;
412 uint8_t x, y, level; 459 uint8_t x, y, level;
413} 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}
414 479
415static void 480static void
416smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
417{ 482{
418 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
419 484
420 if (SvIOK (*sv)) 485 if (it == h.end ())
421 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
422 else 487 else
423 sv_setiv (*sv, bits); 488 it->second |= bits;
424} 489}
425 490
426static void 491static void
427music_finished (void) 492music_finished (void)
428{ 493{
445 ev.code = 1; 510 ev.code = 1;
446 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
447 ev.data2 = 0; 512 ev.data2 = 0;
448 513
449 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;
450} 522}
451 523
452static unsigned int 524static unsigned int
453minpot (unsigned int n) 525minpot (unsigned int n)
454{ 526{
521 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
522 return 0; 594 return 0;
523 595
524 return 1; 596 return 1;
525} 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
526 656
527MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
528 658
529PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
530 660
559 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
560 690
561 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
563 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),
564 744
565 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
648 828
829 const_iv (KMOD_LRAM),
830
649 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
650 832
651 const_iv (SDL_INIT_TIMER), 833 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 834 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 835 const_iv (SDL_INIT_VIDEO),
677 859
678 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
679# undef const_iv 861# undef const_iv
680 }; 862 };
681 863
682 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--)
683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
684 866
685 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
686 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
687} 869}
688 870
704NV ceil (NV x) 886NV ceil (NV x)
705 887
706IV minpot (UV n) 888IV minpot (UV n)
707 889
708IV 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
709 897
710void 898void
711pango_init () 899pango_init ()
712 CODE: 900 CODE:
713{ 901{
721#endif 909#endif
722} 910}
723 911
724char *SDL_GetError () 912char *SDL_GetError ()
725 913
914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
916
726int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
727 918
728int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
729 920
730void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
731 922
732void SDL_Quit () 923void SDL_Quit ()
733 924
734int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
735 927
736int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
737 CODE: 929 CODE:
738 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
739 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
740 OUTPUT: 932 OUTPUT:
741 RETVAL 933 RETVAL
742 934
743void 935void
798 ); 990 );
799 991
800 if (RETVAL) 992 if (RETVAL)
801 { 993 {
802 av_clear (texture_av); 994 av_clear (texture_av);
803
804 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
805#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);
806#include "glfunc.h" 996#include "glfunc.h"
807#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
808 } 1000 }
809} 1001}
810 OUTPUT: 1002 OUTPUT:
811 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
812 1007
813void 1008void
814SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
815 1010
816char * 1011char *
817SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
818 1014
819int 1015int
820SDL_GetAppState () 1016SDL_GetAppState ()
821 1017
822int 1018int
823SDL_GetModState () 1019SDL_GetModState ()
824 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
825void 1025void
1026SDL_PumpEvents ()
1027
1028void
826poll_events () 1029peep_events ()
827 PPCODE: 1030 PPCODE:
828{ 1031{
829 SDL_Event ev; 1032 SDL_Event ev;
830 1033
831 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
838 { 1041 {
839 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
840 case SDL_KEYUP: 1043 case SDL_KEYUP:
841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
843 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);
844 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 */
845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
846 break; 1049 break;
847 1050
848 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
867 x = ev.motion.x; 1070 x = ev.motion.x;
868 y = ev.motion.y; 1071 y = ev.motion.y;
869 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
870 } 1073 }
871 1074
872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
873 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
874 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
875 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
876 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
877 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
897 1100
898 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))));
899 } 1102 }
900} 1103}
901 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
902int 1118int
903Mix_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)
904 POSTCALL: 1120 POSTCALL:
905 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
906 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
907 1123
908void 1124void
909Mix_QuerySpec () 1125Mix_QuerySpec ()
968add_font (char *file) 1184add_font (char *file)
969 CODE: 1185 CODE:
970 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
971 OUTPUT: 1187 OUTPUT:
972 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)
973 1196
974void 1197void
975load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
976 ALIAS: 1199 ALIAS:
977 load_image_file = 1 1200 load_image_file = 1
1023 1246
1024 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1025 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1026 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1027 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1028 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1029 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)));
1030 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1031 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1032 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1033 1256
1093#if DEBUG 1316#if DEBUG
1094 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1095#endif 1318#endif
1096} 1319}
1097 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1098MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1099 1329
1100PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1101 1331
1102DC::Font 1332DC::Font
1103new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1104 CODE: 1334 CODE:
1105{ 1335{
1106 int count; 1336 int count;
1107 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1108 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1137 PROTOTYPE: 1367 PROTOTYPE:
1138 CODE: 1368 CODE:
1139 tc_restore (); 1369 tc_restore ();
1140 1370
1141DC::Layout 1371DC::Layout
1142new (SV *class) 1372new (SV *klass)
1143 CODE: 1373 CODE:
1144 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1145 1375
1146 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1147 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1296 1526
1297void 1527void
1298set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1299 CODE: 1529 CODE:
1300 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1301 { 1531 {
1302 self->base_height = base_height; 1532 self->base_height = base_height;
1303 layout_update_font (self); 1533 layout_update_font (self);
1304 } 1534 }
1305 1535
1306void 1536void
1533 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1534 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1535 } 1765 }
1536} 1766}
1537 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
1538IV 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)
1539 CODE: 1890 CODE:
1540{ 1891{
1541 GLint width; 1892 GLint width;
1542 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);
1549MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1550 1901
1551PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1552 1903
1553DC::Map 1904DC::Map
1554new (SV *class) 1905new (SV *klass)
1555 CODE: 1906 CODE:
1556 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1557 RETVAL->x = 0; 1908 RETVAL->x = 0;
1558 RETVAL->y = 0; 1909 RETVAL->y = 0;
1559 RETVAL->w = 0; 1910 RETVAL->w = 0;
1560 RETVAL->h = 0; 1911 RETVAL->h = 0;
1561 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1598 1949
1599void 1950void
1600set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1601 CODE: 1952 CODE:
1602{ 1953{
1603 tileid texid; 1954 tileid texid;
1604 maptex *tex; 1955 maptex *tex;
1605 1956
1606 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1607 return; 1958 return;
1608 1959
1609 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1610 return; 1961 return;
1611 1962
1612 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1613 1964
1614 if (!texid) 1965 if (!texid)
1615 return; 1966 return;
1616 1967
1617 tex = self->tex + texid; 1968 tex = self->tex + texid;
1646 //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);
1647 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1648 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1650} 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 }
1651 2022
1652int 2023int
1653ox (DC::Map self) 2024ox (DC::Map self)
1654 ALIAS: 2025 ALIAS:
1655 oy = 1 2026 oy = 1
1695 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1696 } 2067 }
1697} 2068}
1698 2069
1699SV * 2070SV *
1700map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1701 CODE: 2072 CODE:
1702{ 2073{
1703 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1704 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1705 mapcell *cell; 2076 mapcell *cell;
1726 2097
1727 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1728 2099
1729 if (flags & 8) 2100 if (flags & 8)
1730 { 2101 {
2102 uint8_t ext, cmd;
2103
1731 if (extmap) 2104 do
1732 { 2105 {
1733 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1734 2108
1735 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
1736 { 2112 {
1737 ext = *data++;
1738 cmd = ext & 0x7f;
1739
1740 if (cmd < 4)
1741 cell->darkness = 255 - ext * 64 + 1;
1742 else if (cmd == 5) // health
1743 {
1744 cell->stat_width = 1; 2113 cell->stat_width = 1;
1745 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1746 }
1747 else if (cmd == 6) // monster width
1748 cell->stat_width = *data++ + 1;
1749 else if (cmd == 0x47)
1750 {
1751 if (*data == 1) cell->player = data [1];
1752 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1753 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1754 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1755
1756 data += *data + 1;
1757 }
1758 else if (cmd == 8) // cell flags
1759 cell->flags = *data++;
1760 else if (ext & 0x40) // unknown, multibyte => skip
1761 data += *data + 1;
1762 else
1763 data++;
1764 } 2115 }
1765 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++;
1766 } 2133 }
1767 else 2134 while (ext & 0x80);
1768 cell->darkness = *data++ + 1;
1769 } 2135 }
1770 2136
1771 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1772 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1773 { 2139 {
1776 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1777 2143
1778 if (cell->tile [z]) 2144 if (cell->tile [z])
1779 { 2145 {
1780 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1781 if (!tex->name) 2148 if (!tex->name)
1782 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1783 2150
1784 if (tex->smoothtile) 2151 if (tex->smoothtile)
1785 { 2152 {
1786 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1787 if (!smooth->name) 2155 if (!smooth->name)
1788 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1789 } 2157 }
1790 } 2158 }
1791 } 2159 }
1819 ? self->row + y 2187 ? self->row + y
1820 : 0; 2188 : 0;
1821 2189
1822 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1823 { 2191 {
1824 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1825 2193
1826 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1827 { 2195 {
1828 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1829 2197
1831 { 2199 {
1832 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1833 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1834 int a1 = tex.a; 2202 int a1 = tex.a;
1835 2203
1836 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1837 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1838 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1839 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1840 } 2208 }
1841 } 2209 }
1842 2210
1843 *map++ = (r ) 2211 *map++ = (r )
1844 | (g << 8) 2212 | (g << 8)
1845 | (b << 16) 2213 | (b << 16)
1846 | (a << 24); 2214 | (a << 24);
1847 } 2215 }
1848 } 2216 }
1849 2217
1850 RETVAL = map_sv; 2218 RETVAL = map_sv;
1851} 2219}
1852 OUTPUT: 2220 OUTPUT:
1853 RETVAL 2221 RETVAL
1854 2222
1855void 2223void
1856draw (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)
1857 CODE: 2225 CODE:
1858{ 2226{
1859 int x, y, z; 2227 int x, y, z;
1860 2228
1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1862 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1863 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!
1864 smooth_key skey;
1865 int pl_x, pl_y; 2230 int pl_x, pl_y;
1866 maptex pl_tex; 2231 maptex pl_tex;
1867 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1868 rc_key_t key; 2234 rc_key_t key;
1869 rc_array_t *arr; 2235 rc_array_t *arr;
1870 2236
1871 pl_tex.name = 0; 2237 pl_tex.name = 0;
1872 2238
1873 // thats current max. sorry. 2239 // that's current max. sorry.
1874 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1875 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1876
1877 // clear key, in case of extra padding
1878 memset (&skey, 0, sizeof (skey));
1879 2242
1880 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1881 key.r = 255; 2244 key.r = 255;
1882 key.g = 255; 2245 key.g = 255;
1883 key.b = 255; 2246 key.b = 255;
1884 key.a = 255; 2247 key.a = 255;
1885 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1886 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
1887 key.texname = -1;
1888 2250
1889 mx += self->x; 2251 mx += self->x;
1890 my += self->y; 2252 my += self->y;
1891 2253
1892 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1893 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1894 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1895 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1896 2258
1897 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1898 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1899 { 2261 {
1900 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1915 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1916 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1917 2279
1918 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1919 { 2281 {
2282 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
1920 memset (smooth_level, 0, sizeof (smooth_level)); 2285 memset (smooth_level, 0, sizeof (smooth_level));
2286 key.texname = -1;
1921 2287
1922 for (y = 0; y < sh; y++) 2288 for (y = 0; y < sh; y++)
1923 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
1924 { 2290 {
1925 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
1931 tileid tile = cell->tile [z]; 2297 tileid tile = cell->tile [z];
1932 2298
1933 if (tile) 2299 if (tile)
1934 { 2300 {
1935 maptex tex = self->tex [tile]; 2301 maptex tex = self->tex [tile];
1936 int px = (x + 1) * T - tex.w; 2302 int px, py;
1937 int py = (y + 1) * T - tex.h;
1938 2303
1939 if (key.texname != tex.name) 2304 if (key.texname != tex.name)
1940 { 2305 {
2306 self->tex [tile].unused = 0;
2307
1941 if (!tex.name) 2308 if (!tex.name)
1942 tex = self->tex [2]; /* missing, replace by noface */ 2309 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1943 2310
1944 key.texname = tex.name; 2311 key.texname = tex.name;
1945 arr = rc_array (rc, &key); 2312 arr = rc_array (rc, &key);
1946 } 2313 }
2314
2315 px = (x + 1) * Th - tex.w;
2316 py = (y + 1) * Tw - tex.h;
1947 2317
1948 if (expect_false (cell->player == player) && expect_false (z == 2)) 2318 if (expect_false (cell->player == player) && expect_false (z == 2))
1949 { 2319 {
1950 pl_x = px; 2320 pl_x = px;
1951 pl_y = py; 2321 pl_y = py;
1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2326 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1957 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2327 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1958 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2328 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1959 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2329 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1960 2330
1961 if (expect_false (cell->flags) && expect_false (z == 2))
1962 {
1963 // overlays such as the speech bubble, probably more to come
1964 if (cell->flags & 1)
1965 {
1966 maptex tex = self->tex [1];
1967 int px = x * T + T * 2 / 32;
1968 int py = y * T - T * 6 / 32;
1969
1970 if (tex.name)
1971 {
1972 if (key.texname != tex.name)
1973 {
1974 key.texname = tex.name;
1975 arr = rc_array (rc, &key);
1976 }
1977
1978 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1979 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1980 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1981 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1982 }
1983 }
1984 }
1985
1986 // update smooth hash 2331 // update smooth hash
1987 if (tex.smoothtile) 2332 if (tex.smoothtile)
1988 { 2333 {
1989 skey.tile = tex.smoothtile; 2334 skey.tile = tex.smoothtile;
1990 skey.level = tex.smoothlevel; 2335 skey.level = tex.smoothlevel;
2005 2350
2006 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2351 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2007 // ·· ·· ·┏ ┓· 2352 // ·· ·· ·┏ ┓·
2008 2353
2009 // full tile 2354 // full tile
2010 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2355 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2011 2356
2012 // borders 2357 // borders
2013 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2358 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2014 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2359 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2015 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2360 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2016 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2361 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2017 2362
2018 // corners 2363 // corners
2019 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2364 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2020 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2365 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2021 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2366 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2022 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2367 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2368 }
2369 }
2370
2371 if (expect_false (z == 2) && expect_false (cell->flags))
2372 {
2373 // overlays such as the speech bubble, probably more to come
2374 if (cell->flags & 1)
2375 {
2376 rc_key_t key_ov = key;
2377 maptex tex = self->tex [TEXID_SPEECH];
2378 rc_array_t *arr;
2379 int px = x * Tw + Tw * 2 / 32;
2380 int py = y * Th - Th * 6 / 32;
2381
2382 key_ov.texname = tex.name;
2383 arr = rc_array (rc_ov, &key_ov);
2384
2385 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2386 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2388 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2023 } 2389 }
2024 } 2390 }
2025 } 2391 }
2026 } 2392 }
2027 2393
2043 if (smask & (((uint32_t)1) << b)) 2409 if (smask & (((uint32_t)1) << b))
2044 { 2410 {
2045 int level = (w << 5) | b; 2411 int level = (w << 5) | b;
2046 HE *he; 2412 HE *he;
2047 2413
2048 hv_iterinit (smooth); 2414 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2049 while ((he = hv_iternext (smooth)))
2050 { 2415 {
2051 smooth_key *skey = (smooth_key *)HeKEY (he); 2416 smooth_key &skey = it->first;
2052 IV bits = SvIVX (HeVAL (he)); 2417 IV bits = it->second;
2053 2418
2054 if (!(bits & 0x1000) 2419 if (!(bits & 0x1000)
2055 && skey->level == level 2420 && skey.level == level
2056 && level > smooth_max [skey->x][skey->y]) 2421 && level > smooth_max [skey.x][skey.y])
2057 { 2422 {
2058 maptex tex = self->tex [skey->tile]; 2423 maptex tex = self->tex [skey.tile];
2059 int px = (((int)skey->x) - 1) * T; 2424 int px = (((int)skey.x) - 1) * Tw;
2060 int py = (((int)skey->y) - 1) * T; 2425 int py = (((int)skey.y) - 1) * Th;
2061 int border = bits & 15; 2426 int border = bits & 15;
2062 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2427 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2063 float dx = tex.s * .0625f; // 16 images/row 2428 float dx = tex.s * .0625f; // 16 images/row
2064 float dy = tex.t * .5f ; // 2 images/column 2429 float dy = tex.t * .5f ; // 2 images/column
2065 2430
2067 { 2432 {
2068 // this time avoiding texture state changes 2433 // this time avoiding texture state changes
2069 // save gobs of state changes. 2434 // save gobs of state changes.
2070 if (key.texname != tex.name) 2435 if (key.texname != tex.name)
2071 { 2436 {
2437 self->tex [skey.tile].unused = 0;
2438
2072 glEnd (); 2439 glEnd ();
2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2440 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2074 glBegin (GL_QUADS); 2441 glBegin (GL_QUADS);
2075 } 2442 }
2076 2443
2077 if (border) 2444 if (border)
2078 { 2445 {
2079 float ox = border * dx; 2446 float ox = border * dx;
2080 2447
2081 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2448 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2082 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2083 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2450 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2084 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2451 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2085 } 2452 }
2086 2453
2087 if (corner) 2454 if (corner)
2088 { 2455 {
2089 float ox = corner * dx; 2456 float ox = corner * dx;
2090 2457
2091 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2458 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2092 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2459 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2093 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2460 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2094 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2461 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2095 } 2462 }
2096 } 2463 }
2097 } 2464 }
2098 } 2465 }
2099 } 2466 }
2101 2468
2102 glEnd (); 2469 glEnd ();
2103 glDisable (GL_TEXTURE_2D); 2470 glDisable (GL_TEXTURE_2D);
2104 key.texname = -1; 2471 key.texname = -1;
2105 } 2472 }
2106
2107 hv_clear (smooth);
2108 } 2473 }
2109 2474
2110 if (pl_tex.name) 2475 if (pl_tex.name)
2111 { 2476 {
2112 maptex tex = pl_tex; 2477 maptex tex = pl_tex;
2122 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2487 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2123 2488
2124 rc_draw (rc); 2489 rc_draw (rc);
2125 } 2490 }
2126 2491
2492 rc_draw (rc_ov);
2493 rc_clear (rc_ov);
2494
2127 glDisable (GL_BLEND); 2495 glDisable (GL_BLEND);
2128 rc_free (rc); 2496 rc_free (rc);
2497 rc_free (rc_ov);
2129 2498
2130 // top layer: overlays such as the health bar 2499 // top layer: overlays such as the health bar
2131 for (y = 0; y < sh; y++) 2500 for (y = 0; y < sh; y++)
2132 if (0 <= y + my && y + my < self->rows) 2501 if (0 <= y + my && y + my < self->rows)
2133 { 2502 {
2136 for (x = 0; x < sw; x++) 2505 for (x = 0; x < sw; x++)
2137 if (row->c0 <= x + mx && x + mx < row->c1) 2506 if (row->c0 <= x + mx && x + mx < row->c1)
2138 { 2507 {
2139 mapcell *cell = row->col + (x + mx - row->c0); 2508 mapcell *cell = row->col + (x + mx - row->c0);
2140 2509
2141 int px = x * T; 2510 int px = x * Tw;
2142 int py = y * T; 2511 int py = y * Th;
2512
2513 if (expect_false (cell->player == player))
2514 {
2515 px += sdx;
2516 py += sdy;
2517 }
2143 2518
2144 if (cell->stat_hp) 2519 if (cell->stat_hp)
2145 { 2520 {
2146 int width = cell->stat_width * T; 2521 int width = cell->stat_width * Tw;
2147 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2522 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2148 2523
2149 glColor3ub (0, 0, 0); 2524 glColor3ub (0, 0, 0);
2150 glRectf (px + 1, py - thick - 2, 2525 glRectf (px + 1, py - thick - 2,
2151 px + width - 1, py); 2526 px + width - 1, py);
2152 2527
2158 } 2533 }
2159 } 2534 }
2160} 2535}
2161 2536
2162void 2537void
2163draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2538draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2164 CODE: 2539 CODE:
2165{ 2540{
2166 static float color[16][3] = { 2541 static float color[16][3] = {
2167 { 0.00F, 0.00F, 0.00F }, 2542 { 0.00f, 0.00f, 0.00f },
2168 { 1.00F, 1.00F, 1.00F }, 2543 { 1.00f, 1.00f, 1.00f },
2169 { 0.00F, 0.00F, 0.55F }, 2544 { 0.00f, 0.00f, 0.55f },
2170 { 1.00F, 0.00F, 0.00F }, 2545 { 1.00f, 0.00f, 0.00f },
2171 2546
2172 { 1.00F, 0.54F, 0.00F }, 2547 { 1.00f, 0.54f, 0.00f },
2173 { 0.11F, 0.56F, 1.00F }, 2548 { 0.11f, 0.56f, 1.00f },
2174 { 0.93F, 0.46F, 0.00F }, 2549 { 0.93f, 0.46f, 0.00f },
2175 { 0.18F, 0.54F, 0.34F }, 2550 { 0.18f, 0.54f, 0.34f },
2176 2551
2177 { 0.56F, 0.73F, 0.56F }, 2552 { 0.56f, 0.73f, 0.56f },
2178 { 0.80F, 0.80F, 0.80F }, 2553 { 0.80f, 0.80f, 0.80f },
2179 { 0.55F, 0.41F, 0.13F }, 2554 { 0.55f, 0.41f, 0.13f },
2180 { 0.99F, 0.77F, 0.26F }, 2555 { 0.99f, 0.77f, 0.26f },
2181 2556
2182 { 0.74F, 0.65F, 0.41F }, 2557 { 0.74f, 0.65f, 0.41f },
2183 2558
2184 { 0.00F, 1.00F, 1.00F }, 2559 { 0.00f, 1.00f, 1.00f },
2185 { 1.00F, 0.00F, 1.00F }, 2560 { 1.00f, 0.00f, 1.00f },
2186 { 1.00F, 1.00F, 0.00F }, 2561 { 1.00f, 1.00f, 0.00f },
2187 }; 2562 };
2188 2563
2189 int x, y; 2564 int x, y;
2190 2565
2191 glEnable (GL_TEXTURE_2D); 2566 glEnable (GL_TEXTURE_2D);
2567 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2568 * but the nvidia driver (185.18.14) mishandles alpha textures
2569 * and takes the colour from god knows where instead of using
2570 * Cp. MODULATE results in the same colour, but slightly different
2571 * alpha, but atcually gives us the correct colour with nvidia.
2572 */
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2573 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2193 glEnable (GL_BLEND); 2574 glEnable (GL_BLEND);
2194 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2575 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2195 glBegin (GL_QUADS); 2576 glBegin (GL_QUADS);
2196 2577
2197 for (y = 0; y < h; y++) 2578 for (y = 0; y < h; y++)
2201 2582
2202 if (m) 2583 if (m)
2203 { 2584 {
2204 float *c = color [m & 15]; 2585 float *c = color [m & 15];
2205 2586
2206 float tx1 = m & 0x40 ? 0.5 : 0.; 2587 float tx1 = m & 0x40 ? 0.5f : 0.f;
2207 float tx2 = tx1 + 0.5; 2588 float tx2 = tx1 + 0.5f;
2208 2589
2209 glColor4f (c[0], c[1], c[2], 0.75); 2590 glColor4f (c[0], c[1], c[2], 1);
2210 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2591 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2211 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2592 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2212 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2593 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2213 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2594 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2214 } 2595 }
2222void 2603void
2223fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2604fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2224 PPCODE: 2605 PPCODE:
2225{ 2606{
2226 int x, y; 2607 int x, y;
2227 int sw1 = sw + 2; 2608 int sw1 = sw + 2;
2228 int sh1 = sh + 2; 2609 int sh1 = sh + 2;
2229 int sh3 = sh * 3; 2610 int sh3 = sh * 3;
2230 int sw34 = (sw * 3 + 3) & ~3; 2611 int sw3 = sw * 3;
2612 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2613 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2231 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2614 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2232 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2615 memset (darkness1, 0, sw1*sh1);
2233 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2234 2616
2235 SvPOK_only (darkness3_sv); 2617 SvPOK_only (darkness3_sv);
2236 SvCUR_set (darkness3_sv, sw34 * sh3); 2618 SvCUR_set (darkness3_sv, sw3 * sh3);
2237 2619
2238 mx += self->x - 1; 2620 mx += self->x - 1;
2239 my += self->y - 1; 2621 my += self->y - 1;
2240
2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2242 2622
2243 for (y = 0; y < sh1; y++) 2623 for (y = 0; y < sh1; y++)
2244 if (0 <= y + my && y + my < self->rows) 2624 if (0 <= y + my && y + my < self->rows)
2245 { 2625 {
2246 maprow *row = self->row + (y + my); 2626 maprow *row = self->row + (y + my);
2249 if (row->c0 <= x + mx && x + mx < row->c1) 2629 if (row->c0 <= x + mx && x + mx < row->c1)
2250 { 2630 {
2251 mapcell *cell = row->col + (x + mx - row->c0); 2631 mapcell *cell = row->col + (x + mx - row->c0);
2252 2632
2253 darkness1 [y * sw1 + x] = cell->darkness 2633 darkness1 [y * sw1 + x] = cell->darkness
2254 ? 255 - (cell->darkness - 1) 2634 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2255 : 255 - FOW_DARKNESS; 2635 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2256 } 2636 }
2257 } 2637 }
2258 2638
2259 for (y = 0; y < sh; ++y) 2639 for (y = 0; y < sh; ++y)
2260 for (x = 0; x < sw; ++x) 2640 for (x = 0; x < sw; ++x)
2279 2659
2280 uint8_t r13 = (d13 + d23 + d12) / 3; 2660 uint8_t r13 = (d13 + d23 + d12) / 3;
2281 uint8_t r23 = d23; 2661 uint8_t r23 = d23;
2282 uint8_t r33 = (d23 + d33 + d32) / 3; 2662 uint8_t r33 = (d23 + d33 + d32) / 3;
2283 2663
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2664 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2285 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2665 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2286 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2667 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2288 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2668 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2289 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2670 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2291 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2671 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2292 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2293 } 2673 }
2294 2674
2295 free (darkness1); 2675 free (darkness1);
2296 2676
2297 EXTEND (SP, 3); 2677 EXTEND (SP, 3);
2298 PUSHs (sv_2mortal (newSViv (sw34))); 2678 PUSHs (sv_2mortal (newSViv (sw3)));
2299 PUSHs (sv_2mortal (newSViv (sh3))); 2679 PUSHs (sv_2mortal (newSViv (sh3)));
2300 PUSHs (darkness3_sv); 2680 PUSHs (darkness3_sv);
2301} 2681}
2302 2682
2303SV * 2683SV *
2366 else 2746 else
2367 *data++ = 0; 2747 *data++ = 0;
2368 } 2748 }
2369 } 2749 }
2370 2750
2371 /* if size is w*h + 5 then no data has been found */ 2751 /* if size is w*h + 5 then no data has been found */
2372 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2752 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2373 { 2753 {
2374 SvPOK_only (data_sv); 2754 SvPOK_only (data_sv);
2375 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2755 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2376 } 2756 }
2377 2757
2378 RETVAL = data_sv; 2758 RETVAL = data_sv;
2379} 2759}
2380 OUTPUT: 2760 OUTPUT:
2381 RETVAL 2761 RETVAL
2382 2762
2383void 2763void
2390 STRLEN len; 2770 STRLEN len;
2391 uint8_t *data, *end; 2771 uint8_t *data, *end;
2392 2772
2393 len = SvLEN (data_sv); 2773 len = SvLEN (data_sv);
2394 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2774 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2395 data = SvPVbyte_nolen (data_sv); 2775 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2396 end = data + len + 8; 2776 end = data + len + 8;
2397 2777
2398 if (len < 5) 2778 if (len < 5)
2399 XSRETURN_EMPTY; 2779 XSRETURN_EMPTY;
2400 2780
2461} 2841}
2462 2842
2463MODULE = Deliantra::Client PACKAGE = DC::RW 2843MODULE = Deliantra::Client PACKAGE = DC::RW
2464 2844
2465DC::RW 2845DC::RW
2466new (SV *class, SV *data_sv) 2846new (SV *klass, SV *data_sv)
2467 CODE: 2847 CODE:
2468{ 2848{
2469 STRLEN datalen; 2849 STRLEN datalen;
2470 char *data = SvPVbyte (data_sv, datalen); 2850 char *data = SvPVbyte (data_sv, datalen);
2471 2851
2473} 2853}
2474 OUTPUT: 2854 OUTPUT:
2475 RETVAL 2855 RETVAL
2476 2856
2477DC::RW 2857DC::RW
2478new_from_file (SV *class, const char *path, const char *mode = "rb") 2858new_from_file (SV *klass, const char *path, const char *mode = "rb")
2479 CODE: 2859 CODE:
2480 RETVAL = SDL_RWFromFile (path, mode); 2860 RETVAL = SDL_RWFromFile (path, mode);
2481 OUTPUT: 2861 OUTPUT:
2482 RETVAL 2862 RETVAL
2483 2863
2501 if (RETVAL < 0) 2881 if (RETVAL < 0)
2502 { 2882 {
2503 RETVAL = Mix_GroupOldest (-1); 2883 RETVAL = Mix_GroupOldest (-1);
2504 2884
2505 if (RETVAL < 0) 2885 if (RETVAL < 0)
2886 {
2887 // happens sometimes, maybe it just stopped playing(?)
2888 RETVAL = Mix_GroupAvailable (-1);
2889
2890 if (RETVAL < 0)
2506 XSRETURN_UNDEF; 2891 XSRETURN_UNDEF;
2507 2892 }
2893 else
2508 Mix_HaltChannel (RETVAL); 2894 Mix_HaltChannel (RETVAL);
2509 } 2895 }
2510 2896
2511 Mix_UnregisterAllEffects (RETVAL); 2897 Mix_UnregisterAllEffects (RETVAL);
2512 Mix_Volume (RETVAL, 128); 2898 Mix_Volume (RETVAL, 128);
2513} 2899}
2560void 2946void
2561set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2947set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2562 CODE: 2948 CODE:
2563{ 2949{
2564 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2950 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2565 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2951 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2566 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2952 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2567} 2953}
2568 2954
2569void 2955void
2570set_reverse_stereo (DC::Channel self, int flip) 2956set_reverse_stereo (DC::Channel self, int flip)
2573 2959
2574MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2960MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2575 2961
2576PROTOTYPES: DISABLE 2962PROTOTYPES: DISABLE
2577 2963
2964void
2965decoders ()
2966 PPCODE:
2967#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2968 int i, num = Mix_GetNumChunkDecoders ();
2969 EXTEND (SP, num);
2970 for (i = 0; i < num; ++i)
2971 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2972#else
2973 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2974#endif
2975
2578DC::MixChunk 2976DC::MixChunk
2579new (SV *class, DC::RW rwops) 2977new (SV *klass, DC::RW rwops)
2580 CODE: 2978 CODE:
2581 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2979 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2582 OUTPUT: 2980 OUTPUT:
2583 RETVAL 2981 RETVAL
2584 2982
2614 OUTPUT: 3012 OUTPUT:
2615 RETVAL 3013 RETVAL
2616 3014
2617MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3015MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2618 3016
3017void
3018decoders ()
3019 PPCODE:
3020#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3021 int i, num = Mix_GetNumMusicDecoders ();
3022 EXTEND (SP, num);
3023 for (i = 0; i < num; ++i)
3024 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3025#else
3026 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3027#endif
3028
2619int 3029int
2620volume (int volume = -1) 3030volume (int volume = -1)
2621 PROTOTYPE: ;$ 3031 PROTOTYPE: ;$
2622 CODE: 3032 CODE:
2623 if (items > 0) 3033 if (items > 0)
2634void 3044void
2635halt () 3045halt ()
2636 CODE: 3046 CODE:
2637 Mix_HaltMusic (); 3047 Mix_HaltMusic ();
2638 3048
3049int
3050playing ()
3051 CODE:
3052 RETVAL = Mix_PlayingMusic ();
3053 OUTPUT:
3054 RETVAL
3055
2639DC::MixMusic 3056DC::MixMusic
2640new (SV *class, DC::RW rwops) 3057new (SV *klass, DC::RW rwops)
2641 CODE: 3058 CODE:
2642 RETVAL = Mix_LoadMUS_RW (rwops); 3059 RETVAL = Mix_LoadMUS_RW (rwops);
2643 OUTPUT: 3060 OUTPUT:
2644 RETVAL 3061 RETVAL
2645 3062
2673 } *civ, const_iv[] = { 3090 } *civ, const_iv[] = {
2674# define const_iv(name) { # name, (IV)name } 3091# define const_iv(name) { # name, (IV)name }
2675 const_iv (GL_VENDOR), 3092 const_iv (GL_VENDOR),
2676 const_iv (GL_VERSION), 3093 const_iv (GL_VERSION),
2677 const_iv (GL_EXTENSIONS), 3094 const_iv (GL_EXTENSIONS),
3095 const_iv (GL_MAX_TEXTURE_UNITS),
2678 const_iv (GL_COLOR_MATERIAL), 3096 const_iv (GL_COLOR_MATERIAL),
2679 const_iv (GL_SMOOTH), 3097 const_iv (GL_SMOOTH),
2680 const_iv (GL_FLAT), 3098 const_iv (GL_FLAT),
2681 const_iv (GL_DITHER), 3099 const_iv (GL_DITHER),
2682 const_iv (GL_BLEND), 3100 const_iv (GL_BLEND),
2694 const_iv (GL_ZERO), 3112 const_iv (GL_ZERO),
2695 const_iv (GL_SRC_ALPHA), 3113 const_iv (GL_SRC_ALPHA),
2696 const_iv (GL_DST_ALPHA), 3114 const_iv (GL_DST_ALPHA),
2697 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3115 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2698 const_iv (GL_ONE_MINUS_DST_ALPHA), 3116 const_iv (GL_ONE_MINUS_DST_ALPHA),
3117 const_iv (GL_SRC_COLOR),
3118 const_iv (GL_DST_COLOR),
3119 const_iv (GL_ONE_MINUS_SRC_COLOR),
3120 const_iv (GL_ONE_MINUS_DST_COLOR),
2699 const_iv (GL_SRC_ALPHA_SATURATE), 3121 const_iv (GL_SRC_ALPHA_SATURATE),
2700 const_iv (GL_RGB), 3122 const_iv (GL_RGB),
2701 const_iv (GL_RGBA), 3123 const_iv (GL_RGBA),
2702 const_iv (GL_RGBA4), 3124 const_iv (GL_RGBA4),
2703 const_iv (GL_RGBA8), 3125 const_iv (GL_RGBA8),
2771 const_iv (GL_NICEST), 3193 const_iv (GL_NICEST),
2772 const_iv (GL_V2F), 3194 const_iv (GL_V2F),
2773 const_iv (GL_V3F), 3195 const_iv (GL_V3F),
2774 const_iv (GL_T2F_V3F), 3196 const_iv (GL_T2F_V3F),
2775 const_iv (GL_T2F_N3F_V3F), 3197 const_iv (GL_T2F_N3F_V3F),
3198 const_iv (GL_FUNC_ADD),
3199 const_iv (GL_FUNC_SUBTRACT),
3200 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2776# undef const_iv 3201# undef const_iv
2777 }; 3202 };
2778 3203
2779 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3204 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2780 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3205 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2781 3206
2782 texture_av = newAV (); 3207 texture_av = newAV ();
2783 AvREAL_off (texture_av); 3208 AvREAL_off (texture_av);
2784} 3209}
2785 3210
2787disable_GL_EXT_blend_func_separate () 3212disable_GL_EXT_blend_func_separate ()
2788 CODE: 3213 CODE:
2789 gl.BlendFuncSeparate = 0; 3214 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0; 3215 gl.BlendFuncSeparateEXT = 0;
2791 3216
2792char * 3217void
3218apple_nvidia_bug (int enable)
3219
3220const char *
2793gl_vendor () 3221gl_vendor ()
2794 CODE: 3222 CODE:
2795 RETVAL = (char *)glGetString (GL_VENDOR); 3223 RETVAL = (const char *)glGetString (GL_VENDOR);
2796 OUTPUT: 3224 OUTPUT:
2797 RETVAL 3225 RETVAL
2798 3226
2799char * 3227const char *
2800gl_version () 3228gl_version ()
2801 CODE: 3229 CODE:
2802 RETVAL = (char *)glGetString (GL_VERSION); 3230 RETVAL = (const char *)glGetString (GL_VERSION);
2803 OUTPUT: 3231 OUTPUT:
2804 RETVAL 3232 RETVAL
2805 3233
2806char * 3234const char *
2807gl_extensions () 3235gl_extensions ()
2808 CODE: 3236 CODE:
2809 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3237 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2810 OUTPUT: 3238 OUTPUT:
2811 RETVAL 3239 RETVAL
2812 3240
2813const char *glGetString (GLenum pname) 3241const char *glGetString (GLenum pname)
3242 CODE:
3243 RETVAL = (const char *)glGetString (pname);
3244 OUTPUT:
3245 RETVAL
2814 3246
2815GLint glGetInteger (GLenum pname) 3247GLint glGetInteger (GLenum pname)
2816 CODE: 3248 CODE:
2817 glGetIntegerv (pname, &RETVAL); 3249 glGetIntegerv (pname, &RETVAL);
2818 OUTPUT: 3250 OUTPUT:
2826 3258
2827int glGetError () 3259int glGetError ()
2828 3260
2829void glFinish () 3261void glFinish ()
2830 3262
3263void glFlush ()
3264
2831void glClear (int mask) 3265void glClear (int mask)
2832 3266
2833void glClearColor (float r, float g, float b, float a = 1.0) 3267void glClearColor (float r, float g, float b, float a = 1.0)
2834 PROTOTYPE: @ 3268 PROTOTYPE: @
2835 3269
2844void glBlendFunc (int sfactor, int dfactor) 3278void glBlendFunc (int sfactor, int dfactor)
2845 3279
2846void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3280void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2847 CODE: 3281 CODE:
2848 gl_BlendFuncSeparate (sa, da, saa, daa); 3282 gl_BlendFuncSeparate (sa, da, saa, daa);
3283
3284# void glBlendEquation (int se)
2849 3285
2850void glDepthMask (int flag) 3286void glDepthMask (int flag)
2851 3287
2852void glLogicOp (int opcode) 3288void glLogicOp (int opcode)
2853 3289
2888void glRotate (float angle, float x, float y, float z) 3324void glRotate (float angle, float x, float y, float z)
2889 CODE: 3325 CODE:
2890 glRotatef (angle, x, y, z); 3326 glRotatef (angle, x, y, z);
2891 3327
2892void glColor (float r, float g, float b, float a = 1.0) 3328void glColor (float r, float g, float b, float a = 1.0)
3329 PROTOTYPE: @
2893 ALIAS: 3330 ALIAS:
2894 glColor_premultiply = 1 3331 glColor_premultiply = 1
2895 CODE: 3332 CODE:
2896 if (ix) 3333 if (ix)
2897 { 3334 {
3003 3440
3004void glEndList () 3441void glEndList ()
3005 3442
3006void glCallList (int list) 3443void glCallList (int list)
3007 3444
3445void c_init ()
3446 CODE:
3447 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3448 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3449
3008MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3450MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3009 3451
3010PROTOTYPES: DISABLE 3452PROTOTYPES: DISABLE
3011 3453
3012void 3454void
3013find_widget (SV *self, NV x, NV y) 3455find_widget (SV *self, NV x, NV y)
3014 PPCODE: 3456 PPCODE:
3015{ 3457{
3016 if (within_widget (self, x, y)) 3458 if (within_widget (self, x, y))
3017 XPUSHs (self); 3459 XPUSHs (self);
3018} 3460}
3019 3461
3020BOOT: 3462BOOT:
3021{ 3463{
3029 3471
3030void 3472void
3031draw (SV *self) 3473draw (SV *self)
3032 CODE: 3474 CODE:
3033{ 3475{
3034 HV *hv; 3476 HV *hv;
3035 SV **svp; 3477 SV **svp;
3036 NV x, y, w, h; 3478 NV x, y, w, h;
3037 SV *draw_x_sv = GvSV (draw_x_gv); 3479 SV *draw_x_sv = GvSV (draw_x_gv);
3038 SV *draw_y_sv = GvSV (draw_y_gv); 3480 SV *draw_y_sv = GvSV (draw_y_gv);
3039 SV *draw_w_sv = GvSV (draw_w_gv); 3481 SV *draw_w_sv = GvSV (draw_w_gv);
3040 SV *draw_h_sv = GvSV (draw_h_gv); 3482 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines