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.289 by root, Wed Dec 24 04:09:26 2008 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines