BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed camera rotation bug

Browse Source
This commit is contained in:
viktorljung
2015-12-17 11:13:34 +01:00
parent fa66e9ff47
commit 0f1b06f74e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: 008f727821...6b5749627c
deps
+1 -1
Submodule deps updated: f20b9cc13b...1ae6ba5b12
include/Engine/Rendering/RenderSystem.cpp → src/Engine/Rendering/RenderSystem.cpp
+3 -3
View File
@@ -31,7 +31,7 @@ void RenderSystem::Initialize()
void RenderSystem::UpdateViewMatrix(ComponentWrapper& cameraTransform) void RenderSystem::UpdateViewMatrix(ComponentWrapper& cameraTransform)
{ {
glm::quat orientation = cameraTransform["Orientation"]; glm::quat orientation = glm::quat((glm::vec3)cameraTransform["Orientation"]);
glm::vec3 position = cameraTransform["Position"]; glm::vec3 position = cameraTransform["Position"];
m_ViewMatrix = glm::toMat4(glm::inverse(orientation)) * glm::translate(-position); m_ViewMatrix = glm::toMat4(glm::inverse(orientation)) * glm::translate(-position);
@@ -198,7 +198,7 @@ void RenderSystem::Update(World* world, double dt)
ComponentWrapper& cameraComponent = world->GetComponent(m_CurrentCamera, "Camera"); ComponentWrapper& cameraComponent = world->GetComponent(m_CurrentCamera, "Camera");
ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform"); ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform");
firstPersonInputController.SetOrientation((glm::quat)cameraTransform["Orientation"]); firstPersonInputController.SetOrientation(glm::quat((glm::vec3)cameraTransform["Orientation"]));
firstPersonInputController.SetPosition((glm::vec3)cameraTransform["Position"]); firstPersonInputController.SetPosition((glm::vec3)cameraTransform["Position"]);
} }
} }
@@ -209,7 +209,7 @@ void RenderSystem::Update(World* world, double dt)
ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform"); ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform");
firstPersonInputController.Update(dt); firstPersonInputController.Update(dt);
(glm::quat&)cameraTransform["Orientation"] = firstPersonInputController.Orientation(); (glm::vec3&)cameraTransform["Orientation"] = glm::eulerAngles(firstPersonInputController.Orientation());
(glm::vec3&)cameraTransform["Position"] = firstPersonInputController.Position(); (glm::vec3&)cameraTransform["Position"] = firstPersonInputController.Position();