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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines