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

Editor no longer resets camera

Browse Source
This commit is contained in:
sippeangelo
2016-03-14 04:02:05 +01:00
parent e3767996a1
commit 24de85b476
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Editor/EditorSystem.cpp
+8 -3
View File
@@ -86,8 +86,13 @@ void EditorSystem::Update(double dt)
ComponentWrapper& cameraTransform = m_EditorCamera["Transform"]; ComponentWrapper& cameraTransform = m_EditorCamera["Transform"];
Field<glm::vec3> ori = cameraTransform["Orientation"]; Field<glm::vec3> ori = cameraTransform["Orientation"];
ori.x(m_EditorCameraInputController->Rotation().x); glm::vec3 newOri;
ori.y(m_EditorCameraInputController->Rotation().y); 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<glm::vec3> pos = cameraTransform["Position"]; Field<glm::vec3> pos = cameraTransform["Position"];
pos += m_EditorCameraInputController->Movement() * glm::inverse(glm::quat(ori)) * (float)actualDelta; pos += m_EditorCameraInputController->Movement() * glm::inverse(glm::quat(ori)) * (float)actualDelta;
} }
@@ -121,7 +126,7 @@ void EditorSystem::Disable()
m_EventBroker->Publish(Events::LockMouse()); m_EventBroker->Publish(Events::LockMouse());
Events::SetCamera e; Events::SetCamera e;
e.CameraEntity = m_ActualCamera; e.CameraEntity = m_ActualCamera;
m_EventBroker->Publish(e); //m_EventBroker->Publish(e);
m_Enabled = false; m_Enabled = false;
} }