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.311 by root, Tue Dec 27 09:17:27 2011 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 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
184{ 189{
185 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
186 191
187 while (attrs) 192 while (attrs)
188 { 193 {
189 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
190 195
191 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
192 return 1; 197 return 1;
193 198
194 attrs = attrs->next; 199 attrs = attrs->next;
195 } 200 }
196 201
197 return 0; 202 return 0;
198} 203}
199 204
200typedef struct cf_layout { 205struct cf_layout {
201 PangoLayout *pl; 206 PangoLayout *pl;
202 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
203 int base_height; 208 int base_height;
204 DC__Font font; 209 DC__Font font;
205 rc_t *rc; 210 rc_t *rc;
206} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
207 214
208static DC__Font default_font; 215static DC__Font default_font;
209static PangoContext *opengl_context; 216static PangoContext *opengl_context;
210static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
211 218
212static void 219static void
213substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
214{ 221{
215 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
216#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
217 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
218#endif 225#endif
219 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
220} 227}
221 228
222static void 229static void
252} 259}
253 260
254typedef uint16_t tileid; 261typedef uint16_t tileid;
255typedef uint16_t faceid; 262typedef uint16_t faceid;
256 263
257typedef struct { 264struct maptex
265{
258 GLuint name; 266 GLuint name;
259 int w, h; 267 int w, h;
260 float s, t; 268 float s, t;
261 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
262 tileid smoothtile; 270 tileid smoothtile;
263 uint8_t smoothlevel; 271 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
265} maptex; 273};
266 274
267typedef struct { 275struct mapcell
276{
268 uint32_t player; 277 uint32_t player;
269 tileid tile[3]; 278 tileid tile[3];
270 uint16_t darkness; 279 uint16_t darkness;
271 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
272} mapcell; 281};
273 282
274typedef struct { 283struct maprow
284{
275 int32_t c0, c1; 285 int32_t c0, c1;
276 mapcell *col; 286 mapcell *col;
277} maprow; 287};
278 288
279typedef struct map { 289struct mapgrid {
280 int x, y, w, h; 290 int x, y, w, h;
281 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
282 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
283 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
284 294
285 int32_t rows; 295 int32_t rows;
286 maprow *row; 296 maprow *row;
287} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
288 300
289static char * 301static char *
290prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
291{ 303{
292 char *p; 304 char *p;
310 322
311#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#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)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313 325
314static void 326static void
315need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
316{ 328{
317 while (self->faces <= face) 329 while (self->faces <= face)
318 { 330 {
319 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
320 self->faces *= 2; 332 self->faces *= 2;
321 } 333 }
322} 334}
323 335
324static void 336static void
325need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
326{ 338{
327 while (self->texs <= texid) 339 while (self->texs <= texid)
328 { 340 {
329 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
330 self->texs *= 2; 342 self->texs *= 2;
331 } 343 }
332} 344}
333 345
334static maprow * 346static maprow *
335map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
336{ 348{
337 if (0 > y) 349 if (0 > y)
338 { 350 {
339 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
340 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
378 390
379 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
380} 392}
381 393
382static mapcell * 394static mapcell *
383map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
384{ 396{
385 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
386} 398}
387 399
388static void 400static void
389map_clear (DC__Map self) 401map_clear (mapgrid *self)
390{ 402{
391 int r; 403 int r;
392 404
393 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
394 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
412 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
413 (cell)->player = 0; \ 425 (cell)->player = 0; \
414 } while (0) 426 } while (0)
415 427
416static void 428static void
417map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
418{ 430{
419 int x, y; 431 int x, y;
420 maprow *row; 432 maprow *row;
421 mapcell *cell; 433 mapcell *cell;
422 434
439 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
440 } 452 }
441 } 453 }
442} 454}
443 455
444typedef struct { 456struct smooth_key
457{
445 tileid tile; 458 tileid tile;
446 uint8_t x, y, level; 459 uint8_t x, y, level;
447} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
448 479
449static void 480static void
450smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451{ 482{
452 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
453 484
454 if (SvIOK (*sv)) 485 if (it == h.end ())
455 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
456 else 487 else
457 sv_setiv (*sv, bits); 488 it->second |= bits;
458} 489}
459 490
460static void 491static void
461music_finished (void) 492music_finished (void)
462{ 493{
481 ev.data2 = 0; 512 ev.data2 = 0;
482 513
483 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
484} 515}
485 516
517// approximately divide by 255
486static unsigned int 518static unsigned int
487div255 (unsigned int n) 519div255 (unsigned int n)
488{ 520{
489 return (n + (n >> 8)) >> 8; 521 return (n + (n >> 8)) >> 8;
490} 522}
577 609
578 return mod; 610 return mod;
579} 611}
580 612
581static void 613static void
582deliantra_main () 614deliantra_main (SV *real_main)
583{ 615{
584 char *argv[] = { 0 }; 616 dSP;
585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
586} 620}
587 621
588#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
589 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main() 626 * 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, 627 * on OS X, so... we provide one and call the original main(), which,
592 * due to shared library magic, calls -lSDLmain's main, not perl's main, 628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
594 */ 630 */
595 extern C_LINKAGE int 631 extern C_LINKAGE int
596 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
597 { 633 {
598 deliantra_main (); 634 deliantra_main (real_main);
599 } 635 }
600 636
601 #undef main 637 #undef main
602 638
603 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
604 640
605 static void 641 static void
606 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
607 { 643 {
644 real_main = real_main_;
645
608 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv); 647 (main) (1, argv);
610 } 648 }
611#else 649#else
612 static void 650 static void
613 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
614 { 652 {
615 deliantra_main (); 653 deliantra_main (real_main);
616 } 654 }
617#endif 655#endif
618 656
619MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
620 658
871#endif 909#endif
872} 910}
873 911
874char *SDL_GetError () 912char *SDL_GetError ()
875 913
876void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
877 916
878int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
879 918
880int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
881 920
882void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
883 922
884void SDL_Quit () 923void SDL_Quit ()
885 924
886int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
887 927
888int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
889 CODE: 929 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
891 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
892 OUTPUT: 932 OUTPUT:
893 RETVAL 933 RETVAL
894 934
895void 935void
950 ); 990 );
951 991
952 if (RETVAL) 992 if (RETVAL)
953 { 993 {
954 av_clear (texture_av); 994 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); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
958#include "glfunc.h" 996#include "glfunc.h"
959#undef GL_FUNC 997#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
963 } 1000 }
964} 1001}
965 OUTPUT: 1002 OUTPUT:
966 RETVAL 1003 RETVAL
967 1004
968void 1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
1007
1008void
969SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
970 1010
971char * 1011char *
972SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
973 1014
974int 1015int
975SDL_GetAppState () 1016SDL_GetAppState ()
976 1017
977int 1018int
1074 OUTPUT: 1115 OUTPUT:
1075 RETVAL 1116 RETVAL
1076 1117
1077int 1118int
1078Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1079 POSTCALL: 1120 POSTCALL:
1080 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1081 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1082 1123
1083void 1124void
1084Mix_QuerySpec () 1125Mix_QuerySpec ()
1147 RETVAL 1188 RETVAL
1148 1189
1149void 1190void
1150IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG) 1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1151 1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1152void 1194void
1153Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG) 1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1154 1196
1155void 1197void
1156load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1157 ALIAS: 1199 ALIAS:
1158 load_image_file = 1 1200 load_image_file = 1
1204 1246
1205 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1206 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1207 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1208 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1209 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1210 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1211 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1212 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1213 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1214 1256
1286MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1287 1329
1288PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1289 1331
1290DC::Font 1332DC::Font
1291new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1292 CODE: 1334 CODE:
1293{ 1335{
1294 int count; 1336 int count;
1295 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1296 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1325 PROTOTYPE: 1367 PROTOTYPE:
1326 CODE: 1368 CODE:
1327 tc_restore (); 1369 tc_restore ();
1328 1370
1329DC::Layout 1371DC::Layout
1330new (SV *class) 1372new (SV *klass)
1331 CODE: 1373 CODE:
1332 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1333 1375
1334 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1335 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1484 1526
1485void 1527void
1486set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1487 CODE: 1529 CODE:
1488 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1489 { 1531 {
1490 self->base_height = base_height; 1532 self->base_height = base_height;
1491 layout_update_font (self); 1533 layout_update_font (self);
1492 } 1534 }
1493 1535
1494void 1536void
1858MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1859 1901
1860PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1861 1903
1862DC::Map 1904DC::Map
1863new (SV *class) 1905new (SV *klass)
1864 CODE: 1906 CODE:
1865 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1866 RETVAL->x = 0; 1908 RETVAL->x = 0;
1867 RETVAL->y = 0; 1909 RETVAL->y = 0;
1868 RETVAL->w = 0; 1910 RETVAL->w = 0;
1869 RETVAL->h = 0; 1911 RETVAL->h = 0;
1870 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1907 1949
1908void 1950void
1909set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1910 CODE: 1952 CODE:
1911{ 1953{
1912 tileid texid; 1954 tileid texid;
1913 maptex *tex; 1955 maptex *tex;
1914 1956
1915 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1916 return; 1958 return;
1917 1959
1918 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1919 return; 1961 return;
1920 1962
1921 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1922 1964
1923 if (!texid) 1965 if (!texid)
1924 return; 1966 return;
1925 1967
1926 tex = self->tex + texid; 1968 tex = self->tex + texid;
1959} 2001}
1960 2002
1961void 2003void
1962expire_textures (DC::Map self, int texid, int count) 2004expire_textures (DC::Map self, int texid, int count)
1963 PPCODE: 2005 PPCODE:
1964 for (; texid < self->texs && count; ++texid, --count) 2006 for (; texid < self->texs && count; ++texid, --count)
1965 { 2007 {
1966 maptex *tex = self->tex + texid; 2008 maptex *tex = self->tex + texid;
1967 2009
1968 if (tex->name) 2010 if (tex->name)
1969 { 2011 {
2024 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
2025 } 2067 }
2026} 2068}
2027 2069
2028SV * 2070SV *
2029map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
2030 CODE: 2072 CODE:
2031{ 2073{
2032 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
2033 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
2034 mapcell *cell; 2076 mapcell *cell;
2055 2097
2056 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
2057 2099
2058 if (flags & 8) 2100 if (flags & 8)
2059 { 2101 {
2102 uint8_t ext, cmd;
2103
2060 if (extmap) 2104 do
2061 { 2105 {
2062 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
2063 2108
2064 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
2065 { 2112 {
2066 ext = *data++;
2067 cmd = ext & 0x7f;
2068
2069 if (cmd < 4)
2070 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2071 else if (cmd == 5) // health
2072 {
2073 cell->stat_width = 1; 2113 cell->stat_width = 1;
2074 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
2075 }
2076 else if (cmd == 6) // monster width
2077 cell->stat_width = *data++ + 1;
2078 else if (cmd == 0x47)
2079 {
2080 if (*data == 1) cell->player = data [1];
2081 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2082 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2083 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2084
2085 data += *data + 1;
2086 }
2087 else if (cmd == 8) // cell flags
2088 cell->flags = *data++;
2089 else if (ext & 0x40) // unknown, multibyte => skip
2090 data += *data + 1;
2091 else
2092 data++;
2093 } 2115 }
2094 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
2095 } 2133 }
2096 else 2134 while (ext & 0x80);
2097 cell->darkness = *data++ + 1;
2098 } 2135 }
2099 2136
2100 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
2101 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
2102 { 2139 {
2176 | (b << 16) 2213 | (b << 16)
2177 | (a << 24); 2214 | (a << 24);
2178 } 2215 }
2179 } 2216 }
2180 2217
2181 RETVAL = map_sv; 2218 RETVAL = map_sv;
2182} 2219}
2183 OUTPUT: 2220 OUTPUT:
2184 RETVAL 2221 RETVAL
2185 2222
2186void 2223void
2187draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2188 CODE: 2225 CODE:
2189{ 2226{
2190 int x, y, z; 2227 int x, y, z;
2191 2228
2192 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2193 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2194 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2195 smooth_key skey;
2196 int pl_x, pl_y; 2230 int pl_x, pl_y;
2197 maptex pl_tex; 2231 maptex pl_tex;
2198 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2199 rc_t *rc_ov = rc_alloc (); 2233 rc_t *rc_ov = rc_alloc ();
2200 rc_key_t key; 2234 rc_key_t key;
2203 pl_tex.name = 0; 2237 pl_tex.name = 0;
2204 2238
2205 // that's current max. sorry. 2239 // that's current max. sorry.
2206 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
2207 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
2208
2209 // clear key, in case of extra padding
2210 memset (&skey, 0, sizeof (skey));
2211 2242
2212 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
2213 key.r = 255; 2244 key.r = 255;
2214 key.g = 255; 2245 key.g = 255;
2215 key.b = 255; 2246 key.b = 255;
2221 my += self->y; 2252 my += self->y;
2222 2253
2223 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
2224 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
2225 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
2226 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2227 2258
2228 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2229 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2230 { 2261 {
2231 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2246 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2247 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2248 2279
2249 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
2250 { 2281 {
2251 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2252 key.texname = -1; 2285 key.texname = -1;
2253 2286
2254 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
2255 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
2256 { 2289 {
2298 if (tex.smoothtile) 2331 if (tex.smoothtile)
2299 { 2332 {
2300 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
2301 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
2302 2335
2303 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
2304 2337
2305 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
2306 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
2307 2340
2308 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2316 2349
2317 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2318 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2319 2352
2320 // full tile 2353 // full tile
2321 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2322 2355
2323 // borders 2356 // borders
2324 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2325 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2358 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2326 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2359 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2327 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2328 2361
2329 // corners 2362 // corners
2330 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2331 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2364 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2332 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2365 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2333 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2334 } 2367 }
2335 } 2368 }
2336 2369
2337 if (expect_false (z == 2) && expect_false (cell->flags)) 2370 if (expect_false (z == 2) && expect_false (cell->flags))
2338 { 2371 {
2365 { 2398 {
2366 int w, b; 2399 int w, b;
2367 2400
2368 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2369 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2370 for (w = 0; w < 256 / 32; ++w) 2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2371 { 2406 {
2372 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2373 if (smask) 2408 IV bits = it->second;
2374 for (b = 0; b < 32; ++b) 2409
2375 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2376 { 2413 {
2377 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
2378 HE *he; 2422 if (tex.name)
2379
2380 hv_iterinit (smooth);
2381 while ((he = hv_iternext (smooth)))
2382 { 2423 {
2383 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2384 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2385 2426 if (key.texname != tex.name)
2386 if (!(bits & 0x1000)
2387 && skey->level == level
2388 && level > smooth_max [skey->x][skey->y])
2389 { 2427 {
2390 maptex tex = self->tex [skey->tile];
2391 int px = (((int)skey->x) - 1) * Tw;
2392 int py = (((int)skey->y) - 1) * Th;
2393 int border = bits & 15;
2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2395 float dx = tex.s * .0625f; // 16 images/row
2396 float dy = tex.t * .5f ; // 2 images/column
2397
2398 if (tex.name)
2399 {
2400 // this time avoiding texture state changes
2401 // save gobs of state changes.
2402 if (key.texname != tex.name)
2403 {
2404 self->tex [skey->tile].unused = 0; 2428 self->tex [skey.tile].unused = 0;
2405 2429
2406 glEnd (); 2430 glEnd ();
2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2408 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2409 } 2433 }
2410 2434
2411 if (border) 2435 if (border)
2412 { 2436 {
2413 float ox = border * dx; 2437 float ox = border * dx;
2414 2438
2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2419 } 2443 }
2420 2444
2421 if (corner) 2445 if (corner)
2422 { 2446 {
2423 float ox = corner * dx; 2447 float ox = corner * dx;
2424 2448
2425 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2429 }
2430 }
2431 } 2453 }
2432 } 2454 }
2433 } 2455 }
2434 } 2456 }
2435 2457
2436 glEnd (); 2458 glEnd ();
2437 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2438 key.texname = -1; 2460 key.texname = -1;
2439 } 2461 }
2440
2441 hv_clear (smooth);
2442 } 2462 }
2443 2463
2444 if (pl_tex.name) 2464 if (pl_tex.name)
2445 { 2465 {
2446 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2715 else 2735 else
2716 *data++ = 0; 2736 *data++ = 0;
2717 } 2737 }
2718 } 2738 }
2719 2739
2720 /* if size is w*h + 5 then no data has been found */ 2740 /* if size is w*h + 5 then no data has been found */
2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2722 { 2742 {
2723 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2725 } 2745 }
2726 2746
2727 RETVAL = data_sv; 2747 RETVAL = data_sv;
2728} 2748}
2729 OUTPUT: 2749 OUTPUT:
2730 RETVAL 2750 RETVAL
2731 2751
2732void 2752void
2739 STRLEN len; 2759 STRLEN len;
2740 uint8_t *data, *end; 2760 uint8_t *data, *end;
2741 2761
2742 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2744 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2745 end = data + len + 8; 2765 end = data + len + 8;
2746 2766
2747 if (len < 5) 2767 if (len < 5)
2748 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2749 2769
2810} 2830}
2811 2831
2812MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2813 2833
2814DC::RW 2834DC::RW
2815new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2816 CODE: 2836 CODE:
2817{ 2837{
2818 STRLEN datalen; 2838 STRLEN datalen;
2819 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2820 2840
2822} 2842}
2823 OUTPUT: 2843 OUTPUT:
2824 RETVAL 2844 RETVAL
2825 2845
2826DC::RW 2846DC::RW
2827new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2828 CODE: 2848 CODE:
2829 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2830 OUTPUT: 2850 OUTPUT:
2831 RETVAL 2851 RETVAL
2832 2852
2941#else 2961#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif 2963#endif
2944 2964
2945DC::MixChunk 2965DC::MixChunk
2946new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2947 CODE: 2967 CODE:
2948 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2949 OUTPUT: 2969 OUTPUT:
2950 RETVAL 2970 RETVAL
2951 2971
3021 RETVAL = Mix_PlayingMusic (); 3041 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT: 3042 OUTPUT:
3023 RETVAL 3043 RETVAL
3024 3044
3025DC::MixMusic 3045DC::MixMusic
3026new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
3027 CODE: 3047 CODE:
3028 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
3029 OUTPUT: 3049 OUTPUT:
3030 RETVAL 3050 RETVAL
3031 3051
3184 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
3185 3205
3186void 3206void
3187apple_nvidia_bug (int enable) 3207apple_nvidia_bug (int enable)
3188 3208
3189char * 3209const char *
3190gl_vendor () 3210gl_vendor ()
3191 CODE: 3211 CODE:
3192 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
3193 OUTPUT: 3213 OUTPUT:
3194 RETVAL 3214 RETVAL
3195 3215
3196char * 3216const char *
3197gl_version () 3217gl_version ()
3198 CODE: 3218 CODE:
3199 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
3200 OUTPUT: 3220 OUTPUT:
3201 RETVAL 3221 RETVAL
3202 3222
3203char * 3223const char *
3204gl_extensions () 3224gl_extensions ()
3205 CODE: 3225 CODE:
3206 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3207 OUTPUT: 3227 OUTPUT:
3208 RETVAL 3228 RETVAL
3209 3229
3210const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
3211 3235
3212GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
3213 CODE: 3237 CODE:
3214 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
3215 OUTPUT: 3239 OUTPUT:
3418 3442
3419void 3443void
3420find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3421 PPCODE: 3445 PPCODE:
3422{ 3446{
3423 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3424 XPUSHs (self); 3448 XPUSHs (self);
3425} 3449}
3426 3450
3427BOOT: 3451BOOT:
3428{ 3452{
3436 3460
3437void 3461void
3438draw (SV *self) 3462draw (SV *self)
3439 CODE: 3463 CODE:
3440{ 3464{
3441 HV *hv; 3465 HV *hv;
3442 SV **svp; 3466 SV **svp;
3443 NV x, y, w, h; 3467 NV x, y, w, h;
3444 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3445 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3446 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3447 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines