--- deliantra/Deliantra-Client/Client.xs 2008/04/10 14:35:50 1.258 +++ deliantra/Deliantra-Client/Client.xs 2010/05/02 21:22:20 1.305 @@ -21,7 +21,6 @@ # undef pipe // microsoft vs. C # define sqrtf(x) sqrt(x) -# define roundf(x) (int)(x) # define atan2f(x,y) atan2(x,y) # define M_PI 3.14159265f #endif @@ -41,6 +40,13 @@ #include #include +/* work around os x broken headers */ +#ifdef __MACOSX__ +typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); +#endif + #define PANGO_ENABLE_BACKEND #define G_DISABLE_CAST_CHECKS @@ -67,9 +73,21 @@ # include #endif +#if __GNUC__ >= 4 +# define expect(expr,value) __builtin_expect ((expr),(value)) +#else +# define expect(expr,value) (expr) +#endif + +#define expect_false(expr) expect ((expr) != 0, 0) +#define expect_true(expr) expect ((expr) != 0, 1) + #define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ -#define FOW_DARKNESS 32 +/* this is used as fow flag as well, so has to have a different value */ +/* then anything that is computed by incoming darkness */ +#define FOW_DARKNESS 50 +#define DARKNESS_ADJUST(n) (n) #define MAP_EXTEND_X 32 #define MAP_EXTEND_Y 512 @@ -79,11 +97,10 @@ /* mask out modifiers we are not interested in */ #define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) -#if 0 -# define PARACHUTE SDL_INIT_NOPARACHUTE -#else -# define PARACHUTE 0 -#endif +#define KMOD_LRAM 0x10000 // our extension + +#define TEXID_SPEECH 1 +#define TEXID_NOFACE 2 static AV *texture_av; @@ -225,6 +242,7 @@ uint8_t r, g, b, a; tileid smoothtile; uint8_t smoothlevel; + uint8_t unused; /* set to zero on use */ } maptex; typedef struct { @@ -366,6 +384,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) { @@ -389,10 +417,7 @@ cell = row->col + x - row->c0; - cell->darkness = 0; - cell->stat_hp = 0; - cell->flags = 0; - cell->player = 0; + CELL_CLEAR (cell); } } } @@ -514,6 +539,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 @@ -552,6 +629,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), @@ -636,7 +763,38 @@ const_iv (KMOD_CAPS), const_iv (KMOD_MODE), + const_iv (KMOD_LRAM), + const_iv (MIX_DEFAULT_FORMAT), + + const_iv (SDL_INIT_TIMER), + const_iv (SDL_INIT_AUDIO), + const_iv (SDL_INIT_VIDEO), + const_iv (SDL_INIT_CDROM), + const_iv (SDL_INIT_JOYSTICK), + const_iv (SDL_INIT_EVERYTHING), + const_iv (SDL_INIT_NOPARACHUTE), + const_iv (SDL_INIT_EVENTTHREAD), + + const_iv (SDL_GL_RED_SIZE), + const_iv (SDL_GL_GREEN_SIZE), + const_iv (SDL_GL_BLUE_SIZE), + const_iv (SDL_GL_ALPHA_SIZE), + const_iv (SDL_GL_DOUBLEBUFFER), + const_iv (SDL_GL_BUFFER_SIZE), + const_iv (SDL_GL_DEPTH_SIZE), + const_iv (SDL_GL_STENCIL_SIZE), + const_iv (SDL_GL_ACCUM_RED_SIZE), + const_iv (SDL_GL_ACCUM_GREEN_SIZE), + const_iv (SDL_GL_ACCUM_BLUE_SIZE), + const_iv (SDL_GL_ACCUM_ALPHA_SIZE), + const_iv (SDL_GL_STEREO), + const_iv (SDL_GL_MULTISAMPLEBUFFERS), + const_iv (SDL_GL_MULTISAMPLESAMPLES), + const_iv (SDL_GL_ACCELERATED_VISUAL), + const_iv (SDL_GL_SWAP_CONTROL), + + const_iv (FOW_DARKNESS) # undef const_iv }; @@ -668,6 +826,12 @@ IV popcount (UV n) +NV distance (NV dx, NV dy) + CODE: + RETVAL = pow (dx * dx + dy * dy, 0.5); + OUTPUT: + RETVAL + void pango_init () CODE: @@ -682,14 +846,26 @@ #endif } -char * -SDL_GetError () +char *SDL_GetError () -int -SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) +void SDL_braino () -void -SDL_Quit () +int SDL_Init (U32 flags) + +int SDL_InitSubSystem (U32 flags) + +void SDL_QuitSubSystem (U32 flags) + +void SDL_Quit () + +int SDL_GL_SetAttribute (int attr, int value) + +int SDL_GL_GetAttribute (int attr) + CODE: + if (SDL_GL_GetAttribute (attr, &RETVAL)) + XSRETURN_UNDEF; + OUTPUT: + RETVAL void SDL_ListModes (int rgb, int alpha) @@ -711,17 +887,14 @@ SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); -#if SDL_VERSION_ATLEAST(1,2,10) - SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); -#endif m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); if (m && m != (SDL_Rect **)-1) while (*m) { - if ((*m)->w >= 800 && (*m)->h >= 480) + if ((*m)->w >= 400 && (*m)->h >= 300) { AV *av = newAV (); av_push (av, newSViv ((*m)->w)); @@ -759,6 +932,9 @@ #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; } } OUTPUT: @@ -794,8 +970,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; @@ -823,7 +999,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); @@ -853,6 +1029,19 @@ } } +char * +SDL_AudioDriverName () + CODE: +{ + char buf [256]; + if (!SDL_AudioDriverName (buf, sizeof (buf))) + XSRETURN_UNDEF; + + RETVAL = buf; +} + OUTPUT: + RETVAL + int Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) POSTCALL: @@ -926,6 +1115,9 @@ RETVAL void +IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG) + +void load_image_inline (SV *image_) ALIAS: load_image_file = 1 @@ -1049,6 +1241,13 @@ #endif } +int +SvREFCNT (SV *sv) + CODE: + RETVAL = SvREFCNT (sv); + OUTPUT: + RETVAL + MODULE = Deliantra::Client PACKAGE = DC::Font PROTOTYPES: DISABLE @@ -1489,6 +1688,127 @@ } } +void +draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1) + PROTOTYPE: @ + CODE: +{ + glEnable (GL_BLEND); + glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); + glEnable (GL_TEXTURE_2D); + glBindTexture (GL_TEXTURE_2D, name1); + + glColor3f (intensity, intensity, intensity); + glPushMatrix (); + glScalef (1./3, 1./3, 1.); + + if (blend > 0.f) + { + float dx3 = dx * -3.f / w; + float dy3 = dy * -3.f / h; + GLfloat env_color[4] = { 0., 0., 0., blend }; + + /* interpolate the two shadow textures */ + /* stage 0 == rgb(glcolor) + alpha(t0) */ + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + + /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */ + gl.ActiveTexture (GL_TEXTURE1); + glEnable (GL_TEXTURE_2D); + glBindTexture (GL_TEXTURE_2D, name2); + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); + + /* rgb == rgb(glcolor) */ + glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); + glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR); + glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); + + /* alpha = interpolate t0, t1 by env_alpha */ + glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); + + glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE); + glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE); + glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA); + + glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS); + glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); + + glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); + glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); + + glBegin (GL_QUADS); + gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0); + gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h); + gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h); + gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0); + glEnd (); + + glDisable (GL_TEXTURE_2D); + gl.ActiveTexture (GL_TEXTURE0); + } + else + { + /* simple blending of one texture, also opengl <1.3 path */ + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + + glBegin (GL_QUADS); + glTexCoord2f (0, 0); glVertex2f (0, 0); + glTexCoord2f (0, t); glVertex2f (0, h); + glTexCoord2f (s, t); glVertex2f (w, h); + glTexCoord2f (s, 0); glVertex2f (w, 0); + glEnd (); + } + + /* draw ?-marks or equivalent, this is very clumsy code :/ */ + { + int x, y; + int dx3 = dx * 3; + int dy3 = dy * 3; + + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + glBindTexture (GL_TEXTURE_2D, hidden_tex); + glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glTranslatef (-1., -1., 0); + glBegin (GL_QUADS); + + for (y = 1; y < h; y += 3) + { + int y1 = y - dy3; + int y1valid = y1 >= 0 && y1 < h; + + for (x = 1; x < w; x += 3) + { + int x1 = x - dx3; + uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS); + uint8_t h2; + + if (y1valid && x1 >= 0 && x1 < w) + h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS); + else + h2 = 1; /* out of range == invisible */ + + if (h1 || h2) + { + float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend; + glColor4f (1., 1., 1., alpha); + + glTexCoord2f (0, 0.); glVertex2i (x , y ); + glTexCoord2f (0, 1.); glVertex2i (x , y + 3); + glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3); + glTexCoord2f (1, 0.); glVertex2i (x + 3, y ); + } + } + } + } + + glEnd (); + + glPopMatrix (); + + glDisable (GL_TEXTURE_2D); + glDisable (GL_BLEND); +} + IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) CODE: { @@ -1603,6 +1923,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: @@ -1689,10 +2029,10 @@ do { ext = *data++; - cmd = ext & 0x3f; + cmd = ext & 0x7f; if (cmd < 4) - cell->darkness = 255 - ext * 64 + 1; + cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */ else if (cmd == 5) // health { cell->stat_width = 1; @@ -1702,8 +2042,10 @@ cell->stat_width = *data++ + 1; else if (cmd == 0x47) { - if (*data == 4) - ; // decode player count + 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; } @@ -1730,12 +2072,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)); } @@ -1743,7 +2087,7 @@ } } else - cell->darkness = 0; + CELL_CLEAR (cell); } } OUTPUT: @@ -1805,7 +2149,7 @@ RETVAL void -draw (DC::Map self, int mx, int my, int sw, int sh, int T) +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; @@ -1814,12 +2158,16 @@ 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; - - rc_t *rc = rc_alloc (); + int pl_x, pl_y; + maptex pl_tex; + rc_t *rc = rc_alloc (); + rc_t *rc_ov = rc_alloc (); rc_key_t key; rc_array_t *arr; - // thats current max. sorry. + pl_tex.name = 0; + + // that's current max. sorry. if (sw > 255) sw = 255; if (sh > 255) sh = 255; @@ -1833,7 +2181,6 @@ key.a = 255; key.mode = GL_QUADS; key.format = GL_T2F_V3F; - key.texname = -1; mx += self->x; my += self->y; @@ -1867,6 +2214,7 @@ for (z = 0; z <= 2; z++) { memset (smooth_level, 0, sizeof (smooth_level)); + key.texname = -1; for (y = 0; y < sh; y++) if (0 <= y + my && y + my < self->rows) @@ -1886,8 +2234,10 @@ if (key.texname != tex.name) { + self->tex [tile].unused = 0; + if (!tex.name) - tex = self->tex [2]; /* missing, replace by noface */ + tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ key.texname = tex.name; arr = rc_array (rc, &key); @@ -1896,36 +2246,19 @@ px = (x + 1) * T - tex.w; py = (y + 1) * T - tex.h; + if (expect_false (cell->player == player) && expect_false (z == 2)) + { + pl_x = px; + pl_y = py; + pl_tex = tex; + continue; + } + rc_t2f_v3f (arr, 0 , 0 , px , py , 0); rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); - if (cell->flags && z == 2) - { - // overlays such as the speech bubble, probably more to come - if (cell->flags & 1) - { - maptex tex = self->tex [1]; - int px = x * T + T * 2 / 32; - int py = y * T - T * 6 / 32; - - if (tex.name) - { - if (key.texname != tex.name) - { - key.texname = tex.name; - arr = rc_array (rc, &key); - } - - rc_t2f_v3f (arr, 0 , 0 , px , py , 0); - rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); - rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); - rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); - } - } - } - // update smooth hash if (tex.smoothtile) { @@ -1965,6 +2298,27 @@ skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); } } + + if (expect_false (z == 2) && expect_false (cell->flags)) + { + // overlays such as the speech bubble, probably more to come + if (cell->flags & 1) + { + rc_key_t key_ov = key; + maptex tex = self->tex [TEXID_SPEECH]; + rc_array_t *arr; + int px = x * T + T * 2 / 32; + int py = y * T - T * 6 / 32; + + key_ov.texname = tex.name; + arr = rc_array (rc_ov, &key_ov); + + rc_t2f_v3f (arr, 0 , 0 , px , py , 0); + rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); + rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); + rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); + } + } } } @@ -2012,6 +2366,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); @@ -2050,8 +2406,29 @@ hv_clear (smooth); } + if (pl_tex.name) + { + maptex tex = pl_tex; + int px = pl_x + sdx; + int py = pl_y + sdy; + + key.texname = tex.name; + arr = rc_array (rc, &key); + + rc_t2f_v3f (arr, 0 , 0 , px , py , 0); + rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); + rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); + rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); + + rc_draw (rc); + } + + rc_draw (rc_ov); + rc_clear (rc_ov); + glDisable (GL_BLEND); rc_free (rc); + rc_free (rc_ov); // top layer: overlays such as the health bar for (y = 0; y < sh; y++) @@ -2067,6 +2444,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; @@ -2086,36 +2469,42 @@ } void -draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) +draw_magicmap (DC::Map self, int w, int h, unsigned char *data) CODE: { static float color[16][3] = { - { 0.00F, 0.00F, 0.00F }, - { 1.00F, 1.00F, 1.00F }, - { 0.00F, 0.00F, 0.55F }, - { 1.00F, 0.00F, 0.00F }, - - { 1.00F, 0.54F, 0.00F }, - { 0.11F, 0.56F, 1.00F }, - { 0.93F, 0.46F, 0.00F }, - { 0.18F, 0.54F, 0.34F }, - - { 0.56F, 0.73F, 0.56F }, - { 0.80F, 0.80F, 0.80F }, - { 0.55F, 0.41F, 0.13F }, - { 0.99F, 0.77F, 0.26F }, - - { 0.74F, 0.65F, 0.41F }, - - { 0.00F, 1.00F, 1.00F }, - { 1.00F, 0.00F, 1.00F }, - { 1.00F, 1.00F, 0.00F }, + { 0.00f, 0.00f, 0.00f }, + { 1.00f, 1.00f, 1.00f }, + { 0.00f, 0.00f, 0.55f }, + { 1.00f, 0.00f, 0.00f }, + + { 1.00f, 0.54f, 0.00f }, + { 0.11f, 0.56f, 1.00f }, + { 0.93f, 0.46f, 0.00f }, + { 0.18f, 0.54f, 0.34f }, + + { 0.56f, 0.73f, 0.56f }, + { 0.80f, 0.80f, 0.80f }, + { 0.55f, 0.41f, 0.13f }, + { 0.99f, 0.77f, 0.26f }, + + { 0.74f, 0.65f, 0.41f }, + + { 0.00f, 1.00f, 1.00f }, + { 1.00f, 0.00f, 1.00f }, + { 1.00f, 1.00f, 0.00f }, }; int x, y; glEnable (GL_TEXTURE_2D); - glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + /* GL_REPLACE would be correct, as we don't need to modulate alpha, + * but the nvidia driver (185.18.14) mishandles alpha textures + * and takes the colour from god knows where instead of using + * Cp. MODULATE results in the same colour, but slightly different + * alpha, but atcually gives us the correct colour with nvidia. + */ + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glEnable (GL_BLEND); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBegin (GL_QUADS); @@ -2129,10 +2518,10 @@ { float *c = color [m & 15]; - float tx1 = m & 0x40 ? 0.5 : 0.; - float tx2 = tx1 + 0.5; + float tx1 = m & 0x40 ? 0.5f : 0.f; + float tx2 = tx1 + 0.5f; - glColor4f (c[0], c[1], c[2], 0.75); + glColor4f (c[0], c[1], c[2], 1); glTexCoord2f (tx1, 0.); glVertex2i (x , y ); glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); @@ -2150,22 +2539,20 @@ PPCODE: { int x, y; - int sw1 = sw + 2; - int sh1 = sh + 2; - int sh3 = sh * 3; - int sw34 = (sw * 3 + 3) & ~3; + int sw1 = sw + 2; + int sh1 = sh + 2; + int sh3 = sh * 3; + int sw3 = sw * 3; uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); - SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); + SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); SvPOK_only (darkness3_sv); - SvCUR_set (darkness3_sv, sw34 * sh3); + SvCUR_set (darkness3_sv, sw3 * sh3); mx += self->x - 1; my += self->y - 1; - memset (darkness1, 255, sw1 * sh1); - for (y = 0; y < sh1; y++) if (0 <= y + my && y + my < self->rows) { @@ -2177,8 +2564,8 @@ mapcell *cell = row->col + (x + mx - row->c0); darkness1 [y * sw1 + x] = cell->darkness - ? 255 - (cell->darkness - 1) - : 255 - FOW_DARKNESS; + ? DARKNESS_ADJUST (255 - (cell->darkness - 1)) + : DARKNESS_ADJUST (255 - FOW_DARKNESS); } } @@ -2207,21 +2594,21 @@ uint8_t r23 = d23; uint8_t r33 = (d23 + d33 + d32) / 3; - darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); - darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); - darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); - darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); - darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); - darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); - darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); - darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); - darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); + darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11); + darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21); + darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31); + darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12); + darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */ + darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32); + darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13); + darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23); + darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33); } free (darkness1); EXTEND (SP, 3); - PUSHs (sv_2mortal (newSViv (sw34))); + PUSHs (sv_2mortal (newSViv (sw3))); PUSHs (sv_2mortal (newSViv (sh3))); PUSHs (darkness3_sv); } @@ -2294,20 +2681,35 @@ } } - SvPOK_only (data_sv); - SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); - RETVAL = data_sv; + /* 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; } OUTPUT: RETVAL void -set_rect (DC::Map self, int x0, int y0, uint8_t *data) +set_rect (DC::Map self, int x0, int y0, SV *data_sv) PPCODE: { int x, y, z; int w, h; int x1, y1; + STRLEN len; + uint8_t *data, *end; + + len = SvLEN (data_sv); + SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more + data = SvPVbyte_nolen (data_sv); + end = data + len + 8; + + if (len < 5) + XSRETURN_EMPTY; if (*data++ != 0) XSRETURN_EMPTY; /* version mismatch */ @@ -2332,7 +2734,12 @@ for (x = x0; x < x1; x++) { - uint8_t flags = *data++; + uint8_t flags; + + if (data + 7 >= end) + XSRETURN_EMPTY; + + flags = *data++; if (flags) { @@ -2345,7 +2752,8 @@ if (cell->darkness == 0) { - cell->darkness = 0; + /*cell->darkness = 0;*/ + EXTEND (SP, 3); for (z = 0; z <= 2; z++) { @@ -2353,7 +2761,7 @@ if (t >= self->texs || (t && !self->tex [t].name)) { - XPUSHs (sv_2mortal (newSViv (t))); + PUSHs (sv_2mortal (newSViv (t))); need_texid (self, t); } @@ -2408,9 +2816,15 @@ RETVAL = Mix_GroupOldest (-1); if (RETVAL < 0) - XSRETURN_UNDEF; + { + // happens sometimes, maybe it just stopped playing(?) + RETVAL = Mix_GroupAvailable (-1); - Mix_HaltChannel (RETVAL); + if (RETVAL < 0) + XSRETURN_UNDEF; + } + else + Mix_HaltChannel (RETVAL); } Mix_UnregisterAllEffects (RETVAL); @@ -2467,7 +2881,7 @@ CODE: { int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); - int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); + int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f; Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); } @@ -2480,6 +2894,18 @@ PROTOTYPES: DISABLE +void +decoders () + PPCODE: +#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10 + int i, num = Mix_GetNumChunkDecoders (); + EXTEND (SP, num); + for (i = 0; i < num; ++i) + PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0))); +#else + XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); +#endif + DC::MixChunk new (SV *class, DC::RW rwops) CODE: @@ -2521,6 +2947,18 @@ MODULE = Deliantra::Client PACKAGE = DC::MixMusic +void +decoders () + PPCODE: +#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10 + int i, num = Mix_GetNumMusicDecoders (); + EXTEND (SP, num); + for (i = 0; i < num; ++i) + PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0))); +#else + XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); +#endif + int volume (int volume = -1) PROTOTYPE: ;$ @@ -2541,6 +2979,13 @@ CODE: Mix_HaltMusic (); +int +playing () + CODE: + RETVAL = Mix_PlayingMusic (); + OUTPUT: + RETVAL + DC::MixMusic new (SV *class, DC::RW rwops) CODE: @@ -2580,6 +3025,7 @@ const_iv (GL_VENDOR), const_iv (GL_VERSION), const_iv (GL_EXTENSIONS), + const_iv (GL_MAX_TEXTURE_UNITS), const_iv (GL_COLOR_MATERIAL), const_iv (GL_SMOOTH), const_iv (GL_FLAT), @@ -2601,6 +3047,10 @@ const_iv (GL_DST_ALPHA), const_iv (GL_ONE_MINUS_SRC_ALPHA), const_iv (GL_ONE_MINUS_DST_ALPHA), + const_iv (GL_SRC_COLOR), + const_iv (GL_DST_COLOR), + const_iv (GL_ONE_MINUS_SRC_COLOR), + const_iv (GL_ONE_MINUS_DST_COLOR), const_iv (GL_SRC_ALPHA_SATURATE), const_iv (GL_RGB), const_iv (GL_RGBA), @@ -2678,6 +3128,9 @@ const_iv (GL_V3F), const_iv (GL_T2F_V3F), const_iv (GL_T2F_N3F_V3F), + const_iv (GL_FUNC_ADD), + const_iv (GL_FUNC_SUBTRACT), + const_iv (GL_FUNC_REVERSE_SUBTRACT), # undef const_iv }; @@ -2694,6 +3147,9 @@ gl.BlendFuncSeparate = 0; gl.BlendFuncSeparateEXT = 0; +void +apple_nvidia_bug (int enable) + char * gl_vendor () CODE: @@ -2733,6 +3189,8 @@ void glFinish () +void glFlush () + void glClear (int mask) void glClearColor (float r, float g, float b, float a = 1.0) @@ -2752,6 +3210,8 @@ CODE: gl_BlendFuncSeparate (sa, da, saa, daa); +# void glBlendEquation (int se) + void glDepthMask (int flag) void glLogicOp (int opcode) @@ -2795,6 +3255,7 @@ glRotatef (angle, x, y, z); void glColor (float r, float g, float b, float a = 1.0) + PROTOTYPE: @ ALIAS: glColor_premultiply = 1 CODE: @@ -2910,6 +3371,11 @@ void glCallList (int list) +void c_init () + CODE: + glPixelStorei (GL_PACK_ALIGNMENT , 1); + glPixelStorei (GL_UNPACK_ALIGNMENT, 1); + MODULE = Deliantra::Client PACKAGE = DC::UI::Base PROTOTYPES: DISABLE