Merge pull request #196 from ucsd-cse125-sp24/fix/animation-speed

Scale animation speed off frame rate + fix player y positioning

include/client/client.hpp

@@ -343,6 +343,8 @@ class Client {
     float mouse_xpos = 0.0f;
     float mouse_ypos = 0.0f;
 
+    double lastTime = 0.0;
+
     GameConfig config;
     tcp::resolver resolver;
     tcp::socket socket;

src/client/client.cpp

@@ -666,6 +666,10 @@ void Client::geometryPass() {
     bool is_dm = this->session->getInfo().is_dungeon_master.value();
     glm::vec3 my_pos = this->gameState.objects[eid]->physics.corner;
 
+    double currentTime = glfwGetTime();
+    double timeElapsed = currentTime - lastTime;
+    lastTime = currentTime;
+
     // draw all objects to g-buffer
     for (auto& [id, sharedObject] : this->gameState.objects) {
         if (!sharedObject.has_value()) {
@@ -693,6 +697,7 @@ void Client::geometryPass() {
                     //  TODO: Update the player eye level to an acceptable level
 
                     glm::vec3 pos = sharedObject->physics.getCenterPosition();
+                    pos.y -= (sharedObject->physics.dimensions.y / 2.0f);
                     pos.y += PLAYER_EYE_LEVEL;
                     cam->updatePos(pos);
 
@@ -714,7 +719,7 @@ void Client::geometryPass() {
                 animManager->setAnimation(sharedObject->globalID, sharedObject->type, sharedObject->animState);
 
                 /* Update model animation */
-                animManager->updateAnimation(0.025f);
+                animManager->updateAnimation(timeElapsed);
                 auto transforms = animManager->getFinalBoneMatrices();
 
                 for (int i = 0; i < (transforms.size() < 100 ? transforms.size() : 100); ++i) {
@@ -724,6 +729,8 @@ void Client::geometryPass() {
                 if (!sharedObject->playerInfo->render) { break; } // dont render while invisible
 
                 auto player_pos = sharedObject->physics.getCenterPosition();
+                player_pos.y -= (sharedObject->physics.dimensions.y / 2.0f);
+
                 auto player_dir = sharedObject->physics.facing;
 
                 if (player_dir == glm::vec3(0.0f)) {