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.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines