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.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 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 atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
33 38
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 40
36#include <SDL.h> 41#include <SDL.h>
37#include <SDL_thread.h> 42#include <SDL_thread.h>
41#include <SDL_opengl.h> 46#include <SDL_opengl.h>
42 47
43/* work around os x broken headers */ 48/* work around os x broken headers */
44#ifdef __MACOSX__ 49#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
46#endif 53#endif
47 54
48#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
50 57
51#include <glib/gmacros.h> 58#include <glib.h>
52 59
53#include <pango/pango.h> 60#include <pango/pango.h>
54 61
55#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
80#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
82 89
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 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 */
85#define FOW_DARKNESS 64 94#define FOW_DARKNESS 50
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 95#define DARKNESS_ADJUST(n) (n)
87 96
88#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
90 99
91#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
95 104
96#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
97 106
98#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 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}
101 128
102static AV *texture_av; 129static AV *texture_av;
103 130
104static struct 131static struct
105{ 132{
162{ 189{
163 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
164 191
165 while (attrs) 192 while (attrs)
166 { 193 {
167 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 195
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 197 return 1;
171 198
172 attrs = attrs->next; 199 attrs = attrs->next;
173 } 200 }
174 201
175 return 0; 202 return 0;
176} 203}
177 204
178typedef struct cf_layout { 205struct cf_layout {
179 PangoLayout *pl; 206 PangoLayout *pl;
180 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
181 int base_height; 208 int base_height;
182 DC__Font font; 209 DC__Font font;
183 rc_t *rc; 210 rc_t rc;
184} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
185 214
186static DC__Font default_font; 215static DC__Font default_font;
187static PangoContext *opengl_context; 216static PangoContext *opengl_context;
188static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
189 218
190static void 219static void
191substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
192{ 221{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 225#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 227}
199 228
200static void 229static void
230} 259}
231 260
232typedef uint16_t tileid; 261typedef uint16_t tileid;
233typedef uint16_t faceid; 262typedef uint16_t faceid;
234 263
235typedef struct { 264struct maptex
265{
236 GLuint name; 266 GLuint name;
237 int w, h; 267 int w, h;
238 float s, t; 268 float s, t;
239 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
240 tileid smoothtile; 270 tileid smoothtile;
241 uint8_t smoothlevel; 271 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
243} maptex; 273};
244 274
245typedef struct { 275struct mapcell
276{
246 uint32_t player; 277 uint32_t player;
247 tileid tile[3]; 278 tileid tile[3];
248 uint16_t darkness; 279 uint16_t darkness;
249 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
250} mapcell; 281};
251 282
252typedef struct { 283struct maprow
284{
253 int32_t c0, c1; 285 int32_t c0, c1;
254 mapcell *col; 286 mapcell *col;
255} maprow; 287};
256 288
257typedef struct map { 289struct mapgrid {
258 int x, y, w, h; 290 int x, y, w, h;
259 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
260 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
261 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
262 294
263 int32_t rows; 295 int32_t rows;
264 maprow *row; 296 maprow *row;
265} *DC__Map; 297};
266 298
267static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
268prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
269{ 304{
270 char *p; 305 T *p;
271 306
272 New (0, p, sze + inc, char); 307 Newxz (p, sze + inc, T);
273 Zero (p, inc, char);
274 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
275 Safefree (ptr); 309 Safefree (ptr);
276 310
277 return p; 311 ptr = p;
278} 312}
279 313
280static char * 314template<typename T>
281append (char *ptr, int sze, int inc)
282{
283 Renew (ptr, sze + inc, char);
284 Zero (ptr + sze, inc, char);
285
286 return ptr;
287}
288
289#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
290#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291
292static void 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
293need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
294{ 324{
295 while (self->faces <= face) 325 while (self->faces <= face)
296 { 326 {
297 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
298 self->faces *= 2; 328 self->faces *= 2;
299 } 329 }
300} 330}
301 331
302static void 332static void
303need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
304{ 334{
305 while (self->texs <= texid) 335 while (self->texs <= texid)
306 { 336 {
307 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
308 self->texs *= 2; 338 self->texs *= 2;
309 } 339 }
310} 340}
311 341
312static maprow * 342static maprow *
313map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
314{ 344{
315 if (0 > y) 345 if (0 > y)
316 { 346 {
317 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
318 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
319 349
320 self->rows += extend; 350 self->rows += extend;
321 self->y += extend; 351 self->y += extend;
322 y += extend; 352 y += extend;
323 } 353 }
324 else if (y >= self->rows) 354 else if (y >= self->rows)
325 { 355 {
326 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
327 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
328 self->rows += extend; 358 self->rows += extend;
329 } 359 }
330 360
331 return self->row + y; 361 return self->row + y;
332} 362}
342 } 372 }
343 373
344 if (row->c0 > x) 374 if (row->c0 > x)
345 { 375 {
346 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
347 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
348 row->c0 -= extend; 378 row->c0 -= extend;
349 } 379 }
350 else if (x >= row->c1) 380 else if (x >= row->c1)
351 { 381 {
352 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
353 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
354 row->c1 += extend; 384 row->c1 += extend;
355 } 385 }
356 386
357 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
358} 388}
359 389
360static mapcell * 390static mapcell *
361map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
362{ 392{
363 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
364} 394}
365 395
366static void 396static void
367map_clear (DC__Map self) 397map_clear (mapgrid *self)
368{ 398{
369 int r; 399 int r;
370 400
371 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
372 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
390 (cell)->flags = 0; \ 420 (cell)->flags = 0; \
391 (cell)->player = 0; \ 421 (cell)->player = 0; \
392 } while (0) 422 } while (0)
393 423
394static void 424static void
395map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
396{ 426{
397 int x, y; 427 int x, y;
398 maprow *row; 428 maprow *row;
399 mapcell *cell; 429 mapcell *cell;
400 430
417 CELL_CLEAR (cell); 447 CELL_CLEAR (cell);
418 } 448 }
419 } 449 }
420} 450}
421 451
422typedef struct { 452struct smooth_key
453{
423 tileid tile; 454 tileid tile;
424 uint8_t x, y, level; 455 uint8_t x, y, level;
425} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
426 475
427static void 476static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 478{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
431 480
432 if (SvIOK (*sv)) 481 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
434 else 483 else
435 sv_setiv (*sv, bits); 484 it->second |= bits;
436} 485}
437 486
438static void 487static void
439music_finished (void) 488music_finished (void)
440{ 489{
457 ev.code = 1; 506 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 508 ev.data2 = 0;
460 509
461 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
462} 518}
463 519
464static unsigned int 520static unsigned int
465minpot (unsigned int n) 521minpot (unsigned int n)
466{ 522{
549 605
550 return mod; 606 return mod;
551} 607}
552 608
553static void 609static void
554deliantra_main () 610deliantra_main (SV *real_main)
555{ 611{
556 char *argv[] = { 0 }; 612 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
558} 616}
559 617
560#ifdef __MACOSX__ 618#ifdef __MACOSX__
619 static SV *real_main;
620
561 /* to due surprising braindamage on the side of SDL design, we 621 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 622 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which, 623 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 625 * and which calls our main (== SDL_main) back.
566 */ 626 */
567 extern C_LINKAGE int 627 extern C_LINKAGE int
568 main (int argc, char *argv[]) 628 main (int argc, char *argv[])
569 { 629 {
570 deliantra_main (); 630 deliantra_main (real_main);
571 } 631 }
572 632
573 #undef main 633 #undef main
574 634
575 extern C_LINKAGE int main (int argc, char *argv[]); 635 extern C_LINKAGE int main (int argc, char *argv[]);
576 636
577 static void 637 static void
578 SDL_braino (void) 638 SDL_main_hack (SV *real_main_)
579 { 639 {
640 real_main = real_main_;
641
580 char *argv[] = { "deliantra client", 0 }; 642 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 643 (main) (1, argv);
582 } 644 }
583#else 645#else
584 static void 646 static void
585 SDL_braino (void) 647 SDL_main_hack (SV *real_main)
586 { 648 {
587 deliantra_main (); 649 deliantra_main (real_main);
588 } 650 }
589#endif 651#endif
590 652
591MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
592 654
793 855
794 const_iv (FOW_DARKNESS) 856 const_iv (FOW_DARKNESS)
795# undef const_iv 857# undef const_iv
796 }; 858 };
797 859
798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 862
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 865}
804 866
843#endif 905#endif
844} 906}
845 907
846char *SDL_GetError () 908char *SDL_GetError ()
847 909
848void SDL_braino () 910void SDL_main_hack (SV *real_main)
911 PROTOTYPE: &
849 912
850int SDL_Init (U32 flags) 913int SDL_Init (U32 flags)
851 914
852int SDL_InitSubSystem (U32 flags) 915int SDL_InitSubSystem (U32 flags)
853 916
854void SDL_QuitSubSystem (U32 flags) 917void SDL_QuitSubSystem (U32 flags)
855 918
856void SDL_Quit () 919void SDL_Quit ()
857 920
858int SDL_GL_SetAttribute (int attr, int value) 921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
859 923
860int SDL_GL_GetAttribute (int attr) 924int SDL_GL_GetAttribute (int attr)
861 CODE: 925 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL)) 926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
863 XSRETURN_UNDEF; 927 XSRETURN_UNDEF;
864 OUTPUT: 928 OUTPUT:
865 RETVAL 929 RETVAL
866 930
867void 931void
922 ); 986 );
923 987
924 if (RETVAL) 988 if (RETVAL)
925 { 989 {
926 av_clear (texture_av); 990 av_clear (texture_av);
927
928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
930#include "glfunc.h" 992#include "glfunc.h"
931#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932 } 996 }
933} 997}
934 OUTPUT: 998 OUTPUT:
935 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
936 1003
937void 1004void
938SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
939 1006
940char * 1007char *
941SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
942 1010
943int 1011int
944SDL_GetAppState () 1012SDL_GetAppState ()
945 1013
946int 1014int
947SDL_GetModState () 1015SDL_GetModState ()
948 1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
949void 1021void
1022SDL_PumpEvents ()
1023
1024void
950poll_events () 1025peep_events ()
951 PPCODE: 1026 PPCODE:
952{ 1027{
953 SDL_Event ev; 1028 SDL_Event ev;
954 1029
955 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
1021 1096
1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1023 } 1098 }
1024} 1099}
1025 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
1026int 1114int
1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1028 POSTCALL: 1116 POSTCALL:
1029 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
1030 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
1031 1119
1032void 1120void
1033Mix_QuerySpec () 1121Mix_QuerySpec ()
1092add_font (char *file) 1180add_font (char *file)
1093 CODE: 1181 CODE:
1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT: 1183 OUTPUT:
1096 RETVAL 1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1097 1192
1098void 1193void
1099load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
1100 ALIAS: 1195 ALIAS:
1101 load_image_file = 1 1196 load_image_file = 1
1147 1242
1148 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
1149 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
1150 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
1151 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
1152 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1153 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1154 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1155 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1156 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
1157 1252
1229MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1230 1325
1231PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1232 1327
1233DC::Font 1328DC::Font
1234new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1235 CODE: 1330 CODE:
1236{ 1331{
1237 int count; 1332 int count;
1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1239 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1268 PROTOTYPE: 1363 PROTOTYPE:
1269 CODE: 1364 CODE:
1270 tc_restore (); 1365 tc_restore ();
1271 1366
1272DC::Layout 1367DC::Layout
1273new (SV *class) 1368new (SV *klass)
1274 CODE: 1369 CODE:
1275 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1276 1371
1277 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1278 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1279 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1280 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1281 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1282 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1283 RETVAL->font = 0; 1378 RETVAL->font = 0;
1284 RETVAL->rc = rc_alloc ();
1285 1379
1286 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1287 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1288 OUTPUT: 1382 OUTPUT:
1289 RETVAL 1383 RETVAL
1290 1384
1291void 1385void
1292DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1293 CODE: 1387 CODE:
1294 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1295 rc_free (self->rc);
1296 Safefree (self); 1389 delete self;
1297 1390
1298void 1391void
1299set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1300 CODE: 1393 CODE:
1301{ 1394{
1427 1520
1428void 1521void
1429set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1430 CODE: 1523 CODE:
1431 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1432 { 1525 {
1433 self->base_height = base_height; 1526 self->base_height = base_height;
1434 layout_update_font (self); 1527 layout_update_font (self);
1435 } 1528 }
1436 1529
1437void 1530void
1555} 1648}
1556 1649
1557void 1650void
1558render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1559 CODE: 1652 CODE:
1560 rc_clear (self->rc); 1653 self->rc.clear ();
1561 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1562 self->pl, 1655 self->pl,
1563 self->rc, 1656 &self->rc,
1564 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1565 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1566 flags 1659 flags
1567 ); 1660 );
1568 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1579 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1580 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1581 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1582 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1583 1676
1584 rc_draw (self->rc); 1677 self->rc.draw ();
1585 1678
1586 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1587 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1588 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1589} 1682}
1665 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1666 } 1759 }
1667} 1760}
1668 1761
1669void 1762void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 1763draw_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)
1671 PROTOTYPE: @ 1764 PROTOTYPE: @
1672 CODE: 1765 CODE:
1673{ 1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674 glEnable (GL_TEXTURE_2D); 1769 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1770 glBindTexture (GL_TEXTURE_2D, name1);
1678 1771
1679 glColor3f (intensity, intensity, intensity); 1772 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix (); 1773 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.); 1774 glScalef (1./3, 1./3, 1.);
1682 1775
1683 if (blend > 0.f) 1776 if (blend > 0.f)
1684 { 1777 {
1685 float S2, T2; /* 0. 0. for texture 2 */ 1778 float dx3 = dx * -3.f / w;
1686 float w = w1 > w2 ? w1 : w2; 1779 float dy3 = dy * -3.f / h;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend }; 1780 GLfloat env_color[4] = { 0., 0., 0., blend };
1689 1781
1690 /* interpolate the two shadow textures */ 1782 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1783 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1784 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1697 glBindTexture (GL_TEXTURE_2D, name2); 1789 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699 1791
1700 /* rgb == rgb(glcolor) */ 1792 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1793 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704 1796
1705 /* alpha = interpolate t0, t1 by env_alpha */ 1797 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1798 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707 1799
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1805 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714 1806
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717 1809
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS); 1810 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1811 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1813 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1734 glEnd (); 1815 glEnd ();
1735 1816
1736 glDisable (GL_TEXTURE_2D); 1817 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0); 1818 gl.ActiveTexture (GL_TEXTURE0);
1738 } 1819 }
1740 { 1821 {
1741 /* simple blending of one texture, also opengl <1.3 path */ 1822 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1823 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743 1824
1744 glBegin (GL_QUADS); 1825 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1826 glTexCoord2f (0, 0); glVertex2f (0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1827 glTexCoord2f (0, t); glVertex2f (0, h);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1828 glTexCoord2f (s, t); glVertex2f (w, h);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1829 glTexCoord2f (s, 0); glVertex2f (w, 0);
1749 glEnd (); 1830 glEnd ();
1750 } 1831 }
1832
1833 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1834 {
1835 int x, y;
1836 int dx3 = dx * 3;
1837 int dy3 = dy * 3;
1838
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1840 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1841 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1842 glTranslatef (-1., -1., 0);
1843 glBegin (GL_QUADS);
1844
1845 for (y = 1; y < h; y += 3)
1846 {
1847 int y1 = y - dy3;
1848 int y1valid = y1 >= 0 && y1 < h;
1849
1850 for (x = 1; x < w; x += 3)
1851 {
1852 int x1 = x - dx3;
1853 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1854 uint8_t h2;
1855
1856 if (y1valid && x1 >= 0 && x1 < w)
1857 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 else
1859 h2 = 1; /* out of range == invisible */
1860
1861 if (h1 || h2)
1862 {
1863 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1864 glColor4f (1., 1., 1., alpha);
1865
1866 glTexCoord2f (0, 0.); glVertex2i (x , y );
1867 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1868 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1869 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1870 }
1871 }
1872 }
1873 }
1874
1875 glEnd ();
1751 1876
1752 glPopMatrix (); 1877 glPopMatrix ();
1753 1878
1754 glDisable (GL_TEXTURE_2D); 1879 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND); 1880 glDisable (GL_BLEND);
1769MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1770 1895
1771PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1772 1897
1773DC::Map 1898DC::Map
1774new (SV *class) 1899new (SV *klass)
1775 CODE: 1900 CODE:
1776 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1777 RETVAL->x = 0; 1902 RETVAL->x = 0;
1778 RETVAL->y = 0; 1903 RETVAL->y = 0;
1779 RETVAL->w = 0; 1904 RETVAL->w = 0;
1780 RETVAL->h = 0; 1905 RETVAL->h = 0;
1781 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1818 1943
1819void 1944void
1820set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1821 CODE: 1946 CODE:
1822{ 1947{
1823 tileid texid; 1948 tileid texid;
1824 maptex *tex; 1949 maptex *tex;
1825 1950
1826 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1827 return; 1952 return;
1828 1953
1829 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1830 return; 1955 return;
1831 1956
1832 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1833 1958
1834 if (!texid) 1959 if (!texid)
1835 return; 1960 return;
1836 1961
1837 tex = self->tex + texid; 1962 tex = self->tex + texid;
1870} 1995}
1871 1996
1872void 1997void
1873expire_textures (DC::Map self, int texid, int count) 1998expire_textures (DC::Map self, int texid, int count)
1874 PPCODE: 1999 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count) 2000 for (; texid < self->texs && count; ++texid, --count)
1876 { 2001 {
1877 maptex *tex = self->tex + texid; 2002 maptex *tex = self->tex + texid;
1878 2003
1879 if (tex->name) 2004 if (tex->name)
1880 { 2005 {
1927 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1928 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1929 2054
1930 while (self->y < 0) 2055 while (self->y < 0)
1931 { 2056 {
1932 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1933 2058
1934 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1935 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1936 } 2061 }
1937} 2062}
1938 2063
1939SV * 2064SV *
1940map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1941 CODE: 2066 CODE:
1942{ 2067{
1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1944 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1945 mapcell *cell; 2070 mapcell *cell;
1966 2091
1967 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1968 2093
1969 if (flags & 8) 2094 if (flags & 8)
1970 { 2095 {
2096 uint8_t ext, cmd;
2097
1971 if (extmap) 2098 do
1972 { 2099 {
1973 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1974 2102
1975 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
1976 { 2106 {
1977 ext = *data++;
1978 cmd = ext & 0x7f;
1979
1980 if (cmd < 4)
1981 cell->darkness = 255 - ext * 64 + 1;
1982 else if (cmd == 5) // health
1983 {
1984 cell->stat_width = 1; 2107 cell->stat_width = 1;
1985 cell->stat_hp = *data++; 2108 cell->stat_hp = *data++;
1986 }
1987 else if (cmd == 6) // monster width
1988 cell->stat_width = *data++ + 1;
1989 else if (cmd == 0x47)
1990 {
1991 if (*data == 1) cell->player = data [1];
1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1995
1996 data += *data + 1;
1997 }
1998 else if (cmd == 8) // cell flags
1999 cell->flags = *data++;
2000 else if (ext & 0x40) // unknown, multibyte => skip
2001 data += *data + 1;
2002 else
2003 data++;
2004 } 2109 }
2005 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
2006 } 2127 }
2007 else 2128 while (ext & 0x80);
2008 cell->darkness = *data++ + 1;
2009 } 2129 }
2010 2130
2011 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
2012 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
2013 { 2133 {
2061 ? self->row + y 2181 ? self->row + y
2062 : 0; 2182 : 0;
2063 2183
2064 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
2065 { 2185 {
2066 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
2067 2187
2068 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
2069 { 2189 {
2070 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
2071 2191
2073 { 2193 {
2074 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
2075 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
2076 int a1 = tex.a; 2196 int a1 = tex.a;
2077 2197
2078 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
2079 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
2080 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
2081 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
2082 } 2202 }
2083 } 2203 }
2084 2204
2085 *map++ = (r ) 2205 *map++ = (r )
2086 | (g << 8) 2206 | (g << 8)
2087 | (b << 16) 2207 | (b << 16)
2088 | (a << 24); 2208 | (a << 24);
2089 } 2209 }
2090 } 2210 }
2091 2211
2092 RETVAL = map_sv; 2212 RETVAL = map_sv;
2093} 2213}
2094 OUTPUT: 2214 OUTPUT:
2095 RETVAL 2215 RETVAL
2096 2216
2097void 2217void
2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2218draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2099 CODE: 2219 CODE:
2100{ 2220{
2101 int x, y, z; 2221 int x, y, z;
2102 2222
2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2104 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2223 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2106 smooth_key skey;
2107 int pl_x, pl_y; 2224 int pl_x, pl_y;
2108 maptex pl_tex; 2225 maptex pl_tex;
2109 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2110 rc_t *rc_ov = rc_alloc (); 2227 rc_t rc_ov;
2111 rc_key_t key; 2228 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden; 2229 rc_t::array_t *arr;
2113 2230
2114 pl_tex.name = 0; 2231 pl_tex.name = 0;
2115 2232
2116 // that's current max. sorry. 2233 // that's current max. sorry.
2117 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
2118 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
2119
2120 // clear key, in case of extra padding
2121 memset (&skey, 0, sizeof (skey));
2122 2236
2123 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
2124 key.r = 255; 2238 key.r = 255;
2125 key.g = 255; 2239 key.g = 255;
2126 key.b = 255; 2240 key.b = 255;
2132 my += self->y; 2246 my += self->y;
2133 2247
2134 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
2135 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
2136 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
2137 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2138 2252
2139 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
2140 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
2141 { 2255 {
2142 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
2155 2269
2156 glEnable (GL_BLEND); 2270 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159 2273
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
2163 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
2164 { 2275 {
2165 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2166 key.texname = -1; 2279 key.texname = -1;
2167 2280
2168 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
2169 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
2170 { 2283 {
2187 2300
2188 if (!tex.name) 2301 if (!tex.name)
2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2190 2303
2191 key.texname = tex.name; 2304 key.texname = tex.name;
2192 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
2193 } 2306 }
2194 2307
2195 px = (x + 1) * T - tex.w; 2308 px = (x + 1) * Th - tex.w;
2196 py = (y + 1) * T - tex.h; 2309 py = (y + 1) * Tw - tex.h;
2197 2310
2198 if (expect_false (cell->player == player) && expect_false (z == 2)) 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 { 2312 {
2200 pl_x = px; 2313 pl_x = px;
2201 pl_y = py; 2314 pl_y = py;
2202 pl_tex = tex; 2315 pl_tex = tex;
2203 continue; 2316 continue;
2204 } 2317 }
2205 2318
2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2207 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2208 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2321 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2209 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2210 2323
2211 // update smooth hash 2324 // update smooth hash
2212 if (tex.smoothtile) 2325 if (tex.smoothtile)
2213 { 2326 {
2214 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
2215 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
2216 2329
2217 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
2218 2331
2219 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
2220 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
2221 2334
2222 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
2230 2343
2231 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2232 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
2233 2346
2234 // full tile 2347 // full tile
2235 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2236 2349
2237 // borders 2350 // borders
2238 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2239 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2352 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2240 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2353 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2241 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2242 2355
2243 // corners 2356 // corners
2244 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2358 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2359 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2248 } 2361 }
2249 } 2362 }
2250 2363
2251 if (expect_false (z == 2)) 2364 if (expect_false (z == 2) && expect_false (cell->flags))
2252 { 2365 {
2253 /* draw question marks on top of hidden spaces */ 2366 // overlays such as the speech bubble, probably more to come
2254 if (!cell->darkness) 2367 if (cell->flags & 1)
2255 { 2368 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key; 2369 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH]; 2370 maptex tex = self->tex[TEXID_SPEECH];
2273 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32; 2371 int px = x * Tw + Tw * 2 / 32;
2275 int py = y * T - T * 6 / 32; 2372 int py = y * Th - Th * 6 / 32;
2276 2373
2277 key_ov.texname = tex.name; 2374 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov); 2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2279 2376
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2284 }
2285 } 2381 }
2286 } 2382 }
2287 } 2383 }
2288 } 2384 }
2289 2385
2290 rc_draw (rc); 2386 rc.draw ();
2291 rc_clear (rc); 2387 rc.clear ();
2292 2388
2293 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
2294 // this is basically counting sort 2390 // this is basically counting sort
2295 { 2391 {
2296 int w, b; 2392 int w, b;
2297 2393
2298 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
2299 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
2300 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2301 { 2399 {
2302 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
2303 if (smask) 2401 IV bits = it->second;
2304 for (b = 0; b < 32; ++b) 2402
2305 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
2306 { 2406 {
2307 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
2308 HE *he; 2415 if (tex.name)
2309
2310 hv_iterinit (smooth);
2311 while ((he = hv_iternext (smooth)))
2312 { 2416 {
2313 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
2314 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
2315 2419 if (key.texname != tex.name)
2316 if (!(bits & 0x1000)
2317 && skey->level == level
2318 && level > smooth_max [skey->x][skey->y])
2319 { 2420 {
2320 maptex tex = self->tex [skey->tile];
2321 int px = (((int)skey->x) - 1) * T;
2322 int py = (((int)skey->y) - 1) * T;
2323 int border = bits & 15;
2324 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2325 float dx = tex.s * .0625f; // 16 images/row
2326 float dy = tex.t * .5f ; // 2 images/column
2327
2328 if (tex.name)
2329 {
2330 // this time avoiding texture state changes
2331 // save gobs of state changes.
2332 if (key.texname != tex.name)
2333 {
2334 self->tex [skey->tile].unused = 0; 2421 self->tex [skey.tile].unused = 0;
2335 2422
2336 glEnd (); 2423 glEnd ();
2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2338 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2339 } 2426 }
2340 2427
2341 if (border) 2428 if (border)
2342 { 2429 {
2343 float ox = border * dx; 2430 float ox = border * dx;
2344 2431
2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2349 } 2436 }
2350 2437
2351 if (corner) 2438 if (corner)
2352 { 2439 {
2353 float ox = corner * dx; 2440 float ox = corner * dx;
2354 2441
2355 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2359 }
2360 }
2361 } 2446 }
2362 } 2447 }
2363 } 2448 }
2364 } 2449 }
2365 2450
2366 glEnd (); 2451 glEnd ();
2367 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1; 2453 key.texname = -1;
2369 } 2454 }
2370
2371 hv_clear (smooth);
2372 } 2455 }
2373 2456
2374 if (pl_tex.name) 2457 if (pl_tex.name)
2375 { 2458 {
2376 maptex tex = pl_tex; 2459 maptex tex = pl_tex;
2377 int px = pl_x + sdx; 2460 int px = pl_x + sdx;
2378 int py = pl_y + sdy; 2461 int py = pl_y + sdy;
2379 2462
2380 key.texname = tex.name; 2463 key.texname = tex.name;
2381 arr = rc_array (rc, &key); 2464 rc_t::array_t &arr = rc.array (key);
2382 2465
2383 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2384 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2385 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2468 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2386 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2387 2470
2388 rc_draw (rc); 2471 rc.draw ();
2389 } 2472 }
2390 2473
2391 rc_draw (rc_ov); 2474 rc_ov.draw ();
2392 rc_clear (rc_ov); 2475 rc_ov.clear ();
2393 2476
2394 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2395 rc_free (rc);
2396 rc_free (rc_ov);
2397 2478
2398 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2399 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2400 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2401 { 2482 {
2404 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2405 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2406 { 2487 {
2407 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2408 2489
2409 int px = x * T; 2490 int px = x * Tw;
2410 int py = y * T; 2491 int py = y * Th;
2411 2492
2412 if (expect_false (cell->player == player)) 2493 if (expect_false (cell->player == player))
2413 { 2494 {
2414 px += sdx; 2495 px += sdx;
2415 py += sdy; 2496 py += sdy;
2416 } 2497 }
2417 2498
2418 if (cell->stat_hp) 2499 if (cell->stat_hp)
2419 { 2500 {
2420 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2422 2503
2423 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2424 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2425 px + width - 1, py); 2506 px + width - 1, py);
2426 2507
2463 int x, y; 2544 int x, y;
2464 2545
2465 glEnable (GL_TEXTURE_2D); 2546 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2547 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures 2548 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using 2549 * and takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different 2550 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia. 2551 * alpha, but atcually gives us the correct colour with nvidia.
2471 */ 2552 */
2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2502void 2583void
2503fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2584fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2504 PPCODE: 2585 PPCODE:
2505{ 2586{
2506 int x, y; 2587 int x, y;
2507 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2508 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2509 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2510 int sw34 = (sw * 3 + 3) & ~3; 2591 int sw3 = sw * 3;
2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2511 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2512 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2513 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2514 2596
2515 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2516 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2517 2599
2518 mx += self->x - 1; 2600 mx += self->x - 1;
2519 my += self->y - 1; 2601 my += self->y - 1;
2520
2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522 2602
2523 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2524 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2525 { 2605 {
2526 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2559 2639
2560 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2561 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2562 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2563 2643
2564 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2569 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573 } 2653 }
2574 2654
2575 free (darkness1); 2655 free (darkness1);
2576 2656
2577 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2578 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2579 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2580 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2581} 2661}
2582 2662
2583SV * 2663SV *
2646 else 2726 else
2647 *data++ = 0; 2727 *data++ = 0;
2648 } 2728 }
2649 } 2729 }
2650 2730
2651 /* if size is w*h + 5 then no data has been found */ 2731 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 { 2733 {
2654 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 } 2736 }
2657 2737
2658 RETVAL = data_sv; 2738 RETVAL = data_sv;
2659} 2739}
2660 OUTPUT: 2740 OUTPUT:
2661 RETVAL 2741 RETVAL
2662 2742
2663void 2743void
2670 STRLEN len; 2750 STRLEN len;
2671 uint8_t *data, *end; 2751 uint8_t *data, *end;
2672 2752
2673 len = SvLEN (data_sv); 2753 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv); 2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2676 end = data + len + 8; 2756 end = data + len + 8;
2677 2757
2678 if (len < 5) 2758 if (len < 5)
2679 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2680 2760
2741} 2821}
2742 2822
2743MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2744 2824
2745DC::RW 2825DC::RW
2746new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2747 CODE: 2827 CODE:
2748{ 2828{
2749 STRLEN datalen; 2829 STRLEN datalen;
2750 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2751 2831
2753} 2833}
2754 OUTPUT: 2834 OUTPUT:
2755 RETVAL 2835 RETVAL
2756 2836
2757DC::RW 2837DC::RW
2758new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2759 CODE: 2839 CODE:
2760 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2761 OUTPUT: 2841 OUTPUT:
2762 RETVAL 2842 RETVAL
2763 2843
2781 if (RETVAL < 0) 2861 if (RETVAL < 0)
2782 { 2862 {
2783 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2784 2864
2785 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2786 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2787 2872 }
2873 else
2788 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2789 } 2875 }
2790 2876
2791 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2793} 2879}
2853 2939
2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855 2941
2856PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2857 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2858DC::MixChunk 2956DC::MixChunk
2859new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2860 CODE: 2958 CODE:
2861 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2862 OUTPUT: 2960 OUTPUT:
2863 RETVAL 2961 RETVAL
2864 2962
2894 OUTPUT: 2992 OUTPUT:
2895 RETVAL 2993 RETVAL
2896 2994
2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2899int 3009int
2900volume (int volume = -1) 3010volume (int volume = -1)
2901 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2902 CODE: 3012 CODE:
2903 if (items > 0) 3013 if (items > 0)
2914void 3024void
2915halt () 3025halt ()
2916 CODE: 3026 CODE:
2917 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2918 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2919DC::MixMusic 3036DC::MixMusic
2920new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2921 CODE: 3038 CODE:
2922 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2923 OUTPUT: 3040 OUTPUT:
2924 RETVAL 3041 RETVAL
2925 3042
3062 const_iv (GL_FUNC_SUBTRACT), 3179 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3064# undef const_iv 3181# undef const_iv
3065 }; 3182 };
3066 3183
3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3069 3186
3070 texture_av = newAV (); 3187 texture_av = newAV ();
3071 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
3072} 3189}
3073 3190
3078 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
3079 3196
3080void 3197void
3081apple_nvidia_bug (int enable) 3198apple_nvidia_bug (int enable)
3082 3199
3083char * 3200const char *
3084gl_vendor () 3201gl_vendor ()
3085 CODE: 3202 CODE:
3086 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
3087 OUTPUT: 3204 OUTPUT:
3088 RETVAL 3205 RETVAL
3089 3206
3090char * 3207const char *
3091gl_version () 3208gl_version ()
3092 CODE: 3209 CODE:
3093 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
3094 OUTPUT: 3211 OUTPUT:
3095 RETVAL 3212 RETVAL
3096 3213
3097char * 3214const char *
3098gl_extensions () 3215gl_extensions ()
3099 CODE: 3216 CODE:
3100 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3101 OUTPUT: 3218 OUTPUT:
3102 RETVAL 3219 RETVAL
3103 3220
3104const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
3105 3226
3106GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
3107 CODE: 3228 CODE:
3108 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
3109 OUTPUT: 3230 OUTPUT:
3116 RETVAL 3237 RETVAL
3117 3238
3118int glGetError () 3239int glGetError ()
3119 3240
3120void glFinish () 3241void glFinish ()
3242
3243void glFlush ()
3121 3244
3122void glClear (int mask) 3245void glClear (int mask)
3123 3246
3124void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
3125 PROTOTYPE: @ 3248 PROTOTYPE: @
3297 3420
3298void glEndList () 3421void glEndList ()
3299 3422
3300void glCallList (int list) 3423void glCallList (int list)
3301 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303 3431
3304PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
3305 3433
3306void 3434void
3307find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
3308 PPCODE: 3436 PPCODE:
3309{ 3437{
3310 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
3311 XPUSHs (self); 3439 XPUSHs (self);
3312} 3440}
3313 3441
3314BOOT: 3442BOOT:
3315{ 3443{
3323 3451
3324void 3452void
3325draw (SV *self) 3453draw (SV *self)
3326 CODE: 3454 CODE:
3327{ 3455{
3328 HV *hv; 3456 HV *hv;
3329 SV **svp; 3457 SV **svp;
3330 NV x, y, w, h; 3458 NV x, y, w, h;
3331 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
3332 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
3333 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
3334 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines