From dc92ccc2b235dfd32ddc1dc6fadfea1d7d0aef87 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 18 Apr 2016 13:19:49 -0700 Subject: [PATCH] MyAvatar: Removed unnecessary slot. --- interface/src/avatar/MyAvatar.cpp | 7 ++----- interface/src/avatar/MyAvatar.h | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index b8be9be3ba..01e1f2d71c 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -199,7 +199,7 @@ MyAvatar::MyAvatar(RigPointer rig) : } }); - connect(rig.get(), SIGNAL(onLoadComplete()), SLOT(onRigLoadComplete())); + connect(rig.get(), SIGNAL(onLoadComplete()), this, SIGNAL(onLoadComplete())); } MyAvatar::~MyAvatar() { @@ -1568,6 +1568,7 @@ glm::vec3 MyAvatar::applyKeyboardMotor(float deltaTime, const glm::vec3& localVe float speedIncreaseFactor = 1.8f; motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale , 0.0f, 1.0f) * speedIncreaseFactor; const float maxBoostSpeed = getUniformScale() * MAX_BOOST_SPEED; + if (motorSpeed < maxBoostSpeed) { // an active keyboard motor should never be slower than this float boostCoefficient = (maxBoostSpeed - motorSpeed) / maxBoostSpeed; @@ -2104,7 +2105,3 @@ bool MyAvatar::didTeleport() { lastPosition = pos; return (changeInPosition.length() > MAX_AVATAR_MOVEMENT_PER_FRAME); } - -void MyAvatar::onRigLoadComplete() { - emit onLoadComplete(); -} diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 697bc8c83d..c63d6f2c88 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -469,8 +469,6 @@ private: float getEnergy(); void setEnergy(float value); bool didTeleport(); -private slots: - void onRigLoadComplete(); }; QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);