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

FIRE-34747: Review fixes

master
Angeldark Raymaker 2024-11-13 20:07:51 +00:00
parent 0f9776d867
commit bc2c5e7453
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/CMakeLists.txt
View File

@ -937,6 +937,7 @@ set(viewer_HEADER_FILES
fsfloaternearbychat.h
fsfloaterpartialinventory.h
fsfloaterplacedetails.h
fsfloaterposer.h
fsfloaterposestand.h
fsfloaterprotectedfolders.h
fsfloaterradar.h
@ -949,6 +950,7 @@ set(viewer_HEADER_FILES
fsfloatervramusage.h
fsfloaterwearablefavorites.h
fsfloaterwhitelisthelper.h
fsjointpose.h
fsgridhandler.h
fskeywords.h
fslslbridge.h
@ -970,6 +972,8 @@ set(viewer_HEADER_FILES
fspanelradar.h
fsparticipantlist.h
fspose.h
fsposeranimator.h
fsposingmotion.h
fsradar.h
fsradarentry.h
fsradarlistctrl.h
@ -979,6 +983,7 @@ set(viewer_HEADER_FILES
fsscrolllistctrl.h
fsslurl.h
fsslurlcommand.h
fsvirtualtrackpad.h
fsworldmapmessage.h
lggbeamcolormapfloater.h
lggbeammapfloater.h

10
indra/newview/fsfloaterposer.cpp
View File

@ -156,16 +156,12 @@ bool FSFloaterPoser::postBuild()
mPosesScrollList->setCommitCallback([this](LLUICtrl *, const LLSD &) { onPoseFileSelect(); });
mToggleAdvancedPanelBtn = getChild<LLButton>("toggleAdvancedPanel");
if (gSavedSettings.getBOOL(POSER_ADVANCEDWINDOWSTATE_SAVE_KEY))
mToggleAdvancedPanelBtn->setValue(true);
mStopPosingOnCloseCbx = getChild<LLCheckBoxCtrl>("stop_posing_on_close_checkbox");
if (gSavedSettings.getBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY))
mStopPosingOnCloseCbx->set(true);
mResetBaseRotOnEditCbx = getChild<LLCheckBoxCtrl>("reset_base_rotation_on_edit_checkbox");
if (gSavedSettings.getBOOL(POSER_RESETBASEROTONEDIT_SAVE_KEY))
mResetBaseRotOnEditCbx->set(true);
mTrackpadSensitivitySlider = getChild<LLSliderCtrl>("trackpad_sensitivity_slider");
mTrackpadSensitivitySlider->setValue(gSavedSettings.getF32(POSER_TRACKPAD_SENSITIVITY_SAVE_KEY));
@ -236,12 +232,6 @@ void FSFloaterPoser::onClose(bool app_quitting)
if (mToggleAdvancedPanelBtn)
gSavedSettings.setBOOL(POSER_ADVANCEDWINDOWSTATE_SAVE_KEY, mToggleAdvancedPanelBtn->getValue().asBoolean());
if (mStopPosingOnCloseCbx)
gSavedSettings.setBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY, mStopPosingOnCloseCbx->getValue().asBoolean());
if (mResetBaseRotOnEditCbx)
gSavedSettings.setBOOL(POSER_RESETBASEROTONEDIT_SAVE_KEY, mResetBaseRotOnEditCbx->getValue().asBoolean());
if (gSavedSettings.getBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY))
stopPosingSelf();

2
indra/newview/fsjointpose.cpp
View File

@ -62,7 +62,7 @@ void FSJointPose::setRotationDelta(const LLQuaternion& rot)
mRotation = FSJointRotation(mRotation.baseRotation, rot);
}
void FSJointPose::setScaleDelta(LLVector3 scale)
void FSJointPose::setScaleDelta(const LLVector3& scale)
{
addToUndo(mScaleDelta, &mUndoneScaleIndex, &mLastSetScaleDeltas, &mTimeLastUpdatedScale);
mScaleDelta.set(scale);

13
indra/newview/fsjointpose.h
View File

@ -130,7 +130,7 @@ class FSJointPose
/// <summary>
/// Sets the scale the animator wishes the joint to have.
/// </summary>
void setScaleDelta(LLVector3 scale);
void setScaleDelta(const LLVector3& scale);
/// <summary>
/// Undoes the last scale set, if any.
@ -192,7 +192,7 @@ class FSJointPose
deltaRotation.set(delta);
}
FSJointRotation() {}
FSJointRotation() = default;
LLQuaternion baseRotation;
LLQuaternion deltaRotation;
@ -206,7 +206,7 @@ class FSJointPose
deltaRotation.mQ[VZ] *= -1;
}
void set(FSJointRotation jRot)
void set(const FSJointRotation& jRot)
{
baseRotation.set(jRot.baseRotation);
deltaRotation.set(jRot.deltaRotation);
@ -223,13 +223,6 @@ private:
/// </summary>
bool mIsCollisionVolume{ false };
/// <summary>
/// Whether this joint has been 'mirrored'.
/// For joints that have no opposite, mirrors the rotation.
/// For joints that do have an opposite, it indicates the rotation should be gotten from the opposite joint.
/// </summary>
bool mIsRotationMirrored{ false };
FSJointRotation mRotation;
std::deque<FSJointRotation> mLastSetRotationDeltas;
size_t mUndoneRotationIndex = 0;