--- deliantra/Deliantra-Client/Client.xs 2011/12/27 07:23:33 1.310 +++ deliantra/Deliantra-Client/Client.xs 2018/11/18 01:58:53 1.324 @@ -17,6 +17,8 @@ #include "perl.h" #include "XSUB.h" +#include "flat_hash_map.hpp" + #ifdef _WIN32 # undef pipe // microsoft vs. C @@ -25,11 +27,14 @@ # define M_PI 3.14159265f #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include #define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW @@ -50,7 +55,7 @@ #define PANGO_ENABLE_BACKEND #define G_DISABLE_CAST_CHECKS -#include +#include #include @@ -186,7 +191,7 @@ while (attrs) { - PangoAttribute *attr = attrs->data; + PangoAttribute *attr = (PangoAttribute *)attrs->data; if (attr->klass->type == PANGO_ATTR_SHAPE) return 1; @@ -197,13 +202,15 @@ return 0; } -typedef struct cf_layout { +struct cf_layout { PangoLayout *pl; float r, g, b, a; // default color for rgba mode int base_height; DC__Font font; rc_t *rc; -} *DC__Layout; +}; + +typedef cf_layout *DC__Layout; static DC__Font default_font; static PangoContext *opengl_context; @@ -214,7 +221,7 @@ { FcPatternAddBool (pattern, FC_HINTING, 1); #ifdef FC_HINT_STYLE - FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); + FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL); #endif FcPatternAddBool (pattern, FC_AUTOHINT, 0); } @@ -254,7 +261,8 @@ typedef uint16_t tileid; typedef uint16_t faceid; -typedef struct { +struct maptex +{ GLuint name; int w, h; float s, t; @@ -262,21 +270,23 @@ tileid smoothtile; uint8_t smoothlevel; uint8_t unused; /* set to zero on use */ -} maptex; +}; -typedef struct { +struct mapcell +{ uint32_t player; tileid tile[3]; uint16_t darkness; uint8_t stat_width, stat_hp, flags, smoothmax; -} mapcell; +}; -typedef struct { +struct maprow +{ int32_t c0, c1; mapcell *col; -} maprow; +}; -typedef struct map { +struct mapgrid { int x, y, w, h; int ox, oy; /* offset to virtual global coordinate system */ int faces; tileid *face2tile; // [faceid] @@ -284,7 +294,9 @@ int32_t rows; maprow *row; -} *DC__Map; +}; + +typedef mapgrid *DC__Map; static char * prepend (char *ptr, int sze, int inc) @@ -312,7 +324,7 @@ #define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) static void -need_facenum (struct map *self, faceid face) +need_facenum (struct mapgrid *self, faceid face) { while (self->faces <= face) { @@ -322,7 +334,7 @@ } static void -need_texid (struct map *self, int texid) +need_texid (struct mapgrid *self, int texid) { while (self->texs <= texid) { @@ -332,7 +344,7 @@ } static maprow * -map_get_row (DC__Map self, int y) +map_get_row (mapgrid *self, int y) { if (0 > y) { @@ -380,13 +392,13 @@ } static mapcell * -map_get_cell (DC__Map self, int x, int y) +map_get_cell (mapgrid *self, int x, int y) { return row_get_cell (map_get_row (self, y), x); } static void -map_clear (DC__Map self) +map_clear (mapgrid *self) { int r; @@ -414,7 +426,7 @@ } while (0) static void -map_blank (DC__Map self, int x0, int y0, int w, int h) +map_blank (mapgrid *self, int x0, int y0, int w, int h) { int x, y; maprow *row; @@ -441,20 +453,39 @@ } } -typedef struct { +struct smooth_key +{ tileid tile; uint8_t x, y, level; -} smooth_key; + + bool operator == (const smooth_key &o) const + { + return tile == o.tile && x == o.x && y == o.y && level == o.level; + } +}; + +typedef ska::flat_hash_map smooth_hash; + +namespace std { + template <> + struct hash + { + size_t operator () (const smooth_key &v) const + { + return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24); + } + }; +} static void -smooth_or_bits (HV *hv, smooth_key *key, IV bits) +smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits) { - SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); + auto &&it = h.find (key); - if (SvIOK (*sv)) - SvIV_set (*sv, SvIVX (*sv) | bits); + if (it == h.end ()) + h.insert (std::make_pair (key, bits)); else - sv_setiv (*sv, bits); + it->second |= bits; } static void @@ -483,6 +514,7 @@ SDL_PushEvent ((SDL_Event *)&ev); } +// approximately divide by 255 static unsigned int div255 (unsigned int n) { @@ -579,13 +611,17 @@ } static void -deliantra_main () +deliantra_main (SV *real_main) { - char *argv[] = { 0 }; - call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv); + dSP; + + PUSHMARK (SP); + call_sv (real_main, G_DISCARD | G_VOID); } #ifdef __MACOSX__ + static SV *real_main; + /* to due surprising braindamage on the side of SDL design, we * do some mind-boggling hack here: SDL requires a custom main() * on OS X, so... we provide one and call the original main(), which, @@ -595,7 +631,7 @@ extern C_LINKAGE int main (int argc, char *argv[]) { - deliantra_main (); + deliantra_main (real_main); } #undef main @@ -603,16 +639,18 @@ extern C_LINKAGE int main (int argc, char *argv[]); static void - SDL_braino (void) + SDL_main_hack (SV *real_main_) { + real_main = real_main_; + char *argv[] = { "deliantra client", 0 }; (main) (1, argv); } #else static void - SDL_braino (void) + SDL_main_hack (SV *real_main) { - deliantra_main (); + deliantra_main (real_main); } #endif @@ -873,7 +911,8 @@ char *SDL_GetError () -void SDL_braino () +void SDL_main_hack (SV *real_main) + PROTOTYPE: & int SDL_Init (U32 flags) @@ -884,10 +923,11 @@ void SDL_Quit () int SDL_GL_SetAttribute (int attr, int value) + C_ARGS: (SDL_GLattr)attr, value int SDL_GL_GetAttribute (int attr) CODE: - if (SDL_GL_GetAttribute (attr, &RETVAL)) + if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL)) XSRETURN_UNDEF; OUTPUT: RETVAL @@ -952,12 +992,9 @@ if (RETVAL) { av_clear (texture_av); - - SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); #define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); #include "glfunc.h" #undef GL_FUNC - if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; } @@ -966,10 +1003,14 @@ RETVAL void +SDL_WM_SetCaption (const char *title, const char *icon) + +void SDL_GL_SwapBuffers () char * SDL_GetKeyName (int sym) + C_ARGS: (SDLKey)sym int SDL_GetAppState () @@ -977,8 +1018,15 @@ int SDL_GetModState () +int +SDL_WaitEvent () + C_ARGS: 0 + +void +SDL_PumpEvents () + void -poll_events () +peep_events () PPCODE: { SDL_Event ev; @@ -1069,7 +1117,7 @@ int Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) - POSTCALL: + POSTCALL: Mix_HookMusicFinished (music_finished); Mix_ChannelFinished (channel_finished); @@ -1142,8 +1190,9 @@ void IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG) +# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s void -Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG) +Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG) void load_image_inline (SV *image_) @@ -1199,7 +1248,7 @@ EXTEND (SP, 6); PUSHs (sv_2mortal (newSViv (surface2->w))); PUSHs (sv_2mortal (newSViv (surface2->h))); - PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); + PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch))); PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); PUSHs (sv_2mortal (newSViv (GL_RGBA))); PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); @@ -1281,7 +1330,7 @@ PROTOTYPES: DISABLE DC::Font -new_from_file (SV *class, char *path, int id = 0) +new_from_file (SV *klass, char *path, int id = 0) CODE: { int count; @@ -1320,7 +1369,7 @@ tc_restore (); DC::Layout -new (SV *class) +new (SV *klass) CODE: New (0, RETVAL, 1, struct cf_layout); @@ -1479,7 +1528,7 @@ set_height (DC::Layout self, int base_height) CODE: if (self->base_height != base_height) - { + { self->base_height = base_height; layout_update_font (self); } @@ -1853,9 +1902,9 @@ PROTOTYPES: DISABLE DC::Map -new (SV *class) +new (SV *klass) CODE: - New (0, RETVAL, 1, struct map); + New (0, RETVAL, 1, mapgrid); RETVAL->x = 0; RETVAL->y = 0; RETVAL->w = 0; @@ -1902,7 +1951,7 @@ set_smooth (DC::Map self, int face, int smooth, int level) CODE: { - tileid texid; + tileid texid; maptex *tex; if (face < 0 || face >= self->faces) @@ -1911,7 +1960,7 @@ if (smooth < 0 || smooth >= self->faces) return; - texid = self->face2tile [face]; + texid = self->face2tile [face]; if (!texid) return; @@ -1954,7 +2003,7 @@ void expire_textures (DC::Map self, int texid, int count) PPCODE: - for (; texid < self->texs && count; ++texid, --count) + for (; texid < self->texs && count; ++texid, --count) { maptex *tex = self->tex + texid; @@ -2019,7 +2068,7 @@ } SV * -map1a_update (DC::Map self, SV *data_, int extmap) +map1a_update (DC::Map self, SV *data_) CODE: { uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); @@ -2050,44 +2099,39 @@ if (flags & 8) { - if (extmap) + uint8_t ext, cmd; + + do { - uint8_t ext, cmd; + ext = *data++; + cmd = ext & 0x7f; - do + if (cmd < 4) + cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */ + else if (cmd == 5) // health { - ext = *data++; - cmd = ext & 0x7f; - - if (cmd < 4) - cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */ - else if (cmd == 5) // health - { - cell->stat_width = 1; - cell->stat_hp = *data++; - } - else if (cmd == 6) // monster width - cell->stat_width = *data++ + 1; - else if (cmd == 0x47) - { - if (*data == 1) cell->player = data [1]; - else if (*data == 2) cell->player = data [2] + (data [1] << 8); - else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16); - else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24); + cell->stat_width = 1; + cell->stat_hp = *data++; + } + else if (cmd == 6) // monster width + cell->stat_width = *data++ + 1; + else if (cmd == 0x47) + { + if (*data == 1) cell->player = data [1]; + else if (*data == 2) cell->player = data [2] + (data [1] << 8); + else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16); + else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24); - data += *data + 1; - } - else if (cmd == 8) // cell flags - cell->flags = *data++; - else if (ext & 0x40) // unknown, multibyte => skip - data += *data + 1; - else - data++; + data += *data + 1; } - while (ext & 0x80); + else if (cmd == 8) // cell flags + cell->flags = *data++; + else if (ext & 0x40) // unknown, multibyte => skip + data += *data + 1; + else + data++; } - else - cell->darkness = *data++ + 1; + while (ext & 0x80); } for (z = 0; z <= 2; ++z) @@ -2171,7 +2215,7 @@ } } - RETVAL = map_sv; + RETVAL = map_sv; } OUTPUT: RETVAL @@ -2182,10 +2226,7 @@ { int x, y, z; - HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); - uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level - static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) - smooth_key skey; + static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static! int pl_x, pl_y; maptex pl_tex; rc_t *rc = rc_alloc (); @@ -2199,9 +2240,6 @@ if (sw > 255) sw = 255; if (sh > 255) sh = 255; - // clear key, in case of extra padding - memset (&skey, 0, sizeof (skey)); - memset (&key, 0, sizeof (key)); key.r = 255; key.g = 255; @@ -2216,7 +2254,7 @@ // first pass: determine smooth_max // rather ugly, if you ask me // could also be stored inside mapcell and updated on change - memset (smooth_max, 0, sizeof (smooth_max)); + memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1)); for (y = 0; y < sh; y++) if (0 <= y + my && y + my < self->rows) @@ -2241,6 +2279,9 @@ for (z = 0; z <= 2; z++) { + uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level + smooth_key skey; + smooth_hash smooth; memset (smooth_level, 0, sizeof (smooth_level)); key.texname = -1; @@ -2311,19 +2352,19 @@ // ·· ·· ·┏ ┓· // full tile - skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); + skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000); // borders - skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); - skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); - skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); - skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); + skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091); + skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032); + skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064); + skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8); // corners - skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); - skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); - skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); - skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); + skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100); + skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200); + skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400); + skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800); } } @@ -2370,19 +2411,18 @@ int level = (w << 5) | b; HE *he; - hv_iterinit (smooth); - while ((he = hv_iternext (smooth))) + for (auto &&it = smooth.begin (); it != smooth.end (); ++it) { - smooth_key *skey = (smooth_key *)HeKEY (he); - IV bits = SvIVX (HeVAL (he)); + smooth_key &skey = it->first; + IV bits = it->second; if (!(bits & 0x1000) - && skey->level == level - && level > smooth_max [skey->x][skey->y]) + && skey.level == level + && level > smooth_max [skey.x][skey.y]) { - maptex tex = self->tex [skey->tile]; - int px = (((int)skey->x) - 1) * Tw; - int py = (((int)skey->y) - 1) * Th; + maptex tex = self->tex [skey.tile]; + int px = (((int)skey.x) - 1) * Tw; + int py = (((int)skey.y) - 1) * Th; int border = bits & 15; int corner = (bits >> 8) & ~(bits >> 4) & 15; float dx = tex.s * .0625f; // 16 images/row @@ -2394,7 +2434,7 @@ // save gobs of state changes. if (key.texname != tex.name) { - self->tex [skey->tile].unused = 0; + self->tex [skey.tile].unused = 0; glEnd (); glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); @@ -2430,8 +2470,6 @@ glDisable (GL_TEXTURE_2D); key.texname = -1; } - - hv_clear (smooth); } if (pl_tex.name) @@ -2710,14 +2748,14 @@ } } - /* if size is w*h + 5 then no data has been found */ + /* if size is w*h + 5 then no data has been found */ if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) { SvPOK_only (data_sv); SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); } - RETVAL = data_sv; + RETVAL = data_sv; } OUTPUT: RETVAL @@ -2734,7 +2772,7 @@ len = SvLEN (data_sv); SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more - data = SvPVbyte_nolen (data_sv); + data = (uint8_t *)SvPVbyte_nolen (data_sv); end = data + len + 8; if (len < 5) @@ -2805,7 +2843,7 @@ MODULE = Deliantra::Client PACKAGE = DC::RW DC::RW -new (SV *class, SV *data_sv) +new (SV *klass, SV *data_sv) CODE: { STRLEN datalen; @@ -2817,7 +2855,7 @@ RETVAL DC::RW -new_from_file (SV *class, const char *path, const char *mode = "rb") +new_from_file (SV *klass, const char *path, const char *mode = "rb") CODE: RETVAL = SDL_RWFromFile (path, mode); OUTPUT: @@ -2936,7 +2974,7 @@ #endif DC::MixChunk -new (SV *class, DC::RW rwops) +new (SV *klass, DC::RW rwops) CODE: RETVAL = Mix_LoadWAV_RW (rwops, 1); OUTPUT: @@ -3016,7 +3054,7 @@ RETVAL DC::MixMusic -new (SV *class, DC::RW rwops) +new (SV *klass, DC::RW rwops) CODE: RETVAL = Mix_LoadMUS_RW (rwops); OUTPUT: @@ -3179,28 +3217,32 @@ void apple_nvidia_bug (int enable) -char * +const char * gl_vendor () CODE: - RETVAL = (char *)glGetString (GL_VENDOR); + RETVAL = (const char *)glGetString (GL_VENDOR); OUTPUT: RETVAL -char * +const char * gl_version () CODE: - RETVAL = (char *)glGetString (GL_VERSION); + RETVAL = (const char *)glGetString (GL_VERSION); OUTPUT: RETVAL -char * +const char * gl_extensions () CODE: - RETVAL = (char *)glGetString (GL_EXTENSIONS); + RETVAL = (const char *)glGetString (GL_EXTENSIONS); OUTPUT: RETVAL const char *glGetString (GLenum pname) + CODE: + RETVAL = (const char *)glGetString (pname); + OUTPUT: + RETVAL GLint glGetInteger (GLenum pname) CODE: @@ -3413,7 +3455,7 @@ find_widget (SV *self, NV x, NV y) PPCODE: { - if (within_widget (self, x, y)) + if (within_widget (self, x, y)) XPUSHs (self); } @@ -3431,8 +3473,8 @@ draw (SV *self) CODE: { - HV *hv; - SV **svp; + HV *hv; + SV **svp; NV x, y, w, h; SV *draw_x_sv = GvSV (draw_x_gv); SV *draw_y_sv = GvSV (draw_y_gv);