diff options
author | McCabe Maxsted | 2011-07-08 14:48:05 -0700 |
---|---|---|
committer | McCabe Maxsted | 2011-07-08 14:48:05 -0700 |
commit | 14f4622c3b836caafea64a260a00a5f5a9f103f9 (patch) | |
tree | 852dc75202e4e8804fa409faa6a41c14e70b2c3d /linden/indra/newview/llvovolume.cpp | |
parent | Only check if an object is above SculptSAThresh if it's an actual sculptie (diff) | |
download | meta-impy-14f4622c3b836caafea64a260a00a5f5a9f103f9.zip meta-impy-14f4622c3b836caafea64a260a00a5f5a9f103f9.tar.gz meta-impy-14f4622c3b836caafea64a260a00a5f5a9f103f9.tar.bz2 meta-impy-14f4622c3b836caafea64a260a00a5f5a9f103f9.tar.xz |
Added debug settings RenderSculptSAThreshold and RenderSculptSAMax. Adjust these if sculpties ever go invisible that shouldn't
Diffstat (limited to 'linden/indra/newview/llvovolume.cpp')
-rw-r--r-- | linden/indra/newview/llvovolume.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp index 77201da..d40ee99 100644 --- a/linden/indra/newview/llvovolume.cpp +++ b/linden/indra/newview/llvovolume.cpp | |||
@@ -71,10 +71,6 @@ | |||
71 | const S32 MIN_QUIET_FRAMES_COALESCE = 30; | 71 | const S32 MIN_QUIET_FRAMES_COALESCE = 30; |
72 | const F32 FORCE_SIMPLE_RENDER_AREA = 512.f; | 72 | const F32 FORCE_SIMPLE_RENDER_AREA = 512.f; |
73 | const F32 FORCE_CULL_AREA = 8.f; | 73 | const F32 FORCE_CULL_AREA = 8.f; |
74 | |||
75 | static const F32 sSculptSAThresh = 1750.f; // Surface area at which sculpts are considered for not being rendered | ||
76 | static const F32 sSculptSAMax = 50000.f; // The maximum combined surface area of sculpts(per frame) that are above the | ||
77 | // threshold before they stop being rendered | ||
78 | 74 | ||
79 | BOOL gAnimateTextures = TRUE; | 75 | BOOL gAnimateTextures = TRUE; |
80 | extern BOOL gHideSelectedObjects; | 76 | extern BOOL gHideSelectedObjects; |
@@ -83,6 +79,9 @@ F32 LLVOVolume::sLODFactor = 1.f; | |||
83 | F32 LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop | 79 | F32 LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop |
84 | F32 LLVOVolume::sDistanceFactor = 1.0f; | 80 | F32 LLVOVolume::sDistanceFactor = 1.0f; |
85 | S32 LLVOVolume::sNumLODChanges = 0; | 81 | S32 LLVOVolume::sNumLODChanges = 0; |
82 | F32 LLVOVolume::sSculptSAThresh = 1750.f; | ||
83 | F32 LLVOVolume::sSculptSAMax = 50000.f; | ||
84 | |||
86 | 85 | ||
87 | LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) | 86 | LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) |
88 | : LLViewerObject(id, pcode, regionp), | 87 | : LLViewerObject(id, pcode, regionp), |
@@ -2310,14 +2309,14 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) | |||
2310 | 2309 | ||
2311 | llassert_always(vobj); | 2310 | llassert_always(vobj); |
2312 | 2311 | ||
2313 | if (vobj->isSculpted() && vobj->mSculptSurfaceArea > sSculptSAThresh) | 2312 | if (vobj->isSculpted() && vobj->mSculptSurfaceArea > LLVOVolume::sSculptSAThresh) |
2314 | { | 2313 | { |
2315 | LLPipeline::sSculptSurfaceAreaFrame += vobj->mSculptSurfaceArea; | 2314 | LLPipeline::sSculptSurfaceAreaFrame += vobj->mSculptSurfaceArea; |
2316 | if (LLPipeline::sSculptSurfaceAreaFrame > sSculptSAMax) | 2315 | if (LLPipeline::sSculptSurfaceAreaFrame > LLVOVolume::sSculptSAMax) |
2317 | { | 2316 | { |
2318 | LL_DEBUGS("Volume") << "Sculptie (" | 2317 | LL_DEBUGS("Volume") << "Sculptie (" |
2319 | << vobj->getID() << ") above RenderSculptSAMax (" | 2318 | << vobj->getID() << ") above RenderSculptSAMax (" |
2320 | << sSculptSAMax | 2319 | << LLVOVolume::sSculptSAMax |
2321 | << ")! Turning invisible!" | 2320 | << ")! Turning invisible!" |
2322 | << LL_ENDL; | 2321 | << LL_ENDL; |
2323 | continue; | 2322 | continue; |