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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines