This commit is contained in:
viktorljung
2016-02-02 14:52:31 +01:00
parent 6ba87d2942
commit dba2fbdc0c
11 changed files with 842 additions and 112 deletions
+4 -4
View File
@@ -97,18 +97,18 @@ void PlayerMovementSystem::Update(double dt)
float movementLength = glm::length(groundVelocity);
if (glm::length(controller->Movement()) > 0.f) {
if (controller->Crouching()) {
cAnimation["Name"] = "Crouch Walk";
cAnimation["AnimationName"] = "Crouch Walk";
(double&)cAnimation["Speed"] = 1.f * -glm::sign(controller->Movement().z);
} else {
cAnimation["Name"] = "Run";
cAnimation["AnimationName"] = "Run";
(double&)cAnimation["Speed"] = 2.f * -glm::sign(controller->Movement().z);
}
} else {
if (controller->Crouching()) {
cAnimation["Name"] = "Crouch";
cAnimation["AnimationName"] = "Crouch";
(double&)cAnimation["Speed"] = 1.f;
} else {
cAnimation["Name"] = "Hold Pos";
cAnimation["AnimationName"] = "Hold Pos";
(double&)cAnimation["Speed"] = 1.f;
}
}