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.284 by elmex, Thu Dec 11 00:17:47 2008 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 16 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
92 94
93/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 97
96#define KMOD_LRAM 0x10000 // our extension 98#define KMOD_LRAM 0x10000 // our extension
99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
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}
97 121
98static AV *texture_av; 122static AV *texture_av;
99 123
100static struct 124static struct
101{ 125{
158{ 182{
159 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
160 184
161 while (attrs) 185 while (attrs)
162 { 186 {
163 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 188
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 190 return 1;
167 191
168 attrs = attrs->next; 192 attrs = attrs->next;
169 } 193 }
170 194
171 return 0; 195 return 0;
172} 196}
173 197
174typedef struct cf_layout { 198struct cf_layout {
175 PangoLayout *pl; 199 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
177 int base_height; 201 int base_height;
178 DC__Font font; 202 DC__Font font;
179 rc_t *rc; 203 rc_t rc;
180} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
181 207
182static DC__Font default_font; 208static DC__Font default_font;
183static PangoContext *opengl_context; 209static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
185 211
186static void 212static void
187substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
188{ 214{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 218#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 220}
195 221
196static void 222static void
223 249
224 *w = rect.width; 250 *w = rect.width;
225 *h = rect.height; 251 *h = rect.height;
226} 252}
227 253
254/////////////////////////////////////////////////////////////////////////////
255
228typedef uint16_t tileid; 256typedef uint16_t tileid;
229typedef uint16_t faceid; 257typedef uint16_t faceid;
230 258
231typedef struct { 259struct maptex
260{
232 GLuint name; 261 GLuint name;
233 int w, h; 262 int w, h;
234 float s, t; 263 float s, t;
235 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
236 tileid smoothtile; 265 tileid smoothtile;
237 uint8_t smoothlevel; 266 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */ 267 uint8_t unused; /* set to zero on use */
239} maptex; 268};
240 269
241typedef struct { 270struct mapcell
271{
242 uint32_t player; 272 uint32_t player;
243 tileid tile[3]; 273 tileid tile[3];
244 uint16_t darkness; 274 uint16_t darkness;
245 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
246} mapcell; 276};
247 277
248typedef struct { 278struct maprow
279{
249 int32_t c0, c1; 280 int32_t c0, c1;
250 mapcell *col; 281 mapcell *col;
251} maprow; 282};
252 283
253typedef struct map { 284struct mapgrid {
254 int x, y, w, h; 285 int x, y, w, h;
255 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
256 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
257 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
258 289
259 int32_t rows; 290 int32_t rows;
260 maprow *row; 291 maprow *row;
261} *DC__Map; 292};
262 293
263static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
264prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
265{ 299{
266 char *p; 300 T *p;
267 301
268 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
269 Zero (p, inc, char); 303 Zero (p, inc, T);
270 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
271 Safefree (ptr); 305 Safefree (ptr);
272 306
273 return p; 307 ptr = p;
274} 308}
275 309
276static char * 310template<typename T>
277append (char *ptr, int sze, int inc)
278{
279 Renew (ptr, sze + inc, char);
280 Zero (ptr + sze, inc, char);
281
282 return ptr;
283}
284
285#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
286#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
287
288static 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
289need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
290{ 320{
291 while (self->faces <= face) 321 while (self->faces <= face)
292 { 322 {
293 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
294 self->faces *= 2; 324 self->faces *= 2;
295 } 325 }
296} 326}
297 327
298static void 328static void
299need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
300{ 330{
301 while (self->texs <= texid) 331 while (self->texs <= texid)
302 { 332 {
303 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
304 self->texs *= 2; 334 self->texs *= 2;
305 } 335 }
306} 336}
307 337
308static maprow * 338static maprow *
309map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
310{ 340{
311 if (0 > y) 341 if (0 > y)
312 { 342 {
313 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
314 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
315 345
316 self->rows += extend; 346 self->rows += extend;
317 self->y += extend; 347 self->y += extend;
318 y += extend; 348 y += extend;
319 } 349 }
320 else if (y >= self->rows) 350 else if (y >= self->rows)
321 { 351 {
322 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
323 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
324 self->rows += extend; 354 self->rows += extend;
325 } 355 }
326 356
327 return self->row + y; 357 return self->row + y;
328} 358}
338 } 368 }
339 369
340 if (row->c0 > x) 370 if (row->c0 > x)
341 { 371 {
342 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
343 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
344 row->c0 -= extend; 374 row->c0 -= extend;
345 } 375 }
346 else if (x >= row->c1) 376 else if (x >= row->c1)
347 { 377 {
348 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
349 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
350 row->c1 += extend; 380 row->c1 += extend;
351 } 381 }
352 382
353 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
354} 384}
355 385
356static mapcell * 386static mapcell *
357map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
358{ 388{
359 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
360} 390}
361 391
362static void 392static void
363map_clear (DC__Map self) 393map_clear (mapgrid *self)
364{ 394{
365 int r; 395 int r;
366 396
367 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
368 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
386 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
387 (cell)->player = 0; \ 417 (cell)->player = 0; \
388 } while (0) 418 } while (0)
389 419
390static void 420static void
391map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
392{ 422{
393 int x, y; 423 int x, y;
394 maprow *row; 424 maprow *row;
395 mapcell *cell; 425 mapcell *cell;
396 426
413 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
414 } 444 }
415 } 445 }
416} 446}
417 447
418typedef struct { 448struct smooth_key
449{
419 tileid tile; 450 tileid tile;
420 uint8_t x, y, level; 451 uint8_t x, y, level;
421} 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}
422 471
423static void 472static void
424smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
425{ 474{
426 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
427 476
428 if (SvIOK (*sv)) 477 if (it == h.end ())
429 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
430 else 479 else
431 sv_setiv (*sv, bits); 480 it->second |= bits;
432} 481}
433 482
434static void 483static void
435music_finished (void) 484music_finished (void)
436{ 485{
453 ev.code = 1; 502 ev.code = 1;
454 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
455 ev.data2 = 0; 504 ev.data2 = 0;
456 505
457 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;
458} 514}
459 515
460static unsigned int 516static unsigned int
461minpot (unsigned int n) 517minpot (unsigned int n)
462{ 518{
472 n |= n >> 16; 528 n |= n >> 16;
473 529
474 return n + 1; 530 return n + 1;
475} 531}
476 532
477static unsigned int
478popcount (unsigned int n)
479{
480 n -= (n >> 1) & 0x55555555U;
481 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
482 n = ((n >> 4) + n) & 0x0f0f0f0fU;
483 n *= 0x01010101U;
484
485 return n >> 24;
486}
487
488/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
489#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
490#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
491 536
492/******************************************************************************/ 537/******************************************************************************/
545 590
546 return mod; 591 return mod;
547} 592}
548 593
549static void 594static void
550deliantra_main () 595deliantra_main (SV *real_main)
551{ 596{
552 char *argv[] = { 0 }; 597 dSP;
553 call_argv ("::main", G_DISCARD | G_VOID, argv); 598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
554} 601}
555 602
556#ifdef __MACOSX__ 603#ifdef __MACOSX__
604 static SV *real_main;
605
557 /* to due surprising braindamage on the side of SDL design, we 606 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main() 607 * do some mind-boggling hack here: SDL requires a custom main()
559 * 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,
560 * 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,
561 * and which calls our main (== SDL_main) back. 610 * and which calls our main (== SDL_main) back.
562 */ 611 */
563 extern C_LINKAGE int 612 extern C_LINKAGE int
564 main (int argc, char *argv[]) 613 main (int argc, char *argv[])
565 { 614 {
566 deliantra_main (); 615 deliantra_main (real_main);
567 } 616 }
568 617
569 #undef main 618 #undef main
570 619
571 extern C_LINKAGE int main (int argc, char *argv[]); 620 extern C_LINKAGE int main (int argc, char *argv[]);
572 621
573 static void 622 static void
574 SDL_braino (void) 623 SDL_main_hack (SV *real_main_)
575 { 624 {
625 real_main = real_main_;
626
576 char *argv[] = { "deliantra client", 0 }; 627 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv); 628 (main) (1, argv);
578 } 629 }
579#else 630#else
580 static void 631 static void
581 SDL_braino (void) 632 SDL_main_hack (SV *real_main)
582 { 633 {
583 deliantra_main (); 634 deliantra_main (real_main);
584 } 635 }
585#endif 636#endif
586 637
587MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
588 639
789 840
790 const_iv (FOW_DARKNESS) 841 const_iv (FOW_DARKNESS)
791# undef const_iv 842# undef const_iv
792 }; 843 };
793 844
794 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--)
795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
796 847
797 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
798 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
799} 850}
800 851
816NV ceil (NV x) 867NV ceil (NV x)
817 868
818IV minpot (UV n) 869IV minpot (UV n)
819 870
820IV 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
821 882
822void 883void
823pango_init () 884pango_init ()
824 CODE: 885 CODE:
825{ 886{
833#endif 894#endif
834} 895}
835 896
836char *SDL_GetError () 897char *SDL_GetError ()
837 898
838void SDL_braino () 899void SDL_main_hack (SV *real_main)
900 PROTOTYPE: &
839 901
840int SDL_Init (U32 flags) 902int SDL_Init (U32 flags)
841 903
842int SDL_InitSubSystem (U32 flags) 904int SDL_InitSubSystem (U32 flags)
843 905
844void SDL_QuitSubSystem (U32 flags) 906void SDL_QuitSubSystem (U32 flags)
845 907
846void SDL_Quit () 908void SDL_Quit ()
847 909
848int SDL_GL_SetAttribute (int attr, int value) 910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
849 912
850int SDL_GL_GetAttribute (int attr) 913int SDL_GL_GetAttribute (int attr)
851 CODE: 914 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL)) 915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
853 XSRETURN_UNDEF; 916 XSRETURN_UNDEF;
854 OUTPUT: 917 OUTPUT:
855 RETVAL 918 RETVAL
856 919
857void 920void
912 ); 975 );
913 976
914 if (RETVAL) 977 if (RETVAL)
915 { 978 {
916 av_clear (texture_av); 979 av_clear (texture_av);
917
918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919#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);
920#include "glfunc.h" 981#include "glfunc.h"
921#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922 } 985 }
923} 986}
924 OUTPUT: 987 OUTPUT:
925 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
926 992
927void 993void
928SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
929 995
930char * 996char *
931SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
932 999
933int 1000int
934SDL_GetAppState () 1001SDL_GetAppState ()
935 1002
936int 1003int
937SDL_GetModState () 1004SDL_GetModState ()
938 1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
939void 1010void
1011SDL_PumpEvents ()
1012
1013void
940poll_events () 1014peep_events ()
941 PPCODE: 1015 PPCODE:
942{ 1016{
943 SDL_Event ev; 1017 SDL_Event ev;
944 1018
945 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
1011 1085
1012 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))));
1013 } 1087 }
1014} 1088}
1015 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
1016int 1103int
1017Mix_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)
1018 POSTCALL: 1105 POSTCALL:
1019 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
1020 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
1021 1108
1022void 1109void
1023Mix_QuerySpec () 1110Mix_QuerySpec ()
1082add_font (char *file) 1169add_font (char *file)
1083 CODE: 1170 CODE:
1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT: 1172 OUTPUT:
1086 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)
1087 1181
1088void 1182void
1089load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
1090 ALIAS: 1184 ALIAS:
1091 load_image_file = 1 1185 load_image_file = 1
1137 1231
1138 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
1139 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
1140 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
1141 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
1142 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1143 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)));
1144 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1145 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1146 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
1147 1241
1219MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1220 1314
1221PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1222 1316
1223DC::Font 1317DC::Font
1224new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1225 CODE: 1319 CODE:
1226{ 1320{
1227 int count; 1321 int count;
1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1229 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1258 PROTOTYPE: 1352 PROTOTYPE:
1259 CODE: 1353 CODE:
1260 tc_restore (); 1354 tc_restore ();
1261 1355
1262DC::Layout 1356DC::Layout
1263new (SV *class) 1357new (SV *klass)
1264 CODE: 1358 CODE:
1265 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1266 1360
1267 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1268 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1269 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1270 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1271 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1272 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1273 RETVAL->font = 0; 1367 RETVAL->font = 0;
1274 RETVAL->rc = rc_alloc ();
1275 1368
1276 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1277 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1278 OUTPUT: 1371 OUTPUT:
1279 RETVAL 1372 RETVAL
1280 1373
1281void 1374void
1282DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1283 CODE: 1376 CODE:
1284 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1285 rc_free (self->rc);
1286 Safefree (self); 1378 delete self;
1287 1379
1288void 1380void
1289set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1290 CODE: 1382 CODE:
1291{ 1383{
1417 1509
1418void 1510void
1419set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1420 CODE: 1512 CODE:
1421 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1422 { 1514 {
1423 self->base_height = base_height; 1515 self->base_height = base_height;
1424 layout_update_font (self); 1516 layout_update_font (self);
1425 } 1517 }
1426 1518
1427void 1519void
1545} 1637}
1546 1638
1547void 1639void
1548render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1549 CODE: 1641 CODE:
1550 rc_clear (self->rc); 1642 self->rc.clear ();
1551 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1552 self->pl, 1644 self->pl,
1553 self->rc, 1645 &self->rc,
1554 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1555 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1556 flags 1648 flags
1557 ); 1649 );
1558 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1569 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1570 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1571 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1572 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1573 1665
1574 rc_draw (self->rc); 1666 self->rc.draw ();
1575 1667
1576 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1577 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1578 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1579} 1671}
1654 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1656 } 1748 }
1657} 1749}
1658 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
1659IV 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)
1660 CODE: 1873 CODE:
1661{ 1874{
1662 GLint width; 1875 GLint width;
1663 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);
1670MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1671 1884
1672PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1673 1886
1674DC::Map 1887DC::Map
1675new (SV *class) 1888new (SV *klass)
1676 CODE: 1889 CODE:
1677 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1678 RETVAL->x = 0; 1891 RETVAL->x = 0;
1679 RETVAL->y = 0; 1892 RETVAL->y = 0;
1680 RETVAL->w = 0; 1893 RETVAL->w = 0;
1681 RETVAL->h = 0; 1894 RETVAL->h = 0;
1682 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1719 1932
1720void 1933void
1721set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1722 CODE: 1935 CODE:
1723{ 1936{
1724 tileid texid; 1937 tileid texid;
1725 maptex *tex; 1938 maptex *tex;
1726 1939
1727 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1728 return; 1941 return;
1729 1942
1730 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1731 return; 1944 return;
1732 1945
1733 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1734 1947
1735 if (!texid) 1948 if (!texid)
1736 return; 1949 return;
1737 1950
1738 tex = self->tex + texid; 1951 tex = self->tex + texid;
1771} 1984}
1772 1985
1773void 1986void
1774expire_textures (DC::Map self, int texid, int count) 1987expire_textures (DC::Map self, int texid, int count)
1775 PPCODE: 1988 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count) 1989 for (; texid < self->texs && count; ++texid, --count)
1777 { 1990 {
1778 maptex *tex = self->tex + texid; 1991 maptex *tex = self->tex + texid;
1779 1992
1780 if (tex->name) 1993 if (tex->name)
1781 { 1994 {
1828 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1829 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1830 2043
1831 while (self->y < 0) 2044 while (self->y < 0)
1832 { 2045 {
1833 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1834 2047
1835 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1836 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1837 } 2050 }
1838} 2051}
1839 2052
1840SV * 2053SV *
1841map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1842 CODE: 2055 CODE:
1843{ 2056{
1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1845 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1846 mapcell *cell; 2059 mapcell *cell;
1867 2080
1868 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1869 2082
1870 if (flags & 8) 2083 if (flags & 8)
1871 { 2084 {
2085 uint8_t ext, cmd;
2086
1872 if (extmap) 2087 do
1873 { 2088 {
1874 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1875 2091
1876 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
1877 { 2095 {
1878 ext = *data++;
1879 cmd = ext & 0x7f;
1880
1881 if (cmd < 4)
1882 cell->darkness = 255 - ext * 64 + 1;
1883 else if (cmd == 5) // health
1884 {
1885 cell->stat_width = 1; 2096 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1887 }
1888 else if (cmd == 6) // monster width
1889 cell->stat_width = *data++ + 1;
1890 else if (cmd == 0x47)
1891 {
1892 if (*data == 1) cell->player = data [1];
1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1896
1897 data += *data + 1;
1898 }
1899 else if (cmd == 8) // cell flags
1900 cell->flags = *data++;
1901 else if (ext & 0x40) // unknown, multibyte => skip
1902 data += *data + 1;
1903 else
1904 data++;
1905 } 2098 }
1906 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++;
1907 } 2116 }
1908 else 2117 while (ext & 0x80);
1909 cell->darkness = *data++ + 1;
1910 } 2118 }
1911 2119
1912 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1913 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1914 { 2122 {
1962 ? self->row + y 2170 ? self->row + y
1963 : 0; 2171 : 0;
1964 2172
1965 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1966 { 2174 {
1967 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1968 2176
1969 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1970 { 2178 {
1971 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1972 2180
1974 { 2182 {
1975 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1976 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1977 int a1 = tex.a; 2185 int a1 = tex.a;
1978 2186
1979 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1980 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1981 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1982 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1983 } 2191 }
1984 } 2192 }
1985 2193
1986 *map++ = (r ) 2194 *map++ = (r )
1987 | (g << 8) 2195 | (g << 8)
1988 | (b << 16) 2196 | (b << 16)
1989 | (a << 24); 2197 | (a << 24);
1990 } 2198 }
1991 } 2199 }
1992 2200
1993 RETVAL = map_sv; 2201 RETVAL = map_sv;
1994} 2202}
1995 OUTPUT: 2203 OUTPUT:
1996 RETVAL 2204 RETVAL
1997 2205
1998void 2206void
1999draw (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)
2000 CODE: 2208 CODE:
2001{ 2209{
2002 int x, y, z; 2210 int x, y, z;
2003 2211
2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2006 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!
2007 smooth_key skey;
2008 int pl_x, pl_y; 2213 int pl_x, pl_y;
2009 maptex pl_tex; 2214 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2216 rc_t rc_ov;
2011 rc_key_t key; 2217 rc_key_t key;
2012 rc_array_t *arr; 2218 rc_t::array_t *arr;
2013 2219
2014 pl_tex.name = 0; 2220 pl_tex.name = 0;
2015 2221
2016 // thats current max. sorry. 2222 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
2019
2020 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey));
2022 2225
2023 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
2024 key.r = 255; 2227 key.r = 255;
2025 key.g = 255; 2228 key.g = 255;
2026 key.b = 255; 2229 key.b = 255;
2032 my += self->y; 2235 my += self->y;
2033 2236
2034 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
2035 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
2036 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
2037 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2038 2241
2039 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
2040 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
2041 { 2244 {
2042 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
2057 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2058 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2059 2262
2060 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
2061 { 2264 {
2062 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;
2063 key.texname = -1; 2268 key.texname = -1;
2064 2269
2065 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
2066 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
2067 { 2272 {
2074 tileid tile = cell->tile [z]; 2279 tileid tile = cell->tile [z];
2075 2280
2076 if (tile) 2281 if (tile)
2077 { 2282 {
2078 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2284 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2285
2082 if (key.texname != tex.name) 2286 if (key.texname != tex.name)
2083 { 2287 {
2084 self->tex [tile].unused = 0; 2288 self->tex [tile].unused = 0;
2085 2289
2086 if (!tex.name) 2290 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2292
2089 key.texname = tex.name; 2293 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
2091 } 2295 }
2092 2296
2297 px = (x + 1) * Th - tex.w;
2298 py = (y + 1) * Tw - tex.h;
2299
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2094 { 2301 {
2095 pl_x = px; 2302 pl_x = px;
2096 pl_y = py; 2303 pl_y = py;
2097 pl_tex = tex; 2304 pl_tex = tex;
2098 continue; 2305 continue;
2099 } 2306 }
2100 2307
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2103 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);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2105
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 /* this is a workaround to make speech bubbles drawn
2109 * for example above walls, work. */
2110 rc_draw (rc);
2111 rc_clear (rc);
2112 key.texname = -1;
2113
2114 // overlays such as the speech bubble, probably more to come
2115 if (cell->flags & 1)
2116 {
2117 maptex tex = self->tex [1];
2118 int px = x * T + T * 2 / 32;
2119 int py = y * T - T * 6 / 32;
2120
2121 if (tex.name)
2122 {
2123 if (key.texname != tex.name)
2124 {
2125 key.texname = tex.name;
2126 arr = rc_array (rc, &key);
2127 }
2128
2129 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2130 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2131 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2132 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2133 }
2134 }
2135 }
2136 2312
2137 // update smooth hash 2313 // update smooth hash
2138 if (tex.smoothtile) 2314 if (tex.smoothtile)
2139 { 2315 {
2140 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
2141 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
2142 2318
2143 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
2144 2320
2145 // 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
2146 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
2147 2323
2148 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
2156 2332
2157 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2158 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
2159 2335
2160 // full tile 2336 // full tile
2161 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);
2162 2338
2163 // borders 2339 // borders
2164 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);
2165 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);
2166 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);
2167 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);
2168 2344
2169 // corners 2345 // corners
2170 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);
2171 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);
2172 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);
2173 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);
2350 }
2351 }
2352
2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2354 {
2355 // overlays such as the speech bubble, probably more to come
2356 if (cell->flags & 1)
2357 {
2358 rc_key_t key_ov = key;
2359 maptex tex = self->tex[TEXID_SPEECH];
2360 int px = x * Tw + Tw * 2 / 32;
2361 int py = y * Th - Th * 6 / 32;
2362
2363 key_ov.texname = tex.name;
2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2365
2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2174 } 2370 }
2175 } 2371 }
2176 } 2372 }
2177 } 2373 }
2178 2374
2179 rc_draw (rc); 2375 rc.draw ();
2180 rc_clear (rc); 2376 rc.clear ();
2181 2377
2182 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
2183 // this is basically counting sort 2379 // this is basically counting sort
2184 { 2380 {
2185 int w, b; 2381 int w, b;
2186 2382
2187 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
2188 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
2189 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)
2190 { 2388 {
2191 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
2192 if (smask) 2390 IV bits = it->second;
2193 for (b = 0; b < 32; ++b) 2391
2194 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
2195 { 2395 {
2196 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
2197 HE *he; 2404 if (tex.name)
2198
2199 hv_iterinit (smooth);
2200 while ((he = hv_iternext (smooth)))
2201 { 2405 {
2202 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
2203 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
2204 2408 if (key.texname != tex.name)
2205 if (!(bits & 0x1000)
2206 && skey->level == level
2207 && level > smooth_max [skey->x][skey->y])
2208 { 2409 {
2209 maptex tex = self->tex [skey->tile];
2210 int px = (((int)skey->x) - 1) * T;
2211 int py = (((int)skey->y) - 1) * T;
2212 int border = bits & 15;
2213 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2214 float dx = tex.s * .0625f; // 16 images/row
2215 float dy = tex.t * .5f ; // 2 images/column
2216
2217 if (tex.name)
2218 {
2219 // this time avoiding texture state changes
2220 // save gobs of state changes.
2221 if (key.texname != tex.name)
2222 {
2223 self->tex [skey->tile].unused = 0; 2410 self->tex [skey.tile].unused = 0;
2224 2411
2225 glEnd (); 2412 glEnd ();
2226 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2227 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2228 } 2415 }
2229 2416
2230 if (border) 2417 if (border)
2231 { 2418 {
2232 float ox = border * dx; 2419 float ox = border * dx;
2233 2420
2234 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2235 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2236 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2237 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2238 } 2425 }
2239 2426
2240 if (corner) 2427 if (corner)
2241 { 2428 {
2242 float ox = corner * dx; 2429 float ox = corner * dx;
2243 2430
2244 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2245 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2246 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2247 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2248 }
2249 }
2250 } 2435 }
2251 } 2436 }
2252 } 2437 }
2253 } 2438 }
2254 2439
2255 glEnd (); 2440 glEnd ();
2256 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2257 key.texname = -1; 2442 key.texname = -1;
2258 } 2443 }
2259
2260 hv_clear (smooth);
2261 } 2444 }
2262 2445
2263 if (pl_tex.name) 2446 if (pl_tex.name)
2264 { 2447 {
2265 maptex tex = pl_tex; 2448 maptex tex = pl_tex;
2266 int px = pl_x + sdx; 2449 int px = pl_x + sdx;
2267 int py = pl_y + sdy; 2450 int py = pl_y + sdy;
2268 2451
2269 key.texname = tex.name; 2452 key.texname = tex.name;
2270 arr = rc_array (rc, &key); 2453 rc_t::array_t &arr = rc.array (key);
2271 2454
2272 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2273 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2274 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);
2275 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2276 2459
2277 rc_draw (rc); 2460 rc.draw ();
2278 } 2461 }
2279 2462
2463 rc_ov.draw ();
2464 rc_ov.clear ();
2465
2280 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2281 rc_free (rc);
2282 2467
2283 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2284 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2285 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2286 { 2471 {
2289 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2290 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2291 { 2476 {
2292 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2293 2478
2294 int px = x * T; 2479 int px = x * Tw;
2295 int py = y * T; 2480 int py = y * Th;
2296 2481
2297 if (expect_false (cell->player == player)) 2482 if (ecb_expect_false (cell->player == player))
2298 { 2483 {
2299 px += sdx; 2484 px += sdx;
2300 py += sdy; 2485 py += sdy;
2301 } 2486 }
2302 2487
2303 if (cell->stat_hp) 2488 if (cell->stat_hp)
2304 { 2489 {
2305 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2306 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2307 2492
2308 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2309 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2310 px + width - 1, py); 2495 px + width - 1, py);
2311 2496
2317 } 2502 }
2318 } 2503 }
2319} 2504}
2320 2505
2321void 2506void
2322draw_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)
2323 CODE: 2508 CODE:
2324{ 2509{
2325 static float color[16][3] = { 2510 static float color[16][3] = {
2326 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2327 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2328 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2329 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2330 2515
2331 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2332 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2333 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2334 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2335 2520
2336 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2337 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2338 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2339 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2340 2525
2341 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2342 2527
2343 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2344 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2345 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2346 }; 2531 };
2347 2532
2348 int x, y; 2533 int x, y;
2349 2534
2350 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2351 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2352 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2353 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2354 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2355 2546
2356 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2360 2551
2361 if (m) 2552 if (m)
2362 { 2553 {
2363 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2364 2555
2365 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2366 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2367 2558
2368 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2369 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2370 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2371 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2372 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2373 } 2564 }
2381void 2572void
2382fow_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)
2383 PPCODE: 2574 PPCODE:
2384{ 2575{
2385 int x, y; 2576 int x, y;
2386 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2387 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2388 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2389 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);
2390 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2391 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2392 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2393 2585
2394 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2395 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2396 2588
2397 mx += self->x - 1; 2589 mx += self->x - 1;
2398 my += self->y - 1; 2590 my += self->y - 1;
2399
2400 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2401 2591
2402 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2403 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2404 { 2594 {
2405 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2408 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2409 { 2599 {
2410 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2411 2601
2412 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2413 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2414 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2415 } 2605 }
2416 } 2606 }
2417 2607
2418 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2419 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2438 2628
2439 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2440 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2441 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2442 2632
2443 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2444 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2445 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2446 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2447 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 */
2448 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2449 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2450 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2451 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2452 } 2642 }
2453 2643
2454 free (darkness1); 2644 free (darkness1);
2455 2645
2456 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2457 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2458 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2459 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2460} 2650}
2461 2651
2462SV * 2652SV *
2525 else 2715 else
2526 *data++ = 0; 2716 *data++ = 0;
2527 } 2717 }
2528 } 2718 }
2529 2719
2530 /* 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 */
2531 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2532 { 2722 {
2533 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2534 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2535 } 2725 }
2536 2726
2537 RETVAL = data_sv; 2727 RETVAL = data_sv;
2538} 2728}
2539 OUTPUT: 2729 OUTPUT:
2540 RETVAL 2730 RETVAL
2541 2731
2542void 2732void
2549 STRLEN len; 2739 STRLEN len;
2550 uint8_t *data, *end; 2740 uint8_t *data, *end;
2551 2741
2552 len = SvLEN (data_sv); 2742 len = SvLEN (data_sv);
2553 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2554 data = SvPVbyte_nolen (data_sv); 2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2555 end = data + len + 8; 2745 end = data + len + 8;
2556 2746
2557 if (len < 5) 2747 if (len < 5)
2558 XSRETURN_EMPTY; 2748 XSRETURN_EMPTY;
2559 2749
2620} 2810}
2621 2811
2622MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2623 2813
2624DC::RW 2814DC::RW
2625new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2626 CODE: 2816 CODE:
2627{ 2817{
2628 STRLEN datalen; 2818 STRLEN datalen;
2629 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2630 2820
2632} 2822}
2633 OUTPUT: 2823 OUTPUT:
2634 RETVAL 2824 RETVAL
2635 2825
2636DC::RW 2826DC::RW
2637new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2638 CODE: 2828 CODE:
2639 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2640 OUTPUT: 2830 OUTPUT:
2641 RETVAL 2831 RETVAL
2642 2832
2660 if (RETVAL < 0) 2850 if (RETVAL < 0)
2661 { 2851 {
2662 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2663 2853
2664 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)
2665 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2666 2861 }
2862 else
2667 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2668 } 2864 }
2669 2865
2670 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2671 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2672} 2868}
2719void 2915void
2720set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2721 CODE: 2917 CODE:
2722{ 2918{
2723 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));
2724 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;
2725 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2726} 2922}
2727 2923
2728void 2924void
2729set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2732 2928
2733MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2734 2930
2735PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2736 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
2737DC::MixChunk 2945DC::MixChunk
2738new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2739 CODE: 2947 CODE:
2740 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2741 OUTPUT: 2949 OUTPUT:
2742 RETVAL 2950 RETVAL
2743 2951
2773 OUTPUT: 2981 OUTPUT:
2774 RETVAL 2982 RETVAL
2775 2983
2776MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2777 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
2778int 2998int
2779volume (int volume = -1) 2999volume (int volume = -1)
2780 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2781 CODE: 3001 CODE:
2782 if (items > 0) 3002 if (items > 0)
2793void 3013void
2794halt () 3014halt ()
2795 CODE: 3015 CODE:
2796 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2797 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2798DC::MixMusic 3025DC::MixMusic
2799new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2800 CODE: 3027 CODE:
2801 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2802 OUTPUT: 3029 OUTPUT:
2803 RETVAL 3030 RETVAL
2804 3031
2832 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2833# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2834 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2835 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2836 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2837 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2838 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2839 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2840 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2841 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2853 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2854 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2855 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2856 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2857 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),
2858 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2859 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2860 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2861 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2862 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2930 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2931 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2932 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2933 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2934 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2935# undef const_iv 3170# undef const_iv
2936 }; 3171 };
2937 3172
2938 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--)
2939 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2940 3175
2941 texture_av = newAV (); 3176 texture_av = newAV ();
2942 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2943} 3178}
2944 3179
2946disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2947 CODE: 3182 CODE:
2948 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2949 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2950 3185
2951char * 3186void
3187apple_nvidia_bug (int enable)
3188
3189const char *
2952gl_vendor () 3190gl_vendor ()
2953 CODE: 3191 CODE:
2954 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2955 OUTPUT: 3193 OUTPUT:
2956 RETVAL 3194 RETVAL
2957 3195
2958char * 3196const char *
2959gl_version () 3197gl_version ()
2960 CODE: 3198 CODE:
2961 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2962 OUTPUT: 3200 OUTPUT:
2963 RETVAL 3201 RETVAL
2964 3202
2965char * 3203const char *
2966gl_extensions () 3204gl_extensions ()
2967 CODE: 3205 CODE:
2968 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2969 OUTPUT: 3207 OUTPUT:
2970 RETVAL 3208 RETVAL
2971 3209
2972const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2973 3215
2974GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2975 CODE: 3217 CODE:
2976 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2977 OUTPUT: 3219 OUTPUT:
2985 3227
2986int glGetError () 3228int glGetError ()
2987 3229
2988void glFinish () 3230void glFinish ()
2989 3231
3232void glFlush ()
3233
2990void glClear (int mask) 3234void glClear (int mask)
2991 3235
2992void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2993 PROTOTYPE: @ 3237 PROTOTYPE: @
2994 3238
3003void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
3004 3248
3005void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3006 CODE: 3250 CODE:
3007 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
3008 3254
3009void glDepthMask (int flag) 3255void glDepthMask (int flag)
3010 3256
3011void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
3012 3258
3163 3409
3164void glEndList () 3410void glEndList ()
3165 3411
3166void glCallList (int list) 3412void glCallList (int list)
3167 3413
3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
3168MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3169 3420
3170PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
3171 3422
3172void 3423void
3173find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
3174 PPCODE: 3425 PPCODE:
3175{ 3426{
3176 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
3177 XPUSHs (self); 3428 XPUSHs (self);
3178} 3429}
3179 3430
3180BOOT: 3431BOOT:
3181{ 3432{
3189 3440
3190void 3441void
3191draw (SV *self) 3442draw (SV *self)
3192 CODE: 3443 CODE:
3193{ 3444{
3194 HV *hv; 3445 HV *hv;
3195 SV **svp; 3446 SV **svp;
3196 NV x, y, w, h; 3447 NV x, y, w, h;
3197 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
3198 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
3199 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
3200 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