From 807ad54d7dc97c46e4b96e06320946ea77518847 Mon Sep 17 00:00:00 2001 From: Diren D Bharwani Date: Tue, 22 Nov 2022 21:31:37 +0800 Subject: [PATCH 1/2] Fixed Scene Node SetActive & SceneGraph CheckActiveInHierarchy --- SHADE_Engine/src/Scene/SHSceneGraph.cpp | 19 ++++++++++++++++++- SHADE_Engine/src/Scene/SHSceneNode.cpp | 5 ----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/SHADE_Engine/src/Scene/SHSceneGraph.cpp b/SHADE_Engine/src/Scene/SHSceneGraph.cpp index 6240b7bf..5e9f331d 100644 --- a/SHADE_Engine/src/Scene/SHSceneGraph.cpp +++ b/SHADE_Engine/src/Scene/SHSceneGraph.cpp @@ -204,7 +204,24 @@ namespace SHADE } //////////////////////////////////////// - return NODE_ITER->second->IsActive(); + // Recurse up the tree until the root. If any parent is inactive, this node is inactive in the hierarchy. + const SHSceneNode* PARENT_NODE = NODE_ITER->second->parent; + + while (PARENT_NODE->GetEntityID() != root->GetEntityID()) + { + if (!PARENT_NODE->IsActive()) + return false; + + if (!PARENT_NODE->parent) + { + SHLOGV_ERROR("Entity {}'s node that is not the root has no parent!", PARENT_NODE->GetEntityID()) + return false; + } + + PARENT_NODE = PARENT_NODE->parent; + } + + return true; } /*-----------------------------------------------------------------------------------*/ diff --git a/SHADE_Engine/src/Scene/SHSceneNode.cpp b/SHADE_Engine/src/Scene/SHSceneNode.cpp index 8dac20bd..28f47989 100644 --- a/SHADE_Engine/src/Scene/SHSceneNode.cpp +++ b/SHADE_Engine/src/Scene/SHSceneNode.cpp @@ -133,11 +133,6 @@ namespace SHADE void SHSceneNode::SetActive(bool newActiveState) noexcept { active = newActiveState; - - for (auto* child : children) - { - child->SetActive(newActiveState); - } } } // namespace SHADE \ No newline at end of file -- 2.40.1 From 4f1007e6be932430cc4e14efe0cdad418511a416 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Tue, 6 Dec 2022 13:09:47 +0800 Subject: [PATCH 2/2] Added scene init exit events --- SHADE_Engine/src/Events/SHEventDefines.h | 4 +++ SHADE_Engine/src/Scene/SHSceneEvents.h | 7 +++++ SHADE_Engine/src/Scene/SHSceneManager.cpp | 31 ++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/SHADE_Engine/src/Events/SHEventDefines.h b/SHADE_Engine/src/Events/SHEventDefines.h index d7bbf5f0..bdc4c505 100644 --- a/SHADE_Engine/src/Events/SHEventDefines.h +++ b/SHADE_Engine/src/Events/SHEventDefines.h @@ -18,4 +18,8 @@ constexpr SHEventIdentifier SH_PHYSICS_COLLIDER_REMOVED_EVENT { 9 }; constexpr SHEventIdentifier SH_EDITOR_ON_PLAY_EVENT { 10 }; constexpr SHEventIdentifier SH_EDITOR_ON_PAUSE_EVENT { 11 }; constexpr SHEventIdentifier SH_EDITOR_ON_STOP_EVENT { 12 }; +constexpr SHEventIdentifier SH_SCENE_INIT_PRE { 13 }; +constexpr SHEventIdentifier SH_SCENE_INIT_POST { 14 }; +constexpr SHEventIdentifier SH_SCENE_EXIT_PRE { 15 }; +constexpr SHEventIdentifier SH_SCENE_EXIT_POST { 16 }; diff --git a/SHADE_Engine/src/Scene/SHSceneEvents.h b/SHADE_Engine/src/Scene/SHSceneEvents.h index c0d7dbc1..5b4fded9 100644 --- a/SHADE_Engine/src/Scene/SHSceneEvents.h +++ b/SHADE_Engine/src/Scene/SHSceneEvents.h @@ -12,6 +12,7 @@ // Project Headers #include "SHSceneNode.h" +#include "Assets/SHAssetMacros.h" namespace SHADE { @@ -38,4 +39,10 @@ namespace SHADE SHSceneNode* childRemoved = nullptr; }; + + struct SHSceneInitExitEvent + { + AssetID sceneAssetID; + }; + } // namespace SHADE \ No newline at end of file diff --git a/SHADE_Engine/src/Scene/SHSceneManager.cpp b/SHADE_Engine/src/Scene/SHSceneManager.cpp index 110aaea6..3614fa52 100644 --- a/SHADE_Engine/src/Scene/SHSceneManager.cpp +++ b/SHADE_Engine/src/Scene/SHSceneManager.cpp @@ -15,6 +15,8 @@ //#include "Rendering/Window/SHRenderingWindow.h" #include "ECS_Base/Managers/SHEntityManager.h" #include "ECS_Base/Managers/SHSystemManager.h" +#include "SHSceneEvents.h" +#include "Events/SHEventManager.hpp" //#include "FRC/SHFrameRateController.h" //#include "ECS_Base/System/SHApplication.h" @@ -54,9 +56,15 @@ namespace SHADE { if (currentScene) { + SHSceneInitExitEvent exitEvent; + exitEvent.sceneAssetID = currentScene->sceneAssetID; + SHEventManager::BroadcastEvent(exitEvent, SH_SCENE_EXIT_PRE); + currentScene->Free(); currentScene->Unload(); SHEntityManager::DestroyAllEntity(); + + SHEventManager::BroadcastEvent(exitEvent, SH_SCENE_EXIT_POST); delete currentScene; } @@ -82,27 +90,48 @@ namespace SHADE nextSceneID = UINT32_MAX; if (currentScene != nullptr) { + currentScene->Load(); + + SHSceneInitExitEvent initEvent; + initEvent.sceneAssetID = currentScene->sceneAssetID; + + SHEventManager::BroadcastEvent(initEvent, SH_SCENE_INIT_PRE); currentScene->Init(); + SHEventManager::BroadcastEvent(initEvent, SH_SCENE_INIT_POST); } } else // restarting scene { nextSceneID = UINT32_MAX; + SHSceneInitExitEvent exitEvent; + exitEvent.sceneAssetID = currentScene->sceneAssetID; + SHEventManager::BroadcastEvent(exitEvent, SH_SCENE_EXIT_PRE); + currentScene->Free(); if (cleanReload == true) { cleanReload = false; currentScene->Unload(); SHEntityManager::DestroyAllEntity(); + SHEventManager::BroadcastEvent(exitEvent, SH_SCENE_EXIT_POST); currentScene->sceneName = newSceneName; currentScene->Load(); } - else + else + { + SHEntityManager::DestroyAllEntity(); + SHEventManager::BroadcastEvent(exitEvent, SH_SCENE_EXIT_POST); + } + + SHSceneInitExitEvent initEvent; + initEvent.sceneAssetID = currentScene->sceneAssetID; + SHEventManager::BroadcastEvent(initEvent, SH_SCENE_INIT_PRE); currentScene->Init(); + SHEventManager::BroadcastEvent(initEvent, SH_SCENE_INIT_POST); } } -- 2.40.1