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.312 by root, Thu Dec 29 07:13:44 2011 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 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>
33 37
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 39
36#include <SDL.h> 40#include <SDL.h>
37#include <SDL_thread.h> 41#include <SDL_thread.h>
48#endif 52#endif
49 53
50#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
52 56
53#include <glib/gmacros.h> 57#include <glib.h>
54 58
55#include <pango/pango.h> 59#include <pango/pango.h>
56 60
57#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
184{ 188{
185 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
186 190
187 while (attrs) 191 while (attrs)
188 { 192 {
189 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
190 194
191 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
192 return 1; 196 return 1;
193 197
194 attrs = attrs->next; 198 attrs = attrs->next;
195 } 199 }
196 200
197 return 0; 201 return 0;
198} 202}
199 203
200typedef struct cf_layout { 204struct cf_layout {
201 PangoLayout *pl; 205 PangoLayout *pl;
202 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
203 int base_height; 207 int base_height;
204 DC__Font font; 208 DC__Font font;
205 rc_t *rc; 209 rc_t *rc;
206} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
207 213
208static DC__Font default_font; 214static DC__Font default_font;
209static PangoContext *opengl_context; 215static PangoContext *opengl_context;
210static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
211 217
212static void 218static void
213substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
214{ 220{
215 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
216#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
217 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
218#endif 224#endif
219 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
220} 226}
221 227
222static void 228static void
252} 258}
253 259
254typedef uint16_t tileid; 260typedef uint16_t tileid;
255typedef uint16_t faceid; 261typedef uint16_t faceid;
256 262
257typedef struct { 263struct maptex
264{
258 GLuint name; 265 GLuint name;
259 int w, h; 266 int w, h;
260 float s, t; 267 float s, t;
261 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
262 tileid smoothtile; 269 tileid smoothtile;
263 uint8_t smoothlevel; 270 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */ 271 uint8_t unused; /* set to zero on use */
265} maptex; 272};
266 273
267typedef struct { 274struct mapcell
275{
268 uint32_t player; 276 uint32_t player;
269 tileid tile[3]; 277 tileid tile[3];
270 uint16_t darkness; 278 uint16_t darkness;
271 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
272} mapcell; 280};
273 281
274typedef struct { 282struct maprow
283{
275 int32_t c0, c1; 284 int32_t c0, c1;
276 mapcell *col; 285 mapcell *col;
277} maprow; 286};
278 287
279typedef struct map { 288struct mapgrid {
280 int x, y, w, h; 289 int x, y, w, h;
281 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
282 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
283 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
284 293
285 int32_t rows; 294 int32_t rows;
286 maprow *row; 295 maprow *row;
287} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
288 299
289static char * 300static char *
290prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
291{ 302{
292 char *p; 303 char *p;
310 321
311#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 322#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)) 323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313 324
314static void 325static void
315need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
316{ 327{
317 while (self->faces <= face) 328 while (self->faces <= face)
318 { 329 {
319 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
320 self->faces *= 2; 331 self->faces *= 2;
321 } 332 }
322} 333}
323 334
324static void 335static void
325need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
326{ 337{
327 while (self->texs <= texid) 338 while (self->texs <= texid)
328 { 339 {
329 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
330 self->texs *= 2; 341 self->texs *= 2;
331 } 342 }
332} 343}
333 344
334static maprow * 345static maprow *
335map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
336{ 347{
337 if (0 > y) 348 if (0 > y)
338 { 349 {
339 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
340 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
378 389
379 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
380} 391}
381 392
382static mapcell * 393static mapcell *
383map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
384{ 395{
385 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
386} 397}
387 398
388static void 399static void
389map_clear (DC__Map self) 400map_clear (mapgrid *self)
390{ 401{
391 int r; 402 int r;
392 403
393 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
394 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
412 (cell)->flags = 0; \ 423 (cell)->flags = 0; \
413 (cell)->player = 0; \ 424 (cell)->player = 0; \
414 } while (0) 425 } while (0)
415 426
416static void 427static void
417map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
418{ 429{
419 int x, y; 430 int x, y;
420 maprow *row; 431 maprow *row;
421 mapcell *cell; 432 mapcell *cell;
422 433
439 CELL_CLEAR (cell); 450 CELL_CLEAR (cell);
440 } 451 }
441 } 452 }
442} 453}
443 454
444typedef struct { 455struct smooth_key
456{
445 tileid tile; 457 tileid tile;
446 uint8_t x, y, level; 458 uint8_t x, y, level;
447} smooth_key; 459
460 bool operator == (const smooth_key &o) const
461 {
462 return tile == o.tile && x == o.x && y == o.y && level == o.level;
463 }
464};
465
466typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
467
468namespace std {
469 template <>
470 struct hash<smooth_key>
471 {
472 size_t operator () (const smooth_key &v) const
473 {
474 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
475 }
476 };
477}
448 478
449static void 479static void
450smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451{ 481{
452 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
453 483
454 if (SvIOK (*sv)) 484 if (it == h.end ())
455 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
456 else 486 else
457 sv_setiv (*sv, bits); 487 it->second |= bits;
458} 488}
459 489
460static void 490static void
461music_finished (void) 491music_finished (void)
462{ 492{
481 ev.data2 = 0; 511 ev.data2 = 0;
482 512
483 SDL_PushEvent ((SDL_Event *)&ev); 513 SDL_PushEvent ((SDL_Event *)&ev);
484} 514}
485 515
516// approximately divide by 255
486static unsigned int 517static unsigned int
487div255 (unsigned int n) 518div255 (unsigned int n)
488{ 519{
489 return (n + (n >> 8)) >> 8; 520 return (n + (n >> 8)) >> 8;
490} 521}
577 608
578 return mod; 609 return mod;
579} 610}
580 611
581static void 612static void
582deliantra_main () 613deliantra_main (SV *real_main)
583{ 614{
584 char *argv[] = { 0 }; 615 dSP;
585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv); 616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
586} 619}
587 620
588#ifdef __MACOSX__ 621#ifdef __MACOSX__
622 static SV *real_main;
623
589 /* to due surprising braindamage on the side of SDL design, we 624 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main() 625 * 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, 626 * 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, 627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back. 628 * and which calls our main (== SDL_main) back.
594 */ 629 */
595 extern C_LINKAGE int 630 extern C_LINKAGE int
596 main (int argc, char *argv[]) 631 main (int argc, char *argv[])
597 { 632 {
598 deliantra_main (); 633 deliantra_main (real_main);
599 } 634 }
600 635
601 #undef main 636 #undef main
602 637
603 extern C_LINKAGE int main (int argc, char *argv[]); 638 extern C_LINKAGE int main (int argc, char *argv[]);
604 639
605 static void 640 static void
606 SDL_braino (void) 641 SDL_main_hack (SV *real_main_)
607 { 642 {
643 real_main = real_main_;
644
608 char *argv[] = { "deliantra client", 0 }; 645 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv); 646 (main) (1, argv);
610 } 647 }
611#else 648#else
612 static void 649 static void
613 SDL_braino (void) 650 SDL_main_hack (SV *real_main)
614 { 651 {
615 deliantra_main (); 652 deliantra_main (real_main);
616 } 653 }
617#endif 654#endif
618 655
619MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
620 657
871#endif 908#endif
872} 909}
873 910
874char *SDL_GetError () 911char *SDL_GetError ()
875 912
876void SDL_braino () 913void SDL_main_hack (SV *real_main)
914 PROTOTYPE: &
877 915
878int SDL_Init (U32 flags) 916int SDL_Init (U32 flags)
879 917
880int SDL_InitSubSystem (U32 flags) 918int SDL_InitSubSystem (U32 flags)
881 919
882void SDL_QuitSubSystem (U32 flags) 920void SDL_QuitSubSystem (U32 flags)
883 921
884void SDL_Quit () 922void SDL_Quit ()
885 923
886int SDL_GL_SetAttribute (int attr, int value) 924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
887 926
888int SDL_GL_GetAttribute (int attr) 927int SDL_GL_GetAttribute (int attr)
889 CODE: 928 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL)) 929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
891 XSRETURN_UNDEF; 930 XSRETURN_UNDEF;
892 OUTPUT: 931 OUTPUT:
893 RETVAL 932 RETVAL
894 933
895void 934void
950 ); 989 );
951 990
952 if (RETVAL) 991 if (RETVAL)
953 { 992 {
954 av_clear (texture_av); 993 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); 994#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
958#include "glfunc.h" 995#include "glfunc.h"
959#undef GL_FUNC 996#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
963 } 999 }
964} 1000}
965 OUTPUT: 1001 OUTPUT:
966 RETVAL 1002 RETVAL
967 1003
968void 1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
1006
1007void
969SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
970 1009
971char * 1010char *
972SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
973 1013
974int 1014int
975SDL_GetAppState () 1015SDL_GetAppState ()
976 1016
977int 1017int
1074 OUTPUT: 1114 OUTPUT:
1075 RETVAL 1115 RETVAL
1076 1116
1077int 1117int
1078Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1079 POSTCALL: 1119 POSTCALL:
1080 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
1081 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
1082 1122
1083void 1123void
1084Mix_QuerySpec () 1124Mix_QuerySpec ()
1205 1245
1206 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
1207 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
1208 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
1209 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
1210 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1211 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1251 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1212 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1213 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1214 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
1215 1255
1287MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1288 1328
1289PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1290 1330
1291DC::Font 1331DC::Font
1292new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1293 CODE: 1333 CODE:
1294{ 1334{
1295 int count; 1335 int count;
1296 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1297 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1326 PROTOTYPE: 1366 PROTOTYPE:
1327 CODE: 1367 CODE:
1328 tc_restore (); 1368 tc_restore ();
1329 1369
1330DC::Layout 1370DC::Layout
1331new (SV *class) 1371new (SV *klass)
1332 CODE: 1372 CODE:
1333 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1334 1374
1335 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1336 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1485 1525
1486void 1526void
1487set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1488 CODE: 1528 CODE:
1489 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1490 { 1530 {
1491 self->base_height = base_height; 1531 self->base_height = base_height;
1492 layout_update_font (self); 1532 layout_update_font (self);
1493 } 1533 }
1494 1534
1495void 1535void
1859MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1860 1900
1861PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1862 1902
1863DC::Map 1903DC::Map
1864new (SV *class) 1904new (SV *klass)
1865 CODE: 1905 CODE:
1866 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1867 RETVAL->x = 0; 1907 RETVAL->x = 0;
1868 RETVAL->y = 0; 1908 RETVAL->y = 0;
1869 RETVAL->w = 0; 1909 RETVAL->w = 0;
1870 RETVAL->h = 0; 1910 RETVAL->h = 0;
1871 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1908 1948
1909void 1949void
1910set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1911 CODE: 1951 CODE:
1912{ 1952{
1913 tileid texid; 1953 tileid texid;
1914 maptex *tex; 1954 maptex *tex;
1915 1955
1916 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1917 return; 1957 return;
1918 1958
1919 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1920 return; 1960 return;
1921 1961
1922 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1923 1963
1924 if (!texid) 1964 if (!texid)
1925 return; 1965 return;
1926 1966
1927 tex = self->tex + texid; 1967 tex = self->tex + texid;
1960} 2000}
1961 2001
1962void 2002void
1963expire_textures (DC::Map self, int texid, int count) 2003expire_textures (DC::Map self, int texid, int count)
1964 PPCODE: 2004 PPCODE:
1965 for (; texid < self->texs && count; ++texid, --count) 2005 for (; texid < self->texs && count; ++texid, --count)
1966 { 2006 {
1967 maptex *tex = self->tex + texid; 2007 maptex *tex = self->tex + texid;
1968 2008
1969 if (tex->name) 2009 if (tex->name)
1970 { 2010 {
2025 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
2026 } 2066 }
2027} 2067}
2028 2068
2029SV * 2069SV *
2030map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
2031 CODE: 2071 CODE:
2032{ 2072{
2033 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
2034 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
2035 mapcell *cell; 2075 mapcell *cell;
2056 2096
2057 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
2058 2098
2059 if (flags & 8) 2099 if (flags & 8)
2060 { 2100 {
2101 uint8_t ext, cmd;
2102
2061 if (extmap) 2103 do
2062 { 2104 {
2063 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
2064 2107
2065 do 2108 if (cmd < 4)
2109 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2110 else if (cmd == 5) // health
2066 { 2111 {
2067 ext = *data++;
2068 cmd = ext & 0x7f;
2069
2070 if (cmd < 4)
2071 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2072 else if (cmd == 5) // health
2073 {
2074 cell->stat_width = 1; 2112 cell->stat_width = 1;
2075 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
2076 }
2077 else if (cmd == 6) // monster width
2078 cell->stat_width = *data++ + 1;
2079 else if (cmd == 0x47)
2080 {
2081 if (*data == 1) cell->player = data [1];
2082 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2083 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2084 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2085
2086 data += *data + 1;
2087 }
2088 else if (cmd == 8) // cell flags
2089 cell->flags = *data++;
2090 else if (ext & 0x40) // unknown, multibyte => skip
2091 data += *data + 1;
2092 else
2093 data++;
2094 } 2114 }
2095 while (ext & 0x80); 2115 else if (cmd == 6) // monster width
2116 cell->stat_width = *data++ + 1;
2117 else if (cmd == 0x47)
2118 {
2119 if (*data == 1) cell->player = data [1];
2120 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2121 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2122 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2123
2124 data += *data + 1;
2125 }
2126 else if (cmd == 8) // cell flags
2127 cell->flags = *data++;
2128 else if (ext & 0x40) // unknown, multibyte => skip
2129 data += *data + 1;
2130 else
2131 data++;
2096 } 2132 }
2097 else 2133 while (ext & 0x80);
2098 cell->darkness = *data++ + 1;
2099 } 2134 }
2100 2135
2101 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
2102 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
2103 { 2138 {
2177 | (b << 16) 2212 | (b << 16)
2178 | (a << 24); 2213 | (a << 24);
2179 } 2214 }
2180 } 2215 }
2181 2216
2182 RETVAL = map_sv; 2217 RETVAL = map_sv;
2183} 2218}
2184 OUTPUT: 2219 OUTPUT:
2185 RETVAL 2220 RETVAL
2186 2221
2187void 2222void
2188draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2189 CODE: 2224 CODE:
2190{ 2225{
2191 int x, y, z; 2226 int x, y, z;
2192 2227
2193 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2194 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2195 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)
2196 smooth_key skey; 2230 smooth_key skey;
2197 int pl_x, pl_y; 2231 int pl_x, pl_y;
2198 maptex pl_tex; 2232 maptex pl_tex;
2247 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2248 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2249 2283
2250 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
2251 { 2285 {
2286 smooth_hash smooth;
2252 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2253 key.texname = -1; 2288 key.texname = -1;
2254 2289
2255 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
2256 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
2317 2352
2318 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2319 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
2320 2355
2321 // full tile 2356 // full tile
2322 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2357 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2323 2358
2324 // borders 2359 // borders
2325 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2326 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2327 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2362 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2328 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2363 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2329 2364
2330 // corners 2365 // corners
2331 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2366 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2332 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2367 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2333 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2368 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2334 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2369 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2335 } 2370 }
2336 } 2371 }
2337 2372
2338 if (expect_false (z == 2) && expect_false (cell->flags)) 2373 if (expect_false (z == 2) && expect_false (cell->flags))
2339 { 2374 {
2376 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
2377 { 2412 {
2378 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
2379 HE *he; 2414 HE *he;
2380 2415
2381 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2382 while ((he = hv_iternext (smooth)))
2383 { 2417 {
2384 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
2385 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
2386 2420
2387 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
2388 && skey->level == level 2422 && skey.level == level
2389 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
2390 { 2424 {
2391 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
2392 int px = (((int)skey->x) - 1) * Tw; 2426 int px = (((int)skey.x) - 1) * Tw;
2393 int py = (((int)skey->y) - 1) * Th; 2427 int py = (((int)skey.y) - 1) * Th;
2394 int border = bits & 15; 2428 int border = bits & 15;
2395 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2396 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
2397 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
2398 2432
2400 { 2434 {
2401 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2402 // save gobs of state changes. 2436 // save gobs of state changes.
2403 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2404 { 2438 {
2405 self->tex [skey->tile].unused = 0; 2439 self->tex [skey.tile].unused = 0;
2406 2440
2407 glEnd (); 2441 glEnd ();
2408 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2409 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2410 } 2444 }
2436 2470
2437 glEnd (); 2471 glEnd ();
2438 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2439 key.texname = -1; 2473 key.texname = -1;
2440 } 2474 }
2441
2442 hv_clear (smooth);
2443 } 2475 }
2444 2476
2445 if (pl_tex.name) 2477 if (pl_tex.name)
2446 { 2478 {
2447 maptex tex = pl_tex; 2479 maptex tex = pl_tex;
2716 else 2748 else
2717 *data++ = 0; 2749 *data++ = 0;
2718 } 2750 }
2719 } 2751 }
2720 2752
2721 /* if size is w*h + 5 then no data has been found */ 2753 /* if size is w*h + 5 then no data has been found */
2722 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2723 { 2755 {
2724 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2725 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2726 } 2758 }
2727 2759
2728 RETVAL = data_sv; 2760 RETVAL = data_sv;
2729} 2761}
2730 OUTPUT: 2762 OUTPUT:
2731 RETVAL 2763 RETVAL
2732 2764
2733void 2765void
2740 STRLEN len; 2772 STRLEN len;
2741 uint8_t *data, *end; 2773 uint8_t *data, *end;
2742 2774
2743 len = SvLEN (data_sv); 2775 len = SvLEN (data_sv);
2744 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2745 data = SvPVbyte_nolen (data_sv); 2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2746 end = data + len + 8; 2778 end = data + len + 8;
2747 2779
2748 if (len < 5) 2780 if (len < 5)
2749 XSRETURN_EMPTY; 2781 XSRETURN_EMPTY;
2750 2782
2811} 2843}
2812 2844
2813MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2814 2846
2815DC::RW 2847DC::RW
2816new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2817 CODE: 2849 CODE:
2818{ 2850{
2819 STRLEN datalen; 2851 STRLEN datalen;
2820 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2821 2853
2823} 2855}
2824 OUTPUT: 2856 OUTPUT:
2825 RETVAL 2857 RETVAL
2826 2858
2827DC::RW 2859DC::RW
2828new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2829 CODE: 2861 CODE:
2830 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2831 OUTPUT: 2863 OUTPUT:
2832 RETVAL 2864 RETVAL
2833 2865
2942#else 2974#else
2943 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2975 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2944#endif 2976#endif
2945 2977
2946DC::MixChunk 2978DC::MixChunk
2947new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2948 CODE: 2980 CODE:
2949 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2950 OUTPUT: 2982 OUTPUT:
2951 RETVAL 2983 RETVAL
2952 2984
3022 RETVAL = Mix_PlayingMusic (); 3054 RETVAL = Mix_PlayingMusic ();
3023 OUTPUT: 3055 OUTPUT:
3024 RETVAL 3056 RETVAL
3025 3057
3026DC::MixMusic 3058DC::MixMusic
3027new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
3028 CODE: 3060 CODE:
3029 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
3030 OUTPUT: 3062 OUTPUT:
3031 RETVAL 3063 RETVAL
3032 3064
3185 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
3186 3218
3187void 3219void
3188apple_nvidia_bug (int enable) 3220apple_nvidia_bug (int enable)
3189 3221
3190char * 3222const char *
3191gl_vendor () 3223gl_vendor ()
3192 CODE: 3224 CODE:
3193 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
3194 OUTPUT: 3226 OUTPUT:
3195 RETVAL 3227 RETVAL
3196 3228
3197char * 3229const char *
3198gl_version () 3230gl_version ()
3199 CODE: 3231 CODE:
3200 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
3201 OUTPUT: 3233 OUTPUT:
3202 RETVAL 3234 RETVAL
3203 3235
3204char * 3236const char *
3205gl_extensions () 3237gl_extensions ()
3206 CODE: 3238 CODE:
3207 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3208 OUTPUT: 3240 OUTPUT:
3209 RETVAL 3241 RETVAL
3210 3242
3211const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
3212 3248
3213GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
3214 CODE: 3250 CODE:
3215 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
3216 OUTPUT: 3252 OUTPUT:
3419 3455
3420void 3456void
3421find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
3422 PPCODE: 3458 PPCODE:
3423{ 3459{
3424 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
3425 XPUSHs (self); 3461 XPUSHs (self);
3426} 3462}
3427 3463
3428BOOT: 3464BOOT:
3429{ 3465{
3437 3473
3438void 3474void
3439draw (SV *self) 3475draw (SV *self)
3440 CODE: 3476 CODE:
3441{ 3477{
3442 HV *hv; 3478 HV *hv;
3443 SV **svp; 3479 SV **svp;
3444 NV x, y, w, h; 3480 NV x, y, w, h;
3445 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
3446 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
3447 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
3448 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines