diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 35875b84939aa994121ddf20d6b7f5406b1fdaac..25c59efbd5ded142d8b1dee9d1edff89ddd54c77 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -1262,5 +1262,5 @@ U32 LLParcel::countExperienceKeyType( U32 type )
return std::count_if(
boost::begin(mExperienceKeys | boost::adaptors::map_values),
boost::end(mExperienceKeys | boost::adaptors::map_values),
- [type](U32 t){ return t == type; });
+ [type](U32 v) { return v == type; });
}
diff --git a/indra/llmath/v4math.h b/indra/llmath/v4math.h
index 3f98600b407c8602ff619d85a03b12d59a346579..d91d5ee1b1bca3094ebedefdd998f63dc4bf7a51 100644
--- a/indra/llmath/v4math.h
+++ b/indra/llmath/v4math.h
@@ -479,7 +479,7 @@ inline LLVector4 operator-(const LLVector4 &a)
// [RLVa:KB] - RlvBehaviourModifierCompMin/Max
inline bool operator<(const LLVector4& lhs, const LLVector4& rhs)
{
- return std::tie(lhs.mV[0], lhs.mV[1], lhs.mV[2], lhs.mV[3]) < std::tie(rhs.mV[0], rhs.mV[1], rhs.mV[2], rhs.mV[3]);
+ return std::tie(lhs.mV[0], lhs.mV[1], lhs.mV[2], rhs.mV[3]) < std::tie(rhs.mV[0], rhs.mV[1], rhs.mV[2], rhs.mV[3]);
}
// [/RLVa:KB]
diff --git a/indra/llmessage/lldispatcher.cpp b/indra/llmessage/lldispatcher.cpp
index 717ef10f70283c1b319cf57a2fa381277fa3fbeb..fefac0262cb2c902bd5984fb44fd5e9c56fb2493 100644
--- a/indra/llmessage/lldispatcher.cpp
+++ b/indra/llmessage/lldispatcher.cpp
@@ -58,11 +58,11 @@ bool LLDispatcher::isHandlerPresent(const key_t& name) const
void LLDispatcher::copyAllHandlerNames(keys_t& names) const
{
// copy the names onto the vector we are given
- std::transform(
- mHandlers.begin(),
- mHandlers.end(),
- std::back_insert_iterator<keys_t>(names),
- llselect1st<dispatch_map_t::value_type>());
+ std::transform(
+ mHandlers.begin(),
+ mHandlers.end(),
+ std::back_insert_iterator<keys_t>(names),
+ [](const dispatch_map_t::value_type& e) { return e.first; });
}
bool LLDispatcher::dispatch(
diff --git a/indra/llmessage/llmessagethrottle.cpp b/indra/llmessage/llmessagethrottle.cpp
index b738838a25e02e6d26641f42db6c9939d4a5f698..8ceeb39f8ddcb95b57ec19330859945f4f71d6f1 100644
--- a/indra/llmessage/llmessagethrottle.cpp
+++ b/indra/llmessage/llmessagethrottle.cpp
@@ -32,8 +32,6 @@
#include "llframetimer.h"
// This is used for the stl search_n function.
-bool eq_message_throttle_entry(const LLMessageThrottleEntry& a, const LLMessageThrottleEntry& b)
- { return a.getHash() == b.getHash(); }
const U64 SEC_TO_USEC = 1000000;
@@ -100,8 +98,8 @@ BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const std::string& mesg
LLMessageThrottleEntry entry(hash, LLFrameTimer::getTotalTime());
// Check if this message is already in the list.
- message_list_iterator_t found = std::search_n(message_list->begin(), message_list->end(),
- 1, entry, eq_message_throttle_entry);
+ message_list_iterator_t found = std::find_if(message_list->begin(), message_list->end(),
+ [&entry](const message_list_t::value_type& e) { return e.getHash() == entry.getHash(); });
if (found == message_list->end())
{
@@ -129,8 +127,8 @@ BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, c
LLMessageThrottleEntry entry(hash, LLFrameTimer::getTotalTime());
// Check if this message is already in the list.
- message_list_iterator_t found = std::search_n(message_list->begin(), message_list->end(),
- 1, entry, eq_message_throttle_entry);
+ message_list_iterator_t found = std::find_if(message_list->begin(), message_list->end(),
+ [&entry](const message_list_t::value_type& e) { return e.getHash() == entry.getHash(); });
if (found == message_list->end())
{
diff --git a/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl b/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl
index 78aeba1fb4ab49156ec75ace3c73997c9b1df01d..4875523fb259684978d6c7cf955c2c38f913e163 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl
@@ -147,10 +147,7 @@ void main()
break;
case 2: // Blur (variable)
fragColor = texture2DRect(diffuseRect, fragTC).rgb;
- if (effectStrength > 0)
- {
- fragColor = mix(fragColor, blurVariable(diffuseRect, fragTC, SPHERE_PARAMS.x, BLUR_DIRECTION, effectStrength), effectStrength);
- }
+ fragColor = mix(fragColor, blurVariable(diffuseRect, fragTC, SPHERE_PARAMS.x, BLUR_DIRECTION, effectStrength), int(effectStrength > 0));
break;
case 3: // ChromaticAberration
fragColor = chromaticAberration(diffuseRect, fragTC, SPHERE_PARAMS.xy, SPHERE_PARAMS.zw, effectStrength);
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 667e658848fc7dfce7b16de6c775b7062c3dd0e8..434a9f6c42ee6613d90f1b631bcdc2d2d57496f0 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -827,8 +827,7 @@ void LLFavoritesBarCtrl::updateButtons()
if (getChildList()->size() > 0)
{
//find last visible child to get the rightest button offset
- child_list_const_reverse_iter_t last_visible_it = std::find_if(childs->rbegin(), childs->rend(),
- std::mem_fn(&LLView::getVisible));
+ child_list_const_reverse_iter_t last_visible_it = std::find_if(childs->rbegin(), childs->rend(), [](const LLView* viewp) { return viewp->getVisible(); });
if(last_visible_it != childs->rend())
{
last_right_edge = (*last_visible_it)->getRect().mRight;
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index ca024f8b782e05689ac078daa7a1ca6cffad720c..dfd6e2b3f11c694ac13df674b32e5f5c2837fcf0 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -636,9 +636,7 @@ void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)
std::for_each(
mInfoPanels.begin(),
mInfoPanels.end(),
- llbind2nd(
- std::mem_fn(&LLPanelRegionInfo::refreshFromRegion),
- region));
+ [region](LLPanelRegionInfo* panelp) { panelp->refreshFromRegion(region); });
mEnvironmentPanel->refreshFromRegion(region);
}
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index bfeee39480a2144a0cd11b7f650d6996ad2b081f..5c1554d4bb84dfee97e5c54177dfb09039fae8f2 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -77,6 +77,7 @@
#include "llslurl.h"
#include "llstartup.h"
// [RLVa:KB] - Checked: 2015-12-27 (RLVa-1.5.0)
+#include "llvisualeffect.h"
#include "rlvactions.h"
#include "rlvcommon.h"
// [/RLVa:KB]
@@ -146,15 +147,15 @@ static bool handleAvatarHoverOffsetChanged(const LLSD& newvalue)
static bool handleSetShaderChanged(const LLSD& newvalue)
{
-// [RLVa:KB] - @setenv
- if ( (!RlvActions::canChangeEnvironment()) && (LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders")) && (!gSavedSettings.getBOOL("WindLightUseAtmosShaders")) )
+// [RLVa:KB] - @setenv and @setsphere
+ if ( (RlvActions::isRlvEnabled()) && (!RlvActions::canChangeEnvironment() || (LLVfxManager::instance().hasEffect(EVisualEffect::RlvSphere))) &&
+ (LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders"))&& (!gSavedSettings.getBOOL("WindLightUseAtmosShaders")) )
{
gSavedSettings.setBOOL("WindLightUseAtmosShaders", TRUE);
return true;
}
// [/RLVa:KB]
-
// changing shader level may invalidate existing cached bump maps, as the shader type determines the format of the bump map it expects - clear and repopulate the bump cache
gBumpImageList.destroyGL();
gBumpImageList.restoreGL();
@@ -436,21 +437,9 @@ static bool handleRenderLocalLightsChanged(const LLSD& newvalue)
return true;
}
-// [RLVa:KB] - @setsphere
-static bool handleWindLightAtmosShadersChanged(const LLSD& newvalue)
-{
- LLRenderTarget::sUseFBO = newvalue.asBoolean() && LLPipeline::sUseDepthTexture;
- handleSetShaderChanged(LLSD());
- return true;
-}
-// [/RLVa:KB]
-
static bool handleRenderDeferredChanged(const LLSD& newvalue)
{
-// LLRenderTarget::sUseFBO = newvalue.asBoolean();
-// [RLVa:KB] - @setsphere
- LLRenderTarget::sUseFBO = newvalue.asBoolean() || (gSavedSettings.getBOOL("WindLightUseAtmosShaders") && LLPipeline::sUseDepthTexture);
-// [/RLVa:KB]
+ LLRenderTarget::sUseFBO = newvalue.asBoolean();
if (gPipeline.isInit())
{
LLPipeline::refreshCachedSettings();
@@ -472,10 +461,7 @@ static bool handleRenderDeferredChanged(const LLSD& newvalue)
//
static bool handleRenderBumpChanged(const LLSD& newval)
{
-// LLRenderTarget::sUseFBO = newval.asBoolean();
-// [RLVa:KB] - @setsphere
- LLRenderTarget::sUseFBO = newval.asBoolean() || (gSavedSettings.getBOOL("WindLightUseAtmosShaders") && LLPipeline::sUseDepthTexture);
-// [/RLVa:KB]
+ LLRenderTarget::sUseFBO = newval.asBoolean();
if (gPipeline.isInit())
{
gPipeline.updateRenderBump();
@@ -682,10 +668,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("RenderGlow")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("RenderGlowResolutionPow")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
gSavedSettings.getControl("RenderAvatarCloth")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
-// gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
-// [RLVa:KB] - @setsphere
- gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleWindLightAtmosShadersChanged, _2));
-// [/RLVa:KB]
+ gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("RenderGammaFull")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("RenderVolumeLODFactor")->getSignal()->connect(boost::bind(&handleVolumeLODChanged, _2));
gSavedSettings.getControl("RenderAvatarLODFactor")->getSignal()->connect(boost::bind(&handleAvatarLODChanged, _2));
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index c9c64c02417af5531878cefaa31e85f1736e6f42..d027ddc57fcd8921efdc87bbe6d76a1af9ea5baa 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -6095,10 +6095,15 @@ void LLPickInfo::fetchResults()
// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
if ( (RlvActions::hasBehaviour(RLV_BHVR_SETOVERLAY)) && (hit_object) && (!hit_object->isHUDAttachment()) )
{
- if (auto* pOverlayEffect = LLVfxManager::instance().getEffect<RlvOverlayEffect>(EVisualEffect::RlvOverlay))
+ std::list<LLVisualEffect*> effects;
+ LLVfxManager::instance().getEffects<RlvOverlayEffect>(effects);
+ for (const LLVisualEffect* pEffect : effects)
{
- if (pOverlayEffect->hitTest(mMousePt))
+ if (pEffect->getEnabled() && static_cast<const RlvOverlayEffect*>(pEffect)->hitTest(mMousePt))
+ {
hit_object = nullptr;
+ break;
+ }
}
}
// [/RLVa:KB]
diff --git a/indra/newview/llvisualeffect.cpp b/indra/newview/llvisualeffect.cpp
index af68a5741360138001127e503e6f7f21d0a7aa80..3a4594ff09194b8dd01df3978af125c7e2796f7d 100644
--- a/indra/newview/llvisualeffect.cpp
+++ b/indra/newview/llvisualeffect.cpp
@@ -70,35 +70,43 @@ LLVector4 LLTweenableValueLerp<LLVector4>::get()
LLVfxManager::LLVfxManager()
{
-
}
bool LLVfxManager::addEffect(LLVisualEffect* pEffectInst)
{
- if (m_Effects.end() != m_Effects.find(pEffectInst))
+ // Effect IDs can be reused across effects but should be unique for all effect instances sharing the same effect code
+ auto itEffect = std::find_if(m_Effects.begin(), m_Effects.end(), [pEffectInst](const LLVisualEffect* pEffect) { return pEffect->getCode() == pEffectInst->getCode() && pEffect->getId() == pEffectInst->getId(); });
+ llassert(m_Effects.end() == itEffect);
+ if (m_Effects.end() != itEffect)
return false;
- m_Effects.insert(pEffectInst);
-
+ m_Effects.insert(std::upper_bound(m_Effects.begin(), m_Effects.end(), pEffectInst, cmpEffect), pEffectInst);
return true;
}
-LLVisualEffect* LLVfxManager::getEffect(const LLUUID& idEffect) const
+LLVisualEffect* LLVfxManager::getEffect(EVisualEffect eCode, const LLUUID& idEffect) const
{
- auto itEffect = std::find_if(m_Effects.begin(), m_Effects.end(), [&idEffect](const LLVisualEffect* pEffect) { return pEffect->getId() == idEffect; });
+ auto itEffect = std::find_if(m_Effects.begin(), m_Effects.end(), [eCode, &idEffect](const LLVisualEffect* pEffect) { return pEffect->getCode() == eCode && pEffect->getId() == idEffect; });
return (m_Effects.end() != itEffect) ? *itEffect : nullptr;
}
-LLVisualEffect* LLVfxManager::getEffect(EVisualEffect eCode) const
+bool LLVfxManager::getEffects(std::list<LLVisualEffect*>& effectList, std::function<bool(const LLVisualEffect*)> fnFilter)
{
- // NOTE: returns the first found but there could be more
- auto itEffect = std::find_if(m_Effects.begin(), m_Effects.end(), [eCode](const LLVisualEffect* pEffect) { return pEffect->getCode() == eCode; });
- return (m_Effects.end() != itEffect) ? *itEffect : nullptr;
+ effectList.clear();
+
+ auto itEffect = boost::make_filter_iterator(fnFilter, m_Effects.begin(), m_Effects.end()),
+ endEffect = boost::make_filter_iterator(fnFilter, m_Effects.end(), m_Effects.end());
+ while (itEffect != endEffect)
+ {
+ effectList.push_back(*itEffect++);
+ }
+
+ return effectList.size();
}
-bool LLVfxManager::removeEffect(const LLUUID& idEffect)
+bool LLVfxManager::removeEffect(EVisualEffect eCode, const LLUUID& idEffect)
{
- auto itEffect = std::find_if(m_Effects.begin(), m_Effects.end(), [&idEffect](const LLVisualEffect* pEffect) { return pEffect->getId() == idEffect; });
+ auto itEffect = std::find_if(m_Effects.begin(), m_Effects.end(), [eCode, &idEffect](const LLVisualEffect* pEffect) { return pEffect->getCode() == eCode && pEffect->getId() == idEffect; });
if (m_Effects.end() == itEffect)
return false;
@@ -109,32 +117,54 @@ bool LLVfxManager::removeEffect(const LLUUID& idEffect)
void LLVfxManager::runEffect(EVisualEffect eCode, LLVisualEffectParams* pParams)
{
- // *TODO-Catz: once we're done, check whether iterating over the entire list still has negliable impact
- auto pred = [eCode](const LLVisualEffect* pEffect) { return pEffect->getCode() == eCode; };
+ runEffect([eCode](const LLVisualEffect* pEffect) { return pEffect->getCode() == eCode; }, pParams);
+}
+
+void LLVfxManager::runEffect(EVisualEffectType eType, LLVisualEffectParams* pParams)
+{
+ runEffect([eType](const LLVisualEffect* pEffect) { return pEffect->getType() == eType; }, pParams);
+}
- auto itEffect = boost::make_filter_iterator(pred, m_Effects.begin(), m_Effects.end()),
- endEffect = boost::make_filter_iterator(pred, m_Effects.end(), m_Effects.end());
- for (; itEffect != endEffect; ++itEffect)
+void LLVfxManager::runEffect(std::function<bool(const LLVisualEffect*)> predicate, LLVisualEffectParams* pParams)
+{
+ // *TODO-Catz: once we're done, check whether iterating over the entire list still has negliable impact
+ auto itEffect = boost::make_filter_iterator(predicate, m_Effects.begin(), m_Effects.end()),
+ endEffect = boost::make_filter_iterator(predicate, m_Effects.end(), m_Effects.end());
+ while (itEffect != endEffect)
{
- if (pParams)
- pParams->step(itEffect == endEffect);
- (*itEffect)->run(pParams);
+ LLVisualEffect* pEffect = *itEffect++;
+ if (pEffect->getEnabled())
+ {
+ if (pParams)
+ pParams->step(itEffect == endEffect);
+ pEffect->run(pParams);
+ }
}
}
-void LLVfxManager::runEffect(EVisualEffectType eType, LLVisualEffectParams* pParams)
+void LLVfxManager::updateEffect(LLVisualEffect* pEffect, bool fEnabled, U32 nPriority)
{
- // *TODO-Catz: once we're done, check whether iterating over the entire list still has negliable impact
- auto pred = [eType](const LLVisualEffect* pEffect) { return pEffect->getType() == eType; };
+ llassert(m_Effects.end() != std::find(m_Effects.begin(), m_Effects.end(), pEffect));
- auto itEffect = boost::make_filter_iterator(pred, m_Effects.begin(), m_Effects.end()),
- endEffect = boost::make_filter_iterator(pred, m_Effects.end(), m_Effects.end());
- for (; itEffect != endEffect; ++itEffect)
+ if ( (pEffect->getEnabled() != fEnabled) || (pEffect->getPriority() != nPriority) )
+ {
+ pEffect->setEnabled(fEnabled);
+ pEffect->setPriority(nPriority);
+ std::sort(m_Effects.begin(), m_Effects.end(), cmpEffect);
+ }
+}
+
+// static
+bool LLVfxManager::cmpEffect(const LLVisualEffect* pLHS, const LLVisualEffect* pRHS)
+{
+ if (pLHS && pRHS)
{
- if (pParams)
- pParams->step(itEffect == endEffect);
- (*itEffect)->run(pParams);
+ // Sort by code, then priority, then memory address
+ return (pLHS->getCode() == pRHS->getCode()) ? (pLHS->getPriority() == pRHS->getPriority() ? pLHS < pRHS
+ : pLHS->getPriority() > pRHS->getPriority())
+ : pLHS->getCode() < pRHS->getCode();
}
+ return (pLHS);
}
// ============================================================================
diff --git a/indra/newview/llvisualeffect.h b/indra/newview/llvisualeffect.h
index 6d2a7624d6acb78aff0503e24d6eb77827b34ed3..19be8b0d6b9c11166fcc7ef0143f5f8a013762fa 100644
--- a/indra/newview/llvisualeffect.h
+++ b/indra/newview/llvisualeffect.h
@@ -72,6 +72,7 @@ struct LLShaderEffectParams final : LLVisualEffectParams
class LLVisualEffect
{
+ friend class LLVfxManager;
public:
LLVisualEffect(LLUUID id, EVisualEffect eCode, EVisualEffectType eType)
: m_id(id), m_eCode(eCode), m_eType(eType)
@@ -79,12 +80,17 @@ class LLVisualEffect
virtual ~LLVisualEffect() {}
EVisualEffect getCode() const { return m_eCode;}
+ bool getEnabled() const { return m_fEnabled; }
const LLUUID& getId() const { return m_id;}
U32 getPriority() const { return m_nPriority; }
EVisualEffectType getType() const { return m_eType;}
+ void setEnabled(bool enable) { m_fEnabled = enable; }
virtual void run(const LLVisualEffectParams* pParams) = 0;
+protected:
+ void setPriority(U32 priority) { m_nPriority = priority; }
+
/*
* Member variables
*/
@@ -92,7 +98,8 @@ class LLVisualEffect
LLUUID m_id;
EVisualEffect m_eCode;
EVisualEffectType m_eType;
- U32 m_nPriority;
+ bool m_fEnabled = true;
+ U32 m_nPriority = 0;
};
// ============================================================================
@@ -160,20 +167,34 @@ class LLVfxManager final : public LLSingleton<LLVfxManager>
*/
public:
bool addEffect(LLVisualEffect* pEffectInst);
- LLVisualEffect* getEffect(const LLUUID& idEffect) const;
- template<typename T> T* getEffect(const LLUUID& idEffect) const { return dynamic_cast<T*>(getEffect(idEffect)); }
- LLVisualEffect* getEffect(EVisualEffect eCode) const;
- template<typename T> T* getEffect(EVisualEffect eCode) const { return dynamic_cast<T*>(getEffect(eCode)); }
- bool removeEffect(const LLUUID& idEffect);
+ LLVisualEffect* getEffect(EVisualEffect eCode, const LLUUID& idEffect) const;
+ template<typename T> T* getEffect(const LLUUID& idEffect) const { return dynamic_cast<T*>(getEffect(T::EffectCode, idEffect)); }
+ bool getEffects(std::list<LLVisualEffect*>& effectList, std::function<bool(const LLVisualEffect*)> fnFilter);
+ template<typename T> bool getEffects(std::list<LLVisualEffect*>& effectList) { return getEffects(effectList, [](const LLVisualEffect* pEffect) { return pEffect->getCode() == T::EffectCode; }); }
+ bool hasEffect(EVisualEffect eCode) const;
+ bool removeEffect(EVisualEffect eCode, const LLUUID& idEffect);
+ template<typename T> bool removeEffect(const LLUUID& idEffect) { return removeEffect(T::EffectCode, idEffect); }
void runEffect(EVisualEffect eCode, LLVisualEffectParams* pParams = nullptr);
void runEffect(EVisualEffectType eType, LLVisualEffectParams* pParams = nullptr);
+ void updateEffect(LLVisualEffect* pEffect, bool fEnabled, U32 nPriority);
protected:
+ void runEffect(std::function<bool(const LLVisualEffect*)> fnFilter, LLVisualEffectParams* pParams);
+ static bool cmpEffect(const LLVisualEffect* pLHS, const LLVisualEffect* pRHS);
/*
* Member variables
*/
protected:
- std::set<LLVisualEffect*> m_Effects;
+ std::vector<LLVisualEffect*> m_Effects;
};
// ============================================================================
+// Inlined member functions
+//
+
+inline bool LLVfxManager::hasEffect(EVisualEffect eCode) const
+{
+ return m_Effects.end() != std::find_if(m_Effects.begin(), m_Effects.end(), [eCode](const LLVisualEffect* pEffect) { return pEffect->getCode() == eCode; });
+}
+
+// ============================================================================
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 05e22c54b7acd87ef5aeba76e49350c0c7a3bb51..1972077b687045f78623236c3386b7be191aacfa 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1111,6 +1111,13 @@ void LLPipeline::updateRenderDeferred()
RenderAvatarVP &&
WindLightUseAtmosShaders &&
(bool) LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred");
+// [RLVa:KB] - @setsphere
+ if (!sRenderDeferred && RlvActions::hasBehaviour(RLV_BHVR_SETSPHERE) && WindLightUseAtmosShaders)
+ {
+ LLRenderTarget::sUseFBO = true;
+ LLPipeline::sUseDepthTexture = true;
+ }
+// [/RLVa:KB]
}
// static
@@ -4429,7 +4436,7 @@ void LLPipeline::renderGeom(LLCamera& camera, bool forceVBOUpdate)
gGL.loadMatrix(gGLModelView);
LLGLSLShader::bindNoShader();
// [RLVa:KB] - @setsphere
- if (LLPipeline::RenderDeferred || !LLRenderTarget::sUseFBO || !LLPipeline::sUseDepthTexture)
+ if (LLPipeline::sRenderDeferred || !LLRenderTarget::sUseFBO || !LLPipeline::sUseDepthTexture)
{
doOcclusion(camera);
}
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index b64b8b6f41d7d3a373e3168cccfa2e78fd3ec43f..df7ebb5c1acf7324d8d4468f6a597ba1de297074 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -37,7 +37,7 @@ const S32 RLV_VERSION_BUILD_COMPAT = 0;
// Implementation version
const S32 RLVa_VERSION_MAJOR = 2;
const S32 RLVa_VERSION_MINOR = 4;
-const S32 RLVa_VERSION_PATCH = 0;
+const S32 RLVa_VERSION_PATCH = 1;
const S32 RLVa_IMPL_ID = 13;
// Uncomment before a final release
diff --git a/indra/newview/rlveffects.cpp b/indra/newview/rlveffects.cpp
index 6da6a158254affd66c1be41fc6c93d03710c882f..70e90301444245b7d616395478b1318fc4dcdc45 100644
--- a/indra/newview/rlveffects.cpp
+++ b/indra/newview/rlveffects.cpp
@@ -40,6 +40,7 @@ RlvOverlayEffect::RlvOverlayEffect(const LLUUID& idRlvObj)
, m_fBlockTouch(false)
, m_Color(LLColor3(c_DefaultColor))
{
+ m_fEnabled = false;
}
RlvOverlayEffect::~RlvOverlayEffect()
@@ -50,7 +51,7 @@ RlvOverlayEffect::~RlvOverlayEffect()
// static
ERlvCmdRet RlvOverlayEffect::onAlphaValueChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvOverlayEffect* pEffect = dynamic_cast<RlvOverlayEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvOverlayEffect* pEffect = LLVfxManager::instance().getEffect<RlvOverlayEffect>(idRlvObj))
{
pEffect->m_nAlpha = (newValue) ? boost::get<float>(newValue.value()) : c_DefaultAlpha;
}
@@ -60,7 +61,7 @@ ERlvCmdRet RlvOverlayEffect::onAlphaValueChanged(const LLUUID& idRlvObj, const b
// static
ERlvCmdRet RlvOverlayEffect::onBlockTouchValueChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvOverlayEffect* pEffect = dynamic_cast<RlvOverlayEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvOverlayEffect* pEffect = LLVfxManager::instance().getEffect<RlvOverlayEffect>(idRlvObj))
{
pEffect->m_fBlockTouch = (newValue) ? boost::get<bool>(newValue.value()) : false;
}
@@ -69,7 +70,7 @@ ERlvCmdRet RlvOverlayEffect::onBlockTouchValueChanged(const LLUUID& idRlvObj, co
// static
ERlvCmdRet RlvOverlayEffect::onColorValueChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvOverlayEffect* pEffect = dynamic_cast<RlvOverlayEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvOverlayEffect* pEffect = LLVfxManager::instance().getEffect<RlvOverlayEffect>(idRlvObj))
{
pEffect->m_Color = LLColor3( (newValue) ? boost::get<LLVector3>(newValue.value()).mV : c_DefaultColor);
}
@@ -79,7 +80,7 @@ ERlvCmdRet RlvOverlayEffect::onColorValueChanged(const LLUUID& idRlvObj, const b
// static
ERlvCmdRet RlvOverlayEffect::onTextureChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvOverlayEffect* pEffect = dynamic_cast<RlvOverlayEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvOverlayEffect* pEffect = LLVfxManager::instance().getEffect<RlvOverlayEffect>(idRlvObj))
{
if (newValue)
pEffect->setImage(boost::get<LLUUID>(newValue.value()));
@@ -189,7 +190,7 @@ RlvSphereEffect::~RlvSphereEffect()
// static
ERlvCmdRet RlvSphereEffect::onModeChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
pEffect->m_eMode = (ESphereMode)((newValue) ? boost::get<int>(newValue.value()) : c_SphereDefaultMode);
}
@@ -199,7 +200,7 @@ ERlvCmdRet RlvSphereEffect::onModeChanged(const LLUUID& idRlvObj, const boost::o
// static
ERlvCmdRet RlvSphereEffect::onOriginChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
pEffect->m_eOrigin = (ESphereOrigin)((newValue) ? boost::get<int>(newValue.value()) : c_SphereDefaultOrigin);
}
@@ -209,7 +210,7 @@ ERlvCmdRet RlvSphereEffect::onOriginChanged(const LLUUID& idRlvObj, const boost:
// static
ERlvCmdRet RlvSphereEffect::onColorChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
LLVector4 vecColor = (newValue) ? LLVector4(boost::get<LLVector3>(newValue.value()), 1.0f) : LLVector4(c_SphereDefaultColor);
if (!pEffect->m_nTweenDuration)
@@ -223,7 +224,7 @@ ERlvCmdRet RlvSphereEffect::onColorChanged(const LLUUID& idRlvObj, const boost::
// static
ERlvCmdRet RlvSphereEffect::onDistMinChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
float nDistanceMin = (newValue) ? boost::get<float>(newValue.value()) : c_SphereDefaultDistance;
if (!pEffect->m_nTweenDuration)
@@ -237,7 +238,7 @@ ERlvCmdRet RlvSphereEffect::onDistMinChanged(const LLUUID& idRlvObj, const boost
// static
ERlvCmdRet RlvSphereEffect::onDistMaxChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
float nDistanceMax = (newValue) ? boost::get<float>(newValue.value()) : c_SphereDefaultDistance;
if (!pEffect->m_nTweenDuration)
@@ -251,7 +252,7 @@ ERlvCmdRet RlvSphereEffect::onDistMaxChanged(const LLUUID& idRlvObj, const boost
// static
ERlvCmdRet RlvSphereEffect::onDistExtendChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
pEffect->m_eDistExtend = (ESphereDistExtend)((newValue) ? boost::get<int>(newValue.value()) : c_SphereDefaultDistanceExtend);
}
@@ -261,7 +262,7 @@ ERlvCmdRet RlvSphereEffect::onDistExtendChanged(const LLUUID& idRlvObj, const bo
// static
ERlvCmdRet RlvSphereEffect::onParamsChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
LLVector4 params = LLVector4((newValue) ? boost::get<LLVector4>(newValue.value()).mV : c_SphereDefaultColor);
if (!pEffect->m_nTweenDuration)
@@ -275,7 +276,7 @@ ERlvCmdRet RlvSphereEffect::onParamsChanged(const LLUUID& idRlvObj, const boost:
// static
ERlvCmdRet RlvSphereEffect::onTweenDurationChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
pEffect->m_nTweenDuration = (newValue) ? boost::get<float>(newValue.value()) : 0;
}
@@ -285,7 +286,7 @@ ERlvCmdRet RlvSphereEffect::onTweenDurationChanged(const LLUUID& idRlvObj, const
// static
ERlvCmdRet RlvSphereEffect::onValueMinChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
float nValueMin = (newValue) ? boost::get<float>(newValue.value()) : c_SphereDefaultAlpha;;
if (!pEffect->m_nTweenDuration)
@@ -299,7 +300,7 @@ ERlvCmdRet RlvSphereEffect::onValueMinChanged(const LLUUID& idRlvObj, const boos
// static
ERlvCmdRet RlvSphereEffect::onValueMaxChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
- if (RlvSphereEffect* pEffect = dynamic_cast<RlvSphereEffect*>(LLVfxManager::instance().getEffect(idRlvObj)))
+ if (RlvSphereEffect* pEffect = LLVfxManager::instance().getEffect<RlvSphereEffect>(idRlvObj))
{
float nValueMax = (newValue) ? boost::get<float>(newValue.value()) : c_SphereDefaultAlpha;
if (!pEffect->m_nTweenDuration)
diff --git a/indra/newview/rlveffects.h b/indra/newview/rlveffects.h
index 5bcf67aea58ac6f346bdf9d6bef9072ae8dedb08..26256228299a783d952888de197bd63c6639cdc9 100644
--- a/indra/newview/rlveffects.h
+++ b/indra/newview/rlveffects.h
@@ -35,6 +35,7 @@ class RlvOverlayEffect final : public LLVisualEffect
RlvOverlayEffect(const LLUUID& idRlvObj);
~RlvOverlayEffect();
+ static const EVisualEffect EffectCode = EVisualEffect::RlvOverlay;
public:
bool hitTest(const LLCoordGL& ptMouse) const;
void run(const LLVisualEffectParams*) override;
@@ -70,6 +71,7 @@ class RlvSphereEffect final : public LLVisualEffect
RlvSphereEffect(const LLUUID& idRlvObj);
~RlvSphereEffect();
+ static const EVisualEffect EffectCode = EVisualEffect::RlvSphere;
public:
void run(const LLVisualEffectParams* pParams) override;
static ERlvCmdRet onModeChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue);
diff --git a/indra/newview/rlvfloaters.cpp b/indra/newview/rlvfloaters.cpp
index 2ddd86c9d4982ef752894e76e3b9f7452cf2345a..aefc2b3b2084365570bbc44aadccaa318af5e254 100644
--- a/indra/newview/rlvfloaters.cpp
+++ b/indra/newview/rlvfloaters.cpp
@@ -19,6 +19,7 @@
#include "llagent.h"
#include "llappearancemgr.h"
#include "llavatarnamecache.h"
+#include <llchatentry.h>
#include "llclipboard.h"
#include "llcombobox.h"
#include "llinventoryfunctions.h"
@@ -733,7 +734,7 @@ static const char s_strRlvConsoleDisabled[] = "RLVa is disabled";
static const char s_strRlvConsoleInvalid[] = "Invalid command";
RlvFloaterConsole::RlvFloaterConsole(const LLSD& sdKey)
- : LLFloater(sdKey), m_pOutputText(nullptr)
+ : LLFloater(sdKey)
{
}
@@ -743,11 +744,14 @@ RlvFloaterConsole::~RlvFloaterConsole()
BOOL RlvFloaterConsole::postBuild()
{
- LLLineEditor* pInputEdit = getChild<LLLineEditor>("console_input");
- pInputEdit->setEnableLineHistory(true);
- pInputEdit->setCommitCallback(boost::bind(&RlvFloaterConsole::onInput, this, _1, _2));
- pInputEdit->setFocus(true);
- pInputEdit->setCommitOnFocusLost(false);
+ m_pInputEdit = getChild<LLChatEntry>("console_input");
+ m_pInputEdit->setCommitCallback(boost::bind(&RlvFloaterConsole::onInput, this, _1, _2));
+ m_pInputEdit->setTextExpandedCallback(boost::bind(&RlvFloaterConsole::reshapeLayoutPanel, this));
+ m_pInputEdit->setFocus(true);
+ m_pInputEdit->setCommitOnFocusLost(false);
+
+ m_pInputPanel = getChild<LLLayoutPanel>("input_panel");
+ m_nInputEditPad = m_pInputPanel->getRect().getHeight() - m_pInputEdit->getRect().getHeight();
m_pOutputText = getChild<LLTextEditor>("console_output");
m_pOutputText->appendText(s_strRlvConsolePrompt, false);
@@ -769,12 +773,12 @@ void RlvFloaterConsole::addCommandReply(const std::string& strCommand, const std
void RlvFloaterConsole::onInput(LLUICtrl* pCtrl, const LLSD& sdParam)
{
- LLLineEditor* pInputEdit = static_cast<LLLineEditor*>(pCtrl);
+ LLChatEntry* pInputEdit = static_cast<LLChatEntry*>(pCtrl);
std::string strInput = pInputEdit->getText();
LLStringUtil::trim(strInput);
m_pOutputText->appendText(strInput, false);
- pInputEdit->clear();
+ pInputEdit->setText(LLStringUtil::null);
if (!rlv_handler_t::isEnabled())
{
@@ -831,4 +835,9 @@ void RlvFloaterConsole::onInput(LLUICtrl* pCtrl, const LLSD& sdParam)
m_pOutputText->appendText(s_strRlvConsolePrompt, true);
}
+void RlvFloaterConsole::reshapeLayoutPanel()
+{
+ m_pInputPanel->reshape(m_pInputPanel->getRect().getWidth(), m_pInputEdit->getRect().getHeight() + m_nInputEditPad, FALSE);
+}
+
// ============================================================================
diff --git a/indra/newview/rlvfloaters.h b/indra/newview/rlvfloaters.h
index 9e6fb2b6215c50d719ecd48cdd8a89339a7ecf42..dcb5cd077f4ff28821feb7089aafadba15a773ce 100644
--- a/indra/newview/rlvfloaters.h
+++ b/indra/newview/rlvfloaters.h
@@ -1,21 +1,20 @@
-/**
+/**
*
* Copyright (c) 2009-2011, Kitty Barnett
- *
- * The source code in this file is provided to you under the terms of the
+ *
+ * The source code in this file is provided to you under the terms of the
* GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
* in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
- *
+ *
* By copying, modifying or distributing this software, you acknowledge that
- * you have read and understood your obligations described above, and agree to
+ * you have read and understood your obligations described above, and agree to
* abide by those obligations.
- *
+ *
*/
-#ifndef RLV_FLOATERS_H
-#define RLV_FLOATERS_H
+#pragma once
#include "llfloater.h"
@@ -25,7 +24,9 @@
// ============================================================================
// Foward declarations
//
+class LLChatEntry;
class LLComboBox;
+class LLLayoutPanel;
class LLTextEditor;
// ============================================================================
@@ -150,21 +151,23 @@ class RlvFloaterConsole final : public LLFloater
public:
BOOL postBuild() override;
void onClose(bool fQuitting) override;
-
+
/*
* Member functions
*/
protected:
void addCommandReply(const std::string& strCommand, const std::string& strReply);
void onInput(LLUICtrl* ctrl, const LLSD& param);
+ void reshapeLayoutPanel();
/*
* Member variables
*/
protected:
- LLTextEditor* m_pOutputText;
+ LLTextEditor* m_pOutputText = nullptr;
+ LLLayoutPanel* m_pInputPanel = nullptr;
+ LLChatEntry* m_pInputEdit = nullptr;
+ int m_nInputEditPad = 0;
};
// ============================================================================
-
-#endif // RLV_FLOATERS_H
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 1262411144f9c4fa9dfe0eb4ab94feb40c802cd1..a03d72b41f421a8d94b9c92aa3e2506cd8b53754 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -2051,14 +2051,44 @@ void RlvBehaviourToggleHandler<RLV_BHVR_PAY>::onCommandToggle(ERlvBehaviour eBhv
}
}
-// Handles: @setoverlay=n|y toggles
+// Handles: @setoverlay=n|y
template<> template<>
-void RlvBehaviourToggleHandler<RLV_BHVR_SETOVERLAY>::onCommandToggle(ERlvBehaviour eBhvr, bool fHasBhvr)
+ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SETOVERLAY>::onCommand(const RlvCommand& rlvCmd, bool& fRefCount)
{
- if (fHasBhvr)
- LLVfxManager::instance().addEffect(new RlvOverlayEffect(gRlvHandler.getCurrentObject()));
- else
- LLVfxManager::instance().removeEffect(gRlvHandler.getCurrentObject());
+ ERlvCmdRet eRet = RlvBehaviourGenericHandler<RLV_OPTION_NONE_OR_MODIFIER>::onCommand(rlvCmd, fRefCount);
+ if ( (RLV_RET_SUCCESS == eRet) && (!rlvCmd.isModifier()) )
+ {
+ if (gRlvHandler.hasBehaviour(rlvCmd.getObjectID(), rlvCmd.getBehaviourType()))
+ {
+ LLVfxManager::instance().addEffect(new RlvOverlayEffect(gRlvHandler.getCurrentObject()));
+ }
+ else
+ {
+ LLVfxManager::instance().removeEffect<RlvOverlayEffect>(gRlvHandler.getCurrentObject());
+ }
+ }
+
+ // Refresh overlay effects according to object hierarchy
+ std::list<LLVisualEffect*> effects;
+ if (LLVfxManager::instance().getEffects<RlvOverlayEffect>(effects))
+ {
+ auto itActiveEffect = std::find_if(effects.begin(), effects.end(), [](const LLVisualEffect* pEffect) { return pEffect->getEnabled(); });
+ if (effects.end() == itActiveEffect)
+ {
+ // If nothing is active just pick the first one to activate
+ itActiveEffect = effects.begin();
+ }
+
+ const LLUUID idActiveRootObj = (effects.end() != itActiveEffect) ? Rlv::getObjectRootId((*itActiveEffect)->getId()) : LLUUID::null;
+ for (LLVisualEffect* pEffect : effects)
+ {
+ bool isActive = (idActiveRootObj.isNull() && pEffect == effects.front()) || (Rlv::getObjectRootId(pEffect->getId()) == idActiveRootObj);
+ int nPriority = (isActive) ? 256 - Rlv::getObjectLinkNumber(pEffect->getId()) : pEffect->getPriority();
+ LLVfxManager::instance().updateEffect(pEffect, isActive, nPriority);
+ }
+ }
+
+ return eRet;
}
// Handles: @setsphere=n|y
@@ -2072,22 +2102,28 @@ ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SETSPHERE>::onCommand(const RlvCommand&
ERlvCmdRet eRet = RlvBehaviourGenericHandler<RLV_OPTION_NONE_OR_MODIFIER>::onCommand(rlvCmd, fRefCount);
if ( (RLV_RET_SUCCESS == eRet) && (!rlvCmd.isModifier()) )
{
- // If we're not using deferred but are using Windlight shaders we need to force use of FBO and depthmap texture
- if ( (!LLPipeline::RenderDeferred) && (LLPipeline::WindLightUseAtmosShaders) && (!LLPipeline::sUseDepthTexture) )
+ if (gRlvHandler.hasBehaviour(rlvCmd.getObjectID(), rlvCmd.getBehaviourType()))
{
- LLRenderTarget::sUseFBO = true;
- LLPipeline::sUseDepthTexture = true;
+ Rlv::forceAtmosphericShadersIfAvailable();
- gPipeline.releaseGLBuffers();
- gPipeline.createGLBuffers();
- gPipeline.resetVertexBuffers();
- LLViewerShaderMgr::instance()->setShaders();
- }
+ // If we're not using deferred but are using Windlight shaders we need to force use of FBO and depthmap texture
+ if ( (!LLPipeline::sRenderDeferred) && (LLPipeline::WindLightUseAtmosShaders) && (!LLPipeline::sUseDepthTexture) )
+ {
+ LLRenderTarget::sUseFBO = true;
+ LLPipeline::sUseDepthTexture = true;
+
+ gPipeline.releaseGLBuffers();
+ gPipeline.createGLBuffers();
+ gPipeline.resetVertexBuffers();
+ LLViewerShaderMgr::instance()->setShaders();
+ }
- if (gRlvHandler.hasBehaviour(rlvCmd.getObjectID(), rlvCmd.getBehaviourType()))
LLVfxManager::instance().addEffect(new RlvSphereEffect(rlvCmd.getObjectID()));
+ }
else
- LLVfxManager::instance().removeEffect(gRlvHandler.getCurrentObject());
+ {
+ LLVfxManager::instance().removeEffect<RlvSphereEffect>(gRlvHandler.getCurrentObject());
+ }
}
return eRet;
}
@@ -2403,11 +2439,10 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SETENV>::onCommandToggle(ERlvBehaviour e
}
}
- // Don't allow toggling "Atmopsheric Shaders" through the debug settings under @setenv=n
- gSavedSettings.getControl("WindLightUseAtmosShaders")->setHiddenFromSettingsEditor(fHasBhvr);
-
if (fHasBhvr)
{
+ Rlv::forceAtmosphericShadersIfAvailable();
+
// Usurp the 'edit' environment for RLVa locking so TPV tools like quick prefs and phototools are automatically locked out as well
// (these needed per-feature awareness of RLV in the previous implementation which often wasn't implemented)
LLEnvironment* pEnv = LLEnvironment::getInstance();
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 0b3389d273ac644bf6276c947215be11904e800e..a96cbc93355a85075961e40c312994568c539b3a 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -17,9 +17,11 @@
#include "llviewerprecompiledheaders.h"
#include "llappearancemgr.h"
#include "llattachmentsmgr.h"
+#include "llfeaturemanager.h"
#include "llgesturemgr.h"
#include "llnotificationsutil.h"
#include "llviewerobjectlist.h"
+#include "pipeline.h"
#include "rlvcommon.h"
#include "rlveffects.h"
@@ -219,16 +221,16 @@ RlvBehaviourDictionary::RlvBehaviourDictionary()
addEntry(new RlvBehaviourGenericToggleProcessor<RLV_BHVR_SETCAM_UNLOCK, RLV_OPTION_NONE>("camunlock", RlvBehaviourInfo::BHVR_SYNONYM | RlvBehaviourInfo::BHVR_DEPRECATED));
// Overlay
- RlvBehaviourInfo* pSetOverlayBhvr = new RlvBehaviourGenericToggleProcessor<RLV_BHVR_SETOVERLAY, RLV_OPTION_NONE_OR_MODIFIER>("setoverlay");
+ RlvBehaviourInfo* pSetOverlayBhvr = new RlvBehaviourProcessor<RLV_BHVR_SETOVERLAY>("setoverlay");
pSetOverlayBhvr->addModifier(ERlvLocalBhvrModifier::OverlayAlpha, typeid(float), "alpha", &RlvOverlayEffect::onAlphaValueChanged);
pSetOverlayBhvr->addModifier(ERlvLocalBhvrModifier::OverlayTexture, typeid(LLUUID), "texture", &RlvOverlayEffect::onTextureChanged);
pSetOverlayBhvr->addModifier(ERlvLocalBhvrModifier::OverlayTint, typeid(LLVector3), "tint", &RlvOverlayEffect::onColorValueChanged);
pSetOverlayBhvr->addModifier(ERlvLocalBhvrModifier::OverlayTouch, typeid(LLVector3), "touch", &RlvOverlayEffect::onBlockTouchValueChanged);
addEntry(pSetOverlayBhvr);
- addEntry(new RlvForceProcessor<RLV_BHVR_SETOVERLAY_TWEEN>("setoverlay_tween", RlvBehaviourInfo::BHVR_EXPERIMENTAL));
+ addEntry(new RlvForceProcessor<RLV_BHVR_SETOVERLAY_TWEEN>("setoverlay_tween"));
// Sphere
- RlvBehaviourInfo* pSetSphereBhvr = new RlvBehaviourProcessor<RLV_BHVR_SETSPHERE>("setsphere", RlvBehaviourInfo::BHVR_EXPERIMENTAL);
+ RlvBehaviourInfo* pSetSphereBhvr = new RlvBehaviourProcessor<RLV_BHVR_SETSPHERE>("setsphere");
pSetSphereBhvr->addModifier(ERlvLocalBhvrModifier::SphereMode, typeid(int), "mode", &RlvSphereEffect::onModeChanged);
pSetSphereBhvr->addModifier(ERlvLocalBhvrModifier::SphereOrigin, typeid(int), "origin", &RlvSphereEffect::onOriginChanged);
pSetSphereBhvr->addModifier(ERlvLocalBhvrModifier::SphereColor, typeid(LLVector3), "color", &RlvSphereEffect::onColorChanged);
@@ -2038,3 +2040,40 @@ std::string rlvGetLastParenthesisedText(const std::string& strText, std::string:
}
// =========================================================================
+// Various helper functions
+//
+
+namespace Rlv
+{
+ void forceAtmosphericShadersIfAvailable()
+ {
+ if ( (LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders")) && (!LLPipeline::WindLightUseAtmosShaders) )
+ {
+ // Triggers handleSetShaderChanged() which will do the actual work for us
+ gSavedSettings.setBOOL("WindLightUseAtmosShaders", TRUE);
+ }
+ }
+
+ int getObjectLinkNumber(const LLUUID& idObj)
+ {
+ const LLViewerObject* pObj = gObjectList.findObject(idObj);
+ const LLViewerObject* pRootObj = (pObj) ? pObj->getRootEdit() : nullptr;
+ if ( (!pRootObj) || (pRootObj->getChildren().empty()) )
+ return 0;
+ else if (pRootObj == pObj)
+ return 1;
+ return 2 + std::distance(pRootObj->getChildren().begin(), std::find(pRootObj->getChildren().begin(), pRootObj->getChildren().end(), pObj));
+ }
+
+ const LLUUID& getObjectRootId(const LLUUID& idObj)
+ {
+ if (const LLViewerObject* pObj = gObjectList.findObject(idObj))
+ {
+ pObj = pObj->getRootEdit();
+ return pObj->getID();
+ }
+ return idObj;
+ }
+}
+
+// =========================================================================
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index 0d970ee5ca70a10d969e2ff575c6d90c740fa50f..398af45d4d7e5e936342c605f5b65a24f3568519 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -694,6 +694,14 @@ ERlvAttachGroupType rlvAttachGroupFromString(const std::string& strGroup);
std::string rlvGetFirstParenthesisedText(const std::string& strText, std::string::size_type* pidxMatch = NULL);
std::string rlvGetLastParenthesisedText(const std::string& strText, std::string::size_type* pidxStart = NULL);
+namespace Rlv
+{
+ void forceAtmosphericShadersIfAvailable();
+
+ int getObjectLinkNumber(const LLUUID& idObj);
+ const LLUUID& getObjectRootId(const LLUUID& idObj);
+}
+
// ============================================================================
// Inlined class member functions
//
diff --git a/indra/newview/skins/default/xui/en/floater_rlv_console.xml b/indra/newview/skins/default/xui/en/floater_rlv_console.xml
index 8c09e7dacc425fd18eda72106607d968762477bb..928d50cb414286d2a7a485819972f6cf7888f783 100644
--- a/indra/newview/skins/default/xui/en/floater_rlv_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_rlv_console.xml
@@ -1,43 +1,73 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
- can_resize="true"
- height="400"
- layout="topleft"
- min_height="300"
- min_width="300"
- name="rlv_console"
- title="RLVa console"
- width="600"
- >
- <text_editor
+ can_resize="true"
+ height="400"
+ layout="topleft"
+ min_height="300"
+ min_width="300"
+ name="rlv_console"
+ title="RLVa console"
+ width="600"
+ >
+ <layout_stack
+ animate="false"
+ bottom="-1"
+ default_tab_group="2"
follows="all"
- left="10"
- length="1"
- font="Monospace"
- height="366"
- ignore_tab="false"
+ left="5"
layout="topleft"
- max_length="65536"
- name="console_output"
- read_only="true"
- track_end="true"
- type="string"
- width="576"
- word_wrap="true"
+ mouse_opaque="false"
+ name="main_stack"
+ right="-5"
+ orientation="vertical"
+ tab_group="1"
+ top="1"
>
- </text_editor>
- <line_editor
- border_style="line"
- border_thickness="1"
- bottom_delta="20"
- follows="left|right|bottom"
- font="SansSerif"
- height="19"
- layout="topleft"
- max_length_chars="127"
- name="console_input"
- top_delta="0"
- width="576"
- >
- </line_editor>
+ <layout_panel
+ name="body_panel"
+ height="235">
+ <text_editor
+ follows="all"
+ left="1"
+ right="-1"
+ top="0"
+ length="1"
+ font="Monospace"
+ bottom="-1"
+ ignore_tab="false"
+ layout="topleft"
+ max_length="65536"
+ name="console_output"
+ read_only="true"
+ track_end="true"
+ type="string"
+ word_wrap="true"
+ >
+ </text_editor>
+ </layout_panel>
+
+ <layout_panel
+ height="26"
+ auto_resize="false"
+ name="input_panel">
+ <chat_editor
+ layout="topleft"
+ expand_lines_count="5"
+ follows="left|right|bottom"
+ font="SansSerifSmall"
+ height="20"
+ is_expandable="true"
+ text_tentative_color="TextFgTentativeColor"
+ name="console_input"
+ max_length="1023"
+ spellcheck="true"
+ tab_group="3"
+ bottom_delta="20"
+ left="1"
+ top="1"
+ right="-1"
+ wrap="true"
+ />
+ </layout_panel>
+ </layout_stack>
</floater>