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.293 by root, Thu Dec 17 02:49:38 2009 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}
1659 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1660 } 1759 }
1661} 1760}
1662 1761
1663void 1762void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1) 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)
1665 PROTOTYPE: @ 1764 PROTOTYPE: @
1666 CODE: 1765 CODE:
1667{ 1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668 glEnable (GL_TEXTURE_2D); 1769 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND); 1770 glBindTexture (GL_TEXTURE_2D, name1);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 1771
1673 glColor4f (intensity, intensity, intensity, 0.9); 1772 glColor3f (intensity, intensity, intensity);
1674 glPushMatrix (); 1773 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.); 1774 glScalef (1./3, 1./3, 1.);
1676 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);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1789 glBindTexture (GL_TEXTURE_2D, name2);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678 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);
1679 glBegin (GL_QUADS); 1843 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1844
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1845 for (y = 1; y < h; y += 3)
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1846 {
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 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
1684 glEnd (); 1875 glEnd ();
1685 1876
1686 glPopMatrix (); 1877 glPopMatrix ();
1687 1878
1688 glDisable (GL_TEXTURE_2D); 1879 glDisable (GL_TEXTURE_2D);
1703MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1704 1895
1705PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1706 1897
1707DC::Map 1898DC::Map
1708new (SV *class) 1899new (SV *klass)
1709 CODE: 1900 CODE:
1710 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1711 RETVAL->x = 0; 1902 RETVAL->x = 0;
1712 RETVAL->y = 0; 1903 RETVAL->y = 0;
1713 RETVAL->w = 0; 1904 RETVAL->w = 0;
1714 RETVAL->h = 0; 1905 RETVAL->h = 0;
1715 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1752 1943
1753void 1944void
1754set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1755 CODE: 1946 CODE:
1756{ 1947{
1757 tileid texid; 1948 tileid texid;
1758 maptex *tex; 1949 maptex *tex;
1759 1950
1760 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1761 return; 1952 return;
1762 1953
1763 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1764 return; 1955 return;
1765 1956
1766 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1767 1958
1768 if (!texid) 1959 if (!texid)
1769 return; 1960 return;
1770 1961
1771 tex = self->tex + texid; 1962 tex = self->tex + texid;
1804} 1995}
1805 1996
1806void 1997void
1807expire_textures (DC::Map self, int texid, int count) 1998expire_textures (DC::Map self, int texid, int count)
1808 PPCODE: 1999 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count) 2000 for (; texid < self->texs && count; ++texid, --count)
1810 { 2001 {
1811 maptex *tex = self->tex + texid; 2002 maptex *tex = self->tex + texid;
1812 2003
1813 if (tex->name) 2004 if (tex->name)
1814 { 2005 {
1861 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1862 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1863 2054
1864 while (self->y < 0) 2055 while (self->y < 0)
1865 { 2056 {
1866 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1867 2058
1868 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1869 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1870 } 2061 }
1871} 2062}
1872 2063
1873SV * 2064SV *
1874map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1875 CODE: 2066 CODE:
1876{ 2067{
1877 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1878 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1879 mapcell *cell; 2070 mapcell *cell;
1900 2091
1901 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1902 2093
1903 if (flags & 8) 2094 if (flags & 8)
1904 { 2095 {
2096 uint8_t ext, cmd;
2097
1905 if (extmap) 2098 do
1906 { 2099 {
1907 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1908 2102
1909 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
1910 { 2106 {
1911 ext = *data++;
1912 cmd = ext & 0x7f;
1913
1914 if (cmd < 4)
1915 cell->darkness = 255 - ext * 64 + 1;
1916 else if (cmd == 5) // health
1917 {
1918 cell->stat_width = 1; 2107 cell->stat_width = 1;
1919 cell->stat_hp = *data++; 2108 cell->stat_hp = *data++;
1920 }
1921 else if (cmd == 6) // monster width
1922 cell->stat_width = *data++ + 1;
1923 else if (cmd == 0x47)
1924 {
1925 if (*data == 1) cell->player = data [1];
1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1929
1930 data += *data + 1;
1931 }
1932 else if (cmd == 8) // cell flags
1933 cell->flags = *data++;
1934 else if (ext & 0x40) // unknown, multibyte => skip
1935 data += *data + 1;
1936 else
1937 data++;
1938 } 2109 }
1939 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++;
1940 } 2127 }
1941 else 2128 while (ext & 0x80);
1942 cell->darkness = *data++ + 1;
1943 } 2129 }
1944 2130
1945 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
1946 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
1947 { 2133 {
1995 ? self->row + y 2181 ? self->row + y
1996 : 0; 2182 : 0;
1997 2183
1998 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
1999 { 2185 {
2000 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
2001 2187
2002 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
2003 { 2189 {
2004 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
2005 2191
2007 { 2193 {
2008 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
2009 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
2010 int a1 = tex.a; 2196 int a1 = tex.a;
2011 2197
2012 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
2013 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
2014 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
2015 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
2016 } 2202 }
2017 } 2203 }
2018 2204
2019 *map++ = (r ) 2205 *map++ = (r )
2020 | (g << 8) 2206 | (g << 8)
2021 | (b << 16) 2207 | (b << 16)
2022 | (a << 24); 2208 | (a << 24);
2023 } 2209 }
2024 } 2210 }
2025 2211
2026 RETVAL = map_sv; 2212 RETVAL = map_sv;
2027} 2213}
2028 OUTPUT: 2214 OUTPUT:
2029 RETVAL 2215 RETVAL
2030 2216
2031void 2217void
2032draw (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)
2033 CODE: 2219 CODE:
2034{ 2220{
2035 int x, y, z; 2221 int x, y, z;
2036 2222
2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2038 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2039 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!
2040 smooth_key skey;
2041 int pl_x, pl_y; 2224 int pl_x, pl_y;
2042 maptex pl_tex; 2225 maptex pl_tex;
2043 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2044 rc_t *rc_ov = rc_alloc (); 2227 rc_t rc_ov;
2045 rc_key_t key; 2228 rc_key_t key;
2046 rc_array_t *arr, *arr_hidden; 2229 rc_t::array_t *arr;
2047 2230
2048 pl_tex.name = 0; 2231 pl_tex.name = 0;
2049 2232
2050 // that's current max. sorry. 2233 // that's current max. sorry.
2051 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
2052 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
2053
2054 // clear key, in case of extra padding
2055 memset (&skey, 0, sizeof (skey));
2056 2236
2057 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
2058 key.r = 255; 2238 key.r = 255;
2059 key.g = 255; 2239 key.g = 255;
2060 key.b = 255; 2240 key.b = 255;
2066 my += self->y; 2246 my += self->y;
2067 2247
2068 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
2069 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
2070 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
2071 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2072 2252
2073 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
2074 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
2075 { 2255 {
2076 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
2089 2269
2090 glEnable (GL_BLEND); 2270 glEnable (GL_BLEND);
2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093 2273
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
2097 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
2098 { 2275 {
2099 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;
2100 key.texname = -1; 2279 key.texname = -1;
2101 2280
2102 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
2103 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
2104 { 2283 {
2121 2300
2122 if (!tex.name) 2301 if (!tex.name)
2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2124 2303
2125 key.texname = tex.name; 2304 key.texname = tex.name;
2126 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
2127 } 2306 }
2128 2307
2129 px = (x + 1) * T - tex.w; 2308 px = (x + 1) * Th - tex.w;
2130 py = (y + 1) * T - tex.h; 2309 py = (y + 1) * Tw - tex.h;
2131 2310
2132 if (expect_false (cell->player == player) && expect_false (z == 2)) 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 { 2312 {
2134 pl_x = px; 2313 pl_x = px;
2135 pl_y = py; 2314 pl_y = py;
2136 pl_tex = tex; 2315 pl_tex = tex;
2137 continue; 2316 continue;
2138 } 2317 }
2139 2318
2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2141 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2142 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);
2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2144 2323
2145 // update smooth hash 2324 // update smooth hash
2146 if (tex.smoothtile) 2325 if (tex.smoothtile)
2147 { 2326 {
2148 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
2149 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
2150 2329
2151 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
2152 2331
2153 // 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
2154 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
2155 2334
2156 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
2164 2343
2165 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2166 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
2167 2346
2168 // full tile 2347 // full tile
2169 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);
2170 2349
2171 // borders 2350 // borders
2172 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);
2173 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);
2174 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);
2175 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);
2176 2355
2177 // corners 2356 // corners
2178 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);
2179 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);
2180 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);
2181 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);
2182 } 2361 }
2183 } 2362 }
2184 2363
2185 if (expect_false (z == 2)) 2364 if (expect_false (z == 2) && expect_false (cell->flags))
2186 { 2365 {
2187 /* draw question marks on top of hidden spaces */ 2366 // overlays such as the speech bubble, probably more to come
2188 if (!cell->darkness) 2367 if (cell->flags & 1)
2189 { 2368 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key; 2369 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH]; 2370 maptex tex = self->tex[TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32; 2371 int px = x * Tw + Tw * 2 / 32;
2209 int py = y * T - T * 6 / 32; 2372 int py = y * Th - Th * 6 / 32;
2210 2373
2211 key_ov.texname = tex.name; 2374 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov); 2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2213 2376
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2216 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);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2218 }
2219 } 2381 }
2220 } 2382 }
2221 } 2383 }
2222 } 2384 }
2223 2385
2224 rc_draw (rc); 2386 rc.draw ();
2225 rc_clear (rc); 2387 rc.clear ();
2226 2388
2227 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
2228 // this is basically counting sort 2390 // this is basically counting sort
2229 { 2391 {
2230 int w, b; 2392 int w, b;
2231 2393
2232 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
2233 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
2234 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)
2235 { 2399 {
2236 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
2237 if (smask) 2401 IV bits = it->second;
2238 for (b = 0; b < 32; ++b) 2402
2239 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
2240 { 2406 {
2241 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
2242 HE *he; 2415 if (tex.name)
2243
2244 hv_iterinit (smooth);
2245 while ((he = hv_iternext (smooth)))
2246 { 2416 {
2247 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
2248 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
2249 2419 if (key.texname != tex.name)
2250 if (!(bits & 0x1000)
2251 && skey->level == level
2252 && level > smooth_max [skey->x][skey->y])
2253 { 2420 {
2254 maptex tex = self->tex [skey->tile];
2255 int px = (((int)skey->x) - 1) * T;
2256 int py = (((int)skey->y) - 1) * T;
2257 int border = bits & 15;
2258 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259 float dx = tex.s * .0625f; // 16 images/row
2260 float dy = tex.t * .5f ; // 2 images/column
2261
2262 if (tex.name)
2263 {
2264 // this time avoiding texture state changes
2265 // save gobs of state changes.
2266 if (key.texname != tex.name)
2267 {
2268 self->tex [skey->tile].unused = 0; 2421 self->tex [skey.tile].unused = 0;
2269 2422
2270 glEnd (); 2423 glEnd ();
2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2272 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2273 } 2426 }
2274 2427
2275 if (border) 2428 if (border)
2276 { 2429 {
2277 float ox = border * dx; 2430 float ox = border * dx;
2278 2431
2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283 } 2436 }
2284 2437
2285 if (corner) 2438 if (corner)
2286 { 2439 {
2287 float ox = corner * dx; 2440 float ox = corner * dx;
2288 2441
2289 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293 }
2294 }
2295 } 2446 }
2296 } 2447 }
2297 } 2448 }
2298 } 2449 }
2299 2450
2300 glEnd (); 2451 glEnd ();
2301 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2302 key.texname = -1; 2453 key.texname = -1;
2303 } 2454 }
2304
2305 hv_clear (smooth);
2306 } 2455 }
2307 2456
2308 if (pl_tex.name) 2457 if (pl_tex.name)
2309 { 2458 {
2310 maptex tex = pl_tex; 2459 maptex tex = pl_tex;
2311 int px = pl_x + sdx; 2460 int px = pl_x + sdx;
2312 int py = pl_y + sdy; 2461 int py = pl_y + sdy;
2313 2462
2314 key.texname = tex.name; 2463 key.texname = tex.name;
2315 arr = rc_array (rc, &key); 2464 rc_t::array_t &arr = rc.array (key);
2316 2465
2317 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2318 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2319 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);
2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2321 2470
2322 rc_draw (rc); 2471 rc.draw ();
2323 } 2472 }
2324 2473
2325 rc_draw (rc_ov); 2474 rc_ov.draw ();
2326 rc_clear (rc_ov); 2475 rc_ov.clear ();
2327 2476
2328 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2329 rc_free (rc);
2330 rc_free (rc_ov);
2331 2478
2332 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2333 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2334 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2335 { 2482 {
2338 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2339 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2340 { 2487 {
2341 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2342 2489
2343 int px = x * T; 2490 int px = x * Tw;
2344 int py = y * T; 2491 int py = y * Th;
2345 2492
2346 if (expect_false (cell->player == player)) 2493 if (expect_false (cell->player == player))
2347 { 2494 {
2348 px += sdx; 2495 px += sdx;
2349 py += sdy; 2496 py += sdy;
2350 } 2497 }
2351 2498
2352 if (cell->stat_hp) 2499 if (cell->stat_hp)
2353 { 2500 {
2354 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356 2503
2357 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2358 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2359 px + width - 1, py); 2506 px + width - 1, py);
2360 2507
2366 } 2513 }
2367 } 2514 }
2368} 2515}
2369 2516
2370void 2517void
2371draw_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)
2372 CODE: 2519 CODE:
2373{ 2520{
2374 static float color[16][3] = { 2521 static float color[16][3] = {
2375 { 0.00F, 0.00F, 0.00F }, 2522 { 0.00f, 0.00f, 0.00f },
2376 { 1.00F, 1.00F, 1.00F }, 2523 { 1.00f, 1.00f, 1.00f },
2377 { 0.00F, 0.00F, 0.55F }, 2524 { 0.00f, 0.00f, 0.55f },
2378 { 1.00F, 0.00F, 0.00F }, 2525 { 1.00f, 0.00f, 0.00f },
2379 2526
2380 { 1.00F, 0.54F, 0.00F }, 2527 { 1.00f, 0.54f, 0.00f },
2381 { 0.11F, 0.56F, 1.00F }, 2528 { 0.11f, 0.56f, 1.00f },
2382 { 0.93F, 0.46F, 0.00F }, 2529 { 0.93f, 0.46f, 0.00f },
2383 { 0.18F, 0.54F, 0.34F }, 2530 { 0.18f, 0.54f, 0.34f },
2384 2531
2385 { 0.56F, 0.73F, 0.56F }, 2532 { 0.56f, 0.73f, 0.56f },
2386 { 0.80F, 0.80F, 0.80F }, 2533 { 0.80f, 0.80f, 0.80f },
2387 { 0.55F, 0.41F, 0.13F }, 2534 { 0.55f, 0.41f, 0.13f },
2388 { 0.99F, 0.77F, 0.26F }, 2535 { 0.99f, 0.77f, 0.26f },
2389 2536
2390 { 0.74F, 0.65F, 0.41F }, 2537 { 0.74f, 0.65f, 0.41f },
2391 2538
2392 { 0.00F, 1.00F, 1.00F }, 2539 { 0.00f, 1.00f, 1.00f },
2393 { 1.00F, 0.00F, 1.00F }, 2540 { 1.00f, 0.00f, 1.00f },
2394 { 1.00F, 1.00F, 0.00F }, 2541 { 1.00f, 1.00f, 0.00f },
2395 }; 2542 };
2396 2543
2397 int x, y; 2544 int x, y;
2398 2545
2399 glEnable (GL_TEXTURE_2D); 2546 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2547 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures 2548 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using 2549 * and takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different 2550 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia. 2551 * alpha, but atcually gives us the correct colour with nvidia.
2405 */ 2552 */
2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2415 2562
2416 if (m) 2563 if (m)
2417 { 2564 {
2418 float *c = color [m & 15]; 2565 float *c = color [m & 15];
2419 2566
2420 float tx1 = m & 0x40 ? 0.5 : 0.; 2567 float tx1 = m & 0x40 ? 0.5f : 0.f;
2421 float tx2 = tx1 + 0.5; 2568 float tx2 = tx1 + 0.5f;
2422 2569
2423 glColor4f (c[0], c[1], c[2], 1); 2570 glColor4f (c[0], c[1], c[2], 1);
2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2571 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2572 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2573 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2436void 2583void
2437fow_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)
2438 PPCODE: 2585 PPCODE:
2439{ 2586{
2440 int x, y; 2587 int x, y;
2441 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2442 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2443 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2444 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);
2445 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2446 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2447 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2448 2596
2449 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2450 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2451 2599
2452 mx += self->x - 1; 2600 mx += self->x - 1;
2453 my += self->y - 1; 2601 my += self->y - 1;
2454
2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456 2602
2457 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2458 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2459 { 2605 {
2460 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2463 if (row->c0 <= x + mx && x + mx < row->c1) 2609 if (row->c0 <= x + mx && x + mx < row->c1)
2464 { 2610 {
2465 mapcell *cell = row->col + (x + mx - row->c0); 2611 mapcell *cell = row->col + (x + mx - row->c0);
2466 2612
2467 darkness1 [y * sw1 + x] = cell->darkness 2613 darkness1 [y * sw1 + x] = cell->darkness
2468 ? 255 - (cell->darkness - 1) 2614 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469 : 255 - FOW_DARKNESS; 2615 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470 } 2616 }
2471 } 2617 }
2472 2618
2473 for (y = 0; y < sh; ++y) 2619 for (y = 0; y < sh; ++y)
2474 for (x = 0; x < sw; ++x) 2620 for (x = 0; x < sw; ++x)
2493 2639
2494 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2495 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2496 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2497 2643
2498 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502 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 */
2503 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507 } 2653 }
2508 2654
2509 free (darkness1); 2655 free (darkness1);
2510 2656
2511 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2512 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2513 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2514 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2515} 2661}
2516 2662
2517SV * 2663SV *
2580 else 2726 else
2581 *data++ = 0; 2727 *data++ = 0;
2582 } 2728 }
2583 } 2729 }
2584 2730
2585 /* 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 */
2586 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2587 { 2733 {
2588 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 } 2736 }
2591 2737
2592 RETVAL = data_sv; 2738 RETVAL = data_sv;
2593} 2739}
2594 OUTPUT: 2740 OUTPUT:
2595 RETVAL 2741 RETVAL
2596 2742
2597void 2743void
2604 STRLEN len; 2750 STRLEN len;
2605 uint8_t *data, *end; 2751 uint8_t *data, *end;
2606 2752
2607 len = SvLEN (data_sv); 2753 len = SvLEN (data_sv);
2608 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609 data = SvPVbyte_nolen (data_sv); 2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2610 end = data + len + 8; 2756 end = data + len + 8;
2611 2757
2612 if (len < 5) 2758 if (len < 5)
2613 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2614 2760
2675} 2821}
2676 2822
2677MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2678 2824
2679DC::RW 2825DC::RW
2680new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2681 CODE: 2827 CODE:
2682{ 2828{
2683 STRLEN datalen; 2829 STRLEN datalen;
2684 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2685 2831
2687} 2833}
2688 OUTPUT: 2834 OUTPUT:
2689 RETVAL 2835 RETVAL
2690 2836
2691DC::RW 2837DC::RW
2692new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2693 CODE: 2839 CODE:
2694 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2695 OUTPUT: 2841 OUTPUT:
2696 RETVAL 2842 RETVAL
2697 2843
2715 if (RETVAL < 0) 2861 if (RETVAL < 0)
2716 { 2862 {
2717 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2718 2864
2719 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)
2720 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2721 2872 }
2873 else
2722 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2723 } 2875 }
2724 2876
2725 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2726 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2727} 2879}
2774void 2926void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2927set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE: 2928 CODE:
2777{ 2929{
2778 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));
2779 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;
2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2932 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781} 2933}
2782 2934
2783void 2935void
2784set_reverse_stereo (DC::Channel self, int flip) 2936set_reverse_stereo (DC::Channel self, int flip)
2787 2939
2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789 2941
2790PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2791 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
2792DC::MixChunk 2956DC::MixChunk
2793new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2794 CODE: 2958 CODE:
2795 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2796 OUTPUT: 2960 OUTPUT:
2797 RETVAL 2961 RETVAL
2798 2962
2828 OUTPUT: 2992 OUTPUT:
2829 RETVAL 2993 RETVAL
2830 2994
2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832 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
2833int 3009int
2834volume (int volume = -1) 3010volume (int volume = -1)
2835 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2836 CODE: 3012 CODE:
2837 if (items > 0) 3013 if (items > 0)
2848void 3024void
2849halt () 3025halt ()
2850 CODE: 3026 CODE:
2851 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2852 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2853DC::MixMusic 3036DC::MixMusic
2854new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2855 CODE: 3038 CODE:
2856 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2857 OUTPUT: 3040 OUTPUT:
2858 RETVAL 3041 RETVAL
2859 3042
2996 const_iv (GL_FUNC_SUBTRACT), 3179 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998# undef const_iv 3181# undef const_iv
2999 }; 3182 };
3000 3183
3001 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--)
3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003 3186
3004 texture_av = newAV (); 3187 texture_av = newAV ();
3005 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
3006} 3189}
3007 3190
3012 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
3013 3196
3014void 3197void
3015apple_nvidia_bug (int enable) 3198apple_nvidia_bug (int enable)
3016 3199
3017char * 3200const char *
3018gl_vendor () 3201gl_vendor ()
3019 CODE: 3202 CODE:
3020 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
3021 OUTPUT: 3204 OUTPUT:
3022 RETVAL 3205 RETVAL
3023 3206
3024char * 3207const char *
3025gl_version () 3208gl_version ()
3026 CODE: 3209 CODE:
3027 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
3028 OUTPUT: 3211 OUTPUT:
3029 RETVAL 3212 RETVAL
3030 3213
3031char * 3214const char *
3032gl_extensions () 3215gl_extensions ()
3033 CODE: 3216 CODE:
3034 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3035 OUTPUT: 3218 OUTPUT:
3036 RETVAL 3219 RETVAL
3037 3220
3038const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
3039 3226
3040GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
3041 CODE: 3228 CODE:
3042 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
3043 OUTPUT: 3230 OUTPUT:
3050 RETVAL 3237 RETVAL
3051 3238
3052int glGetError () 3239int glGetError ()
3053 3240
3054void glFinish () 3241void glFinish ()
3242
3243void glFlush ()
3055 3244
3056void glClear (int mask) 3245void glClear (int mask)
3057 3246
3058void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
3059 PROTOTYPE: @ 3248 PROTOTYPE: @
3231 3420
3232void glEndList () 3421void glEndList ()
3233 3422
3234void glCallList (int list) 3423void glCallList (int list)
3235 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237 3431
3238PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
3239 3433
3240void 3434void
3241find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
3242 PPCODE: 3436 PPCODE:
3243{ 3437{
3244 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
3245 XPUSHs (self); 3439 XPUSHs (self);
3246} 3440}
3247 3441
3248BOOT: 3442BOOT:
3249{ 3443{
3257 3451
3258void 3452void
3259draw (SV *self) 3453draw (SV *self)
3260 CODE: 3454 CODE:
3261{ 3455{
3262 HV *hv; 3456 HV *hv;
3263 SV **svp; 3457 SV **svp;
3264 NV x, y, w, h; 3458 NV x, y, w, h;
3265 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
3266 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
3267 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
3268 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