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.303 by root, Thu Apr 22 11:18:04 2010 UTC vs.
Revision 1.334 by root, Mon Nov 19 01:37:28 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, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> 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 ();
1042 OUTPUT: 1107 OUTPUT:
1043 RETVAL 1108 RETVAL
1044 1109
1045int 1110int
1046Mix_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)
1047 POSTCALL: 1112 POSTCALL:
1048 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1049 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1050 1115
1051void 1116void
1052Mix_QuerySpec () 1117Mix_QuerySpec ()
1111add_font (char *file) 1176add_font (char *file)
1112 CODE: 1177 CODE:
1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT: 1179 OUTPUT:
1115 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)
1116 1188
1117void 1189void
1118load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1119 ALIAS: 1191 ALIAS:
1120 load_image_file = 1 1192 load_image_file = 1
1166 1238
1167 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1168 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1169 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1170 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1171 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1172 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)));
1173 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1174 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1175 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1176 1248
1248MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1249 1321
1250PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1251 1323
1252DC::Font 1324DC::Font
1253new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1254 CODE: 1326 CODE:
1255{ 1327{
1256 int count; 1328 int count;
1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1258 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1287 PROTOTYPE: 1359 PROTOTYPE:
1288 CODE: 1360 CODE:
1289 tc_restore (); 1361 tc_restore ();
1290 1362
1291DC::Layout 1363DC::Layout
1292new (SV *class) 1364new (SV *klass)
1293 CODE: 1365 CODE:
1294 New (0, RETVAL, 1, struct cf_layout); 1366 RETVAL = new cf_layout;
1295 1367
1296 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1297 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1298 RETVAL->g = 1.; 1370 RETVAL->g = 1.;
1299 RETVAL->b = 1.; 1371 RETVAL->b = 1.;
1300 RETVAL->a = 1.; 1372 RETVAL->a = 1.;
1301 RETVAL->base_height = MIN_FONT_HEIGHT; 1373 RETVAL->base_height = MIN_FONT_HEIGHT;
1302 RETVAL->font = 0; 1374 RETVAL->font = 0;
1303 RETVAL->rc = rc_alloc ();
1304 1375
1305 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1376 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1306 layout_update_font (RETVAL); 1377 layout_update_font (RETVAL);
1307 OUTPUT: 1378 OUTPUT:
1308 RETVAL 1379 RETVAL
1309 1380
1310void 1381void
1311DESTROY (DC::Layout self) 1382DESTROY (DC::Layout self)
1312 CODE: 1383 CODE:
1313 g_object_unref (self->pl); 1384 g_object_unref (self->pl);
1314 rc_free (self->rc);
1315 Safefree (self); 1385 delete self;
1316 1386
1317void 1387void
1318set_text (DC::Layout self, SV *text_) 1388set_text (DC::Layout self, SV *text_)
1319 CODE: 1389 CODE:
1320{ 1390{
1446 1516
1447void 1517void
1448set_height (DC::Layout self, int base_height) 1518set_height (DC::Layout self, int base_height)
1449 CODE: 1519 CODE:
1450 if (self->base_height != base_height) 1520 if (self->base_height != base_height)
1451 { 1521 {
1452 self->base_height = base_height; 1522 self->base_height = base_height;
1453 layout_update_font (self); 1523 layout_update_font (self);
1454 } 1524 }
1455 1525
1456void 1526void
1574} 1644}
1575 1645
1576void 1646void
1577render (DC::Layout self, float x, float y, int flags = 0) 1647render (DC::Layout self, float x, float y, int flags = 0)
1578 CODE: 1648 CODE:
1579 rc_clear (self->rc); 1649 self->rc.clear ();
1580 pango_opengl_render_layout_subpixel ( 1650 pango_opengl_render_layout_subpixel (
1581 self->pl, 1651 self->pl,
1582 self->rc, 1652 &self->rc,
1583 x * PANGO_SCALE, y * PANGO_SCALE, 1653 x * PANGO_SCALE, y * PANGO_SCALE,
1584 self->r, self->g, self->b, self->a, 1654 self->r, self->g, self->b, self->a,
1585 flags 1655 flags
1586 ); 1656 );
1587 // we assume that context_change actually clears/frees stuff 1657 // we assume that context_change actually clears/frees stuff
1598 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1668 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1599 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1669 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1600 glEnable (GL_ALPHA_TEST); 1670 glEnable (GL_ALPHA_TEST);
1601 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1671 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1602 1672
1603 rc_draw (self->rc); 1673 self->rc.draw ();
1604 1674
1605 glDisable (GL_ALPHA_TEST); 1675 glDisable (GL_ALPHA_TEST);
1606 glDisable (GL_BLEND); 1676 glDisable (GL_BLEND);
1607 glDisable (GL_TEXTURE_2D); 1677 glDisable (GL_TEXTURE_2D);
1608} 1678}
1820MODULE = Deliantra::Client PACKAGE = DC::Map 1890MODULE = Deliantra::Client PACKAGE = DC::Map
1821 1891
1822PROTOTYPES: DISABLE 1892PROTOTYPES: DISABLE
1823 1893
1824DC::Map 1894DC::Map
1825new (SV *class) 1895new (SV *klass)
1826 CODE: 1896 CODE:
1827 New (0, RETVAL, 1, struct map); 1897 New (0, RETVAL, 1, mapgrid);
1828 RETVAL->x = 0; 1898 RETVAL->x = 0;
1829 RETVAL->y = 0; 1899 RETVAL->y = 0;
1830 RETVAL->w = 0; 1900 RETVAL->w = 0;
1831 RETVAL->h = 0; 1901 RETVAL->h = 0;
1832 RETVAL->ox = 0; 1902 RETVAL->ox = 0;
1869 1939
1870void 1940void
1871set_smooth (DC::Map self, int face, int smooth, int level) 1941set_smooth (DC::Map self, int face, int smooth, int level)
1872 CODE: 1942 CODE:
1873{ 1943{
1874 tileid texid; 1944 tileid texid;
1875 maptex *tex; 1945 maptex *tex;
1876 1946
1877 if (face < 0 || face >= self->faces) 1947 if (face < 0 || face >= self->faces)
1878 return; 1948 return;
1879 1949
1880 if (smooth < 0 || smooth >= self->faces) 1950 if (smooth < 0 || smooth >= self->faces)
1881 return; 1951 return;
1882 1952
1883 texid = self->face2tile [face]; 1953 texid = self->face2tile [face];
1884 1954
1885 if (!texid) 1955 if (!texid)
1886 return; 1956 return;
1887 1957
1888 tex = self->tex + texid; 1958 tex = self->tex + texid;
1921} 1991}
1922 1992
1923void 1993void
1924expire_textures (DC::Map self, int texid, int count) 1994expire_textures (DC::Map self, int texid, int count)
1925 PPCODE: 1995 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count) 1996 for (; texid < self->texs && count; ++texid, --count)
1927 { 1997 {
1928 maptex *tex = self->tex + texid; 1998 maptex *tex = self->tex + texid;
1929 1999
1930 if (tex->name) 2000 if (tex->name)
1931 { 2001 {
1978 self->ox += dx; self->x += dx; 2048 self->ox += dx; self->x += dx;
1979 self->oy += dy; self->y += dy; 2049 self->oy += dy; self->y += dy;
1980 2050
1981 while (self->y < 0) 2051 while (self->y < 0)
1982 { 2052 {
1983 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2053 prepend (self->row, self->rows, MAP_EXTEND_Y);
1984 2054
1985 self->rows += MAP_EXTEND_Y; 2055 self->rows += MAP_EXTEND_Y;
1986 self->y += MAP_EXTEND_Y; 2056 self->y += MAP_EXTEND_Y;
1987 } 2057 }
1988} 2058}
1989 2059
1990SV * 2060SV *
1991map1a_update (DC::Map self, SV *data_, int extmap) 2061map1a_update (DC::Map self, SV *data_)
1992 CODE: 2062 CODE:
1993{ 2063{
1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2064 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1995 uint8_t *data_end = (uint8_t *)SvEND (data_); 2065 uint8_t *data_end = (uint8_t *)SvEND (data_);
1996 mapcell *cell; 2066 mapcell *cell;
2017 2087
2018 //TODO: don't trust server data to be in-range(!) 2088 //TODO: don't trust server data to be in-range(!)
2019 2089
2020 if (flags & 8) 2090 if (flags & 8)
2021 { 2091 {
2092 uint8_t ext, cmd;
2093
2022 if (extmap) 2094 do
2023 { 2095 {
2024 uint8_t ext, cmd; 2096 ext = *data++;
2097 cmd = ext & 0x7f;
2025 2098
2026 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
2027 { 2102 {
2028 ext = *data++;
2029 cmd = ext & 0x7f;
2030
2031 if (cmd < 4)
2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2033 else if (cmd == 5) // health
2034 {
2035 cell->stat_width = 1; 2103 cell->stat_width = 1;
2036 cell->stat_hp = *data++; 2104 cell->stat_hp = *data++;
2037 }
2038 else if (cmd == 6) // monster width
2039 cell->stat_width = *data++ + 1;
2040 else if (cmd == 0x47)
2041 {
2042 if (*data == 1) cell->player = data [1];
2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2046
2047 data += *data + 1;
2048 }
2049 else if (cmd == 8) // cell flags
2050 cell->flags = *data++;
2051 else if (ext & 0x40) // unknown, multibyte => skip
2052 data += *data + 1;
2053 else
2054 data++;
2055 } 2105 }
2056 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++;
2057 } 2123 }
2058 else 2124 while (ext & 0x80);
2059 cell->darkness = *data++ + 1;
2060 } 2125 }
2061 2126
2062 for (z = 0; z <= 2; ++z) 2127 for (z = 0; z <= 2; ++z)
2063 if (flags & (4 >> z)) 2128 if (flags & (4 >> z))
2064 { 2129 {
2112 ? self->row + y 2177 ? self->row + y
2113 : 0; 2178 : 0;
2114 2179
2115 for (x = x0; x < x1; x++) 2180 for (x = x0; x < x1; x++)
2116 { 2181 {
2117 int r = 32, g = 32, b = 32, a = 192; 2182 unsigned int r = 32, g = 32, b = 32, a = 192;
2118 2183
2119 if (row && row->c0 <= x && x < row->c1) 2184 if (row && row->c0 <= x && x < row->c1)
2120 { 2185 {
2121 mapcell *cell = row->col + (x - row->c0); 2186 mapcell *cell = row->col + (x - row->c0);
2122 2187
2124 { 2189 {
2125 maptex tex = self->tex [cell->tile [z]]; 2190 maptex tex = self->tex [cell->tile [z]];
2126 int a0 = 255 - tex.a; 2191 int a0 = 255 - tex.a;
2127 int a1 = tex.a; 2192 int a1 = tex.a;
2128 2193
2129 r = (r * a0 + tex.r * a1) / 255; 2194 r = div255 (r * a0 + tex.r * a1);
2130 g = (g * a0 + tex.g * a1) / 255; 2195 g = div255 (g * a0 + tex.g * a1);
2131 b = (b * a0 + tex.b * a1) / 255; 2196 b = div255 (b * a0 + tex.b * a1);
2132 a = (a * a0 + tex.a * a1) / 255; 2197 a = div255 (a * a0 + tex.a * a1);
2133 } 2198 }
2134 } 2199 }
2135 2200
2136 *map++ = (r ) 2201 *map++ = (r )
2137 | (g << 8) 2202 | (g << 8)
2138 | (b << 16) 2203 | (b << 16)
2139 | (a << 24); 2204 | (a << 24);
2140 } 2205 }
2141 } 2206 }
2142 2207
2143 RETVAL = map_sv; 2208 RETVAL = map_sv;
2144} 2209}
2145 OUTPUT: 2210 OUTPUT:
2146 RETVAL 2211 RETVAL
2147 2212
2148void 2213void
2149draw (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)
2150 CODE: 2215 CODE:
2151{ 2216{
2152 int x, y, z; 2217 int x, y, z;
2153 2218
2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2155 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2156 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!
2157 smooth_key skey;
2158 int pl_x, pl_y; 2220 int pl_x, pl_y;
2159 maptex pl_tex; 2221 maptex pl_tex;
2160 rc_t *rc = rc_alloc (); 2222 rc_t rc;
2161 rc_t *rc_ov = rc_alloc (); 2223 rc_t rc_ov;
2162 rc_key_t key; 2224 rc_key_t key;
2163 rc_array_t *arr; 2225 rc_t::array_t *arr;
2164 2226
2165 pl_tex.name = 0; 2227 pl_tex.name = 0;
2166 2228
2167 // that's current max. sorry. 2229 // that's current max. sorry.
2168 if (sw > 255) sw = 255; 2230 if (sw > 255) sw = 255;
2169 if (sh > 255) sh = 255; 2231 if (sh > 255) sh = 255;
2170
2171 // clear key, in case of extra padding
2172 memset (&skey, 0, sizeof (skey));
2173 2232
2174 memset (&key, 0, sizeof (key)); 2233 memset (&key, 0, sizeof (key));
2175 key.r = 255; 2234 key.r = 255;
2176 key.g = 255; 2235 key.g = 255;
2177 key.b = 255; 2236 key.b = 255;
2183 my += self->y; 2242 my += self->y;
2184 2243
2185 // first pass: determine smooth_max 2244 // first pass: determine smooth_max
2186 // rather ugly, if you ask me 2245 // rather ugly, if you ask me
2187 // could also be stored inside mapcell and updated on change 2246 // could also be stored inside mapcell and updated on change
2188 memset (smooth_max, 0, sizeof (smooth_max)); 2247 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2189 2248
2190 for (y = 0; y < sh; y++) 2249 for (y = 0; y < sh; y++)
2191 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2192 { 2251 {
2193 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
2208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2267 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2268 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2210 2269
2211 for (z = 0; z <= 2; z++) 2270 for (z = 0; z <= 2; z++)
2212 { 2271 {
2213 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;
2214 key.texname = -1; 2275 key.texname = -1;
2215 2276
2216 for (y = 0; y < sh; y++) 2277 for (y = 0; y < sh; y++)
2217 if (0 <= y + my && y + my < self->rows) 2278 if (0 <= y + my && y + my < self->rows)
2218 { 2279 {
2235 2296
2236 if (!tex.name) 2297 if (!tex.name)
2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2298 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2238 2299
2239 key.texname = tex.name; 2300 key.texname = tex.name;
2240 arr = rc_array (rc, &key); 2301 arr = &rc.array (key);
2241 } 2302 }
2242 2303
2243 px = (x + 1) * T - tex.w; 2304 px = (x + 1) * Th - tex.w;
2244 py = (y + 1) * T - tex.h; 2305 py = (y + 1) * Tw - tex.h;
2245 2306
2246 if (expect_false (cell->player == player) && expect_false (z == 2)) 2307 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2247 { 2308 {
2248 pl_x = px; 2309 pl_x = px;
2249 pl_y = py; 2310 pl_y = py;
2250 pl_tex = tex; 2311 pl_tex = tex;
2251 continue; 2312 continue;
2252 } 2313 }
2253 2314
2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2315 arr->t2f_v3f (0 , 0 , px , py , 0);
2255 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2316 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2256 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);
2257 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2318 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2258 2319
2259 // update smooth hash 2320 // update smooth hash
2260 if (tex.smoothtile) 2321 if (tex.smoothtile)
2261 { 2322 {
2262 skey.tile = tex.smoothtile; 2323 skey.tile = tex.smoothtile;
2263 skey.level = tex.smoothlevel; 2324 skey.level = tex.smoothlevel;
2264 2325
2265 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2326 smooth_level[tex.smoothlevel] = 1;
2266 2327
2267 // 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
2268 // shifted +1|+1 so we always stay positive. 2329 // shifted +1|+1 so we always stay positive.
2269 2330
2270 // bits is ___n cccc CCCC bbbb 2331 // bits is ___n cccc CCCC bbbb
2278 2339
2279 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2340 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2280 // ·· ·· ·┏ ┓· 2341 // ·· ·· ·┏ ┓·
2281 2342
2282 // full tile 2343 // full tile
2283 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);
2284 2345
2285 // borders 2346 // borders
2286 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);
2287 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);
2288 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);
2289 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);
2290 2351
2291 // corners 2352 // corners
2292 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);
2293 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);
2294 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);
2295 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);
2296 } 2357 }
2297 } 2358 }
2298 2359
2299 if (expect_false (z == 2) && expect_false (cell->flags)) 2360 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2300 { 2361 {
2301 // overlays such as the speech bubble, probably more to come 2362 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1) 2363 if (cell->flags & 1)
2303 { 2364 {
2304 rc_key_t key_ov = key; 2365 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH]; 2366 maptex tex = self->tex[TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32; 2367 int px = x * Tw + Tw * 2 / 32;
2308 int py = y * T - T * 6 / 32; 2368 int py = y * Th - Th * 6 / 32;
2309 2369
2310 key_ov.texname = tex.name; 2370 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov); 2371 rc_t::array_t &arr = rc_ov.array (key_ov);
2312 2372
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2373 arr.t2f_v3f (0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2374 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2315 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);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2376 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2317 } 2377 }
2318 } 2378 }
2319 } 2379 }
2320 } 2380 }
2321 2381
2322 rc_draw (rc); 2382 rc.draw ();
2323 rc_clear (rc); 2383 rc.clear ();
2324 2384
2325 // go through all smoothlevels, lowest to highest, then draw. 2385 // go through all smoothlevels, lowest to highest, then draw.
2326 // this is basically counting sort 2386 // this is basically counting sort
2327 { 2387 {
2328 int w, b; 2388 int w, b;
2329 2389
2330 glEnable (GL_TEXTURE_2D); 2390 glEnable (GL_TEXTURE_2D);
2331 glBegin (GL_QUADS); 2391 glBegin (GL_QUADS);
2332 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)
2333 { 2395 {
2334 uint32_t smask = smooth_level [w]; 2396 smooth_key &skey = it->first;
2335 if (smask) 2397 IV bits = it->second;
2336 for (b = 0; b < 32; ++b) 2398
2337 if (smask & (((uint32_t)1) << b)) 2399 if (!(bits & 0x1000)
2400 && skey.level == level
2401 && level > smooth_max [skey.x][skey.y])
2338 { 2402 {
2339 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
2340 HE *he; 2411 if (tex.name)
2341
2342 hv_iterinit (smooth);
2343 while ((he = hv_iternext (smooth)))
2344 { 2412 {
2345 smooth_key *skey = (smooth_key *)HeKEY (he); 2413 // this time avoiding texture state changes
2346 IV bits = SvIVX (HeVAL (he)); 2414 // save gobs of state changes.
2347 2415 if (key.texname != tex.name)
2348 if (!(bits & 0x1000)
2349 && skey->level == level
2350 && level > smooth_max [skey->x][skey->y])
2351 { 2416 {
2352 maptex tex = self->tex [skey->tile];
2353 int px = (((int)skey->x) - 1) * T;
2354 int py = (((int)skey->y) - 1) * T;
2355 int border = bits & 15;
2356 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2357 float dx = tex.s * .0625f; // 16 images/row
2358 float dy = tex.t * .5f ; // 2 images/column
2359
2360 if (tex.name)
2361 {
2362 // this time avoiding texture state changes
2363 // save gobs of state changes.
2364 if (key.texname != tex.name)
2365 {
2366 self->tex [skey->tile].unused = 0; 2417 self->tex [skey.tile].unused = 0;
2367 2418
2368 glEnd (); 2419 glEnd ();
2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2420 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2370 glBegin (GL_QUADS); 2421 glBegin (GL_QUADS);
2371 } 2422 }
2372 2423
2373 if (border) 2424 if (border)
2374 { 2425 {
2375 float ox = border * dx; 2426 float ox = border * dx;
2376 2427
2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2381 } 2432 }
2382 2433
2383 if (corner) 2434 if (corner)
2384 { 2435 {
2385 float ox = corner * dx; 2436 float ox = corner * dx;
2386 2437
2387 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2438 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2439 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2440 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2391 }
2392 }
2393 } 2442 }
2394 } 2443 }
2395 } 2444 }
2396 } 2445 }
2397 2446
2398 glEnd (); 2447 glEnd ();
2399 glDisable (GL_TEXTURE_2D); 2448 glDisable (GL_TEXTURE_2D);
2400 key.texname = -1; 2449 key.texname = -1;
2401 } 2450 }
2402
2403 hv_clear (smooth);
2404 } 2451 }
2405 2452
2406 if (pl_tex.name) 2453 if (pl_tex.name)
2407 { 2454 {
2408 maptex tex = pl_tex; 2455 maptex tex = pl_tex;
2409 int px = pl_x + sdx; 2456 int px = pl_x + sdx;
2410 int py = pl_y + sdy; 2457 int py = pl_y + sdy;
2411 2458
2412 key.texname = tex.name; 2459 key.texname = tex.name;
2413 arr = rc_array (rc, &key); 2460 rc_t::array_t &arr = rc.array (key);
2414 2461
2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2462 arr.t2f_v3f (0 , 0 , px , py , 0);
2416 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2463 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2417 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);
2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2465 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2419 2466
2420 rc_draw (rc); 2467 rc.draw ();
2421 } 2468 }
2422 2469
2423 rc_draw (rc_ov); 2470 rc_ov.draw ();
2424 rc_clear (rc_ov); 2471 rc_ov.clear ();
2425 2472
2426 glDisable (GL_BLEND); 2473 glDisable (GL_BLEND);
2427 rc_free (rc);
2428 rc_free (rc_ov);
2429 2474
2430 // top layer: overlays such as the health bar 2475 // top layer: overlays such as the health bar
2431 for (y = 0; y < sh; y++) 2476 for (y = 0; y < sh; y++)
2432 if (0 <= y + my && y + my < self->rows) 2477 if (0 <= y + my && y + my < self->rows)
2433 { 2478 {
2436 for (x = 0; x < sw; x++) 2481 for (x = 0; x < sw; x++)
2437 if (row->c0 <= x + mx && x + mx < row->c1) 2482 if (row->c0 <= x + mx && x + mx < row->c1)
2438 { 2483 {
2439 mapcell *cell = row->col + (x + mx - row->c0); 2484 mapcell *cell = row->col + (x + mx - row->c0);
2440 2485
2441 int px = x * T; 2486 int px = x * Tw;
2442 int py = y * T; 2487 int py = y * Th;
2443 2488
2444 if (expect_false (cell->player == player)) 2489 if (ecb_expect_false (cell->player == player))
2445 { 2490 {
2446 px += sdx; 2491 px += sdx;
2447 py += sdy; 2492 py += sdy;
2448 } 2493 }
2449 2494
2450 if (cell->stat_hp) 2495 if (cell->stat_hp)
2451 { 2496 {
2452 int width = cell->stat_width * T; 2497 int width = cell->stat_width * Tw;
2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2498 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2454 2499
2455 glColor3ub (0, 0, 0); 2500 glColor3ub (0, 0, 0);
2456 glRectf (px + 1, py - thick - 2, 2501 glRectf (px + 1, py - thick - 2,
2457 px + width - 1, py); 2502 px + width - 1, py);
2458 2503
2538 int x, y; 2583 int x, y;
2539 int sw1 = sw + 2; 2584 int sw1 = sw + 2;
2540 int sh1 = sh + 2; 2585 int sh1 = sh + 2;
2541 int sh3 = sh * 3; 2586 int sh3 = sh * 3;
2542 int sw3 = sw * 3; 2587 int sw3 = sw * 3;
2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2588 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2545 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);
2546 2592
2547 SvPOK_only (darkness3_sv); 2593 SvPOK_only (darkness3_sv);
2548 SvCUR_set (darkness3_sv, sw3 * sh3); 2594 SvCUR_set (darkness3_sv, sw3 * sh3);
2549 2595
2550 mx += self->x - 1; 2596 mx += self->x - 1;
2676 else 2722 else
2677 *data++ = 0; 2723 *data++ = 0;
2678 } 2724 }
2679 } 2725 }
2680 2726
2681 /* 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 */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2728 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 { 2729 {
2684 SvPOK_only (data_sv); 2730 SvPOK_only (data_sv);
2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2731 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 } 2732 }
2687 2733
2688 RETVAL = data_sv; 2734 RETVAL = data_sv;
2689} 2735}
2690 OUTPUT: 2736 OUTPUT:
2691 RETVAL 2737 RETVAL
2692 2738
2693void 2739void
2700 STRLEN len; 2746 STRLEN len;
2701 uint8_t *data, *end; 2747 uint8_t *data, *end;
2702 2748
2703 len = SvLEN (data_sv); 2749 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2750 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv); 2751 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2706 end = data + len + 8; 2752 end = data + len + 8;
2707 2753
2708 if (len < 5) 2754 if (len < 5)
2709 XSRETURN_EMPTY; 2755 XSRETURN_EMPTY;
2710 2756
2771} 2817}
2772 2818
2773MODULE = Deliantra::Client PACKAGE = DC::RW 2819MODULE = Deliantra::Client PACKAGE = DC::RW
2774 2820
2775DC::RW 2821DC::RW
2776new (SV *class, SV *data_sv) 2822new (SV *klass, SV *data_sv)
2777 CODE: 2823 CODE:
2778{ 2824{
2779 STRLEN datalen; 2825 STRLEN datalen;
2780 char *data = SvPVbyte (data_sv, datalen); 2826 char *data = SvPVbyte (data_sv, datalen);
2781 2827
2783} 2829}
2784 OUTPUT: 2830 OUTPUT:
2785 RETVAL 2831 RETVAL
2786 2832
2787DC::RW 2833DC::RW
2788new_from_file (SV *class, const char *path, const char *mode = "rb") 2834new_from_file (SV *klass, const char *path, const char *mode = "rb")
2789 CODE: 2835 CODE:
2790 RETVAL = SDL_RWFromFile (path, mode); 2836 RETVAL = SDL_RWFromFile (path, mode);
2791 OUTPUT: 2837 OUTPUT:
2792 RETVAL 2838 RETVAL
2793 2839
2902#else 2948#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2949 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif 2950#endif
2905 2951
2906DC::MixChunk 2952DC::MixChunk
2907new (SV *class, DC::RW rwops) 2953new (SV *klass, DC::RW rwops)
2908 CODE: 2954 CODE:
2909 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2955 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2910 OUTPUT: 2956 OUTPUT:
2911 RETVAL 2957 RETVAL
2912 2958
2982 RETVAL = Mix_PlayingMusic (); 3028 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT: 3029 OUTPUT:
2984 RETVAL 3030 RETVAL
2985 3031
2986DC::MixMusic 3032DC::MixMusic
2987new (SV *class, DC::RW rwops) 3033new (SV *klass, DC::RW rwops)
2988 CODE: 3034 CODE:
2989 RETVAL = Mix_LoadMUS_RW (rwops); 3035 RETVAL = Mix_LoadMUS_RW (rwops);
2990 OUTPUT: 3036 OUTPUT:
2991 RETVAL 3037 RETVAL
2992 3038
3129 const_iv (GL_FUNC_SUBTRACT), 3175 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3176 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3131# undef const_iv 3177# undef const_iv
3132 }; 3178 };
3133 3179
3134 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--)
3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3181 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3136 3182
3137 texture_av = newAV (); 3183 texture_av = newAV ();
3138 AvREAL_off (texture_av); 3184 AvREAL_off (texture_av);
3139} 3185}
3140 3186
3145 gl.BlendFuncSeparateEXT = 0; 3191 gl.BlendFuncSeparateEXT = 0;
3146 3192
3147void 3193void
3148apple_nvidia_bug (int enable) 3194apple_nvidia_bug (int enable)
3149 3195
3150char * 3196const char *
3151gl_vendor () 3197gl_vendor ()
3152 CODE: 3198 CODE:
3153 RETVAL = (char *)glGetString (GL_VENDOR); 3199 RETVAL = (const char *)glGetString (GL_VENDOR);
3154 OUTPUT: 3200 OUTPUT:
3155 RETVAL 3201 RETVAL
3156 3202
3157char * 3203const char *
3158gl_version () 3204gl_version ()
3159 CODE: 3205 CODE:
3160 RETVAL = (char *)glGetString (GL_VERSION); 3206 RETVAL = (const char *)glGetString (GL_VERSION);
3161 OUTPUT: 3207 OUTPUT:
3162 RETVAL 3208 RETVAL
3163 3209
3164char * 3210const char *
3165gl_extensions () 3211gl_extensions ()
3166 CODE: 3212 CODE:
3167 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3213 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3168 OUTPUT: 3214 OUTPUT:
3169 RETVAL 3215 RETVAL
3170 3216
3171const char *glGetString (GLenum pname) 3217const char *glGetString (GLenum pname)
3218 CODE:
3219 RETVAL = (const char *)glGetString (pname);
3220 OUTPUT:
3221 RETVAL
3172 3222
3173GLint glGetInteger (GLenum pname) 3223GLint glGetInteger (GLenum pname)
3174 CODE: 3224 CODE:
3175 glGetIntegerv (pname, &RETVAL); 3225 glGetIntegerv (pname, &RETVAL);
3176 OUTPUT: 3226 OUTPUT:
3183 RETVAL 3233 RETVAL
3184 3234
3185int glGetError () 3235int glGetError ()
3186 3236
3187void glFinish () 3237void glFinish ()
3238
3239void glFlush ()
3188 3240
3189void glClear (int mask) 3241void glClear (int mask)
3190 3242
3191void glClearColor (float r, float g, float b, float a = 1.0) 3243void glClearColor (float r, float g, float b, float a = 1.0)
3192 PROTOTYPE: @ 3244 PROTOTYPE: @
3377 3429
3378void 3430void
3379find_widget (SV *self, NV x, NV y) 3431find_widget (SV *self, NV x, NV y)
3380 PPCODE: 3432 PPCODE:
3381{ 3433{
3382 if (within_widget (self, x, y)) 3434 if (within_widget (self, x, y))
3383 XPUSHs (self); 3435 XPUSHs (self);
3384} 3436}
3385 3437
3386BOOT: 3438BOOT:
3387{ 3439{
3395 3447
3396void 3448void
3397draw (SV *self) 3449draw (SV *self)
3398 CODE: 3450 CODE:
3399{ 3451{
3400 HV *hv; 3452 HV *hv;
3401 SV **svp; 3453 SV **svp;
3402 NV x, y, w, h; 3454 NV x, y, w, h;
3403 SV *draw_x_sv = GvSV (draw_x_gv); 3455 SV *draw_x_sv = GvSV (draw_x_gv);
3404 SV *draw_y_sv = GvSV (draw_y_gv); 3456 SV *draw_y_sv = GvSV (draw_y_gv);
3405 SV *draw_w_sv = GvSV (draw_w_gv); 3457 SV *draw_w_sv = GvSV (draw_w_gv);
3406 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