From 6051a865578f08e65e058478a6cc7fedb5aefb7b Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 3 Jan 2014 14:08:55 -0500
Subject: [PATCH] STORM-1980 Small optimization and tweaks of shaking constants
---
indra/newview/llfloaterregionrestarting.cpp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/indra/newview/llfloaterregionrestarting.cpp b/indra/newview/llfloaterregionrestarting.cpp
index 111daf93ebc..b793d259cd7 100644
--- a/indra/newview/llfloaterregionrestarting.cpp
+++ b/indra/newview/llfloaterregionrestarting.cpp
@@ -100,8 +100,9 @@ void LLFloaterRegionRestarting::draw()
{
LLFloater::draw();
- const F32 SHAKE_INTERVAL = 0.05;
+ const F32 SHAKE_INTERVAL = 0.03;
const U32 SHAKE_ITERATIONS = 4;
+ const F32 SHAKE_AMOUNT = 1.5;
if(SHAKE_START == sShakeState)
{
@@ -117,26 +118,22 @@ void LLFloaterRegionRestarting::draw()
switch(sShakeState)
{
case SHAKE_LEFT:
- gAgentCamera.setPanLeftKey(1.0);
- gAgentCamera.setPanLeftKey(1.0);
+ gAgentCamera.setPanLeftKey(SHAKE_AMOUNT);
sShakeState = SHAKE_UP;
break;
case SHAKE_UP:
- gAgentCamera.setPanUpKey(1.0);
- gAgentCamera.setPanUpKey(1.0);
+ gAgentCamera.setPanUpKey(SHAKE_AMOUNT);
sShakeState = SHAKE_RIGHT;
break;
case SHAKE_RIGHT:
- gAgentCamera.setPanRightKey(1.0);
- gAgentCamera.setPanRightKey(1.0);
+ gAgentCamera.setPanRightKey(SHAKE_AMOUNT);
sShakeState = SHAKE_DOWN;
break;
case SHAKE_DOWN:
- gAgentCamera.setPanDownKey(1.0);
- gAgentCamera.setPanDownKey(1.0);
+ gAgentCamera.setPanDownKey(SHAKE_AMOUNT);
mIterations = mIterations + 1;
if(SHAKE_ITERATIONS == mIterations)
{
--
GitLab