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.333 by root, Mon Nov 19 01:23:01 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines