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.301 by root, Thu Feb 4 20:01:08 2010 UTC vs.
Revision 1.333 by root, Mon Nov 19 01:23:01 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>
48#endif 53#endif
49 54
50#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
52 57
53#include <glib/gmacros.h> 58#include <glib.h>
54 59
55#include <pango/pango.h> 60#include <pango/pango.h>
56 61
57#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
71# include <netinet/in.h> 76# include <netinet/in.h>
72# include <netinet/tcp.h> 77# include <netinet/tcp.h>
73# include <inttypes.h> 78# include <inttypes.h>
74#endif 79#endif
75 80
76#if __GNUC__ >= 4 81#include "ecb.h"
77# define expect(expr,value) __builtin_expect ((expr),(value)) 82#include "salloc.h"
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84 83
85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
86 85
87/* this is used as fow flag as well, so has to have a different value */ 86/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */ 87/* then anything that is computed by incoming darkness */
99 98
100#define KMOD_LRAM 0x10000 // our extension 99#define KMOD_LRAM 0x10000 // our extension
101 100
102#define TEXID_SPEECH 1 101#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 102#define TEXID_NOFACE 2
103
104static char *
105fast_sv_grow (SV *sv, STRLEN need)
106{
107 STRLEN len = SvLEN (sv);
108 STRLEN want = SvCUR (sv) + need;
109
110 if (ecb_expect_false (len < want))
111 {
112 do
113 len *= 2;
114 while (len < want);
115
116 sv_grow (sv, len);
117 }
118
119 SvCUR_set (sv, want);
120 return SvEND (sv) - need;
121}
104 122
105static AV *texture_av; 123static AV *texture_av;
106 124
107static struct 125static struct
108{ 126{
165{ 183{
166 GSList *attrs = run->item->analysis.extra_attrs; 184 GSList *attrs = run->item->analysis.extra_attrs;
167 185
168 while (attrs) 186 while (attrs)
169 { 187 {
170 PangoAttribute *attr = attrs->data; 188 PangoAttribute *attr = (PangoAttribute *)attrs->data;
171 189
172 if (attr->klass->type == PANGO_ATTR_SHAPE) 190 if (attr->klass->type == PANGO_ATTR_SHAPE)
173 return 1; 191 return 1;
174 192
175 attrs = attrs->next; 193 attrs = attrs->next;
176 } 194 }
177 195
178 return 0; 196 return 0;
179} 197}
180 198
181typedef struct cf_layout { 199struct cf_layout {
182 PangoLayout *pl; 200 PangoLayout *pl;
183 float r, g, b, a; // default color for rgba mode 201 float r, g, b, a; // default color for rgba mode
184 int base_height; 202 int base_height;
185 DC__Font font; 203 DC__Font font;
186 rc_t *rc; 204 rc_t rc;
187} *DC__Layout; 205};
206
207typedef cf_layout *DC__Layout;
188 208
189static DC__Font default_font; 209static DC__Font default_font;
190static PangoContext *opengl_context; 210static PangoContext *opengl_context;
191static PangoFontMap *opengl_fontmap; 211static PangoFontMap *opengl_fontmap;
192 212
193static void 213static void
194substitute_func (FcPattern *pattern, gpointer data) 214substitute_func (FcPattern *pattern, gpointer data)
195{ 215{
196 FcPatternAddBool (pattern, FC_HINTING, 1); 216 FcPatternAddBool (pattern, FC_HINTING, 1);
197#ifdef FC_HINT_STYLE 217#ifdef FC_HINT_STYLE
198 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 218 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199#endif 219#endif
200 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 220 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201} 221}
202 222
203static void 223static void
230 250
231 *w = rect.width; 251 *w = rect.width;
232 *h = rect.height; 252 *h = rect.height;
233} 253}
234 254
255/////////////////////////////////////////////////////////////////////////////
256
235typedef uint16_t tileid; 257typedef uint16_t tileid;
236typedef uint16_t faceid; 258typedef uint16_t faceid;
237 259
238typedef struct { 260struct maptex
261{
239 GLuint name; 262 GLuint name;
240 int w, h; 263 int w, h;
241 float s, t; 264 float s, t;
242 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
243 tileid smoothtile; 266 tileid smoothtile;
244 uint8_t smoothlevel; 267 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */ 268 uint8_t unused; /* set to zero on use */
246} maptex; 269};
247 270
248typedef struct { 271struct mapcell
272{
249 uint32_t player; 273 uint32_t player;
250 tileid tile[3]; 274 tileid tile[3];
251 uint16_t darkness; 275 uint16_t darkness;
252 uint8_t stat_width, stat_hp, flags, smoothmax; 276 uint8_t stat_width, stat_hp, flags, smoothmax;
253} mapcell; 277};
254 278
255typedef struct { 279struct maprow
280{
256 int32_t c0, c1; 281 int32_t c0, c1;
257 mapcell *col; 282 mapcell *col;
258} maprow; 283};
259 284
260typedef struct map { 285struct mapgrid {
261 int x, y, w, h; 286 int x, y, w, h;
262 int ox, oy; /* offset to virtual global coordinate system */ 287 int ox, oy; /* offset to virtual global coordinate system */
263 int faces; tileid *face2tile; // [faceid] 288 int faces; tileid *face2tile; // [faceid]
264 int texs; maptex *tex; // [tileid] 289 int texs; maptex *tex; // [tileid]
265 290
266 int32_t rows; 291 int32_t rows;
267 maprow *row; 292 maprow *row;
268} *DC__Map; 293};
269 294
270static char * 295typedef mapgrid *DC__Map;
296
297template<typename T>
298static void
271prepend (char *ptr, int sze, int inc) 299prepend (T *&ptr, int sze, int inc)
272{ 300{
273 char *p; 301 T *p;
274 302
275 New (0, p, sze + inc, char); 303 Newx (p, inc + sze, T);
276 Zero (p, inc, char); 304 Zero (p, inc, T);
277 Move (ptr, p + inc, sze, char); 305 Move (ptr, p + inc, sze, T);
278 Safefree (ptr); 306 Safefree (ptr);
279 307
280 return p; 308 ptr = p;
281} 309}
282 310
283static char * 311template<typename T>
284append (char *ptr, int sze, int inc)
285{
286 Renew (ptr, sze + inc, char);
287 Zero (ptr + sze, inc, char);
288
289 return ptr;
290}
291
292#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
293#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
294
295static void 312static void
313append (T *&ptr, int sze, int inc)
314{
315 Renew (ptr, sze + inc, T);
316 Zero (ptr + sze, inc, T);
317}
318
319static void
296need_facenum (struct map *self, faceid face) 320need_facenum (struct mapgrid *self, faceid face)
297{ 321{
298 while (self->faces <= face) 322 while (self->faces <= face)
299 { 323 {
300 Append (tileid, self->face2tile, self->faces, self->faces); 324 append (self->face2tile, self->faces, self->faces);
301 self->faces *= 2; 325 self->faces *= 2;
302 } 326 }
303} 327}
304 328
305static void 329static void
306need_texid (struct map *self, int texid) 330need_texid (struct mapgrid *self, int texid)
307{ 331{
308 while (self->texs <= texid) 332 while (self->texs <= texid)
309 { 333 {
310 Append (maptex, self->tex, self->texs, self->texs); 334 append (self->tex, self->texs, self->texs);
311 self->texs *= 2; 335 self->texs *= 2;
312 } 336 }
313} 337}
314 338
315static maprow * 339static maprow *
316map_get_row (DC__Map self, int y) 340map_get_row (mapgrid *self, int y)
317{ 341{
318 if (0 > y) 342 if (0 > y)
319 { 343 {
320 int extend = - y + MAP_EXTEND_Y; 344 int extend = - y + MAP_EXTEND_Y;
321 Prepend (maprow, self->row, self->rows, extend); 345 prepend (self->row, self->rows, extend);
322 346
323 self->rows += extend; 347 self->rows += extend;
324 self->y += extend; 348 self->y += extend;
325 y += extend; 349 y += extend;
326 } 350 }
327 else if (y >= self->rows) 351 else if (y >= self->rows)
328 { 352 {
329 int extend = y - self->rows + MAP_EXTEND_Y; 353 int extend = y - self->rows + MAP_EXTEND_Y;
330 Append (maprow, self->row, self->rows, extend); 354 append (self->row, self->rows, extend);
331 self->rows += extend; 355 self->rows += extend;
332 } 356 }
333 357
334 return self->row + y; 358 return self->row + y;
335} 359}
345 } 369 }
346 370
347 if (row->c0 > x) 371 if (row->c0 > x)
348 { 372 {
349 int extend = row->c0 - x + MAP_EXTEND_X; 373 int extend = row->c0 - x + MAP_EXTEND_X;
350 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 374 prepend (row->col, row->c1 - row->c0, extend);
351 row->c0 -= extend; 375 row->c0 -= extend;
352 } 376 }
353 else if (x >= row->c1) 377 else if (x >= row->c1)
354 { 378 {
355 int extend = x - row->c1 + MAP_EXTEND_X; 379 int extend = x - row->c1 + MAP_EXTEND_X;
356 Append (mapcell, row->col, row->c1 - row->c0, extend); 380 append (row->col, row->c1 - row->c0, extend);
357 row->c1 += extend; 381 row->c1 += extend;
358 } 382 }
359 383
360 return row->col + (x - row->c0); 384 return row->col + (x - row->c0);
361} 385}
362 386
363static mapcell * 387static mapcell *
364map_get_cell (DC__Map self, int x, int y) 388map_get_cell (mapgrid *self, int x, int y)
365{ 389{
366 return row_get_cell (map_get_row (self, y), x); 390 return row_get_cell (map_get_row (self, y), x);
367} 391}
368 392
369static void 393static void
370map_clear (DC__Map self) 394map_clear (mapgrid *self)
371{ 395{
372 int r; 396 int r;
373 397
374 for (r = 0; r < self->rows; r++) 398 for (r = 0; r < self->rows; r++)
375 Safefree (self->row[r].col); 399 Safefree (self->row[r].col);
393 (cell)->flags = 0; \ 417 (cell)->flags = 0; \
394 (cell)->player = 0; \ 418 (cell)->player = 0; \
395 } while (0) 419 } while (0)
396 420
397static void 421static void
398map_blank (DC__Map self, int x0, int y0, int w, int h) 422map_blank (mapgrid *self, int x0, int y0, int w, int h)
399{ 423{
400 int x, y; 424 int x, y;
401 maprow *row; 425 maprow *row;
402 mapcell *cell; 426 mapcell *cell;
403 427
420 CELL_CLEAR (cell); 444 CELL_CLEAR (cell);
421 } 445 }
422 } 446 }
423} 447}
424 448
425typedef struct { 449struct smooth_key
450{
426 tileid tile; 451 tileid tile;
427 uint8_t x, y, level; 452 uint8_t x, y, level;
428} smooth_key; 453
454 bool operator == (const smooth_key &o) const
455 {
456 return tile == o.tile && x == o.x && y == o.y && level == o.level;
457 }
458};
459
460typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
461
462namespace std {
463 template <>
464 struct hash<smooth_key>
465 {
466 size_t operator () (const smooth_key &v) const
467 {
468 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
469 }
470 };
471}
429 472
430static void 473static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 474smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 475{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 476 auto &&it = h.find (key);
434 477
435 if (SvIOK (*sv)) 478 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 479 h.insert (std::make_pair (key, bits));
437 else 480 else
438 sv_setiv (*sv, bits); 481 it->second |= bits;
439} 482}
440 483
441static void 484static void
442music_finished (void) 485music_finished (void)
443{ 486{
460 ev.code = 1; 503 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 504 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 505 ev.data2 = 0;
463 506
464 SDL_PushEvent ((SDL_Event *)&ev); 507 SDL_PushEvent ((SDL_Event *)&ev);
508}
509
510// approximately divide by 255
511static unsigned int
512div255 (unsigned int n)
513{
514 return (n + (n >> 8)) >> 8;
465} 515}
466 516
467static unsigned int 517static unsigned int
468minpot (unsigned int n) 518minpot (unsigned int n)
469{ 519{
479 n |= n >> 16; 529 n |= n >> 16;
480 530
481 return n + 1; 531 return n + 1;
482} 532}
483 533
484static unsigned int
485popcount (unsigned int n)
486{
487 n -= (n >> 1) & 0x55555555U;
488 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
489 n = ((n >> 4) + n) & 0x0f0f0f0fU;
490 n *= 0x01010101U;
491
492 return n >> 24;
493}
494
495/* SDL should provide this, really. */ 534/* SDL should provide this, really. */
496#define SDLK_MODIFIER_MIN 300 535#define SDLK_MODIFIER_MIN 300
497#define SDLK_MODIFIER_MAX 314 536#define SDLK_MODIFIER_MAX 314
498 537
499/******************************************************************************/ 538/******************************************************************************/
552 591
553 return mod; 592 return mod;
554} 593}
555 594
556static void 595static void
557deliantra_main () 596deliantra_main (SV *real_main)
558{ 597{
559 char *argv[] = { 0 }; 598 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 599
600 PUSHMARK (SP);
601 call_sv (real_main, G_DISCARD | G_VOID);
561} 602}
562 603
563#ifdef __MACOSX__ 604#ifdef __MACOSX__
605 static SV *real_main;
606
564 /* to due surprising braindamage on the side of SDL design, we 607 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 608 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which, 609 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 610 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 611 * and which calls our main (== SDL_main) back.
569 */ 612 */
570 extern C_LINKAGE int 613 extern C_LINKAGE int
571 main (int argc, char *argv[]) 614 main (int argc, char *argv[])
572 { 615 {
573 deliantra_main (); 616 deliantra_main (real_main);
574 } 617 }
575 618
576 #undef main 619 #undef main
577 620
578 extern C_LINKAGE int main (int argc, char *argv[]); 621 extern C_LINKAGE int main (int argc, char *argv[]);
579 622
580 static void 623 static void
581 SDL_braino (void) 624 SDL_main_hack (SV *real_main_)
582 { 625 {
626 real_main = real_main_;
627
583 char *argv[] = { "deliantra client", 0 }; 628 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 629 (main) (1, argv);
585 } 630 }
586#else 631#else
587 static void 632 static void
588 SDL_braino (void) 633 SDL_main_hack (SV *real_main)
589 { 634 {
590 deliantra_main (); 635 deliantra_main (real_main);
591 } 636 }
592#endif 637#endif
593 638
594MODULE = Deliantra::Client PACKAGE = DC 639MODULE = Deliantra::Client PACKAGE = DC
595 640
796 841
797 const_iv (FOW_DARKNESS) 842 const_iv (FOW_DARKNESS)
798# undef const_iv 843# undef const_iv
799 }; 844 };
800 845
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 846 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 847 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 848
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 849 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 850 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 851}
807 852
822 867
823NV ceil (NV x) 868NV ceil (NV x)
824 869
825IV minpot (UV n) 870IV minpot (UV n)
826 871
872UV ld32 (UV n)
873 CODE:
874 RETVAL = ecb_ld32 (n);
875 OUTPUT:
876 RETVAL
877
827IV popcount (UV n) 878IV popcount (UV n)
879 CODE:
880 RETVAL = ecb_popcount32 (n);
881 OUTPUT:
882 RETVAL
828 883
829NV distance (NV dx, NV dy) 884NV distance (NV dx, NV dy)
830 CODE: 885 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5); 886 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT: 887 OUTPUT:
846#endif 901#endif
847} 902}
848 903
849char *SDL_GetError () 904char *SDL_GetError ()
850 905
851void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
852 908
853int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
854 910
855int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
856 912
857void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
858 914
859void SDL_Quit () 915void SDL_Quit ()
860 916
861int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
862 919
863int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
864 CODE: 921 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
867 OUTPUT: 924 OUTPUT:
868 RETVAL 925 RETVAL
869 926
870void 927void
925 ); 982 );
926 983
927 if (RETVAL) 984 if (RETVAL)
928 { 985 {
929 av_clear (texture_av); 986 av_clear (texture_av);
930
931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 988#include "glfunc.h"
934#undef GL_FUNC 989#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938 } 992 }
939} 993}
940 OUTPUT: 994 OUTPUT:
941 RETVAL 995 RETVAL
942 996
943void 997void
998SDL_WM_SetCaption (const char *title, const char *icon)
999
1000void
944SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
945 1002
946char * 1003char *
947SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
948 1006
949int 1007int
950SDL_GetAppState () 1008SDL_GetAppState ()
951 1009
952int 1010int
953SDL_GetModState () 1011SDL_GetModState ()
954 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
955void 1017void
1018SDL_PumpEvents ()
1019
1020void
956poll_events () 1021peep_events ()
957 PPCODE: 1022 PPCODE:
958{ 1023{
959 SDL_Event ev; 1024 SDL_Event ev;
960 1025
961 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1027 1092
1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1029 } 1094 }
1030} 1095}
1031 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
1032int 1110int
1033Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1034 POSTCALL: 1112 POSTCALL:
1035 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1036 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1037 1115
1038void 1116void
1039Mix_QuerySpec () 1117Mix_QuerySpec ()
1098add_font (char *file) 1176add_font (char *file)
1099 CODE: 1177 CODE:
1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT: 1179 OUTPUT:
1102 RETVAL 1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1103 1188
1104void 1189void
1105load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1106 ALIAS: 1191 ALIAS:
1107 load_image_file = 1 1192 load_image_file = 1
1153 1238
1154 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1155 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1156 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1157 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1158 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1159 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1160 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1161 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1162 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1163 1248
1235MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1236 1321
1237PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1238 1323
1239DC::Font 1324DC::Font
1240new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1241 CODE: 1326 CODE:
1242{ 1327{
1243 int count; 1328 int count;
1244 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1245 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1274 PROTOTYPE: 1359 PROTOTYPE:
1275 CODE: 1360 CODE:
1276 tc_restore (); 1361 tc_restore ();
1277 1362
1278DC::Layout 1363DC::Layout
1279new (SV *class) 1364new (SV *klass)
1280 CODE: 1365 CODE:
1281 New (0, RETVAL, 1, struct cf_layout); 1366 RETVAL = new cf_layout;
1282 1367
1283 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1284 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1285 RETVAL->g = 1.; 1370 RETVAL->g = 1.;
1286 RETVAL->b = 1.; 1371 RETVAL->b = 1.;
1287 RETVAL->a = 1.; 1372 RETVAL->a = 1.;
1288 RETVAL->base_height = MIN_FONT_HEIGHT; 1373 RETVAL->base_height = MIN_FONT_HEIGHT;
1289 RETVAL->font = 0; 1374 RETVAL->font = 0;
1290 RETVAL->rc = rc_alloc ();
1291 1375
1292 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1376 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1293 layout_update_font (RETVAL); 1377 layout_update_font (RETVAL);
1294 OUTPUT: 1378 OUTPUT:
1295 RETVAL 1379 RETVAL
1296 1380
1297void 1381void
1298DESTROY (DC::Layout self) 1382DESTROY (DC::Layout self)
1299 CODE: 1383 CODE:
1300 g_object_unref (self->pl); 1384 g_object_unref (self->pl);
1301 rc_free (self->rc);
1302 Safefree (self); 1385 delete self;
1303 1386
1304void 1387void
1305set_text (DC::Layout self, SV *text_) 1388set_text (DC::Layout self, SV *text_)
1306 CODE: 1389 CODE:
1307{ 1390{
1433 1516
1434void 1517void
1435set_height (DC::Layout self, int base_height) 1518set_height (DC::Layout self, int base_height)
1436 CODE: 1519 CODE:
1437 if (self->base_height != base_height) 1520 if (self->base_height != base_height)
1438 { 1521 {
1439 self->base_height = base_height; 1522 self->base_height = base_height;
1440 layout_update_font (self); 1523 layout_update_font (self);
1441 } 1524 }
1442 1525
1443void 1526void
1561} 1644}
1562 1645
1563void 1646void
1564render (DC::Layout self, float x, float y, int flags = 0) 1647render (DC::Layout self, float x, float y, int flags = 0)
1565 CODE: 1648 CODE:
1566 rc_clear (self->rc); 1649 self->rc.clear ();
1567 pango_opengl_render_layout_subpixel ( 1650 pango_opengl_render_layout_subpixel (
1568 self->pl, 1651 self->pl,
1569 self->rc, 1652 &self->rc,
1570 x * PANGO_SCALE, y * PANGO_SCALE, 1653 x * PANGO_SCALE, y * PANGO_SCALE,
1571 self->r, self->g, self->b, self->a, 1654 self->r, self->g, self->b, self->a,
1572 flags 1655 flags
1573 ); 1656 );
1574 // we assume that context_change actually clears/frees stuff 1657 // we assume that context_change actually clears/frees stuff
1585 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1668 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1586 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1669 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1587 glEnable (GL_ALPHA_TEST); 1670 glEnable (GL_ALPHA_TEST);
1588 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1671 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1589 1672
1590 rc_draw (self->rc); 1673 self->rc.draw ();
1591 1674
1592 glDisable (GL_ALPHA_TEST); 1675 glDisable (GL_ALPHA_TEST);
1593 glDisable (GL_BLEND); 1676 glDisable (GL_BLEND);
1594 glDisable (GL_TEXTURE_2D); 1677 glDisable (GL_TEXTURE_2D);
1595} 1678}
1807MODULE = Deliantra::Client PACKAGE = DC::Map 1890MODULE = Deliantra::Client PACKAGE = DC::Map
1808 1891
1809PROTOTYPES: DISABLE 1892PROTOTYPES: DISABLE
1810 1893
1811DC::Map 1894DC::Map
1812new (SV *class) 1895new (SV *klass)
1813 CODE: 1896 CODE:
1814 New (0, RETVAL, 1, struct map); 1897 New (0, RETVAL, 1, mapgrid);
1815 RETVAL->x = 0; 1898 RETVAL->x = 0;
1816 RETVAL->y = 0; 1899 RETVAL->y = 0;
1817 RETVAL->w = 0; 1900 RETVAL->w = 0;
1818 RETVAL->h = 0; 1901 RETVAL->h = 0;
1819 RETVAL->ox = 0; 1902 RETVAL->ox = 0;
1856 1939
1857void 1940void
1858set_smooth (DC::Map self, int face, int smooth, int level) 1941set_smooth (DC::Map self, int face, int smooth, int level)
1859 CODE: 1942 CODE:
1860{ 1943{
1861 tileid texid; 1944 tileid texid;
1862 maptex *tex; 1945 maptex *tex;
1863 1946
1864 if (face < 0 || face >= self->faces) 1947 if (face < 0 || face >= self->faces)
1865 return; 1948 return;
1866 1949
1867 if (smooth < 0 || smooth >= self->faces) 1950 if (smooth < 0 || smooth >= self->faces)
1868 return; 1951 return;
1869 1952
1870 texid = self->face2tile [face]; 1953 texid = self->face2tile [face];
1871 1954
1872 if (!texid) 1955 if (!texid)
1873 return; 1956 return;
1874 1957
1875 tex = self->tex + texid; 1958 tex = self->tex + texid;
1908} 1991}
1909 1992
1910void 1993void
1911expire_textures (DC::Map self, int texid, int count) 1994expire_textures (DC::Map self, int texid, int count)
1912 PPCODE: 1995 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count) 1996 for (; texid < self->texs && count; ++texid, --count)
1914 { 1997 {
1915 maptex *tex = self->tex + texid; 1998 maptex *tex = self->tex + texid;
1916 1999
1917 if (tex->name) 2000 if (tex->name)
1918 { 2001 {
1965 self->ox += dx; self->x += dx; 2048 self->ox += dx; self->x += dx;
1966 self->oy += dy; self->y += dy; 2049 self->oy += dy; self->y += dy;
1967 2050
1968 while (self->y < 0) 2051 while (self->y < 0)
1969 { 2052 {
1970 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2053 prepend (self->row, self->rows, MAP_EXTEND_Y);
1971 2054
1972 self->rows += MAP_EXTEND_Y; 2055 self->rows += MAP_EXTEND_Y;
1973 self->y += MAP_EXTEND_Y; 2056 self->y += MAP_EXTEND_Y;
1974 } 2057 }
1975} 2058}
1976 2059
1977SV * 2060SV *
1978map1a_update (DC::Map self, SV *data_, int extmap) 2061map1a_update (DC::Map self, SV *data_)
1979 CODE: 2062 CODE:
1980{ 2063{
1981 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2064 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1982 uint8_t *data_end = (uint8_t *)SvEND (data_); 2065 uint8_t *data_end = (uint8_t *)SvEND (data_);
1983 mapcell *cell; 2066 mapcell *cell;
2004 2087
2005 //TODO: don't trust server data to be in-range(!) 2088 //TODO: don't trust server data to be in-range(!)
2006 2089
2007 if (flags & 8) 2090 if (flags & 8)
2008 { 2091 {
2092 uint8_t ext, cmd;
2093
2009 if (extmap) 2094 do
2010 { 2095 {
2011 uint8_t ext, cmd; 2096 ext = *data++;
2097 cmd = ext & 0x7f;
2012 2098
2013 do 2099 if (cmd < 4)
2100 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2101 else if (cmd == 5) // health
2014 { 2102 {
2015 ext = *data++;
2016 cmd = ext & 0x7f;
2017
2018 if (cmd < 4)
2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2020 else if (cmd == 5) // health
2021 {
2022 cell->stat_width = 1; 2103 cell->stat_width = 1;
2023 cell->stat_hp = *data++; 2104 cell->stat_hp = *data++;
2024 }
2025 else if (cmd == 6) // monster width
2026 cell->stat_width = *data++ + 1;
2027 else if (cmd == 0x47)
2028 {
2029 if (*data == 1) cell->player = data [1];
2030 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2031 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2032 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2033
2034 data += *data + 1;
2035 }
2036 else if (cmd == 8) // cell flags
2037 cell->flags = *data++;
2038 else if (ext & 0x40) // unknown, multibyte => skip
2039 data += *data + 1;
2040 else
2041 data++;
2042 } 2105 }
2043 while (ext & 0x80); 2106 else if (cmd == 6) // monster width
2107 cell->stat_width = *data++ + 1;
2108 else if (cmd == 0x47)
2109 {
2110 if (*data == 1) cell->player = data [1];
2111 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2112 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2113 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2114
2115 data += *data + 1;
2116 }
2117 else if (cmd == 8) // cell flags
2118 cell->flags = *data++;
2119 else if (ext & 0x40) // unknown, multibyte => skip
2120 data += *data + 1;
2121 else
2122 data++;
2044 } 2123 }
2045 else 2124 while (ext & 0x80);
2046 cell->darkness = *data++ + 1;
2047 } 2125 }
2048 2126
2049 for (z = 0; z <= 2; ++z) 2127 for (z = 0; z <= 2; ++z)
2050 if (flags & (4 >> z)) 2128 if (flags & (4 >> z))
2051 { 2129 {
2099 ? self->row + y 2177 ? self->row + y
2100 : 0; 2178 : 0;
2101 2179
2102 for (x = x0; x < x1; x++) 2180 for (x = x0; x < x1; x++)
2103 { 2181 {
2104 int r = 32, g = 32, b = 32, a = 192; 2182 unsigned int r = 32, g = 32, b = 32, a = 192;
2105 2183
2106 if (row && row->c0 <= x && x < row->c1) 2184 if (row && row->c0 <= x && x < row->c1)
2107 { 2185 {
2108 mapcell *cell = row->col + (x - row->c0); 2186 mapcell *cell = row->col + (x - row->c0);
2109 2187
2111 { 2189 {
2112 maptex tex = self->tex [cell->tile [z]]; 2190 maptex tex = self->tex [cell->tile [z]];
2113 int a0 = 255 - tex.a; 2191 int a0 = 255 - tex.a;
2114 int a1 = tex.a; 2192 int a1 = tex.a;
2115 2193
2116 r = (r * a0 + tex.r * a1) / 255; 2194 r = div255 (r * a0 + tex.r * a1);
2117 g = (g * a0 + tex.g * a1) / 255; 2195 g = div255 (g * a0 + tex.g * a1);
2118 b = (b * a0 + tex.b * a1) / 255; 2196 b = div255 (b * a0 + tex.b * a1);
2119 a = (a * a0 + tex.a * a1) / 255; 2197 a = div255 (a * a0 + tex.a * a1);
2120 } 2198 }
2121 } 2199 }
2122 2200
2123 *map++ = (r ) 2201 *map++ = (r )
2124 | (g << 8) 2202 | (g << 8)
2125 | (b << 16) 2203 | (b << 16)
2126 | (a << 24); 2204 | (a << 24);
2127 } 2205 }
2128 } 2206 }
2129 2207
2130 RETVAL = map_sv; 2208 RETVAL = map_sv;
2131} 2209}
2132 OUTPUT: 2210 OUTPUT:
2133 RETVAL 2211 RETVAL
2134 2212
2135void 2213void
2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2214draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2137 CODE: 2215 CODE:
2138{ 2216{
2139 int x, y, z; 2217 int x, y, z;
2140 2218
2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2142 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2143 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2219 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2144 smooth_key skey;
2145 int pl_x, pl_y; 2220 int pl_x, pl_y;
2146 maptex pl_tex; 2221 maptex pl_tex;
2147 rc_t *rc = rc_alloc (); 2222 rc_t rc;
2148 rc_t *rc_ov = rc_alloc (); 2223 rc_t rc_ov;
2149 rc_key_t key; 2224 rc_key_t key;
2150 rc_array_t *arr; 2225 rc_t::array_t *arr;
2151 2226
2152 pl_tex.name = 0; 2227 pl_tex.name = 0;
2153 2228
2154 // that's current max. sorry. 2229 // that's current max. sorry.
2155 if (sw > 255) sw = 255; 2230 if (sw > 255) sw = 255;
2156 if (sh > 255) sh = 255; 2231 if (sh > 255) sh = 255;
2157
2158 // clear key, in case of extra padding
2159 memset (&skey, 0, sizeof (skey));
2160 2232
2161 memset (&key, 0, sizeof (key)); 2233 memset (&key, 0, sizeof (key));
2162 key.r = 255; 2234 key.r = 255;
2163 key.g = 255; 2235 key.g = 255;
2164 key.b = 255; 2236 key.b = 255;
2170 my += self->y; 2242 my += self->y;
2171 2243
2172 // first pass: determine smooth_max 2244 // first pass: determine smooth_max
2173 // rather ugly, if you ask me 2245 // rather ugly, if you ask me
2174 // could also be stored inside mapcell and updated on change 2246 // could also be stored inside mapcell and updated on change
2175 memset (smooth_max, 0, sizeof (smooth_max)); 2247 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2176 2248
2177 for (y = 0; y < sh; y++) 2249 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2179 { 2251 {
2180 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
2195 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2267 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2268 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2197 2269
2198 for (z = 0; z <= 2; z++) 2270 for (z = 0; z <= 2; z++)
2199 { 2271 {
2200 memset (smooth_level, 0, sizeof (smooth_level)); 2272 std::bitset<256> smooth_level; // one bit for every possible smooth level
2273 smooth_key skey;
2274 smooth_hash smooth;
2201 key.texname = -1; 2275 key.texname = -1;
2202 2276
2203 for (y = 0; y < sh; y++) 2277 for (y = 0; y < sh; y++)
2204 if (0 <= y + my && y + my < self->rows) 2278 if (0 <= y + my && y + my < self->rows)
2205 { 2279 {
2222 2296
2223 if (!tex.name) 2297 if (!tex.name)
2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2298 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2225 2299
2226 key.texname = tex.name; 2300 key.texname = tex.name;
2227 arr = rc_array (rc, &key); 2301 arr = &rc.array (key);
2228 } 2302 }
2229 2303
2230 px = (x + 1) * T - tex.w; 2304 px = (x + 1) * Th - tex.w;
2231 py = (y + 1) * T - tex.h; 2305 py = (y + 1) * Tw - tex.h;
2232 2306
2233 if (expect_false (cell->player == player) && expect_false (z == 2)) 2307 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2234 { 2308 {
2235 pl_x = px; 2309 pl_x = px;
2236 pl_y = py; 2310 pl_y = py;
2237 pl_tex = tex; 2311 pl_tex = tex;
2238 continue; 2312 continue;
2239 } 2313 }
2240 2314
2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2315 arr->t2f_v3f (0 , 0 , px , py , 0);
2242 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2316 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2243 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2317 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2244 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2318 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2245 2319
2246 // update smooth hash 2320 // update smooth hash
2247 if (tex.smoothtile) 2321 if (tex.smoothtile)
2248 { 2322 {
2249 skey.tile = tex.smoothtile; 2323 skey.tile = tex.smoothtile;
2250 skey.level = tex.smoothlevel; 2324 skey.level = tex.smoothlevel;
2251 2325
2252 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2326 smooth_level[tex.smoothlevel] = 1;
2253 2327
2254 // add bits to current tile and all neighbours. skey.x|y is 2328 // add bits to current tile and all neighbours. skey.x|y is
2255 // shifted +1|+1 so we always stay positive. 2329 // shifted +1|+1 so we always stay positive.
2256 2330
2257 // bits is ___n cccc CCCC bbbb 2331 // bits is ___n cccc CCCC bbbb
2265 2339
2266 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2340 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2267 // ·· ·· ·┏ ┓· 2341 // ·· ·· ·┏ ┓·
2268 2342
2269 // full tile 2343 // full tile
2270 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2344 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2271 2345
2272 // borders 2346 // borders
2273 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2347 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2274 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2348 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2275 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2349 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2276 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2350 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2277 2351
2278 // corners 2352 // corners
2279 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2353 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2280 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2354 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2281 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2355 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2282 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2356 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2283 } 2357 }
2284 } 2358 }
2285 2359
2286 if (expect_false (z == 2) && expect_false (cell->flags)) 2360 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2287 { 2361 {
2288 // overlays such as the speech bubble, probably more to come 2362 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1) 2363 if (cell->flags & 1)
2290 { 2364 {
2291 rc_key_t key_ov = key; 2365 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH]; 2366 maptex tex = self->tex[TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32; 2367 int px = x * Tw + Tw * 2 / 32;
2295 int py = y * T - T * 6 / 32; 2368 int py = y * Th - Th * 6 / 32;
2296 2369
2297 key_ov.texname = tex.name; 2370 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov); 2371 rc_t::array_t &arr = rc_ov.array (key_ov);
2299 2372
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2373 arr.t2f_v3f (0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2374 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2375 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2376 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2304 } 2377 }
2305 } 2378 }
2306 } 2379 }
2307 } 2380 }
2308 2381
2309 rc_draw (rc); 2382 rc.draw ();
2310 rc_clear (rc); 2383 rc.clear ();
2311 2384
2312 // go through all smoothlevels, lowest to highest, then draw. 2385 // go through all smoothlevels, lowest to highest, then draw.
2313 // this is basically counting sort 2386 // this is basically counting sort
2314 { 2387 {
2315 int w, b; 2388 int w, b;
2316 2389
2317 glEnable (GL_TEXTURE_2D); 2390 glEnable (GL_TEXTURE_2D);
2318 glBegin (GL_QUADS); 2391 glBegin (GL_QUADS);
2319 for (w = 0; w < 256 / 32; ++w) 2392 for (int level = 0; level < smooth_level.size (); ++level)
2393 if (smooth_level[level])
2394 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2320 { 2395 {
2321 uint32_t smask = smooth_level [w]; 2396 smooth_key &skey = it->first;
2322 if (smask) 2397 IV bits = it->second;
2323 for (b = 0; b < 32; ++b) 2398
2324 if (smask & (((uint32_t)1) << b)) 2399 if (!(bits & 0x1000)
2400 && skey.level == level
2401 && level > smooth_max [skey.x][skey.y])
2325 { 2402 {
2326 int level = (w << 5) | b; 2403 maptex tex = self->tex [skey.tile];
2404 int px = (((int)skey.x) - 1) * Tw;
2405 int py = (((int)skey.y) - 1) * Th;
2406 int border = bits & 15;
2407 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2408 float dx = tex.s * .0625f; // 16 images/row
2409 float dy = tex.t * .5f ; // 2 images/column
2410
2327 HE *he; 2411 if (tex.name)
2328
2329 hv_iterinit (smooth);
2330 while ((he = hv_iternext (smooth)))
2331 { 2412 {
2332 smooth_key *skey = (smooth_key *)HeKEY (he); 2413 // this time avoiding texture state changes
2333 IV bits = SvIVX (HeVAL (he)); 2414 // save gobs of state changes.
2334 2415 if (key.texname != tex.name)
2335 if (!(bits & 0x1000)
2336 && skey->level == level
2337 && level > smooth_max [skey->x][skey->y])
2338 { 2416 {
2339 maptex tex = self->tex [skey->tile];
2340 int px = (((int)skey->x) - 1) * T;
2341 int py = (((int)skey->y) - 1) * T;
2342 int border = bits & 15;
2343 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2344 float dx = tex.s * .0625f; // 16 images/row
2345 float dy = tex.t * .5f ; // 2 images/column
2346
2347 if (tex.name)
2348 {
2349 // this time avoiding texture state changes
2350 // save gobs of state changes.
2351 if (key.texname != tex.name)
2352 {
2353 self->tex [skey->tile].unused = 0; 2417 self->tex [skey.tile].unused = 0;
2354 2418
2355 glEnd (); 2419 glEnd ();
2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2420 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2357 glBegin (GL_QUADS); 2421 glBegin (GL_QUADS);
2358 } 2422 }
2359 2423
2360 if (border) 2424 if (border)
2361 { 2425 {
2362 float ox = border * dx; 2426 float ox = border * dx;
2363 2427
2364 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2365 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2366 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2367 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2368 } 2432 }
2369 2433
2370 if (corner) 2434 if (corner)
2371 { 2435 {
2372 float ox = corner * dx; 2436 float ox = corner * dx;
2373 2437
2374 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2438 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2375 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2439 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2376 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2440 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2377 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2378 }
2379 }
2380 } 2442 }
2381 } 2443 }
2382 } 2444 }
2383 } 2445 }
2384 2446
2385 glEnd (); 2447 glEnd ();
2386 glDisable (GL_TEXTURE_2D); 2448 glDisable (GL_TEXTURE_2D);
2387 key.texname = -1; 2449 key.texname = -1;
2388 } 2450 }
2389
2390 hv_clear (smooth);
2391 } 2451 }
2392 2452
2393 if (pl_tex.name) 2453 if (pl_tex.name)
2394 { 2454 {
2395 maptex tex = pl_tex; 2455 maptex tex = pl_tex;
2396 int px = pl_x + sdx; 2456 int px = pl_x + sdx;
2397 int py = pl_y + sdy; 2457 int py = pl_y + sdy;
2398 2458
2399 key.texname = tex.name; 2459 key.texname = tex.name;
2400 arr = rc_array (rc, &key); 2460 rc_t::array_t &arr = rc.array (key);
2401 2461
2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2462 arr.t2f_v3f (0 , 0 , px , py , 0);
2403 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2463 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2464 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2405 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2465 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2406 2466
2407 rc_draw (rc); 2467 rc.draw ();
2408 } 2468 }
2409 2469
2410 rc_draw (rc_ov); 2470 rc_ov.draw ();
2411 rc_clear (rc_ov); 2471 rc_ov.clear ();
2412 2472
2413 glDisable (GL_BLEND); 2473 glDisable (GL_BLEND);
2414 rc_free (rc);
2415 rc_free (rc_ov);
2416 2474
2417 // top layer: overlays such as the health bar 2475 // top layer: overlays such as the health bar
2418 for (y = 0; y < sh; y++) 2476 for (y = 0; y < sh; y++)
2419 if (0 <= y + my && y + my < self->rows) 2477 if (0 <= y + my && y + my < self->rows)
2420 { 2478 {
2423 for (x = 0; x < sw; x++) 2481 for (x = 0; x < sw; x++)
2424 if (row->c0 <= x + mx && x + mx < row->c1) 2482 if (row->c0 <= x + mx && x + mx < row->c1)
2425 { 2483 {
2426 mapcell *cell = row->col + (x + mx - row->c0); 2484 mapcell *cell = row->col + (x + mx - row->c0);
2427 2485
2428 int px = x * T; 2486 int px = x * Tw;
2429 int py = y * T; 2487 int py = y * Th;
2430 2488
2431 if (expect_false (cell->player == player)) 2489 if (ecb_expect_false (cell->player == player))
2432 { 2490 {
2433 px += sdx; 2491 px += sdx;
2434 py += sdy; 2492 py += sdy;
2435 } 2493 }
2436 2494
2437 if (cell->stat_hp) 2495 if (cell->stat_hp)
2438 { 2496 {
2439 int width = cell->stat_width * T; 2497 int width = cell->stat_width * Tw;
2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2498 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2441 2499
2442 glColor3ub (0, 0, 0); 2500 glColor3ub (0, 0, 0);
2443 glRectf (px + 1, py - thick - 2, 2501 glRectf (px + 1, py - thick - 2,
2444 px + width - 1, py); 2502 px + width - 1, py);
2445 2503
2525 int x, y; 2583 int x, y;
2526 int sw1 = sw + 2; 2584 int sw1 = sw + 2;
2527 int sh1 = sh + 2; 2585 int sh1 = sh + 2;
2528 int sh3 = sh * 3; 2586 int sh3 = sh * 3;
2529 int sw3 = sw * 3; 2587 int sw3 = sw * 3;
2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2588 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2589 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2590 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2591 memset (darkness1, 0, sw1*sh1);
2533 2592
2534 SvPOK_only (darkness3_sv); 2593 SvPOK_only (darkness3_sv);
2535 SvCUR_set (darkness3_sv, sw3 * sh3); 2594 SvCUR_set (darkness3_sv, sw3 * sh3);
2536 2595
2537 mx += self->x - 1; 2596 mx += self->x - 1;
2663 else 2722 else
2664 *data++ = 0; 2723 *data++ = 0;
2665 } 2724 }
2666 } 2725 }
2667 2726
2668 /* if size is w*h + 5 then no data has been found */ 2727 /* if size is w*h + 5 then no data has been found */
2669 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2728 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2670 { 2729 {
2671 SvPOK_only (data_sv); 2730 SvPOK_only (data_sv);
2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2731 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 } 2732 }
2674 2733
2675 RETVAL = data_sv; 2734 RETVAL = data_sv;
2676} 2735}
2677 OUTPUT: 2736 OUTPUT:
2678 RETVAL 2737 RETVAL
2679 2738
2680void 2739void
2687 STRLEN len; 2746 STRLEN len;
2688 uint8_t *data, *end; 2747 uint8_t *data, *end;
2689 2748
2690 len = SvLEN (data_sv); 2749 len = SvLEN (data_sv);
2691 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2750 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692 data = SvPVbyte_nolen (data_sv); 2751 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2693 end = data + len + 8; 2752 end = data + len + 8;
2694 2753
2695 if (len < 5) 2754 if (len < 5)
2696 XSRETURN_EMPTY; 2755 XSRETURN_EMPTY;
2697 2756
2758} 2817}
2759 2818
2760MODULE = Deliantra::Client PACKAGE = DC::RW 2819MODULE = Deliantra::Client PACKAGE = DC::RW
2761 2820
2762DC::RW 2821DC::RW
2763new (SV *class, SV *data_sv) 2822new (SV *klass, SV *data_sv)
2764 CODE: 2823 CODE:
2765{ 2824{
2766 STRLEN datalen; 2825 STRLEN datalen;
2767 char *data = SvPVbyte (data_sv, datalen); 2826 char *data = SvPVbyte (data_sv, datalen);
2768 2827
2770} 2829}
2771 OUTPUT: 2830 OUTPUT:
2772 RETVAL 2831 RETVAL
2773 2832
2774DC::RW 2833DC::RW
2775new_from_file (SV *class, const char *path, const char *mode = "rb") 2834new_from_file (SV *klass, const char *path, const char *mode = "rb")
2776 CODE: 2835 CODE:
2777 RETVAL = SDL_RWFromFile (path, mode); 2836 RETVAL = SDL_RWFromFile (path, mode);
2778 OUTPUT: 2837 OUTPUT:
2779 RETVAL 2838 RETVAL
2780 2839
2798 if (RETVAL < 0) 2857 if (RETVAL < 0)
2799 { 2858 {
2800 RETVAL = Mix_GroupOldest (-1); 2859 RETVAL = Mix_GroupOldest (-1);
2801 2860
2802 if (RETVAL < 0) 2861 if (RETVAL < 0)
2862 {
2863 // happens sometimes, maybe it just stopped playing(?)
2864 RETVAL = Mix_GroupAvailable (-1);
2865
2866 if (RETVAL < 0)
2803 XSRETURN_UNDEF; 2867 XSRETURN_UNDEF;
2804 2868 }
2869 else
2805 Mix_HaltChannel (RETVAL); 2870 Mix_HaltChannel (RETVAL);
2806 } 2871 }
2807 2872
2808 Mix_UnregisterAllEffects (RETVAL); 2873 Mix_UnregisterAllEffects (RETVAL);
2809 Mix_Volume (RETVAL, 128); 2874 Mix_Volume (RETVAL, 128);
2810} 2875}
2883#else 2948#else
2884 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2949 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2885#endif 2950#endif
2886 2951
2887DC::MixChunk 2952DC::MixChunk
2888new (SV *class, DC::RW rwops) 2953new (SV *klass, DC::RW rwops)
2889 CODE: 2954 CODE:
2890 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2955 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2891 OUTPUT: 2956 OUTPUT:
2892 RETVAL 2957 RETVAL
2893 2958
2963 RETVAL = Mix_PlayingMusic (); 3028 RETVAL = Mix_PlayingMusic ();
2964 OUTPUT: 3029 OUTPUT:
2965 RETVAL 3030 RETVAL
2966 3031
2967DC::MixMusic 3032DC::MixMusic
2968new (SV *class, DC::RW rwops) 3033new (SV *klass, DC::RW rwops)
2969 CODE: 3034 CODE:
2970 RETVAL = Mix_LoadMUS_RW (rwops); 3035 RETVAL = Mix_LoadMUS_RW (rwops);
2971 OUTPUT: 3036 OUTPUT:
2972 RETVAL 3037 RETVAL
2973 3038
3110 const_iv (GL_FUNC_SUBTRACT), 3175 const_iv (GL_FUNC_SUBTRACT),
3111 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3176 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3112# undef const_iv 3177# undef const_iv
3113 }; 3178 };
3114 3179
3115 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3180 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3116 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3181 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3117 3182
3118 texture_av = newAV (); 3183 texture_av = newAV ();
3119 AvREAL_off (texture_av); 3184 AvREAL_off (texture_av);
3120} 3185}
3121 3186
3126 gl.BlendFuncSeparateEXT = 0; 3191 gl.BlendFuncSeparateEXT = 0;
3127 3192
3128void 3193void
3129apple_nvidia_bug (int enable) 3194apple_nvidia_bug (int enable)
3130 3195
3131char * 3196const char *
3132gl_vendor () 3197gl_vendor ()
3133 CODE: 3198 CODE:
3134 RETVAL = (char *)glGetString (GL_VENDOR); 3199 RETVAL = (const char *)glGetString (GL_VENDOR);
3135 OUTPUT: 3200 OUTPUT:
3136 RETVAL 3201 RETVAL
3137 3202
3138char * 3203const char *
3139gl_version () 3204gl_version ()
3140 CODE: 3205 CODE:
3141 RETVAL = (char *)glGetString (GL_VERSION); 3206 RETVAL = (const char *)glGetString (GL_VERSION);
3142 OUTPUT: 3207 OUTPUT:
3143 RETVAL 3208 RETVAL
3144 3209
3145char * 3210const char *
3146gl_extensions () 3211gl_extensions ()
3147 CODE: 3212 CODE:
3148 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3213 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3149 OUTPUT: 3214 OUTPUT:
3150 RETVAL 3215 RETVAL
3151 3216
3152const char *glGetString (GLenum pname) 3217const char *glGetString (GLenum pname)
3218 CODE:
3219 RETVAL = (const char *)glGetString (pname);
3220 OUTPUT:
3221 RETVAL
3153 3222
3154GLint glGetInteger (GLenum pname) 3223GLint glGetInteger (GLenum pname)
3155 CODE: 3224 CODE:
3156 glGetIntegerv (pname, &RETVAL); 3225 glGetIntegerv (pname, &RETVAL);
3157 OUTPUT: 3226 OUTPUT:
3164 RETVAL 3233 RETVAL
3165 3234
3166int glGetError () 3235int glGetError ()
3167 3236
3168void glFinish () 3237void glFinish ()
3238
3239void glFlush ()
3169 3240
3170void glClear (int mask) 3241void glClear (int mask)
3171 3242
3172void glClearColor (float r, float g, float b, float a = 1.0) 3243void glClearColor (float r, float g, float b, float a = 1.0)
3173 PROTOTYPE: @ 3244 PROTOTYPE: @
3358 3429
3359void 3430void
3360find_widget (SV *self, NV x, NV y) 3431find_widget (SV *self, NV x, NV y)
3361 PPCODE: 3432 PPCODE:
3362{ 3433{
3363 if (within_widget (self, x, y)) 3434 if (within_widget (self, x, y))
3364 XPUSHs (self); 3435 XPUSHs (self);
3365} 3436}
3366 3437
3367BOOT: 3438BOOT:
3368{ 3439{
3376 3447
3377void 3448void
3378draw (SV *self) 3449draw (SV *self)
3379 CODE: 3450 CODE:
3380{ 3451{
3381 HV *hv; 3452 HV *hv;
3382 SV **svp; 3453 SV **svp;
3383 NV x, y, w, h; 3454 NV x, y, w, h;
3384 SV *draw_x_sv = GvSV (draw_x_gv); 3455 SV *draw_x_sv = GvSV (draw_x_gv);
3385 SV *draw_y_sv = GvSV (draw_y_gv); 3456 SV *draw_y_sv = GvSV (draw_y_gv);
3386 SV *draw_w_sv = GvSV (draw_w_gv); 3457 SV *draw_w_sv = GvSV (draw_w_gv);
3387 SV *draw_h_sv = GvSV (draw_h_gv); 3458 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines