From 0b707d43d1d04808e3354b9bf1dc35d380c286be Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 20:50:39 -0700 Subject: Backout of the sculptie derender patch ported from FireStorm This also reverts 14f4622c and 534767ef --- linden/indra/newview/app_settings/settings.xml | 22 ---------------------- linden/indra/newview/llappviewer.cpp | 2 -- linden/indra/newview/llviewercontrol.cpp | 16 +--------------- linden/indra/newview/llvovolume.cpp | 19 +------------------ linden/indra/newview/llvovolume.h | 3 --- linden/indra/newview/pipeline.cpp | 3 --- linden/indra/newview/pipeline.h | 1 - 7 files changed, 2 insertions(+), 64 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index e03e1f3..74750a6 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -1097,28 +1097,6 @@ Value 1 - RenderSculptSAMax - - Comment - The maximum combined surface area of sculpts(per frame) that are above the threshold before they stop being rendered - Persist - 1 - Type - F32 - Value - 50000 - - RenderSculptSAThreshold - - Comment - Surface area at which sculpts are considered for not being rendered - Persist - 1 - Type - F32 - Value - 1750 - RenderWaterVoidCulling Comment diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 519fa62..b96f6c2 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -422,8 +422,6 @@ static void settings_to_globals() LLVOTree::sTreeFactor = gSavedSettings.getF32("RenderTreeLODFactor"); LLVOAvatar::sLODFactor = gSavedSettings.getF32("RenderAvatarLODFactor"); LLVOAvatar::sMaxVisible = gSavedSettings.getS32("RenderAvatarMaxVisible"); - LLVOVolume::sSculptSAThresh = gSavedSettings.getF32("RenderSculptSAThreshold"); - LLVOVolume::sSculptSAMax = gSavedSettings.getF32("RenderSculptSAMax"); LLVOAvatar::sVisibleInFirstPerson = gSavedSettings.getBOOL("FirstPersonAvatarVisible"); // clamp auto-open time to some minimum usable value LLFolderView::sAutoOpenTime = llmax(0.25f, gSavedSettings.getF32("FolderAutoOpenDelay")); diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp index 4c81e71..59d766f 100644 --- a/linden/indra/newview/llviewercontrol.cpp +++ b/linden/indra/newview/llviewercontrol.cpp @@ -530,18 +530,6 @@ bool handleSliderScrollWheelMultiplierChanged(const LLSD& newvalue) return true; } -bool handleRenderSculptSAThresholdChanged(const LLSD& newvalue) -{ - LLVOVolume::sSculptSAThresh = newvalue.asReal(); - return true; -} - -bool handleRenderSculptSAMaxChanged(const LLSD& newvalue) -{ - LLVOVolume::sSculptSAMax = newvalue.asReal(); - return true; -} - //////////////////////////////////////////////////////////////////////////// @@ -687,9 +675,7 @@ void settings_setup_listeners() gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1)); - gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _1)); - gSavedSettings.getControl("RenderSculptSAThreshold")->getSignal()->connect(boost::bind(&handleRenderSculptSAThresholdChanged, _1)); - gSavedSettings.getControl("RenderSculptSAMax")->getSignal()->connect(boost::bind(&handleRenderSculptSAMaxChanged, _1)); + gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _1)); } template <> eControlType get_control_type(const U32& in, LLSD& out) diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp index b422c51..d580d61 100644 --- a/linden/indra/newview/llvovolume.cpp +++ b/linden/indra/newview/llvovolume.cpp @@ -79,9 +79,6 @@ F32 LLVOVolume::sLODFactor = 1.f; F32 LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop F32 LLVOVolume::sDistanceFactor = 1.0f; S32 LLVOVolume::sNumLODChanges = 0; -F32 LLVOVolume::sSculptSAThresh = 1750.f; -F32 LLVOVolume::sSculptSAMax = 50000.f; - LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) : LLViewerObject(id, pcode, regionp), @@ -709,7 +706,7 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail } else { - mSculptSurfaceArea = 0.0; + mSculptSurfaceArea = 0.f; } return TRUE; @@ -2322,20 +2319,6 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) LLVOVolume* vobj = drawablep->getVOVolume(); llassert_always(vobj); - - if (vobj->isSculpted() && vobj->mSculptSurfaceArea > LLVOVolume::sSculptSAThresh) - { - LLPipeline::sSculptSurfaceAreaFrame += vobj->mSculptSurfaceArea; - if (LLPipeline::sSculptSurfaceAreaFrame > LLVOVolume::sSculptSAMax) - { - LL_DEBUGS("Volume") << "Sculptie (" - << vobj->getID() << ") above RenderSculptSAMax (" - << LLVOVolume::sSculptSAMax - << ")! Turning invisible!" - << LL_ENDL; - continue; - } - } vobj->updateTextureVirtualSize(); vobj->preRebuild(); diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h index 2f53bea..d09a198 100644 --- a/linden/indra/newview/llvovolume.h +++ b/linden/indra/newview/llvovolume.h @@ -248,9 +248,6 @@ public: static F32 sLODSlopDistanceFactor;// Changing this to zero, effectively disables the LOD transition slop static F32 sLODFactor; // LOD scale factor static F32 sDistanceFactor; // LOD distance factor - static F32 sSculptSAThresh; // Surface area at which sculpts are considered for not being rendered - static F32 sSculptSAMax; // The maximum combined surface area of sculpts(per frame) that are above the - // threshold before they stop being rendered protected: static S32 sNumLODChanges; diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index ae0e605..cd9b3be 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp @@ -258,7 +258,6 @@ BOOL LLPipeline::sRenderAttachedLights = TRUE; BOOL LLPipeline::sRenderAttachedParticles = TRUE; BOOL LLPipeline::sRenderDeferred = FALSE; S32 LLPipeline::sVisibleLightCount = 0; -F32 LLPipeline::sSculptSurfaceAreaFrame = 0.0; static LLCullResult* sCull = NULL; @@ -2199,8 +2198,6 @@ void LLPipeline::postSort(LLCamera& camera) LLFastTimer ftm(LLFastTimer::FTM_STATESORT_POSTSORT); assertInitialized(); - - sSculptSurfaceAreaFrame = 0.0; //rebuild drawable geometry for (LLCullResult::sg_list_t::iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i) diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h index 2252fbd..c5ab7ab 100644 --- a/linden/indra/newview/pipeline.h +++ b/linden/indra/newview/pipeline.h @@ -579,7 +579,6 @@ protected: public: static BOOL sRenderBeacons; static BOOL sRenderHighlight; - static F32 sSculptSurfaceAreaFrame; }; -- cgit v1.1