smax = (surface->lightmapinfo->extents[0] >> 4) + 1;
tmax = (surface->lightmapinfo->extents[1] >> 4) + 1;
- impacts = DotProduct (impact, surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3] - surface->lightmapinfo->texturemins[0];
- impactt = DotProduct (impact, surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3] - surface->lightmapinfo->texturemins[1];
+ impacts = (int)(DotProduct (impact, surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3] - surface->lightmapinfo->texturemins[0]);
+ impactt = (int)(DotProduct (impact, surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3] - surface->lightmapinfo->texturemins[1]);
s = bound(0, impacts, smax * 16) - impacts;
t = bound(0, impactt, tmax * 16) - impactt;
- i = s * s + t * t + dist2;
+ i = (int)(s * s + t * t + dist2);
if (i > maxdist)
continue;
const mportal_t *portal = (mportal_t *)ent;
int i, numpoints;
float *v;
- rmeshstate_t m;
float vertex3f[POLYGONELEMENTS_MAXPOINTS*3];
GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
GL_DepthMask(false);
numpoints = min(portal->numpoints, POLYGONELEMENTS_MAXPOINTS);
- memset(&m, 0, sizeof(m));
- m.pointer_vertex = vertex3f;
- R_Mesh_State(&m);
+ R_Mesh_VertexPointer(vertex3f);
+ R_Mesh_ColorPointer(NULL);
+ R_Mesh_ResetTextureState();
i = surfacenumber;
GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f),
r_shadow_compilingrtlight->static_meshchain_shadow = Mod_ShadowMesh_Finish(r_main_mempool, r_shadow_compilingrtlight->static_meshchain_shadow, false, false);
}
-void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs)
+void R_Q1BSP_DrawShadowVolume_Batch(const vec3_t relativelightorigin, const vec3_t lightmins, const vec3_t lightmaxs, int texturenumsurfaces, msurface_t **texturesurfacelist)
+{
+ int texturesurfaceindex;
+ RSurf_PrepareVerticesForBatch(false, false, texturenumsurfaces, texturesurfacelist);
+ for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+ {
+ msurface_t *surface = texturesurfacelist[texturesurfaceindex];
+ R_Shadow_MarkVolumeFromBox(surface->num_firsttriangle, surface->num_triangles, rsurface_vertex3f, rsurface_model->surfmesh.data_element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs);
+ }
+}
+
+void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const vec3_t lightmins, const vec3_t lightmaxs)
{
model_t *model = ent->model;
msurface_t *surface;
- int surfacelistindex;
+ int modelsurfacelistindex;
+ int f = 0;
float projectdistance = lightradius + model->radius*2 + r_shadow_projectdistance.value;
- vec3_t modelorg;
- texture_t *texture, *currentexture = NULL;
+ texture_t *t = NULL;
+ const int maxsurfacelist = 1024;
+ int numsurfacelist = 0;
+ msurface_t *surfacelist[1024];
// check the box in modelspace, it was already checked in worldspace
if (!BoxesOverlap(model->normalmins, model->normalmaxs, lightmins, lightmaxs))
return;
if (model->brush.shadowmesh)
{
R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
- for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+ for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
{
- surface = model->data_surfaces + surfacelist[surfacelistindex];
- texture = surface->texture->currentframe;
- if ((texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL)
+ surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
+ t = surface->texture->currentframe;
+ if ((t->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL)
continue;
- if ((texture->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) || (ent->flags & RENDER_NOCULLFACE))
+ if ((t->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) || (ent->flags & RENDER_NOCULLFACE))
continue;
R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs);
}
else
{
projectdistance = lightradius + model->radius*2;
- Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
- for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+ RSurf_ActiveEntity(ent);
+ R_Shadow_PrepareShadowMark(model->surfmesh.num_triangles);
+ // identify lit faces within the bounding box
+ for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
{
- surface = model->data_surfaces + surfacelist[surfacelistindex];
- texture = surface->texture->currentframe;
- if (texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT) || !surface->num_triangles)
- continue;
- if (currentexture != texture)
+ surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
+ if (t != surface->texture || numsurfacelist >= maxsurfacelist)
{
- currentexture = texture;
- RSurf_PrepareForBatch(ent, texture, modelorg);
- RSurf_SetPointersForPass(false, false);
+ if (numsurfacelist)
+ {
+ R_Q1BSP_DrawShadowVolume_Batch(relativelightorigin, lightmins, lightmaxs, numsurfacelist, surfacelist);
+ numsurfacelist = 0;
+ }
+ t = surface->texture;
+ rsurface_texture = t->currentframe;
+ f = (rsurface_texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) == MATERIALFLAG_WALL;
}
- if (rsurface_dynamicvertex)
- RSurf_PrepareDynamicSurfaceVertices(surface);
- // identify lit faces within the bounding box
- R_Shadow_PrepareShadowMark(model->surfmesh.num_triangles);
- R_Shadow_MarkVolumeFromBox(surface->num_firsttriangle, surface->num_triangles, rsurface_vertex3f, model->surfmesh.data_element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs);
- R_Shadow_VolumeFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, rsurface_vertex3f, model->surfmesh.data_element3i, model->surfmesh.data_neighbor3i, relativelightorigin, projectdistance, numshadowmark, shadowmarklist);
+ if (f && surface->num_triangles)
+ surfacelist[numsurfacelist++] = surface;
}
+ if (numsurfacelist)
+ R_Q1BSP_DrawShadowVolume_Batch(relativelightorigin, lightmins, lightmaxs, numsurfacelist, surfacelist);
+ R_Shadow_VolumeFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, rsurface_vertex3f, model->surfmesh.data_element3i, model->surfmesh.data_neighbor3i, relativelightorigin, projectdistance, numshadowmark, shadowmarklist);
}
}
static void R_Q1BSP_DrawLight_TransparentCallback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight)
{
msurface_t *surface = ent->model->data_surfaces + surfacenumber;
- texture_t *texture = surface->texture;
- R_UpdateTextureInfo(ent, texture);
- texture = texture->currentframe;
+ R_UpdateTextureInfo(ent, surface->texture);
R_Shadow_RenderMode_Begin();
R_Shadow_RenderMode_ActiveLight((rtlight_t *)rtlight);
R_Shadow_RenderMode_Lighting(false, true);
R_Shadow_SetupEntityLight(ent);
- R_Shadow_RenderSurfacesLighting(ent, texture, 1, &surface);
+ rsurface_texture = surface->texture->currentframe;
+ R_Shadow_RenderSurfacesLighting(1, &surface);
R_Shadow_RenderMode_End();
}
-static void R_Q1BSP_DrawLight_TransparentBatch(const entity_render_t *ent, texture_t *texture, int batchnumsurfaces, msurface_t **batchsurfacelist)
+static void R_Q1BSP_DrawLight_TransparentBatch(int batchnumsurfaces, msurface_t **batchsurfacelist)
{
int batchsurfaceindex;
- model_t *model = ent->model;
msurface_t *batchsurface;
vec3_t tempcenter, center;
for (batchsurfaceindex = 0;batchsurfaceindex < batchnumsurfaces;batchsurfaceindex++)
tempcenter[0] = (batchsurface->mins[0] + batchsurface->maxs[0]) * 0.5f;
tempcenter[1] = (batchsurface->mins[1] + batchsurface->maxs[1]) * 0.5f;
tempcenter[2] = (batchsurface->mins[2] + batchsurface->maxs[2]) * 0.5f;
- Matrix4x4_Transform(&ent->matrix, tempcenter, center);
- R_MeshQueue_AddTransparent(texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST ? r_vieworigin : center, R_Q1BSP_DrawLight_TransparentCallback, ent, batchsurface - model->data_surfaces, r_shadow_rtlight);
+ Matrix4x4_Transform(&rsurface_entity->matrix, tempcenter, center);
+ R_MeshQueue_AddTransparent(rsurface_texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST ? r_vieworigin : center, R_Q1BSP_DrawLight_TransparentCallback, rsurface_entity, batchsurface - rsurface_model->data_surfaces, r_shadow_rtlight);
}
}
{
model_t *model = ent->model;
msurface_t *surface;
- texture_t *texture;
int surfacelistindex, batchnumsurfaces;
msurface_t *batchsurfacelist[RSURF_MAX_BATCHSURFACES];
- vec3_t modelorg;
texture_t *tex;
qboolean skip;
+ RSurf_ActiveEntity(ent);
R_UpdateAllTextureInfo(ent);
- Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
tex = NULL;
- texture = NULL;
+ rsurface_texture = NULL;
skip = false;
batchnumsurfaces = 0;
for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
{
if (batchnumsurfaces > 0)
{
- if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)
- R_Q1BSP_DrawLight_TransparentBatch(ent, texture, batchnumsurfaces, batchsurfacelist);
+ if (rsurface_texture->currentmaterialflags & MATERIALFLAG_BLENDED)
+ R_Q1BSP_DrawLight_TransparentBatch(batchnumsurfaces, batchsurfacelist);
else
- R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist);
+ R_Shadow_RenderSurfacesLighting(batchnumsurfaces, batchsurfacelist);
batchnumsurfaces = 0;
}
tex = surface->texture;
- texture = surface->texture->currentframe;
- skip = (texture->currentmaterialflags & MATERIALFLAG_SKY) != 0;
+ rsurface_texture = surface->texture->currentframe;
+ skip = (rsurface_texture->currentmaterialflags & MATERIALFLAG_SKY) != 0;
if (skip)
continue;
}
{
if (batchnumsurfaces == RSURF_MAX_BATCHSURFACES)
{
- if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)
- R_Q1BSP_DrawLight_TransparentBatch(ent, texture, batchnumsurfaces, batchsurfacelist);
+ if (rsurface_texture->currentmaterialflags & MATERIALFLAG_BLENDED)
+ R_Q1BSP_DrawLight_TransparentBatch(batchnumsurfaces, batchsurfacelist);
else
- R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist);
+ R_Shadow_RenderSurfacesLighting(batchnumsurfaces, batchsurfacelist);
batchnumsurfaces = 0;
}
batchsurfacelist[batchnumsurfaces++] = surface;
}
if (batchnumsurfaces > 0)
{
- if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)
- R_Q1BSP_DrawLight_TransparentBatch(ent, texture, batchnumsurfaces, batchsurfacelist);
+ if (rsurface_texture->currentmaterialflags & MATERIALFLAG_BLENDED)
+ R_Q1BSP_DrawLight_TransparentBatch(batchnumsurfaces, batchsurfacelist);
else
- R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist);
+ R_Shadow_RenderSurfacesLighting(batchnumsurfaces, batchsurfacelist);
batchnumsurfaces = 0;
}
qglEnable(GL_CULL_FACE);
projects / xonotic / darkplaces.git / blobdiff