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.302 by root, Tue Apr 20 10:53:11 2010 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 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))
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 82
85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
86 84
87/* this is used as fow flag as well, so has to have a different value */ 85/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */ 86/* then anything that is computed by incoming darkness */
99 97
100#define KMOD_LRAM 0x10000 // our extension 98#define KMOD_LRAM 0x10000 // our extension
101 99
102#define TEXID_SPEECH 1 100#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 101#define TEXID_NOFACE 2
102
103static char *
104fast_sv_grow (SV *sv, STRLEN need)
105{
106 STRLEN len = SvLEN (sv);
107 STRLEN want = SvCUR (sv) + need;
108
109 if (ecb_expect_false (len < want))
110 {
111 do
112 len *= 2;
113 while (len < want);
114
115 sv_grow (sv, len);
116 }
117
118 SvCUR_set (sv, want);
119 return SvEND (sv) - need;
120}
104 121
105static AV *texture_av; 122static AV *texture_av;
106 123
107static struct 124static struct
108{ 125{
165{ 182{
166 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
167 184
168 while (attrs) 185 while (attrs)
169 { 186 {
170 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
171 188
172 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
173 return 1; 190 return 1;
174 191
175 attrs = attrs->next; 192 attrs = attrs->next;
176 } 193 }
177 194
178 return 0; 195 return 0;
179} 196}
180 197
181typedef struct cf_layout { 198struct cf_layout {
182 PangoLayout *pl; 199 PangoLayout *pl;
183 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
184 int base_height; 201 int base_height;
185 DC__Font font; 202 DC__Font font;
186 rc_t *rc; 203 rc_t rc;
187} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
188 207
189static DC__Font default_font; 208static DC__Font default_font;
190static PangoContext *opengl_context; 209static PangoContext *opengl_context;
191static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
192 211
193static void 212static void
194substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
195{ 214{
196 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
197#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
198 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199#endif 218#endif
200 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201} 220}
202 221
203static void 222static void
230 249
231 *w = rect.width; 250 *w = rect.width;
232 *h = rect.height; 251 *h = rect.height;
233} 252}
234 253
254/////////////////////////////////////////////////////////////////////////////
255
235typedef uint16_t tileid; 256typedef uint16_t tileid;
236typedef uint16_t faceid; 257typedef uint16_t faceid;
237 258
238typedef struct { 259struct maptex
260{
239 GLuint name; 261 GLuint name;
240 int w, h; 262 int w, h;
241 float s, t; 263 float s, t;
242 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
243 tileid smoothtile; 265 tileid smoothtile;
244 uint8_t smoothlevel; 266 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */ 267 uint8_t unused; /* set to zero on use */
246} maptex; 268};
247 269
248typedef struct { 270struct mapcell
271{
249 uint32_t player; 272 uint32_t player;
250 tileid tile[3]; 273 tileid tile[3];
251 uint16_t darkness; 274 uint16_t darkness;
252 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
253} mapcell; 276};
254 277
255typedef struct { 278struct maprow
279{
256 int32_t c0, c1; 280 int32_t c0, c1;
257 mapcell *col; 281 mapcell *col;
258} maprow; 282};
259 283
260typedef struct map { 284struct mapgrid {
261 int x, y, w, h; 285 int x, y, w, h;
262 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
263 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
264 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
265 289
266 int32_t rows; 290 int32_t rows;
267 maprow *row; 291 maprow *row;
268} *DC__Map; 292};
269 293
270static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
271prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
272{ 299{
273 char *p; 300 T *p;
274 301
275 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
276 Zero (p, inc, char); 303 Zero (p, inc, T);
277 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
278 Safefree (ptr); 305 Safefree (ptr);
279 306
280 return p; 307 ptr = p;
281} 308}
282 309
283static char * 310template<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 311static void
312append (T *&ptr, int sze, int inc)
313{
314 Renew (ptr, sze + inc, T);
315 Zero (ptr + sze, inc, T);
316}
317
318static void
296need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
297{ 320{
298 while (self->faces <= face) 321 while (self->faces <= face)
299 { 322 {
300 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
301 self->faces *= 2; 324 self->faces *= 2;
302 } 325 }
303} 326}
304 327
305static void 328static void
306need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
307{ 330{
308 while (self->texs <= texid) 331 while (self->texs <= texid)
309 { 332 {
310 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
311 self->texs *= 2; 334 self->texs *= 2;
312 } 335 }
313} 336}
314 337
315static maprow * 338static maprow *
316map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
317{ 340{
318 if (0 > y) 341 if (0 > y)
319 { 342 {
320 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
321 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
322 345
323 self->rows += extend; 346 self->rows += extend;
324 self->y += extend; 347 self->y += extend;
325 y += extend; 348 y += extend;
326 } 349 }
327 else if (y >= self->rows) 350 else if (y >= self->rows)
328 { 351 {
329 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
330 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
331 self->rows += extend; 354 self->rows += extend;
332 } 355 }
333 356
334 return self->row + y; 357 return self->row + y;
335} 358}
345 } 368 }
346 369
347 if (row->c0 > x) 370 if (row->c0 > x)
348 { 371 {
349 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
350 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
351 row->c0 -= extend; 374 row->c0 -= extend;
352 } 375 }
353 else if (x >= row->c1) 376 else if (x >= row->c1)
354 { 377 {
355 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
356 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
357 row->c1 += extend; 380 row->c1 += extend;
358 } 381 }
359 382
360 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
361} 384}
362 385
363static mapcell * 386static mapcell *
364map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
365{ 388{
366 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
367} 390}
368 391
369static void 392static void
370map_clear (DC__Map self) 393map_clear (mapgrid *self)
371{ 394{
372 int r; 395 int r;
373 396
374 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
375 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
393 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
394 (cell)->player = 0; \ 417 (cell)->player = 0; \
395 } while (0) 418 } while (0)
396 419
397static void 420static void
398map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
399{ 422{
400 int x, y; 423 int x, y;
401 maprow *row; 424 maprow *row;
402 mapcell *cell; 425 mapcell *cell;
403 426
420 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
421 } 444 }
422 } 445 }
423} 446}
424 447
425typedef struct { 448struct smooth_key
449{
426 tileid tile; 450 tileid tile;
427 uint8_t x, y, level; 451 uint8_t x, y, level;
428} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
429 471
430static void 472static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 474{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
434 476
435 if (SvIOK (*sv)) 477 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
437 else 479 else
438 sv_setiv (*sv, bits); 480 it->second |= bits;
439} 481}
440 482
441static void 483static void
442music_finished (void) 484music_finished (void)
443{ 485{
460 ev.code = 1; 502 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 504 ev.data2 = 0;
463 505
464 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
465} 514}
466 515
467static unsigned int 516static unsigned int
468minpot (unsigned int n) 517minpot (unsigned int n)
469{ 518{
479 n |= n >> 16; 528 n |= n >> 16;
480 529
481 return n + 1; 530 return n + 1;
482} 531}
483 532
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. */ 533/* SDL should provide this, really. */
496#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
497#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
498 536
499/******************************************************************************/ 537/******************************************************************************/
552 590
553 return mod; 591 return mod;
554} 592}
555 593
556static void 594static void
557deliantra_main () 595deliantra_main (SV *real_main)
558{ 596{
559 char *argv[] = { 0 }; 597 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
561} 601}
562 602
563#ifdef __MACOSX__ 603#ifdef __MACOSX__
604 static SV *real_main;
605
564 /* to due surprising braindamage on the side of SDL design, we 606 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 607 * 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, 608 * 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, 609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 610 * and which calls our main (== SDL_main) back.
569 */ 611 */
570 extern C_LINKAGE int 612 extern C_LINKAGE int
571 main (int argc, char *argv[]) 613 main (int argc, char *argv[])
572 { 614 {
573 deliantra_main (); 615 deliantra_main (real_main);
574 } 616 }
575 617
576 #undef main 618 #undef main
577 619
578 extern C_LINKAGE int main (int argc, char *argv[]); 620 extern C_LINKAGE int main (int argc, char *argv[]);
579 621
580 static void 622 static void
581 SDL_braino (void) 623 SDL_main_hack (SV *real_main_)
582 { 624 {
625 real_main = real_main_;
626
583 char *argv[] = { "deliantra client", 0 }; 627 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 628 (main) (1, argv);
585 } 629 }
586#else 630#else
587 static void 631 static void
588 SDL_braino (void) 632 SDL_main_hack (SV *real_main)
589 { 633 {
590 deliantra_main (); 634 deliantra_main (real_main);
591 } 635 }
592#endif 636#endif
593 637
594MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
595 639
796 840
797 const_iv (FOW_DARKNESS) 841 const_iv (FOW_DARKNESS)
798# undef const_iv 842# undef const_iv
799 }; 843 };
800 844
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 845 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 847
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 850}
807 851
823NV ceil (NV x) 867NV ceil (NV x)
824 868
825IV minpot (UV n) 869IV minpot (UV n)
826 870
827IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
828 876
829NV distance (NV dx, NV dy) 877NV distance (NV dx, NV dy)
830 CODE: 878 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5); 879 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT: 880 OUTPUT:
846#endif 894#endif
847} 895}
848 896
849char *SDL_GetError () 897char *SDL_GetError ()
850 898
851void SDL_braino () 899void SDL_main_hack (SV *real_main)
900 PROTOTYPE: &
852 901
853int SDL_Init (U32 flags) 902int SDL_Init (U32 flags)
854 903
855int SDL_InitSubSystem (U32 flags) 904int SDL_InitSubSystem (U32 flags)
856 905
857void SDL_QuitSubSystem (U32 flags) 906void SDL_QuitSubSystem (U32 flags)
858 907
859void SDL_Quit () 908void SDL_Quit ()
860 909
861int SDL_GL_SetAttribute (int attr, int value) 910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
862 912
863int SDL_GL_GetAttribute (int attr) 913int SDL_GL_GetAttribute (int attr)
864 CODE: 914 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 916 XSRETURN_UNDEF;
867 OUTPUT: 917 OUTPUT:
868 RETVAL 918 RETVAL
869 919
870void 920void
925 ); 975 );
926 976
927 if (RETVAL) 977 if (RETVAL)
928 { 978 {
929 av_clear (texture_av); 979 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); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 981#include "glfunc.h"
934#undef GL_FUNC 982#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938 } 985 }
939} 986}
940 OUTPUT: 987 OUTPUT:
941 RETVAL 988 RETVAL
942 989
943void 990void
991SDL_WM_SetCaption (const char *title, const char *icon)
992
993void
944SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
945 995
946char * 996char *
947SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
948 999
949int 1000int
950SDL_GetAppState () 1001SDL_GetAppState ()
951 1002
952int 1003int
953SDL_GetModState () 1004SDL_GetModState ()
954 1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
955void 1010void
1011SDL_PumpEvents ()
1012
1013void
956poll_events () 1014peep_events ()
957 PPCODE: 1015 PPCODE:
958{ 1016{
959 SDL_Event ev; 1017 SDL_Event ev;
960 1018
961 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
1027 1085
1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1086 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1029 } 1087 }
1030} 1088}
1031 1089
1090char *
1091SDL_AudioDriverName ()
1092 CODE:
1093{
1094 char buf [256];
1095 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1096 XSRETURN_UNDEF;
1097
1098 RETVAL = buf;
1099}
1100 OUTPUT:
1101 RETVAL
1102
1032int 1103int
1033Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1034 POSTCALL: 1105 POSTCALL:
1035 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
1036 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
1037 1108
1038void 1109void
1039Mix_QuerySpec () 1110Mix_QuerySpec ()
1098add_font (char *file) 1169add_font (char *file)
1099 CODE: 1170 CODE:
1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT: 1172 OUTPUT:
1102 RETVAL 1173 RETVAL
1174
1175void
1176IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1177
1178# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1179void
1180Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1103 1181
1104void 1182void
1105load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
1106 ALIAS: 1184 ALIAS:
1107 load_image_file = 1 1185 load_image_file = 1
1153 1231
1154 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
1155 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
1156 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
1157 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
1158 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 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))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1160 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1161 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1162 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
1163 1241
1235MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1236 1314
1237PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1238 1316
1239DC::Font 1317DC::Font
1240new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1241 CODE: 1319 CODE:
1242{ 1320{
1243 int count; 1321 int count;
1244 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1245 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1274 PROTOTYPE: 1352 PROTOTYPE:
1275 CODE: 1353 CODE:
1276 tc_restore (); 1354 tc_restore ();
1277 1355
1278DC::Layout 1356DC::Layout
1279new (SV *class) 1357new (SV *klass)
1280 CODE: 1358 CODE:
1281 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1282 1360
1283 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1284 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1285 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1286 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1287 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1288 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1289 RETVAL->font = 0; 1367 RETVAL->font = 0;
1290 RETVAL->rc = rc_alloc ();
1291 1368
1292 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1293 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1294 OUTPUT: 1371 OUTPUT:
1295 RETVAL 1372 RETVAL
1296 1373
1297void 1374void
1298DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1299 CODE: 1376 CODE:
1300 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1301 rc_free (self->rc);
1302 Safefree (self); 1378 delete self;
1303 1379
1304void 1380void
1305set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1306 CODE: 1382 CODE:
1307{ 1383{
1433 1509
1434void 1510void
1435set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1436 CODE: 1512 CODE:
1437 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1438 { 1514 {
1439 self->base_height = base_height; 1515 self->base_height = base_height;
1440 layout_update_font (self); 1516 layout_update_font (self);
1441 } 1517 }
1442 1518
1443void 1519void
1561} 1637}
1562 1638
1563void 1639void
1564render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1565 CODE: 1641 CODE:
1566 rc_clear (self->rc); 1642 self->rc.clear ();
1567 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1568 self->pl, 1644 self->pl,
1569 self->rc, 1645 &self->rc,
1570 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1571 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1572 flags 1648 flags
1573 ); 1649 );
1574 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1585 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1586 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1587 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1588 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1589 1665
1590 rc_draw (self->rc); 1666 self->rc.draw ();
1591 1667
1592 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1593 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1594 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1595} 1671}
1807MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1808 1884
1809PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1810 1886
1811DC::Map 1887DC::Map
1812new (SV *class) 1888new (SV *klass)
1813 CODE: 1889 CODE:
1814 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1815 RETVAL->x = 0; 1891 RETVAL->x = 0;
1816 RETVAL->y = 0; 1892 RETVAL->y = 0;
1817 RETVAL->w = 0; 1893 RETVAL->w = 0;
1818 RETVAL->h = 0; 1894 RETVAL->h = 0;
1819 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1856 1932
1857void 1933void
1858set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1859 CODE: 1935 CODE:
1860{ 1936{
1861 tileid texid; 1937 tileid texid;
1862 maptex *tex; 1938 maptex *tex;
1863 1939
1864 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1865 return; 1941 return;
1866 1942
1867 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1868 return; 1944 return;
1869 1945
1870 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1871 1947
1872 if (!texid) 1948 if (!texid)
1873 return; 1949 return;
1874 1950
1875 tex = self->tex + texid; 1951 tex = self->tex + texid;
1908} 1984}
1909 1985
1910void 1986void
1911expire_textures (DC::Map self, int texid, int count) 1987expire_textures (DC::Map self, int texid, int count)
1912 PPCODE: 1988 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count) 1989 for (; texid < self->texs && count; ++texid, --count)
1914 { 1990 {
1915 maptex *tex = self->tex + texid; 1991 maptex *tex = self->tex + texid;
1916 1992
1917 if (tex->name) 1993 if (tex->name)
1918 { 1994 {
1965 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1966 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1967 2043
1968 while (self->y < 0) 2044 while (self->y < 0)
1969 { 2045 {
1970 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1971 2047
1972 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1973 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1974 } 2050 }
1975} 2051}
1976 2052
1977SV * 2053SV *
1978map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1979 CODE: 2055 CODE:
1980{ 2056{
1981 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1982 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1983 mapcell *cell; 2059 mapcell *cell;
2004 2080
2005 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
2006 2082
2007 if (flags & 8) 2083 if (flags & 8)
2008 { 2084 {
2085 uint8_t ext, cmd;
2086
2009 if (extmap) 2087 do
2010 { 2088 {
2011 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
2012 2091
2013 do 2092 if (cmd < 4)
2093 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2094 else if (cmd == 5) // health
2014 { 2095 {
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; 2096 cell->stat_width = 1;
2023 cell->stat_hp = *data++; 2097 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 } 2098 }
2043 while (ext & 0x80); 2099 else if (cmd == 6) // monster width
2100 cell->stat_width = *data++ + 1;
2101 else if (cmd == 0x47)
2102 {
2103 if (*data == 1) cell->player = data [1];
2104 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2105 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2106 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2107
2108 data += *data + 1;
2109 }
2110 else if (cmd == 8) // cell flags
2111 cell->flags = *data++;
2112 else if (ext & 0x40) // unknown, multibyte => skip
2113 data += *data + 1;
2114 else
2115 data++;
2044 } 2116 }
2045 else 2117 while (ext & 0x80);
2046 cell->darkness = *data++ + 1;
2047 } 2118 }
2048 2119
2049 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
2050 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
2051 { 2122 {
2099 ? self->row + y 2170 ? self->row + y
2100 : 0; 2171 : 0;
2101 2172
2102 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
2103 { 2174 {
2104 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
2105 2176
2106 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
2107 { 2178 {
2108 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
2109 2180
2111 { 2182 {
2112 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
2113 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
2114 int a1 = tex.a; 2185 int a1 = tex.a;
2115 2186
2116 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
2117 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
2118 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
2119 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
2120 } 2191 }
2121 } 2192 }
2122 2193
2123 *map++ = (r ) 2194 *map++ = (r )
2124 | (g << 8) 2195 | (g << 8)
2125 | (b << 16) 2196 | (b << 16)
2126 | (a << 24); 2197 | (a << 24);
2127 } 2198 }
2128 } 2199 }
2129 2200
2130 RETVAL = map_sv; 2201 RETVAL = map_sv;
2131} 2202}
2132 OUTPUT: 2203 OUTPUT:
2133 RETVAL 2204 RETVAL
2134 2205
2135void 2206void
2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2207draw (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: 2208 CODE:
2138{ 2209{
2139 int x, y, z; 2210 int x, y, z;
2140 2211
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) 2212 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; 2213 int pl_x, pl_y;
2146 maptex pl_tex; 2214 maptex pl_tex;
2147 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2148 rc_t *rc_ov = rc_alloc (); 2216 rc_t rc_ov;
2149 rc_key_t key; 2217 rc_key_t key;
2150 rc_array_t *arr; 2218 rc_t::array_t *arr;
2151 2219
2152 pl_tex.name = 0; 2220 pl_tex.name = 0;
2153 2221
2154 // that's current max. sorry. 2222 // that's current max. sorry.
2155 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
2156 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
2157
2158 // clear key, in case of extra padding
2159 memset (&skey, 0, sizeof (skey));
2160 2225
2161 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
2162 key.r = 255; 2227 key.r = 255;
2163 key.g = 255; 2228 key.g = 255;
2164 key.b = 255; 2229 key.b = 255;
2170 my += self->y; 2235 my += self->y;
2171 2236
2172 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
2173 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
2174 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
2175 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2176 2241
2177 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
2179 { 2244 {
2180 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
2195 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2197 2262
2198 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
2199 { 2264 {
2200 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2201 key.texname = -1; 2268 key.texname = -1;
2202 2269
2203 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
2204 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
2205 { 2272 {
2222 2289
2223 if (!tex.name) 2290 if (!tex.name)
2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2225 2292
2226 key.texname = tex.name; 2293 key.texname = tex.name;
2227 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
2228 } 2295 }
2229 2296
2230 px = (x + 1) * T - tex.w; 2297 px = (x + 1) * Th - tex.w;
2231 py = (y + 1) * T - tex.h; 2298 py = (y + 1) * Tw - tex.h;
2232 2299
2233 if (expect_false (cell->player == player) && expect_false (z == 2)) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2234 { 2301 {
2235 pl_x = px; 2302 pl_x = px;
2236 pl_y = py; 2303 pl_y = py;
2237 pl_tex = tex; 2304 pl_tex = tex;
2238 continue; 2305 continue;
2239 } 2306 }
2240 2307
2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2242 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2309 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); 2310 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); 2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2245 2312
2246 // update smooth hash 2313 // update smooth hash
2247 if (tex.smoothtile) 2314 if (tex.smoothtile)
2248 { 2315 {
2249 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
2250 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
2251 2318
2252 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
2253 2320
2254 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
2255 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
2256 2323
2257 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
2265 2332
2266 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2267 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
2268 2335
2269 // full tile 2336 // full tile
2270 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2271 2338
2272 // borders 2339 // borders
2273 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 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); 2341 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); 2342 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); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2277 2344
2278 // corners 2345 // corners
2279 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 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); 2347 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); 2348 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); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2283 } 2350 }
2284 } 2351 }
2285 2352
2286 if (expect_false (z == 2) && expect_false (cell->flags)) 2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2287 { 2354 {
2288 // overlays such as the speech bubble, probably more to come 2355 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1) 2356 if (cell->flags & 1)
2290 { 2357 {
2291 rc_key_t key_ov = key; 2358 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH]; 2359 maptex tex = self->tex[TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32; 2360 int px = x * Tw + Tw * 2 / 32;
2295 int py = y * T - T * 6 / 32; 2361 int py = y * Th - Th * 6 / 32;
2296 2362
2297 key_ov.texname = tex.name; 2363 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov); 2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2299 2365
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2304 } 2370 }
2305 } 2371 }
2306 } 2372 }
2307 } 2373 }
2308 2374
2309 rc_draw (rc); 2375 rc.draw ();
2310 rc_clear (rc); 2376 rc.clear ();
2311 2377
2312 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
2313 // this is basically counting sort 2379 // this is basically counting sort
2314 { 2380 {
2315 int w, b; 2381 int w, b;
2316 2382
2317 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
2318 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
2319 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2320 { 2388 {
2321 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
2322 if (smask) 2390 IV bits = it->second;
2323 for (b = 0; b < 32; ++b) 2391
2324 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
2325 { 2395 {
2326 int level = (w << 5) | b; 2396 maptex tex = self->tex [skey.tile];
2397 int px = (((int)skey.x) - 1) * Tw;
2398 int py = (((int)skey.y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
2327 HE *he; 2404 if (tex.name)
2328
2329 hv_iterinit (smooth);
2330 while ((he = hv_iternext (smooth)))
2331 { 2405 {
2332 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
2333 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
2334 2408 if (key.texname != tex.name)
2335 if (!(bits & 0x1000)
2336 && skey->level == level
2337 && level > smooth_max [skey->x][skey->y])
2338 { 2409 {
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; 2410 self->tex [skey.tile].unused = 0;
2354 2411
2355 glEnd (); 2412 glEnd ();
2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2357 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2358 } 2415 }
2359 2416
2360 if (border) 2417 if (border)
2361 { 2418 {
2362 float ox = border * dx; 2419 float ox = border * dx;
2363 2420
2364 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2365 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2366 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2367 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2368 } 2425 }
2369 2426
2370 if (corner) 2427 if (corner)
2371 { 2428 {
2372 float ox = corner * dx; 2429 float ox = corner * dx;
2373 2430
2374 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2375 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2376 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2377 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2378 }
2379 }
2380 } 2435 }
2381 } 2436 }
2382 } 2437 }
2383 } 2438 }
2384 2439
2385 glEnd (); 2440 glEnd ();
2386 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2387 key.texname = -1; 2442 key.texname = -1;
2388 } 2443 }
2389
2390 hv_clear (smooth);
2391 } 2444 }
2392 2445
2393 if (pl_tex.name) 2446 if (pl_tex.name)
2394 { 2447 {
2395 maptex tex = pl_tex; 2448 maptex tex = pl_tex;
2396 int px = pl_x + sdx; 2449 int px = pl_x + sdx;
2397 int py = pl_y + sdy; 2450 int py = pl_y + sdy;
2398 2451
2399 key.texname = tex.name; 2452 key.texname = tex.name;
2400 arr = rc_array (rc, &key); 2453 rc_t::array_t &arr = rc.array (key);
2401 2454
2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2403 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2456 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); 2457 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); 2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2406 2459
2407 rc_draw (rc); 2460 rc.draw ();
2408 } 2461 }
2409 2462
2410 rc_draw (rc_ov); 2463 rc_ov.draw ();
2411 rc_clear (rc_ov); 2464 rc_ov.clear ();
2412 2465
2413 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2414 rc_free (rc);
2415 rc_free (rc_ov);
2416 2467
2417 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2418 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2419 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2420 { 2471 {
2423 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2424 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2425 { 2476 {
2426 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2427 2478
2428 int px = x * T; 2479 int px = x * Tw;
2429 int py = y * T; 2480 int py = y * Th;
2430 2481
2431 if (expect_false (cell->player == player)) 2482 if (ecb_expect_false (cell->player == player))
2432 { 2483 {
2433 px += sdx; 2484 px += sdx;
2434 py += sdy; 2485 py += sdy;
2435 } 2486 }
2436 2487
2437 if (cell->stat_hp) 2488 if (cell->stat_hp)
2438 { 2489 {
2439 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2441 2492
2442 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2443 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2444 px + width - 1, py); 2495 px + width - 1, py);
2445 2496
2525 int x, y; 2576 int x, y;
2526 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2527 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2528 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2529 int sw3 = sw * 3; 2580 int sw3 = sw * 3;
2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2584 memset (darkness1, 0, sw1*sh1);
2533 2585
2534 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2535 SvCUR_set (darkness3_sv, sw3 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2536 2588
2537 mx += self->x - 1; 2589 mx += self->x - 1;
2663 else 2715 else
2664 *data++ = 0; 2716 *data++ = 0;
2665 } 2717 }
2666 } 2718 }
2667 2719
2668 /* if size is w*h + 5 then no data has been found */ 2720 /* if size is w*h + 5 then no data has been found */
2669 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2670 { 2722 {
2671 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 } 2725 }
2674 2726
2675 RETVAL = data_sv; 2727 RETVAL = data_sv;
2676} 2728}
2677 OUTPUT: 2729 OUTPUT:
2678 RETVAL 2730 RETVAL
2679 2731
2680void 2732void
2687 STRLEN len; 2739 STRLEN len;
2688 uint8_t *data, *end; 2740 uint8_t *data, *end;
2689 2741
2690 len = SvLEN (data_sv); 2742 len = SvLEN (data_sv);
2691 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692 data = SvPVbyte_nolen (data_sv); 2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2693 end = data + len + 8; 2745 end = data + len + 8;
2694 2746
2695 if (len < 5) 2747 if (len < 5)
2696 XSRETURN_EMPTY; 2748 XSRETURN_EMPTY;
2697 2749
2758} 2810}
2759 2811
2760MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2761 2813
2762DC::RW 2814DC::RW
2763new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2764 CODE: 2816 CODE:
2765{ 2817{
2766 STRLEN datalen; 2818 STRLEN datalen;
2767 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2768 2820
2770} 2822}
2771 OUTPUT: 2823 OUTPUT:
2772 RETVAL 2824 RETVAL
2773 2825
2774DC::RW 2826DC::RW
2775new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2776 CODE: 2828 CODE:
2777 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2778 OUTPUT: 2830 OUTPUT:
2779 RETVAL 2831 RETVAL
2780 2832
2889#else 2941#else
2890 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2891#endif 2943#endif
2892 2944
2893DC::MixChunk 2945DC::MixChunk
2894new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2895 CODE: 2947 CODE:
2896 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2897 OUTPUT: 2949 OUTPUT:
2898 RETVAL 2950 RETVAL
2899 2951
2969 RETVAL = Mix_PlayingMusic (); 3021 RETVAL = Mix_PlayingMusic ();
2970 OUTPUT: 3022 OUTPUT:
2971 RETVAL 3023 RETVAL
2972 3024
2973DC::MixMusic 3025DC::MixMusic
2974new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2975 CODE: 3027 CODE:
2976 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2977 OUTPUT: 3029 OUTPUT:
2978 RETVAL 3030 RETVAL
2979 3031
3116 const_iv (GL_FUNC_SUBTRACT), 3168 const_iv (GL_FUNC_SUBTRACT),
3117 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3118# undef const_iv 3170# undef const_iv
3119 }; 3171 };
3120 3172
3121 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3122 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3123 3175
3124 texture_av = newAV (); 3176 texture_av = newAV ();
3125 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
3126} 3178}
3127 3179
3132 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
3133 3185
3134void 3186void
3135apple_nvidia_bug (int enable) 3187apple_nvidia_bug (int enable)
3136 3188
3137char * 3189const char *
3138gl_vendor () 3190gl_vendor ()
3139 CODE: 3191 CODE:
3140 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
3141 OUTPUT: 3193 OUTPUT:
3142 RETVAL 3194 RETVAL
3143 3195
3144char * 3196const char *
3145gl_version () 3197gl_version ()
3146 CODE: 3198 CODE:
3147 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
3148 OUTPUT: 3200 OUTPUT:
3149 RETVAL 3201 RETVAL
3150 3202
3151char * 3203const char *
3152gl_extensions () 3204gl_extensions ()
3153 CODE: 3205 CODE:
3154 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3155 OUTPUT: 3207 OUTPUT:
3156 RETVAL 3208 RETVAL
3157 3209
3158const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
3159 3215
3160GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
3161 CODE: 3217 CODE:
3162 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
3163 OUTPUT: 3219 OUTPUT:
3170 RETVAL 3226 RETVAL
3171 3227
3172int glGetError () 3228int glGetError ()
3173 3229
3174void glFinish () 3230void glFinish ()
3231
3232void glFlush ()
3175 3233
3176void glClear (int mask) 3234void glClear (int mask)
3177 3235
3178void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
3179 PROTOTYPE: @ 3237 PROTOTYPE: @
3364 3422
3365void 3423void
3366find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
3367 PPCODE: 3425 PPCODE:
3368{ 3426{
3369 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
3370 XPUSHs (self); 3428 XPUSHs (self);
3371} 3429}
3372 3430
3373BOOT: 3431BOOT:
3374{ 3432{
3382 3440
3383void 3441void
3384draw (SV *self) 3442draw (SV *self)
3385 CODE: 3443 CODE:
3386{ 3444{
3387 HV *hv; 3445 HV *hv;
3388 SV **svp; 3446 SV **svp;
3389 NV x, y, w, h; 3447 NV x, y, w, h;
3390 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
3391 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
3392 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
3393 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines