Skip to content
Snippets Groups Projects
Commit 3b612cd3 authored by Aimee Linden's avatar Aimee Linden
Browse files

VWR-7054 FIXED Flycam movement in build mode is reduced.

Removed hard coded scaling of movements when in build mode, made it a debug setting defaulted to 1 to disable it.
parent 3fca4b0d
No related branches found
No related tags found
No related merge requests found
......@@ -3309,6 +3309,17 @@
<key>Value</key>
<real>1.0</real>
</map>
<key>FlycamBuildModeScale</key>
<map>
<key>Comment</key>
<string>Scale factor to apply to flycam movements when in build mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
</map>
<key>FlycamFeathering</key>
<map>
<key>Comment</key>
......
......@@ -57,9 +57,6 @@
#define RY_I 5
#define RZ_I 3
// flycam translations in build mode should be reduced
const F32 BUILDMODE_FLYCAM_T_SCALE = 3.f;
// minimum time after setting away state before coming back
const F32 MIN_AFK_TIME = 2.f;
......@@ -924,14 +921,15 @@ void LLViewerJoystick::moveFlycam(bool reset)
cur_delta[i] = llmin(cur_delta[i]+dead_zone[i], 0.f);
}
// we need smaller camera movements in build mode
// We may want to scale camera movements up or down in build mode.
// NOTE: this needs to remain after the deadzone calculation, otherwise
// we have issues with flycam "jumping" when the build dialog is opened/closed -Nyx
if (in_build_mode)
{
if (i == X_I || i == Y_I || i == Z_I)
{
cur_delta[i] /= BUILDMODE_FLYCAM_T_SCALE;
static LLCachedControl<F32> build_mode_scale(gSavedSettings,"FlycamBuildModeScale");
cur_delta[i] *= build_mode_scale;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment