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.294 by root, Sat Dec 19 05:06:56 2009 UTC vs.
Revision 1.333 by root, Mon Nov 19 01:23:01 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines