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.294 by root, Sat Dec 19 05:06:56 2009 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 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 64 94#define FOW_DARKNESS 50
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 95#define DARKNESS_ADJUST(n) (n)
88 96
89#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
90#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
91 99
92#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
96 104
97#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
98 106
99#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3 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}
102 128
103static AV *texture_av; 129static AV *texture_av;
104 130
105static struct 131static struct
106{ 132{
163{ 189{
164 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
165 191
166 while (attrs) 192 while (attrs)
167 { 193 {
168 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
169 195
170 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
171 return 1; 197 return 1;
172 198
173 attrs = attrs->next; 199 attrs = attrs->next;
174 } 200 }
175 201
176 return 0; 202 return 0;
177} 203}
178 204
179typedef struct cf_layout { 205struct cf_layout {
180 PangoLayout *pl; 206 PangoLayout *pl;
181 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
182 int base_height; 208 int base_height;
183 DC__Font font; 209 DC__Font font;
184 rc_t *rc; 210 rc_t rc;
185} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
186 214
187static DC__Font default_font; 215static DC__Font default_font;
188static PangoContext *opengl_context; 216static PangoContext *opengl_context;
189static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
190 218
191static void 219static void
192substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
193{ 221{
194 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
195#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
196 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
197#endif 225#endif
198 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
199} 227}
200 228
201static void 229static void
231} 259}
232 260
233typedef uint16_t tileid; 261typedef uint16_t tileid;
234typedef uint16_t faceid; 262typedef uint16_t faceid;
235 263
236typedef struct { 264struct maptex
265{
237 GLuint name; 266 GLuint name;
238 int w, h; 267 int w, h;
239 float s, t; 268 float s, t;
240 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
241 tileid smoothtile; 270 tileid smoothtile;
242 uint8_t smoothlevel; 271 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
244} maptex; 273};
245 274
246typedef struct { 275struct mapcell
276{
247 uint32_t player; 277 uint32_t player;
248 tileid tile[3]; 278 tileid tile[3];
249 uint16_t darkness; 279 uint16_t darkness;
250 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
251} mapcell; 281};
252 282
253typedef struct { 283struct maprow
284{
254 int32_t c0, c1; 285 int32_t c0, c1;
255 mapcell *col; 286 mapcell *col;
256} maprow; 287};
257 288
258typedef struct map { 289struct mapgrid {
259 int x, y, w, h; 290 int x, y, w, h;
260 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
261 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
262 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
263 294
264 int32_t rows; 295 int32_t rows;
265 maprow *row; 296 maprow *row;
266} *DC__Map; 297};
267 298
268static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
269prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
270{ 304{
271 char *p; 305 T *p;
272 306
273 New (0, p, sze + inc, char); 307 New (0, p, sze + inc, T);
274 Zero (p, inc, char); 308 Zero (p, inc, T);
275 Move (ptr, p + inc, sze, char); 309 Move (ptr, p + inc, sze, T);
276 Safefree (ptr); 310 Safefree (ptr);
277 311
278 return p; 312 ptr = p;
279} 313}
280 314
281static char * 315template<typename T>
282append (char *ptr, int sze, int inc)
283{
284 Renew (ptr, sze + inc, char);
285 Zero (ptr + sze, inc, char);
286
287 return ptr;
288}
289
290#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
292
293static void 316static void
317append (T *&ptr, int sze, int inc)
318{
319 Renew (ptr, sze + inc, T);
320 Zero (ptr + sze, inc, T);
321}
322
323static void
294need_facenum (struct map *self, faceid face) 324need_facenum (struct mapgrid *self, faceid face)
295{ 325{
296 while (self->faces <= face) 326 while (self->faces <= face)
297 { 327 {
298 Append (tileid, self->face2tile, self->faces, self->faces); 328 append (self->face2tile, self->faces, self->faces);
299 self->faces *= 2; 329 self->faces *= 2;
300 } 330 }
301} 331}
302 332
303static void 333static void
304need_texid (struct map *self, int texid) 334need_texid (struct mapgrid *self, int texid)
305{ 335{
306 while (self->texs <= texid) 336 while (self->texs <= texid)
307 { 337 {
308 Append (maptex, self->tex, self->texs, self->texs); 338 append (self->tex, self->texs, self->texs);
309 self->texs *= 2; 339 self->texs *= 2;
310 } 340 }
311} 341}
312 342
313static maprow * 343static maprow *
314map_get_row (DC__Map self, int y) 344map_get_row (mapgrid *self, int y)
315{ 345{
316 if (0 > y) 346 if (0 > y)
317 { 347 {
318 int extend = - y + MAP_EXTEND_Y; 348 int extend = - y + MAP_EXTEND_Y;
319 Prepend (maprow, self->row, self->rows, extend); 349 prepend (self->row, self->rows, extend);
320 350
321 self->rows += extend; 351 self->rows += extend;
322 self->y += extend; 352 self->y += extend;
323 y += extend; 353 y += extend;
324 } 354 }
325 else if (y >= self->rows) 355 else if (y >= self->rows)
326 { 356 {
327 int extend = y - self->rows + MAP_EXTEND_Y; 357 int extend = y - self->rows + MAP_EXTEND_Y;
328 Append (maprow, self->row, self->rows, extend); 358 append (self->row, self->rows, extend);
329 self->rows += extend; 359 self->rows += extend;
330 } 360 }
331 361
332 return self->row + y; 362 return self->row + y;
333} 363}
343 } 373 }
344 374
345 if (row->c0 > x) 375 if (row->c0 > x)
346 { 376 {
347 int extend = row->c0 - x + MAP_EXTEND_X; 377 int extend = row->c0 - x + MAP_EXTEND_X;
348 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 378 prepend (row->col, row->c1 - row->c0, extend);
349 row->c0 -= extend; 379 row->c0 -= extend;
350 } 380 }
351 else if (x >= row->c1) 381 else if (x >= row->c1)
352 { 382 {
353 int extend = x - row->c1 + MAP_EXTEND_X; 383 int extend = x - row->c1 + MAP_EXTEND_X;
354 Append (mapcell, row->col, row->c1 - row->c0, extend); 384 append (row->col, row->c1 - row->c0, extend);
355 row->c1 += extend; 385 row->c1 += extend;
356 } 386 }
357 387
358 return row->col + (x - row->c0); 388 return row->col + (x - row->c0);
359} 389}
360 390
361static mapcell * 391static mapcell *
362map_get_cell (DC__Map self, int x, int y) 392map_get_cell (mapgrid *self, int x, int y)
363{ 393{
364 return row_get_cell (map_get_row (self, y), x); 394 return row_get_cell (map_get_row (self, y), x);
365} 395}
366 396
367static void 397static void
368map_clear (DC__Map self) 398map_clear (mapgrid *self)
369{ 399{
370 int r; 400 int r;
371 401
372 for (r = 0; r < self->rows; r++) 402 for (r = 0; r < self->rows; r++)
373 Safefree (self->row[r].col); 403 Safefree (self->row[r].col);
391 (cell)->flags = 0; \ 421 (cell)->flags = 0; \
392 (cell)->player = 0; \ 422 (cell)->player = 0; \
393 } while (0) 423 } while (0)
394 424
395static void 425static void
396map_blank (DC__Map self, int x0, int y0, int w, int h) 426map_blank (mapgrid *self, int x0, int y0, int w, int h)
397{ 427{
398 int x, y; 428 int x, y;
399 maprow *row; 429 maprow *row;
400 mapcell *cell; 430 mapcell *cell;
401 431
418 CELL_CLEAR (cell); 448 CELL_CLEAR (cell);
419 } 449 }
420 } 450 }
421} 451}
422 452
423typedef struct { 453struct smooth_key
454{
424 tileid tile; 455 tileid tile;
425 uint8_t x, y, level; 456 uint8_t x, y, level;
426} smooth_key; 457
458 bool operator == (const smooth_key &o) const
459 {
460 return tile == o.tile && x == o.x && y == o.y && level == o.level;
461 }
462};
463
464typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
465
466namespace std {
467 template <>
468 struct hash<smooth_key>
469 {
470 size_t operator () (const smooth_key &v) const
471 {
472 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
473 }
474 };
475}
427 476
428static void 477static void
429smooth_or_bits (HV *hv, smooth_key *key, IV bits) 478smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
430{ 479{
431 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 480 auto &&it = h.find (key);
432 481
433 if (SvIOK (*sv)) 482 if (it == h.end ())
434 SvIV_set (*sv, SvIVX (*sv) | bits); 483 h.insert (std::make_pair (key, bits));
435 else 484 else
436 sv_setiv (*sv, bits); 485 it->second |= bits;
437} 486}
438 487
439static void 488static void
440music_finished (void) 489music_finished (void)
441{ 490{
458 ev.code = 1; 507 ev.code = 1;
459 ev.data1 = (void *)(long)channel; 508 ev.data1 = (void *)(long)channel;
460 ev.data2 = 0; 509 ev.data2 = 0;
461 510
462 SDL_PushEvent ((SDL_Event *)&ev); 511 SDL_PushEvent ((SDL_Event *)&ev);
512}
513
514// approximately divide by 255
515static unsigned int
516div255 (unsigned int n)
517{
518 return (n + (n >> 8)) >> 8;
463} 519}
464 520
465static unsigned int 521static unsigned int
466minpot (unsigned int n) 522minpot (unsigned int n)
467{ 523{
550 606
551 return mod; 607 return mod;
552} 608}
553 609
554static void 610static void
555deliantra_main () 611deliantra_main (SV *real_main)
556{ 612{
557 char *argv[] = { 0 }; 613 dSP;
558 call_argv ("::main", G_DISCARD | G_VOID, argv); 614
615 PUSHMARK (SP);
616 call_sv (real_main, G_DISCARD | G_VOID);
559} 617}
560 618
561#ifdef __MACOSX__ 619#ifdef __MACOSX__
620 static SV *real_main;
621
562 /* to due surprising braindamage on the side of SDL design, we 622 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main() 623 * do some mind-boggling hack here: SDL requires a custom main()
564 * on OS X, so... we provide one and call the original main(), which, 624 * on OS X, so... we provide one and call the original main(), which,
565 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 625 * due to shared library magic, calls -lSDLmain's main, not perl's main,
566 * and which calls our main (== SDL_main) back. 626 * and which calls our main (== SDL_main) back.
567 */ 627 */
568 extern C_LINKAGE int 628 extern C_LINKAGE int
569 main (int argc, char *argv[]) 629 main (int argc, char *argv[])
570 { 630 {
571 deliantra_main (); 631 deliantra_main (real_main);
572 } 632 }
573 633
574 #undef main 634 #undef main
575 635
576 extern C_LINKAGE int main (int argc, char *argv[]); 636 extern C_LINKAGE int main (int argc, char *argv[]);
577 637
578 static void 638 static void
579 SDL_braino (void) 639 SDL_main_hack (SV *real_main_)
580 { 640 {
641 real_main = real_main_;
642
581 char *argv[] = { "deliantra client", 0 }; 643 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv); 644 (main) (1, argv);
583 } 645 }
584#else 646#else
585 static void 647 static void
586 SDL_braino (void) 648 SDL_main_hack (SV *real_main)
587 { 649 {
588 deliantra_main (); 650 deliantra_main (real_main);
589 } 651 }
590#endif 652#endif
591 653
592MODULE = Deliantra::Client PACKAGE = DC 654MODULE = Deliantra::Client PACKAGE = DC
593 655
794 856
795 const_iv (FOW_DARKNESS) 857 const_iv (FOW_DARKNESS)
796# undef const_iv 858# undef const_iv
797 }; 859 };
798 860
799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 861 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 862 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801 863
802 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 864 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 865 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804} 866}
805 867
821NV ceil (NV x) 883NV ceil (NV x)
822 884
823IV minpot (UV n) 885IV minpot (UV n)
824 886
825IV popcount (UV n) 887IV popcount (UV n)
888
889NV distance (NV dx, NV dy)
890 CODE:
891 RETVAL = pow (dx * dx + dy * dy, 0.5);
892 OUTPUT:
893 RETVAL
826 894
827void 895void
828pango_init () 896pango_init ()
829 CODE: 897 CODE:
830{ 898{
838#endif 906#endif
839} 907}
840 908
841char *SDL_GetError () 909char *SDL_GetError ()
842 910
843void SDL_braino () 911void SDL_main_hack (SV *real_main)
912 PROTOTYPE: &
844 913
845int SDL_Init (U32 flags) 914int SDL_Init (U32 flags)
846 915
847int SDL_InitSubSystem (U32 flags) 916int SDL_InitSubSystem (U32 flags)
848 917
849void SDL_QuitSubSystem (U32 flags) 918void SDL_QuitSubSystem (U32 flags)
850 919
851void SDL_Quit () 920void SDL_Quit ()
852 921
853int SDL_GL_SetAttribute (int attr, int value) 922int SDL_GL_SetAttribute (int attr, int value)
923 C_ARGS: (SDL_GLattr)attr, value
854 924
855int SDL_GL_GetAttribute (int attr) 925int SDL_GL_GetAttribute (int attr)
856 CODE: 926 CODE:
857 if (SDL_GL_GetAttribute (attr, &RETVAL)) 927 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
858 XSRETURN_UNDEF; 928 XSRETURN_UNDEF;
859 OUTPUT: 929 OUTPUT:
860 RETVAL 930 RETVAL
861 931
862void 932void
917 ); 987 );
918 988
919 if (RETVAL) 989 if (RETVAL)
920 { 990 {
921 av_clear (texture_av); 991 av_clear (texture_av);
922
923 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
924#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 992#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
925#include "glfunc.h" 993#include "glfunc.h"
926#undef GL_FUNC 994#undef GL_FUNC
995 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
996 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
927 } 997 }
928} 998}
929 OUTPUT: 999 OUTPUT:
930 RETVAL 1000 RETVAL
1001
1002void
1003SDL_WM_SetCaption (const char *title, const char *icon)
931 1004
932void 1005void
933SDL_GL_SwapBuffers () 1006SDL_GL_SwapBuffers ()
934 1007
935char * 1008char *
936SDL_GetKeyName (int sym) 1009SDL_GetKeyName (int sym)
1010 C_ARGS: (SDLKey)sym
937 1011
938int 1012int
939SDL_GetAppState () 1013SDL_GetAppState ()
940 1014
941int 1015int
942SDL_GetModState () 1016SDL_GetModState ()
943 1017
1018int
1019SDL_WaitEvent ()
1020 C_ARGS: 0
1021
944void 1022void
1023SDL_PumpEvents ()
1024
1025void
945poll_events () 1026peep_events ()
946 PPCODE: 1027 PPCODE:
947{ 1028{
948 SDL_Event ev; 1029 SDL_Event ev;
949 1030
950 SDL_PumpEvents (); 1031 SDL_PumpEvents ();
1016 1097
1017 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1098 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1018 } 1099 }
1019} 1100}
1020 1101
1102char *
1103SDL_AudioDriverName ()
1104 CODE:
1105{
1106 char buf [256];
1107 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1108 XSRETURN_UNDEF;
1109
1110 RETVAL = buf;
1111}
1112 OUTPUT:
1113 RETVAL
1114
1021int 1115int
1022Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1116Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1023 POSTCALL: 1117 POSTCALL:
1024 Mix_HookMusicFinished (music_finished); 1118 Mix_HookMusicFinished (music_finished);
1025 Mix_ChannelFinished (channel_finished); 1119 Mix_ChannelFinished (channel_finished);
1026 1120
1027void 1121void
1028Mix_QuerySpec () 1122Mix_QuerySpec ()
1087add_font (char *file) 1181add_font (char *file)
1088 CODE: 1182 CODE:
1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1183 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT: 1184 OUTPUT:
1091 RETVAL 1185 RETVAL
1186
1187void
1188IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1189
1190# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1191void
1192Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1092 1193
1093void 1194void
1094load_image_inline (SV *image_) 1195load_image_inline (SV *image_)
1095 ALIAS: 1196 ALIAS:
1096 load_image_file = 1 1197 load_image_file = 1
1142 1243
1143 SDL_LockSurface (surface2); 1244 SDL_LockSurface (surface2);
1144 EXTEND (SP, 6); 1245 EXTEND (SP, 6);
1145 PUSHs (sv_2mortal (newSViv (surface2->w))); 1246 PUSHs (sv_2mortal (newSViv (surface2->w)));
1146 PUSHs (sv_2mortal (newSViv (surface2->h))); 1247 PUSHs (sv_2mortal (newSViv (surface2->h)));
1147 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1248 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1148 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1249 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1149 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1250 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1150 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1251 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1151 SDL_UnlockSurface (surface2); 1252 SDL_UnlockSurface (surface2);
1152 1253
1224MODULE = Deliantra::Client PACKAGE = DC::Font 1325MODULE = Deliantra::Client PACKAGE = DC::Font
1225 1326
1226PROTOTYPES: DISABLE 1327PROTOTYPES: DISABLE
1227 1328
1228DC::Font 1329DC::Font
1229new_from_file (SV *class, char *path, int id = 0) 1330new_from_file (SV *klass, char *path, int id = 0)
1230 CODE: 1331 CODE:
1231{ 1332{
1232 int count; 1333 int count;
1233 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1334 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1234 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1335 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1263 PROTOTYPE: 1364 PROTOTYPE:
1264 CODE: 1365 CODE:
1265 tc_restore (); 1366 tc_restore ();
1266 1367
1267DC::Layout 1368DC::Layout
1268new (SV *class) 1369new (SV *klass)
1269 CODE: 1370 CODE:
1270 New (0, RETVAL, 1, struct cf_layout); 1371 RETVAL = new cf_layout;
1271 1372
1272 RETVAL->pl = pango_layout_new (opengl_context); 1373 RETVAL->pl = pango_layout_new (opengl_context);
1273 RETVAL->r = 1.; 1374 RETVAL->r = 1.;
1274 RETVAL->g = 1.; 1375 RETVAL->g = 1.;
1275 RETVAL->b = 1.; 1376 RETVAL->b = 1.;
1276 RETVAL->a = 1.; 1377 RETVAL->a = 1.;
1277 RETVAL->base_height = MIN_FONT_HEIGHT; 1378 RETVAL->base_height = MIN_FONT_HEIGHT;
1278 RETVAL->font = 0; 1379 RETVAL->font = 0;
1279 RETVAL->rc = rc_alloc ();
1280 1380
1281 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1381 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1282 layout_update_font (RETVAL); 1382 layout_update_font (RETVAL);
1283 OUTPUT: 1383 OUTPUT:
1284 RETVAL 1384 RETVAL
1285 1385
1286void 1386void
1287DESTROY (DC::Layout self) 1387DESTROY (DC::Layout self)
1288 CODE: 1388 CODE:
1289 g_object_unref (self->pl); 1389 g_object_unref (self->pl);
1290 rc_free (self->rc);
1291 Safefree (self); 1390 delete self;
1292 1391
1293void 1392void
1294set_text (DC::Layout self, SV *text_) 1393set_text (DC::Layout self, SV *text_)
1295 CODE: 1394 CODE:
1296{ 1395{
1422 1521
1423void 1522void
1424set_height (DC::Layout self, int base_height) 1523set_height (DC::Layout self, int base_height)
1425 CODE: 1524 CODE:
1426 if (self->base_height != base_height) 1525 if (self->base_height != base_height)
1427 { 1526 {
1428 self->base_height = base_height; 1527 self->base_height = base_height;
1429 layout_update_font (self); 1528 layout_update_font (self);
1430 } 1529 }
1431 1530
1432void 1531void
1550} 1649}
1551 1650
1552void 1651void
1553render (DC::Layout self, float x, float y, int flags = 0) 1652render (DC::Layout self, float x, float y, int flags = 0)
1554 CODE: 1653 CODE:
1555 rc_clear (self->rc); 1654 self->rc.clear ();
1556 pango_opengl_render_layout_subpixel ( 1655 pango_opengl_render_layout_subpixel (
1557 self->pl, 1656 self->pl,
1558 self->rc, 1657 &self->rc,
1559 x * PANGO_SCALE, y * PANGO_SCALE, 1658 x * PANGO_SCALE, y * PANGO_SCALE,
1560 self->r, self->g, self->b, self->a, 1659 self->r, self->g, self->b, self->a,
1561 flags 1660 flags
1562 ); 1661 );
1563 // we assume that context_change actually clears/frees stuff 1662 // we assume that context_change actually clears/frees stuff
1574 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1673 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1575 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1674 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1576 glEnable (GL_ALPHA_TEST); 1675 glEnable (GL_ALPHA_TEST);
1577 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1676 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1578 1677
1579 rc_draw (self->rc); 1678 self->rc.draw ();
1580 1679
1581 glDisable (GL_ALPHA_TEST); 1680 glDisable (GL_ALPHA_TEST);
1582 glDisable (GL_BLEND); 1681 glDisable (GL_BLEND);
1583 glDisable (GL_TEXTURE_2D); 1682 glDisable (GL_TEXTURE_2D);
1584} 1683}
1660 glDisable (GL_BLEND); 1759 glDisable (GL_BLEND);
1661 } 1760 }
1662} 1761}
1663 1762
1664void 1763void
1665draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 1764draw_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)
1666 PROTOTYPE: @ 1765 PROTOTYPE: @
1667 CODE: 1766 CODE:
1668{ 1767{
1768 glEnable (GL_BLEND);
1769 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1669 glEnable (GL_TEXTURE_2D); 1770 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1); 1771 glBindTexture (GL_TEXTURE_2D, name1);
1673 1772
1674 glColor3f (intensity, intensity, intensity); 1773 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix (); 1774 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.); 1775 glScalef (1./3, 1./3, 1.);
1677 1776
1678 if (blend > 0.f) 1777 if (blend > 0.f)
1679 { 1778 {
1680 float S2, T2; /* 0. 0. for texture 2 */ 1779 float dx3 = dx * -3.f / w;
1681 float w = w1 > w2 ? w1 : w2; 1780 float dy3 = dy * -3.f / h;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend }; 1781 GLfloat env_color[4] = { 0., 0., 0., blend };
1684 1782
1685 /* interpolate the two shadow textures */ 1783 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1784 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1692 glBindTexture (GL_TEXTURE_2D, name2); 1790 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1791 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694 1792
1695 /* rgb == rgb(glcolor) */ 1793 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1794 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1795 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1796 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699 1797
1700 /* alpha = interpolate t0, t1 by env_alpha */ 1798 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1799 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702 1800
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709 1807
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712 1810
1713 s1 *= w / w1;
1714 t1 *= h / h1;
1715
1716 dx *= -3.f / w2;
1717 dy *= -3.f / h2;
1718 dx *= w / w2;
1719 dy *= h / h2;
1720
1721 s2 *= w / w2;
1722 t2 *= h / h2;
1723
1724 glBegin (GL_QUADS); 1811 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1813 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1728 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1815 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1729 glEnd (); 1816 glEnd ();
1730 1817
1731 glDisable (GL_TEXTURE_2D); 1818 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0); 1819 gl.ActiveTexture (GL_TEXTURE0);
1733 } 1820 }
1735 { 1822 {
1736 /* simple blending of one texture, also opengl <1.3 path */ 1823 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1824 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738 1825
1739 glBegin (GL_QUADS); 1826 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1827 glTexCoord2f (0, 0); glVertex2f (0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1828 glTexCoord2f (0, t); glVertex2f (0, h);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1829 glTexCoord2f (s, t); glVertex2f (w, h);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1830 glTexCoord2f (s, 0); glVertex2f (w, 0);
1744 glEnd (); 1831 glEnd ();
1745 } 1832 }
1833
1834 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1835 {
1836 int x, y;
1837 int dx3 = dx * 3;
1838 int dy3 = dy * 3;
1839
1840 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1841 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1842 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1843 glTranslatef (-1., -1., 0);
1844 glBegin (GL_QUADS);
1845
1846 for (y = 1; y < h; y += 3)
1847 {
1848 int y1 = y - dy3;
1849 int y1valid = y1 >= 0 && y1 < h;
1850
1851 for (x = 1; x < w; x += 3)
1852 {
1853 int x1 = x - dx3;
1854 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1855 uint8_t h2;
1856
1857 if (y1valid && x1 >= 0 && x1 < w)
1858 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 else
1860 h2 = 1; /* out of range == invisible */
1861
1862 if (h1 || h2)
1863 {
1864 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1865 glColor4f (1., 1., 1., alpha);
1866
1867 glTexCoord2f (0, 0.); glVertex2i (x , y );
1868 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1869 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1870 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1871 }
1872 }
1873 }
1874 }
1875
1876 glEnd ();
1746 1877
1747 glPopMatrix (); 1878 glPopMatrix ();
1748 1879
1749 glDisable (GL_TEXTURE_2D); 1880 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND); 1881 glDisable (GL_BLEND);
1764MODULE = Deliantra::Client PACKAGE = DC::Map 1895MODULE = Deliantra::Client PACKAGE = DC::Map
1765 1896
1766PROTOTYPES: DISABLE 1897PROTOTYPES: DISABLE
1767 1898
1768DC::Map 1899DC::Map
1769new (SV *class) 1900new (SV *klass)
1770 CODE: 1901 CODE:
1771 New (0, RETVAL, 1, struct map); 1902 New (0, RETVAL, 1, mapgrid);
1772 RETVAL->x = 0; 1903 RETVAL->x = 0;
1773 RETVAL->y = 0; 1904 RETVAL->y = 0;
1774 RETVAL->w = 0; 1905 RETVAL->w = 0;
1775 RETVAL->h = 0; 1906 RETVAL->h = 0;
1776 RETVAL->ox = 0; 1907 RETVAL->ox = 0;
1813 1944
1814void 1945void
1815set_smooth (DC::Map self, int face, int smooth, int level) 1946set_smooth (DC::Map self, int face, int smooth, int level)
1816 CODE: 1947 CODE:
1817{ 1948{
1818 tileid texid; 1949 tileid texid;
1819 maptex *tex; 1950 maptex *tex;
1820 1951
1821 if (face < 0 || face >= self->faces) 1952 if (face < 0 || face >= self->faces)
1822 return; 1953 return;
1823 1954
1824 if (smooth < 0 || smooth >= self->faces) 1955 if (smooth < 0 || smooth >= self->faces)
1825 return; 1956 return;
1826 1957
1827 texid = self->face2tile [face]; 1958 texid = self->face2tile [face];
1828 1959
1829 if (!texid) 1960 if (!texid)
1830 return; 1961 return;
1831 1962
1832 tex = self->tex + texid; 1963 tex = self->tex + texid;
1865} 1996}
1866 1997
1867void 1998void
1868expire_textures (DC::Map self, int texid, int count) 1999expire_textures (DC::Map self, int texid, int count)
1869 PPCODE: 2000 PPCODE:
1870 for (; texid < self->texs && count; ++texid, --count) 2001 for (; texid < self->texs && count; ++texid, --count)
1871 { 2002 {
1872 maptex *tex = self->tex + texid; 2003 maptex *tex = self->tex + texid;
1873 2004
1874 if (tex->name) 2005 if (tex->name)
1875 { 2006 {
1922 self->ox += dx; self->x += dx; 2053 self->ox += dx; self->x += dx;
1923 self->oy += dy; self->y += dy; 2054 self->oy += dy; self->y += dy;
1924 2055
1925 while (self->y < 0) 2056 while (self->y < 0)
1926 { 2057 {
1927 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2058 prepend (self->row, self->rows, MAP_EXTEND_Y);
1928 2059
1929 self->rows += MAP_EXTEND_Y; 2060 self->rows += MAP_EXTEND_Y;
1930 self->y += MAP_EXTEND_Y; 2061 self->y += MAP_EXTEND_Y;
1931 } 2062 }
1932} 2063}
1933 2064
1934SV * 2065SV *
1935map1a_update (DC::Map self, SV *data_, int extmap) 2066map1a_update (DC::Map self, SV *data_)
1936 CODE: 2067 CODE:
1937{ 2068{
1938 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2069 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1939 uint8_t *data_end = (uint8_t *)SvEND (data_); 2070 uint8_t *data_end = (uint8_t *)SvEND (data_);
1940 mapcell *cell; 2071 mapcell *cell;
1961 2092
1962 //TODO: don't trust server data to be in-range(!) 2093 //TODO: don't trust server data to be in-range(!)
1963 2094
1964 if (flags & 8) 2095 if (flags & 8)
1965 { 2096 {
2097 uint8_t ext, cmd;
2098
1966 if (extmap) 2099 do
1967 { 2100 {
1968 uint8_t ext, cmd; 2101 ext = *data++;
2102 cmd = ext & 0x7f;
1969 2103
1970 do 2104 if (cmd < 4)
2105 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2106 else if (cmd == 5) // health
1971 { 2107 {
1972 ext = *data++;
1973 cmd = ext & 0x7f;
1974
1975 if (cmd < 4)
1976 cell->darkness = 255 - ext * 64 + 1;
1977 else if (cmd == 5) // health
1978 {
1979 cell->stat_width = 1; 2108 cell->stat_width = 1;
1980 cell->stat_hp = *data++; 2109 cell->stat_hp = *data++;
1981 }
1982 else if (cmd == 6) // monster width
1983 cell->stat_width = *data++ + 1;
1984 else if (cmd == 0x47)
1985 {
1986 if (*data == 1) cell->player = data [1];
1987 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1988 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1989 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1990
1991 data += *data + 1;
1992 }
1993 else if (cmd == 8) // cell flags
1994 cell->flags = *data++;
1995 else if (ext & 0x40) // unknown, multibyte => skip
1996 data += *data + 1;
1997 else
1998 data++;
1999 } 2110 }
2000 while (ext & 0x80); 2111 else if (cmd == 6) // monster width
2112 cell->stat_width = *data++ + 1;
2113 else if (cmd == 0x47)
2114 {
2115 if (*data == 1) cell->player = data [1];
2116 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2117 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2118 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2119
2120 data += *data + 1;
2121 }
2122 else if (cmd == 8) // cell flags
2123 cell->flags = *data++;
2124 else if (ext & 0x40) // unknown, multibyte => skip
2125 data += *data + 1;
2126 else
2127 data++;
2001 } 2128 }
2002 else 2129 while (ext & 0x80);
2003 cell->darkness = *data++ + 1;
2004 } 2130 }
2005 2131
2006 for (z = 0; z <= 2; ++z) 2132 for (z = 0; z <= 2; ++z)
2007 if (flags & (4 >> z)) 2133 if (flags & (4 >> z))
2008 { 2134 {
2056 ? self->row + y 2182 ? self->row + y
2057 : 0; 2183 : 0;
2058 2184
2059 for (x = x0; x < x1; x++) 2185 for (x = x0; x < x1; x++)
2060 { 2186 {
2061 int r = 32, g = 32, b = 32, a = 192; 2187 unsigned int r = 32, g = 32, b = 32, a = 192;
2062 2188
2063 if (row && row->c0 <= x && x < row->c1) 2189 if (row && row->c0 <= x && x < row->c1)
2064 { 2190 {
2065 mapcell *cell = row->col + (x - row->c0); 2191 mapcell *cell = row->col + (x - row->c0);
2066 2192
2068 { 2194 {
2069 maptex tex = self->tex [cell->tile [z]]; 2195 maptex tex = self->tex [cell->tile [z]];
2070 int a0 = 255 - tex.a; 2196 int a0 = 255 - tex.a;
2071 int a1 = tex.a; 2197 int a1 = tex.a;
2072 2198
2073 r = (r * a0 + tex.r * a1) / 255; 2199 r = div255 (r * a0 + tex.r * a1);
2074 g = (g * a0 + tex.g * a1) / 255; 2200 g = div255 (g * a0 + tex.g * a1);
2075 b = (b * a0 + tex.b * a1) / 255; 2201 b = div255 (b * a0 + tex.b * a1);
2076 a = (a * a0 + tex.a * a1) / 255; 2202 a = div255 (a * a0 + tex.a * a1);
2077 } 2203 }
2078 } 2204 }
2079 2205
2080 *map++ = (r ) 2206 *map++ = (r )
2081 | (g << 8) 2207 | (g << 8)
2082 | (b << 16) 2208 | (b << 16)
2083 | (a << 24); 2209 | (a << 24);
2084 } 2210 }
2085 } 2211 }
2086 2212
2087 RETVAL = map_sv; 2213 RETVAL = map_sv;
2088} 2214}
2089 OUTPUT: 2215 OUTPUT:
2090 RETVAL 2216 RETVAL
2091 2217
2092void 2218void
2093draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2219draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2094 CODE: 2220 CODE:
2095{ 2221{
2096 int x, y, z; 2222 int x, y, z;
2097 2223
2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2099 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2100 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2224 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2101 smooth_key skey;
2102 int pl_x, pl_y; 2225 int pl_x, pl_y;
2103 maptex pl_tex; 2226 maptex pl_tex;
2104 rc_t *rc = rc_alloc (); 2227 rc_t rc;
2105 rc_t *rc_ov = rc_alloc (); 2228 rc_t rc_ov;
2106 rc_key_t key; 2229 rc_key_t key;
2107 rc_array_t *arr, *arr_hidden; 2230 rc_t::array_t *arr;
2108 2231
2109 pl_tex.name = 0; 2232 pl_tex.name = 0;
2110 2233
2111 // that's current max. sorry. 2234 // that's current max. sorry.
2112 if (sw > 255) sw = 255; 2235 if (sw > 255) sw = 255;
2113 if (sh > 255) sh = 255; 2236 if (sh > 255) sh = 255;
2114
2115 // clear key, in case of extra padding
2116 memset (&skey, 0, sizeof (skey));
2117 2237
2118 memset (&key, 0, sizeof (key)); 2238 memset (&key, 0, sizeof (key));
2119 key.r = 255; 2239 key.r = 255;
2120 key.g = 255; 2240 key.g = 255;
2121 key.b = 255; 2241 key.b = 255;
2127 my += self->y; 2247 my += self->y;
2128 2248
2129 // first pass: determine smooth_max 2249 // first pass: determine smooth_max
2130 // rather ugly, if you ask me 2250 // rather ugly, if you ask me
2131 // could also be stored inside mapcell and updated on change 2251 // could also be stored inside mapcell and updated on change
2132 memset (smooth_max, 0, sizeof (smooth_max)); 2252 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2133 2253
2134 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
2135 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
2136 { 2256 {
2137 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
2150 2270
2151 glEnable (GL_BLEND); 2271 glEnable (GL_BLEND);
2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2272 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2273 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154 2274
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
2158 for (z = 0; z <= 2; z++) 2275 for (z = 0; z <= 2; z++)
2159 { 2276 {
2160 memset (smooth_level, 0, sizeof (smooth_level)); 2277 std::bitset<256> smooth_level; // one bit for every possible smooth level
2278 smooth_key skey;
2279 smooth_hash smooth;
2161 key.texname = -1; 2280 key.texname = -1;
2162 2281
2163 for (y = 0; y < sh; y++) 2282 for (y = 0; y < sh; y++)
2164 if (0 <= y + my && y + my < self->rows) 2283 if (0 <= y + my && y + my < self->rows)
2165 { 2284 {
2182 2301
2183 if (!tex.name) 2302 if (!tex.name)
2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2303 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2185 2304
2186 key.texname = tex.name; 2305 key.texname = tex.name;
2187 arr = rc_array (rc, &key); 2306 arr = &rc.array (key);
2188 } 2307 }
2189 2308
2190 px = (x + 1) * T - tex.w; 2309 px = (x + 1) * Th - tex.w;
2191 py = (y + 1) * T - tex.h; 2310 py = (y + 1) * Tw - tex.h;
2192 2311
2193 if (expect_false (cell->player == player) && expect_false (z == 2)) 2312 if (expect_false (cell->player == player) && expect_false (z == 2))
2194 { 2313 {
2195 pl_x = px; 2314 pl_x = px;
2196 pl_y = py; 2315 pl_y = py;
2197 pl_tex = tex; 2316 pl_tex = tex;
2198 continue; 2317 continue;
2199 } 2318 }
2200 2319
2201 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2320 arr->t2f_v3f (0 , 0 , px , py , 0);
2202 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2321 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2203 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2322 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2204 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2323 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2205 2324
2206 // update smooth hash 2325 // update smooth hash
2207 if (tex.smoothtile) 2326 if (tex.smoothtile)
2208 { 2327 {
2209 skey.tile = tex.smoothtile; 2328 skey.tile = tex.smoothtile;
2210 skey.level = tex.smoothlevel; 2329 skey.level = tex.smoothlevel;
2211 2330
2212 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2331 smooth_level[tex.smoothlevel] = 1;
2213 2332
2214 // add bits to current tile and all neighbours. skey.x|y is 2333 // add bits to current tile and all neighbours. skey.x|y is
2215 // shifted +1|+1 so we always stay positive. 2334 // shifted +1|+1 so we always stay positive.
2216 2335
2217 // bits is ___n cccc CCCC bbbb 2336 // bits is ___n cccc CCCC bbbb
2225 2344
2226 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2345 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2227 // ·· ·· ·┏ ┓· 2346 // ·· ·· ·┏ ┓·
2228 2347
2229 // full tile 2348 // full tile
2230 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2349 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2231 2350
2232 // borders 2351 // borders
2233 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2352 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2234 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2353 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2235 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2354 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2236 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2355 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2237 2356
2238 // corners 2357 // corners
2239 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2358 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2240 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2359 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2241 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2360 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2242 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2361 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2243 } 2362 }
2244 } 2363 }
2245 2364
2246 if (expect_false (z == 2)) 2365 if (expect_false (z == 2) && expect_false (cell->flags))
2247 { 2366 {
2248 /* draw question marks on top of hidden spaces */ 2367 // overlays such as the speech bubble, probably more to come
2249 if (!cell->darkness) 2368 if (cell->flags & 1)
2250 { 2369 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key; 2370 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH]; 2371 maptex tex = self->tex[TEXID_SPEECH];
2268 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32; 2372 int px = x * Tw + Tw * 2 / 32;
2270 int py = y * T - T * 6 / 32; 2373 int py = y * Th - Th * 6 / 32;
2271 2374
2272 key_ov.texname = tex.name; 2375 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov); 2376 rc_t::array_t &arr = rc_ov.array (key_ov);
2274 2377
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2378 arr.t2f_v3f (0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2379 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2277 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2380 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2381 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2279 }
2280 } 2382 }
2281 } 2383 }
2282 } 2384 }
2283 } 2385 }
2284 2386
2285 rc_draw (rc); 2387 rc.draw ();
2286 rc_clear (rc); 2388 rc.clear ();
2287 2389
2288 // go through all smoothlevels, lowest to highest, then draw. 2390 // go through all smoothlevels, lowest to highest, then draw.
2289 // this is basically counting sort 2391 // this is basically counting sort
2290 { 2392 {
2291 int w, b; 2393 int w, b;
2292 2394
2293 glEnable (GL_TEXTURE_2D); 2395 glEnable (GL_TEXTURE_2D);
2294 glBegin (GL_QUADS); 2396 glBegin (GL_QUADS);
2295 for (w = 0; w < 256 / 32; ++w) 2397 for (int level = 0; level < smooth_level.size (); ++level)
2398 if (smooth_level[level])
2399 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2296 { 2400 {
2297 uint32_t smask = smooth_level [w]; 2401 smooth_key &skey = it->first;
2298 if (smask) 2402 IV bits = it->second;
2299 for (b = 0; b < 32; ++b) 2403
2300 if (smask & (((uint32_t)1) << b)) 2404 if (!(bits & 0x1000)
2405 && skey.level == level
2406 && level > smooth_max [skey.x][skey.y])
2301 { 2407 {
2302 int level = (w << 5) | b; 2408 maptex tex = self->tex [skey.tile];
2409 int px = (((int)skey.x) - 1) * Tw;
2410 int py = (((int)skey.y) - 1) * Th;
2411 int border = bits & 15;
2412 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2413 float dx = tex.s * .0625f; // 16 images/row
2414 float dy = tex.t * .5f ; // 2 images/column
2415
2303 HE *he; 2416 if (tex.name)
2304
2305 hv_iterinit (smooth);
2306 while ((he = hv_iternext (smooth)))
2307 { 2417 {
2308 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 // this time avoiding texture state changes
2309 IV bits = SvIVX (HeVAL (he)); 2419 // save gobs of state changes.
2310 2420 if (key.texname != tex.name)
2311 if (!(bits & 0x1000)
2312 && skey->level == level
2313 && level > smooth_max [skey->x][skey->y])
2314 { 2421 {
2315 maptex tex = self->tex [skey->tile];
2316 int px = (((int)skey->x) - 1) * T;
2317 int py = (((int)skey->y) - 1) * T;
2318 int border = bits & 15;
2319 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2320 float dx = tex.s * .0625f; // 16 images/row
2321 float dy = tex.t * .5f ; // 2 images/column
2322
2323 if (tex.name)
2324 {
2325 // this time avoiding texture state changes
2326 // save gobs of state changes.
2327 if (key.texname != tex.name)
2328 {
2329 self->tex [skey->tile].unused = 0; 2422 self->tex [skey.tile].unused = 0;
2330 2423
2331 glEnd (); 2424 glEnd ();
2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2425 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2333 glBegin (GL_QUADS); 2426 glBegin (GL_QUADS);
2334 } 2427 }
2335 2428
2336 if (border) 2429 if (border)
2337 { 2430 {
2338 float ox = border * dx; 2431 float ox = border * dx;
2339 2432
2340 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2341 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2342 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2343 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2344 } 2437 }
2345 2438
2346 if (corner) 2439 if (corner)
2347 { 2440 {
2348 float ox = corner * dx; 2441 float ox = corner * dx;
2349 2442
2350 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2351 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2352 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2353 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2354 }
2355 }
2356 } 2447 }
2357 } 2448 }
2358 } 2449 }
2359 } 2450 }
2360 2451
2361 glEnd (); 2452 glEnd ();
2362 glDisable (GL_TEXTURE_2D); 2453 glDisable (GL_TEXTURE_2D);
2363 key.texname = -1; 2454 key.texname = -1;
2364 } 2455 }
2365
2366 hv_clear (smooth);
2367 } 2456 }
2368 2457
2369 if (pl_tex.name) 2458 if (pl_tex.name)
2370 { 2459 {
2371 maptex tex = pl_tex; 2460 maptex tex = pl_tex;
2372 int px = pl_x + sdx; 2461 int px = pl_x + sdx;
2373 int py = pl_y + sdy; 2462 int py = pl_y + sdy;
2374 2463
2375 key.texname = tex.name; 2464 key.texname = tex.name;
2376 arr = rc_array (rc, &key); 2465 rc_t::array_t &arr = rc.array (key);
2377 2466
2378 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2467 arr.t2f_v3f (0 , 0 , px , py , 0);
2379 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2468 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2380 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2469 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2381 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2470 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2382 2471
2383 rc_draw (rc); 2472 rc.draw ();
2384 } 2473 }
2385 2474
2386 rc_draw (rc_ov); 2475 rc_ov.draw ();
2387 rc_clear (rc_ov); 2476 rc_ov.clear ();
2388 2477
2389 glDisable (GL_BLEND); 2478 glDisable (GL_BLEND);
2390 rc_free (rc);
2391 rc_free (rc_ov);
2392 2479
2393 // top layer: overlays such as the health bar 2480 // top layer: overlays such as the health bar
2394 for (y = 0; y < sh; y++) 2481 for (y = 0; y < sh; y++)
2395 if (0 <= y + my && y + my < self->rows) 2482 if (0 <= y + my && y + my < self->rows)
2396 { 2483 {
2399 for (x = 0; x < sw; x++) 2486 for (x = 0; x < sw; x++)
2400 if (row->c0 <= x + mx && x + mx < row->c1) 2487 if (row->c0 <= x + mx && x + mx < row->c1)
2401 { 2488 {
2402 mapcell *cell = row->col + (x + mx - row->c0); 2489 mapcell *cell = row->col + (x + mx - row->c0);
2403 2490
2404 int px = x * T; 2491 int px = x * Tw;
2405 int py = y * T; 2492 int py = y * Th;
2406 2493
2407 if (expect_false (cell->player == player)) 2494 if (expect_false (cell->player == player))
2408 { 2495 {
2409 px += sdx; 2496 px += sdx;
2410 py += sdy; 2497 py += sdy;
2411 } 2498 }
2412 2499
2413 if (cell->stat_hp) 2500 if (cell->stat_hp)
2414 { 2501 {
2415 int width = cell->stat_width * T; 2502 int width = cell->stat_width * Tw;
2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2503 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2417 2504
2418 glColor3ub (0, 0, 0); 2505 glColor3ub (0, 0, 0);
2419 glRectf (px + 1, py - thick - 2, 2506 glRectf (px + 1, py - thick - 2,
2420 px + width - 1, py); 2507 px + width - 1, py);
2421 2508
2427 } 2514 }
2428 } 2515 }
2429} 2516}
2430 2517
2431void 2518void
2432draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2519draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2433 CODE: 2520 CODE:
2434{ 2521{
2435 static float color[16][3] = { 2522 static float color[16][3] = {
2436 { 0.00F, 0.00F, 0.00F }, 2523 { 0.00f, 0.00f, 0.00f },
2437 { 1.00F, 1.00F, 1.00F }, 2524 { 1.00f, 1.00f, 1.00f },
2438 { 0.00F, 0.00F, 0.55F }, 2525 { 0.00f, 0.00f, 0.55f },
2439 { 1.00F, 0.00F, 0.00F }, 2526 { 1.00f, 0.00f, 0.00f },
2440 2527
2441 { 1.00F, 0.54F, 0.00F }, 2528 { 1.00f, 0.54f, 0.00f },
2442 { 0.11F, 0.56F, 1.00F }, 2529 { 0.11f, 0.56f, 1.00f },
2443 { 0.93F, 0.46F, 0.00F }, 2530 { 0.93f, 0.46f, 0.00f },
2444 { 0.18F, 0.54F, 0.34F }, 2531 { 0.18f, 0.54f, 0.34f },
2445 2532
2446 { 0.56F, 0.73F, 0.56F }, 2533 { 0.56f, 0.73f, 0.56f },
2447 { 0.80F, 0.80F, 0.80F }, 2534 { 0.80f, 0.80f, 0.80f },
2448 { 0.55F, 0.41F, 0.13F }, 2535 { 0.55f, 0.41f, 0.13f },
2449 { 0.99F, 0.77F, 0.26F }, 2536 { 0.99f, 0.77f, 0.26f },
2450 2537
2451 { 0.74F, 0.65F, 0.41F }, 2538 { 0.74f, 0.65f, 0.41f },
2452 2539
2453 { 0.00F, 1.00F, 1.00F }, 2540 { 0.00f, 1.00f, 1.00f },
2454 { 1.00F, 0.00F, 1.00F }, 2541 { 1.00f, 0.00f, 1.00f },
2455 { 1.00F, 1.00F, 0.00F }, 2542 { 1.00f, 1.00f, 0.00f },
2456 }; 2543 };
2457 2544
2458 int x, y; 2545 int x, y;
2459 2546
2460 glEnable (GL_TEXTURE_2D); 2547 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2548 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures 2549 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using 2550 * and takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different 2551 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia. 2552 * alpha, but atcually gives us the correct colour with nvidia.
2466 */ 2553 */
2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2554 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2468 glEnable (GL_BLEND); 2555 glEnable (GL_BLEND);
2476 2563
2477 if (m) 2564 if (m)
2478 { 2565 {
2479 float *c = color [m & 15]; 2566 float *c = color [m & 15];
2480 2567
2481 float tx1 = m & 0x40 ? 0.5 : 0.; 2568 float tx1 = m & 0x40 ? 0.5f : 0.f;
2482 float tx2 = tx1 + 0.5; 2569 float tx2 = tx1 + 0.5f;
2483 2570
2484 glColor4f (c[0], c[1], c[2], 1); 2571 glColor4f (c[0], c[1], c[2], 1);
2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2572 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2573 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2574 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2497void 2584void
2498fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2585fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2499 PPCODE: 2586 PPCODE:
2500{ 2587{
2501 int x, y; 2588 int x, y;
2502 int sw1 = sw + 2; 2589 int sw1 = sw + 2;
2503 int sh1 = sh + 2; 2590 int sh1 = sh + 2;
2504 int sh3 = sh * 3; 2591 int sh3 = sh * 3;
2505 int sw34 = (sw * 3 + 3) & ~3; 2592 int sw3 = sw * 3;
2593 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2594 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2506 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2595 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2507 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2596 memset (darkness1, 0, sw1*sh1);
2508 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2509 2597
2510 SvPOK_only (darkness3_sv); 2598 SvPOK_only (darkness3_sv);
2511 SvCUR_set (darkness3_sv, sw34 * sh3); 2599 SvCUR_set (darkness3_sv, sw3 * sh3);
2512 2600
2513 mx += self->x - 1; 2601 mx += self->x - 1;
2514 my += self->y - 1; 2602 my += self->y - 1;
2515
2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517 2603
2518 for (y = 0; y < sh1; y++) 2604 for (y = 0; y < sh1; y++)
2519 if (0 <= y + my && y + my < self->rows) 2605 if (0 <= y + my && y + my < self->rows)
2520 { 2606 {
2521 maprow *row = self->row + (y + my); 2607 maprow *row = self->row + (y + my);
2554 2640
2555 uint8_t r13 = (d13 + d23 + d12) / 3; 2641 uint8_t r13 = (d13 + d23 + d12) / 3;
2556 uint8_t r23 = d23; 2642 uint8_t r23 = d23;
2557 uint8_t r33 = (d23 + d33 + d32) / 3; 2643 uint8_t r33 = (d23 + d33 + d32) / 3;
2558 2644
2559 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2560 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2561 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2647 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2562 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2563 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2564 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2650 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2565 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2566 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2567 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2653 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2568 } 2654 }
2569 2655
2570 free (darkness1); 2656 free (darkness1);
2571 2657
2572 EXTEND (SP, 3); 2658 EXTEND (SP, 3);
2573 PUSHs (sv_2mortal (newSViv (sw34))); 2659 PUSHs (sv_2mortal (newSViv (sw3)));
2574 PUSHs (sv_2mortal (newSViv (sh3))); 2660 PUSHs (sv_2mortal (newSViv (sh3)));
2575 PUSHs (darkness3_sv); 2661 PUSHs (darkness3_sv);
2576} 2662}
2577 2663
2578SV * 2664SV *
2641 else 2727 else
2642 *data++ = 0; 2728 *data++ = 0;
2643 } 2729 }
2644 } 2730 }
2645 2731
2646 /* if size is w*h + 5 then no data has been found */ 2732 /* if size is w*h + 5 then no data has been found */
2647 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2733 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2648 { 2734 {
2649 SvPOK_only (data_sv); 2735 SvPOK_only (data_sv);
2650 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2736 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651 } 2737 }
2652 2738
2653 RETVAL = data_sv; 2739 RETVAL = data_sv;
2654} 2740}
2655 OUTPUT: 2741 OUTPUT:
2656 RETVAL 2742 RETVAL
2657 2743
2658void 2744void
2665 STRLEN len; 2751 STRLEN len;
2666 uint8_t *data, *end; 2752 uint8_t *data, *end;
2667 2753
2668 len = SvLEN (data_sv); 2754 len = SvLEN (data_sv);
2669 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2755 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2670 data = SvPVbyte_nolen (data_sv); 2756 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2671 end = data + len + 8; 2757 end = data + len + 8;
2672 2758
2673 if (len < 5) 2759 if (len < 5)
2674 XSRETURN_EMPTY; 2760 XSRETURN_EMPTY;
2675 2761
2736} 2822}
2737 2823
2738MODULE = Deliantra::Client PACKAGE = DC::RW 2824MODULE = Deliantra::Client PACKAGE = DC::RW
2739 2825
2740DC::RW 2826DC::RW
2741new (SV *class, SV *data_sv) 2827new (SV *klass, SV *data_sv)
2742 CODE: 2828 CODE:
2743{ 2829{
2744 STRLEN datalen; 2830 STRLEN datalen;
2745 char *data = SvPVbyte (data_sv, datalen); 2831 char *data = SvPVbyte (data_sv, datalen);
2746 2832
2748} 2834}
2749 OUTPUT: 2835 OUTPUT:
2750 RETVAL 2836 RETVAL
2751 2837
2752DC::RW 2838DC::RW
2753new_from_file (SV *class, const char *path, const char *mode = "rb") 2839new_from_file (SV *klass, const char *path, const char *mode = "rb")
2754 CODE: 2840 CODE:
2755 RETVAL = SDL_RWFromFile (path, mode); 2841 RETVAL = SDL_RWFromFile (path, mode);
2756 OUTPUT: 2842 OUTPUT:
2757 RETVAL 2843 RETVAL
2758 2844
2776 if (RETVAL < 0) 2862 if (RETVAL < 0)
2777 { 2863 {
2778 RETVAL = Mix_GroupOldest (-1); 2864 RETVAL = Mix_GroupOldest (-1);
2779 2865
2780 if (RETVAL < 0) 2866 if (RETVAL < 0)
2867 {
2868 // happens sometimes, maybe it just stopped playing(?)
2869 RETVAL = Mix_GroupAvailable (-1);
2870
2871 if (RETVAL < 0)
2781 XSRETURN_UNDEF; 2872 XSRETURN_UNDEF;
2782 2873 }
2874 else
2783 Mix_HaltChannel (RETVAL); 2875 Mix_HaltChannel (RETVAL);
2784 } 2876 }
2785 2877
2786 Mix_UnregisterAllEffects (RETVAL); 2878 Mix_UnregisterAllEffects (RETVAL);
2787 Mix_Volume (RETVAL, 128); 2879 Mix_Volume (RETVAL, 128);
2788} 2880}
2835void 2927void
2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2928set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2837 CODE: 2929 CODE:
2838{ 2930{
2839 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2931 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2840 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2932 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2933 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842} 2934}
2843 2935
2844void 2936void
2845set_reverse_stereo (DC::Channel self, int flip) 2937set_reverse_stereo (DC::Channel self, int flip)
2848 2940
2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2941MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850 2942
2851PROTOTYPES: DISABLE 2943PROTOTYPES: DISABLE
2852 2944
2945void
2946decoders ()
2947 PPCODE:
2948#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2949 int i, num = Mix_GetNumChunkDecoders ();
2950 EXTEND (SP, num);
2951 for (i = 0; i < num; ++i)
2952 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2953#else
2954 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2955#endif
2956
2853DC::MixChunk 2957DC::MixChunk
2854new (SV *class, DC::RW rwops) 2958new (SV *klass, DC::RW rwops)
2855 CODE: 2959 CODE:
2856 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2960 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2857 OUTPUT: 2961 OUTPUT:
2858 RETVAL 2962 RETVAL
2859 2963
2889 OUTPUT: 2993 OUTPUT:
2890 RETVAL 2994 RETVAL
2891 2995
2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2996MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2893 2997
2998void
2999decoders ()
3000 PPCODE:
3001#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3002 int i, num = Mix_GetNumMusicDecoders ();
3003 EXTEND (SP, num);
3004 for (i = 0; i < num; ++i)
3005 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3006#else
3007 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3008#endif
3009
2894int 3010int
2895volume (int volume = -1) 3011volume (int volume = -1)
2896 PROTOTYPE: ;$ 3012 PROTOTYPE: ;$
2897 CODE: 3013 CODE:
2898 if (items > 0) 3014 if (items > 0)
2909void 3025void
2910halt () 3026halt ()
2911 CODE: 3027 CODE:
2912 Mix_HaltMusic (); 3028 Mix_HaltMusic ();
2913 3029
3030int
3031playing ()
3032 CODE:
3033 RETVAL = Mix_PlayingMusic ();
3034 OUTPUT:
3035 RETVAL
3036
2914DC::MixMusic 3037DC::MixMusic
2915new (SV *class, DC::RW rwops) 3038new (SV *klass, DC::RW rwops)
2916 CODE: 3039 CODE:
2917 RETVAL = Mix_LoadMUS_RW (rwops); 3040 RETVAL = Mix_LoadMUS_RW (rwops);
2918 OUTPUT: 3041 OUTPUT:
2919 RETVAL 3042 RETVAL
2920 3043
3057 const_iv (GL_FUNC_SUBTRACT), 3180 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3181 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3059# undef const_iv 3182# undef const_iv
3060 }; 3183 };
3061 3184
3062 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3185 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3186 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3064 3187
3065 texture_av = newAV (); 3188 texture_av = newAV ();
3066 AvREAL_off (texture_av); 3189 AvREAL_off (texture_av);
3067} 3190}
3068 3191
3073 gl.BlendFuncSeparateEXT = 0; 3196 gl.BlendFuncSeparateEXT = 0;
3074 3197
3075void 3198void
3076apple_nvidia_bug (int enable) 3199apple_nvidia_bug (int enable)
3077 3200
3078char * 3201const char *
3079gl_vendor () 3202gl_vendor ()
3080 CODE: 3203 CODE:
3081 RETVAL = (char *)glGetString (GL_VENDOR); 3204 RETVAL = (const char *)glGetString (GL_VENDOR);
3082 OUTPUT: 3205 OUTPUT:
3083 RETVAL 3206 RETVAL
3084 3207
3085char * 3208const char *
3086gl_version () 3209gl_version ()
3087 CODE: 3210 CODE:
3088 RETVAL = (char *)glGetString (GL_VERSION); 3211 RETVAL = (const char *)glGetString (GL_VERSION);
3089 OUTPUT: 3212 OUTPUT:
3090 RETVAL 3213 RETVAL
3091 3214
3092char * 3215const char *
3093gl_extensions () 3216gl_extensions ()
3094 CODE: 3217 CODE:
3095 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3218 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3096 OUTPUT: 3219 OUTPUT:
3097 RETVAL 3220 RETVAL
3098 3221
3099const char *glGetString (GLenum pname) 3222const char *glGetString (GLenum pname)
3223 CODE:
3224 RETVAL = (const char *)glGetString (pname);
3225 OUTPUT:
3226 RETVAL
3100 3227
3101GLint glGetInteger (GLenum pname) 3228GLint glGetInteger (GLenum pname)
3102 CODE: 3229 CODE:
3103 glGetIntegerv (pname, &RETVAL); 3230 glGetIntegerv (pname, &RETVAL);
3104 OUTPUT: 3231 OUTPUT:
3111 RETVAL 3238 RETVAL
3112 3239
3113int glGetError () 3240int glGetError ()
3114 3241
3115void glFinish () 3242void glFinish ()
3243
3244void glFlush ()
3116 3245
3117void glClear (int mask) 3246void glClear (int mask)
3118 3247
3119void glClearColor (float r, float g, float b, float a = 1.0) 3248void glClearColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @ 3249 PROTOTYPE: @
3292 3421
3293void glEndList () 3422void glEndList ()
3294 3423
3295void glCallList (int list) 3424void glCallList (int list)
3296 3425
3426void c_init ()
3427 CODE:
3428 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3429 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3430
3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3431MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298 3432
3299PROTOTYPES: DISABLE 3433PROTOTYPES: DISABLE
3300 3434
3301void 3435void
3302find_widget (SV *self, NV x, NV y) 3436find_widget (SV *self, NV x, NV y)
3303 PPCODE: 3437 PPCODE:
3304{ 3438{
3305 if (within_widget (self, x, y)) 3439 if (within_widget (self, x, y))
3306 XPUSHs (self); 3440 XPUSHs (self);
3307} 3441}
3308 3442
3309BOOT: 3443BOOT:
3310{ 3444{
3318 3452
3319void 3453void
3320draw (SV *self) 3454draw (SV *self)
3321 CODE: 3455 CODE:
3322{ 3456{
3323 HV *hv; 3457 HV *hv;
3324 SV **svp; 3458 SV **svp;
3325 NV x, y, w, h; 3459 NV x, y, w, h;
3326 SV *draw_x_sv = GvSV (draw_x_gv); 3460 SV *draw_x_sv = GvSV (draw_x_gv);
3327 SV *draw_y_sv = GvSV (draw_y_gv); 3461 SV *draw_y_sv = GvSV (draw_y_gv);
3328 SV *draw_w_sv = GvSV (draw_w_gv); 3462 SV *draw_w_sv = GvSV (draw_w_gv);
3329 SV *draw_h_sv = GvSV (draw_h_gv); 3463 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines