diff options
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 23 | ||||
| -rwxr-xr-x | indra/newview/llvocache.cpp | 13 | ||||
| -rwxr-xr-x | indra/newview/llvocache.h | 3 |
3 files changed, 0 insertions, 39 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 04be4e5f00..db7be5abc4 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -731,18 +731,6 @@ <key>Value</key> <integer>0</integer> </map> - - <key>BackDistanceFactor</key> - <map> - <key>Comment</key> - <string>Keep invisible objects in memory which are in the distance range (the factor * draw_distance) to the camera</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>0.125</real> - </map> <key>BackgroundYieldTime</key> <map> <key>Comment</key> @@ -754,17 +742,6 @@ <key>Value</key> <integer>40</integer> </map> - <key>BackProjectionAngleSquared</key> - <map> - <key>Comment</key> - <string>squared tan(object bbox projection angle). that of invisible objects greater than this threshold are kept in memory</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>0.0311</real> - </map> <key>BackShpereCullingRadius</key> <map> <key>Comment</key> diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index d0061fc777..2ff2d0f341 100755 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -35,8 +35,6 @@ #include "pipeline.h" #include "llagentcamera.h" -F32 LLVOCacheEntry::sBackDistanceSquared = 0.f; -F32 LLVOCacheEntry::sBackAngleTanSquared = 0.f; U32 LLVOCacheEntry::sMinFrameRange = 0; BOOL LLVOCachePartition::sNeedsOcclusionCheck = FALSE; @@ -341,21 +339,10 @@ BOOL LLVOCacheEntry::writeToFile(LLAPRFile* apr_file) const //static void LLVOCacheEntry::updateDebugSettings() { - //distance to keep objects = back_dist_factor * draw_distance - static LLCachedControl<F32> back_dist_factor(gSavedSettings,"BackDistanceFactor"); - - //squared tan(projection angle of the bbox), default is 10 (degree) - static LLCachedControl<F32> squared_back_angle(gSavedSettings,"BackProjectionAngleSquared"); - //the number of frames invisible objects stay in memory static LLCachedControl<U32> inv_obj_time(gSavedSettings,"NonvisibleObjectsInMemoryTime"); sMinFrameRange = inv_obj_time - 1; //make 0 to be the maximum - - sBackDistanceSquared = back_dist_factor * gAgentCamera.mDrawDistance; - sBackDistanceSquared *= sBackDistanceSquared; - - sBackAngleTanSquared = squared_back_angle; } //static diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h index 09766b297e..af97f9fdce 100755 --- a/indra/newview/llvocache.h +++ b/indra/newview/llvocache.h @@ -153,9 +153,6 @@ protected: BOOL mTouched; //if set, this entry is valid, otherwise it is invalid. - static F32 sBackDistanceSquared; - static F32 sBackAngleTanSquared; - public: static U32 sMinFrameRange; }; |