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