From ccd98f9badd33e7f099fd1fdcce4634b6b30bedf Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 21 May 2004 18:59:21 +0000 Subject: [PATCH] Tomaz renamed r_shadow_polygon* cvars to r_shadow_shadow_polygon* git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4219 d7cf8633-e32d-0410-b094-e92efae38249 --- r_shadow.c | 18 +++++++++--------- r_shadow.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/r_shadow.c b/r_shadow.c index 20c95578..47fdfa76 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -172,8 +172,6 @@ cvar_t r_shadow_glossintensity = {0, "r_shadow_glossintensity", "1"}; cvar_t r_shadow_lightattenuationpower = {0, "r_shadow_lightattenuationpower", "0.5"}; cvar_t r_shadow_lightattenuationscale = {0, "r_shadow_lightattenuationscale", "1"}; cvar_t r_shadow_lightintensityscale = {0, "r_shadow_lightintensityscale", "1"}; -cvar_t r_shadow_polygonfactor = {0, "r_shadow_polygonfactor", "0"}; -cvar_t r_shadow_polygonoffset = {0, "r_shadow_polygonoffset", "1"}; cvar_t r_shadow_portallight = {0, "r_shadow_portallight", "1"}; cvar_t r_shadow_projectdistance = {0, "r_shadow_projectdistance", "1000000"}; cvar_t r_shadow_realtime_dlight = {0, "r_shadow_realtime_dlight", "1"}; @@ -183,6 +181,8 @@ cvar_t r_shadow_realtime_world_dlightshadows = {0, "r_shadow_realtime_world_dlig cvar_t r_shadow_realtime_world_lightmaps = {0, "r_shadow_realtime_world_lightmaps", "0"}; cvar_t r_shadow_realtime_world_shadows = {0, "r_shadow_realtime_world_shadows", "1"}; cvar_t r_shadow_scissor = {0, "r_shadow_scissor", "1"}; +cvar_t r_shadow_shadow_polygonfactor = {0, "r_shadow_shadow_polygonfactor", "0"}; +cvar_t r_shadow_shadow_polygonoffset = {0, "r_shadow_shadow_polygonoffset", "1"}; cvar_t r_shadow_singlepassvolumegeneration = {0, "r_shadow_singlepassvolumegeneration", "1"}; cvar_t r_shadow_staticworldlights = {0, "r_shadow_staticworldlights", "1"}; cvar_t r_shadow_texture3d = {0, "r_shadow_texture3d", "1"}; @@ -284,8 +284,6 @@ void R_Shadow_Help_f(void) "r_shadow_lightattenuationpower : used to generate attenuation texture\n" "r_shadow_lightattenuationscale : used to generate attenuation texture\n" "r_shadow_lightintensityscale : scale rendering brightness of all lights\n" -"r_shadow_polygonfactor : nudge shadow volumes closer/further\n" -"r_shadow_polygonoffset : nudge shadow volumes closer/further\n" "r_shadow_portallight : use portal visibility for static light precomputation\n" "r_shadow_projectdistance : shadow volume projection distance\n" "r_shadow_realtime_dlight : use high quality dynamic lights in normal mode\n" @@ -295,6 +293,8 @@ void R_Shadow_Help_f(void) "r_shadow_realtime_world_lightmaps : use lightmaps in addition to lights\n" "r_shadow_realtime_world_shadows : cast shadows from world lights\n" "r_shadow_scissor : use scissor optimization\n" +"r_shadow_shadow_polygonfactor : nudge shadow volumes closer/further\n" +"r_shadow_shadow_polygonoffset : nudge shadow volumes closer/further\n" "r_shadow_singlepassvolumegeneration : selects shadow volume algorithm\n" "r_shadow_texture3d : use 3d attenuation texture (if hardware supports)\n" "r_shadow_visiblevolumes : useful for performance testing; bright = slow!\n" @@ -315,8 +315,6 @@ void R_Shadow_Init(void) Cvar_RegisterVariable(&r_shadow_lightattenuationpower); Cvar_RegisterVariable(&r_shadow_lightattenuationscale); Cvar_RegisterVariable(&r_shadow_lightintensityscale); - Cvar_RegisterVariable(&r_shadow_polygonfactor); - Cvar_RegisterVariable(&r_shadow_polygonoffset); Cvar_RegisterVariable(&r_shadow_portallight); Cvar_RegisterVariable(&r_shadow_projectdistance); Cvar_RegisterVariable(&r_shadow_realtime_dlight); @@ -326,6 +324,8 @@ void R_Shadow_Init(void) Cvar_RegisterVariable(&r_shadow_realtime_world_lightmaps); Cvar_RegisterVariable(&r_shadow_realtime_world_shadows); Cvar_RegisterVariable(&r_shadow_scissor); + Cvar_RegisterVariable(&r_shadow_shadow_polygonfactor); + Cvar_RegisterVariable(&r_shadow_shadow_polygonoffset); Cvar_RegisterVariable(&r_shadow_singlepassvolumegeneration); Cvar_RegisterVariable(&r_shadow_staticworldlights); Cvar_RegisterVariable(&r_shadow_texture3d); @@ -806,10 +806,10 @@ void R_Shadow_Stage_ShadowVolumes(void) GL_BlendFunc(GL_ONE, GL_ZERO); GL_DepthMask(false); GL_DepthTest(true); - qglPolygonOffset(r_shadow_polygonfactor.value, r_shadow_polygonoffset.value); - //if (r_shadow_polygonoffset.value != 0) + qglPolygonOffset(r_shadow_shadow_polygonfactor.value, r_shadow_shadow_polygonoffset.value); + //if (r_shadow_shadow_polygonoffset.value != 0) //{ - // qglPolygonOffset(r_shadow_polygonfactor.value, r_shadow_polygonoffset.value); + // qglPolygonOffset(r_shadow_shadow_polygonfactor.value, r_shadow_shadow_polygonoffset.value); // qglEnable(GL_POLYGON_OFFSET_FILL); //} //else diff --git a/r_shadow.h b/r_shadow.h index 2c24757f..5f608603 100644 --- a/r_shadow.h +++ b/r_shadow.h @@ -12,8 +12,6 @@ extern cvar_t r_shadow_glossintensity; extern cvar_t r_shadow_lightattenuationpower; extern cvar_t r_shadow_lightattenuationscale; extern cvar_t r_shadow_lightintensityscale; -extern cvar_t r_shadow_polygonfactor; -extern cvar_t r_shadow_polygonoffset; extern cvar_t r_shadow_portallight; extern cvar_t r_shadow_projectdistance; extern cvar_t r_shadow_realtime_dlight; @@ -23,6 +21,8 @@ extern cvar_t r_shadow_realtime_world_dlightshadows; extern cvar_t r_shadow_realtime_world_lightmaps; extern cvar_t r_shadow_realtime_world_shadows; extern cvar_t r_shadow_scissor; +extern cvar_t r_shadow_shadow_polygonfactor; +extern cvar_t r_shadow_shadow_polygonoffset; extern cvar_t r_shadow_singlepassvolumegeneration; extern cvar_t r_shadow_staticworldlights; extern cvar_t r_shadow_texture3d; -- 2.39.2