--- deliantra/Deliantra-Client/Client.xs 2008/07/18 22:32:54 1.264 +++ deliantra/Deliantra-Client/Client.xs 2008/12/04 23:58:20 1.281 @@ -41,6 +41,11 @@ #include #include +/* work around os x broken headers */ +#ifdef __MACOSX__ +typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +#endif + #define PANGO_ENABLE_BACKEND #define G_DISABLE_CAST_CHECKS @@ -78,7 +83,7 @@ #define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ -#define FOW_DARKNESS 32 +#define FOW_DARKNESS 16 #define MAP_EXTEND_X 32 #define MAP_EXTEND_Y 512 @@ -88,6 +93,8 @@ /* mask out modifiers we are not interested in */ #define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) +#define KMOD_LRAM 0x10000 // our extension + static AV *texture_av; static struct @@ -228,6 +235,7 @@ uint8_t r, g, b, a; tileid smoothtile; uint8_t smoothlevel; + uint8_t unused; /* set to zero on use */ } maptex; typedef struct { @@ -369,6 +377,16 @@ self->rows = 0; } +#define CELL_CLEAR(cell) \ + do { \ + if ((cell)->player) \ + (cell)->tile [2] = 0; \ + (cell)->darkness = 0; \ + (cell)->stat_hp = 0; \ + (cell)->flags = 0; \ + (cell)->player = 0; \ + } while (0) + static void map_blank (DC__Map self, int x0, int y0, int w, int h) { @@ -392,10 +410,7 @@ cell = row->col + x - row->c0; - cell->darkness = 0; - cell->stat_hp = 0; - cell->flags = 0; - cell->player = 0; + CELL_CLEAR (cell); } } } @@ -517,6 +532,58 @@ return 1; } +/******************************************************************************/ + +/* process keyboard modifiers */ +static int +mod_munge (int mod) +{ + mod &= MOD_MASK; + + if (mod & (KMOD_META | KMOD_ALT)) + mod |= KMOD_LRAM; + + return mod; +} + +static void +deliantra_main () +{ + char *argv[] = { 0 }; + call_argv ("::main", G_DISCARD | G_VOID, argv); +} + +#ifdef __MACOSX__ + /* 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, + * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, + * and which calls our main (== SDL_main) back. + */ + extern C_LINKAGE int + main (int argc, char *argv[]) + { + deliantra_main (); + } + + #undef main + + extern C_LINKAGE int main (int argc, char *argv[]); + + static void + SDL_braino (void) + { + char *argv[] = { "deliantra client", 0 }; + (main) (1, argv); + } +#else + static void + SDL_braino (void) + { + deliantra_main (); + } +#endif + MODULE = Deliantra::Client PACKAGE = DC PROTOTYPES: ENABLE @@ -555,6 +622,56 @@ const_iv (SDL_APPMOUSEFOCUS), const_iv (SDL_APPACTIVE), + + const_iv (SDLK_UNKNOWN), + const_iv (SDLK_FIRST), + const_iv (SDLK_BACKSPACE), + const_iv (SDLK_TAB), + const_iv (SDLK_CLEAR), + const_iv (SDLK_RETURN), + const_iv (SDLK_PAUSE), + const_iv (SDLK_ESCAPE), + const_iv (SDLK_SPACE), + const_iv (SDLK_EXCLAIM), + const_iv (SDLK_QUOTEDBL), + const_iv (SDLK_HASH), + const_iv (SDLK_DOLLAR), + const_iv (SDLK_AMPERSAND), + const_iv (SDLK_QUOTE), + const_iv (SDLK_LEFTPAREN), + const_iv (SDLK_RIGHTPAREN), + const_iv (SDLK_ASTERISK), + const_iv (SDLK_PLUS), + const_iv (SDLK_COMMA), + const_iv (SDLK_MINUS), + const_iv (SDLK_PERIOD), + const_iv (SDLK_SLASH), + const_iv (SDLK_0), + const_iv (SDLK_1), + const_iv (SDLK_2), + const_iv (SDLK_3), + const_iv (SDLK_4), + const_iv (SDLK_5), + const_iv (SDLK_6), + const_iv (SDLK_7), + const_iv (SDLK_8), + const_iv (SDLK_9), + const_iv (SDLK_COLON), + const_iv (SDLK_SEMICOLON), + const_iv (SDLK_LESS), + const_iv (SDLK_EQUALS), + const_iv (SDLK_GREATER), + const_iv (SDLK_QUESTION), + const_iv (SDLK_AT), + + const_iv (SDLK_LEFTBRACKET), + const_iv (SDLK_BACKSLASH), + const_iv (SDLK_RIGHTBRACKET), + const_iv (SDLK_CARET), + const_iv (SDLK_UNDERSCORE), + const_iv (SDLK_BACKQUOTE), + const_iv (SDLK_DELETE), + const_iv (SDLK_FIRST), const_iv (SDLK_LAST), const_iv (SDLK_KP0), @@ -639,6 +756,8 @@ const_iv (KMOD_CAPS), const_iv (KMOD_MODE), + const_iv (KMOD_LRAM), + const_iv (MIX_DEFAULT_FORMAT), const_iv (SDL_INIT_TIMER), @@ -666,7 +785,9 @@ const_iv (SDL_GL_MULTISAMPLEBUFFERS), const_iv (SDL_GL_MULTISAMPLESAMPLES), const_iv (SDL_GL_ACCELERATED_VISUAL), - const_iv (SDL_GL_SWAP_CONTROL) + const_iv (SDL_GL_SWAP_CONTROL), + + const_iv (FOW_DARKNESS) # undef const_iv }; @@ -714,6 +835,8 @@ char *SDL_GetError () +void SDL_braino () + int SDL_Init (U32 flags) int SDL_InitSubSystem (U32 flags) @@ -758,12 +881,15 @@ if (m && m != (SDL_Rect **)-1) while (*m) { - AV *av = newAV (); - av_push (av, newSViv ((*m)->w)); - av_push (av, newSViv ((*m)->h)); - av_push (av, newSViv (rgb)); - av_push (av, newSViv (alpha)); - XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); + if ((*m)->w >= 400 && (*m)->h >= 300) + { + AV *av = newAV (); + av_push (av, newSViv ((*m)->w)); + av_push (av, newSViv ((*m)->h)); + av_push (av, newSViv (rgb)); + av_push (av, newSViv (alpha)); + XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); + } ++m; } @@ -828,8 +954,8 @@ case SDL_KEYUP: hv_store (hv, "state", 5, newSViv (ev.key.state), 0); hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); - hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); - hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ + hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0); + hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */ hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); break; @@ -857,7 +983,7 @@ SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); } - hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); + hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0); hv_store (hv, "state", 5, newSViv (state), 0); hv_store (hv, "x", 1, newSViv (x), 0); hv_store (hv, "y", 1, newSViv (y), 0); @@ -1083,6 +1209,13 @@ #endif } +int +SvREFCNT (SV *sv) + CODE: + RETVAL = SvREFCNT (sv); + OUTPUT: + RETVAL + MODULE = Deliantra::Client PACKAGE = DC::Font PROTOTYPES: DISABLE @@ -1637,6 +1770,26 @@ glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } +void +expire_textures (DC::Map self, int texid, int count) + PPCODE: + for (; texid < self->texs && count; ++texid, --count) + { + maptex *tex = self->tex + texid; + + if (tex->name) + { + if (tex->unused) + { + tex->name = 0; + tex->unused = 0, + XPUSHs (sv_2mortal (newSViv (texid))); + } + else + tex->unused = 1; + } + } + int ox (DC::Map self) ALIAS: @@ -1766,12 +1919,14 @@ if (cell->tile [z]) { maptex *tex = self->tex + cell->tile [z]; + tex->unused = 0; if (!tex->name) av_push (missing, newSViv (cell->tile [z])); if (tex->smoothtile) { maptex *smooth = self->tex + tex->smoothtile; + smooth->unused = 0; if (!smooth->name) av_push (missing, newSViv (tex->smoothtile)); } @@ -1779,7 +1934,7 @@ } } else - cell->darkness = 0; + CELL_CLEAR (cell); } } OUTPUT: @@ -1841,7 +1996,7 @@ RETVAL void -draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) +draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) CODE: { int x, y, z; @@ -1926,6 +2081,8 @@ if (key.texname != tex.name) { + self->tex [tile].unused = 0; + if (!tex.name) tex = self->tex [2]; /* missing, replace by noface */ @@ -2057,6 +2214,8 @@ // save gobs of state changes. if (key.texname != tex.name) { + self->tex [skey->tile].unused = 0; + glEnd (); glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); glBegin (GL_QUADS); @@ -2098,8 +2257,8 @@ if (pl_tex.name) { maptex tex = pl_tex; - int px = pl_x + pdx; - int py = pl_y + pdy; + int px = pl_x + sdx; + int py = pl_y + sdy; key.texname = tex.name; arr = rc_array (rc, &key); @@ -2129,6 +2288,12 @@ int px = x * T; int py = y * T; + if (expect_false (cell->player == player)) + { + px += sdx; + py += sdy; + } + if (cell->stat_hp) { int width = cell->stat_width * T; @@ -2226,7 +2391,7 @@ mx += self->x - 1; my += self->y - 1; - memset (darkness1, 255, sw1 * sh1); + memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1); for (y = 0; y < sh1; y++) if (0 <= y + my && y + my < self->rows) @@ -2878,6 +3043,7 @@ glRotatef (angle, x, y, z); void glColor (float r, float g, float b, float a = 1.0) + PROTOTYPE: @ ALIAS: glColor_premultiply = 1 CODE: