livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EditAppearanceLighting setting

master
Ansariel 2020-08-06 12:29:57 +02:00
parent 760dd9615c
commit e4fd159767
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/llmorphview.cpp
View File

@ -61,7 +61,8 @@ LLMorphView::LLMorphView(const LLMorphView::Params& p)
mOldCameraNearClip( 0.f ),
mCameraPitch( 0.f ),
mCameraYaw( 0.f ),
mCameraDrivenByKeys( FALSE )
mCameraDrivenByKeys( FALSE ),
mEditAppearanceLightingConnection() // <FS:Ansariel> Optional Edit Appearance Lighting
{}
//-----------------------------------------------------------------------------
@ -80,33 +81,47 @@ void LLMorphView::initialize()
gAgentAvatarp->stopMotion( ANIM_AGENT_BODY_NOISE );
// ## Zi: Optional Edit Appearance Lighting
// gAgentAvatarp->mSpecialRenderMode = 3;
LLPointer<LLControlVariable> special_render_mode_control=gSavedSettings.getControl("EditAppearanceLighting");
special_render_mode_control->getCommitSignal()->connect(boost::bind(&LLMorphView::onSpecialRenderModeLightChanged, this));
// <FS:Zi> Optional Edit Appearance Lighting
//gAgentAvatarp->mSpecialRenderMode = 3;
if (mEditAppearanceLightingConnection.connected())
{
mEditAppearanceLightingConnection.disconnect();
}
mEditAppearanceLightingConnection = gSavedSettings.getControl("EditAppearanceLighting")->getCommitSignal()->connect(boost::bind(&LLMorphView::onSpecialRenderModeLightChanged, this));
onSpecialRenderModeLightChanged();
// ## Zi: Optional Edit Appearance Lighting
// </FS:Zi> Optional Edit Appearance Lighting
// set up camera for close look at avatar
mOldCameraNearClip = LLViewerCamera::getInstance()->getNear();
LLViewerCamera::getInstance()->setNear(MORPH_NEAR_CLIP);
}
// ## Zi: Optional Edit Appearance Lighting
// <FS:Zi> Optional Edit Appearance Lighting
void LLMorphView::onSpecialRenderModeLightChanged()
{
if(gSavedSettings.getBOOL("EditAppearanceLighting"))
if (gSavedSettings.getBOOL("EditAppearanceLighting"))
{
gAgentAvatarp->mSpecialRenderMode = 3;
}
else
{
gAgentAvatarp->mSpecialRenderMode = 0;
}
}
// ## Zi: Optional Edit Appearance Lighting
// </FS:Zi> Optional Edit Appearance Lighting
//-----------------------------------------------------------------------------
// shutdown()
//-----------------------------------------------------------------------------
void LLMorphView::shutdown()
{
// <FS:Ansariel> Optional Edit Appearance Lighting
if (mEditAppearanceLightingConnection.connected())
{
mEditAppearanceLightingConnection.disconnect();
}
// </FS:Ansariel> Optional Edit Appearance Lighting
if (isAgentAvatarValid())
{
gAgentAvatarp->startMotion( ANIM_AGENT_BODY_NOISE );

4
indra/newview/llmorphview.h
View File

@ -63,7 +63,7 @@ public:
protected:
void initialize();
void onSpecialRenderModeLightChanged(); // ## Zi: Optional Edit Appearance Lighting
void onSpecialRenderModeLightChanged(); // <FS:Zi> Optional Edit Appearance Lighting
LLJoint* mCameraTargetJoint;
LLVector3d mCameraOffset;
@ -78,7 +78,7 @@ protected:
F32 mCameraYaw;
BOOL mCameraDrivenByKeys;
BOOL mSpecialRenderModeLight; // ## Zi: Optional Edit Appearance Lighting
boost::signals2::connection mEditAppearanceLightingConnection; // <FS:Zi> Optional Edit Appearance Lighting
};
//