X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_brush.c;h=eba42f526e937d9191ff8708d46d1a1677872b3f;hb=48dd658f8bbfa60efbd5f56d1c208727c4418078;hp=08040c79faa60e4d9a150c30e4bbf17f53894d60;hpb=764d427c5ca3d15a9d85d38f94aa0ddc85f8677d;p=xonotic%2Fdarkplaces.git diff --git a/model_brush.c b/model_brush.c index 08040c79..eba42f52 100644 --- a/model_brush.c +++ b/model_brush.c @@ -38,6 +38,10 @@ cvar_t r_subdivisions_collision_tolerance = {0, "r_subdivisions_collision_tolera cvar_t r_subdivisions_collision_mintess = {0, "r_subdivisions_collision_mintess", "0", "minimum number of subdivisions (values above 0 will smooth curves that don't need it)"}; cvar_t r_subdivisions_collision_maxtess = {0, "r_subdivisions_collision_maxtess", "1024", "maximum number of subdivisions (prevents curves beyond a certain detail level, limits smoothing)"}; cvar_t r_subdivisions_collision_maxvertices = {0, "r_subdivisions_collision_maxvertices", "4225", "maximum vertices allowed per subdivided curve"}; +cvar_t r_trippy = {0, "r_trippy", "0", "easter egg"}; +cvar_t r_fxaa = {CVAR_SAVE, "r_fxaa", "0", "fast approximate anti aliasing"}; +cvar_t mod_noshader_default_offsetmapping = {CVAR_SAVE, "mod_noshader_default_offsetmapping", "1", "use offsetmapping by default on all surfaces that are not using q3 shader files"}; +cvar_t mod_obj_orientation = {0, "mod_obj_orientation", "1", "fix orientation of OBJ models to the usual conventions (if zero, use coordinates as is)"}; cvar_t mod_q3bsp_curves_collisions = {0, "mod_q3bsp_curves_collisions", "1", "enables collisions with curves (SLOW)"}; cvar_t mod_q3bsp_curves_collisions_stride = {0, "mod_q3bsp_curves_collisions_stride", "16", "collisions against curves: optimize performance by doing a combined collision check for this triangle amount first (-1 avoids any box tests)"}; cvar_t mod_q3bsp_curves_stride = {0, "mod_q3bsp_curves_stride", "16", "particle effect collisions against curves: optimize performance by doing a combined collision check for this triangle amount first (-1 avoids any box tests)"}; @@ -46,9 +50,14 @@ cvar_t mod_q3bsp_debugtracebrush = {0, "mod_q3bsp_debugtracebrush", "0", "select cvar_t mod_q3bsp_lightmapmergepower = {CVAR_SAVE, "mod_q3bsp_lightmapmergepower", "4", "merges the quake3 128x128 lightmap textures into larger lightmap group textures to speed up rendering, 1 = 256x256, 2 = 512x512, 3 = 1024x1024, 4 = 2048x2048, 5 = 4096x4096, ..."}; cvar_t mod_q3bsp_nolightmaps = {CVAR_SAVE, "mod_q3bsp_nolightmaps", "0", "do not load lightmaps in Q3BSP maps (to save video RAM, but be warned: it looks ugly)"}; cvar_t mod_q3bsp_tracelineofsight_brushes = {0, "mod_q3bsp_tracelineofsight_brushes", "0", "enables culling of entities behind detail brushes, curves, etc"}; -cvar_t mod_q3shader_default_offsetmapping = {CVAR_SAVE, "mod_q3shader_default_offsetmapping", "1", "use offsetmapping by default on all surfaces"}; +cvar_t mod_q3bsp_sRGBlightmaps = {0, "mod_q3bsp_sRGBlightmaps", "0", "treat lightmaps from Q3 maps as sRGB when vid_sRGB is active"}; +cvar_t mod_q3shader_default_offsetmapping = {CVAR_SAVE, "mod_q3shader_default_offsetmapping", "1", "use offsetmapping by default on all surfaces that are using q3 shader files"}; +cvar_t mod_q3shader_default_offsetmapping_scale = {CVAR_SAVE, "mod_q3shader_default_offsetmapping_scale", "1", "default scale used for offsetmapping"}; +cvar_t mod_q3shader_default_offsetmapping_bias = {CVAR_SAVE, "mod_q3shader_default_offsetmapping_bias", "0", "default bias used for offsetmapping"}; cvar_t mod_q3shader_default_polygonfactor = {0, "mod_q3shader_default_polygonfactor", "0", "biases depth values of 'polygonoffset' shaders to prevent z-fighting artifacts"}; cvar_t mod_q3shader_default_polygonoffset = {0, "mod_q3shader_default_polygonoffset", "-2", "biases depth values of 'polygonoffset' shaders to prevent z-fighting artifacts"}; +cvar_t mod_q3shader_force_addalpha = {0, "mod_q3shader_force_addalpha", "0", "treat GL_ONE GL_ONE (or add) blendfunc as GL_SRC_ALPHA GL_ONE for compatibility with older DarkPlaces releases"}; +cvar_t mod_q3shader_force_terrain_alphaflag = {0, "mod_q3shader_force_terrain_alphaflag", "0", "for multilayered terrain shaders force TEXF_ALPHA flag on both layers"}; cvar_t mod_q1bsp_polygoncollisions = {0, "mod_q1bsp_polygoncollisions", "0", "disables use of precomputed cliphulls and instead collides with polygons (uses Bounding Interval Hierarchy optimizations)"}; cvar_t mod_collision_bih = {0, "mod_collision_bih", "1", "enables use of generated Bounding Interval Hierarchy tree instead of compiled bsp tree in collision code"}; @@ -74,6 +83,10 @@ void Mod_BrushInit(void) Cvar_RegisterVariable(&r_subdivisions_collision_mintess); Cvar_RegisterVariable(&r_subdivisions_collision_maxtess); Cvar_RegisterVariable(&r_subdivisions_collision_maxvertices); + Cvar_RegisterVariable(&r_trippy); + Cvar_RegisterVariable(&r_fxaa); + Cvar_RegisterVariable(&mod_noshader_default_offsetmapping); + Cvar_RegisterVariable(&mod_obj_orientation); Cvar_RegisterVariable(&mod_q3bsp_curves_collisions); Cvar_RegisterVariable(&mod_q3bsp_curves_collisions_stride); Cvar_RegisterVariable(&mod_q3bsp_curves_stride); @@ -81,14 +94,24 @@ void Mod_BrushInit(void) Cvar_RegisterVariable(&mod_q3bsp_debugtracebrush); Cvar_RegisterVariable(&mod_q3bsp_lightmapmergepower); Cvar_RegisterVariable(&mod_q3bsp_nolightmaps); + Cvar_RegisterVariable(&mod_q3bsp_sRGBlightmaps); Cvar_RegisterVariable(&mod_q3bsp_tracelineofsight_brushes); Cvar_RegisterVariable(&mod_q3shader_default_offsetmapping); + Cvar_RegisterVariable(&mod_q3shader_default_offsetmapping_scale); + Cvar_RegisterVariable(&mod_q3shader_default_offsetmapping_bias); Cvar_RegisterVariable(&mod_q3shader_default_polygonfactor); Cvar_RegisterVariable(&mod_q3shader_default_polygonoffset); + Cvar_RegisterVariable(&mod_q3shader_force_addalpha); + Cvar_RegisterVariable(&mod_q3shader_force_terrain_alphaflag); Cvar_RegisterVariable(&mod_q1bsp_polygoncollisions); Cvar_RegisterVariable(&mod_collision_bih); Cvar_RegisterVariable(&mod_recalculatenodeboxes); + // these games were made for older DP engines and are no longer + // maintained; use this hack to show their textures properly + if(gamemode == GAME_NEXUIZ) + Cvar_SetQuick(&mod_q3shader_force_addalpha, "1"); + memset(&mod_q1bsp_texture_solid, 0, sizeof(mod_q1bsp_texture_solid)); strlcpy(mod_q1bsp_texture_solid.name, "solid" , sizeof(mod_q1bsp_texture_solid.name)); mod_q1bsp_texture_solid.surfaceflags = 0; @@ -882,6 +905,8 @@ static void Mod_Q1BSP_TracePoint(struct model_s *model, const frameblend_t *fram Mod_Q1BSP_RecursiveHullCheckPoint(&rhc, rhc.hull->firstclipnode); } +static void Mod_Q1BSP_TraceLineAgainstSurfaces(struct model_s *model, const frameblend_t *frameblend, const skeleton_t *skeleton, trace_t *trace, const vec3_t start, const vec3_t end, int hitsupercontentsmask); + static void Mod_Q1BSP_TraceLine(struct model_s *model, const frameblend_t *frameblend, const skeleton_t *skeleton, trace_t *trace, const vec3_t start, const vec3_t end, int hitsupercontentsmask) { RecursiveHullCheckTraceInfo_t rhc; @@ -892,6 +917,13 @@ static void Mod_Q1BSP_TraceLine(struct model_s *model, const frameblend_t *frame return; } + // sometimes we want to traceline against polygons so we can report the texture that was hit rather than merely a contents, but using this method breaks one of negke's maps so it must be a cvar check... + if (sv_gameplayfix_q1bsptracelinereportstexture.integer) + { + Mod_Q1BSP_TraceLineAgainstSurfaces(model, frameblend, skeleton, trace, start, end, hitsupercontentsmask); + return; + } + memset(&rhc, 0, sizeof(rhc)); memset(trace, 0, sizeof(trace_t)); rhc.trace = trace; @@ -1155,7 +1187,7 @@ void Collision_ClipTrace_Point(trace_t *trace, const vec3_t cmins, const vec3_t static qboolean Mod_Q1BSP_TraceLineOfSight(struct model_s *model, const vec3_t start, const vec3_t end) { trace_t trace; - model->TraceLine(model, NULL, NULL, &trace, start, end, SUPERCONTENTS_VISBLOCKERMASK); + Mod_Q1BSP_TraceLine(model, NULL, NULL, &trace, start, end, SUPERCONTENTS_VISBLOCKERMASK); return trace.fraction == 1; } @@ -1210,7 +1242,8 @@ loc0: // check for impact on this node if (node->numsurfaces) { - int i, dsi, dti, lmwidth, lmheight; + unsigned int i; + int dsi, dti, lmwidth, lmheight; float ds, dt; msurface_t *surface; unsigned char *lightmap; @@ -1278,7 +1311,7 @@ loc0: } } -void Mod_Q1BSP_LightPoint(dp_model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal) +static void Mod_Q1BSP_LightPoint(dp_model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal) { // pretend lighting is coming down from above (due to lack of a lightgrid to know primary lighting direction) VectorSet(diffusenormal, 0, 0, 1); @@ -1295,7 +1328,7 @@ void Mod_Q1BSP_LightPoint(dp_model_t *model, const vec3_t p, vec3_t ambientcolor static const texture_t *Mod_Q1BSP_TraceLineAgainstSurfacesFindTextureOnNode(RecursiveHullCheckTraceInfo_t *t, const dp_model_t *model, const mnode_t *node, double mid[3]) { - int i; + unsigned int i; int j; int k; const msurface_t *surface; @@ -1516,7 +1549,7 @@ R_Q1BSP_LoadSplitSky A sky texture is 256*128, with the right side being a masked overlay ============== */ -void R_Q1BSP_LoadSplitSky (unsigned char *src, int width, int height, int bytesperpixel) +static void R_Q1BSP_LoadSplitSky (unsigned char *src, int width, int height, int bytesperpixel) { int x, y; int w = width/2; @@ -1576,40 +1609,38 @@ void R_Q1BSP_LoadSplitSky (unsigned char *src, int width, int height, int bytesp } } - loadmodel->brush.solidskyskinframe = R_SkinFrame_LoadInternalBGRA("sky_solidtexture", 0 , (unsigned char *) solidpixels, w, h); - loadmodel->brush.alphaskyskinframe = R_SkinFrame_LoadInternalBGRA("sky_alphatexture", TEXF_ALPHA, (unsigned char *) alphapixels, w, h); + loadmodel->brush.solidskyskinframe = R_SkinFrame_LoadInternalBGRA("sky_solidtexture", 0 , (unsigned char *) solidpixels, w, h, vid.sRGB3D); + loadmodel->brush.alphaskyskinframe = R_SkinFrame_LoadInternalBGRA("sky_alphatexture", TEXF_ALPHA, (unsigned char *) alphapixels, w, h, vid.sRGB3D); Mem_Free(solidpixels); Mem_Free(alphapixels); } -static void Mod_Q1BSP_LoadTextures(lump_t *l) +static void Mod_Q1BSP_LoadTextures(sizebuf_t *sb) { - int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete; + int i, j, k, num, max, altmax, mtwidth, mtheight, doffset, incomplete, nummiptex = 0; skinframe_t *skinframe; - miptex_t *dmiptex; texture_t *tx, *tx2, *anims[10], *altanims[10]; texture_t backuptex; - dmiptexlump_t *m; unsigned char *data, *mtdata; const char *s; char mapname[MAX_QPATH], name[MAX_QPATH]; - unsigned char zero[4]; - - memset(zero, 0, sizeof(zero)); + unsigned char zeroopaque[4], zerotrans[4]; + sizebuf_t miptexsb; + char vabuf[1024]; + Vector4Set(zeroopaque, 0, 0, 0, 255); + Vector4Set(zerotrans, 0, 0, 0, 128); loadmodel->data_textures = NULL; // add two slots for notexture walls and notexture liquids - if (l->filelen) + if (sb->cursize) { - m = (dmiptexlump_t *)(mod_base + l->fileofs); - m->nummiptex = LittleLong (m->nummiptex); - loadmodel->num_textures = m->nummiptex + 2; + nummiptex = MSG_ReadLittleLong(sb); + loadmodel->num_textures = nummiptex + 2; loadmodel->num_texturesperskin = loadmodel->num_textures; } else { - m = NULL; loadmodel->num_textures = 2; loadmodel->num_texturesperskin = loadmodel->num_textures; } @@ -1655,13 +1686,17 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) tx->reflectfactor = 1; Vector4Set(tx->reflectcolor4f, 1, 1, 1, 1); tx->r_water_wateralpha = 1; - tx->offsetmapping = OFFSETMAPPING_OFF; + tx->offsetmapping = OFFSETMAPPING_DEFAULT; tx->offsetscale = 1; + tx->offsetbias = 0; tx->specularscalemod = 1; tx->specularpowermod = 1; + tx->transparentsort = TRANSPARENTSORT_DISTANCE; + // WHEN ADDING DEFAULTS HERE, REMEMBER TO PUT DEFAULTS IN ALL LOADERS + // JUST GREP FOR "specularscalemod = 1". } - if (!m) + if (!sb->cursize) { Con_Printf("%s: no miptex lump to load textures from\n", loadmodel->name); return; @@ -1673,26 +1708,29 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) FS_StripExtension(s, mapname, sizeof(mapname)); // just to work around bounds checking when debugging with it (array index out of bounds error thing) - dofs = m->dataofs; // LordHavoc: mostly rewritten map texture loader - for (i = 0;i < m->nummiptex;i++) + for (i = 0;i < nummiptex;i++) { - dofs[i] = LittleLong(dofs[i]); + doffset = MSG_ReadLittleLong(sb); if (r_nosurftextures.integer) continue; - if (dofs[i] == -1) + if (doffset == -1) { Con_DPrintf("%s: miptex #%i missing\n", loadmodel->name, i); continue; } - dmiptex = (miptex_t *)((unsigned char *)m + dofs[i]); + + MSG_InitReadBuffer(&miptexsb, sb->data + doffset, sb->cursize - doffset); // copy name, but only up to 16 characters // (the output buffer can hold more than this, but the input buffer is // only 16) - for (j = 0;j < 16 && dmiptex->name[j];j++) - name[j] = dmiptex->name[j]; + for (j = 0;j < 16;j++) + name[j] = MSG_ReadByte(&miptexsb); name[j] = 0; + // pretty up the buffer (replacing any trailing garbage with 0) + for (j = strlen(name);j < 16;j++) + name[j] = 0; if (!name[0]) { @@ -1700,23 +1738,23 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) Con_DPrintf("%s: warning: renaming unnamed texture to %s\n", loadmodel->name, name); } - mtwidth = LittleLong(dmiptex->width); - mtheight = LittleLong(dmiptex->height); + mtwidth = MSG_ReadLittleLong(&miptexsb); + mtheight = MSG_ReadLittleLong(&miptexsb); mtdata = NULL; - j = LittleLong(dmiptex->offsets[0]); + j = MSG_ReadLittleLong(&miptexsb); if (j) { // texture included - if (j < 40 || j + mtwidth * mtheight > l->filelen) + if (j < 40 || j + mtwidth * mtheight > miptexsb.cursize) { - Con_Printf("%s: Texture \"%s\" is corrupt or incomplete\n", loadmodel->name, dmiptex->name); + Con_Printf("%s: Texture \"%s\" is corrupt or incomplete\n", loadmodel->name, name); continue; } - mtdata = (unsigned char *)dmiptex + j; + mtdata = miptexsb.data + j; } if ((mtwidth & 15) || (mtheight & 15)) - Con_DPrintf("%s: warning: texture \"%s\" is not 16 aligned\n", loadmodel->name, dmiptex->name); + Con_DPrintf("%s: warning: texture \"%s\" is not 16 aligned\n", loadmodel->name, name); // LordHavoc: force all names to lowercase for (j = 0;name[j];j++) @@ -1725,7 +1763,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) // LordHavoc: backup the texture_t because q3 shader loading overwrites it backuptex = loadmodel->data_textures[i]; - if (dmiptex->name[0] && Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i, name, false, false, 0)) + if (name[0] && Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i, name, false, false, 0)) continue; loadmodel->data_textures[i] = backuptex; @@ -1756,6 +1794,8 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) { tx->supercontents = mod_q1bsp_texture_sky.supercontents; tx->surfaceflags = mod_q1bsp_texture_sky.surfaceflags; + // for the surface traceline we need to hit this surface as a solid... + tx->supercontents |= SUPERCONTENTS_SOLID; } else { @@ -1768,9 +1808,9 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) // LordHavoc: HL sky textures are entirely different than quake if (!loadmodel->brush.ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == mtheight * 2) { - data = loadimagepixelsbgra(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), false, false, r_texture_convertsRGB_skin.integer != 0, NULL); + data = loadimagepixelsbgra(gamemode == GAME_TENEBRAE ? tx->name : va(vabuf, sizeof(vabuf), "textures/%s/%s", mapname, tx->name), false, false, false, NULL); if (!data) - data = loadimagepixelsbgra(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), false, false, r_texture_convertsRGB_skin.integer != 0, NULL); + data = loadimagepixelsbgra(gamemode == GAME_TENEBRAE ? tx->name : va(vabuf, sizeof(vabuf), "textures/%s", tx->name), false, false, false, NULL); if (data && image_width == image_height * 2) { R_Q1BSP_LoadSplitSky(data, image_width, image_height, 4); @@ -1781,9 +1821,11 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) } else { - skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS, false); + skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va(vabuf, sizeof(vabuf), "textures/%s/%s", mapname, tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS, false); if (!skinframe) - skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS, false); + skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va(vabuf, sizeof(vabuf), "textures/%s", tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS, false); + if (skinframe) + tx->offsetmapping = OFFSETMAPPING_DEFAULT; // allow offsetmapping on external textures without a q3 shader if (!skinframe) { // did not find external texture, load it from the bsp or wad3 @@ -1793,14 +1835,14 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) unsigned char *pixels, *freepixels; pixels = freepixels = NULL; if (mtdata) - pixels = W_ConvertWAD3TextureBGRA(dmiptex); + pixels = W_ConvertWAD3TextureBGRA(&miptexsb); if (pixels == NULL) pixels = freepixels = W_GetTextureBGRA(tx->name); if (pixels != NULL) { tx->width = image_width; tx->height = image_height; - skinframe = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP, pixels, image_width, image_height); + skinframe = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP, pixels, image_width, image_height, true); } if (freepixels) Mem_Free(freepixels); @@ -1812,48 +1854,48 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) if (skinframe) tx->skinframes[0] = skinframe; } - - tx->basematerialflags = MATERIALFLAG_WALL; - if (tx->name[0] == '*') - { - // LordHavoc: some turbulent textures should not be affected by wateralpha - if (!strncmp(tx->name, "*glassmirror", 12)) // Tenebrae - { - // replace the texture with transparent black - Vector4Set(zero, 128, 128, 128, 128); - tx->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_MIPMAP | TEXF_ALPHA, zero, 1, 1); - tx->basematerialflags |= MATERIALFLAG_NOSHADOW | MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_REFLECTION; - } - else if (!strncmp(tx->name,"*lava",5) - || !strncmp(tx->name,"*teleport",9) - || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture - tx->basematerialflags |= MATERIALFLAG_WATERSCROLL | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_NOSHADOW; - else - tx->basematerialflags |= MATERIALFLAG_WATERSCROLL | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_NOSHADOW | MATERIALFLAG_WATERALPHA | MATERIALFLAG_WATERSHADER; - if (tx->skinframes[0] && tx->skinframes[0]->hasalpha) - tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; - } + // LordHavoc: some Tenebrae textures get replaced by black + if (!strncmp(tx->name, "*glassmirror", 12)) // Tenebrae + tx->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_MIPMAP | TEXF_ALPHA, zerotrans, 1, 1, false); else if (!strncmp(tx->name, "mirror", 6)) // Tenebrae - { - // replace the texture with black - tx->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, 0, zero, 1, 1); - tx->basematerialflags |= MATERIALFLAG_REFLECTION; - } - else if (!strncmp(tx->name, "sky", 3)) - tx->basematerialflags = MATERIALFLAG_SKY | MATERIALFLAG_NOSHADOW; - else if (!strcmp(tx->name, "caulk")) - tx->basematerialflags = MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW; - else if (tx->skinframes[0] && tx->skinframes[0]->hasalpha) - tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; + tx->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, 0, zeroopaque, 1, 1, false); + } - // start out with no animation - tx->currentframe = tx; - tx->currentskinframe = tx->skinframes[0]; + tx->basematerialflags = MATERIALFLAG_WALL; + if (tx->name[0] == '*') + { + // LordHavoc: some turbulent textures should not be affected by wateralpha + if (!strncmp(tx->name, "*glassmirror", 12)) // Tenebrae + tx->basematerialflags |= MATERIALFLAG_NOSHADOW | MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_REFLECTION; + else if (!strncmp(tx->name,"*lava",5) + || !strncmp(tx->name,"*teleport",9) + || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture + tx->basematerialflags |= MATERIALFLAG_WATERSCROLL | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_NOSHADOW; + else + tx->basematerialflags |= MATERIALFLAG_WATERSCROLL | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_NOSHADOW | MATERIALFLAG_WATERALPHA | MATERIALFLAG_WATERSHADER; + if (tx->skinframes[0] && tx->skinframes[0]->hasalpha) + tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; } + else if (!strncmp(tx->name, "mirror", 6)) // Tenebrae + { + // replace the texture with black + tx->basematerialflags |= MATERIALFLAG_REFLECTION; + } + else if (!strncmp(tx->name, "sky", 3)) + tx->basematerialflags = MATERIALFLAG_SKY | MATERIALFLAG_NOSHADOW; + else if (!strcmp(tx->name, "caulk")) + tx->basematerialflags = MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW; + else if (tx->skinframes[0] && tx->skinframes[0]->hasalpha) + tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; + + // start out with no animation + tx->currentframe = tx; + tx->currentskinframe = tx->skinframes[0]; + tx->currentmaterialflags = tx->basematerialflags; } // sequence the animations - for (i = 0;i < m->nummiptex;i++) + for (i = 0;i < nummiptex;i++) { tx = loadmodel->data_textures + i; if (!tx || tx->name[0] != '+' || tx->name[1] == 0 || tx->name[2] == 0) @@ -1865,7 +1907,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) memset(anims, 0, sizeof(anims)); memset(altanims, 0, sizeof(altanims)); - for (j = i;j < m->nummiptex;j++) + for (j = i;j < nummiptex;j++) { tx2 = loadmodel->data_textures + j; if (!tx2 || tx2->name[0] != '+' || strcmp(tx2->name+2, tx->name+2)) @@ -1954,7 +1996,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) } } -static void Mod_Q1BSP_LoadLighting(lump_t *l) +static void Mod_Q1BSP_LoadLighting(sizebuf_t *sb) { int i; unsigned char *in, *out, *data, d; @@ -1963,9 +2005,9 @@ static void Mod_Q1BSP_LoadLighting(lump_t *l) fs_offset_t filesize; if (loadmodel->brush.ishlbsp) // LordHavoc: load the colored lighting data straight { - loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen); - for (i=0; ifilelen; i++) - loadmodel->brushq1.lightdata[i] = mod_base[l->fileofs+i] >>= 1; + loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, sb->cursize); + for (i = 0;i < sb->cursize;i++) + loadmodel->brushq1.lightdata[i] = sb->data[i] >>= 1; } else // LordHavoc: bsp version 29 (normal white lighting) { @@ -1978,7 +2020,7 @@ static void Mod_Q1BSP_LoadLighting(lump_t *l) data = (unsigned char*) FS_LoadFile(litfilename, tempmempool, false, &filesize); if (data) { - if (filesize == (fs_offset_t)(8 + l->filelen * 3) && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T') + if (filesize == (fs_offset_t)(8 + sb->cursize * 3) && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T') { i = LittleLong(((int *)data)[1]); if (i == 1) @@ -1991,7 +2033,7 @@ static void Mod_Q1BSP_LoadLighting(lump_t *l) data = (unsigned char*) FS_LoadFile(dlitfilename, tempmempool, false, &filesize); if (data) { - if (filesize == (fs_offset_t)(8 + l->filelen * 3) && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T') + if (filesize == (fs_offset_t)(8 + sb->cursize * 3) && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T') { i = LittleLong(((int *)data)[1]); if (i == 1) @@ -2015,7 +2057,7 @@ static void Mod_Q1BSP_LoadLighting(lump_t *l) else if (filesize == 8) Con_Print("Empty .lit file, ignoring\n"); else - Con_Printf("Corrupt .lit file (file size %i bytes, should be %i bytes), ignoring\n", (int) filesize, (int) (8 + l->filelen * 3)); + Con_Printf("Corrupt .lit file (file size %i bytes, should be %i bytes), ignoring\n", (int) filesize, (int) (8 + sb->cursize * 3)); if (data) { Mem_Free(data); @@ -2023,12 +2065,12 @@ static void Mod_Q1BSP_LoadLighting(lump_t *l) } } // LordHavoc: oh well, expand the white lighting data - if (!l->filelen) + if (!sb->cursize) return; - loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen*3); - in = mod_base + l->fileofs; + loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, sb->cursize*3); + in = sb->data; out = loadmodel->brushq1.lightdata; - for (i = 0;i < l->filelen;i++) + for (i = 0;i < sb->cursize;i++) { d = *in++; *out++ = d; @@ -2038,15 +2080,15 @@ static void Mod_Q1BSP_LoadLighting(lump_t *l) } } -static void Mod_Q1BSP_LoadVisibility(lump_t *l) +static void Mod_Q1BSP_LoadVisibility(sizebuf_t *sb) { loadmodel->brushq1.num_compressedpvs = 0; loadmodel->brushq1.data_compressedpvs = NULL; - if (!l->filelen) + if (!sb->cursize) return; - loadmodel->brushq1.num_compressedpvs = l->filelen; - loadmodel->brushq1.data_compressedpvs = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen); - memcpy(loadmodel->brushq1.data_compressedpvs, mod_base + l->fileofs, l->filelen); + loadmodel->brushq1.num_compressedpvs = sb->cursize; + loadmodel->brushq1.data_compressedpvs = (unsigned char *)Mem_Alloc(loadmodel->mempool, sb->cursize); + MSG_ReadBytes(sb, sb->cursize, loadmodel->brushq1.data_compressedpvs); } // used only for HalfLife maps @@ -2056,13 +2098,13 @@ static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data) int i, j, k; if (!data) return; - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) return; // error if (com_token[0] != '{') return; // error while (1) { - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) return; // error if (com_token[0] == '}') break; // end of worldspawn @@ -2072,7 +2114,7 @@ static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data) strlcpy(key, com_token, sizeof(key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) return; // error dpsnprintf(value, sizeof(value), "%s", com_token); if (!strcmp("wad", key)) // for HalfLife maps @@ -2106,78 +2148,52 @@ static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data) } } -static void Mod_Q1BSP_LoadEntities(lump_t *l) +static void Mod_Q1BSP_LoadEntities(sizebuf_t *sb) { loadmodel->brush.entities = NULL; - if (!l->filelen) + if (!sb->cursize) return; - loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen + 1); - memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen); - loadmodel->brush.entities[l->filelen] = 0; + loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, sb->cursize + 1); + MSG_ReadBytes(sb, sb->cursize, (unsigned char *)loadmodel->brush.entities); + loadmodel->brush.entities[sb->cursize] = 0; if (loadmodel->brush.ishlbsp) Mod_Q1BSP_ParseWadsFromEntityLump(loadmodel->brush.entities); } -static void Mod_Q1BSP_LoadVertexes(lump_t *l) +static void Mod_Q1BSP_LoadVertexes(sizebuf_t *sb) { - dvertex_t *in; mvertex_t *out; int i, count; + size_t structsize = 12; - in = (dvertex_t *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadVertexes: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); + count = sb->cursize / structsize; out = (mvertex_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); loadmodel->brushq1.vertexes = out; loadmodel->brushq1.numvertexes = count; - for ( i=0 ; iposition[0] = LittleFloat(in->point[0]); - out->position[1] = LittleFloat(in->point[1]); - out->position[2] = LittleFloat(in->point[2]); + out->position[0] = MSG_ReadLittleFloat(sb); + out->position[1] = MSG_ReadLittleFloat(sb); + out->position[2] = MSG_ReadLittleFloat(sb); } } -// The following two functions should be removed and MSG_* or SZ_* function sets adjusted so they -// can be used for this -// REMOVEME -int SB_ReadInt (unsigned char **buffer) -{ - int i; - i = ((*buffer)[0]) + 256*((*buffer)[1]) + 65536*((*buffer)[2]) + 16777216*((*buffer)[3]); - (*buffer) += 4; - return i; -} - -// REMOVEME -float SB_ReadFloat (unsigned char **buffer) -{ - union - { - int i; - float f; - } u; - - u.i = SB_ReadInt (buffer); - return u.f; -} - -static void Mod_Q1BSP_LoadSubmodels(lump_t *l, hullinfo_t *hullinfo) +static void Mod_Q1BSP_LoadSubmodels(sizebuf_t *sb, hullinfo_t *hullinfo) { - unsigned char *index; - dmodel_t *out; + mmodel_t *out; int i, j, count; + size_t structsize = (48+4*hullinfo->filehulls); - index = (unsigned char *)(mod_base + l->fileofs); - if (l->filelen % (48+4*hullinfo->filehulls)) + if (sb->cursize % structsize) Host_Error ("Mod_Q1BSP_LoadSubmodels: funny lump size in %s", loadmodel->name); - count = l->filelen / (48+4*hullinfo->filehulls); - out = (dmodel_t *)Mem_Alloc (loadmodel->mempool, count*sizeof(*out)); + count = sb->cursize / structsize; + out = (mmodel_t *)Mem_Alloc (loadmodel->mempool, count*sizeof(*out)); loadmodel->brushq1.submodels = out; loadmodel->brush.numsubmodels = count; @@ -2185,43 +2201,50 @@ static void Mod_Q1BSP_LoadSubmodels(lump_t *l, hullinfo_t *hullinfo) for (i = 0; i < count; i++, out++) { // spread out the mins / maxs by a pixel - out->mins[0] = SB_ReadFloat (&index) - 1; - out->mins[1] = SB_ReadFloat (&index) - 1; - out->mins[2] = SB_ReadFloat (&index) - 1; - out->maxs[0] = SB_ReadFloat (&index) + 1; - out->maxs[1] = SB_ReadFloat (&index) + 1; - out->maxs[2] = SB_ReadFloat (&index) + 1; - out->origin[0] = SB_ReadFloat (&index); - out->origin[1] = SB_ReadFloat (&index); - out->origin[2] = SB_ReadFloat (&index); + out->mins[0] = MSG_ReadLittleFloat(sb) - 1; + out->mins[1] = MSG_ReadLittleFloat(sb) - 1; + out->mins[2] = MSG_ReadLittleFloat(sb) - 1; + out->maxs[0] = MSG_ReadLittleFloat(sb) + 1; + out->maxs[1] = MSG_ReadLittleFloat(sb) + 1; + out->maxs[2] = MSG_ReadLittleFloat(sb) + 1; + out->origin[0] = MSG_ReadLittleFloat(sb); + out->origin[1] = MSG_ReadLittleFloat(sb); + out->origin[2] = MSG_ReadLittleFloat(sb); for (j = 0; j < hullinfo->filehulls; j++) - out->headnode[j] = SB_ReadInt (&index); - out->visleafs = SB_ReadInt (&index); - out->firstface = SB_ReadInt (&index); - out->numfaces = SB_ReadInt (&index); + out->headnode[j] = MSG_ReadLittleLong(sb); + out->visleafs = MSG_ReadLittleLong(sb); + out->firstface = MSG_ReadLittleLong(sb); + out->numfaces = MSG_ReadLittleLong(sb); } } -static void Mod_Q1BSP_LoadEdges(lump_t *l) +static void Mod_Q1BSP_LoadEdges(sizebuf_t *sb) { - dedge_t *in; medge_t *out; int i, count; + size_t structsize = loadmodel->brush.isbsp2 ? 8 : 4; - in = (dedge_t *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadEdges: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); + count = sb->cursize / structsize; out = (medge_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out)); loadmodel->brushq1.edges = out; loadmodel->brushq1.numedges = count; - for ( i=0 ; iv[0] = (unsigned short)LittleShort(in->v[0]); - out->v[1] = (unsigned short)LittleShort(in->v[1]); - if (out->v[0] >= loadmodel->brushq1.numvertexes || out->v[1] >= loadmodel->brushq1.numvertexes) + if (loadmodel->brush.isbsp2) + { + out->v[0] = (unsigned int)MSG_ReadLittleLong(sb); + out->v[1] = (unsigned int)MSG_ReadLittleLong(sb); + } + else + { + out->v[0] = (unsigned short)MSG_ReadLittleShort(sb); + out->v[1] = (unsigned short)MSG_ReadLittleShort(sb); + } + if ((int)out->v[0] >= loadmodel->brushq1.numvertexes || (int)out->v[1] >= loadmodel->brushq1.numvertexes) { Con_Printf("Mod_Q1BSP_LoadEdges: %s has invalid vertex indices in edge %i (vertices %i %i >= numvertices %i)\n", loadmodel->name, i, out->v[0], out->v[1], loadmodel->brushq1.numvertexes); if(!loadmodel->brushq1.numvertexes) @@ -2233,29 +2256,28 @@ static void Mod_Q1BSP_LoadEdges(lump_t *l) } } -static void Mod_Q1BSP_LoadTexinfo(lump_t *l) +static void Mod_Q1BSP_LoadTexinfo(sizebuf_t *sb) { - texinfo_t *in; mtexinfo_t *out; int i, j, k, count, miptex; + size_t structsize = 40; - in = (texinfo_t *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadTexinfo: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); + count = sb->cursize / structsize; out = (mtexinfo_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out)); loadmodel->brushq1.texinfo = out; loadmodel->brushq1.numtexinfo = count; - for (i = 0;i < count;i++, in++, out++) + for (i = 0;i < count;i++, out++) { for (k = 0;k < 2;k++) for (j = 0;j < 4;j++) - out->vecs[k][j] = LittleFloat(in->vecs[k][j]); + out->vecs[k][j] = MSG_ReadLittleFloat(sb); - miptex = LittleLong(in->miptex); - out->flags = LittleLong(in->flags); + miptex = MSG_ReadLittleLong(sb); + out->flags = MSG_ReadLittleLong(sb); out->texture = NULL; if (loadmodel->data_textures) @@ -2434,18 +2456,18 @@ static void Mod_Q1BSP_GenerateWarpMesh(msurface_t *surface) #endif extern cvar_t gl_max_lightmapsize; -static void Mod_Q1BSP_LoadFaces(lump_t *l) +static void Mod_Q1BSP_LoadFaces(sizebuf_t *sb) { - dface_t *in; msurface_t *surface; - int i, j, count, surfacenum, planenum, smax, tmax, ssize, tsize, firstedge, numedges, totalverts, totaltris, lightmapnumber, lightmapsize, totallightmapsamples; + int i, j, count, surfacenum, planenum, smax, tmax, ssize, tsize, firstedge, numedges, totalverts, totaltris, lightmapnumber, lightmapsize, totallightmapsamples, lightmapoffset, texinfoindex; float texmins[2], texmaxs[2], val; rtexture_t *lightmaptexture, *deluxemaptexture; + char vabuf[1024]; + size_t structsize = loadmodel->brush.isbsp2 ? 28 : 20; - in = (dface_t *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadFaces: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); + count = sb->cursize / structsize; loadmodel->data_surfaces = (msurface_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_t)); loadmodel->data_surfaces_lightmapinfo = (msurface_lightmapinfo_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_lightmapinfo_t)); @@ -2456,9 +2478,12 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l) totalverts = 0; totaltris = 0; - for (surfacenum = 0, in = (dface_t *)(mod_base + l->fileofs);surfacenum < count;surfacenum++, in++) + for (surfacenum = 0;surfacenum < count;surfacenum++) { - numedges = (unsigned short)LittleShort(in->numedges); + if (loadmodel->brush.isbsp2) + numedges = BuffLittleLong(sb->data + structsize * surfacenum + 12); + else + numedges = BuffLittleShort(sb->data + structsize * surfacenum + 8); totalverts += numedges; totaltris += numedges - 2; } @@ -2473,25 +2498,29 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l) totalverts = 0; totaltris = 0; - for (surfacenum = 0, in = (dface_t *)(mod_base + l->fileofs), surface = loadmodel->data_surfaces;surfacenum < count;surfacenum++, in++, surface++) + for (surfacenum = 0, surface = loadmodel->data_surfaces;surfacenum < count;surfacenum++, surface++) { surface->lightmapinfo = loadmodel->data_surfaces_lightmapinfo + surfacenum; + planenum = loadmodel->brush.isbsp2 ? MSG_ReadLittleLong(sb) : (unsigned short)MSG_ReadLittleShort(sb); + /*side = */loadmodel->brush.isbsp2 ? MSG_ReadLittleLong(sb) : (unsigned short)MSG_ReadLittleShort(sb); + firstedge = MSG_ReadLittleLong(sb); + numedges = loadmodel->brush.isbsp2 ? MSG_ReadLittleLong(sb) : (unsigned short)MSG_ReadLittleShort(sb); + texinfoindex = loadmodel->brush.isbsp2 ? MSG_ReadLittleLong(sb) : (unsigned short)MSG_ReadLittleShort(sb); + for (i = 0;i < MAXLIGHTMAPS;i++) + surface->lightmapinfo->styles[i] = MSG_ReadByte(sb); + lightmapoffset = MSG_ReadLittleLong(sb); // FIXME: validate edges, texinfo, etc? - firstedge = LittleLong(in->firstedge); - numedges = (unsigned short)LittleShort(in->numedges); if ((unsigned int) firstedge > (unsigned int) loadmodel->brushq1.numsurfedges || (unsigned int) numedges > (unsigned int) loadmodel->brushq1.numsurfedges || (unsigned int) firstedge + (unsigned int) numedges > (unsigned int) loadmodel->brushq1.numsurfedges) Host_Error("Mod_Q1BSP_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)", firstedge, numedges, loadmodel->brushq1.numsurfedges); - i = (unsigned short)LittleShort(in->texinfo); - if ((unsigned int) i >= (unsigned int) loadmodel->brushq1.numtexinfo) - Host_Error("Mod_Q1BSP_LoadFaces: invalid texinfo index %i(model has %i texinfos)", i, loadmodel->brushq1.numtexinfo); - surface->lightmapinfo->texinfo = loadmodel->brushq1.texinfo + i; - surface->texture = surface->lightmapinfo->texinfo->texture; - - planenum = (unsigned short)LittleShort(in->planenum); + if ((unsigned int) texinfoindex >= (unsigned int) loadmodel->brushq1.numtexinfo) + Host_Error("Mod_Q1BSP_LoadFaces: invalid texinfo index %i(model has %i texinfos)", texinfoindex, loadmodel->brushq1.numtexinfo); if ((unsigned int) planenum >= (unsigned int) loadmodel->brush.num_planes) Host_Error("Mod_Q1BSP_LoadFaces: invalid plane index %i (model has %i planes)", planenum, loadmodel->brush.num_planes); + surface->lightmapinfo->texinfo = loadmodel->brushq1.texinfo + texinfoindex; + surface->texture = surface->lightmapinfo->texinfo->texture; + //surface->flags = surface->texture->flags; //if (LittleShort(in->side)) // surface->flags |= SURF_PLANEBACK; @@ -2559,12 +2588,9 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l) tsize = (surface->lightmapinfo->extents[1] >> 4) + 1; // lighting info - for (i = 0;i < MAXLIGHTMAPS;i++) - surface->lightmapinfo->styles[i] = in->styles[i]; surface->lightmaptexture = NULL; surface->deluxemaptexture = r_texture_blanknormalmap; - i = LittleLong(in->lightofs); - if (i == -1) + if (lightmapoffset == -1) { surface->lightmapinfo->samples = NULL; #if 1 @@ -2578,12 +2604,12 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l) #endif } else if (loadmodel->brush.ishlbsp) // LordHavoc: HalfLife map (bsp version 30) - surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + i; + surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + lightmapoffset; else // LordHavoc: white lighting (bsp version 29) { - surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + (i * 3); + surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + (lightmapoffset * 3); if (loadmodel->brushq1.nmaplightdata) - surface->lightmapinfo->nmapsamples = loadmodel->brushq1.nmaplightdata + (i * 3); + surface->lightmapinfo->nmapsamples = loadmodel->brushq1.nmaplightdata + (lightmapoffset * 3); } // check if we should apply a lightmap to this @@ -2649,9 +2675,9 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l) loadmodel->brushq3.num_mergedlightmaps = lightmapnumber + 1; loadmodel->brushq3.data_lightmaps = (rtexture_t **)Mem_Realloc(loadmodel->mempool, loadmodel->brushq3.data_lightmaps, loadmodel->brushq3.num_mergedlightmaps * sizeof(loadmodel->brushq3.data_lightmaps[0])); loadmodel->brushq3.data_deluxemaps = (rtexture_t **)Mem_Realloc(loadmodel->mempool, loadmodel->brushq3.data_deluxemaps, loadmodel->brushq3.num_mergedlightmaps * sizeof(loadmodel->brushq3.data_deluxemaps[0])); - loadmodel->brushq3.data_lightmaps[lightmapnumber] = lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_ALLOWUPDATES, -1, NULL); + loadmodel->brushq3.data_lightmaps[lightmapnumber] = lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, va(vabuf, sizeof(vabuf), "lightmap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_ALLOWUPDATES, -1, NULL); if (loadmodel->brushq1.nmaplightdata) - loadmodel->brushq3.data_deluxemaps[lightmapnumber] = deluxemaptexture = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_ALLOWUPDATES, -1, NULL); + loadmodel->brushq3.data_deluxemaps[lightmapnumber] = deluxemaptexture = R_LoadTexture2D(loadmodel->texturepool, va(vabuf, sizeof(vabuf), "deluxemap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_ALLOWUPDATES, -1, NULL); lightmapnumber++; Mod_AllocLightmap_Reset(&allocState); Mod_AllocLightmap_Block(&allocState, ssize, tsize, &lightmapx, &lightmapy); @@ -2741,16 +2767,15 @@ static void Mod_Q1BSP_LoadNodes_RecursiveSetParent(mnode_t *node, mnode_t *paren } } -static void Mod_Q1BSP_LoadNodes(lump_t *l) +static void Mod_Q1BSP_LoadNodes(sizebuf_t *sb) { - int i, j, count, p; - dnode_t *in; + int i, j, count, p, child[2]; mnode_t *out; + size_t structsize = loadmodel->brush.isbsp2rmqe ? 32 : (loadmodel->brush.isbsp2 ? 44 : 24); - in = (dnode_t *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadNodes: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); + count = sb->cursize / structsize; if (count == 0) Host_Error("Mod_Q1BSP_LoadNodes: missing BSP tree in %s",loadmodel->name); out = (mnode_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); @@ -2758,19 +2783,56 @@ static void Mod_Q1BSP_LoadNodes(lump_t *l) loadmodel->brush.data_nodes = out; loadmodel->brush.num_nodes = count; - for ( i=0 ; imins[j] = LittleShort(in->mins[j]); - out->maxs[j] = LittleShort(in->maxs[j]); + p = MSG_ReadLittleLong(sb); + out->plane = loadmodel->brush.data_planes + p; + + if (loadmodel->brush.isbsp2rmqe) + { + child[0] = MSG_ReadLittleLong(sb); + child[1] = MSG_ReadLittleLong(sb); + out->mins[0] = MSG_ReadLittleShort(sb); + out->mins[1] = MSG_ReadLittleShort(sb); + out->mins[2] = MSG_ReadLittleShort(sb); + out->maxs[0] = MSG_ReadLittleShort(sb); + out->maxs[1] = MSG_ReadLittleShort(sb); + out->maxs[2] = MSG_ReadLittleShort(sb); + out->firstsurface = MSG_ReadLittleLong(sb); + out->numsurfaces = MSG_ReadLittleLong(sb); + } + else if (loadmodel->brush.isbsp2) + { + child[0] = MSG_ReadLittleLong(sb); + child[1] = MSG_ReadLittleLong(sb); + out->mins[0] = MSG_ReadLittleFloat(sb); + out->mins[1] = MSG_ReadLittleFloat(sb); + out->mins[2] = MSG_ReadLittleFloat(sb); + out->maxs[0] = MSG_ReadLittleFloat(sb); + out->maxs[1] = MSG_ReadLittleFloat(sb); + out->maxs[2] = MSG_ReadLittleFloat(sb); + out->firstsurface = MSG_ReadLittleLong(sb); + out->numsurfaces = MSG_ReadLittleLong(sb); } + else + { + child[0] = (unsigned short)MSG_ReadLittleShort(sb); + child[1] = (unsigned short)MSG_ReadLittleShort(sb); + if (child[0] >= count) + child[0] -= 65536; + if (child[1] >= count) + child[1] -= 65536; - p = LittleLong(in->planenum); - out->plane = loadmodel->brush.data_planes + p; + out->mins[0] = MSG_ReadLittleShort(sb); + out->mins[1] = MSG_ReadLittleShort(sb); + out->mins[2] = MSG_ReadLittleShort(sb); + out->maxs[0] = MSG_ReadLittleShort(sb); + out->maxs[1] = MSG_ReadLittleShort(sb); + out->maxs[2] = MSG_ReadLittleShort(sb); - out->firstsurface = (unsigned short)LittleShort(in->firstface); - out->numsurfaces = (unsigned short)LittleShort(in->numfaces); + out->firstsurface = (unsigned short)MSG_ReadLittleShort(sb); + out->numsurfaces = (unsigned short)MSG_ReadLittleShort(sb); + } for (j=0 ; j<2 ; j++) { @@ -2778,8 +2840,8 @@ static void Mod_Q1BSP_LoadNodes(lump_t *l) // arguire qbsp which can produce more than 32768 nodes, any value // below count is assumed to be a node number, any other value is // assumed to be a leaf number - p = (unsigned short)LittleShort(in->children[j]); - if (p < count) + p = child[j]; + if (p >= 0) { if (p < loadmodel->brush.num_nodes) out->children[j] = loadmodel->brush.data_nodes + p; @@ -2792,8 +2854,8 @@ static void Mod_Q1BSP_LoadNodes(lump_t *l) } else { - // note this uses 65535 intentionally, -1 is leaf 0 - p = 65535 - p; + // get leaf index as a positive value starting at 0 (-1 becomes 0, -2 becomes 1, etc) + p = -(p+1); if (p < loadmodel->brush.num_leafs) out->children[j] = (mnode_t *)(loadmodel->brush.data_leafs + p); else @@ -2809,16 +2871,15 @@ static void Mod_Q1BSP_LoadNodes(lump_t *l) Mod_Q1BSP_LoadNodes_RecursiveSetParent(loadmodel->brush.data_nodes, NULL); // sets nodes and leafs } -static void Mod_Q1BSP_LoadLeafs(lump_t *l) +static void Mod_Q1BSP_LoadLeafs(sizebuf_t *sb) { - dleaf_t *in; mleaf_t *out; - int i, j, count, p; + int i, j, count, p, firstmarksurface, nummarksurfaces; + size_t structsize = loadmodel->brush.isbsp2rmqe ? 32 : (loadmodel->brush.isbsp2 ? 44 : 28); - in = (dleaf_t *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadLeafs: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); + count = sb->cursize / structsize; out = (mleaf_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); loadmodel->brush.data_leafs = out; @@ -2829,32 +2890,16 @@ static void Mod_Q1BSP_LoadLeafs(lump_t *l) loadmodel->brush.data_pvsclusters = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_pvsclusters * loadmodel->brush.num_pvsclusterbytes); memset(loadmodel->brush.data_pvsclusters, 0xFF, loadmodel->brush.num_pvsclusters * loadmodel->brush.num_pvsclusterbytes); - for ( i=0 ; imins[j] = LittleShort(in->mins[j]); - out->maxs[j] = LittleShort(in->maxs[j]); - } - - // FIXME: this function could really benefit from some error checking - - out->contents = LittleLong(in->contents); - - out->firstleafsurface = loadmodel->brush.data_leafsurfaces + (unsigned short)LittleShort(in->firstmarksurface); - out->numleafsurfaces = (unsigned short)LittleShort(in->nummarksurfaces); - if ((unsigned short)LittleShort(in->firstmarksurface) + out->numleafsurfaces > loadmodel->brush.num_leafsurfaces) - { - Con_Printf("Mod_Q1BSP_LoadLeafs: invalid leafsurface range %i:%i outside range %i:%i\n", (int)(out->firstleafsurface - loadmodel->brush.data_leafsurfaces), (int)(out->firstleafsurface + out->numleafsurfaces - loadmodel->brush.data_leafsurfaces), 0, loadmodel->brush.num_leafsurfaces); - out->firstleafsurface = NULL; - out->numleafsurfaces = 0; - } + out->contents = MSG_ReadLittleLong(sb); out->clusterindex = i - 1; if (out->clusterindex >= loadmodel->brush.num_pvsclusters) out->clusterindex = -1; - p = LittleLong(in->visofs); + p = MSG_ReadLittleLong(sb); // ignore visofs errors on leaf 0 (solid) if (p >= 0 && out->clusterindex >= 0) { @@ -2864,14 +2909,61 @@ static void Mod_Q1BSP_LoadLeafs(lump_t *l) Mod_Q1BSP_DecompressVis(loadmodel->brushq1.data_compressedpvs + p, loadmodel->brushq1.data_compressedpvs + loadmodel->brushq1.num_compressedpvs, loadmodel->brush.data_pvsclusters + out->clusterindex * loadmodel->brush.num_pvsclusterbytes, loadmodel->brush.data_pvsclusters + (out->clusterindex + 1) * loadmodel->brush.num_pvsclusterbytes); } - for (j = 0;j < 4;j++) - out->ambient_sound_level[j] = in->ambient_level[j]; + if (loadmodel->brush.isbsp2rmqe) + { + out->mins[0] = MSG_ReadLittleShort(sb); + out->mins[1] = MSG_ReadLittleShort(sb); + out->mins[2] = MSG_ReadLittleShort(sb); + out->maxs[0] = MSG_ReadLittleShort(sb); + out->maxs[1] = MSG_ReadLittleShort(sb); + out->maxs[2] = MSG_ReadLittleShort(sb); + + firstmarksurface = MSG_ReadLittleLong(sb); + nummarksurfaces = MSG_ReadLittleLong(sb); + } + else if (loadmodel->brush.isbsp2) + { + out->mins[0] = MSG_ReadLittleFloat(sb); + out->mins[1] = MSG_ReadLittleFloat(sb); + out->mins[2] = MSG_ReadLittleFloat(sb); + out->maxs[0] = MSG_ReadLittleFloat(sb); + out->maxs[1] = MSG_ReadLittleFloat(sb); + out->maxs[2] = MSG_ReadLittleFloat(sb); + + firstmarksurface = MSG_ReadLittleLong(sb); + nummarksurfaces = MSG_ReadLittleLong(sb); + } + else + { + out->mins[0] = MSG_ReadLittleShort(sb); + out->mins[1] = MSG_ReadLittleShort(sb); + out->mins[2] = MSG_ReadLittleShort(sb); + out->maxs[0] = MSG_ReadLittleShort(sb); + out->maxs[1] = MSG_ReadLittleShort(sb); + out->maxs[2] = MSG_ReadLittleShort(sb); + + firstmarksurface = (unsigned short)MSG_ReadLittleShort(sb); + nummarksurfaces = (unsigned short)MSG_ReadLittleShort(sb); + } + + if (firstmarksurface >= 0 && firstmarksurface + nummarksurfaces <= loadmodel->brush.num_leafsurfaces) + { + out->firstleafsurface = loadmodel->brush.data_leafsurfaces + firstmarksurface; + out->numleafsurfaces = nummarksurfaces; + } + else + { + Con_Printf("Mod_Q1BSP_LoadLeafs: invalid leafsurface range %i:%i outside range %i:%i\n", firstmarksurface, firstmarksurface+nummarksurfaces, 0, loadmodel->brush.num_leafsurfaces); + out->firstleafsurface = NULL; + out->numleafsurfaces = 0; + } - // FIXME: Insert caustics here + for (j = 0;j < 4;j++) + out->ambient_sound_level[j] = MSG_ReadByte(sb); } } -qboolean Mod_Q1BSP_CheckWaterAlphaSupport(void) +static qboolean Mod_Q1BSP_CheckWaterAlphaSupport(void) { int i, j; mleaf_t *leaf; @@ -2894,17 +2986,16 @@ qboolean Mod_Q1BSP_CheckWaterAlphaSupport(void) return false; } -static void Mod_Q1BSP_LoadClipnodes(lump_t *l, hullinfo_t *hullinfo) +static void Mod_Q1BSP_LoadClipnodes(sizebuf_t *sb, hullinfo_t *hullinfo) { - dclipnode_t *in; mclipnode_t *out; int i, count; hull_t *hull; + size_t structsize = loadmodel->brush.isbsp2 ? 12 : 8; - in = (dclipnode_t *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadClipnodes: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); + count = sb->cursize / structsize; out = (mclipnode_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); loadmodel->brushq1.clipnodes = out; @@ -2926,18 +3017,30 @@ static void Mod_Q1BSP_LoadClipnodes(lump_t *l, hullinfo_t *hullinfo) VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size); } - for (i=0 ; iplanenum = LittleLong(in->planenum); - // LordHavoc: this code supports arguire qbsp's broken clipnodes indices (more than 32768 clipnodes), values above count are assumed to be contents values - out->children[0] = (unsigned short)LittleShort(in->children[0]); - out->children[1] = (unsigned short)LittleShort(in->children[1]); - if (out->children[0] >= count) - out->children[0] -= 65536; - if (out->children[1] >= count) - out->children[1] -= 65536; + out->planenum = MSG_ReadLittleLong(sb); if (out->planenum < 0 || out->planenum >= loadmodel->brush.num_planes) - Host_Error("Corrupt clipping hull(out of range planenum)"); + Host_Error("%s: Corrupt clipping hull(out of range planenum)", loadmodel->name); + if (loadmodel->brush.isbsp2) + { + out->children[0] = MSG_ReadLittleLong(sb); + out->children[1] = MSG_ReadLittleLong(sb); + if (out->children[0] >= count) + Host_Error("%s: Corrupt clipping hull (invalid child index)", loadmodel->name); + if (out->children[1] >= count) + Host_Error("%s: Corrupt clipping hull (invalid child index)", loadmodel->name); + } + else + { + // LordHavoc: this code supports arguire qbsp's broken clipnodes indices (more than 32768 clipnodes), values above count are assumed to be contents values + out->children[0] = (unsigned short)MSG_ReadLittleShort(sb); + out->children[1] = (unsigned short)MSG_ReadLittleShort(sb); + if (out->children[0] >= count) + out->children[0] -= 65536; + if (out->children[1] >= count) + out->children[1] -= 65536; + } } } @@ -2967,62 +3070,71 @@ static void Mod_Q1BSP_MakeHull0(void) } } -static void Mod_Q1BSP_LoadLeaffaces(lump_t *l) +static void Mod_Q1BSP_LoadLeaffaces(sizebuf_t *sb) { int i, j; - short *in; + size_t structsize = loadmodel->brush.isbsp2 ? 4 : 2; - in = (short *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadLeaffaces: funny lump size in %s",loadmodel->name); - loadmodel->brush.num_leafsurfaces = l->filelen / sizeof(*in); + loadmodel->brush.num_leafsurfaces = sb->cursize / structsize; loadmodel->brush.data_leafsurfaces = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_leafsurfaces * sizeof(int)); - for (i = 0;i < loadmodel->brush.num_leafsurfaces;i++) + if (loadmodel->brush.isbsp2) + { + for (i = 0;i < loadmodel->brush.num_leafsurfaces;i++) + { + j = MSG_ReadLittleLong(sb); + if (j < 0 || j >= loadmodel->num_surfaces) + Host_Error("Mod_Q1BSP_LoadLeaffaces: bad surface number"); + loadmodel->brush.data_leafsurfaces[i] = j; + } + } + else { - j = (unsigned short) LittleShort(in[i]); - if (j >= loadmodel->num_surfaces) - Host_Error("Mod_Q1BSP_LoadLeaffaces: bad surface number"); - loadmodel->brush.data_leafsurfaces[i] = j; + for (i = 0;i < loadmodel->brush.num_leafsurfaces;i++) + { + j = (unsigned short) MSG_ReadLittleShort(sb); + if (j >= loadmodel->num_surfaces) + Host_Error("Mod_Q1BSP_LoadLeaffaces: bad surface number"); + loadmodel->brush.data_leafsurfaces[i] = j; + } } } -static void Mod_Q1BSP_LoadSurfedges(lump_t *l) +static void Mod_Q1BSP_LoadSurfedges(sizebuf_t *sb) { int i; - int *in; + size_t structsize = 4; - in = (int *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadSurfedges: funny lump size in %s",loadmodel->name); - loadmodel->brushq1.numsurfedges = l->filelen / sizeof(*in); + loadmodel->brushq1.numsurfedges = sb->cursize / structsize; loadmodel->brushq1.surfedges = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->brushq1.numsurfedges * sizeof(int)); for (i = 0;i < loadmodel->brushq1.numsurfedges;i++) - loadmodel->brushq1.surfedges[i] = LittleLong(in[i]); + loadmodel->brushq1.surfedges[i] = MSG_ReadLittleLong(sb); } -static void Mod_Q1BSP_LoadPlanes(lump_t *l) +static void Mod_Q1BSP_LoadPlanes(sizebuf_t *sb) { int i; mplane_t *out; - dplane_t *in; + size_t structsize = 20; - in = (dplane_t *)(mod_base + l->fileofs); - if (l->filelen % sizeof(*in)) + if (sb->cursize % structsize) Host_Error("Mod_Q1BSP_LoadPlanes: funny lump size in %s", loadmodel->name); - - loadmodel->brush.num_planes = l->filelen / sizeof(*in); + loadmodel->brush.num_planes = sb->cursize / structsize; loadmodel->brush.data_planes = out = (mplane_t *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_planes * sizeof(*out)); - for (i = 0;i < loadmodel->brush.num_planes;i++, in++, out++) + for (i = 0;i < loadmodel->brush.num_planes;i++, out++) { - out->normal[0] = LittleFloat(in->normal[0]); - out->normal[1] = LittleFloat(in->normal[1]); - out->normal[2] = LittleFloat(in->normal[2]); - out->dist = LittleFloat(in->dist); - + out->normal[0] = MSG_ReadLittleFloat(sb); + out->normal[1] = MSG_ReadLittleFloat(sb); + out->normal[2] = MSG_ReadLittleFloat(sb); + out->dist = MSG_ReadLittleFloat(sb); + MSG_ReadLittleLong(sb); // type is not used, we use PlaneClassify PlaneClassify(out); } } @@ -3041,12 +3153,12 @@ static void Mod_Q1BSP_LoadMapBrushes(void) if (!maptext) return; text = maptext; - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) return; // error submodel = 0; for (;;) { - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) break; if (com_token[0] != '{') return; // error @@ -3057,7 +3169,7 @@ static void Mod_Q1BSP_LoadMapBrushes(void) brushes = Mem_Alloc(loadmodel->mempool, maxbrushes * sizeof(mbrush_t)); for (;;) { - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) return; // error if (com_token[0] == '}') break; // end of entity @@ -3081,7 +3193,7 @@ static void Mod_Q1BSP_LoadMapBrushes(void) } for (;;) { - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) return; // error if (com_token[0] == '}') break; // end of brush @@ -3090,25 +3202,25 @@ static void Mod_Q1BSP_LoadMapBrushes(void) // FIXME: support hl .map format for (pointnum = 0;pointnum < 3;pointnum++) { - COM_ParseToken_Simple(&data, false, false); + COM_ParseToken_Simple(&data, false, false, true); for (componentnum = 0;componentnum < 3;componentnum++) { - COM_ParseToken_Simple(&data, false, false); + COM_ParseToken_Simple(&data, false, false, true); point[pointnum][componentnum] = atof(com_token); } - COM_ParseToken_Simple(&data, false, false); + COM_ParseToken_Simple(&data, false, false, true); } - COM_ParseToken_Simple(&data, false, false); + COM_ParseToken_Simple(&data, false, false, true); strlcpy(facetexture, com_token, sizeof(facetexture)); - COM_ParseToken_Simple(&data, false, false); + COM_ParseToken_Simple(&data, false, false, true); //scroll_s = atof(com_token); - COM_ParseToken_Simple(&data, false, false); + COM_ParseToken_Simple(&data, false, false, true); //scroll_t = atof(com_token); - COM_ParseToken_Simple(&data, false, false); + COM_ParseToken_Simple(&data, false, false, true); //rotate = atof(com_token); - COM_ParseToken_Simple(&data, false, false); + COM_ParseToken_Simple(&data, false, false, true); //scale_s = atof(com_token); - COM_ParseToken_Simple(&data, false, false); + COM_ParseToken_Simple(&data, false, false, true); //scale_t = atof(com_token); TriangleNormal(point[0], point[1], point[2], planenormal); VectorNormalizeDouble(planenormal); @@ -3399,7 +3511,7 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node) // TODO: calculate node bounding boxes during recursion and calculate a maximum plane size accordingly to improve precision (as most maps do not need 1 billion unit plane polygons) PolygonD_QuadForPlane(nodeportal->points, nodeportal->plane.normal[0], nodeportal->plane.normal[1], nodeportal->plane.normal[2], nodeportal->plane.dist, 1024.0*1024.0*1024.0); nodeportal->numpoints = 4; - side = 0; // shut up compiler warning + // side = 0; // shut up compiler warning -> should be no longer needed, Host_Error is declared noreturn now for (portal = (portal_t *)node->portals;portal;portal = portal->next[side]) { clipplane = portal->plane; @@ -3414,7 +3526,10 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node) side = 1; } else + { Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal"); + side = 0; // hush warning + } for (i = 0;i < nodeportal->numpoints*3;i++) frontpoints[i] = nodeportal->points[i]; @@ -3447,7 +3562,10 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node) else if (portal->nodes[1] == node) side = 1; else + { Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal"); + side = 0; // hush warning + } nextportal = portal->next[side]; if (!portal->numpoints) continue; @@ -3566,7 +3684,7 @@ static int Mod_Q1BSP_FatPVS(dp_model_t *model, const vec3_t org, vec_t radius, u { int bytes = model->brush.num_pvsclusterbytes; bytes = min(bytes, pvsbufferlength); - if (r_novis.integer || !model->brush.num_pvsclusters || !Mod_Q1BSP_GetPVS(model, org)) + if (r_novis.integer || r_trippy.integer || !model->brush.num_pvsclusters || !Mod_Q1BSP_GetPVS(model, org)) { memset(pvsbuffer, 0xFF, bytes); return bytes; @@ -3640,33 +3758,52 @@ void Mod_CollisionBIH_TraceLineAgainstSurfaces(dp_model_t *model, const frameble void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) { int i, j, k; - dheader_t *header; - dmodel_t *bm; + sizebuf_t lumpsb[HEADER_LUMPS]; + mmodel_t *bm; float dist, modelyawradius, modelradius; msurface_t *surface; hullinfo_t hullinfo; int totalstylesurfaces, totalstyles, stylecounts[256], remapstyles[256]; model_brush_lightstyleinfo_t styleinfo[256]; unsigned char *datapointer; + sizebuf_t sb; - mod->modeldatatypestring = "Q1BSP"; + MSG_InitReadBuffer(&sb, (unsigned char *)buffer, (unsigned char *)bufferend - (unsigned char *)buffer); mod->type = mod_brushq1; - header = (dheader_t *)buffer; - - i = LittleLong(header->version); - if (i != BSPVERSION && i != 30) - Host_Error("Mod_Q1BSP_Load: %s has wrong version number(%i should be %i(Quake) or 30(HalfLife)", mod->name, i, BSPVERSION); - mod->brush.ishlbsp = i == 30; + mod->brush.isbsp2 = false; + mod->brush.ishlbsp = false; + i = MSG_ReadLittleLong(&sb); + switch(i) + { + case BSPVERSION: + mod->modeldatatypestring = "Q1BSP"; + break; + case 30: + mod->brush.ishlbsp = true; + mod->modeldatatypestring = "HLBSP"; + break; + case ('2' + 'P' * 256 + 'S' * 65536 + 'B' * 16777216): + mod->brush.isbsp2 = true; + mod->brush.isbsp2rmqe = true; // like bsp2 except leaf/node bounds are 16bit (unexpanded) + mod->modeldatatypestring = "Q1BSP2rmqe"; + break; + case ('B' + 'S' * 256 + 'P' * 65536 + '2' * 16777216): + mod->brush.isbsp2 = true; + mod->modeldatatypestring = "Q1BSP2"; + break; + default: + mod->modeldatatypestring = "Unknown BSP"; + Host_Error("Mod_Q1BSP_Load: %s has wrong version number %i: supported versions are 29 (Quake), 30 (Half-Life), \"BSP2\" or \"2PSB\" (rmqe)", mod->name, i); + return; + } // fill in hull info VectorClear (hullinfo.hullsizes[0][0]); VectorClear (hullinfo.hullsizes[0][1]); if (mod->brush.ishlbsp) { - mod->modeldatatypestring = "HLBSP"; - hullinfo.filehulls = 4; VectorSet (hullinfo.hullsizes[1][0], -16, -16, -36); VectorSet (hullinfo.hullsizes[1][1], 16, 16, 36); @@ -3685,16 +3822,18 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) } // read lumps - mod_base = (unsigned char*)buffer; for (i = 0; i < HEADER_LUMPS; i++) { - header->lumps[i].fileofs = LittleLong(header->lumps[i].fileofs); - header->lumps[i].filelen = LittleLong(header->lumps[i].filelen); + int offset = MSG_ReadLittleLong(&sb); + int size = MSG_ReadLittleLong(&sb); + if (offset < 0 || offset + size > sb.cursize) + Host_Error("Mod_Q1BSP_Load: %s has invalid lump %i (offset %i, size %i, file size %i)\n", mod->name, i, offset, size, (int)sb.cursize); + MSG_InitReadBuffer(&lumpsb[i], sb.data + offset, size); } mod->soundfromcenter = true; mod->TraceBox = Mod_Q1BSP_TraceBox; - mod->TraceLine = Mod_Q1BSP_TraceLineAgainstSurfaces; // LordHavoc: use the surface-hitting version of TraceLine in all cases + mod->TraceLine = Mod_Q1BSP_TraceLine; mod->TracePoint = Mod_Q1BSP_TracePoint; mod->PointSuperContents = Mod_Q1BSP_PointSuperContents; mod->TraceLineAgainstSurfaces = Mod_Q1BSP_TraceLineAgainstSurfaces; @@ -3732,30 +3871,33 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) int temp; if (i == LUMP_ENTITIES) continue; - temp = Com_BlockChecksum(mod_base + header->lumps[i].fileofs, header->lumps[i].filelen); + temp = Com_BlockChecksum(lumpsb[i].data, lumpsb[i].cursize); mod->brush.qw_md4sum ^= LittleLong(temp); if (i == LUMP_VISIBILITY || i == LUMP_LEAFS || i == LUMP_NODES) continue; - temp = Com_BlockChecksum(mod_base + header->lumps[i].fileofs, header->lumps[i].filelen); mod->brush.qw_md4sum2 ^= LittleLong(temp); } - Mod_Q1BSP_LoadEntities(&header->lumps[LUMP_ENTITIES]); - Mod_Q1BSP_LoadVertexes(&header->lumps[LUMP_VERTEXES]); - Mod_Q1BSP_LoadEdges(&header->lumps[LUMP_EDGES]); - Mod_Q1BSP_LoadSurfedges(&header->lumps[LUMP_SURFEDGES]); - Mod_Q1BSP_LoadTextures(&header->lumps[LUMP_TEXTURES]); - Mod_Q1BSP_LoadLighting(&header->lumps[LUMP_LIGHTING]); - Mod_Q1BSP_LoadPlanes(&header->lumps[LUMP_PLANES]); - Mod_Q1BSP_LoadTexinfo(&header->lumps[LUMP_TEXINFO]); - Mod_Q1BSP_LoadFaces(&header->lumps[LUMP_FACES]); - Mod_Q1BSP_LoadLeaffaces(&header->lumps[LUMP_MARKSURFACES]); - Mod_Q1BSP_LoadVisibility(&header->lumps[LUMP_VISIBILITY]); + Mod_Q1BSP_LoadEntities(&lumpsb[LUMP_ENTITIES]); + Mod_Q1BSP_LoadVertexes(&lumpsb[LUMP_VERTEXES]); + Mod_Q1BSP_LoadEdges(&lumpsb[LUMP_EDGES]); + Mod_Q1BSP_LoadSurfedges(&lumpsb[LUMP_SURFEDGES]); + Mod_Q1BSP_LoadTextures(&lumpsb[LUMP_TEXTURES]); + Mod_Q1BSP_LoadLighting(&lumpsb[LUMP_LIGHTING]); + Mod_Q1BSP_LoadPlanes(&lumpsb[LUMP_PLANES]); + Mod_Q1BSP_LoadTexinfo(&lumpsb[LUMP_TEXINFO]); + Mod_Q1BSP_LoadFaces(&lumpsb[LUMP_FACES]); + Mod_Q1BSP_LoadLeaffaces(&lumpsb[LUMP_MARKSURFACES]); + Mod_Q1BSP_LoadVisibility(&lumpsb[LUMP_VISIBILITY]); // load submodels before leafs because they contain the number of vis leafs - Mod_Q1BSP_LoadSubmodels(&header->lumps[LUMP_MODELS], &hullinfo); - Mod_Q1BSP_LoadLeafs(&header->lumps[LUMP_LEAFS]); - Mod_Q1BSP_LoadNodes(&header->lumps[LUMP_NODES]); - Mod_Q1BSP_LoadClipnodes(&header->lumps[LUMP_CLIPNODES], &hullinfo); + Mod_Q1BSP_LoadSubmodels(&lumpsb[LUMP_MODELS], &hullinfo); + Mod_Q1BSP_LoadLeafs(&lumpsb[LUMP_LEAFS]); + Mod_Q1BSP_LoadNodes(&lumpsb[LUMP_NODES]); + Mod_Q1BSP_LoadClipnodes(&lumpsb[LUMP_CLIPNODES], &hullinfo); + + for (i = 0; i < HEADER_LUMPS; i++) + if (lumpsb[i].readcount != lumpsb[i].cursize && i != LUMP_TEXTURES && i != LUMP_LIGHTING) + Host_Error("Lump %i incorrectly loaded (readcount %i, size %i)\n", i, lumpsb[i].readcount, lumpsb[i].cursize); // check if the map supports transparent water rendering loadmodel->brush.supportwateralpha = Mod_Q1BSP_CheckWaterAlphaSupport(); @@ -4352,7 +4494,7 @@ static void Mod_Q2BSP_LoadModels(lump_t *l) */ } -void static Mod_Q2BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) +static void Mod_Q2BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) { int i; q2dheader_t *header; @@ -4428,11 +4570,11 @@ static void Mod_Q3BSP_LoadEntities(lump_t *l) // some Q3 maps override the lightgrid_cellsize with a worldspawn key // VorteX: q3map2 FS-R generates tangentspace deluxemaps for q3bsp and sets 'deluxeMaps' key loadmodel->brushq3.deluxemapping = false; - if (data && COM_ParseToken_Simple(&data, false, false) && com_token[0] == '{') + if (data && COM_ParseToken_Simple(&data, false, false, true) && com_token[0] == '{') { while (1) { - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) break; // error if (com_token[0] == '}') break; // end of worldspawn @@ -4442,7 +4584,7 @@ static void Mod_Q3BSP_LoadEntities(lump_t *l) strlcpy(key, com_token, sizeof(key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) break; // error strlcpy(value, com_token, sizeof(value)); if (!strcasecmp("gridsize", key)) // this one is case insensitive to 100% match q3map2 @@ -4703,9 +4845,40 @@ static void Mod_Q3BSP_LoadVertices(lump_t *l) loadmodel->brushq3.data_texcoordlightmap2f[i * 2 + 0] = LittleFloat(in->lightmap2f[0]); loadmodel->brushq3.data_texcoordlightmap2f[i * 2 + 1] = LittleFloat(in->lightmap2f[1]); // svector/tvector are calculated later in face loading - loadmodel->brushq3.data_color4f[i * 4 + 0] = in->color4ub[0] * (1.0f / 255.0f); - loadmodel->brushq3.data_color4f[i * 4 + 1] = in->color4ub[1] * (1.0f / 255.0f); - loadmodel->brushq3.data_color4f[i * 4 + 2] = in->color4ub[2] * (1.0f / 255.0f); + if(mod_q3bsp_sRGBlightmaps.integer) + { + // if lightmaps are sRGB, vertex colors are sRGB too, so we need to linearize them + // note: when this is in use, lightmap color 128 is no longer neutral, but "sRGB half power" is + // working like this may be odd, but matches q3map2 -gamma 2.2 + if(vid_sRGB.integer && vid_sRGB_fallback.integer && !vid.sRGB3D) + { + loadmodel->brushq3.data_color4f[i * 4 + 0] = in->color4ub[0] * (1.0f / 255.0f); + loadmodel->brushq3.data_color4f[i * 4 + 1] = in->color4ub[1] * (1.0f / 255.0f); + loadmodel->brushq3.data_color4f[i * 4 + 2] = in->color4ub[2] * (1.0f / 255.0f); + // we fix the brightness consistently via lightmapscale + } + else + { + loadmodel->brushq3.data_color4f[i * 4 + 0] = Image_LinearFloatFromsRGB(in->color4ub[0]); + loadmodel->brushq3.data_color4f[i * 4 + 1] = Image_LinearFloatFromsRGB(in->color4ub[1]); + loadmodel->brushq3.data_color4f[i * 4 + 2] = Image_LinearFloatFromsRGB(in->color4ub[2]); + } + } + else + { + if(vid_sRGB.integer && vid_sRGB_fallback.integer && !vid.sRGB3D) + { + loadmodel->brushq3.data_color4f[i * 4 + 0] = Image_sRGBFloatFromLinear_Lightmap(in->color4ub[0]); + loadmodel->brushq3.data_color4f[i * 4 + 1] = Image_sRGBFloatFromLinear_Lightmap(in->color4ub[1]); + loadmodel->brushq3.data_color4f[i * 4 + 2] = Image_sRGBFloatFromLinear_Lightmap(in->color4ub[2]); + } + else + { + loadmodel->brushq3.data_color4f[i * 4 + 0] = in->color4ub[0] * (1.0f / 255.0f); + loadmodel->brushq3.data_color4f[i * 4 + 1] = in->color4ub[1] * (1.0f / 255.0f); + loadmodel->brushq3.data_color4f[i * 4 + 2] = in->color4ub[2] * (1.0f / 255.0f); + } + } loadmodel->brushq3.data_color4f[i * 4 + 3] = in->color4ub[3] * (1.0f / 255.0f); if(in->color4ub[0] != 255 || in->color4ub[1] != 255 || in->color4ub[2] != 255) loadmodel->lit = true; @@ -4777,6 +4950,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump) char mapname[MAX_QPATH]; qboolean external; unsigned char *inpixels[10000]; // max count q3map2 can output (it uses 4 digits) + char vabuf[1024]; // defaults for q3bsp size = 128; @@ -4813,7 +4987,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump) if (developer_loading.integer) Con_Printf("Using external lightmaps\n"); FS_StripExtension(loadmodel->name, mapname, sizeof(mapname)); - inpixels[0] = loadimagepixelsbgra(va("%s/lm_%04d", mapname, 0), false, false, false, NULL); + inpixels[0] = loadimagepixelsbgra(va(vabuf, sizeof(vabuf), "%s/lm_%04d", mapname, 0), false, false, false, NULL); if(!inpixels[0]) return; @@ -4833,7 +5007,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump) for(count = 1; ; ++count) { - inpixels[count] = loadimagepixelsbgra(va("%s/lm_%04d", mapname, count), false, false, false, NULL); + inpixels[count] = loadimagepixelsbgra(va(vabuf, sizeof(vabuf), "%s/lm_%04d", mapname, count), false, false, false, NULL); if(!inpixels[count]) break; // we got all of them if(image_width != size || image_height != size) @@ -4971,7 +5145,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump) mergebuf = (loadmodel->brushq3.deluxemapping && (i & 1)) ? mergeddeluxepixels : mergedpixels; mergebuf += 4 * (realindex & (mergedcolumns-1))*size + 4 * ((realindex >> powerx) & (mergedrows-1))*mergedwidth*size; if ((i & 1) == 0 || !loadmodel->brushq3.deluxemapping) - Con_Printf("copying original lightmap %i (%ix%i) to %i (at %i,%i)\n", i, size, size, lightmapindex, (realindex & (mergedcolumns-1))*size, ((realindex >> powerx) & (mergedrows-1))*size); + Con_DPrintf("copying original lightmap %i (%ix%i) to %i (at %i,%i)\n", i, size, size, lightmapindex, (realindex & (mergedcolumns-1))*size, ((realindex >> powerx) & (mergedrows-1))*size); // convert pixels from RGB or BGRA while copying them into the destination rectangle for (j = 0;j < size;j++) @@ -4987,9 +5161,28 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump) if (((realindex + 1) & (mergedrowsxcolumns - 1)) == 0 || (realindex + 1) == realcount) { if (loadmodel->brushq3.deluxemapping && (i & 1)) - loadmodel->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%04i", lightmapindex), mergedwidth, mergedheight, mergeddeluxepixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bspdeluxemaps.integer ? TEXF_COMPRESS : 0), -1, NULL); + loadmodel->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va(vabuf, sizeof(vabuf), "deluxemap%04i", lightmapindex), mergedwidth, mergedheight, mergeddeluxepixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bspdeluxemaps.integer ? TEXF_COMPRESS : 0), -1, NULL); else - loadmodel->brushq3.data_lightmaps [lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", lightmapindex), mergedwidth, mergedheight, mergedpixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bsplightmaps.integer ? TEXF_COMPRESS : 0), -1, NULL); + { + if(mod_q3bsp_sRGBlightmaps.integer) + { + textype_t t; + if(vid_sRGB.integer && vid_sRGB_fallback.integer && !vid.sRGB3D) + { + t = TEXTYPE_BGRA; // in stupid fallback mode, we upload lightmaps in sRGB form and just fix their brightness + // we fix the brightness consistently via lightmapscale + } + else + t = TEXTYPE_SRGB_BGRA; // normally, we upload lightmaps in sRGB form (possibly downconverted to linear) + loadmodel->brushq3.data_lightmaps [lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va(vabuf, sizeof(vabuf), "lightmap%04i", lightmapindex), mergedwidth, mergedheight, mergedpixels, t, TEXF_FORCELINEAR | (gl_texturecompression_q3bsplightmaps.integer ? TEXF_COMPRESS : 0), -1, NULL); + } + else + { + if(vid_sRGB.integer && vid_sRGB_fallback.integer && !vid.sRGB3D) + Image_MakesRGBColorsFromLinear_Lightmap(mergedpixels, mergedpixels, mergedwidth * mergedheight); + loadmodel->brushq3.data_lightmaps [lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va(vabuf, sizeof(vabuf), "lightmap%04i", lightmapindex), mergedwidth, mergedheight, mergedpixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bsplightmaps.integer ? TEXF_COMPRESS : 0), -1, NULL); + } + } } } @@ -5739,6 +5932,7 @@ static void Mod_Q3BSP_LoadLightGrid(lump_t *l) q3dlightgrid_t *in; q3dlightgrid_t *out; int count; + int i; in = (q3dlightgrid_t *)(mod_base + l->fileofs); if (l->filelen % sizeof(*in)) @@ -5774,6 +5968,45 @@ static void Mod_Q3BSP_LoadLightGrid(lump_t *l) loadmodel->brushq3.num_lightgrid = count; // no swapping or validation necessary memcpy(out, in, count * (int)sizeof(*out)); + + if(mod_q3bsp_sRGBlightmaps.integer) + { + if(vid_sRGB.integer && vid_sRGB_fallback.integer && !vid.sRGB3D) + { + // we fix the brightness consistently via lightmapscale + } + else + { + for(i = 0; i < count; ++i) + { + out[i].ambientrgb[0] = floor(Image_LinearFloatFromsRGB(out[i].ambientrgb[0]) * 255.0f + 0.5f); + out[i].ambientrgb[1] = floor(Image_LinearFloatFromsRGB(out[i].ambientrgb[1]) * 255.0f + 0.5f); + out[i].ambientrgb[2] = floor(Image_LinearFloatFromsRGB(out[i].ambientrgb[2]) * 255.0f + 0.5f); + out[i].diffusergb[0] = floor(Image_LinearFloatFromsRGB(out[i].diffusergb[0]) * 255.0f + 0.5f); + out[i].diffusergb[1] = floor(Image_LinearFloatFromsRGB(out[i].diffusergb[1]) * 255.0f + 0.5f); + out[i].diffusergb[2] = floor(Image_LinearFloatFromsRGB(out[i].diffusergb[2]) * 255.0f + 0.5f); + } + } + } + else + { + if(vid_sRGB.integer && vid_sRGB_fallback.integer && !vid.sRGB3D) + { + for(i = 0; i < count; ++i) + { + out[i].ambientrgb[0] = floor(Image_sRGBFloatFromLinear_Lightmap(out[i].ambientrgb[0]) * 255.0f + 0.5f); + out[i].ambientrgb[1] = floor(Image_sRGBFloatFromLinear_Lightmap(out[i].ambientrgb[1]) * 255.0f + 0.5f); + out[i].ambientrgb[2] = floor(Image_sRGBFloatFromLinear_Lightmap(out[i].ambientrgb[2]) * 255.0f + 0.5f); + out[i].diffusergb[0] = floor(Image_sRGBFloatFromLinear_Lightmap(out[i].diffusergb[0]) * 255.0f + 0.5f); + out[i].diffusergb[1] = floor(Image_sRGBFloatFromLinear_Lightmap(out[i].diffusergb[1]) * 255.0f + 0.5f); + out[i].diffusergb[2] = floor(Image_sRGBFloatFromLinear_Lightmap(out[i].diffusergb[2]) * 255.0f + 0.5f); + } + } + else + { + // all is good + } + } } } @@ -5835,6 +6068,7 @@ static void Mod_Q3BSP_LightPoint(dp_model_t *model, const vec3_t p, vec3_t ambie break; case RENDERPATH_GL11: case RENDERPATH_GL13: + case RENDERPATH_GLES1: stylescale = r_refdef.scene.rtlightstylevalue[0]; break; } @@ -5990,6 +6224,9 @@ void Mod_CollisionBIH_TracePoint(dp_model_t *model, const frameblend_t *frameble trace->hitsupercontentsmask = hitsupercontentsmask; bih = &model->collision_bih; + if(!bih->nodes) + return; + nodenum = bih->rootnode; nodestack[nodestackpos++] = nodenum; while (nodestackpos) @@ -6035,7 +6272,7 @@ void Mod_CollisionBIH_TracePoint(dp_model_t *model, const frameblend_t *frameble } } -void Mod_CollisionBIH_TraceLineShared(dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, trace_t *trace, const vec3_t start, const vec3_t end, int hitsupercontentsmask, const bih_t *bih) +static void Mod_CollisionBIH_TraceLineShared(dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, trace_t *trace, const vec3_t start, const vec3_t end, int hitsupercontentsmask, const bih_t *bih) { const bih_leaf_t *leaf; const bih_node_t *node; @@ -6046,6 +6283,9 @@ void Mod_CollisionBIH_TraceLineShared(dp_model_t *model, const frameblend_t *fra vec_t d1, d2, d3, d4, f, nodestackline[1024][6]; int axis, nodenum, nodestackpos = 0, nodestack[1024]; + if(!bih->nodes) + return; + if (VectorCompare(start, end)) { Mod_CollisionBIH_TracePoint(model, frameblend, skeleton, trace, start, hitsupercontentsmask); @@ -6179,6 +6419,8 @@ void Mod_CollisionBIH_TraceBrush(dp_model_t *model, const frameblend_t *frameble } bih = &model->collision_bih; + if(!bih->nodes) + return; nodenum = bih->rootnode; // box trace, performed as brush trace @@ -6304,7 +6546,7 @@ void Mod_CollisionBIH_TraceBox(dp_model_t *model, const frameblend_t *frameblend } -int Mod_CollisionBIH_PointSuperContents(struct model_s *model, int frame, const vec3_t point) +static int Mod_CollisionBIH_PointSuperContents(struct model_s *model, int frame, const vec3_t point) { trace_t trace; Mod_CollisionBIH_TracePoint(model, NULL, NULL, &trace, point, 0); @@ -6626,7 +6868,7 @@ static void Mod_Q3BSP_TraceLine(dp_model_t *model, const frameblend_t *frameblen Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, model, model->brush.data_nodes, start, end, 0, 1, start, end, ++markframe, segmentmins, segmentmaxs); } -void Mod_Q3BSP_TraceBrush(dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, trace_t *trace, colbrushf_t *start, colbrushf_t *end, int hitsupercontentsmask) +static void Mod_Q3BSP_TraceBrush(dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, trace_t *trace, colbrushf_t *start, colbrushf_t *end, int hitsupercontentsmask) { float segmentmins[3], segmentmaxs[3]; int i; @@ -6691,9 +6933,7 @@ static int Mod_Q3BSP_PointSuperContents(struct model_s *model, int frame, const q3mbrush_t *brush; if (mod_collision_bih.integer) { - trace_t trace; - Mod_Q3BSP_TracePoint(model, NULL, NULL, &trace, point, 0); - supercontents = trace.startsupercontents; + supercontents = Mod_CollisionBIH_PointSuperContents(model, frame, point); } // test if the point is inside each brush else if (model->brush.submodel) @@ -6923,7 +7163,7 @@ static int Mod_Q3BSP_NativeContentsFromSuperContents(dp_model_t *model, int supe return nativecontents; } -void Mod_Q3BSP_RecursiveFindNumLeafs(mnode_t *node) +static void Mod_Q3BSP_RecursiveFindNumLeafs(mnode_t *node) { int numleafs; while (node->plane) @@ -6936,7 +7176,7 @@ void Mod_Q3BSP_RecursiveFindNumLeafs(mnode_t *node) loadmodel->brush.num_leafs = numleafs; } -void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) +static void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) { int i, j, lumps; q3dheader_t *header; @@ -7171,6 +7411,30 @@ void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) Mod_BuildVBOs(); } + if (mod_q3bsp_sRGBlightmaps.integer) + { + if (vid_sRGB.integer && vid_sRGB_fallback.integer && !vid.sRGB3D) + { + // actually we do in sRGB fallback with sRGB lightmaps: Image_sRGBFloatFromLinear_Lightmap(Image_LinearFloatFromsRGBFloat(x)) + // neutral point is at Image_sRGBFloatFromLinearFloat(0.5) + // so we need to map Image_sRGBFloatFromLinearFloat(0.5) to 0.5 + // factor is 0.5 / Image_sRGBFloatFromLinearFloat(0.5) + //loadmodel->lightmapscale *= 0.679942f; // fixes neutral level + } + else // if this is NOT set, regular rendering looks right by this requirement anyway + { + /* + // we want color 1 to do the same as without sRGB + // so, we want to map 1 to Image_LinearFloatFromsRGBFloat(2) instead of to 2 + loadmodel->lightmapscale *= 2.476923f; // fixes max level + */ + + // neutral level 0.5 gets uploaded as sRGB and becomes Image_LinearFloatFromsRGBFloat(0.5) + // we need to undo that + loadmodel->lightmapscale *= 2.336f; // fixes neutral level + } + } + Con_DPrintf("Stats for q3bsp model \"%s\": %i faces, %i nodes, %i leafs, %i clusters, %i clusterportals, mesh: %i vertices, %i triangles, %i surfaces\n", loadmodel->name, loadmodel->num_surfaces, loadmodel->brush.num_nodes, loadmodel->brush.num_leafs, mod->brush.num_pvsclusters, loadmodel->brush.num_portals, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->num_surfaces); } @@ -7190,9 +7454,6 @@ void Mod_MAP_Load(dp_model_t *mod, void *buffer, void *bufferend) Host_Error("Mod_MAP_Load: not yet implemented"); } -#define OBJASMODEL - -#ifdef OBJASMODEL typedef struct objvertex_s { int nextindex; @@ -7305,6 +7566,9 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend) VectorClear(mins); VectorClear(maxs); + // we always have model 0, i.e. the first "submodel" + loadmodel->brush.numsubmodels = 1; + // parse the OBJ text now for(;;) { @@ -7349,9 +7613,18 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend) maxv = max(maxv * 2, 1024); v = (float *)Mem_Realloc(tempmempool, v, maxv * sizeof(float[3])); } - v[numv*3+0] = atof(argv[1]); - v[numv*3+2] = atof(argv[2]); - v[numv*3+1] = atof(argv[3]); + if(mod_obj_orientation.integer) + { + v[numv*3+0] = atof(argv[1]); + v[numv*3+2] = atof(argv[2]); + v[numv*3+1] = atof(argv[3]); + } + else + { + v[numv*3+0] = atof(argv[1]); + v[numv*3+1] = atof(argv[2]); + v[numv*3+2] = atof(argv[3]); + } numv++; } else if (!strcmp(argv[0], "vt")) @@ -7372,9 +7645,18 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend) maxvn = max(maxvn * 2, 1024); vn = (float *)Mem_Realloc(tempmempool, vn, maxvn * sizeof(float[3])); } - vn[numvn*3+0] = atof(argv[1]); - vn[numvn*3+2] = atof(argv[2]); - vn[numvn*3+1] = atof(argv[3]); + if(mod_obj_orientation.integer) + { + vn[numvn*3+0] = atof(argv[1]); + vn[numvn*3+2] = atof(argv[2]); + vn[numvn*3+1] = atof(argv[3]); + } + else + { + vn[numvn*3+0] = atof(argv[1]); + vn[numvn*3+1] = atof(argv[2]); + vn[numvn*3+2] = atof(argv[3]); + } numvn++; } else if (!strcmp(argv[0], "f")) @@ -7443,9 +7725,18 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend) maxtriangles = max(maxtriangles * 2, 32768); vertices = (objvertex_t*)Mem_Realloc(loadmodel->mempool, vertices, maxtriangles * sizeof(objvertex_t[3])); } - vertices[numtriangles*3+0] = vfirst; - vertices[numtriangles*3+1] = vprev; - vertices[numtriangles*3+2] = vcurrent; + if(mod_obj_orientation.integer) + { + vertices[numtriangles*3+0] = vfirst; + vertices[numtriangles*3+1] = vprev; + vertices[numtriangles*3+2] = vcurrent; + } + else + { + vertices[numtriangles*3+0] = vfirst; + vertices[numtriangles*3+2] = vprev; + vertices[numtriangles*3+1] = vcurrent; + } numtriangles++; } vprev = vcurrent; @@ -7780,976 +8071,3 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend) Con_DPrintf("Stats for obj model \"%s\": %i faces, %i nodes, %i leafs, %i clusters, %i clusterportals, mesh: %i vertices, %i triangles, %i surfaces\n", loadmodel->name, loadmodel->num_surfaces, loadmodel->brush.num_nodes, loadmodel->brush.num_leafs, mod->brush.num_pvsclusters, loadmodel->brush.num_portals, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->num_surfaces); } - - - - - - - - - - -#else // OBJASMODEL - -#ifdef OBJWORKS -typedef struct objvertex_s -{ - float v[3]; - float vt[2]; - float vn[3]; -} -objvertex_t; - -typedef struct objtriangle_s -{ - objvertex_t vertex[3]; - int textureindex; - // these fields are used only in conversion to surfaces - int axis; - int surfaceindex; - int surfacevertexindex[3]; - float edgeplane[3][4]; -} -objtriangle_t; - -typedef objnode_s -{ - struct objnode_s *children[2]; - struct objnode_s *parent; - objtriangle_t *triangles; - float normal[3]; - float dist; - float mins[3]; - float maxs[3]; - int numtriangles; -} -objnode_t; - -objnode_t *Mod_OBJ_BSPNodeForTriangles(objnode_t *parent, objtriangle_t *triangles, int numtriangles, const float *mins, const float *maxs, mem_expandablearray_t *nodesarray, int maxclippedtriangles, objtriangle_t *clippedfronttriangles, objtriangle_t *clippedbacktriangles) -{ - int i, j; - float normal[3]; - float dist; - int score; - float bestnormal[3]; - float bestdist; - int bestscore; - float mins[3]; - float maxs[3]; - int numfronttriangles; - int numbacktriangles; - int count_front; - int count_back; - int count_both; - int count_on; - float outfrontpoints[5][3]; - float outbackpoints[5][3]; - int neededfrontpoints; - int neededbackpoints; - int countonpoints; - objnode_t *node; - - node = (objnode_t *)Mem_ExpandableArray_AllocRecord(array); - node->parent = parent; - if (numtriangles) - { - VectorCopy(triangles[0].vertex[0].v, mins); - VectorCopy(triangles[0].vertex[0].v, maxs); - } - else if (parent && parent->children[0] == node) - { - VectorCopy(parent->mins, mins); - Vectorcopy(parent->maxs, maxs); - } - else if (parent && parent->children[1] == node) - { - VectorCopy(parent->mins, mins); - Vectorcopy(parent->maxs, maxs); - } - else - { - VectorClear(mins); - VectorClear(maxs); - } - for (i = 0;i < numtriangles;i++) - { - for (j = 0;j < 3;j++) - { - mins[0] = min(mins[0], triangles[i].vertex[j].v[0]); - mins[1] = min(mins[1], triangles[i].vertex[j].v[1]); - mins[2] = min(mins[2], triangles[i].vertex[j].v[2]); - maxs[0] = max(maxs[0], triangles[i].vertex[j].v[0]); - maxs[1] = max(maxs[1], triangles[i].vertex[j].v[1]); - maxs[2] = max(maxs[2], triangles[i].vertex[j].v[2]); - } - } - VectorCopy(mins, node->mins); - VectorCopy(maxs, node->maxs); - if (numtriangles <= mod_obj_leaftriangles.integer) - { - // create a leaf - loadmodel->brush.num_leafs++; - node->triangles = triangles; - node->numtriangles = numtriangles; - return node; - } - - // create a node - loadmodel->brush.num_nodes++; - // pick a splitting plane from the various choices available to us... - // early splits simply halve the interval - bestscore = 0; - VectorClear(bestnormal); - bestdist = 0; - if (numtriangles <= mod_obj_splitterlimit.integer) - limit = numtriangles; - else - limit = 0; - for (i = -3;i < limit;i++) - { - if (i < 0) - { - // first we try 3 axial splits (kdtree-like) - j = i + 3; - VectorClear(normal); - normal[j] = 1; - dist = (mins[j] + maxs[j]) * 0.5f; - } - else - { - // then we try each triangle plane - TriangleNormal(triangles[i].vertex[0].v, triangles[i].vertex[1].v, triangles[i].vertex[2].v, normal); - VectorNormalize(normal); - dist = DotProduct(normal, triangles[i].vertex[0].v); - // use positive axial values whenever possible - if (normal[0] == -1) - normal[0] = 1; - if (normal[1] == -1) - normal[1] = 1; - if (normal[2] == -1) - normal[2] = 1; - // skip planes that match the current best - if (VectorCompare(normal, bestnormal) && dist == bestdist) - continue; - } - count_on = 0; - count_front = 0; - count_back = 0; - count_both = 0; - for (j = 0;j < numtriangles;j++) - { - dists[0] = DotProduct(normal, triangles[j].vertex[0].v) - dist; - dists[1] = DotProduct(normal, triangles[j].vertex[1].v) - dist; - dists[2] = DotProduct(normal, triangles[j].vertex[2].v) - dist; - if (dists[0] < -DIST_EPSILON || dists[1] < -DIST_EPSILON || dists[2] < -DIST_EPSILON) - { - if (dists[0] > DIST_EPSILON || dists[1] > DIST_EPSILON || dists[2] > DIST_EPSILON) - count_both++; - else - count_back++; - } - else if (dists[0] > DIST_EPSILON || dists[1] > DIST_EPSILON || dists[2] > DIST_EPSILON) - count_front++; - else - count_on++; - } - // score is supposed to: - // prefer axial splits - // prefer evenly dividing the input triangles - // prefer triangles on the plane - // avoid triangles crossing the plane - score = count_on*count_on - count_both*count_both + min(count_front, count_back)*(count_front+count_back); - if (normal[0] == 1 || normal[1] == 1 || normal[2] == 1) - score *= 2; - if (i == -3 || bestscore < score) - { - VectorCopy(normal, bestnormal); - bestdist = dist; - bestscore = score; - } - } - - // now we have chosen an optimal split plane... - - // divide triangles by the splitting plane - numfronttriangles = 0; - numbacktriangles = 0; - for (i = 0;i < numtriangles;i++) - { - neededfrontpoints = 0; - neededbackpoints = 0; - countonpoints = 0; - PolygonF_Divide(3, triangles[i].vertex[0].v, bestnormal[0], bestnormal[1], bestnormal[2], bestdist, DIST_EPSILON, 5, outfrontpoints[0], &neededfrontpoints, 5, outbackpoints[0], &neededbackpoints, &countonpoints); - if (countonpoints > 1) - { - // triangle lies on plane, assign it to one child only - TriangleNormal(triangles[i].vertex[0].v, triangles[i].vertex[1].v, triangles[i].vertex[2].v, normal); - if (DotProduct(bestnormal, normal) >= 0) - { - // assign to front side child - obj_fronttriangles[numfronttriangles++] = triangles[i]; - } - else - { - // assign to back side child - obj_backtriangles[numbacktriangles++] = triangles[i]; - } - } - else - { - // convert clipped polygons to triangles - for (j = 0;j < neededfrontpoints-2;j++) - { - obj_fronttriangles[numfronttriangles] = triangles[i]; - VectorCopy(outfrontpoints[0], obj_fronttriangles[numfronttriangles].vertex[0].v); - VectorCopy(outfrontpoints[j+1], obj_fronttriangles[numfronttriangles].vertex[1].v); - VectorCopy(outfrontpoints[j+2], obj_fronttriangles[numfronttriangles].vertex[2].v); - numfronttriangles++; - } - for (j = 0;j < neededbackpoints-2;j++) - { - obj_backtriangles[numbacktriangles] = triangles[i]; - VectorCopy(outbackpoints[0], obj_backtriangles[numbacktriangles].vertex[0].v); - VectorCopy(outbackpoints[j+1], obj_backtriangles[numbacktriangles].vertex[1].v); - VectorCopy(outbackpoints[j+2], obj_backtriangles[numbacktriangles].vertex[2].v); - numbacktriangles++; - } - } - } - - // now copy the triangles out of the big buffer - if (numfronttriangles) - { - fronttriangles = Mem_Alloc(loadmodel->mempool, fronttriangles * sizeof(*fronttriangles)); - memcpy(fronttriangles, obj_fronttriangles, numfronttriangles * sizeof(*fronttriangles)); - } - else - fronttriangles = NULL; - if (numbacktriangles) - { - backtriangles = Mem_Alloc(loadmodel->mempool, backtriangles * sizeof(*backtriangles)); - memcpy(backtriangles, obj_backtriangles, numbacktriangles * sizeof(*backtriangles)); - } - else - backtriangles = NULL; - - // free the original triangles we were given - if (triangles) - Mem_Free(triangles); - triangles = NULL; - numtriangles = 0; - - // now create the children... - node->children[0] = Mod_OBJ_BSPNodeForTriangles(node, fronttriangles, numfronttriangles, frontmins, frontmaxs, nodesarray, maxclippedtriangles, clippedfronttriangles, clippedbacktriangles); - node->children[1] = Mod_OBJ_BSPNodeForTriangles(node, backtriangles, numbacktriangles, backmins, backmaxs, nodesarray, maxclippedtriangles, clippedfronttriangles, clippedbacktriangles); - return node; -} - -void Mod_OBJ_SnapVertex(float *v) -{ - int i; - float a = mod_obj_vertexprecision.value; - float b = 1.0f / a; - v[0] -= floor(v[0] * a + 0.5f) * b; - v[1] -= floor(v[1] * a + 0.5f) * b; - v[2] -= floor(v[2] * a + 0.5f) * b; -} - -void Mod_OBJ_ConvertBSPNode(objnode_t *objnode, mnode_t *mnodeparent) -{ - if (objnode->children[0]) - { - // convert to mnode_t - mnode_t *mnode = loadmodel->brush.data_nodes + loadmodel->brush.num_nodes++; - mnode->parent = mnodeparent; - mnode->plane = loadmodel->brush.data_planes + loadmodel->brush.num_planes++; - VectorCopy(objnode->normal, mnode->plane->normal); - mnode->plane->dist = objnode->dist; - PlaneClassify(mnode->plane); - VectorCopy(objnode->mins, mnode->mins); - VectorCopy(objnode->maxs, mnode->maxs); - // push combinedsupercontents up to the parent - if (mnodeparent) - mnodeparent->combinedsupercontents |= mnode->combinedsupercontents; - mnode->children[0] = Mod_OBJ_ConvertBSPNode(objnode->children[0], mnode); - mnode->children[1] = Mod_OBJ_ConvertBSPNode(objnode->children[1], mnode); - } - else - { - // convert to mleaf_t - mleaf_t *mleaf = loadmodel->brush.data_leafs + loadmodel->brush.num_leafs++; - mleaf->parent = mnodeparent; - VectorCopy(objnode->mins, mleaf->mins); - VectorCopy(objnode->maxs, mleaf->maxs); - mleaf->clusterindex = loadmodel->brush.num_leafs - 1; - if (objnode->numtriangles) - { - objtriangle_t *triangles = objnode->triangles; - int numtriangles = objnode->numtriangles; - texture_t *texture; - float edge[3][3]; - float normal[3]; - objvertex_t vertex[3]; - numsurfaces = 0; - maxsurfaces = numtriangles; - surfaces = NULL; - // calculate some more data on each triangle for surface gathering - for (i = 0;i < numtriangles;i++) - { - triangle = triangles + i; - texture = loadmodel->data_textures + triangle->textureindex; - Mod_OBJ_SnapVertex(triangle->vertex[0].v); - Mod_OBJ_SnapVertex(triangle->vertex[1].v); - Mod_OBJ_SnapVertex(triangle->vertex[2].v); - TriangleNormal(triangle->vertex[0].v, triangle->vertex[1].v, triangle->vertex[2].v, normal); - axis = 0; - if (fabs(normal[axis]) < fabs(normal[1])) - axis = 1; - if (fabs(normal[axis]) < fabs(normal[2])) - axis = 2; - VectorClear(normal); - normal[axis] = 1; - triangle->axis = axis; - VectorSubtract(triangle->vertex[1].v, triangle->vertex[0].v, edge[0]); - VectorSubtract(triangle->vertex[2].v, triangle->vertex[1].v, edge[1]); - VectorSubtract(triangle->vertex[0].v, triangle->vertex[2].v, edge[2]); - CrossProduct(edge[0], normal, triangle->edgeplane[0]); - CrossProduct(edge[1], normal, triangle->edgeplane[1]); - CrossProduct(edge[2], normal, triangle->edgeplane[2]); - VectorNormalize(triangle->edgeplane[0]); - VectorNormalize(triangle->edgeplane[1]); - VectorNormalize(triangle->edgeplane[2]); - triangle->edgeplane[0][3] = DotProduct(triangle->edgeplane[0], triangle->vertex[0].v); - triangle->edgeplane[1][3] = DotProduct(triangle->edgeplane[1], triangle->vertex[1].v); - triangle->edgeplane[2][3] = DotProduct(triangle->edgeplane[2], triangle->vertex[2].v); - triangle->surfaceindex = 0; - // add to the combined supercontents while we're here... - mleaf->combinedsupercontents |= texture->supercontents; - } - surfaceindex = 1; - for (i = 0;i < numtriangles;i++) - { - // skip already-assigned triangles - if (triangles[i].surfaceindex) - continue; - texture = loadmodel->data_textures + triangles[i].textureindex; - // assign a new surface to this triangle - triangles[i].surfaceindex = surfaceindex++; - axis = triangles[i].axis; - numvertices = 3; - // find the triangle's neighbors, this can take multiple passes - retry = true; - while (retry) - { - retry = false; - for (j = i+1;j < numtriangles;j++) - { - if (triangles[j].surfaceindex || triangles[j].axis != axis || triangles[j].texture != texture) - continue; - triangle = triangles + j; - for (k = i;k < j;k++) - { - if (triangles[k].surfaceindex != surfaceindex) - continue; - if (VectorCompare(triangles[k].vertex[0].v, triangles[j].vertex[0].v) - || VectorCompare(triangles[k].vertex[0].v, triangles[j].vertex[1].v) - || VectorCompare(triangles[k].vertex[0].v, triangles[j].vertex[2].v) - || VectorCompare(triangles[k].vertex[1].v, triangles[j].vertex[0].v) - || VectorCompare(triangles[k].vertex[1].v, triangles[j].vertex[1].v) - || VectorCompare(triangles[k].vertex[1].v, triangles[j].vertex[2].v) - || VectorCompare(triangles[k].vertex[2].v, triangles[j].vertex[0].v) - || VectorCompare(triangles[k].vertex[2].v, triangles[j].vertex[1].v) - || VectorCompare(triangles[k].vertex[2].v, triangles[j].vertex[2].v)) - { - // shares a vertex position - --- FIXME --- - } - } - for (k = 0;k < numvertices;k++) - if (!VectorCompare(vertex[k].v, triangles[j].vertex[0].v) || !VectorCompare(vertex[k].v, triangles[j].vertex[1].v) || !VectorCompare(vertex[k].v, triangles[j].vertex[2].v)) - break; - if (k == numvertices) - break; // not a neighbor - // this triangle is a neighbor and has the same axis and texture - // check now if it overlaps in lightmap projection space - triangles[j].surfaceindex; - if (triangles[j]. - } - } - //triangles[i].surfaceindex = surfaceindex++; - for (surfaceindex = 0;surfaceindex < numsurfaces;surfaceindex++) - { - if (surfaces[surfaceindex].texture != texture) - continue; - // check if any triangles already in this surface overlap in lightmap projection space - - { - } - break; - } - } - // let the collision code simply use the surfaces - mleaf->containscollisionsurfaces = mleaf->combinedsupercontents != 0; - mleaf->numleafsurfaces = ?; - mleaf->firstleafsurface = ?; - } - // push combinedsupercontents up to the parent - if (mnodeparent) - mnodeparent->combinedsupercontents |= mleaf->combinedsupercontents; - } -} -#endif - -void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend) -{ -#ifdef OBJWORKS - const char *textbase = (char *)buffer, *text = textbase; - char *s; - char *argv[512]; - char line[1024]; - char materialname[MAX_QPATH]; - int j, index1, index2, index3, first, prev, index; - int argc; - int linelen; - int numtriangles = 0; - int maxtriangles = 131072; - objtriangle_t *triangles = Mem_Alloc(tempmempool, maxtriangles * sizeof(*triangles)); - int linenumber = 0; - int maxtextures = 256, numtextures = 0, textureindex = 0; - int maxv = 1024, numv = 0; - int maxvt = 1024, numvt = 0; - int maxvn = 1024, numvn = 0; - char **texturenames; - float *v = Mem_Alloc(tempmempool, maxv * sizeof(float[3])); - float *vt = Mem_Alloc(tempmempool, maxvt * sizeof(float[2])); - float *vn = Mem_Alloc(tempmempool, maxvn * sizeof(float[3])); - objvertex_t vfirst, vprev, vcurrent; - float mins[3]; - float maxs[3]; -#if 0 - int hashindex; - int maxverthash = 65536, numverthash = 0; - int numhashindex = 65536; - struct objverthash_s - { - struct objverthash_s *next; - int s; - int v; - int vt; - int vn; - } - *hash, **verthash = Mem_Alloc(tempmempool, numhashindex * sizeof(*verthash)), *verthashdata = Mem_Alloc(tempmempool, maxverthash * sizeof(*verthashdata)), *oldverthashdata; -#endif - - dpsnprintf(materialname, sizeof(materialname), "%s", loadmodel->name); - - loadmodel->modeldatatypestring = "OBJ"; - - loadmodel->type = mod_obj; - loadmodel->soundfromcenter = true; - loadmodel->TraceBox = Mod_OBJ_TraceBox; - loadmodel->TraceLine = Mod_OBJ_TraceLine; - loadmodel->TracePoint = Mod_OBJ_TracePoint; - loadmodel->PointSuperContents = Mod_OBJ_PointSuperContents; - loadmodel->TraceLineAgainstSurfaces = Mod_OBJ_TraceLineAgainstSurfaces; - loadmodel->brush.TraceLineOfSight = Mod_OBJ_TraceLineOfSight; - loadmodel->brush.SuperContentsFromNativeContents = Mod_OBJ_SuperContentsFromNativeContents; - loadmodel->brush.NativeContentsFromSuperContents = Mod_OBJ_NativeContentsFromSuperContents; - loadmodel->brush.GetPVS = Mod_OBJ_GetPVS; - loadmodel->brush.FatPVS = Mod_OBJ_FatPVS; - loadmodel->brush.BoxTouchingPVS = Mod_OBJ_BoxTouchingPVS; - loadmodel->brush.BoxTouchingLeafPVS = Mod_OBJ_BoxTouchingLeafPVS; - loadmodel->brush.BoxTouchingVisibleLeafs = Mod_OBJ_BoxTouchingVisibleLeafs; - loadmodel->brush.FindBoxClusters = Mod_OBJ_FindBoxClusters; - loadmodel->brush.LightPoint = Mod_OBJ_LightPoint; - loadmodel->brush.FindNonSolidLocation = Mod_OBJ_FindNonSolidLocation; - loadmodel->brush.AmbientSoundLevelsForPoint = NULL; - loadmodel->brush.RoundUpToHullSize = NULL; - loadmodel->brush.PointInLeaf = Mod_OBJ_PointInLeaf; - loadmodel->Draw = R_Q1BSP_Draw; - loadmodel->DrawDepth = R_Q1BSP_DrawDepth; - loadmodel->DrawDebug = R_Q1BSP_DrawDebug; - loadmodel->DrawPrepass = R_Q1BSP_DrawPrepass; - loadmodel->GetLightInfo = R_Q1BSP_GetLightInfo; - loadmodel->CompileShadowMap = R_Q1BSP_CompileShadowMap; - loadmodel->DrawShadowMap = R_Q1BSP_DrawShadowMap; - loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume; - loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; - loadmodel->DrawLight = R_Q1BSP_DrawLight; - - VectorClear(mins); - VectorClear(maxs); - - // parse the OBJ text now - for(;;) - { - if (!*text) - break; - linenumber++; - linelen = 0; - for (linelen = 0;text[linelen] && text[linelen] != '\r' && text[linelen] != '\n';linelen++) - line[linelen] = text[linelen]; - line[linelen] = 0; - for (argc = 0;argc < (int)(sizeof(argv)/sizeof(argv[0]));argc++) - argv[argc] = ""; - argc = 0; - s = line; - while (*s == ' ' || *s == '\t') - s++; - while (*s) - { - argv[argc++] = s; - while (*s > ' ') - s++; - if (!*s) - break; - *s++ = 0; - while (*s == ' ' || *s == '\t') - s++; - } - if (!argc) - continue; - if (argv[0][0] == '#') - continue; - if (!strcmp(argv[0], "v")) - { - if (maxv <= numv) - { - float *oldv = v; - maxv *= 2; - v = Mem_Alloc(tempmempool, maxv * sizeof(float[3])); - if (oldv) - { - memcpy(v, oldv, numv * sizeof(float[3])); - Mem_Free(oldv); - } - } - v[numv*3+0] = atof(argv[1]); - v[numv*3+1] = atof(argv[2]); - v[numv*3+2] = atof(argv[3]); - numv++; - } - else if (!strcmp(argv[0], "vt")) - { - if (maxvt <= numvt) - { - float *oldvt = vt; - maxvt *= 2; - vt = Mem_Alloc(tempmempool, maxvt * sizeof(float[2])); - if (oldvt) - { - memcpy(vt, oldvt, numvt * sizeof(float[2])); - Mem_Free(oldvt); - } - } - vt[numvt*2+0] = atof(argv[1]); - vt[numvt*2+1] = atof(argv[2]); - numvt++; - } - else if (!strcmp(argv[0], "vn")) - { - if (maxvn <= numvn) - { - float *oldvn = vn; - maxvn *= 2; - vn = Mem_Alloc(tempmempool, maxvn * sizeof(float[3])); - if (oldvn) - { - memcpy(vn, oldvn, numvn * sizeof(float[3])); - Mem_Free(oldvn); - } - } - vn[numvn*3+0] = atof(argv[1]); - vn[numvn*3+1] = atof(argv[2]); - vn[numvn*3+2] = atof(argv[3]); - numvn++; - } - else if (!strcmp(argv[0], "f")) - { - for (j = 1;j < argc;j++) - { - index1 = atoi(argv[j]); - while(argv[j][0] && argv[j][0] != '/') - argv[j]++; - if (argv[j][0]) - argv[j]++; - index2 = atoi(argv[j]); - while(argv[j][0] && argv[j][0] != '/') - argv[j]++; - if (argv[j][0]) - argv[j]++; - index3 = atoi(argv[j]); - // negative refers to a recent vertex - // zero means not specified - // positive means an absolute vertex index - if (index1 < 0) - index1 = numv - index1; - if (index2 < 0) - index2 = numvt - index2; - if (index3 < 0) - index3 = numvn - index3; - VectorCopy(v + 3*index1, vcurrent.v); - Vector2Copy(vt + 2*index2, vcurrent.vt); - VectorCopy(vn + 3*index3, vcurrent.vn); - if (numtriangles == 0) - { - VectorCopy(vcurrent.v, mins); - VectorCopy(vcurrent.v, maxs); - } - else - { - mins[0] = min(mins[0], vcurrent.v[0]); - mins[1] = min(mins[1], vcurrent.v[1]); - mins[2] = min(mins[2], vcurrent.v[2]); - maxs[0] = max(maxs[0], vcurrent.v[0]); - maxs[1] = max(maxs[1], vcurrent.v[1]); - maxs[2] = max(maxs[2], vcurrent.v[2]); - } - if (j == 1) - vfirst = vcurrent; - else if (j >= 3) - { - if (maxtriangles <= numtriangles) - { - objtriangle_t *oldtriangles = triangles; - maxtriangles *= 2; - triangles = Mem_Alloc(tempmempool, maxtriangles * sizeof(*triangles)); - if (oldtriangles) - { - memcpy(triangles, oldtriangles, maxtriangles * sizeof(*triangles)); - Mem_Free(oldtriangles); - } - } - triangles[numtriangles].textureindex = textureindex; - triangles[numtriangles].vertex[0] = vfirst; - triangles[numtriangles].vertex[1] = vprev; - triangles[numtriangles].vertex[2] = vcurrent; - numtriangles++; - } - vprev = vcurrent; - prev = index; - } - } - else if (!strcmp(argv[0], "o") || !strcmp(argv[0], "g")) - ; - else if (!!strcmp(argv[0], "usemtl")) - { - for (i = 0;i < numtextures;i++) - if (!strcmp(texturenames[numtextures], argv[1])) - break; - if (i < numtextures) - texture = textures + i; - else - { - if (maxtextures <= numtextures) - { - texture_t *oldtextures = textures; - maxtextures *= 2; - textures = Mem_Alloc(tempmempool, maxtextures * sizeof(*textures)); - if (oldtextures) - { - memcpy(textures, oldtextures, numtextures * sizeof(*textures)); - Mem_Free(oldtextures); - } - } - textureindex = numtextures++; - texturenames[textureindex] = Mem_Alloc(tempmempool, strlen(argv[1]) + 1); - memcpy(texturenames[textureindex], argv[1], strlen(argv[1]) + 1); - } - } - text += linelen; - if (*text == '\r') - text++; - if (*text == '\n') - text++; - } - - // now that we have the OBJ data loaded as-is, we can convert it - - // load the textures - loadmodel->num_textures = numtextures; - loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_textures * sizeof(texture_t)); - for (i = 0;i < numtextures;i++) - Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i, texturenames[i], true, true, TEXF_MIPMAP | TEXF_ALPHA | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS); - - // free the texturenames array since we are now done with it - for (i = 0;i < numtextures;i++) - { - Mem_Free(texturenames[i]); - texturenames[i] = NULL; - } - Mem_Free(texturenames); - texturenames = NULL; - - // copy the model bounds, then enlarge the yaw and rotated bounds according to radius - VectorCopy(mins, loadmodel->normalmins); - VectorCopy(maxs, loadmodel->normalmaxs); - dist = max(fabs(loadmodel->normalmins[0]), fabs(loadmodel->normalmaxs[0])); - modelyawradius = max(fabs(loadmodel->normalmins[1]), fabs(loadmodel->normalmaxs[1])); - modelyawradius = dist*dist+modelyawradius*modelyawradius; - modelradius = max(fabs(loadmodel->normalmins[2]), fabs(loadmodel->normalmaxs[2])); - modelradius = modelyawradius + modelradius * modelradius; - modelyawradius = sqrt(modelyawradius); - modelradius = sqrt(modelradius); - loadmodel->yawmins[0] = loadmodel->yawmins[1] = -modelyawradius; - loadmodel->yawmins[2] = loadmodel->normalmins[2]; - loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = modelyawradius; - loadmodel->yawmaxs[2] = loadmodel->normalmaxs[2]; - loadmodel->rotatedmins[0] = loadmodel->rotatedmins[1] = loadmodel->rotatedmins[2] = -modelradius; - loadmodel->rotatedmaxs[0] = loadmodel->rotatedmaxs[1] = loadmodel->rotatedmaxs[2] = modelradius; - loadmodel->radius = modelradius; - loadmodel->radius2 = modelradius * modelradius; - - // make sure the temp triangle buffer is big enough for BSP building - maxclippedtriangles = numtriangles*4; - if (numtriangles > 0) - { - clippedfronttriangles = Mem_Alloc(loadmodel->mempool, maxclippedtriangles * 2 * sizeof(objtriangle_t)); - clippedbacktriangles = clippedfronttriangles + maxclippedtriangles; - } - - // generate a rough BSP tree from triangle data, we don't have to be too careful here, it only has to define the basic areas of the map - loadmodel->brush.num_leafs = 0; - loadmodel->brush.num_nodes = 0; - Mem_ExpandableArray_NewArray(&nodesarray, loadmodel->mempool, sizeof(objnode_t), 1024); - rootnode = Mod_OBJ_BSPNodeForTriangles(triangles, numtriangles, mins, maxs, &nodesarray, maxclippedtriangles, clippedfronttriangles, clippedbacktriangles); - - // convert the BSP tree to mnode_t and mleaf_t structures and convert the triangles to msurface_t... - loadmodel->brush.data_leafs = Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_leafs * sizeof(mleaf_t)); - loadmodel->brush.data_nodes = Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_nodes * sizeof(mnode_t)); - loadmodel->brush.data_planes = Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_nodes * sizeof(mplane_t)); - loadmodel->brush.num_leafs = 0; - loadmodel->brush.num_nodes = 0; - loadmodel->brush.num_planes = 0; - Mod_OBJ_ConvertAndFreeBSPNode(rootnode); - - if (clippedfronttriangles) - Mem_Free(clippedfronttriangles); - maxclippedtriangles = 0; - clippedfronttriangles = NULL; - clippedbacktriangles = NULL; - ---- NOTHING DONE PAST THIS POINT --- - - loadmodel->numskins = LittleLong(pinmodel->num_skins); - numxyz = LittleLong(pinmodel->num_xyz); - numst = LittleLong(pinmodel->num_st); - loadmodel->surfmesh.num_triangles = LittleLong(pinmodel->num_tris); - loadmodel->numframes = LittleLong(pinmodel->num_frames); - loadmodel->surfmesh.num_morphframes = loadmodel->numframes; - loadmodel->num_poses = loadmodel->surfmesh.num_morphframes; - skinwidth = LittleLong(pinmodel->skinwidth); - skinheight = LittleLong(pinmodel->skinheight); - iskinwidth = 1.0f / skinwidth; - iskinheight = 1.0f / skinheight; - - loadmodel->num_surfaces = 1; - loadmodel->nummodelsurfaces = loadmodel->num_surfaces; - data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->numframes * sizeof(animscene_t) + loadmodel->numframes * sizeof(float[6]) + loadmodel->surfmesh.num_triangles * sizeof(int[3]) + (r_enableshadowvolume.integer ? loadmodel->surfmesh.num_triangles * sizeof(int[3]) : 0)); - loadmodel->data_surfaces = (msurface_t *)data;data += loadmodel->num_surfaces * sizeof(msurface_t); - loadmodel->sortedmodelsurfaces = (int *)data;data += loadmodel->num_surfaces * sizeof(int); - loadmodel->sortedmodelsurfaces[0] = 0; - loadmodel->animscenes = (animscene_t *)data;data += loadmodel->numframes * sizeof(animscene_t); - loadmodel->surfmesh.data_morphmd2framesize6f = (float *)data;data += loadmodel->numframes * sizeof(float[6]); - loadmodel->surfmesh.data_element3i = (int *)data;data += loadmodel->surfmesh.num_triangles * sizeof(int[3]); - if (r_enableshadowvolumes.integer) - loadmodel->surfmesh.data_neighbor3i = (int *)data;data += loadmodel->surfmesh.num_triangles * sizeof(int[3]); - - loadmodel->synctype = ST_RAND; - - // load the skins - inskin = (char *)(base + LittleLong(pinmodel->ofs_skins)); - skinfiles = Mod_LoadSkinFiles(); - if (skinfiles) - { - loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins; - loadmodel->num_texturesperskin = loadmodel->num_surfaces; - loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t)); - Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures, skinfiles, "default", ""); - Mod_FreeSkinFiles(skinfiles); - } - else if (loadmodel->numskins) - { - // skins found (most likely not a player model) - loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins; - loadmodel->num_texturesperskin = loadmodel->num_surfaces; - loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t)); - for (i = 0;i < loadmodel->numskins;i++, inskin += MD2_SKINNAME) - Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i * loadmodel->num_surfaces, inskin, true, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP | TEXF_COMPRESS); - } - else - { - // no skins (most likely a player model) - loadmodel->numskins = 1; - loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins; - loadmodel->num_texturesperskin = loadmodel->num_surfaces; - loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t)); - Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures, NULL); - } - - loadmodel->skinscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins); - for (i = 0;i < loadmodel->numskins;i++) - { - loadmodel->skinscenes[i].firstframe = i; - loadmodel->skinscenes[i].framecount = 1; - loadmodel->skinscenes[i].loop = true; - loadmodel->skinscenes[i].framerate = 10; - } - - // load the triangles and stvert data - inst = (unsigned short *)(base + LittleLong(pinmodel->ofs_st)); - intri = (md2triangle_t *)(base + LittleLong(pinmodel->ofs_tris)); - md2verthash = (struct md2verthash_s **)Mem_Alloc(tempmempool, 65536 * sizeof(hash)); - md2verthashdata = (struct md2verthash_s *)Mem_Alloc(tempmempool, loadmodel->surfmesh.num_triangles * 3 * sizeof(*hash)); - // swap the triangle list - loadmodel->surfmesh.num_vertices = 0; - for (i = 0;i < loadmodel->surfmesh.num_triangles;i++) - { - for (j = 0;j < 3;j++) - { - xyz = (unsigned short) LittleShort (intri[i].index_xyz[j]); - st = (unsigned short) LittleShort (intri[i].index_st[j]); - if (xyz >= numxyz) - { - Con_Printf("%s has an invalid xyz index (%i) on triangle %i, resetting to 0\n", loadmodel->name, xyz, i); - xyz = 0; - } - if (st >= numst) - { - Con_Printf("%s has an invalid st index (%i) on triangle %i, resetting to 0\n", loadmodel->name, st, i); - st = 0; - } - hashindex = (xyz * 256 + st) & 65535; - for (hash = md2verthash[hashindex];hash;hash = hash->next) - if (hash->xyz == xyz && hash->st == st) - break; - if (hash == NULL) - { - hash = md2verthashdata + loadmodel->surfmesh.num_vertices++; - hash->xyz = xyz; - hash->st = st; - hash->next = md2verthash[hashindex]; - md2verthash[hashindex] = hash; - } - loadmodel->surfmesh.data_element3i[i*3+j] = (hash - md2verthashdata); - } - } - - vertremap = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_vertices * sizeof(int)); - data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_vertices * sizeof(float[2]) + loadmodel->surfmesh.num_vertices * loadmodel->surfmesh.num_morphframes * sizeof(trivertx_t)); - loadmodel->surfmesh.data_texcoordtexture2f = (float *)data;data += loadmodel->surfmesh.num_vertices * sizeof(float[2]); - loadmodel->surfmesh.data_morphmdlvertex = (trivertx_t *)data;data += loadmodel->surfmesh.num_vertices * loadmodel->surfmesh.num_morphframes * sizeof(trivertx_t); - for (i = 0;i < loadmodel->surfmesh.num_vertices;i++) - { - int sts, stt; - hash = md2verthashdata + i; - vertremap[i] = hash->xyz; - sts = LittleShort(inst[hash->st*2+0]); - stt = LittleShort(inst[hash->st*2+1]); - if (sts < 0 || sts >= skinwidth || stt < 0 || stt >= skinheight) - { - Con_Printf("%s has an invalid skin coordinate (%i %i) on vert %i, changing to 0 0\n", loadmodel->name, sts, stt, i); - sts = 0; - stt = 0; - } - loadmodel->surfmesh.data_texcoordtexture2f[i*2+0] = sts * iskinwidth; - loadmodel->surfmesh.data_texcoordtexture2f[i*2+1] = stt * iskinheight; - } - - Mem_Free(md2verthash); - Mem_Free(md2verthashdata); - - // generate ushort elements array if possible - if (loadmodel->surfmesh.num_vertices <= 65536) - loadmodel->surfmesh.data_element3s = (unsigned short *)Mem_Alloc(loadmodel->mempool, sizeof(unsigned short[3]) * loadmodel->surfmesh.num_triangles); - - // load the frames - datapointer = (base + LittleLong(pinmodel->ofs_frames)); - for (i = 0;i < loadmodel->surfmesh.num_morphframes;i++) - { - int k; - trivertx_t *v; - trivertx_t *out; - pinframe = (md2frame_t *)datapointer; - datapointer += sizeof(md2frame_t); - // store the frame scale/translate into the appropriate array - for (j = 0;j < 3;j++) - { - loadmodel->surfmesh.data_morphmd2framesize6f[i*6+j] = LittleFloat(pinframe->scale[j]); - loadmodel->surfmesh.data_morphmd2framesize6f[i*6+3+j] = LittleFloat(pinframe->translate[j]); - } - // convert the vertices - v = (trivertx_t *)datapointer; - out = loadmodel->surfmesh.data_morphmdlvertex + i * loadmodel->surfmesh.num_vertices; - for (k = 0;k < loadmodel->surfmesh.num_vertices;k++) - out[k] = v[vertremap[k]]; - datapointer += numxyz * sizeof(trivertx_t); - - strlcpy(loadmodel->animscenes[i].name, pinframe->name, sizeof(loadmodel->animscenes[i].name)); - loadmodel->animscenes[i].firstframe = i; - loadmodel->animscenes[i].framecount = 1; - loadmodel->animscenes[i].framerate = 10; - loadmodel->animscenes[i].loop = true; - } - - Mem_Free(vertremap); - - Mod_MakeSortedSurfaces(loadmodel); - if (loadmodel->surfmesh.data_neighbor3i) - Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles); - Mod_Alias_CalculateBoundingBox(); - Mod_Alias_MorphMesh_CompileFrames(); - - surface = loadmodel->data_surfaces; - surface->texture = loadmodel->data_textures; - surface->num_firsttriangle = 0; - surface->num_triangles = loadmodel->surfmesh.num_triangles; - surface->num_firstvertex = 0; - surface->num_vertices = loadmodel->surfmesh.num_vertices; - - loadmodel->surfmesh.isanimated = false; - - if (loadmodel->surfmesh.data_element3s) - for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++) - loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i]; -#endif -} -#endif // !OBJASMODEL - -qboolean Mod_CanSeeBox_Trace(int numsamples, float t, dp_model_t *model, vec3_t eye, vec3_t minsX, vec3_t maxsX) -{ - // we already have done PVS culling at this point... - // so we don't need to do it again. - - int i; - vec3_t testorigin, mins, maxs; - - testorigin[0] = (minsX[0] + maxsX[0]) * 0.5; - testorigin[1] = (minsX[1] + maxsX[1]) * 0.5; - testorigin[2] = (minsX[2] + maxsX[2]) * 0.5; - - if(model->brush.TraceLineOfSight(model, eye, testorigin)) - return 1; - - // expand the box a little - mins[0] = (t+1) * minsX[0] - t * maxsX[0]; - maxs[0] = (t+1) * maxsX[0] - t * minsX[0]; - mins[1] = (t+1) * minsX[1] - t * maxsX[1]; - maxs[1] = (t+1) * maxsX[1] - t * minsX[1]; - mins[2] = (t+1) * minsX[2] - t * maxsX[2]; - maxs[2] = (t+1) * maxsX[2] - t * minsX[2]; - - for(i = 0; i != numsamples; ++i) - { - testorigin[0] = lhrandom(mins[0], maxs[0]); - testorigin[1] = lhrandom(mins[1], maxs[1]); - testorigin[2] = lhrandom(mins[2], maxs[2]); - - if(model->brush.TraceLineOfSight(model, eye, testorigin)) - return 1; - } - - return 0; -} -