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.292 by root, Fri Dec 4 15:04:56 2009 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
70# include <netinet/in.h> 76# include <netinet/in.h>
71# include <netinet/tcp.h> 77# include <netinet/tcp.h>
72# include <inttypes.h> 78# include <inttypes.h>
73#endif 79#endif
74 80
75#if __GNUC__ >= 4 81#include "ecb.h"
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83 82
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 64 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
87 89
88#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
90 92
91#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
95 97
96#define KMOD_LRAM 0x10000 // our extension 98#define KMOD_LRAM 0x10000 // our extension
97 99
98#define TEXID_SPEECH 1 100#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 101#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 102
103static char *
104fast_sv_grow (SV *sv, STRLEN need)
105{
106 STRLEN len = SvLEN (sv);
107 STRLEN want = SvCUR (sv) + need;
108
109 if (ecb_expect_false (len < want))
110 {
111 do
112 len *= 2;
113 while (len < want);
114
115 sv_grow (sv, len);
116 }
117
118 SvCUR_set (sv, want);
119 return SvEND (sv) - need;
120}
101 121
102static AV *texture_av; 122static AV *texture_av;
103 123
104static struct 124static struct
105{ 125{
162{ 182{
163 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
164 184
165 while (attrs) 185 while (attrs)
166 { 186 {
167 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 188
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 190 return 1;
171 191
172 attrs = attrs->next; 192 attrs = attrs->next;
173 } 193 }
174 194
175 return 0; 195 return 0;
176} 196}
177 197
178typedef struct cf_layout { 198struct cf_layout {
179 PangoLayout *pl; 199 PangoLayout *pl;
180 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
181 int base_height; 201 int base_height;
182 DC__Font font; 202 DC__Font font;
183 rc_t *rc; 203 rc_t rc;
184} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
185 207
186static DC__Font default_font; 208static DC__Font default_font;
187static PangoContext *opengl_context; 209static PangoContext *opengl_context;
188static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
189 211
190static void 212static void
191substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
192{ 214{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 218#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 220}
199 221
200static void 222static void
227 249
228 *w = rect.width; 250 *w = rect.width;
229 *h = rect.height; 251 *h = rect.height;
230} 252}
231 253
254/////////////////////////////////////////////////////////////////////////////
255
232typedef uint16_t tileid; 256typedef uint16_t tileid;
233typedef uint16_t faceid; 257typedef uint16_t faceid;
234 258
235typedef struct { 259struct maptex
260{
236 GLuint name; 261 GLuint name;
237 int w, h; 262 int w, h;
238 float s, t; 263 float s, t;
239 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
240 tileid smoothtile; 265 tileid smoothtile;
241 uint8_t smoothlevel; 266 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */ 267 uint8_t unused; /* set to zero on use */
243} maptex; 268};
244 269
245typedef struct { 270struct mapcell
271{
246 uint32_t player; 272 uint32_t player;
247 tileid tile[3]; 273 tileid tile[3];
248 uint16_t darkness; 274 uint16_t darkness;
249 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
250} mapcell; 276};
251 277
252typedef struct { 278struct maprow
279{
253 int32_t c0, c1; 280 int32_t c0, c1;
254 mapcell *col; 281 mapcell *col;
255} maprow; 282};
256 283
257typedef struct map { 284struct mapgrid {
258 int x, y, w, h; 285 int x, y, w, h;
259 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
260 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
261 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
262 289
263 int32_t rows; 290 int32_t rows;
264 maprow *row; 291 maprow *row;
265} *DC__Map; 292};
266 293
267static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
268prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
269{ 299{
270 char *p; 300 T *p;
271 301
272 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
273 Zero (p, inc, char); 303 Zero (p, inc, T);
274 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
275 Safefree (ptr); 305 Safefree (ptr);
276 306
277 return p; 307 ptr = p;
278} 308}
279 309
280static char * 310template<typename T>
281append (char *ptr, int sze, int inc)
282{
283 Renew (ptr, sze + inc, char);
284 Zero (ptr + sze, inc, char);
285
286 return ptr;
287}
288
289#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
290#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291
292static void 311static void
312append (T *&ptr, int sze, int inc)
313{
314 Renew (ptr, sze + inc, T);
315 Zero (ptr + sze, inc, T);
316}
317
318static void
293need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
294{ 320{
295 while (self->faces <= face) 321 while (self->faces <= face)
296 { 322 {
297 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
298 self->faces *= 2; 324 self->faces *= 2;
299 } 325 }
300} 326}
301 327
302static void 328static void
303need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
304{ 330{
305 while (self->texs <= texid) 331 while (self->texs <= texid)
306 { 332 {
307 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
308 self->texs *= 2; 334 self->texs *= 2;
309 } 335 }
310} 336}
311 337
312static maprow * 338static maprow *
313map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
314{ 340{
315 if (0 > y) 341 if (0 > y)
316 { 342 {
317 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
318 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
319 345
320 self->rows += extend; 346 self->rows += extend;
321 self->y += extend; 347 self->y += extend;
322 y += extend; 348 y += extend;
323 } 349 }
324 else if (y >= self->rows) 350 else if (y >= self->rows)
325 { 351 {
326 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
327 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
328 self->rows += extend; 354 self->rows += extend;
329 } 355 }
330 356
331 return self->row + y; 357 return self->row + y;
332} 358}
342 } 368 }
343 369
344 if (row->c0 > x) 370 if (row->c0 > x)
345 { 371 {
346 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
347 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
348 row->c0 -= extend; 374 row->c0 -= extend;
349 } 375 }
350 else if (x >= row->c1) 376 else if (x >= row->c1)
351 { 377 {
352 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
353 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
354 row->c1 += extend; 380 row->c1 += extend;
355 } 381 }
356 382
357 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
358} 384}
359 385
360static mapcell * 386static mapcell *
361map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
362{ 388{
363 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
364} 390}
365 391
366static void 392static void
367map_clear (DC__Map self) 393map_clear (mapgrid *self)
368{ 394{
369 int r; 395 int r;
370 396
371 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
372 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
390 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
391 (cell)->player = 0; \ 417 (cell)->player = 0; \
392 } while (0) 418 } while (0)
393 419
394static void 420static void
395map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
396{ 422{
397 int x, y; 423 int x, y;
398 maprow *row; 424 maprow *row;
399 mapcell *cell; 425 mapcell *cell;
400 426
417 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
418 } 444 }
419 } 445 }
420} 446}
421 447
422typedef struct { 448struct smooth_key
449{
423 tileid tile; 450 tileid tile;
424 uint8_t x, y, level; 451 uint8_t x, y, level;
425} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
426 471
427static void 472static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 474{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
431 476
432 if (SvIOK (*sv)) 477 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
434 else 479 else
435 sv_setiv (*sv, bits); 480 it->second |= bits;
436} 481}
437 482
438static void 483static void
439music_finished (void) 484music_finished (void)
440{ 485{
457 ev.code = 1; 502 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 504 ev.data2 = 0;
460 505
461 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
462} 514}
463 515
464static unsigned int 516static unsigned int
465minpot (unsigned int n) 517minpot (unsigned int n)
466{ 518{
476 n |= n >> 16; 528 n |= n >> 16;
477 529
478 return n + 1; 530 return n + 1;
479} 531}
480 532
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. */ 533/* SDL should provide this, really. */
493#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
494#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
495 536
496/******************************************************************************/ 537/******************************************************************************/
549 590
550 return mod; 591 return mod;
551} 592}
552 593
553static void 594static void
554deliantra_main () 595deliantra_main (SV *real_main)
555{ 596{
556 char *argv[] = { 0 }; 597 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
558} 601}
559 602
560#ifdef __MACOSX__ 603#ifdef __MACOSX__
604 static SV *real_main;
605
561 /* to due surprising braindamage on the side of SDL design, we 606 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 607 * 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, 608 * 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, 609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 610 * and which calls our main (== SDL_main) back.
566 */ 611 */
567 extern C_LINKAGE int 612 extern C_LINKAGE int
568 main (int argc, char *argv[]) 613 main (int argc, char *argv[])
569 { 614 {
570 deliantra_main (); 615 deliantra_main (real_main);
571 } 616 }
572 617
573 #undef main 618 #undef main
574 619
575 extern C_LINKAGE int main (int argc, char *argv[]); 620 extern C_LINKAGE int main (int argc, char *argv[]);
576 621
577 static void 622 static void
578 SDL_braino (void) 623 SDL_main_hack (SV *real_main_)
579 { 624 {
625 real_main = real_main_;
626
580 char *argv[] = { "deliantra client", 0 }; 627 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 628 (main) (1, argv);
582 } 629 }
583#else 630#else
584 static void 631 static void
585 SDL_braino (void) 632 SDL_main_hack (SV *real_main)
586 { 633 {
587 deliantra_main (); 634 deliantra_main (real_main);
588 } 635 }
589#endif 636#endif
590 637
591MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
592 639
793 840
794 const_iv (FOW_DARKNESS) 841 const_iv (FOW_DARKNESS)
795# undef const_iv 842# undef const_iv
796 }; 843 };
797 844
798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 845 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 847
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 850}
804 851
820NV ceil (NV x) 867NV ceil (NV x)
821 868
822IV minpot (UV n) 869IV minpot (UV n)
823 870
824IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
876
877NV distance (NV dx, NV dy)
878 CODE:
879 RETVAL = pow (dx * dx + dy * dy, 0.5);
880 OUTPUT:
881 RETVAL
825 882
826void 883void
827pango_init () 884pango_init ()
828 CODE: 885 CODE:
829{ 886{
837#endif 894#endif
838} 895}
839 896
840char *SDL_GetError () 897char *SDL_GetError ()
841 898
842void SDL_braino () 899void SDL_main_hack (SV *real_main)
900 PROTOTYPE: &
843 901
844int SDL_Init (U32 flags) 902int SDL_Init (U32 flags)
845 903
846int SDL_InitSubSystem (U32 flags) 904int SDL_InitSubSystem (U32 flags)
847 905
848void SDL_QuitSubSystem (U32 flags) 906void SDL_QuitSubSystem (U32 flags)
849 907
850void SDL_Quit () 908void SDL_Quit ()
851 909
852int SDL_GL_SetAttribute (int attr, int value) 910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
853 912
854int SDL_GL_GetAttribute (int attr) 913int SDL_GL_GetAttribute (int attr)
855 CODE: 914 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 916 XSRETURN_UNDEF;
858 OUTPUT: 917 OUTPUT:
859 RETVAL 918 RETVAL
860 919
861void 920void
916 ); 975 );
917 976
918 if (RETVAL) 977 if (RETVAL)
919 { 978 {
920 av_clear (texture_av); 979 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); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924#include "glfunc.h" 981#include "glfunc.h"
925#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 985 }
927} 986}
928 OUTPUT: 987 OUTPUT:
929 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
930 992
931void 993void
932SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
933 995
934char * 996char *
935SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
936 999
937int 1000int
938SDL_GetAppState () 1001SDL_GetAppState ()
939 1002
940int 1003int
941SDL_GetModState () 1004SDL_GetModState ()
942 1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
943void 1010void
1011SDL_PumpEvents ()
1012
1013void
944poll_events () 1014peep_events ()
945 PPCODE: 1015 PPCODE:
946{ 1016{
947 SDL_Event ev; 1017 SDL_Event ev;
948 1018
949 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
1015 1085
1016 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1086 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017 } 1087 }
1018} 1088}
1019 1089
1090char *
1091SDL_AudioDriverName ()
1092 CODE:
1093{
1094 char buf [256];
1095 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1096 XSRETURN_UNDEF;
1097
1098 RETVAL = buf;
1099}
1100 OUTPUT:
1101 RETVAL
1102
1020int 1103int
1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022 POSTCALL: 1105 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
1025 1108
1026void 1109void
1027Mix_QuerySpec () 1110Mix_QuerySpec ()
1086add_font (char *file) 1169add_font (char *file)
1087 CODE: 1170 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1172 OUTPUT:
1090 RETVAL 1173 RETVAL
1174
1175void
1176IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1177
1178# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1179void
1180Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1091 1181
1092void 1182void
1093load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
1094 ALIAS: 1184 ALIAS:
1095 load_image_file = 1 1185 load_image_file = 1
1141 1231
1142 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 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))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
1151 1241
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1314
1225PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1226 1316
1227DC::Font 1317DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1319 CODE:
1230{ 1320{
1231 int count; 1321 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1352 PROTOTYPE:
1263 CODE: 1353 CODE:
1264 tc_restore (); 1354 tc_restore ();
1265 1355
1266DC::Layout 1356DC::Layout
1267new (SV *class) 1357new (SV *klass)
1268 CODE: 1358 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1270 1360
1271 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1273 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1274 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1275 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1276 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1277 RETVAL->font = 0; 1367 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1279 1368
1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1281 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1282 OUTPUT: 1371 OUTPUT:
1283 RETVAL 1372 RETVAL
1284 1373
1285void 1374void
1286DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1287 CODE: 1376 CODE:
1288 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1289 rc_free (self->rc);
1290 Safefree (self); 1378 delete self;
1291 1379
1292void 1380void
1293set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1294 CODE: 1382 CODE:
1295{ 1383{
1421 1509
1422void 1510void
1423set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1424 CODE: 1512 CODE:
1425 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1426 { 1514 {
1427 self->base_height = base_height; 1515 self->base_height = base_height;
1428 layout_update_font (self); 1516 layout_update_font (self);
1429 } 1517 }
1430 1518
1431void 1519void
1549} 1637}
1550 1638
1551void 1639void
1552render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1553 CODE: 1641 CODE:
1554 rc_clear (self->rc); 1642 self->rc.clear ();
1555 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1556 self->pl, 1644 self->pl,
1557 self->rc, 1645 &self->rc,
1558 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1559 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1560 flags 1648 flags
1561 ); 1649 );
1562 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1573 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1574 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1575 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1576 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1577 1665
1578 rc_draw (self->rc); 1666 self->rc.draw ();
1579 1667
1580 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1581 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1582 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1583} 1671}
1658 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1659 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1660 } 1748 }
1661} 1749}
1662 1750
1751void
1752draw_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)
1753 PROTOTYPE: @
1754 CODE:
1755{
1756 glEnable (GL_BLEND);
1757 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1758 glEnable (GL_TEXTURE_2D);
1759 glBindTexture (GL_TEXTURE_2D, name1);
1760
1761 glColor3f (intensity, intensity, intensity);
1762 glPushMatrix ();
1763 glScalef (1./3, 1./3, 1.);
1764
1765 if (blend > 0.f)
1766 {
1767 float dx3 = dx * -3.f / w;
1768 float dy3 = dy * -3.f / h;
1769 GLfloat env_color[4] = { 0., 0., 0., blend };
1770
1771 /* interpolate the two shadow textures */
1772 /* stage 0 == rgb(glcolor) + alpha(t0) */
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774
1775 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1776 gl.ActiveTexture (GL_TEXTURE1);
1777 glEnable (GL_TEXTURE_2D);
1778 glBindTexture (GL_TEXTURE_2D, name2);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1780
1781 /* rgb == rgb(glcolor) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1783 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1784 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1785
1786 /* alpha = interpolate t0, t1 by env_alpha */
1787 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1788
1789 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1798
1799 glBegin (GL_QUADS);
1800 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1801 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1802 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1803 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1804 glEnd ();
1805
1806 glDisable (GL_TEXTURE_2D);
1807 gl.ActiveTexture (GL_TEXTURE0);
1808 }
1809 else
1810 {
1811 /* simple blending of one texture, also opengl <1.3 path */
1812 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1813
1814 glBegin (GL_QUADS);
1815 glTexCoord2f (0, 0); glVertex2f (0, 0);
1816 glTexCoord2f (0, t); glVertex2f (0, h);
1817 glTexCoord2f (s, t); glVertex2f (w, h);
1818 glTexCoord2f (s, 0); glVertex2f (w, 0);
1819 glEnd ();
1820 }
1821
1822 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1823 {
1824 int x, y;
1825 int dx3 = dx * 3;
1826 int dy3 = dy * 3;
1827
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1829 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1830 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1831 glTranslatef (-1., -1., 0);
1832 glBegin (GL_QUADS);
1833
1834 for (y = 1; y < h; y += 3)
1835 {
1836 int y1 = y - dy3;
1837 int y1valid = y1 >= 0 && y1 < h;
1838
1839 for (x = 1; x < w; x += 3)
1840 {
1841 int x1 = x - dx3;
1842 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1843 uint8_t h2;
1844
1845 if (y1valid && x1 >= 0 && x1 < w)
1846 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1847 else
1848 h2 = 1; /* out of range == invisible */
1849
1850 if (h1 || h2)
1851 {
1852 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1853 glColor4f (1., 1., 1., alpha);
1854
1855 glTexCoord2f (0, 0.); glVertex2i (x , y );
1856 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1857 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1858 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1859 }
1860 }
1861 }
1862 }
1863
1864 glEnd ();
1865
1866 glPopMatrix ();
1867
1868 glDisable (GL_TEXTURE_2D);
1869 glDisable (GL_BLEND);
1870}
1871
1663IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1872IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664 CODE: 1873 CODE:
1665{ 1874{
1666 GLint width; 1875 GLint width;
1667 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1876 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1674MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1675 1884
1676PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1677 1886
1678DC::Map 1887DC::Map
1679new (SV *class) 1888new (SV *klass)
1680 CODE: 1889 CODE:
1681 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1682 RETVAL->x = 0; 1891 RETVAL->x = 0;
1683 RETVAL->y = 0; 1892 RETVAL->y = 0;
1684 RETVAL->w = 0; 1893 RETVAL->w = 0;
1685 RETVAL->h = 0; 1894 RETVAL->h = 0;
1686 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1723 1932
1724void 1933void
1725set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1726 CODE: 1935 CODE:
1727{ 1936{
1728 tileid texid; 1937 tileid texid;
1729 maptex *tex; 1938 maptex *tex;
1730 1939
1731 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1732 return; 1941 return;
1733 1942
1734 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1735 return; 1944 return;
1736 1945
1737 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1738 1947
1739 if (!texid) 1948 if (!texid)
1740 return; 1949 return;
1741 1950
1742 tex = self->tex + texid; 1951 tex = self->tex + texid;
1775} 1984}
1776 1985
1777void 1986void
1778expire_textures (DC::Map self, int texid, int count) 1987expire_textures (DC::Map self, int texid, int count)
1779 PPCODE: 1988 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count) 1989 for (; texid < self->texs && count; ++texid, --count)
1781 { 1990 {
1782 maptex *tex = self->tex + texid; 1991 maptex *tex = self->tex + texid;
1783 1992
1784 if (tex->name) 1993 if (tex->name)
1785 { 1994 {
1832 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1833 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1834 2043
1835 while (self->y < 0) 2044 while (self->y < 0)
1836 { 2045 {
1837 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1838 2047
1839 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1840 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1841 } 2050 }
1842} 2051}
1843 2052
1844SV * 2053SV *
1845map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1846 CODE: 2055 CODE:
1847{ 2056{
1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1849 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1850 mapcell *cell; 2059 mapcell *cell;
1871 2080
1872 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1873 2082
1874 if (flags & 8) 2083 if (flags & 8)
1875 { 2084 {
2085 uint8_t ext, cmd;
2086
1876 if (extmap) 2087 do
1877 { 2088 {
1878 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1879 2091
1880 do 2092 if (cmd < 4)
2093 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2094 else if (cmd == 5) // health
1881 { 2095 {
1882 ext = *data++;
1883 cmd = ext & 0x7f;
1884
1885 if (cmd < 4)
1886 cell->darkness = 255 - ext * 64 + 1;
1887 else if (cmd == 5) // health
1888 {
1889 cell->stat_width = 1; 2096 cell->stat_width = 1;
1890 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1891 }
1892 else if (cmd == 6) // monster width
1893 cell->stat_width = *data++ + 1;
1894 else if (cmd == 0x47)
1895 {
1896 if (*data == 1) cell->player = data [1];
1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1900
1901 data += *data + 1;
1902 }
1903 else if (cmd == 8) // cell flags
1904 cell->flags = *data++;
1905 else if (ext & 0x40) // unknown, multibyte => skip
1906 data += *data + 1;
1907 else
1908 data++;
1909 } 2098 }
1910 while (ext & 0x80); 2099 else if (cmd == 6) // monster width
2100 cell->stat_width = *data++ + 1;
2101 else if (cmd == 0x47)
2102 {
2103 if (*data == 1) cell->player = data [1];
2104 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2105 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2106 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2107
2108 data += *data + 1;
2109 }
2110 else if (cmd == 8) // cell flags
2111 cell->flags = *data++;
2112 else if (ext & 0x40) // unknown, multibyte => skip
2113 data += *data + 1;
2114 else
2115 data++;
1911 } 2116 }
1912 else 2117 while (ext & 0x80);
1913 cell->darkness = *data++ + 1;
1914 } 2118 }
1915 2119
1916 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1917 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1918 { 2122 {
1966 ? self->row + y 2170 ? self->row + y
1967 : 0; 2171 : 0;
1968 2172
1969 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1970 { 2174 {
1971 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1972 2176
1973 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1974 { 2178 {
1975 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1976 2180
1978 { 2182 {
1979 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1980 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1981 int a1 = tex.a; 2185 int a1 = tex.a;
1982 2186
1983 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1984 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1985 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1986 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1987 } 2191 }
1988 } 2192 }
1989 2193
1990 *map++ = (r ) 2194 *map++ = (r )
1991 | (g << 8) 2195 | (g << 8)
1992 | (b << 16) 2196 | (b << 16)
1993 | (a << 24); 2197 | (a << 24);
1994 } 2198 }
1995 } 2199 }
1996 2200
1997 RETVAL = map_sv; 2201 RETVAL = map_sv;
1998} 2202}
1999 OUTPUT: 2203 OUTPUT:
2000 RETVAL 2204 RETVAL
2001 2205
2002void 2206void
2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2207draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2004 CODE: 2208 CODE:
2005{ 2209{
2006 int x, y, z; 2210 int x, y, z;
2007 2211
2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2009 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2011 smooth_key skey;
2012 int pl_x, pl_y; 2213 int pl_x, pl_y;
2013 maptex pl_tex; 2214 maptex pl_tex;
2014 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2015 rc_t *rc_ov = rc_alloc (); 2216 rc_t rc_ov;
2016 rc_key_t key; 2217 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden; 2218 rc_t::array_t *arr;
2018 2219
2019 pl_tex.name = 0; 2220 pl_tex.name = 0;
2020 2221
2021 // that's current max. sorry. 2222 // that's current max. sorry.
2022 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
2023 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
2024
2025 // clear key, in case of extra padding
2026 memset (&skey, 0, sizeof (skey));
2027 2225
2028 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
2029 key.r = 255; 2227 key.r = 255;
2030 key.g = 255; 2228 key.g = 255;
2031 key.b = 255; 2229 key.b = 255;
2037 my += self->y; 2235 my += self->y;
2038 2236
2039 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
2040 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
2041 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
2042 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2043 2241
2044 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
2046 { 2244 {
2047 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
2060 2258
2061 glEnable (GL_BLEND); 2259 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064 2262
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
2068 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
2069 { 2264 {
2070 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2071 key.texname = -1; 2268 key.texname = -1;
2072 2269
2073 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
2074 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
2075 { 2272 {
2092 2289
2093 if (!tex.name) 2290 if (!tex.name)
2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2095 2292
2096 key.texname = tex.name; 2293 key.texname = tex.name;
2097 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
2098 } 2295 }
2099 2296
2100 px = (x + 1) * T - tex.w; 2297 px = (x + 1) * Th - tex.w;
2101 py = (y + 1) * T - tex.h; 2298 py = (y + 1) * Tw - tex.h;
2102 2299
2103 if (expect_false (cell->player == player) && expect_false (z == 2)) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2104 { 2301 {
2105 pl_x = px; 2302 pl_x = px;
2106 pl_y = py; 2303 pl_y = py;
2107 pl_tex = tex; 2304 pl_tex = tex;
2108 continue; 2305 continue;
2109 } 2306 }
2110 2307
2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2112 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2310 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2115 2312
2116 // update smooth hash 2313 // update smooth hash
2117 if (tex.smoothtile) 2314 if (tex.smoothtile)
2118 { 2315 {
2119 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
2120 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
2121 2318
2122 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
2123 2320
2124 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
2125 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
2126 2323
2127 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
2135 2332
2136 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2137 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
2138 2335
2139 // full tile 2336 // full tile
2140 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2141 2338
2142 // borders 2339 // borders
2143 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2144 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2341 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2145 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2342 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2146 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2147 2344
2148 // corners 2345 // corners
2149 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2150 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2347 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2151 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2348 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2153 } 2350 }
2154 } 2351 }
2155 2352
2156 if (expect_false (z == 2)) 2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2157 { 2354 {
2158 /* draw question marks on top of hidden spaces */ 2355 // overlays such as the speech bubble, probably more to come
2159 if (!cell->darkness) 2356 if (cell->flags & 1)
2160 { 2357 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key; 2358 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH]; 2359 maptex tex = self->tex[TEXID_SPEECH];
2178 rc_array_t *arr;
2179 int px = x * T + T * 2 / 32; 2360 int px = x * Tw + Tw * 2 / 32;
2180 int py = y * T - T * 6 / 32; 2361 int py = y * Th - Th * 6 / 32;
2181 2362
2182 key_ov.texname = tex.name; 2363 key_ov.texname = tex.name;
2183 arr = rc_array (rc_ov, &key_ov); 2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2184 2365
2185 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2186 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2187 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2188 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2189 }
2190 } 2370 }
2191 } 2371 }
2192 } 2372 }
2193 } 2373 }
2194 2374
2195 rc_draw (rc); 2375 rc.draw ();
2196 rc_clear (rc); 2376 rc.clear ();
2197 2377
2198 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
2199 // this is basically counting sort 2379 // this is basically counting sort
2200 { 2380 {
2201 int w, b; 2381 int w, b;
2202 2382
2203 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
2204 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
2205 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2206 { 2388 {
2207 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
2208 if (smask) 2390 IV bits = it->second;
2209 for (b = 0; b < 32; ++b) 2391
2210 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
2211 { 2395 {
2212 int level = (w << 5) | b; 2396 maptex tex = self->tex [skey.tile];
2397 int px = (((int)skey.x) - 1) * Tw;
2398 int py = (((int)skey.y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
2213 HE *he; 2404 if (tex.name)
2214
2215 hv_iterinit (smooth);
2216 while ((he = hv_iternext (smooth)))
2217 { 2405 {
2218 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
2219 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
2220 2408 if (key.texname != tex.name)
2221 if (!(bits & 0x1000)
2222 && skey->level == level
2223 && level > smooth_max [skey->x][skey->y])
2224 { 2409 {
2225 maptex tex = self->tex [skey->tile];
2226 int px = (((int)skey->x) - 1) * T;
2227 int py = (((int)skey->y) - 1) * T;
2228 int border = bits & 15;
2229 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2230 float dx = tex.s * .0625f; // 16 images/row
2231 float dy = tex.t * .5f ; // 2 images/column
2232
2233 if (tex.name)
2234 {
2235 // this time avoiding texture state changes
2236 // save gobs of state changes.
2237 if (key.texname != tex.name)
2238 {
2239 self->tex [skey->tile].unused = 0; 2410 self->tex [skey.tile].unused = 0;
2240 2411
2241 glEnd (); 2412 glEnd ();
2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2243 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2244 } 2415 }
2245 2416
2246 if (border) 2417 if (border)
2247 { 2418 {
2248 float ox = border * dx; 2419 float ox = border * dx;
2249 2420
2250 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2251 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2252 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2253 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2254 } 2425 }
2255 2426
2256 if (corner) 2427 if (corner)
2257 { 2428 {
2258 float ox = corner * dx; 2429 float ox = corner * dx;
2259 2430
2260 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2261 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2262 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2263 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2264 }
2265 }
2266 } 2435 }
2267 } 2436 }
2268 } 2437 }
2269 } 2438 }
2270 2439
2271 glEnd (); 2440 glEnd ();
2272 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2273 key.texname = -1; 2442 key.texname = -1;
2274 } 2443 }
2275
2276 hv_clear (smooth);
2277 } 2444 }
2278 2445
2279 if (pl_tex.name) 2446 if (pl_tex.name)
2280 { 2447 {
2281 maptex tex = pl_tex; 2448 maptex tex = pl_tex;
2282 int px = pl_x + sdx; 2449 int px = pl_x + sdx;
2283 int py = pl_y + sdy; 2450 int py = pl_y + sdy;
2284 2451
2285 key.texname = tex.name; 2452 key.texname = tex.name;
2286 arr = rc_array (rc, &key); 2453 rc_t::array_t &arr = rc.array (key);
2287 2454
2288 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2289 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2290 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2457 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2291 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2292 2459
2293 rc_draw (rc); 2460 rc.draw ();
2294 } 2461 }
2295 2462
2296 rc_draw (rc_ov); 2463 rc_ov.draw ();
2297 rc_clear (rc_ov); 2464 rc_ov.clear ();
2298 2465
2299 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2300 rc_free (rc);
2301 rc_free (rc_ov);
2302 2467
2303 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2304 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2305 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2306 { 2471 {
2309 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2310 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2311 { 2476 {
2312 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2313 2478
2314 int px = x * T; 2479 int px = x * Tw;
2315 int py = y * T; 2480 int py = y * Th;
2316 2481
2317 if (expect_false (cell->player == player)) 2482 if (ecb_expect_false (cell->player == player))
2318 { 2483 {
2319 px += sdx; 2484 px += sdx;
2320 py += sdy; 2485 py += sdy;
2321 } 2486 }
2322 2487
2323 if (cell->stat_hp) 2488 if (cell->stat_hp)
2324 { 2489 {
2325 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2327 2492
2328 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2329 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2330 px + width - 1, py); 2495 px + width - 1, py);
2331 2496
2337 } 2502 }
2338 } 2503 }
2339} 2504}
2340 2505
2341void 2506void
2342draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2343 CODE: 2508 CODE:
2344{ 2509{
2345 static float color[16][3] = { 2510 static float color[16][3] = {
2346 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2347 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2348 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2349 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2350 2515
2351 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2352 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2353 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2354 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2355 2520
2356 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2357 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2358 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2359 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2360 2525
2361 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2362 2527
2363 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2364 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2365 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2366 }; 2531 };
2367 2532
2368 int x, y; 2533 int x, y;
2369 2534
2370 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2371 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372 * but the nvidia driver (185.18.14) mishandles alpha textures 2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2373 * ansd takes the colour from god knows where instead of using 2538 * and takes the colour from god knows where instead of using
2374 * Cp. MODULATE results in the same colour, but slightly different 2539 * Cp. MODULATE results in the same colour, but slightly different
2375 * alpha, but atcually gives us the correct colour with nvidia. 2540 * alpha, but atcually gives us the correct colour with nvidia.
2376 */ 2541 */
2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2378 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2386 2551
2387 if (m) 2552 if (m)
2388 { 2553 {
2389 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2390 2555
2391 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2392 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2393 2558
2394 glColor4f (c[0], c[1], c[2], 1); 2559 glColor4f (c[0], c[1], c[2], 1);
2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2407void 2572void
2408fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2409 PPCODE: 2574 PPCODE:
2410{ 2575{
2411 int x, y; 2576 int x, y;
2412 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2413 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2414 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2415 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2416 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2417 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2418 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2419 2585
2420 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2421 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2422 2588
2423 mx += self->x - 1; 2589 mx += self->x - 1;
2424 my += self->y - 1; 2590 my += self->y - 1;
2425
2426 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2427 2591
2428 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2429 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2430 { 2594 {
2431 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2434 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2435 { 2599 {
2436 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2437 2601
2438 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2439 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2440 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2441 } 2605 }
2442 } 2606 }
2443 2607
2444 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2445 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2464 2628
2465 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2466 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2467 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2468 2632
2469 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2470 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2471 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2472 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2473 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2474 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2475 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2476 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2477 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2478 } 2642 }
2479 2643
2480 free (darkness1); 2644 free (darkness1);
2481 2645
2482 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2483 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2484 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2485 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2486} 2650}
2487 2651
2488SV * 2652SV *
2551 else 2715 else
2552 *data++ = 0; 2716 *data++ = 0;
2553 } 2717 }
2554 } 2718 }
2555 2719
2556 /* if size is w*h + 5 then no data has been found */ 2720 /* if size is w*h + 5 then no data has been found */
2557 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2558 { 2722 {
2559 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2560 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2561 } 2725 }
2562 2726
2563 RETVAL = data_sv; 2727 RETVAL = data_sv;
2564} 2728}
2565 OUTPUT: 2729 OUTPUT:
2566 RETVAL 2730 RETVAL
2567 2731
2568void 2732void
2575 STRLEN len; 2739 STRLEN len;
2576 uint8_t *data, *end; 2740 uint8_t *data, *end;
2577 2741
2578 len = SvLEN (data_sv); 2742 len = SvLEN (data_sv);
2579 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2580 data = SvPVbyte_nolen (data_sv); 2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2581 end = data + len + 8; 2745 end = data + len + 8;
2582 2746
2583 if (len < 5) 2747 if (len < 5)
2584 XSRETURN_EMPTY; 2748 XSRETURN_EMPTY;
2585 2749
2646} 2810}
2647 2811
2648MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2649 2813
2650DC::RW 2814DC::RW
2651new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2652 CODE: 2816 CODE:
2653{ 2817{
2654 STRLEN datalen; 2818 STRLEN datalen;
2655 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2656 2820
2658} 2822}
2659 OUTPUT: 2823 OUTPUT:
2660 RETVAL 2824 RETVAL
2661 2825
2662DC::RW 2826DC::RW
2663new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2664 CODE: 2828 CODE:
2665 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2666 OUTPUT: 2830 OUTPUT:
2667 RETVAL 2831 RETVAL
2668 2832
2686 if (RETVAL < 0) 2850 if (RETVAL < 0)
2687 { 2851 {
2688 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2689 2853
2690 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2691 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2692 2861 }
2862 else
2693 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2694 } 2864 }
2695 2865
2696 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2697 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2698} 2868}
2745void 2915void
2746set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2747 CODE: 2917 CODE:
2748{ 2918{
2749 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2750 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2751 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2752} 2922}
2753 2923
2754void 2924void
2755set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2758 2928
2759MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2760 2930
2761PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2762 2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2944
2763DC::MixChunk 2945DC::MixChunk
2764new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2765 CODE: 2947 CODE:
2766 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2767 OUTPUT: 2949 OUTPUT:
2768 RETVAL 2950 RETVAL
2769 2951
2799 OUTPUT: 2981 OUTPUT:
2800 RETVAL 2982 RETVAL
2801 2983
2802MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2803 2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2997
2804int 2998int
2805volume (int volume = -1) 2999volume (int volume = -1)
2806 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2807 CODE: 3001 CODE:
2808 if (items > 0) 3002 if (items > 0)
2819void 3013void
2820halt () 3014halt ()
2821 CODE: 3015 CODE:
2822 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2823 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2824DC::MixMusic 3025DC::MixMusic
2825new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2826 CODE: 3027 CODE:
2827 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2828 OUTPUT: 3029 OUTPUT:
2829 RETVAL 3030 RETVAL
2830 3031
2858 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2859# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2860 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2861 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2862 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2863 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2864 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2865 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2866 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2867 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2879 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2880 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2881 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2882 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2883 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2884 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2885 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2886 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2887 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2888 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2962 const_iv (GL_FUNC_SUBTRACT), 3168 const_iv (GL_FUNC_SUBTRACT),
2963 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2964# undef const_iv 3170# undef const_iv
2965 }; 3171 };
2966 3172
2967 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2969 3175
2970 texture_av = newAV (); 3176 texture_av = newAV ();
2971 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2972} 3178}
2973 3179
2978 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2979 3185
2980void 3186void
2981apple_nvidia_bug (int enable) 3187apple_nvidia_bug (int enable)
2982 3188
2983char * 3189const char *
2984gl_vendor () 3190gl_vendor ()
2985 CODE: 3191 CODE:
2986 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2987 OUTPUT: 3193 OUTPUT:
2988 RETVAL 3194 RETVAL
2989 3195
2990char * 3196const char *
2991gl_version () 3197gl_version ()
2992 CODE: 3198 CODE:
2993 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2994 OUTPUT: 3200 OUTPUT:
2995 RETVAL 3201 RETVAL
2996 3202
2997char * 3203const char *
2998gl_extensions () 3204gl_extensions ()
2999 CODE: 3205 CODE:
3000 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3001 OUTPUT: 3207 OUTPUT:
3002 RETVAL 3208 RETVAL
3003 3209
3004const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
3005 3215
3006GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
3007 CODE: 3217 CODE:
3008 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
3009 OUTPUT: 3219 OUTPUT:
3016 RETVAL 3226 RETVAL
3017 3227
3018int glGetError () 3228int glGetError ()
3019 3229
3020void glFinish () 3230void glFinish ()
3231
3232void glFlush ()
3021 3233
3022void glClear (int mask) 3234void glClear (int mask)
3023 3235
3024void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
3025 PROTOTYPE: @ 3237 PROTOTYPE: @
3197 3409
3198void glEndList () 3410void glEndList ()
3199 3411
3200void glCallList (int list) 3412void glCallList (int list)
3201 3413
3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
3202MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3203 3420
3204PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
3205 3422
3206void 3423void
3207find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
3208 PPCODE: 3425 PPCODE:
3209{ 3426{
3210 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
3211 XPUSHs (self); 3428 XPUSHs (self);
3212} 3429}
3213 3430
3214BOOT: 3431BOOT:
3215{ 3432{
3223 3440
3224void 3441void
3225draw (SV *self) 3442draw (SV *self)
3226 CODE: 3443 CODE:
3227{ 3444{
3228 HV *hv; 3445 HV *hv;
3229 SV **svp; 3446 SV **svp;
3230 NV x, y, w, h; 3447 NV x, y, w, h;
3231 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
3232 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
3233 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
3234 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines