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.306 by root, Thu Oct 14 00:02:39 2010 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 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 */
106fast_sv_grow (SV *sv, STRLEN need) 104fast_sv_grow (SV *sv, STRLEN need)
107{ 105{
108 STRLEN len = SvLEN (sv); 106 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need; 107 STRLEN want = SvCUR (sv) + need;
110 108
111 if (expect_false (len < want)) 109 if (ecb_expect_false (len < want))
112 { 110 {
113 do 111 do
114 len *= 2; 112 len *= 2;
115 while (len < want); 113 while (len < want);
116 114
184{ 182{
185 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
186 184
187 while (attrs) 185 while (attrs)
188 { 186 {
189 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
190 188
191 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
192 return 1; 190 return 1;
193 191
194 attrs = attrs->next; 192 attrs = attrs->next;
195 } 193 }
196 194
197 return 0; 195 return 0;
198} 196}
199 197
200typedef struct cf_layout { 198struct cf_layout {
201 PangoLayout *pl; 199 PangoLayout *pl;
202 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
203 int base_height; 201 int base_height;
204 DC__Font font; 202 DC__Font font;
205 rc_t *rc; 203 rc_t rc;
206} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
207 207
208static DC__Font default_font; 208static DC__Font default_font;
209static PangoContext *opengl_context; 209static PangoContext *opengl_context;
210static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
211 211
212static void 212static void
213substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
214{ 214{
215 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
216#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
217 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
218#endif 218#endif
219 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
220} 220}
221 221
222static void 222static void
249 249
250 *w = rect.width; 250 *w = rect.width;
251 *h = rect.height; 251 *h = rect.height;
252} 252}
253 253
254/////////////////////////////////////////////////////////////////////////////
255
254typedef uint16_t tileid; 256typedef uint16_t tileid;
255typedef uint16_t faceid; 257typedef uint16_t faceid;
256 258
257typedef struct { 259struct maptex
260{
258 GLuint name; 261 GLuint name;
259 int w, h; 262 int w, h;
260 float s, t; 263 float s, t;
261 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
262 tileid smoothtile; 265 tileid smoothtile;
263 uint8_t smoothlevel; 266 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */ 267 uint8_t unused; /* set to zero on use */
265} maptex; 268};
266 269
267typedef struct { 270struct mapcell
271{
268 uint32_t player; 272 uint32_t player;
269 tileid tile[3]; 273 tileid tile[3];
270 uint16_t darkness; 274 uint16_t darkness;
271 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
272} mapcell; 276};
273 277
274typedef struct { 278struct maprow
279{
275 int32_t c0, c1; 280 int32_t c0, c1;
276 mapcell *col; 281 mapcell *col;
277} maprow; 282};
278 283
279typedef struct map { 284struct mapgrid {
280 int x, y, w, h; 285 int x, y, w, h;
281 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
282 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
283 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
284 289
285 int32_t rows; 290 int32_t rows;
286 maprow *row; 291 maprow *row;
287} *DC__Map; 292};
288 293
289static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
290prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
291{ 299{
292 char *p; 300 T *p;
293 301
294 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
295 Zero (p, inc, char); 303 Zero (p, inc, T);
296 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
297 Safefree (ptr); 305 Safefree (ptr);
298 306
299 return p; 307 ptr = p;
300} 308}
301 309
302static char * 310template<typename T>
303append (char *ptr, int sze, int inc)
304{
305 Renew (ptr, sze + inc, char);
306 Zero (ptr + sze, inc, char);
307
308 return ptr;
309}
310
311#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
312#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313
314static 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
315need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
316{ 320{
317 while (self->faces <= face) 321 while (self->faces <= face)
318 { 322 {
319 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
320 self->faces *= 2; 324 self->faces *= 2;
321 } 325 }
322} 326}
323 327
324static void 328static void
325need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
326{ 330{
327 while (self->texs <= texid) 331 while (self->texs <= texid)
328 { 332 {
329 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
330 self->texs *= 2; 334 self->texs *= 2;
331 } 335 }
332} 336}
333 337
334static maprow * 338static maprow *
335map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
336{ 340{
337 if (0 > y) 341 if (0 > y)
338 { 342 {
339 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
340 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
341 345
342 self->rows += extend; 346 self->rows += extend;
343 self->y += extend; 347 self->y += extend;
344 y += extend; 348 y += extend;
345 } 349 }
346 else if (y >= self->rows) 350 else if (y >= self->rows)
347 { 351 {
348 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
349 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
350 self->rows += extend; 354 self->rows += extend;
351 } 355 }
352 356
353 return self->row + y; 357 return self->row + y;
354} 358}
364 } 368 }
365 369
366 if (row->c0 > x) 370 if (row->c0 > x)
367 { 371 {
368 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
369 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
370 row->c0 -= extend; 374 row->c0 -= extend;
371 } 375 }
372 else if (x >= row->c1) 376 else if (x >= row->c1)
373 { 377 {
374 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
375 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
376 row->c1 += extend; 380 row->c1 += extend;
377 } 381 }
378 382
379 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
380} 384}
381 385
382static mapcell * 386static mapcell *
383map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
384{ 388{
385 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
386} 390}
387 391
388static void 392static void
389map_clear (DC__Map self) 393map_clear (mapgrid *self)
390{ 394{
391 int r; 395 int r;
392 396
393 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
394 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
412 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
413 (cell)->player = 0; \ 417 (cell)->player = 0; \
414 } while (0) 418 } while (0)
415 419
416static void 420static void
417map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
418{ 422{
419 int x, y; 423 int x, y;
420 maprow *row; 424 maprow *row;
421 mapcell *cell; 425 mapcell *cell;
422 426
439 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
440 } 444 }
441 } 445 }
442} 446}
443 447
444typedef struct { 448struct smooth_key
449{
445 tileid tile; 450 tileid tile;
446 uint8_t x, y, level; 451 uint8_t x, y, level;
447} 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}
448 471
449static void 472static void
450smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451{ 474{
452 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
453 476
454 if (SvIOK (*sv)) 477 if (it == h.end ())
455 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
456 else 479 else
457 sv_setiv (*sv, bits); 480 it->second |= bits;
458} 481}
459 482
460static void 483static void
461music_finished (void) 484music_finished (void)
462{ 485{
481 ev.data2 = 0; 504 ev.data2 = 0;
482 505
483 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
484} 507}
485 508
509// approximately divide by 255
486static unsigned int 510static unsigned int
487div255 (unsigned int n) 511div255 (unsigned int n)
488{ 512{
489 return (n + (n >> 8)) >> 8; 513 return (n + (n >> 8)) >> 8;
490} 514}
504 n |= n >> 16; 528 n |= n >> 16;
505 529
506 return n + 1; 530 return n + 1;
507} 531}
508 532
509static unsigned int
510popcount (unsigned int n)
511{
512 n -= (n >> 1) & 0x55555555U;
513 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
514 n = ((n >> 4) + n) & 0x0f0f0f0fU;
515 n *= 0x01010101U;
516
517 return n >> 24;
518}
519
520/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
521#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
522#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
523 536
524/******************************************************************************/ 537/******************************************************************************/
577 590
578 return mod; 591 return mod;
579} 592}
580 593
581static void 594static void
582deliantra_main () 595deliantra_main (SV *real_main)
583{ 596{
584 char *argv[] = { 0 }; 597 dSP;
585 call_argv ("::main", G_DISCARD | G_VOID, argv); 598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
586} 601}
587 602
588#ifdef __MACOSX__ 603#ifdef __MACOSX__
604 static SV *real_main;
605
589 /* to due surprising braindamage on the side of SDL design, we 606 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main() 607 * do some mind-boggling hack here: SDL requires a custom main()
591 * 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,
592 * 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,
593 * and which calls our main (== SDL_main) back. 610 * and which calls our main (== SDL_main) back.
594 */ 611 */
595 extern C_LINKAGE int 612 extern C_LINKAGE int
596 main (int argc, char *argv[]) 613 main (int argc, char *argv[])
597 { 614 {
598 deliantra_main (); 615 deliantra_main (real_main);
599 } 616 }
600 617
601 #undef main 618 #undef main
602 619
603 extern C_LINKAGE int main (int argc, char *argv[]); 620 extern C_LINKAGE int main (int argc, char *argv[]);
604 621
605 static void 622 static void
606 SDL_braino (void) 623 SDL_main_hack (SV *real_main_)
607 { 624 {
625 real_main = real_main_;
626
608 char *argv[] = { "deliantra client", 0 }; 627 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv); 628 (main) (1, argv);
610 } 629 }
611#else 630#else
612 static void 631 static void
613 SDL_braino (void) 632 SDL_main_hack (SV *real_main)
614 { 633 {
615 deliantra_main (); 634 deliantra_main (real_main);
616 } 635 }
617#endif 636#endif
618 637
619MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
620 639
821 840
822 const_iv (FOW_DARKNESS) 841 const_iv (FOW_DARKNESS)
823# undef const_iv 842# undef const_iv
824 }; 843 };
825 844
826 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--)
827 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
828 847
829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
831} 850}
832 851
847 866
848NV ceil (NV x) 867NV ceil (NV x)
849 868
850IV minpot (UV n) 869IV minpot (UV n)
851 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
852IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
853 882
854NV distance (NV dx, NV dy) 883NV distance (NV dx, NV dy)
855 CODE: 884 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5); 885 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT: 886 OUTPUT:
871#endif 900#endif
872} 901}
873 902
874char *SDL_GetError () 903char *SDL_GetError ()
875 904
876void SDL_braino () 905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
877 907
878int SDL_Init (U32 flags) 908int SDL_Init (U32 flags)
879 909
880int SDL_InitSubSystem (U32 flags) 910int SDL_InitSubSystem (U32 flags)
881 911
882void SDL_QuitSubSystem (U32 flags) 912void SDL_QuitSubSystem (U32 flags)
883 913
884void SDL_Quit () 914void SDL_Quit ()
885 915
886int SDL_GL_SetAttribute (int attr, int value) 916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
887 918
888int SDL_GL_GetAttribute (int attr) 919int SDL_GL_GetAttribute (int attr)
889 CODE: 920 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL)) 921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
891 XSRETURN_UNDEF; 922 XSRETURN_UNDEF;
892 OUTPUT: 923 OUTPUT:
893 RETVAL 924 RETVAL
894 925
895void 926void
950 ); 981 );
951 982
952 if (RETVAL) 983 if (RETVAL)
953 { 984 {
954 av_clear (texture_av); 985 av_clear (texture_av);
955
956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
958#include "glfunc.h" 987#include "glfunc.h"
959#undef GL_FUNC 988#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
963 } 991 }
964} 992}
965 OUTPUT: 993 OUTPUT:
966 RETVAL 994 RETVAL
967 995
968void 996void
997SDL_WM_SetCaption (const char *title, const char *icon)
998
999void
969SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
970 1001
971char * 1002char *
972SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
973 1005
974int 1006int
975SDL_GetAppState () 1007SDL_GetAppState ()
976 1008
977int 1009int
978SDL_GetModState () 1010SDL_GetModState ()
979 1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
980void 1016void
1017SDL_PumpEvents ()
1018
1019void
981poll_events () 1020peep_events ()
982 PPCODE: 1021 PPCODE:
983{ 1022{
984 SDL_Event ev; 1023 SDL_Event ev;
985 1024
986 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
1067 OUTPUT: 1106 OUTPUT:
1068 RETVAL 1107 RETVAL
1069 1108
1070int 1109int
1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1072 POSTCALL: 1111 POSTCALL:
1073 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
1074 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
1075 1114
1076void 1115void
1077Mix_QuerySpec () 1116Mix_QuerySpec ()
1139 OUTPUT: 1178 OUTPUT:
1140 RETVAL 1179 RETVAL
1141 1180
1142void 1181void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG) 1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1144 1187
1145void 1188void
1146load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
1147 ALIAS: 1190 ALIAS:
1148 load_image_file = 1 1191 load_image_file = 1
1194 1237
1195 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
1196 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
1197 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
1198 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
1199 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1200 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1201 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1202 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1203 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
1204 1247
1276MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1277 1320
1278PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1279 1322
1280DC::Font 1323DC::Font
1281new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1282 CODE: 1325 CODE:
1283{ 1326{
1284 int count; 1327 int count;
1285 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1286 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1315 PROTOTYPE: 1358 PROTOTYPE:
1316 CODE: 1359 CODE:
1317 tc_restore (); 1360 tc_restore ();
1318 1361
1319DC::Layout 1362DC::Layout
1320new (SV *class) 1363new (SV *klass)
1321 CODE: 1364 CODE:
1322 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1323 1366
1324 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1325 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1326 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1327 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1328 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1329 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1330 RETVAL->font = 0; 1373 RETVAL->font = 0;
1331 RETVAL->rc = rc_alloc ();
1332 1374
1333 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1334 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1335 OUTPUT: 1377 OUTPUT:
1336 RETVAL 1378 RETVAL
1337 1379
1338void 1380void
1339DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1340 CODE: 1382 CODE:
1341 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1342 rc_free (self->rc);
1343 Safefree (self); 1384 delete self;
1344 1385
1345void 1386void
1346set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1347 CODE: 1388 CODE:
1348{ 1389{
1474 1515
1475void 1516void
1476set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1477 CODE: 1518 CODE:
1478 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1479 { 1520 {
1480 self->base_height = base_height; 1521 self->base_height = base_height;
1481 layout_update_font (self); 1522 layout_update_font (self);
1482 } 1523 }
1483 1524
1484void 1525void
1602} 1643}
1603 1644
1604void 1645void
1605render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1606 CODE: 1647 CODE:
1607 rc_clear (self->rc); 1648 self->rc.clear ();
1608 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1609 self->pl, 1650 self->pl,
1610 self->rc, 1651 &self->rc,
1611 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1612 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1613 flags 1654 flags
1614 ); 1655 );
1615 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1626 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1627 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1628 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1629 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1630 1671
1631 rc_draw (self->rc); 1672 self->rc.draw ();
1632 1673
1633 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1634 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1635 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1636} 1677}
1848MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1849 1890
1850PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1851 1892
1852DC::Map 1893DC::Map
1853new (SV *class) 1894new (SV *klass)
1854 CODE: 1895 CODE:
1855 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1856 RETVAL->x = 0; 1897 RETVAL->x = 0;
1857 RETVAL->y = 0; 1898 RETVAL->y = 0;
1858 RETVAL->w = 0; 1899 RETVAL->w = 0;
1859 RETVAL->h = 0; 1900 RETVAL->h = 0;
1860 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1897 1938
1898void 1939void
1899set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1900 CODE: 1941 CODE:
1901{ 1942{
1902 tileid texid; 1943 tileid texid;
1903 maptex *tex; 1944 maptex *tex;
1904 1945
1905 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1906 return; 1947 return;
1907 1948
1908 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1909 return; 1950 return;
1910 1951
1911 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1912 1953
1913 if (!texid) 1954 if (!texid)
1914 return; 1955 return;
1915 1956
1916 tex = self->tex + texid; 1957 tex = self->tex + texid;
1949} 1990}
1950 1991
1951void 1992void
1952expire_textures (DC::Map self, int texid, int count) 1993expire_textures (DC::Map self, int texid, int count)
1953 PPCODE: 1994 PPCODE:
1954 for (; texid < self->texs && count; ++texid, --count) 1995 for (; texid < self->texs && count; ++texid, --count)
1955 { 1996 {
1956 maptex *tex = self->tex + texid; 1997 maptex *tex = self->tex + texid;
1957 1998
1958 if (tex->name) 1999 if (tex->name)
1959 { 2000 {
2006 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
2007 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
2008 2049
2009 while (self->y < 0) 2050 while (self->y < 0)
2010 { 2051 {
2011 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
2012 2053
2013 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
2014 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
2015 } 2056 }
2016} 2057}
2017 2058
2018SV * 2059SV *
2019map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
2020 CODE: 2061 CODE:
2021{ 2062{
2022 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
2023 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
2024 mapcell *cell; 2065 mapcell *cell;
2045 2086
2046 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
2047 2088
2048 if (flags & 8) 2089 if (flags & 8)
2049 { 2090 {
2091 uint8_t ext, cmd;
2092
2050 if (extmap) 2093 do
2051 { 2094 {
2052 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
2053 2097
2054 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
2055 { 2101 {
2056 ext = *data++;
2057 cmd = ext & 0x7f;
2058
2059 if (cmd < 4)
2060 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2061 else if (cmd == 5) // health
2062 {
2063 cell->stat_width = 1; 2102 cell->stat_width = 1;
2064 cell->stat_hp = *data++; 2103 cell->stat_hp = *data++;
2065 }
2066 else if (cmd == 6) // monster width
2067 cell->stat_width = *data++ + 1;
2068 else if (cmd == 0x47)
2069 {
2070 if (*data == 1) cell->player = data [1];
2071 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2072 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2073 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2074
2075 data += *data + 1;
2076 }
2077 else if (cmd == 8) // cell flags
2078 cell->flags = *data++;
2079 else if (ext & 0x40) // unknown, multibyte => skip
2080 data += *data + 1;
2081 else
2082 data++;
2083 } 2104 }
2084 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
2085 } 2122 }
2086 else 2123 while (ext & 0x80);
2087 cell->darkness = *data++ + 1;
2088 } 2124 }
2089 2125
2090 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
2091 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
2092 { 2128 {
2166 | (b << 16) 2202 | (b << 16)
2167 | (a << 24); 2203 | (a << 24);
2168 } 2204 }
2169 } 2205 }
2170 2206
2171 RETVAL = map_sv; 2207 RETVAL = map_sv;
2172} 2208}
2173 OUTPUT: 2209 OUTPUT:
2174 RETVAL 2210 RETVAL
2175 2211
2176void 2212void
2177draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2213draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2178 CODE: 2214 CODE:
2179{ 2215{
2180 int x, y, z; 2216 int x, y, z;
2181 2217
2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2183 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2184 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2185 smooth_key skey;
2186 int pl_x, pl_y; 2219 int pl_x, pl_y;
2187 maptex pl_tex; 2220 maptex pl_tex;
2188 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2189 rc_t *rc_ov = rc_alloc (); 2222 rc_t rc_ov;
2190 rc_key_t key; 2223 rc_key_t key;
2191 rc_array_t *arr; 2224 rc_t::array_t *arr;
2192 2225
2193 pl_tex.name = 0; 2226 pl_tex.name = 0;
2194 2227
2195 // that's current max. sorry. 2228 // that's current max. sorry.
2196 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
2197 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
2198
2199 // clear key, in case of extra padding
2200 memset (&skey, 0, sizeof (skey));
2201 2231
2202 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
2203 key.r = 255; 2233 key.r = 255;
2204 key.g = 255; 2234 key.g = 255;
2205 key.b = 255; 2235 key.b = 255;
2211 my += self->y; 2241 my += self->y;
2212 2242
2213 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
2214 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
2215 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
2216 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2217 2247
2218 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
2219 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
2220 { 2250 {
2221 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
2236 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2238 2268
2239 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
2240 { 2270 {
2241 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2242 key.texname = -1; 2274 key.texname = -1;
2243 2275
2244 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
2246 { 2278 {
2263 2295
2264 if (!tex.name) 2296 if (!tex.name)
2265 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2266 2298
2267 key.texname = tex.name; 2299 key.texname = tex.name;
2268 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
2269 } 2301 }
2270 2302
2271 px = (x + 1) * Th - tex.w; 2303 px = (x + 1) * Th - tex.w;
2272 py = (y + 1) * Tw - tex.h; 2304 py = (y + 1) * Tw - tex.h;
2273 2305
2274 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2275 { 2307 {
2276 pl_x = px; 2308 pl_x = px;
2277 pl_y = py; 2309 pl_y = py;
2278 pl_tex = tex; 2310 pl_tex = tex;
2279 continue; 2311 continue;
2280 } 2312 }
2281 2313
2282 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2283 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2284 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2285 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2286 2318
2287 // update smooth hash 2319 // update smooth hash
2288 if (tex.smoothtile) 2320 if (tex.smoothtile)
2289 { 2321 {
2290 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
2291 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
2292 2324
2293 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
2294 2326
2295 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
2296 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
2297 2329
2298 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
2306 2338
2307 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2308 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
2309 2341
2310 // full tile 2342 // full tile
2311 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2312 2344
2313 // borders 2345 // borders
2314 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2315 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2347 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2316 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2348 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2317 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2318 2350
2319 // corners 2351 // corners
2320 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2321 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2353 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2322 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2323 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2324 } 2356 }
2325 } 2357 }
2326 2358
2327 if (expect_false (z == 2) && expect_false (cell->flags)) 2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2328 { 2360 {
2329 // overlays such as the speech bubble, probably more to come 2361 // overlays such as the speech bubble, probably more to come
2330 if (cell->flags & 1) 2362 if (cell->flags & 1)
2331 { 2363 {
2332 rc_key_t key_ov = key; 2364 rc_key_t key_ov = key;
2333 maptex tex = self->tex [TEXID_SPEECH]; 2365 maptex tex = self->tex[TEXID_SPEECH];
2334 rc_array_t *arr;
2335 int px = x * Tw + Tw * 2 / 32; 2366 int px = x * Tw + Tw * 2 / 32;
2336 int py = y * Th - Th * 6 / 32; 2367 int py = y * Th - Th * 6 / 32;
2337 2368
2338 key_ov.texname = tex.name; 2369 key_ov.texname = tex.name;
2339 arr = rc_array (rc_ov, &key_ov); 2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2340 2371
2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2342 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2343 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2345 } 2376 }
2346 } 2377 }
2347 } 2378 }
2348 } 2379 }
2349 2380
2350 rc_draw (rc); 2381 rc.draw ();
2351 rc_clear (rc); 2382 rc.clear ();
2352 2383
2353 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2354 // this is basically counting sort 2385 // this is basically counting sort
2355 { 2386 {
2356 int w, b; 2387 int w, b;
2357 2388
2358 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2359 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2360 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2361 { 2394 {
2362 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2363 if (smask) 2396 IV bits = it->second;
2364 for (b = 0; b < 32; ++b) 2397
2365 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2366 { 2401 {
2367 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
2368 HE *he; 2410 if (tex.name)
2369
2370 hv_iterinit (smooth);
2371 while ((he = hv_iternext (smooth)))
2372 { 2411 {
2373 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
2374 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
2375 2414 if (key.texname != tex.name)
2376 if (!(bits & 0x1000)
2377 && skey->level == level
2378 && level > smooth_max [skey->x][skey->y])
2379 { 2415 {
2380 maptex tex = self->tex [skey->tile];
2381 int px = (((int)skey->x) - 1) * Tw;
2382 int py = (((int)skey->y) - 1) * Th;
2383 int border = bits & 15;
2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2385 float dx = tex.s * .0625f; // 16 images/row
2386 float dy = tex.t * .5f ; // 2 images/column
2387
2388 if (tex.name)
2389 {
2390 // this time avoiding texture state changes
2391 // save gobs of state changes.
2392 if (key.texname != tex.name)
2393 {
2394 self->tex [skey->tile].unused = 0; 2416 self->tex [skey.tile].unused = 0;
2395 2417
2396 glEnd (); 2418 glEnd ();
2397 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2398 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2399 } 2421 }
2400 2422
2401 if (border) 2423 if (border)
2402 { 2424 {
2403 float ox = border * dx; 2425 float ox = border * dx;
2404 2426
2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2409 } 2431 }
2410 2432
2411 if (corner) 2433 if (corner)
2412 { 2434 {
2413 float ox = corner * dx; 2435 float ox = corner * dx;
2414 2436
2415 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2419 }
2420 }
2421 } 2441 }
2422 } 2442 }
2423 } 2443 }
2424 } 2444 }
2425 2445
2426 glEnd (); 2446 glEnd ();
2427 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2428 key.texname = -1; 2448 key.texname = -1;
2429 } 2449 }
2430
2431 hv_clear (smooth);
2432 } 2450 }
2433 2451
2434 if (pl_tex.name) 2452 if (pl_tex.name)
2435 { 2453 {
2436 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2437 int px = pl_x + sdx; 2455 int px = pl_x + sdx;
2438 int py = pl_y + sdy; 2456 int py = pl_y + sdy;
2439 2457
2440 key.texname = tex.name; 2458 key.texname = tex.name;
2441 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2442 2460
2443 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2444 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2445 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2446 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2447 2465
2448 rc_draw (rc); 2466 rc.draw ();
2449 } 2467 }
2450 2468
2451 rc_draw (rc_ov); 2469 rc_ov.draw ();
2452 rc_clear (rc_ov); 2470 rc_ov.clear ();
2453 2471
2454 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2455 rc_free (rc);
2456 rc_free (rc_ov);
2457 2473
2458 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2459 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2460 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2461 { 2477 {
2467 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2468 2484
2469 int px = x * Tw; 2485 int px = x * Tw;
2470 int py = y * Th; 2486 int py = y * Th;
2471 2487
2472 if (expect_false (cell->player == player)) 2488 if (ecb_expect_false (cell->player == player))
2473 { 2489 {
2474 px += sdx; 2490 px += sdx;
2475 py += sdy; 2491 py += sdy;
2476 } 2492 }
2477 2493
2566 int x, y; 2582 int x, y;
2567 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2568 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2569 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2570 int sw3 = sw * 3; 2586 int sw3 = sw * 3;
2571 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2572 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2573 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2590 memset (darkness1, 0, sw1*sh1);
2574 2591
2575 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2576 SvCUR_set (darkness3_sv, sw3 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2577 2594
2578 mx += self->x - 1; 2595 mx += self->x - 1;
2704 else 2721 else
2705 *data++ = 0; 2722 *data++ = 0;
2706 } 2723 }
2707 } 2724 }
2708 2725
2709 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2710 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2711 { 2728 {
2712 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2713 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2714 } 2731 }
2715 2732
2716 RETVAL = data_sv; 2733 RETVAL = data_sv;
2717} 2734}
2718 OUTPUT: 2735 OUTPUT:
2719 RETVAL 2736 RETVAL
2720 2737
2721void 2738void
2728 STRLEN len; 2745 STRLEN len;
2729 uint8_t *data, *end; 2746 uint8_t *data, *end;
2730 2747
2731 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2732 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2733 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2734 end = data + len + 8; 2751 end = data + len + 8;
2735 2752
2736 if (len < 5) 2753 if (len < 5)
2737 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2738 2755
2799} 2816}
2800 2817
2801MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2802 2819
2803DC::RW 2820DC::RW
2804new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2805 CODE: 2822 CODE:
2806{ 2823{
2807 STRLEN datalen; 2824 STRLEN datalen;
2808 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2809 2826
2811} 2828}
2812 OUTPUT: 2829 OUTPUT:
2813 RETVAL 2830 RETVAL
2814 2831
2815DC::RW 2832DC::RW
2816new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2817 CODE: 2834 CODE:
2818 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2819 OUTPUT: 2836 OUTPUT:
2820 RETVAL 2837 RETVAL
2821 2838
2930#else 2947#else
2931 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2932#endif 2949#endif
2933 2950
2934DC::MixChunk 2951DC::MixChunk
2935new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2936 CODE: 2953 CODE:
2937 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2938 OUTPUT: 2955 OUTPUT:
2939 RETVAL 2956 RETVAL
2940 2957
3010 RETVAL = Mix_PlayingMusic (); 3027 RETVAL = Mix_PlayingMusic ();
3011 OUTPUT: 3028 OUTPUT:
3012 RETVAL 3029 RETVAL
3013 3030
3014DC::MixMusic 3031DC::MixMusic
3015new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
3016 CODE: 3033 CODE:
3017 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
3018 OUTPUT: 3035 OUTPUT:
3019 RETVAL 3036 RETVAL
3020 3037
3157 const_iv (GL_FUNC_SUBTRACT), 3174 const_iv (GL_FUNC_SUBTRACT),
3158 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3159# undef const_iv 3176# undef const_iv
3160 }; 3177 };
3161 3178
3162 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3163 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3164 3181
3165 texture_av = newAV (); 3182 texture_av = newAV ();
3166 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
3167} 3184}
3168 3185
3173 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
3174 3191
3175void 3192void
3176apple_nvidia_bug (int enable) 3193apple_nvidia_bug (int enable)
3177 3194
3178char * 3195const char *
3179gl_vendor () 3196gl_vendor ()
3180 CODE: 3197 CODE:
3181 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
3182 OUTPUT: 3199 OUTPUT:
3183 RETVAL 3200 RETVAL
3184 3201
3185char * 3202const char *
3186gl_version () 3203gl_version ()
3187 CODE: 3204 CODE:
3188 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
3189 OUTPUT: 3206 OUTPUT:
3190 RETVAL 3207 RETVAL
3191 3208
3192char * 3209const char *
3193gl_extensions () 3210gl_extensions ()
3194 CODE: 3211 CODE:
3195 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3196 OUTPUT: 3213 OUTPUT:
3197 RETVAL 3214 RETVAL
3198 3215
3199const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
3200 3221
3201GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
3202 CODE: 3223 CODE:
3203 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
3204 OUTPUT: 3225 OUTPUT:
3407 3428
3408void 3429void
3409find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3410 PPCODE: 3431 PPCODE:
3411{ 3432{
3412 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3413 XPUSHs (self); 3434 XPUSHs (self);
3414} 3435}
3415 3436
3416BOOT: 3437BOOT:
3417{ 3438{
3425 3446
3426void 3447void
3427draw (SV *self) 3448draw (SV *self)
3428 CODE: 3449 CODE:
3429{ 3450{
3430 HV *hv; 3451 HV *hv;
3431 SV **svp; 3452 SV **svp;
3432 NV x, y, w, h; 3453 NV x, y, w, h;
3433 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3434 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3435 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3436 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines