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.333 by root, Mon Nov 19 01:23:01 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines