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.332 by root, Mon Nov 19 00:56:08 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
815 866
816NV ceil (NV x) 867NV ceil (NV x)
817 868
818IV minpot (UV n) 869IV minpot (UV n)
819 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
820IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
821 888
822void 889void
823pango_init () 890pango_init ()
824 CODE: 891 CODE:
825{ 892{
833#endif 900#endif
834} 901}
835 902
836char *SDL_GetError () 903char *SDL_GetError ()
837 904
838void SDL_braino () 905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
839 907
840int SDL_Init (U32 flags) 908int SDL_Init (U32 flags)
841 909
842int SDL_InitSubSystem (U32 flags) 910int SDL_InitSubSystem (U32 flags)
843 911
844void SDL_QuitSubSystem (U32 flags) 912void SDL_QuitSubSystem (U32 flags)
845 913
846void SDL_Quit () 914void SDL_Quit ()
847 915
848int SDL_GL_SetAttribute (int attr, int value) 916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
849 918
850int SDL_GL_GetAttribute (int attr) 919int SDL_GL_GetAttribute (int attr)
851 CODE: 920 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL)) 921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
853 XSRETURN_UNDEF; 922 XSRETURN_UNDEF;
854 OUTPUT: 923 OUTPUT:
855 RETVAL 924 RETVAL
856 925
857void 926void
912 ); 981 );
913 982
914 if (RETVAL) 983 if (RETVAL)
915 { 984 {
916 av_clear (texture_av); 985 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); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
920#include "glfunc.h" 987#include "glfunc.h"
921#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922 } 991 }
923} 992}
924 OUTPUT: 993 OUTPUT:
925 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
926 998
927void 999void
928SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
929 1001
930char * 1002char *
931SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
932 1005
933int 1006int
934SDL_GetAppState () 1007SDL_GetAppState ()
935 1008
936int 1009int
937SDL_GetModState () 1010SDL_GetModState ()
938 1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
939void 1016void
1017SDL_PumpEvents ()
1018
1019void
940poll_events () 1020peep_events ()
941 PPCODE: 1021 PPCODE:
942{ 1022{
943 SDL_Event ev; 1023 SDL_Event ev;
944 1024
945 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
1011 1091
1012 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1013 } 1093 }
1014} 1094}
1015 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
1016int 1109int
1017Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1018 POSTCALL: 1111 POSTCALL:
1019 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
1020 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
1021 1114
1022void 1115void
1023Mix_QuerySpec () 1116Mix_QuerySpec ()
1082add_font (char *file) 1175add_font (char *file)
1083 CODE: 1176 CODE:
1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT: 1178 OUTPUT:
1086 RETVAL 1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1087 1187
1088void 1188void
1089load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
1090 ALIAS: 1190 ALIAS:
1091 load_image_file = 1 1191 load_image_file = 1
1137 1237
1138 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
1139 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
1140 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
1141 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
1142 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 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))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1144 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1145 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1146 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
1147 1247
1219MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1220 1320
1221PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1222 1322
1223DC::Font 1323DC::Font
1224new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1225 CODE: 1325 CODE:
1226{ 1326{
1227 int count; 1327 int count;
1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1229 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1258 PROTOTYPE: 1358 PROTOTYPE:
1259 CODE: 1359 CODE:
1260 tc_restore (); 1360 tc_restore ();
1261 1361
1262DC::Layout 1362DC::Layout
1263new (SV *class) 1363new (SV *klass)
1264 CODE: 1364 CODE:
1265 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1266 1366
1267 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1268 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1269 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1270 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1271 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1272 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1273 RETVAL->font = 0; 1373 RETVAL->font = 0;
1274 RETVAL->rc = rc_alloc ();
1275 1374
1276 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1277 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1278 OUTPUT: 1377 OUTPUT:
1279 RETVAL 1378 RETVAL
1280 1379
1281void 1380void
1282DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1283 CODE: 1382 CODE:
1284 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1285 rc_free (self->rc);
1286 Safefree (self); 1384 delete self;
1287 1385
1288void 1386void
1289set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1290 CODE: 1388 CODE:
1291{ 1389{
1417 1515
1418void 1516void
1419set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1420 CODE: 1518 CODE:
1421 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1422 { 1520 {
1423 self->base_height = base_height; 1521 self->base_height = base_height;
1424 layout_update_font (self); 1522 layout_update_font (self);
1425 } 1523 }
1426 1524
1427void 1525void
1545} 1643}
1546 1644
1547void 1645void
1548render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1549 CODE: 1647 CODE:
1550 rc_clear (self->rc); 1648 self->rc.clear ();
1551 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1552 self->pl, 1650 self->pl,
1553 self->rc, 1651 &self->rc,
1554 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1555 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1556 flags 1654 flags
1557 ); 1655 );
1558 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1569 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1570 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1571 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1572 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1573 1671
1574 rc_draw (self->rc); 1672 self->rc.draw ();
1575 1673
1576 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1577 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1578 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1579} 1677}
1654 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1656 } 1754 }
1657} 1755}
1658 1756
1757void
1758draw_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)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1659IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1660 CODE: 1879 CODE:
1661{ 1880{
1662 GLint width; 1881 GLint width;
1663 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1670MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1671 1890
1672PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1673 1892
1674DC::Map 1893DC::Map
1675new (SV *class) 1894new (SV *klass)
1676 CODE: 1895 CODE:
1677 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1678 RETVAL->x = 0; 1897 RETVAL->x = 0;
1679 RETVAL->y = 0; 1898 RETVAL->y = 0;
1680 RETVAL->w = 0; 1899 RETVAL->w = 0;
1681 RETVAL->h = 0; 1900 RETVAL->h = 0;
1682 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1719 1938
1720void 1939void
1721set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1722 CODE: 1941 CODE:
1723{ 1942{
1724 tileid texid; 1943 tileid texid;
1725 maptex *tex; 1944 maptex *tex;
1726 1945
1727 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1728 return; 1947 return;
1729 1948
1730 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1731 return; 1950 return;
1732 1951
1733 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1734 1953
1735 if (!texid) 1954 if (!texid)
1736 return; 1955 return;
1737 1956
1738 tex = self->tex + texid; 1957 tex = self->tex + texid;
1771} 1990}
1772 1991
1773void 1992void
1774expire_textures (DC::Map self, int texid, int count) 1993expire_textures (DC::Map self, int texid, int count)
1775 PPCODE: 1994 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count) 1995 for (; texid < self->texs && count; ++texid, --count)
1777 { 1996 {
1778 maptex *tex = self->tex + texid; 1997 maptex *tex = self->tex + texid;
1779 1998
1780 if (tex->name) 1999 if (tex->name)
1781 { 2000 {
1828 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1829 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1830 2049
1831 while (self->y < 0) 2050 while (self->y < 0)
1832 { 2051 {
1833 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1834 2053
1835 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1836 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1837 } 2056 }
1838} 2057}
1839 2058
1840SV * 2059SV *
1841map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1842 CODE: 2061 CODE:
1843{ 2062{
1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1845 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1846 mapcell *cell; 2065 mapcell *cell;
1867 2086
1868 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1869 2088
1870 if (flags & 8) 2089 if (flags & 8)
1871 { 2090 {
2091 uint8_t ext, cmd;
2092
1872 if (extmap) 2093 do
1873 { 2094 {
1874 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1875 2097
1876 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1877 { 2101 {
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; 2102 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2103 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 } 2104 }
1906 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1907 } 2122 }
1908 else 2123 while (ext & 0x80);
1909 cell->darkness = *data++ + 1;
1910 } 2124 }
1911 2125
1912 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1913 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1914 { 2128 {
1962 ? self->row + y 2176 ? self->row + y
1963 : 0; 2177 : 0;
1964 2178
1965 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1966 { 2180 {
1967 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1968 2182
1969 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1970 { 2184 {
1971 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1972 2186
1974 { 2188 {
1975 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1976 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1977 int a1 = tex.a; 2191 int a1 = tex.a;
1978 2192
1979 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1980 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1981 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1982 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1983 } 2197 }
1984 } 2198 }
1985 2199
1986 *map++ = (r ) 2200 *map++ = (r )
1987 | (g << 8) 2201 | (g << 8)
1988 | (b << 16) 2202 | (b << 16)
1989 | (a << 24); 2203 | (a << 24);
1990 } 2204 }
1991 } 2205 }
1992 2206
1993 RETVAL = map_sv; 2207 RETVAL = map_sv;
1994} 2208}
1995 OUTPUT: 2209 OUTPUT:
1996 RETVAL 2210 RETVAL
1997 2211
1998void 2212void
1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2213draw (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: 2214 CODE:
2001{ 2215{
2002 int x, y, z; 2216 int x, y, z;
2003 2217
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) 2218 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; 2219 int pl_x, pl_y;
2009 maptex pl_tex; 2220 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
2011 rc_key_t key; 2223 rc_key_t key;
2012 rc_array_t *arr; 2224 rc_t::array_t *arr;
2013 2225
2014 pl_tex.name = 0; 2226 pl_tex.name = 0;
2015 2227
2016 // thats current max. sorry. 2228 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
2019
2020 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey));
2022 2231
2023 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
2024 key.r = 255; 2233 key.r = 255;
2025 key.g = 255; 2234 key.g = 255;
2026 key.b = 255; 2235 key.b = 255;
2032 my += self->y; 2241 my += self->y;
2033 2242
2034 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
2035 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
2036 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
2037 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2038 2247
2039 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
2040 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
2041 { 2250 {
2042 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
2057 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2058 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2059 2268
2060 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
2061 { 2270 {
2062 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2063 key.texname = -1; 2274 key.texname = -1;
2064 2275
2065 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
2066 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
2067 { 2278 {
2074 tileid tile = cell->tile [z]; 2285 tileid tile = cell->tile [z];
2075 2286
2076 if (tile) 2287 if (tile)
2077 { 2288 {
2078 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2290 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2291
2082 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
2083 { 2293 {
2084 self->tex [tile].unused = 0; 2294 self->tex [tile].unused = 0;
2085 2295
2086 if (!tex.name) 2296 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2298
2089 key.texname = tex.name; 2299 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
2091 } 2301 }
2092 2302
2303 px = (x + 1) * Th - tex.w;
2304 py = (y + 1) * Tw - tex.h;
2305
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2094 { 2307 {
2095 pl_x = px; 2308 pl_x = px;
2096 pl_y = py; 2309 pl_y = py;
2097 pl_tex = tex; 2310 pl_tex = tex;
2098 continue; 2311 continue;
2099 } 2312 }
2100 2313
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 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); 2316 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); 2317 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 2318
2137 // update smooth hash 2319 // update smooth hash
2138 if (tex.smoothtile) 2320 if (tex.smoothtile)
2139 { 2321 {
2140 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
2141 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
2142 2324
2143 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
2144 2326
2145 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
2146 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
2147 2329
2148 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
2156 2338
2157 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2158 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
2159 2341
2160 // full tile 2342 // full tile
2161 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2162 2344
2163 // borders 2345 // borders
2164 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 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); 2347 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); 2348 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); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2168 2350
2169 // corners 2351 // corners
2170 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 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); 2353 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); 2354 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); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2174 } 2376 }
2175 } 2377 }
2176 } 2378 }
2177 } 2379 }
2178 2380
2179 rc_draw (rc); 2381 rc.draw ();
2180 rc_clear (rc); 2382 rc.clear ();
2181 2383
2182 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2183 // this is basically counting sort 2385 // this is basically counting sort
2184 { 2386 {
2185 int w, b; 2387 int w, b;
2186 2388
2187 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2188 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2189 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2190 { 2394 {
2191 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2192 if (smask) 2396 IV bits = it->second;
2193 for (b = 0; b < 32; ++b) 2397
2194 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2195 { 2401 {
2196 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
2197 HE *he; 2410 if (tex.name)
2198
2199 hv_iterinit (smooth);
2200 while ((he = hv_iternext (smooth)))
2201 { 2411 {
2202 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
2203 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
2204 2414 if (key.texname != tex.name)
2205 if (!(bits & 0x1000)
2206 && skey->level == level
2207 && level > smooth_max [skey->x][skey->y])
2208 { 2415 {
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; 2416 self->tex [skey.tile].unused = 0;
2224 2417
2225 glEnd (); 2418 glEnd ();
2226 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2227 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2228 } 2421 }
2229 2422
2230 if (border) 2423 if (border)
2231 { 2424 {
2232 float ox = border * dx; 2425 float ox = border * dx;
2233 2426
2234 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2235 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2236 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2237 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2238 } 2431 }
2239 2432
2240 if (corner) 2433 if (corner)
2241 { 2434 {
2242 float ox = corner * dx; 2435 float ox = corner * dx;
2243 2436
2244 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2245 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2246 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2247 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2248 }
2249 }
2250 } 2441 }
2251 } 2442 }
2252 } 2443 }
2253 } 2444 }
2254 2445
2255 glEnd (); 2446 glEnd ();
2256 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2257 key.texname = -1; 2448 key.texname = -1;
2258 } 2449 }
2259
2260 hv_clear (smooth);
2261 } 2450 }
2262 2451
2263 if (pl_tex.name) 2452 if (pl_tex.name)
2264 { 2453 {
2265 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2266 int px = pl_x + sdx; 2455 int px = pl_x + sdx;
2267 int py = pl_y + sdy; 2456 int py = pl_y + sdy;
2268 2457
2269 key.texname = tex.name; 2458 key.texname = tex.name;
2270 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2271 2460
2272 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2273 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 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); 2463 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); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2276 2465
2277 rc_draw (rc); 2466 rc.draw ();
2278 } 2467 }
2279 2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
2280 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2281 rc_free (rc);
2282 2473
2283 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2284 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2285 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2286 { 2477 {
2289 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2290 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2291 { 2482 {
2292 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2293 2484
2294 int px = x * T; 2485 int px = x * Tw;
2295 int py = y * T; 2486 int py = y * Th;
2296 2487
2297 if (expect_false (cell->player == player)) 2488 if (ecb_expect_false (cell->player == player))
2298 { 2489 {
2299 px += sdx; 2490 px += sdx;
2300 py += sdy; 2491 py += sdy;
2301 } 2492 }
2302 2493
2303 if (cell->stat_hp) 2494 if (cell->stat_hp)
2304 { 2495 {
2305 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2306 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2307 2498
2308 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2309 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2310 px + width - 1, py); 2501 px + width - 1, py);
2311 2502
2317 } 2508 }
2318 } 2509 }
2319} 2510}
2320 2511
2321void 2512void
2322draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2323 CODE: 2514 CODE:
2324{ 2515{
2325 static float color[16][3] = { 2516 static float color[16][3] = {
2326 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2327 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2328 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2329 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2330 2521
2331 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2332 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2333 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2334 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2335 2526
2336 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2337 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2338 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2339 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2340 2531
2341 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2342 2533
2343 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2344 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2345 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2346 }; 2537 };
2347 2538
2348 int x, y; 2539 int x, y;
2349 2540
2350 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2351 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2352 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2353 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2354 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2355 2552
2356 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2360 2557
2361 if (m) 2558 if (m)
2362 { 2559 {
2363 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2364 2561
2365 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2366 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2367 2564
2368 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2369 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2370 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2371 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2372 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2373 } 2570 }
2381void 2578void
2382fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2383 PPCODE: 2580 PPCODE:
2384{ 2581{
2385 int x, y; 2582 int x, y;
2386 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2387 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2388 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2389 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2390 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2391 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2392 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2393 2591
2394 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2395 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2396 2594
2397 mx += self->x - 1; 2595 mx += self->x - 1;
2398 my += self->y - 1; 2596 my += self->y - 1;
2399
2400 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2401 2597
2402 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2403 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2404 { 2600 {
2405 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2408 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2409 { 2605 {
2410 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2411 2607
2412 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2413 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2414 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2415 } 2611 }
2416 } 2612 }
2417 2613
2418 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2419 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2438 2634
2439 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2440 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2441 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2442 2638
2443 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2444 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2445 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2446 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2447 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 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); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2449 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2450 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2451 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2452 } 2648 }
2453 2649
2454 free (darkness1); 2650 free (darkness1);
2455 2651
2456 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2457 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2458 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2459 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2460} 2656}
2461 2657
2462SV * 2658SV *
2525 else 2721 else
2526 *data++ = 0; 2722 *data++ = 0;
2527 } 2723 }
2528 } 2724 }
2529 2725
2530 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2531 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2532 { 2728 {
2533 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2534 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2535 } 2731 }
2536 2732
2537 RETVAL = data_sv; 2733 RETVAL = data_sv;
2538} 2734}
2539 OUTPUT: 2735 OUTPUT:
2540 RETVAL 2736 RETVAL
2541 2737
2542void 2738void
2549 STRLEN len; 2745 STRLEN len;
2550 uint8_t *data, *end; 2746 uint8_t *data, *end;
2551 2747
2552 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2553 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2554 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2555 end = data + len + 8; 2751 end = data + len + 8;
2556 2752
2557 if (len < 5) 2753 if (len < 5)
2558 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2559 2755
2620} 2816}
2621 2817
2622MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2623 2819
2624DC::RW 2820DC::RW
2625new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2626 CODE: 2822 CODE:
2627{ 2823{
2628 STRLEN datalen; 2824 STRLEN datalen;
2629 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2630 2826
2632} 2828}
2633 OUTPUT: 2829 OUTPUT:
2634 RETVAL 2830 RETVAL
2635 2831
2636DC::RW 2832DC::RW
2637new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2638 CODE: 2834 CODE:
2639 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2640 OUTPUT: 2836 OUTPUT:
2641 RETVAL 2837 RETVAL
2642 2838
2660 if (RETVAL < 0) 2856 if (RETVAL < 0)
2661 { 2857 {
2662 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2663 2859
2664 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2665 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2666 2867 }
2868 else
2667 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2668 } 2870 }
2669 2871
2670 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2671 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2672} 2874}
2719void 2921void
2720set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2721 CODE: 2923 CODE:
2722{ 2924{
2723 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 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); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2725 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2726} 2928}
2727 2929
2728void 2930void
2729set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2732 2934
2733MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2734 2936
2735PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2736 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2737DC::MixChunk 2951DC::MixChunk
2738new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2739 CODE: 2953 CODE:
2740 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2741 OUTPUT: 2955 OUTPUT:
2742 RETVAL 2956 RETVAL
2743 2957
2773 OUTPUT: 2987 OUTPUT:
2774 RETVAL 2988 RETVAL
2775 2989
2776MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2777 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2778int 3004int
2779volume (int volume = -1) 3005volume (int volume = -1)
2780 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2781 CODE: 3007 CODE:
2782 if (items > 0) 3008 if (items > 0)
2793void 3019void
2794halt () 3020halt ()
2795 CODE: 3021 CODE:
2796 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2797 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2798DC::MixMusic 3031DC::MixMusic
2799new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2800 CODE: 3033 CODE:
2801 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2802 OUTPUT: 3035 OUTPUT:
2803 RETVAL 3036 RETVAL
2804 3037
2832 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2833# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2834 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2835 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2836 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2837 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2838 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2839 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2840 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2841 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2853 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2854 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2855 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2856 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2857 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2858 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2859 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2860 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2861 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2862 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2930 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2931 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2932 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2933 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2934 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2935# undef const_iv 3176# undef const_iv
2936 }; 3177 };
2937 3178
2938 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2939 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2940 3181
2941 texture_av = newAV (); 3182 texture_av = newAV ();
2942 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2943} 3184}
2944 3185
2946disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2947 CODE: 3188 CODE:
2948 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2949 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2950 3191
2951char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2952gl_vendor () 3196gl_vendor ()
2953 CODE: 3197 CODE:
2954 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2955 OUTPUT: 3199 OUTPUT:
2956 RETVAL 3200 RETVAL
2957 3201
2958char * 3202const char *
2959gl_version () 3203gl_version ()
2960 CODE: 3204 CODE:
2961 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2962 OUTPUT: 3206 OUTPUT:
2963 RETVAL 3207 RETVAL
2964 3208
2965char * 3209const char *
2966gl_extensions () 3210gl_extensions ()
2967 CODE: 3211 CODE:
2968 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2969 OUTPUT: 3213 OUTPUT:
2970 RETVAL 3214 RETVAL
2971 3215
2972const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2973 3221
2974GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2975 CODE: 3223 CODE:
2976 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2977 OUTPUT: 3225 OUTPUT:
2985 3233
2986int glGetError () 3234int glGetError ()
2987 3235
2988void glFinish () 3236void glFinish ()
2989 3237
3238void glFlush ()
3239
2990void glClear (int mask) 3240void glClear (int mask)
2991 3241
2992void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2993 PROTOTYPE: @ 3243 PROTOTYPE: @
2994 3244
3003void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
3004 3254
3005void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3006 CODE: 3256 CODE:
3007 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
3008 3260
3009void glDepthMask (int flag) 3261void glDepthMask (int flag)
3010 3262
3011void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
3012 3264
3163 3415
3164void glEndList () 3416void glEndList ()
3165 3417
3166void glCallList (int list) 3418void glCallList (int list)
3167 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3168MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3169 3426
3170PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3171 3428
3172void 3429void
3173find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3174 PPCODE: 3431 PPCODE:
3175{ 3432{
3176 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3177 XPUSHs (self); 3434 XPUSHs (self);
3178} 3435}
3179 3436
3180BOOT: 3437BOOT:
3181{ 3438{
3189 3446
3190void 3447void
3191draw (SV *self) 3448draw (SV *self)
3192 CODE: 3449 CODE:
3193{ 3450{
3194 HV *hv; 3451 HV *hv;
3195 SV **svp; 3452 SV **svp;
3196 NV x, y, w, h; 3453 NV x, y, w, h;
3197 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3198 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3199 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3200 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines