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.293 by root, Thu Dec 17 02:49:38 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
89#define DARKNESS_ADJUST(n) (n)
87 90
88#define MAP_EXTEND_X 32 91#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 92#define MAP_EXTEND_Y 512
90 93
91#define MIN_FONT_HEIGHT 10 94#define MIN_FONT_HEIGHT 10
95 98
96#define KMOD_LRAM 0x10000 // our extension 99#define KMOD_LRAM 0x10000 // our extension
97 100
98#define TEXID_SPEECH 1 101#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 102#define TEXID_NOFACE 2
100#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}
101 146
102static AV *texture_av; 147static AV *texture_av;
103 148
104static struct 149static struct
105{ 150{
162{ 207{
163 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
164 209
165 while (attrs) 210 while (attrs)
166 { 211 {
167 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 213
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 215 return 1;
171 216
172 attrs = attrs->next; 217 attrs = attrs->next;
173 } 218 }
174 219
175 return 0; 220 return 0;
176} 221}
177 222
178typedef struct cf_layout { 223struct cf_layout {
179 PangoLayout *pl; 224 PangoLayout *pl;
180 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
181 int base_height; 226 int base_height;
182 DC__Font font; 227 DC__Font font;
183 rc_t *rc; 228 rc_t rc;
184} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
185 232
186static DC__Font default_font; 233static DC__Font default_font;
187static PangoContext *opengl_context; 234static PangoContext *opengl_context;
188static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
189 236
190static void 237static void
191substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
192{ 239{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 243#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 245}
199 246
200static void 247static void
227 274
228 *w = rect.width; 275 *w = rect.width;
229 *h = rect.height; 276 *h = rect.height;
230} 277}
231 278
279/////////////////////////////////////////////////////////////////////////////
280
232typedef uint16_t tileid; 281typedef uint16_t tileid;
233typedef uint16_t faceid; 282typedef uint16_t faceid;
234 283
235typedef struct { 284struct maptex
285{
236 GLuint name; 286 GLuint name;
237 int w, h; 287 int w, h;
238 float s, t; 288 float s, t;
239 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
240 tileid smoothtile; 290 tileid smoothtile;
241 uint8_t smoothlevel; 291 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */ 292 uint8_t unused; /* set to zero on use */
243} maptex; 293};
244 294
245typedef struct { 295struct mapcell
296{
246 uint32_t player; 297 uint32_t player;
247 tileid tile[3]; 298 tileid tile[3];
248 uint16_t darkness; 299 uint16_t darkness;
249 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
250} mapcell; 301};
251 302
252typedef struct { 303struct maprow
304{
253 int32_t c0, c1; 305 int32_t c0, c1;
254 mapcell *col; 306 mapcell *col;
255} maprow; 307};
256 308
257typedef struct map { 309struct mapgrid {
258 int x, y, w, h; 310 int x, y, w, h;
259 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
260 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
261 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
262 314
263 int32_t rows; 315 int32_t rows;
264 maprow *row; 316 maprow *row;
265} *DC__Map; 317};
266 318
267static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
268prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
269{ 324{
270 char *p; 325 T *p;
271 326
272 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
273 Zero (p, inc, char); 328 Zero (p, inc, T);
274 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
275 Safefree (ptr); 330 Safefree (ptr);
276 331
277 return p; 332 ptr = p;
278} 333}
279 334
280static char * 335template<typename T>
336ecb_cold static void
281append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
282{ 338{
283 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
284 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
285
286 return ptr;
287} 341}
288
289#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
290#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291 342
292static void 343static void
293need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
294{ 345{
295 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
296 { 347 return;
348
349 size_t newsize = minpot (face + 1);
297 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
298 self->faces *= 2; 351 self->faces = newsize;
299 }
300} 352}
301 353
302static void 354static void
303need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
304{ 356{
305 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
306 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
307 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
308 self->texs *= 2; 362 self->texs = newsize;
309 }
310} 363}
311 364
312static maprow * 365static maprow *
313map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
314{ 367{
315 if (0 > y) 368 if (0 > y)
316 { 369 {
317 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
318 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
319 372
320 self->rows += extend; 373 self->rows += extend;
321 self->y += extend; 374 self->y += extend;
322 y += extend; 375 y += extend;
323 } 376 }
324 else if (y >= self->rows) 377 else if (y >= self->rows)
325 { 378 {
326 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
327 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
328 self->rows += extend; 381 self->rows += extend;
329 } 382 }
330 383
331 return self->row + y; 384 return self->row + y;
332} 385}
342 } 395 }
343 396
344 if (row->c0 > x) 397 if (row->c0 > x)
345 { 398 {
346 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
347 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
348 row->c0 -= extend; 401 row->c0 -= extend;
349 } 402 }
350 else if (x >= row->c1) 403 else if (x >= row->c1)
351 { 404 {
352 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
353 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
354 row->c1 += extend; 407 row->c1 += extend;
355 } 408 }
356 409
357 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
358} 411}
359 412
360static mapcell * 413static mapcell *
361map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
362{ 415{
363 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
364} 417}
365 418
366static void 419static void
367map_clear (DC__Map self) 420map_clear (mapgrid *self)
368{ 421{
369 int r; 422 int r;
370 423
371 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
372 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
390 (cell)->flags = 0; \ 443 (cell)->flags = 0; \
391 (cell)->player = 0; \ 444 (cell)->player = 0; \
392 } while (0) 445 } while (0)
393 446
394static void 447static void
395map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
396{ 449{
397 int x, y; 450 int x, y;
398 maprow *row; 451 maprow *row;
399 mapcell *cell; 452 mapcell *cell;
400 453
417 CELL_CLEAR (cell); 470 CELL_CLEAR (cell);
418 } 471 }
419 } 472 }
420} 473}
421 474
422typedef struct { 475struct smooth_key
476{
423 tileid tile; 477 tileid tile;
424 uint8_t x, y, level; 478 uint8_t x, y, level;
425} 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}
426 498
427static void 499static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 501{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
431 503
432 if (SvIOK (*sv)) 504 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
434 else 506 else
435 sv_setiv (*sv, bits); 507 it->second |= bits;
436} 508}
437 509
438static void 510static void
439music_finished (void) 511music_finished (void)
440{ 512{
459 ev.data2 = 0; 531 ev.data2 = 0;
460 532
461 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
462} 534}
463 535
464static unsigned int
465minpot (unsigned int n)
466{
467 if (!n)
468 return 0;
469
470 --n;
471
472 n |= n >> 1;
473 n |= n >> 2;
474 n |= n >> 4;
475 n |= n >> 8;
476 n |= n >> 16;
477
478 return n + 1;
479}
480
481static unsigned int
482popcount (unsigned int n)
483{
484 n -= (n >> 1) & 0x55555555U;
485 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486 n = ((n >> 4) + n) & 0x0f0f0f0fU;
487 n *= 0x01010101U;
488
489 return n >> 24;
490}
491
492/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
493#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
494#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
495 539
496/******************************************************************************/ 540/******************************************************************************/
549 593
550 return mod; 594 return mod;
551} 595}
552 596
553static void 597static void
554deliantra_main () 598deliantra_main (SV *real_main)
555{ 599{
556 char *argv[] = { 0 }; 600 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 601
602 PUSHMARK (SP);
603 call_sv (real_main, G_DISCARD | G_VOID);
558} 604}
559 605
560#ifdef __MACOSX__ 606#ifdef __MACOSX__
607 static SV *real_main;
608
561 /* to due surprising braindamage on the side of SDL design, we 609 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 610 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which, 611 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 612 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 613 * and which calls our main (== SDL_main) back.
566 */ 614 */
567 extern C_LINKAGE int 615 extern C_LINKAGE int
568 main (int argc, char *argv[]) 616 main (int argc, char *argv[])
569 { 617 {
570 deliantra_main (); 618 deliantra_main (real_main);
571 } 619 }
572 620
573 #undef main 621 #undef main
574 622
575 extern C_LINKAGE int main (int argc, char *argv[]); 623 extern C_LINKAGE int main (int argc, char *argv[]);
576 624
577 static void 625 static void
578 SDL_braino (void) 626 SDL_main_hack (SV *real_main_)
579 { 627 {
628 real_main = real_main_;
629
580 char *argv[] = { "deliantra client", 0 }; 630 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 631 (main) (1, argv);
582 } 632 }
583#else 633#else
584 static void 634 static void
585 SDL_braino (void) 635 SDL_main_hack (SV *real_main)
586 { 636 {
587 deliantra_main (); 637 deliantra_main (real_main);
588 } 638 }
589#endif 639#endif
590 640
591MODULE = Deliantra::Client PACKAGE = DC 641MODULE = Deliantra::Client PACKAGE = DC
592 642
793 843
794 const_iv (FOW_DARKNESS) 844 const_iv (FOW_DARKNESS)
795# undef const_iv 845# undef const_iv
796 }; 846 };
797 847
798 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--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 850
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 853}
804 854
819 869
820NV ceil (NV x) 870NV ceil (NV x)
821 871
822IV minpot (UV n) 872IV minpot (UV n)
823 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
824IV 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
825 891
826void 892void
827pango_init () 893pango_init ()
828 CODE: 894 CODE:
829{ 895{
837#endif 903#endif
838} 904}
839 905
840char *SDL_GetError () 906char *SDL_GetError ()
841 907
842void SDL_braino () 908void SDL_main_hack (SV *real_main)
909 PROTOTYPE: &
843 910
844int SDL_Init (U32 flags) 911int SDL_Init (U32 flags)
845 912
846int SDL_InitSubSystem (U32 flags) 913int SDL_InitSubSystem (U32 flags)
847 914
848void SDL_QuitSubSystem (U32 flags) 915void SDL_QuitSubSystem (U32 flags)
849 916
850void SDL_Quit () 917void SDL_Quit ()
851 918
852int SDL_GL_SetAttribute (int attr, int value) 919int SDL_GL_SetAttribute (int attr, int value)
920 C_ARGS: (SDL_GLattr)attr, value
853 921
854int SDL_GL_GetAttribute (int attr) 922int SDL_GL_GetAttribute (int attr)
855 CODE: 923 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 924 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 925 XSRETURN_UNDEF;
858 OUTPUT: 926 OUTPUT:
859 RETVAL 927 RETVAL
860 928
861void 929void
916 ); 984 );
917 985
918 if (RETVAL) 986 if (RETVAL)
919 { 987 {
920 av_clear (texture_av); 988 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#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);
924#include "glfunc.h" 990#include "glfunc.h"
925#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 994 }
927} 995}
928 OUTPUT: 996 OUTPUT:
929 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
930 1001
931void 1002void
932SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
933 1004
934char * 1005char *
935SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
936 1008
937int 1009int
938SDL_GetAppState () 1010SDL_GetAppState ()
939 1011
940int 1012int
941SDL_GetModState () 1013SDL_GetModState ()
942 1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
943void 1019void
1020SDL_PumpEvents ()
1021
1022void
944poll_events () 1023peep_events ()
945 PPCODE: 1024 PPCODE:
946{ 1025{
947 SDL_Event ev; 1026 SDL_Event ev;
948 1027
949 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
1015 1094
1016 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))));
1017 } 1096 }
1018} 1097}
1019 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
1020int 1112int
1021Mix_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)
1022 POSTCALL: 1114 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
1025 1117
1026void 1118void
1027Mix_QuerySpec () 1119Mix_QuerySpec ()
1086add_font (char *file) 1178add_font (char *file)
1087 CODE: 1179 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1180 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1181 OUTPUT:
1090 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)
1091 1190
1092void 1191void
1093load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
1094 ALIAS: 1193 ALIAS:
1095 load_image_file = 1 1194 load_image_file = 1
1141 1240
1142 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1147 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)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
1151 1250
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1323
1225PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1226 1325
1227DC::Font 1326DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1328 CODE:
1230{ 1329{
1231 int count; 1330 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1361 PROTOTYPE:
1263 CODE: 1362 CODE:
1264 tc_restore (); 1363 tc_restore ();
1265 1364
1266DC::Layout 1365DC::Layout
1267new (SV *class) 1366new (SV *klass)
1268 CODE: 1367 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1270 1369
1271 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1273 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1274 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1275 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1276 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1277 RETVAL->font = 0; 1376 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1279 1377
1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1281 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1282 OUTPUT: 1380 OUTPUT:
1283 RETVAL 1381 RETVAL
1284 1382
1285void 1383void
1286DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1287 CODE: 1385 CODE:
1288 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1289 rc_free (self->rc);
1290 Safefree (self); 1387 delete self;
1291 1388
1292void 1389void
1293set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1294 CODE: 1391 CODE:
1295{ 1392{
1421 1518
1422void 1519void
1423set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1424 CODE: 1521 CODE:
1425 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1426 { 1523 {
1427 self->base_height = base_height; 1524 self->base_height = base_height;
1428 layout_update_font (self); 1525 layout_update_font (self);
1429 } 1526 }
1430 1527
1431void 1528void
1549} 1646}
1550 1647
1551void 1648void
1552render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1553 CODE: 1650 CODE:
1554 rc_clear (self->rc); 1651 self->rc.clear ();
1555 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1556 self->pl, 1653 self->pl,
1557 self->rc, 1654 &self->rc,
1558 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1559 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1560 flags 1657 flags
1561 ); 1658 );
1562 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1573 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1574 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1575 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1576 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1577 1674
1578 rc_draw (self->rc); 1675 self->rc.draw ();
1579 1676
1580 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1581 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1582 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1583} 1680}
1659 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1660 } 1757 }
1661} 1758}
1662 1759
1663void 1760void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1) 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)
1665 PROTOTYPE: @ 1762 PROTOTYPE: @
1666 CODE: 1763 CODE:
1667{ 1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668 glEnable (GL_TEXTURE_2D); 1767 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND); 1768 glBindTexture (GL_TEXTURE_2D, name1);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 1769
1673 glColor4f (intensity, intensity, intensity, 0.9); 1770 glColor3f (intensity, intensity, intensity);
1674 glPushMatrix (); 1771 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.); 1772 glScalef (1./3, 1./3, 1.);
1676 1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678 1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
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);
1679 glBegin (GL_QUADS); 1841 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1842
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1843 for (y = 1; y < h; y += 3)
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1844 {
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 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
1684 glEnd (); 1873 glEnd ();
1685 1874
1686 glPopMatrix (); 1875 glPopMatrix ();
1687 1876
1688 glDisable (GL_TEXTURE_2D); 1877 glDisable (GL_TEXTURE_2D);
1703MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1704 1893
1705PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1706 1895
1707DC::Map 1896DC::Map
1708new (SV *class) 1897new (SV *klass)
1709 CODE: 1898 CODE:
1710 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1711 RETVAL->x = 0; 1900 RETVAL->x = 0;
1712 RETVAL->y = 0; 1901 RETVAL->y = 0;
1713 RETVAL->w = 0; 1902 RETVAL->w = 0;
1714 RETVAL->h = 0; 1903 RETVAL->h = 0;
1715 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1752 1941
1753void 1942void
1754set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1755 CODE: 1944 CODE:
1756{ 1945{
1757 tileid texid; 1946 tileid texid;
1758 maptex *tex; 1947 maptex *tex;
1759 1948
1760 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1761 return; 1950 return;
1762 1951
1763 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1764 return; 1953 return;
1765 1954
1766 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1767 1956
1768 if (!texid) 1957 if (!texid)
1769 return; 1958 return;
1770 1959
1771 tex = self->tex + texid; 1960 tex = self->tex + texid;
1804} 1993}
1805 1994
1806void 1995void
1807expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1808 PPCODE: 1997 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1810 { 1999 {
1811 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1812 2001
1813 if (tex->name) 2002 if (tex->name)
1814 { 2003 {
1861 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1862 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1863 2052
1864 while (self->y < 0) 2053 while (self->y < 0)
1865 { 2054 {
1866 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1867 2056
1868 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1869 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1870 } 2059 }
1871} 2060}
1872 2061
1873SV * 2062SV *
1874map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1875 CODE: 2064 CODE:
1876{ 2065{
1877 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1878 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1879 mapcell *cell; 2068 mapcell *cell;
1900 2089
1901 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1902 2091
1903 if (flags & 8) 2092 if (flags & 8)
1904 { 2093 {
2094 uint8_t ext, cmd;
2095
1905 if (extmap) 2096 do
1906 { 2097 {
1907 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1908 2100
1909 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
1910 { 2104 {
1911 ext = *data++;
1912 cmd = ext & 0x7f;
1913
1914 if (cmd < 4)
1915 cell->darkness = 255 - ext * 64 + 1;
1916 else if (cmd == 5) // health
1917 {
1918 cell->stat_width = 1; 2105 cell->stat_width = 1;
1919 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1920 }
1921 else if (cmd == 6) // monster width
1922 cell->stat_width = *data++ + 1;
1923 else if (cmd == 0x47)
1924 {
1925 if (*data == 1) cell->player = data [1];
1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1929
1930 data += *data + 1;
1931 }
1932 else if (cmd == 8) // cell flags
1933 cell->flags = *data++;
1934 else if (ext & 0x40) // unknown, multibyte => skip
1935 data += *data + 1;
1936 else
1937 data++;
1938 } 2107 }
1939 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++;
1940 } 2125 }
1941 else 2126 while (ext & 0x80);
1942 cell->darkness = *data++ + 1;
1943 } 2127 }
1944 2128
1945 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1946 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1947 { 2131 {
1995 ? self->row + y 2179 ? self->row + y
1996 : 0; 2180 : 0;
1997 2181
1998 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1999 { 2183 {
2000 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
2001 2185
2002 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
2003 { 2187 {
2004 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
2005 2189
2007 { 2191 {
2008 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
2009 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
2010 int a1 = tex.a; 2194 int a1 = tex.a;
2011 2195
2012 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
2013 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
2014 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
2015 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
2016 } 2200 }
2017 } 2201 }
2018 2202
2019 *map++ = (r ) 2203 *map++ = (r )
2020 | (g << 8) 2204 | (g << 8)
2021 | (b << 16) 2205 | (b << 16)
2022 | (a << 24); 2206 | (a << 24);
2023 } 2207 }
2024 } 2208 }
2025 2209
2026 RETVAL = map_sv; 2210 RETVAL = map_sv;
2027} 2211}
2028 OUTPUT: 2212 OUTPUT:
2029 RETVAL 2213 RETVAL
2030 2214
2031void 2215void
2032draw (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)
2033 CODE: 2217 CODE:
2034{ 2218{
2035 int x, y, z; 2219 int x, y, z;
2036 2220
2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2038 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2039 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!
2040 smooth_key skey;
2041 int pl_x, pl_y; 2222 int pl_x, pl_y;
2042 maptex pl_tex; 2223 maptex pl_tex;
2043 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2044 rc_t *rc_ov = rc_alloc (); 2225 rc_t rc_ov;
2045 rc_key_t key; 2226 rc_key_t key;
2046 rc_array_t *arr, *arr_hidden; 2227 rc_t::array_t *arr;
2047 2228
2048 pl_tex.name = 0; 2229 pl_tex.name = 0;
2049 2230
2050 // that's current max. sorry. 2231 // that's current max. sorry.
2051 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
2052 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
2053
2054 // clear key, in case of extra padding
2055 memset (&skey, 0, sizeof (skey));
2056 2234
2057 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
2058 key.r = 255; 2236 key.r = 255;
2059 key.g = 255; 2237 key.g = 255;
2060 key.b = 255; 2238 key.b = 255;
2066 my += self->y; 2244 my += self->y;
2067 2245
2068 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
2069 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
2070 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
2071 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2072 2250
2073 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
2074 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
2075 { 2253 {
2076 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
2089 2267
2090 glEnable (GL_BLEND); 2268 glEnable (GL_BLEND);
2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093 2271
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
2097 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
2098 { 2273 {
2099 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;
2100 key.texname = -1; 2277 key.texname = -1;
2101 2278
2102 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
2103 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
2104 { 2281 {
2121 2298
2122 if (!tex.name) 2299 if (!tex.name)
2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2124 2301
2125 key.texname = tex.name; 2302 key.texname = tex.name;
2126 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
2127 } 2304 }
2128 2305
2129 px = (x + 1) * T - tex.w; 2306 px = (x + 1) * Th - tex.w;
2130 py = (y + 1) * T - tex.h; 2307 py = (y + 1) * Tw - tex.h;
2131 2308
2132 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2133 { 2310 {
2134 pl_x = px; 2311 pl_x = px;
2135 pl_y = py; 2312 pl_y = py;
2136 pl_tex = tex; 2313 pl_tex = tex;
2137 continue; 2314 continue;
2138 } 2315 }
2139 2316
2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
2141 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2142 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);
2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2144 2321
2145 // update smooth hash 2322 // update smooth hash
2146 if (tex.smoothtile) 2323 if (tex.smoothtile)
2147 { 2324 {
2148 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
2149 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
2150 2327
2151 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
2152 2329
2153 // 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
2154 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
2155 2332
2156 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
2164 2341
2165 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2166 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
2167 2344
2168 // full tile 2345 // full tile
2169 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);
2170 2347
2171 // borders 2348 // borders
2172 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);
2173 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);
2174 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);
2175 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);
2176 2353
2177 // corners 2354 // corners
2178 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);
2179 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);
2180 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);
2181 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);
2182 } 2359 }
2183 } 2360 }
2184 2361
2185 if (expect_false (z == 2)) 2362 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2186 { 2363 {
2187 /* draw question marks on top of hidden spaces */ 2364 // overlays such as the speech bubble, probably more to come
2188 if (!cell->darkness) 2365 if (cell->flags & 1)
2189 { 2366 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key; 2367 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH]; 2368 maptex tex = self->tex[TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32; 2369 int px = x * Tw + Tw * 2 / 32;
2209 int py = y * T - T * 6 / 32; 2370 int py = y * Th - Th * 6 / 32;
2210 2371
2211 key_ov.texname = tex.name; 2372 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov); 2373 rc_t::array_t &arr = rc_ov.array (key_ov);
2213 2374
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2375 arr.t2f_v3f (0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2376 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2216 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);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2378 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2218 }
2219 } 2379 }
2220 } 2380 }
2221 } 2381 }
2222 } 2382 }
2223 2383
2224 rc_draw (rc); 2384 rc.draw ();
2225 rc_clear (rc); 2385 rc.clear ();
2226 2386
2227 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2228 // this is basically counting sort 2388 // this is basically counting sort
2229 { 2389 {
2230 int w, b; 2390 int w, b;
2231 2391
2232 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2233 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2234 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)
2235 { 2397 {
2236 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2237 if (smask) 2399 IV bits = it->second;
2238 for (b = 0; b < 32; ++b) 2400
2239 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2240 { 2404 {
2241 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
2242 HE *he; 2413 if (tex.name)
2243
2244 hv_iterinit (smooth);
2245 while ((he = hv_iternext (smooth)))
2246 { 2414 {
2247 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
2248 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
2249 2417 if (key.texname != tex.name)
2250 if (!(bits & 0x1000)
2251 && skey->level == level
2252 && level > smooth_max [skey->x][skey->y])
2253 { 2418 {
2254 maptex tex = self->tex [skey->tile];
2255 int px = (((int)skey->x) - 1) * T;
2256 int py = (((int)skey->y) - 1) * T;
2257 int border = bits & 15;
2258 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259 float dx = tex.s * .0625f; // 16 images/row
2260 float dy = tex.t * .5f ; // 2 images/column
2261
2262 if (tex.name)
2263 {
2264 // this time avoiding texture state changes
2265 // save gobs of state changes.
2266 if (key.texname != tex.name)
2267 {
2268 self->tex [skey->tile].unused = 0; 2419 self->tex [skey.tile].unused = 0;
2269 2420
2270 glEnd (); 2421 glEnd ();
2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2272 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2273 } 2424 }
2274 2425
2275 if (border) 2426 if (border)
2276 { 2427 {
2277 float ox = border * dx; 2428 float ox = border * dx;
2278 2429
2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283 } 2434 }
2284 2435
2285 if (corner) 2436 if (corner)
2286 { 2437 {
2287 float ox = corner * dx; 2438 float ox = corner * dx;
2288 2439
2289 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293 }
2294 }
2295 } 2444 }
2296 } 2445 }
2297 } 2446 }
2298 } 2447 }
2299 2448
2300 glEnd (); 2449 glEnd ();
2301 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2302 key.texname = -1; 2451 key.texname = -1;
2303 } 2452 }
2304
2305 hv_clear (smooth);
2306 } 2453 }
2307 2454
2308 if (pl_tex.name) 2455 if (pl_tex.name)
2309 { 2456 {
2310 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2311 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2312 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2313 2460
2314 key.texname = tex.name; 2461 key.texname = tex.name;
2315 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2316 2463
2317 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2318 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2319 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);
2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2321 2468
2322 rc_draw (rc); 2469 rc.draw ();
2323 } 2470 }
2324 2471
2325 rc_draw (rc_ov); 2472 rc_ov.draw ();
2326 rc_clear (rc_ov); 2473 rc_ov.clear ();
2327 2474
2328 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2329 rc_free (rc);
2330 rc_free (rc_ov);
2331 2476
2332 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2333 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2334 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2335 { 2480 {
2338 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2339 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2340 { 2485 {
2341 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2342 2487
2343 int px = x * T; 2488 int px = x * Tw;
2344 int py = y * T; 2489 int py = y * Th;
2345 2490
2346 if (expect_false (cell->player == player)) 2491 if (ecb_expect_false (cell->player == player))
2347 { 2492 {
2348 px += sdx; 2493 px += sdx;
2349 py += sdy; 2494 py += sdy;
2350 } 2495 }
2351 2496
2352 if (cell->stat_hp) 2497 if (cell->stat_hp)
2353 { 2498 {
2354 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356 2501
2357 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2358 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2359 px + width - 1, py); 2504 px + width - 1, py);
2360 2505
2366 } 2511 }
2367 } 2512 }
2368} 2513}
2369 2514
2370void 2515void
2371draw_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)
2372 CODE: 2517 CODE:
2373{ 2518{
2374 static float color[16][3] = { 2519 static float color[16][3] = {
2375 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
2376 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2377 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2378 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2379 2524
2380 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2381 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2382 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2383 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2384 2529
2385 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2386 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2387 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2388 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2389 2534
2390 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2391 2536
2392 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2393 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2394 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2395 }; 2540 };
2396 2541
2397 int x, y; 2542 int x, y;
2398 2543
2399 glEnable (GL_TEXTURE_2D); 2544 glEnable (GL_TEXTURE_2D);
2400 /* 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,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures 2546 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using 2547 * and takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different 2548 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia. 2549 * alpha, but atcually gives us the correct colour with nvidia.
2405 */ 2550 */
2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2415 2560
2416 if (m) 2561 if (m)
2417 { 2562 {
2418 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2419 2564
2420 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2421 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2422 2567
2423 glColor4f (c[0], c[1], c[2], 1); 2568 glColor4f (c[0], c[1], c[2], 1);
2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2436void 2581void
2437fow_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)
2438 PPCODE: 2583 PPCODE:
2439{ 2584{
2440 int x, y; 2585 int x, y;
2441 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2442 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2443 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2444 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);
2445 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2446 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2447 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2448 2594
2449 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2450 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2451 2597
2452 mx += self->x - 1; 2598 mx += self->x - 1;
2453 my += self->y - 1; 2599 my += self->y - 1;
2454
2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456 2600
2457 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2458 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2459 { 2603 {
2460 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
2463 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2464 { 2608 {
2465 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2466 2610
2467 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2468 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470 } 2614 }
2471 } 2615 }
2472 2616
2473 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2474 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
2493 2637
2494 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2495 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2496 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2497 2641
2498 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502 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 */
2503 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507 } 2651 }
2508 2652
2509 free (darkness1); 2653 free (darkness1);
2510 2654
2511 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2512 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2513 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2514 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2515} 2659}
2516 2660
2517SV * 2661SV *
2580 else 2724 else
2581 *data++ = 0; 2725 *data++ = 0;
2582 } 2726 }
2583 } 2727 }
2584 2728
2585 /* 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 */
2586 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2730 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2587 { 2731 {
2588 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 } 2734 }
2591 2735
2592 RETVAL = data_sv; 2736 RETVAL = data_sv;
2593} 2737}
2594 OUTPUT: 2738 OUTPUT:
2595 RETVAL 2739 RETVAL
2596 2740
2597void 2741void
2604 STRLEN len; 2748 STRLEN len;
2605 uint8_t *data, *end; 2749 uint8_t *data, *end;
2606 2750
2607 len = SvLEN (data_sv); 2751 len = SvLEN (data_sv);
2608 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2752 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609 data = SvPVbyte_nolen (data_sv); 2753 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2610 end = data + len + 8; 2754 end = data + len + 8;
2611 2755
2612 if (len < 5) 2756 if (len < 5)
2613 XSRETURN_EMPTY; 2757 XSRETURN_EMPTY;
2614 2758
2675} 2819}
2676 2820
2677MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2678 2822
2679DC::RW 2823DC::RW
2680new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2681 CODE: 2825 CODE:
2682{ 2826{
2683 STRLEN datalen; 2827 STRLEN datalen;
2684 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2685 2829
2687} 2831}
2688 OUTPUT: 2832 OUTPUT:
2689 RETVAL 2833 RETVAL
2690 2834
2691DC::RW 2835DC::RW
2692new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2693 CODE: 2837 CODE:
2694 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2695 OUTPUT: 2839 OUTPUT:
2696 RETVAL 2840 RETVAL
2697 2841
2715 if (RETVAL < 0) 2859 if (RETVAL < 0)
2716 { 2860 {
2717 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2718 2862
2719 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)
2720 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2721 2870 }
2871 else
2722 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2723 } 2873 }
2724 2874
2725 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2726 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2727} 2877}
2774void 2924void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE: 2926 CODE:
2777{ 2927{
2778 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));
2779 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;
2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781} 2931}
2782 2932
2783void 2933void
2784set_reverse_stereo (DC::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
2787 2937
2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789 2939
2790PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2791 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
2792DC::MixChunk 2954DC::MixChunk
2793new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2794 CODE: 2956 CODE:
2795 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2796 OUTPUT: 2958 OUTPUT:
2797 RETVAL 2959 RETVAL
2798 2960
2828 OUTPUT: 2990 OUTPUT:
2829 RETVAL 2991 RETVAL
2830 2992
2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832 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
2833int 3007int
2834volume (int volume = -1) 3008volume (int volume = -1)
2835 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2836 CODE: 3010 CODE:
2837 if (items > 0) 3011 if (items > 0)
2848void 3022void
2849halt () 3023halt ()
2850 CODE: 3024 CODE:
2851 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2852 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2853DC::MixMusic 3034DC::MixMusic
2854new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2855 CODE: 3036 CODE:
2856 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2857 OUTPUT: 3038 OUTPUT:
2858 RETVAL 3039 RETVAL
2859 3040
2996 const_iv (GL_FUNC_SUBTRACT), 3177 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3178 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998# undef const_iv 3179# undef const_iv
2999 }; 3180 };
3000 3181
3001 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--)
3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003 3184
3004 texture_av = newAV (); 3185 texture_av = newAV ();
3005 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
3006} 3187}
3007 3188
3012 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
3013 3194
3014void 3195void
3015apple_nvidia_bug (int enable) 3196apple_nvidia_bug (int enable)
3016 3197
3017char * 3198const char *
3018gl_vendor () 3199gl_vendor ()
3019 CODE: 3200 CODE:
3020 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
3021 OUTPUT: 3202 OUTPUT:
3022 RETVAL 3203 RETVAL
3023 3204
3024char * 3205const char *
3025gl_version () 3206gl_version ()
3026 CODE: 3207 CODE:
3027 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
3028 OUTPUT: 3209 OUTPUT:
3029 RETVAL 3210 RETVAL
3030 3211
3031char * 3212const char *
3032gl_extensions () 3213gl_extensions ()
3033 CODE: 3214 CODE:
3034 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3035 OUTPUT: 3216 OUTPUT:
3036 RETVAL 3217 RETVAL
3037 3218
3038const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
3039 3224
3040GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
3041 CODE: 3226 CODE:
3042 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
3043 OUTPUT: 3228 OUTPUT:
3050 RETVAL 3235 RETVAL
3051 3236
3052int glGetError () 3237int glGetError ()
3053 3238
3054void glFinish () 3239void glFinish ()
3240
3241void glFlush ()
3055 3242
3056void glClear (int mask) 3243void glClear (int mask)
3057 3244
3058void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
3059 PROTOTYPE: @ 3246 PROTOTYPE: @
3231 3418
3232void glEndList () 3419void glEndList ()
3233 3420
3234void glCallList (int list) 3421void glCallList (int list)
3235 3422
3423void c_init ()
3424 CODE:
3425 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3426 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3427
3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3428MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237 3429
3238PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
3239 3431
3240void 3432void
3241find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
3242 PPCODE: 3434 PPCODE:
3243{ 3435{
3244 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
3245 XPUSHs (self); 3437 XPUSHs (self);
3246} 3438}
3247 3439
3248BOOT: 3440BOOT:
3249{ 3441{
3257 3449
3258void 3450void
3259draw (SV *self) 3451draw (SV *self)
3260 CODE: 3452 CODE:
3261{ 3453{
3262 HV *hv; 3454 HV *hv;
3263 SV **svp; 3455 SV **svp;
3264 NV x, y, w, h; 3456 NV x, y, w, h;
3265 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
3266 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
3267 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
3268 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