}
}
-void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, float fcolor[8])
+void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radius, const float fcolor[8])
{
float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2;
msurface_t *surf, *endsurf;
}
}
-void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2)
+void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2)
{
int n;
float fcolor[8];
return false;
}
-static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
}
m.depthwrite = true;
R_Mesh_State(&m);
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount)
{
}
}
-static void RSurfShader_Water(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_Water(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
+ msurface_t **chain;
vec3_t center;
if (texture->rendertype != SURFRENDER_OPAQUE)
{
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ for (chain = surfchain;(surf = *chain) != NULL;*chain++)
{
if (surf->visframe == r_framecount)
{
}
}
else
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ for (chain = surfchain;(surf = *chain) != NULL;*chain++)
if (surf->visframe == r_framecount)
RSurfShader_Water_Callback(ent, surf - ent->model->surfaces);
}
}
}
-static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
m.tex[0] = R_GetTexture(texture->texture);
- m.tex[1] = R_GetTexture(firstsurf->lightmaptexture);
+ m.tex[1] = R_GetTexture((**surfchain).lightmaptexture);
m.tex[2] = R_GetTexture(texture->detailtexture);
m.texrgbscale[0] = 1;
m.texrgbscale[1] = 4;
R_Mesh_State(&m);
cl = (float) (1 << r_lightmapscalebit) * r_colorscale;
GL_Color(cl, cl, cl, 1);
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount)
{
}
}
-static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
m.tex[0] = R_GetTexture(texture->texture);
- m.tex[1] = R_GetTexture(firstsurf->lightmaptexture);
+ m.tex[1] = R_GetTexture((**surfchain).lightmaptexture);
if (gl_combine.integer)
m.texrgbscale[1] = 4;
R_Mesh_State(&m);
GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount)
{
}
}
-static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
m.tex[0] = R_GetTexture(texture->texture);
R_Mesh_State(&m);
GL_Color(1, 1, 1, 1);
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount)
{
}
}
-static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
memset(&m, 0, sizeof(m));
m.blendfunc1 = GL_ZERO;
m.blendfunc2 = GL_SRC_COLOR;
- m.tex[0] = R_GetTexture(firstsurf->lightmaptexture);
+ m.tex[0] = R_GetTexture((**surfchain).lightmaptexture);
if (gl_combine.integer)
m.texrgbscale[0] = 4;
R_Mesh_State(&m);
GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount)
{
}
}
-static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
}
R_Mesh_State(&m);
GL_UseColorArray();
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount && surf->dlightframe == r_framecount)
{
}
}
-static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
R_Mesh_State(&m);
GL_UseColorArray();
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount)
{
}
}
-static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
m.tex[0] = R_GetTexture(texture->detailtexture);
R_Mesh_State(&m);
GL_Color(1, 1, 1, 1);
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount)
{
}
}
-static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
m.tex[0] = R_GetTexture(texture->glowtexture);
R_Mesh_State(&m);
GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount)
{
}
}
-static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
const surfmesh_t *mesh;
GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
else
GL_Color(0, 0, 0, 1);
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ while((surf = *surfchain++) != NULL)
{
if (surf->visframe == r_framecount)
{
RSurfShader_Wall_Pass_Fog(ent, surf, texture, rendertype, currentalpha);
}
-static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
+static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
{
const msurface_t *surf;
+ msurface_t **chain;
vec3_t center;
if (texture->rendertype != SURFRENDER_OPAQUE)
{
// transparent vertex shaded from lightmap
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ for (chain = surfchain;(surf = *chain) != NULL;chain++)
{
if (surf->visframe == r_framecount)
{
else if (r_shadow_lightingmode >= 2)
{
// opaque base lighting
- RSurfShader_OpaqueWall_Pass_OpaqueGlow(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_OpaqueGlow(ent, texture, surfchain);
if (fogenabled)
- RSurfShader_OpaqueWall_Pass_Fog(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
}
else if (r_vertexsurfaces.integer)
{
// opaque vertex shaded from lightmap
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ for (chain = surfchain;(surf = *chain) != NULL;chain++)
if (surf->visframe == r_framecount)
RSurfShader_Wall_Pass_BaseVertex(ent, surf, texture, texture->rendertype, texture->currentalpha);
if (texture->glowtexture)
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ for (chain = surfchain;(surf = *chain) != NULL;chain++)
if (surf->visframe == r_framecount)
RSurfShader_Wall_Pass_Glow(ent, surf, texture, texture->rendertype, texture->currentalpha);
if (fogenabled)
- for (surf = firstsurf;surf;surf = surf->texturechain)
+ for (chain = surfchain;(surf = *chain) != NULL;chain++)
if (surf->visframe == r_framecount)
RSurfShader_Wall_Pass_Fog(ent, surf, texture, texture->rendertype, texture->currentalpha);
}
if (r_textureunits.integer >= 2)
{
if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer)
- RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(ent, texture, surfchain);
else
{
- RSurfShader_OpaqueWall_Pass_BaseDoubleTex(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_BaseDoubleTex(ent, texture, surfchain);
if (r_detailtextures.integer)
- RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
}
}
else
{
- RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, firstsurf);
- RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, surfchain);
+ RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture, surfchain);
if (r_detailtextures.integer)
- RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
}
if (!r_dlightmap.integer && !(ent->effects & EF_FULLBRIGHT))
- RSurfShader_OpaqueWall_Pass_Light(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_Light(ent, texture, surfchain);
if (texture->glowtexture)
- RSurfShader_OpaqueWall_Pass_Glow(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
if (fogenabled)
- RSurfShader_OpaqueWall_Pass_Fog(ent, texture, firstsurf);
+ RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
}
}
{
int i, numsurfaces, *surfacevisframes;
model_t *model;
- msurface_t *surf, *surfaces;
+ msurface_t *surf, *surfaces, **surfchain;
vec3_t modelorg;
if (!ent->model)
if (r_dynamic.integer && r_shadow_lightingmode < 1)
R_MarkLights(ent);
+ if (model->light_ambient != r_ambient.value || model->light_scalebit != r_lightmapscalebit)
+ {
+ model->light_ambient = r_ambient.value;
+ model->light_scalebit = r_lightmapscalebit;
+ for (i = 0;i < model->nummodelsurfaces;i++)
+ model->surfaces[i + model->firstmodelsurface].cached_dlight = true;
+ }
+ else
+ {
+ for (i = 0;i < model->light_styles;i++)
+ {
+ if (model->light_stylevalue[i] != d_lightstylevalue[model->light_style[i]])
+ {
+ model->light_stylevalue[i] = d_lightstylevalue[model->light_style[i]];
+ for (surfchain = model->light_styleupdatechains[i];*surfchain;surfchain++)
+ (**surfchain).cached_dlight = true;
+ }
+ }
+ }
+
for (i = 0, surf = surfaces;i < numsurfaces;i++, surf++)
{
if (surfacevisframes[i] == r_framecount)
{
c_faces++;
surf->visframe = r_framecount;
+#if 1
+ if (surf->cached_dlight && surf->lightmaptexture != NULL && !r_vertexsurfaces.integer)
+ R_BuildLightMap(ent, surf, false); // base lighting changed
+#else
if (!r_vertexsurfaces.integer && surf->lightmaptexture != NULL)
{
if (surf->cached_dlight
R_BuildLightMap(ent, surf, true); // only dlights
}
}
+#endif
}
}
}
}
-void R_DrawSurfaces(entity_render_t *ent, int type)
+void R_DrawSurfaces(entity_render_t *ent, int type, msurface_t ***chains)
{
int i;
texture_t *t;
R_Mesh_Matrix(&ent->matrix);
for (i = 0, t = ent->model->textures;i < ent->model->numtextures;i++, t++)
- if (t->shader->shaderfunc[type] && t->currentframe && ent->model->texturesurfacechains[i])
- t->shader->shaderfunc[type](ent, t->currentframe, ent->model->texturesurfacechains[i]);
+ if (t->shader->shaderfunc[type] && t->currentframe && chains[i] != NULL)
+ t->shader->shaderfunc[type](ent, t->currentframe, chains[i]);
}
static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
int i;
mportal_t *portal, *endportal;
float temp[3], center[3], f;
-
- if (r_drawportals.integer < 1)
- return;
-
for (portal = ent->model->portals, endportal = portal + ent->model->numportals;portal < endportal;portal++)
{
- if (portal->here->pvsframe == ent->model->pvsframecount || portal->past->pvsframe == ent->model->pvsframecount)
+ if ((portal->here->pvsframe == ent->model->pvsframecount || portal->past->pvsframe == ent->model->pvsframecount) && portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
{
- if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
- {
- VectorClear(temp);
- for (i = 0;i < portal->numpoints;i++)
- VectorAdd(temp, portal->points[i].position, temp);
- f = ixtable[portal->numpoints];
- VectorScale(temp, f, temp);
- Matrix4x4_Transform(&ent->matrix, temp, center);
- R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, ent, portal - ent->model->portals);
- }
+ VectorClear(temp);
+ for (i = 0;i < portal->numpoints;i++)
+ VectorAdd(temp, portal->points[i].position, temp);
+ f = ixtable[portal->numpoints];
+ VectorScale(temp, f, temp);
+ Matrix4x4_Transform(&ent->matrix, temp, center);
+ R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, ent, portal - ent->model->portals);
}
}
}
if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
{
if ((surf->flags & SURF_PLANEBACK))
- {
surfacevisframes[i] = r_framecount;
- surfacepvsframes[i] = model->pvsframecount;
- }
- }
- else
- {
- if (!(surf->flags & SURF_PLANEBACK))
- {
- surfacevisframes[i] = r_framecount;
- surfacepvsframes[i] = model->pvsframecount;
- }
}
+ else if (!(surf->flags & SURF_PLANEBACK))
+ surfacevisframes[i] = r_framecount;
#else
surfacevisframes[i] = r_framecount;
- surfacepvsframes[i] = model->pvsframecount;
#endif
surf->dlightframe = -1;
}
leaf->pvsframe = model->pvsframecount;
// mark surfaces bounding this leaf as visible
for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--, mark++)
- {
- //if (surfacepvsframes[*mark] != model->pvsframecount)
- //{
- surfacepvsframes[*mark] = model->pvsframecount;
- // model->pvssurflist[model->pvssurflistlength++] = *mark;
- //}
- }
+ surfacepvsframes[*mark] = model->pvsframecount;
}
}
}
}
- for (i = 0, j = model->firstmodelsurface;i < model->nummodelsurfaces;i++, j++)
- if (model->surfacepvsframes[j] == model->pvsframecount)
- model->pvssurflist[model->pvssurflistlength++] = j;
+ Mod_BuildPVSTextureChains(model);
}
}
}
void R_DrawWorld (entity_render_t *ent)
{
R_PrepareSurfaces(ent);
- R_DrawSurfaces(ent, SHADERSTAGE_SKY);
- R_DrawSurfaces(ent, SHADERSTAGE_NORMAL);
+ R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->pvstexturechains);
+ R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->pvstexturechains);
}
void R_Model_Brush_DrawSky (entity_render_t *ent)
{
if (ent != &cl_entities[0].render)
R_PrepareBrushModel(ent);
- R_DrawSurfaces(ent, SHADERSTAGE_SKY);
+ R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->pvstexturechains);
}
void R_Model_Brush_Draw (entity_render_t *ent)
c_bmodels++;
if (ent != &cl_entities[0].render)
R_PrepareBrushModel(ent);
- R_DrawSurfaces(ent, SHADERSTAGE_NORMAL);
+ R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->pvstexturechains);
}
void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelightorigin, float lightradius)
projects / xonotic / darkplaces.git / blobdiff