From a0e7bb078afe73c1344f8bf4c796791bdbd92777 Mon Sep 17 00:00:00 2001 From: floralrainfall Date: Tue, 18 Jul 2023 23:18:47 -0400 Subject: [PATCH] insert camera on rnr start --- Projects/Engine/Source/App/V8/DataModel/Camera.cpp | 1 + Projects/Engine/Source/App/V8/World/World.cpp | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Projects/Engine/Source/App/V8/DataModel/Camera.cpp b/Projects/Engine/Source/App/V8/DataModel/Camera.cpp index 6953914..a774847 100644 --- a/Projects/Engine/Source/App/V8/DataModel/Camera.cpp +++ b/Projects/Engine/Source/App/V8/DataModel/Camera.cpp @@ -7,6 +7,7 @@ namespace RNR { m_cf_yaw = 0.f; m_cf_pitch = 0.f; + setName("Camera"); } Camera::~Camera() diff --git a/Projects/Engine/Source/App/V8/World/World.cpp b/Projects/Engine/Source/App/V8/World/World.cpp index 0da93d1..e625958 100644 --- a/Projects/Engine/Source/App/V8/World/World.cpp +++ b/Projects/Engine/Source/App/V8/World/World.cpp @@ -31,7 +31,9 @@ namespace RNR m_tmb = new TopMenuBar(); - + Camera* start_cam = new Camera(); + start_cam->setParent(m_workspace); + m_workspace->setCurrentCamera(start_cam); } World::~World() @@ -76,7 +78,15 @@ namespace RNR void World::load(char* path) { m_refs.clear(); - + + Camera* old_camera = m_workspace->getCurrentCamera(); + if(old_camera) + { + m_workspace->setCurrentCamera(0); + old_camera->setParent(NULL); + delete old_camera; + } + pugi::xml_document rbxl_doc; pugi::xml_parse_result result = rbxl_doc.load_file(path); if(result)