From fa4b3c18d2d5f876d2a916c65f08581ba16dfeb0 Mon Sep 17 00:00:00 2001 From: sorket Date: Sat, 15 Jul 2023 21:14:57 -0400 Subject: [PATCH] Fix the atrocious merge issues and minor typo --- .../Engine/Source/App/V8/DataModel/Workspace.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Projects/Engine/Source/App/V8/DataModel/Workspace.cpp b/Projects/Engine/Source/App/V8/DataModel/Workspace.cpp index 5c4cd6b..f785ae8 100644 --- a/Projects/Engine/Source/App/V8/DataModel/Workspace.cpp +++ b/Projects/Engine/Source/App/V8/DataModel/Workspace.cpp @@ -58,8 +58,24 @@ namespace RNR { m_objects.erase(child_it); } + } delete child_ent; } } + + Camera* Workspace::getCurrentCamera() const + { + return currentCamera.get(); + } + + void Workspace::setCurrentCamera(Camera *newCamera) + { + if (newCamera != currentCamera.get()) + { + currentCamera = boost::shared_ptr(newCamera); + + // TODO: raise propertyChanged and currentCameraChangedSignal + } + } } \ No newline at end of file