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

Fixed camera view matrix.

Browse Source
This commit is contained in:
ViktorLjung
2014-04-24 19:49:14 +02:00
parent 6ccb196b3b
commit 613610d5b1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Camera.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ void Camera::UpdateProjectionMatrix()
void Camera::UpdateViewMatrix() void Camera::UpdateViewMatrix()
{ {
m_ViewMatrix = glm::translate(glm::toMat4(m_Orientation), -m_Position); m_ViewMatrix = glm::toMat4(glm::inverse(m_Orientation)) * glm::translate(-m_Position);
} }
void Camera::FOV(float val) void Camera::FOV(float val)
src/Systems/RenderSystem.cpp
+2 -2
View File
@@ -49,8 +49,8 @@ void Systems::RenderSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
auto cameraComponent = m_World->GetComponent<Components::Camera>(entity, "Camera"); auto cameraComponent = m_World->GetComponent<Components::Camera>(entity, "Camera");
if (cameraComponent != nullptr) if (cameraComponent != nullptr)
{ {
m_Renderer->GetCamera()->Position(transformComponent->Position); m_Renderer->GetCamera()->Position(m_TransformSystem->AbsolutePosition(entity));
m_Renderer->GetCamera()->Orientation(transformComponent->Orientation); m_Renderer->GetCamera()->Orientation(m_TransformSystem->AbsoluteOrientation(entity));
m_Renderer->GetCamera()->FOV(cameraComponent->FOV); m_Renderer->GetCamera()->FOV(cameraComponent->FOV);
m_Renderer->GetCamera()->NearClip(cameraComponent->NearClip); m_Renderer->GetCamera()->NearClip(cameraComponent->NearClip);