size = smax*tmax;
size3 = size*3;
+ r_refdef.stats.lightmapupdatepixels += size;
+ r_refdef.stats.lightmapupdates++;
+
if (cl.buildlightmapmemorysize < size*sizeof(int[3]))
{
cl.buildlightmapmemorysize = size*sizeof(int[3]);
// scaling, and remaps the 0-65536 (2x overbright) to 0-256, it will
// be doubled during rendering to achieve 2x overbright
// (0 = 0.0, 128 = 1.0, 256 = 2.0)
- for (i = 0;i < size;i++)
+ for (i = 0;i < size;i++, bl += 3, stain += 3, out += 4)
{
- l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
- l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
- l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
- *out++ = 255;
+ l = (bl[0] * stain[0]) >> 16;out[2] = min(l, 255);
+ l = (bl[1] * stain[1]) >> 16;out[1] = min(l, 255);
+ l = (bl[2] * stain[2]) >> 16;out[0] = min(l, 255);
+ out[3] = 255;
}
R_UpdateTexture(surface->lightmaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], smax, tmax);
bl = intblocklights;
out = templight;
// we simply renormalize the weighted normals to get a valid deluxemap
- for (i = 0;i < size;i++, bl += 3)
+ for (i = 0;i < size;i++, bl += 3, out += 4)
{
VectorCopy(bl, n);
VectorNormalize(n);
- l = (int)(n[0] * 128 + 128);*out++ = bound(0, l, 255);
- l = (int)(n[1] * 128 + 128);*out++ = bound(0, l, 255);
- l = (int)(n[2] * 128 + 128);*out++ = bound(0, l, 255);
- *out++ = 255;
+ l = (int)(n[0] * 128 + 128);out[2] = bound(0, l, 255);
+ l = (int)(n[1] * 128 + 128);out[1] = bound(0, l, 255);
+ l = (int)(n[2] * 128 + 128);out[0] = bound(0, l, 255);
+ out[3] = 255;
}
R_UpdateTexture(surface->deluxemaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], smax, tmax);
}
R_Shadow_RenderMode_End();
}
-#define RSURF_MAX_BATCHSURFACES 1024
+#define RSURF_MAX_BATCHSURFACES 8192
void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist, const unsigned char *trispvs)
{
model_t *model = ent->model;
msurface_t *surface;
- int i, k, l, m, mend, endsurface, batchnumsurfaces, batchnumtriangles, batchfirstvertex, batchlastvertex;
+ int i, k, kend, l, m, mend, endsurface, batchnumsurfaces, batchnumtriangles, batchfirstvertex, batchlastvertex, batchfirsttriangle;
qboolean usebufferobject, culltriangles;
const int *element3i;
msurface_t *batchsurfacelist[RSURF_MAX_BATCHSURFACES];
int batchelements[BATCHSIZE*3];
texture_t *tex;
CHECKGLERROR
- RSurf_ActiveModelEntity(ent, true, true);
- R_UpdateAllTextureInfo(ent);
- CHECKGLERROR
culltriangles = r_shadow_culltriangles.integer && !(ent->flags & RENDER_NOSELFSHADOW);
element3i = rsurface.modelelement3i;
// this is a double loop because non-visible surface skipping has to be
}
if (!batchnumsurfaces)
continue;
- for (k = 0;k < batchnumsurfaces;k = l)
+ for (k = 0;k < batchnumsurfaces;k = kend)
{
surface = batchsurfacelist[k];
tex = surface->texture;
rsurface.texture = tex->currentframe;
+ // gather surfaces into a batch range
+ for (kend = k;kend < batchnumsurfaces && tex == batchsurfacelist[kend]->texture;kend++)
+ ;
+ // now figure out what to do with this particular range of surfaces
if (rsurface.texture->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_WATER))
{
if (rsurface.texture->currentmaterialflags & MATERIALFLAGMASK_DEPTHSORTED)
{
vec3_t tempcenter, center;
- for (l = k;l < batchnumsurfaces && tex == batchsurfacelist[l]->texture;l++)
+ for (l = k;l < kend;l++)
{
surface = batchsurfacelist[l];
tempcenter[0] = (surface->mins[0] + surface->maxs[0]) * 0.5f;
// use the bufferobject if all triangles are accepted
usebufferobject = true;
batchnumtriangles = 0;
- // note: this only accepts consecutive surfaces because
- // non-consecutive surfaces often have extreme vertex
- // ranges (due to large numbers of surfaces omitted
- // between them)
- surface = batchsurfacelist[k];
- for (l = k;l < batchnumsurfaces && surface == batchsurfacelist[l] && tex == surface->texture;l++, surface++)
+ batchfirsttriangle = surface->num_firsttriangle;
+ for (l = k;l < kend;l++)
{
+ surface = batchsurfacelist[l];
RSurf_PrepareVerticesForBatch(true, true, 1, &surface);
for (m = surface->num_firsttriangle, mend = m + surface->num_triangles;m < mend;m++)
{
- if (culltriangles)
+ if (trispvs)
{
- if (trispvs)
+ if (!CHECKPVSBIT(trispvs, m))
{
- if (!CHECKPVSBIT(trispvs, m))
- {
- usebufferobject = false;
- continue;
- }
+ usebufferobject = false;
+ continue;
}
- else
+ }
+ else if (culltriangles)
+ {
+ if (r_shadow_frontsidecasting.integer && !PointInfrontOfTriangle(rsurface.entitylightorigin, rsurface.vertex3f + element3i[m*3+0]*3, rsurface.vertex3f + element3i[m*3+1]*3, rsurface.vertex3f + element3i[m*3+2]*3))
{
- if (r_shadow_frontsidecasting.integer && !PointInfrontOfTriangle(rsurface.entitylightorigin, rsurface.vertex3f + element3i[m*3+0]*3, rsurface.vertex3f + element3i[m*3+1]*3, rsurface.vertex3f + element3i[m*3+2]*3))
- {
- usebufferobject = false;
- continue;
- }
+ usebufferobject = false;
+ continue;
}
}
- batchelements[batchnumtriangles*3+0] = element3i[m*3+0];
- batchelements[batchnumtriangles*3+1] = element3i[m*3+1];
- batchelements[batchnumtriangles*3+2] = element3i[m*3+2];
- batchnumtriangles++;
- r_refdef.stats.lights_lighttriangles++;
if (batchnumtriangles >= BATCHSIZE)
{
+ r_refdef.stats.lights_lighttriangles += batchnumtriangles;
Mod_VertexRangeFromElements(batchnumtriangles*3, batchelements, &batchfirstvertex, &batchlastvertex);
- R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchnumtriangles, batchelements, 0, 0);
+ if (usebufferobject && batchnumtriangles >= 100)
+ R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchnumtriangles, batchelements, ent->model->surfmesh.ebo, sizeof(int[3]) * batchfirsttriangle);
+ else
+ R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchnumtriangles, batchelements, 0, 0);
+ usebufferobject = true;
batchnumtriangles = 0;
- usebufferobject = false;
+ batchfirsttriangle = m;
}
+ batchelements[batchnumtriangles*3+0] = element3i[m*3+0];
+ batchelements[batchnumtriangles*3+1] = element3i[m*3+1];
+ batchelements[batchnumtriangles*3+2] = element3i[m*3+2];
+ batchnumtriangles++;
}
- r_refdef.stats.lights_lighttriangles += batchsurfacelist[l]->num_triangles;
}
if (batchnumtriangles > 0)
{
+ r_refdef.stats.lights_lighttriangles += batchnumtriangles;
Mod_VertexRangeFromElements(batchnumtriangles*3, batchelements, &batchfirstvertex, &batchlastvertex);
- if (usebufferobject)
- R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchnumtriangles, batchelements, ent->model->surfmesh.ebo, sizeof(int[3]) * batchsurfacelist[k]->num_firsttriangle);
+ if (usebufferobject && batchnumtriangles >= 100)
+ R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchnumtriangles, batchelements, ent->model->surfmesh.ebo, sizeof(int[3]) * batchfirsttriangle);
else
R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchnumtriangles, batchelements, 0, 0);
}
}
}
- else
- {
- // skip ahead to the next texture
- for (l = k;l < batchnumsurfaces && tex == batchsurfacelist[l]->texture;l++)
- ;
- }
}
}
}
newt = r;
for(i=0,t=m->data_textures;i<m->num_textures;i++,t++)
{
- if(t->width && !strcasecmp(t->name, r))
+ if(/*t->width && !strcasecmp(t->name, r)*/ matchpattern( t->name, r, true ) )
{
- if ((skinframe = R_SkinFrame_LoadExternal((char*)newt, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true)))
+ if ((skinframe = R_SkinFrame_LoadExternal(newt, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true)))
{
- t->skinframes[0] = skinframe;
+// t->skinframes[0] = skinframe;
+ t->currentskinframe = skinframe;
+ t->currentskinframe = skinframe;
Con_Printf("%s replaced with %s\n", r, newt);
- return;
}
else
{
projects / xonotic / darkplaces.git / blobdiff