From 24de85b476f7c8fd75b6349cd55207765c85104a Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Mar 2016 04:02:05 +0100 Subject: [PATCH] Editor no longer resets camera --- src/Engine/Editor/EditorSystem.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index e3b47036..27576d5d 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -86,8 +86,13 @@ void EditorSystem::Update(double dt) ComponentWrapper& cameraTransform = m_EditorCamera["Transform"]; Field ori = cameraTransform["Orientation"]; - ori.x(m_EditorCameraInputController->Rotation().x); - ori.y(m_EditorCameraInputController->Rotation().y); + glm::vec3 newOri; + newOri.x = glm::mix(ori.x(), m_EditorCameraInputController->Rotation().x, 0.05f); + newOri.y = glm::mix(ori.y(), m_EditorCameraInputController->Rotation().y, 0.05f); + //ori.x(m_EditorCameraInputController->Rotation().x); + //ori.y(m_EditorCameraInputController->Rotation().y); + ori.x(newOri.x); + ori.y(newOri.y); Field pos = cameraTransform["Position"]; pos += m_EditorCameraInputController->Movement() * glm::inverse(glm::quat(ori)) * (float)actualDelta; } @@ -121,7 +126,7 @@ void EditorSystem::Disable() m_EventBroker->Publish(Events::LockMouse()); Events::SetCamera e; e.CameraEntity = m_ActualCamera; - m_EventBroker->Publish(e); + //m_EventBroker->Publish(e); m_Enabled = false; }