tx->reflectfactor = 1;
Vector4Set(tx->reflectcolor4f, 1, 1, 1, 1);
tx->r_water_wateralpha = 1;
+ tx->specularscalemod = 1;
+ tx->specularpowermod = 1;
}
if (!m)
// start out with no animation
tx->currentframe = tx;
tx->currentskinframe = tx->skinframes[0];
+ tx->specularscalemod = 1; // not supported here
+ tx->specularpowermod = 1; // not supported here
}
}
}
#endif
-extern cvar_t gl_max_size;
+extern cvar_t gl_max_lightmapsize;
static void Mod_Q1BSP_LoadFaces(lump_t *l)
{
dface_t *in;
lightmaptexture = NULL;
deluxemaptexture = r_texture_blanknormalmap;
lightmapnumber = 1;
- lightmapsize = max(256, gl_max_size.integer);
+ lightmapsize = bound(256, gl_max_lightmapsize.integer, (int)vid.maxtexturesize_2d);
totallightmapsamples = 0;
totalverts = 0;
// small maps (such as ammo boxes especially) don't need big lightmap
// textures, so this code tries to guess a good size based on
// totallightmapsamples (size of the lightmaps lump basically), as well as
- // trying to max out the gl_max_size if there is a lot of lightmap data to
- // store
+ // trying to max out the size if there is a lot of lightmap data to store
// additionally, never choose a lightmapsize that is smaller than the
// largest surface encountered (as it would fail)
i = lightmapsize;
- for (lightmapsize = 64; (lightmapsize < i) && (lightmapsize < gl_max_size.integer) && (totallightmapsamples > lightmapsize*lightmapsize); lightmapsize*=2)
+ for (lightmapsize = 64; (lightmapsize < i) && (lightmapsize < bound(128, gl_max_lightmapsize.integer, (int)vid.maxtexturesize_2d)) && (totallightmapsamples > lightmapsize*lightmapsize); lightmapsize*=2)
;
// now that we've decided the lightmap texture size, we can do the rest
}
portal_t;
-static portal_t *portalchain;
-
-/*
-===========
-AllocPortal
-===========
-*/
-static portal_t *AllocPortal(void)
-{
- portal_t *p;
- p = (portal_t *)Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
- p->chain = portalchain;
- portalchain = p;
- return p;
-}
-
-static void FreePortal(portal_t *p)
-{
- Mem_Free(p);
-}
+static memexpandablearray_t portalarray;
static void Mod_Q1BSP_RecursiveRecalcNodeBBox(mnode_t *node)
{
static void Mod_Q1BSP_FinalizePortals(void)
{
- int i, j, numportals, numpoints;
- portal_t *p, *pnext;
+ int i, j, numportals, numpoints, portalindex, portalrange = Mem_ExpandableArray_IndexRange(&portalarray);
+ portal_t *p;
mportal_t *portal;
mvertex_t *point;
mleaf_t *leaf, *endleaf;
VectorSet(leaf->mins, 2000000000, 2000000000, 2000000000);
VectorSet(leaf->maxs, -2000000000, -2000000000, -2000000000);
}
- p = portalchain;
numportals = 0;
numpoints = 0;
- while (p)
+ for (portalindex = 0;portalindex < portalrange;portalindex++)
{
+ p = (portal_t*)Mem_ExpandableArray_RecordAtIndex(&portalarray, portalindex);
+ if (!p)
+ continue;
// note: this check must match the one below or it will usually corrupt memory
// the nodes[0] != nodes[1] check is because leaf 0 is the shared solid leaf, it can have many portals inside with leaf 0 on both sides
if (p->numpoints >= 3 && p->nodes[0] != p->nodes[1] && ((mleaf_t *)p->nodes[0])->clusterindex >= 0 && ((mleaf_t *)p->nodes[1])->clusterindex >= 0)
numportals += 2;
numpoints += p->numpoints * 2;
}
- p = p->chain;
}
loadmodel->brush.data_portals = (mportal_t *)Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
loadmodel->brush.num_portals = numportals;
// process all portals in the global portal chain, while freeing them
portal = loadmodel->brush.data_portals;
point = loadmodel->brush.data_portalpoints;
- p = portalchain;
- portalchain = NULL;
- while (p)
+ for (portalindex = 0;portalindex < portalrange;portalindex++)
{
- pnext = p->chain;
-
+ p = (portal_t*)Mem_ExpandableArray_RecordAtIndex(&portalarray, portalindex);
+ if (!p)
+ continue;
if (p->numpoints >= 3 && p->nodes[0] != p->nodes[1])
{
// note: this check must match the one above or it will usually corrupt memory
}
}
}
- FreePortal(p);
- p = pnext;
}
// now recalculate the node bounding boxes from the leafs
Mod_Q1BSP_RecursiveRecalcNodeBBox(loadmodel->brush.data_nodes + loadmodel->brushq1.hulls[0].firstclipnode);
// create the new portal by generating a polygon for the node plane,
// and clipping it by all of the other portals(which came from nodes above this one)
- nodeportal = AllocPortal();
+ nodeportal = (portal_t *)Mem_ExpandableArray_AllocRecord(&portalarray);
nodeportal->plane = *plane;
// 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)
}
// the portal is split
- splitportal = AllocPortal();
+ splitportal = (portal_t *)Mem_ExpandableArray_AllocRecord(&portalarray);
temp = splitportal->chain;
*splitportal = *portal;
splitportal->chain = temp;
static void Mod_Q1BSP_MakePortals(void)
{
- portalchain = NULL;
+ Mem_ExpandableArray_NewArray(&portalarray, loadmodel->mempool, sizeof(portal_t), 1020*1024/sizeof(portal_t));
Mod_Q1BSP_RecursiveNodePortals(loadmodel->brush.data_nodes + loadmodel->brushq1.hulls[0].firstclipnode);
Mod_Q1BSP_FinalizePortals();
+ Mem_ExpandableArray_FreeArray(&portalarray);
}
//Returns PVS data for a given point
mod->Draw = R_Q1BSP_Draw;
mod->DrawDepth = R_Q1BSP_DrawDepth;
mod->DrawDebug = R_Q1BSP_DrawDebug;
+ mod->DrawPrepass = R_Q1BSP_DrawPrepass;
mod->GetLightInfo = R_Q1BSP_GetLightInfo;
mod->CompileShadowMap = R_Q1BSP_CompileShadowMap;
mod->DrawShadowMap = R_Q1BSP_DrawShadowMap;
mod->Draw = R_Q1BSP_Draw;
mod->DrawDepth = R_Q1BSP_DrawDepth;
mod->DrawDebug = R_Q1BSP_DrawDebug;
+ mod->DrawPrepass = R_Q1BSP_DrawPrepass;
mod->GetLightInfo = R_Q1BSP_GetLightInfo;
mod->CompileShadowMap = R_Q1BSP_CompileShadowMap;
mod->DrawShadowMap = R_Q1BSP_DrawShadowMap;
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;
projects / xonotic / darkplaces.git / blobdiff