Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

MyAvatar: Removed unnecessary slot.

Browse source
This commit is contained in:
Anthony J. Thibault 2016-04-18 13:19:49 -07:00
parent f15bc7b99a
commit dc92ccc2b2
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/avatar/MyAvatar.cpp
View file

@ -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();
}

2
interface/src/avatar/MyAvatar.h
View file

@ -469,8 +469,6 @@ private:
float getEnergy();
void setEnergy(float value);
bool didTeleport();
private slots:
void onRigLoadComplete();
};
QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);