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.308 by root, Fri Jul 29 08:35:35 2011 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
33 38
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 40
36#include <SDL.h> 41#include <SDL.h>
37#include <SDL_thread.h> 42#include <SDL_thread.h>
48#endif 53#endif
49 54
50#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
52 57
53#include <glib/gmacros.h> 58#include <glib.h>
54 59
55#include <pango/pango.h> 60#include <pango/pango.h>
56 61
57#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
71# include <netinet/in.h> 76# include <netinet/in.h>
72# include <netinet/tcp.h> 77# include <netinet/tcp.h>
73# include <inttypes.h> 78# include <inttypes.h>
74#endif 79#endif
75 80
76#if __GNUC__ >= 4 81#include "ecb.h"
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84 82
85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
86 84
87/* this is used as fow flag as well, so has to have a different value */ 85/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */ 86/* then anything that is computed by incoming darkness */
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
848NV ceil (NV x) 867NV ceil (NV x)
849 868
850IV minpot (UV n) 869IV minpot (UV n)
851 870
852IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
853 876
854NV distance (NV dx, NV dy) 877NV distance (NV dx, NV dy)
855 CODE: 878 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5); 879 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT: 880 OUTPUT:
871#endif 894#endif
872} 895}
873 896
874char *SDL_GetError () 897char *SDL_GetError ()
875 898
876void SDL_braino () 899void SDL_main_hack (SV *real_main)
900 PROTOTYPE: &
877 901
878int SDL_Init (U32 flags) 902int SDL_Init (U32 flags)
879 903
880int SDL_InitSubSystem (U32 flags) 904int SDL_InitSubSystem (U32 flags)
881 905
882void SDL_QuitSubSystem (U32 flags) 906void SDL_QuitSubSystem (U32 flags)
883 907
884void SDL_Quit () 908void SDL_Quit ()
885 909
886int SDL_GL_SetAttribute (int attr, int value) 910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
887 912
888int SDL_GL_GetAttribute (int attr) 913int SDL_GL_GetAttribute (int attr)
889 CODE: 914 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL)) 915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
891 XSRETURN_UNDEF; 916 XSRETURN_UNDEF;
892 OUTPUT: 917 OUTPUT:
893 RETVAL 918 RETVAL
894 919
895void 920void
950 ); 975 );
951 976
952 if (RETVAL) 977 if (RETVAL)
953 { 978 {
954 av_clear (texture_av); 979 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); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
958#include "glfunc.h" 981#include "glfunc.h"
959#undef GL_FUNC 982#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
963 } 985 }
964} 986}
965 OUTPUT: 987 OUTPUT:
966 RETVAL 988 RETVAL
967 989
968void 990void
991SDL_WM_SetCaption (const char *title, const char *icon)
992
993void
969SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
970 995
971char * 996char *
972SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
973 999
974int 1000int
975SDL_GetAppState () 1001SDL_GetAppState ()
976 1002
977int 1003int
978SDL_GetModState () 1004SDL_GetModState ()
979 1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
980void 1010void
1011SDL_PumpEvents ()
1012
1013void
981poll_events () 1014peep_events ()
982 PPCODE: 1015 PPCODE:
983{ 1016{
984 SDL_Event ev; 1017 SDL_Event ev;
985 1018
986 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
1067 OUTPUT: 1100 OUTPUT:
1068 RETVAL 1101 RETVAL
1069 1102
1070int 1103int
1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1072 POSTCALL: 1105 POSTCALL:
1073 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
1074 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
1075 1108
1076void 1109void
1077Mix_QuerySpec () 1110Mix_QuerySpec ()
1139 OUTPUT: 1172 OUTPUT:
1140 RETVAL 1173 RETVAL
1141 1174
1142void 1175void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG) 1176IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1177
1178# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1179void
1180Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1144 1181
1145void 1182void
1146load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
1147 ALIAS: 1184 ALIAS:
1148 load_image_file = 1 1185 load_image_file = 1
1194 1231
1195 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
1196 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
1197 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
1198 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
1199 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 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))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1201 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1202 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1203 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
1204 1241
1276MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1277 1314
1278PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1279 1316
1280DC::Font 1317DC::Font
1281new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1282 CODE: 1319 CODE:
1283{ 1320{
1284 int count; 1321 int count;
1285 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1286 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1315 PROTOTYPE: 1352 PROTOTYPE:
1316 CODE: 1353 CODE:
1317 tc_restore (); 1354 tc_restore ();
1318 1355
1319DC::Layout 1356DC::Layout
1320new (SV *class) 1357new (SV *klass)
1321 CODE: 1358 CODE:
1322 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1323 1360
1324 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1325 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1326 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1327 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1328 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1329 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1330 RETVAL->font = 0; 1367 RETVAL->font = 0;
1331 RETVAL->rc = rc_alloc ();
1332 1368
1333 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1334 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1335 OUTPUT: 1371 OUTPUT:
1336 RETVAL 1372 RETVAL
1337 1373
1338void 1374void
1339DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1340 CODE: 1376 CODE:
1341 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1342 rc_free (self->rc);
1343 Safefree (self); 1378 delete self;
1344 1379
1345void 1380void
1346set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1347 CODE: 1382 CODE:
1348{ 1383{
1474 1509
1475void 1510void
1476set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1477 CODE: 1512 CODE:
1478 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1479 { 1514 {
1480 self->base_height = base_height; 1515 self->base_height = base_height;
1481 layout_update_font (self); 1516 layout_update_font (self);
1482 } 1517 }
1483 1518
1484void 1519void
1602} 1637}
1603 1638
1604void 1639void
1605render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1606 CODE: 1641 CODE:
1607 rc_clear (self->rc); 1642 self->rc.clear ();
1608 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1609 self->pl, 1644 self->pl,
1610 self->rc, 1645 &self->rc,
1611 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1612 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1613 flags 1648 flags
1614 ); 1649 );
1615 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1626 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1627 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1628 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1629 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1630 1665
1631 rc_draw (self->rc); 1666 self->rc.draw ();
1632 1667
1633 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1634 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1635 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1636} 1671}
1848MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1849 1884
1850PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1851 1886
1852DC::Map 1887DC::Map
1853new (SV *class) 1888new (SV *klass)
1854 CODE: 1889 CODE:
1855 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1856 RETVAL->x = 0; 1891 RETVAL->x = 0;
1857 RETVAL->y = 0; 1892 RETVAL->y = 0;
1858 RETVAL->w = 0; 1893 RETVAL->w = 0;
1859 RETVAL->h = 0; 1894 RETVAL->h = 0;
1860 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1897 1932
1898void 1933void
1899set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1900 CODE: 1935 CODE:
1901{ 1936{
1902 tileid texid; 1937 tileid texid;
1903 maptex *tex; 1938 maptex *tex;
1904 1939
1905 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1906 return; 1941 return;
1907 1942
1908 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1909 return; 1944 return;
1910 1945
1911 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1912 1947
1913 if (!texid) 1948 if (!texid)
1914 return; 1949 return;
1915 1950
1916 tex = self->tex + texid; 1951 tex = self->tex + texid;
1949} 1984}
1950 1985
1951void 1986void
1952expire_textures (DC::Map self, int texid, int count) 1987expire_textures (DC::Map self, int texid, int count)
1953 PPCODE: 1988 PPCODE:
1954 for (; texid < self->texs && count; ++texid, --count) 1989 for (; texid < self->texs && count; ++texid, --count)
1955 { 1990 {
1956 maptex *tex = self->tex + texid; 1991 maptex *tex = self->tex + texid;
1957 1992
1958 if (tex->name) 1993 if (tex->name)
1959 { 1994 {
2006 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
2007 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
2008 2043
2009 while (self->y < 0) 2044 while (self->y < 0)
2010 { 2045 {
2011 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
2012 2047
2013 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
2014 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
2015 } 2050 }
2016} 2051}
2017 2052
2018SV * 2053SV *
2019map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
2020 CODE: 2055 CODE:
2021{ 2056{
2022 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
2023 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
2024 mapcell *cell; 2059 mapcell *cell;
2045 2080
2046 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
2047 2082
2048 if (flags & 8) 2083 if (flags & 8)
2049 { 2084 {
2085 uint8_t ext, cmd;
2086
2050 if (extmap) 2087 do
2051 { 2088 {
2052 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
2053 2091
2054 do 2092 if (cmd < 4)
2093 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2094 else if (cmd == 5) // health
2055 { 2095 {
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; 2096 cell->stat_width = 1;
2064 cell->stat_hp = *data++; 2097 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 } 2098 }
2084 while (ext & 0x80); 2099 else if (cmd == 6) // monster width
2100 cell->stat_width = *data++ + 1;
2101 else if (cmd == 0x47)
2102 {
2103 if (*data == 1) cell->player = data [1];
2104 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2105 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2106 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2107
2108 data += *data + 1;
2109 }
2110 else if (cmd == 8) // cell flags
2111 cell->flags = *data++;
2112 else if (ext & 0x40) // unknown, multibyte => skip
2113 data += *data + 1;
2114 else
2115 data++;
2085 } 2116 }
2086 else 2117 while (ext & 0x80);
2087 cell->darkness = *data++ + 1;
2088 } 2118 }
2089 2119
2090 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
2091 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
2092 { 2122 {
2166 | (b << 16) 2196 | (b << 16)
2167 | (a << 24); 2197 | (a << 24);
2168 } 2198 }
2169 } 2199 }
2170 2200
2171 RETVAL = map_sv; 2201 RETVAL = map_sv;
2172} 2202}
2173 OUTPUT: 2203 OUTPUT:
2174 RETVAL 2204 RETVAL
2175 2205
2176void 2206void
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) 2207draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2178 CODE: 2208 CODE:
2179{ 2209{
2180 int x, y, z; 2210 int x, y, z;
2181 2211
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) 2212 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; 2213 int pl_x, pl_y;
2187 maptex pl_tex; 2214 maptex pl_tex;
2188 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2189 rc_t *rc_ov = rc_alloc (); 2216 rc_t rc_ov;
2190 rc_key_t key; 2217 rc_key_t key;
2191 rc_array_t *arr; 2218 rc_t::array_t *arr;
2192 2219
2193 pl_tex.name = 0; 2220 pl_tex.name = 0;
2194 2221
2195 // that's current max. sorry. 2222 // that's current max. sorry.
2196 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
2197 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
2198
2199 // clear key, in case of extra padding
2200 memset (&skey, 0, sizeof (skey));
2201 2225
2202 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
2203 key.r = 255; 2227 key.r = 255;
2204 key.g = 255; 2228 key.g = 255;
2205 key.b = 255; 2229 key.b = 255;
2211 my += self->y; 2235 my += self->y;
2212 2236
2213 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
2214 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
2215 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
2216 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2217 2241
2218 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
2219 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
2220 { 2244 {
2221 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
2236 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2238 2262
2239 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
2240 { 2264 {
2241 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2242 key.texname = -1; 2268 key.texname = -1;
2243 2269
2244 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
2246 { 2272 {
2263 2289
2264 if (!tex.name) 2290 if (!tex.name)
2265 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2266 2292
2267 key.texname = tex.name; 2293 key.texname = tex.name;
2268 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
2269 } 2295 }
2270 2296
2271 px = (x + 1) * Th - tex.w; 2297 px = (x + 1) * Th - tex.w;
2272 py = (y + 1) * Tw - tex.h; 2298 py = (y + 1) * Tw - tex.h;
2273 2299
2274 if (expect_false (cell->player == player) && expect_false (z == 2)) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2275 { 2301 {
2276 pl_x = px; 2302 pl_x = px;
2277 pl_y = py; 2303 pl_y = py;
2278 pl_tex = tex; 2304 pl_tex = tex;
2279 continue; 2305 continue;
2280 } 2306 }
2281 2307
2282 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2283 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2309 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); 2310 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); 2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2286 2312
2287 // update smooth hash 2313 // update smooth hash
2288 if (tex.smoothtile) 2314 if (tex.smoothtile)
2289 { 2315 {
2290 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
2291 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
2292 2318
2293 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
2294 2320
2295 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
2296 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
2297 2323
2298 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
2306 2332
2307 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2308 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
2309 2335
2310 // full tile 2336 // full tile
2311 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2312 2338
2313 // borders 2339 // borders
2314 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2315 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2341 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2316 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2342 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2317 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2318 2344
2319 // corners 2345 // corners
2320 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2321 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2347 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2322 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2348 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2323 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2324 } 2350 }
2325 } 2351 }
2326 2352
2327 if (expect_false (z == 2) && expect_false (cell->flags)) 2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2328 { 2354 {
2329 // overlays such as the speech bubble, probably more to come 2355 // overlays such as the speech bubble, probably more to come
2330 if (cell->flags & 1) 2356 if (cell->flags & 1)
2331 { 2357 {
2332 rc_key_t key_ov = key; 2358 rc_key_t key_ov = key;
2333 maptex tex = self->tex [TEXID_SPEECH]; 2359 maptex tex = self->tex[TEXID_SPEECH];
2334 rc_array_t *arr;
2335 int px = x * Tw + Tw * 2 / 32; 2360 int px = x * Tw + Tw * 2 / 32;
2336 int py = y * Th - Th * 6 / 32; 2361 int py = y * Th - Th * 6 / 32;
2337 2362
2338 key_ov.texname = tex.name; 2363 key_ov.texname = tex.name;
2339 arr = rc_array (rc_ov, &key_ov); 2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2340 2365
2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2342 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2343 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2345 } 2370 }
2346 } 2371 }
2347 } 2372 }
2348 } 2373 }
2349 2374
2350 rc_draw (rc); 2375 rc.draw ();
2351 rc_clear (rc); 2376 rc.clear ();
2352 2377
2353 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
2354 // this is basically counting sort 2379 // this is basically counting sort
2355 { 2380 {
2356 int w, b; 2381 int w, b;
2357 2382
2358 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
2359 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
2360 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2361 { 2388 {
2362 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
2363 if (smask) 2390 IV bits = it->second;
2364 for (b = 0; b < 32; ++b) 2391
2365 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
2366 { 2395 {
2367 int level = (w << 5) | b; 2396 maptex tex = self->tex [skey.tile];
2397 int px = (((int)skey.x) - 1) * Tw;
2398 int py = (((int)skey.y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
2368 HE *he; 2404 if (tex.name)
2369
2370 hv_iterinit (smooth);
2371 while ((he = hv_iternext (smooth)))
2372 { 2405 {
2373 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
2374 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
2375 2408 if (key.texname != tex.name)
2376 if (!(bits & 0x1000)
2377 && skey->level == level
2378 && level > smooth_max [skey->x][skey->y])
2379 { 2409 {
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; 2410 self->tex [skey.tile].unused = 0;
2395 2411
2396 glEnd (); 2412 glEnd ();
2397 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2398 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2399 } 2415 }
2400 2416
2401 if (border) 2417 if (border)
2402 { 2418 {
2403 float ox = border * dx; 2419 float ox = border * dx;
2404 2420
2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2409 } 2425 }
2410 2426
2411 if (corner) 2427 if (corner)
2412 { 2428 {
2413 float ox = corner * dx; 2429 float ox = corner * dx;
2414 2430
2415 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2419 }
2420 }
2421 } 2435 }
2422 } 2436 }
2423 } 2437 }
2424 } 2438 }
2425 2439
2426 glEnd (); 2440 glEnd ();
2427 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2428 key.texname = -1; 2442 key.texname = -1;
2429 } 2443 }
2430
2431 hv_clear (smooth);
2432 } 2444 }
2433 2445
2434 if (pl_tex.name) 2446 if (pl_tex.name)
2435 { 2447 {
2436 maptex tex = pl_tex; 2448 maptex tex = pl_tex;
2437 int px = pl_x + sdx; 2449 int px = pl_x + sdx;
2438 int py = pl_y + sdy; 2450 int py = pl_y + sdy;
2439 2451
2440 key.texname = tex.name; 2452 key.texname = tex.name;
2441 arr = rc_array (rc, &key); 2453 rc_t::array_t &arr = rc.array (key);
2442 2454
2443 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2444 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2456 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); 2457 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); 2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2447 2459
2448 rc_draw (rc); 2460 rc.draw ();
2449 } 2461 }
2450 2462
2451 rc_draw (rc_ov); 2463 rc_ov.draw ();
2452 rc_clear (rc_ov); 2464 rc_ov.clear ();
2453 2465
2454 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2455 rc_free (rc);
2456 rc_free (rc_ov);
2457 2467
2458 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2459 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2460 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2461 { 2471 {
2467 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2468 2478
2469 int px = x * Tw; 2479 int px = x * Tw;
2470 int py = y * Th; 2480 int py = y * Th;
2471 2481
2472 if (expect_false (cell->player == player)) 2482 if (ecb_expect_false (cell->player == player))
2473 { 2483 {
2474 px += sdx; 2484 px += sdx;
2475 py += sdy; 2485 py += sdy;
2476 } 2486 }
2477 2487
2705 else 2715 else
2706 *data++ = 0; 2716 *data++ = 0;
2707 } 2717 }
2708 } 2718 }
2709 2719
2710 /* if size is w*h + 5 then no data has been found */ 2720 /* if size is w*h + 5 then no data has been found */
2711 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2712 { 2722 {
2713 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2714 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2715 } 2725 }
2716 2726
2717 RETVAL = data_sv; 2727 RETVAL = data_sv;
2718} 2728}
2719 OUTPUT: 2729 OUTPUT:
2720 RETVAL 2730 RETVAL
2721 2731
2722void 2732void
2729 STRLEN len; 2739 STRLEN len;
2730 uint8_t *data, *end; 2740 uint8_t *data, *end;
2731 2741
2732 len = SvLEN (data_sv); 2742 len = SvLEN (data_sv);
2733 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2734 data = SvPVbyte_nolen (data_sv); 2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2735 end = data + len + 8; 2745 end = data + len + 8;
2736 2746
2737 if (len < 5) 2747 if (len < 5)
2738 XSRETURN_EMPTY; 2748 XSRETURN_EMPTY;
2739 2749
2800} 2810}
2801 2811
2802MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2803 2813
2804DC::RW 2814DC::RW
2805new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2806 CODE: 2816 CODE:
2807{ 2817{
2808 STRLEN datalen; 2818 STRLEN datalen;
2809 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2810 2820
2812} 2822}
2813 OUTPUT: 2823 OUTPUT:
2814 RETVAL 2824 RETVAL
2815 2825
2816DC::RW 2826DC::RW
2817new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2818 CODE: 2828 CODE:
2819 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2820 OUTPUT: 2830 OUTPUT:
2821 RETVAL 2831 RETVAL
2822 2832
2931#else 2941#else
2932 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2933#endif 2943#endif
2934 2944
2935DC::MixChunk 2945DC::MixChunk
2936new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2937 CODE: 2947 CODE:
2938 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2939 OUTPUT: 2949 OUTPUT:
2940 RETVAL 2950 RETVAL
2941 2951
3011 RETVAL = Mix_PlayingMusic (); 3021 RETVAL = Mix_PlayingMusic ();
3012 OUTPUT: 3022 OUTPUT:
3013 RETVAL 3023 RETVAL
3014 3024
3015DC::MixMusic 3025DC::MixMusic
3016new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
3017 CODE: 3027 CODE:
3018 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
3019 OUTPUT: 3029 OUTPUT:
3020 RETVAL 3030 RETVAL
3021 3031
3174 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
3175 3185
3176void 3186void
3177apple_nvidia_bug (int enable) 3187apple_nvidia_bug (int enable)
3178 3188
3179char * 3189const char *
3180gl_vendor () 3190gl_vendor ()
3181 CODE: 3191 CODE:
3182 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
3183 OUTPUT: 3193 OUTPUT:
3184 RETVAL 3194 RETVAL
3185 3195
3186char * 3196const char *
3187gl_version () 3197gl_version ()
3188 CODE: 3198 CODE:
3189 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
3190 OUTPUT: 3200 OUTPUT:
3191 RETVAL 3201 RETVAL
3192 3202
3193char * 3203const char *
3194gl_extensions () 3204gl_extensions ()
3195 CODE: 3205 CODE:
3196 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3197 OUTPUT: 3207 OUTPUT:
3198 RETVAL 3208 RETVAL
3199 3209
3200const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
3201 3215
3202GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
3203 CODE: 3217 CODE:
3204 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
3205 OUTPUT: 3219 OUTPUT:
3408 3422
3409void 3423void
3410find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
3411 PPCODE: 3425 PPCODE:
3412{ 3426{
3413 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
3414 XPUSHs (self); 3428 XPUSHs (self);
3415} 3429}
3416 3430
3417BOOT: 3431BOOT:
3418{ 3432{
3426 3440
3427void 3441void
3428draw (SV *self) 3442draw (SV *self)
3429 CODE: 3443 CODE:
3430{ 3444{
3431 HV *hv; 3445 HV *hv;
3432 SV **svp; 3446 SV **svp;
3433 NV x, y, w, h; 3447 NV x, y, w, h;
3434 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
3435 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
3436 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
3437 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines