diff --git a/Editor/src/Windows/EditorInterface.cpp b/Editor/src/Windows/EditorInterface.cpp index bb8afb2f..111074bb 100644 --- a/Editor/src/Windows/EditorInterface.cpp +++ b/Editor/src/Windows/EditorInterface.cpp @@ -251,7 +251,7 @@ namespace Nuake { ImGui::FocusWindow(ImGui::GetCurrentWindow()); const auto windowPosNuake = Vector2(windowPos.x, windowPos.y); - auto& gbuffer = Engine::GetCurrentScene()->mSceneRenderer->GetGBuffer(); + auto& gbuffer = Engine::GetCurrentScene()->m_SceneRenderer->GetGBuffer(); auto pixelPos = Input::GetMousePosition() - windowPosNuake; pixelPos.y = gbuffer.GetSize().y - pixelPos.y; // imgui coords are inverted on the Y axis @@ -847,7 +847,7 @@ namespace Nuake { ImGui::TableNextColumn(); - SSR* ssr = scene->mSceneRenderer->mSSR.get(); + SSR* ssr = scene->m_SceneRenderer->mSSR.get(); { // Title ImGui::Text("SSR RayStep"); diff --git a/Nuake/src/Scene/Scene.cpp b/Nuake/src/Scene/Scene.cpp index 11f5fd47..9a93ba75 100644 --- a/Nuake/src/Scene/Scene.cpp +++ b/Nuake/src/Scene/Scene.cpp @@ -46,8 +46,8 @@ namespace Nuake { m_Systems.push_back(CreateRef(this)); m_Systems.push_back(CreateRef(this)); - mSceneRenderer = new SceneRenderer(); - mSceneRenderer->Init(); + m_SceneRenderer = new SceneRenderer(); + m_SceneRenderer->Init(); } Scene::~Scene() @@ -75,9 +75,9 @@ namespace Nuake { Entity Scene::GetEntityByID(int id) { - if (_EntitiesIDMap.find(id) != _EntitiesIDMap.end()) + if (m_EntitiesIDMap.find(id) != m_EntitiesIDMap.end()) { - return _EntitiesIDMap[id]; + return m_EntitiesIDMap[id]; } auto idView = m_Registry.view(); @@ -87,7 +87,7 @@ namespace Nuake { if (nameC.ID == id) { auto newEntity = Entity{ e, this }; - _EntitiesIDMap[id] = newEntity; + m_EntitiesIDMap[id] = newEntity; return newEntity; } } @@ -158,14 +158,14 @@ namespace Nuake { return; } - mSceneRenderer->BeginRenderScene(cam->GetPerspective(), cam->GetTransform(), cam->Translation); - mSceneRenderer->RenderScene(*this, framebuffer); + m_SceneRenderer->BeginRenderScene(cam->GetPerspective(), cam->GetTransform(), cam->Translation); + m_SceneRenderer->RenderScene(*this, framebuffer); } void Scene::Draw(FrameBuffer& framebuffer, const Matrix4& projection, const Matrix4& view) { - mSceneRenderer->BeginRenderScene(m_EditorCamera->GetPerspective(), m_EditorCamera->GetTransform(), m_EditorCamera->Translation); - mSceneRenderer->RenderScene(*this, framebuffer); + m_SceneRenderer->BeginRenderScene(m_EditorCamera->GetPerspective(), m_EditorCamera->GetTransform(), m_EditorCamera->Translation); + m_SceneRenderer->RenderScene(*this, framebuffer); } std::vector Scene::GetAllEntities() @@ -251,7 +251,7 @@ namespace Nuake { nameComponent.Name = entityName; nameComponent.ID = id; - _EntitiesIDMap[id] = entity; + m_EntitiesIDMap[id] = entity; Logger::Log("Entity created with name: " + nameComponent.Name, "scene", LOG_TYPE::VERBOSE); return entity; diff --git a/Nuake/src/Scene/Scene.h b/Nuake/src/Scene/Scene.h index 34fe17db..75c7a325 100644 --- a/Nuake/src/Scene/Scene.h +++ b/Nuake/src/Scene/Scene.h @@ -37,10 +37,10 @@ namespace Nuake public: Ref m_EditorCamera; entt::registry m_Registry; - std::map _EntitiesIDMap; + std::map m_EntitiesIDMap; std::string Path = ""; - SceneRenderer* mSceneRenderer; + SceneRenderer* m_SceneRenderer; static Ref New(); Scene();