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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines