s452622/GRK-Projekt
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fish #9

Merged
s452667 merged 10 commits from fish into master 2022-01-08 14:22:36 +01:00
Conversation 0 Commits 10 Files Changed 53 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 960a6ef21d - Show all commits

2
grafika_projekt/src/main.cpp
View File

@ -236,7 +236,7 @@ glm::mat4 animationMatrix(float time, glm::vec3 change) {
auto animationRotation = glm::squad(keyRotation[index % rotationSize], keyRotation[(index + 1) % rotationSize], a1, a2, t); auto animationRotation = glm::squad(keyRotation[index % rotationSize], keyRotation[(index + 1) % rotationSize], a1, a2, t);
glm::mat4 result = glm::translate(pos) * glm::mat4_cast(animationRotation); glm::mat4 result = glm::translate(pos) * glm::scale(glm::vec3(0.25f)) * glm::mat4_cast(animationRotation);
return result; return result;
} }