SHADE_Engine/src/Scene/SHSceneGraph.cpp

@@ -186,6 +186,27 @@ namespace SHADE
     return NODE_ITER->second->GetChildren();
   }
 
+  bool SHSceneGraph::IsActive(EntityID entityID) const noexcept
+  {
+    ////////////////////////////////////////
+    // Error handling
+    if (!SHEntityManager::IsValidEID(entityID))
+    {
+      SHLOG_ERROR("Entity {} is invalid!", entityID)
+      return false;
+    }
+
+    const auto NODE_ITER = entityNodeMap.find(entityID);
+    if (NODE_ITER == entityNodeMap.end())
+    {
+      SHLOG_ERROR("Entity {} cannot be found in the scene!", entityID)
+      return false;
+    }
+    ////////////////////////////////////////
+
+    return NODE_ITER->second->IsActive();
+  }
+
   bool SHSceneGraph::IsActiveInHierarchy(EntityID entityID) const noexcept
   {
     ////////////////////////////////////////
@@ -204,24 +225,7 @@ namespace SHADE
     }
     ////////////////////////////////////////
 
-    // Recurse up the tree until the root. If any parent is inactive, this node is inactive in the hierarchy.
+    return NODE_ITER->second->IsActiveInHierarchy();
-    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;
   }
 
   /*-----------------------------------------------------------------------------------*/

SHADE_Engine/src/Scene/SHSceneGraph.h

@@ -58,6 +58,7 @@ namespace SHADE
     [[nodiscard]] SHSceneNode*                      GetChild            (EntityID entityID, EntityID childEntityID)   const noexcept;
     [[nodiscard]] const std::vector<SHSceneNode*>&  GetChildren         (EntityID entityID)                           const noexcept;
 
+    [[nodiscard]] bool                              IsActive            (EntityID entityID)                           const noexcept;
     [[nodiscard]] bool                              IsActiveInHierarchy (EntityID entityID)                           const noexcept;
 
     /*---------------------------------------------------------------------------------*/

SHADE_Engine/src/Scene/SHSceneNode.cpp

@@ -24,6 +24,7 @@ namespace SHADE
 
   SHSceneNode::SHSceneNode(EntityID eid, SHSceneNode* parent) noexcept
   : active              { true }
+  , isActiveInHierarchy { true }
   , entityID            { eid }
   , parent              { parent }
   {}
@@ -31,6 +32,7 @@ namespace SHADE
 
   SHSceneNode::SHSceneNode(const SHSceneNode& rhs) noexcept
   : active              { rhs.active }
+  , isActiveInHierarchy { rhs.isActiveInHierarchy }
   , entityID            { rhs.entityID }
   , parent              { rhs.parent }
   {
@@ -39,6 +41,7 @@ namespace SHADE
 
   SHSceneNode::SHSceneNode(SHSceneNode&& rhs) noexcept
   : active              { rhs.active }
+  , isActiveInHierarchy { rhs.isActiveInHierarchy }
   , entityID            { rhs.entityID }
   , parent              { rhs.parent }
   {
@@ -51,6 +54,7 @@ namespace SHADE
       return *this;
 
     active              = rhs.active;
+    isActiveInHierarchy = rhs.isActiveInHierarchy;
     entityID            = rhs.entityID;
     parent              = rhs.parent;
 
@@ -63,6 +67,7 @@ namespace SHADE
   SHSceneNode& SHSceneNode::operator=(SHSceneNode&& rhs) noexcept
   {
     active              = rhs.active;
+    isActiveInHierarchy = rhs.isActiveInHierarchy;
     entityID            = rhs.entityID;
     parent              = rhs.parent;
 
@@ -81,6 +86,11 @@ namespace SHADE
     return active;
   }
 
+  bool SHSceneNode::IsActiveInHierarchy() const noexcept
+  {
+    return isActiveInHierarchy;
+  }
+
   EntityID SHSceneNode::GetEntityID() const noexcept
   {
     return entityID;
@@ -133,6 +143,26 @@ namespace SHADE
   void SHSceneNode::SetActive(bool newActiveState) noexcept
   {
     active              = newActiveState;
+    isActiveInHierarchy = newActiveState;
+
+    // Recurse down the children to set the active in hierarchy state
+    recursiveSetActiveInHierarchy(active, children);
+  }
+
+  /*-----------------------------------------------------------------------------------*/
+  /* Private Member Function Definitions                                               */
+  /*-----------------------------------------------------------------------------------*/
+
+  void SHSceneNode::recursiveSetActiveInHierarchy(bool activeInHierarchy, const std::vector<SHSceneNode*>& childrenToSet) noexcept
+  {
+    if (childrenToSet.empty())
+      return;
+
+    for (auto* child : childrenToSet)
+    {
+      child->isActiveInHierarchy = activeInHierarchy;
+      recursiveSetActiveInHierarchy(activeInHierarchy, child->children);
+    }
   }
 
 } // namespace SHADE

SHADE_Engine/src/Scene/SHSceneNode.h

@@ -43,7 +43,7 @@ namespace SHADE
     /* Constructors & Destructor                                                       */
     /*---------------------------------------------------------------------------------*/
 
-    ~SHSceneNode            () = default;
+    ~SHSceneNode            () noexcept = default;
 
     SHSceneNode             (EntityID eid, SHSceneNode* parent = nullptr) noexcept;
     SHSceneNode             (const SHSceneNode& rhs)                      noexcept;
@@ -56,6 +56,7 @@ namespace SHADE
     /*---------------------------------------------------------------------------------*/
 
     [[nodiscard]] bool                              IsActive            ()                  const noexcept;
+    [[nodiscard]] bool                              IsActiveInHierarchy ()                  const noexcept;
     [[nodiscard]] EntityID                          GetEntityID         ()                  const noexcept;
     [[nodiscard]] SHSceneNode*                      GetParent           ()                  const noexcept;
     [[nodiscard]] const std::vector<SHSceneNode*>&  GetChildren         ()                  const noexcept;
@@ -74,9 +75,16 @@ namespace SHADE
     /*---------------------------------------------------------------------------------*/
 
     bool                      active;
+    bool                      isActiveInHierarchy;
     EntityID                  entityID;
     SHSceneNode*              parent;
     std::vector<SHSceneNode*> children;
+
+    /*---------------------------------------------------------------------------------*/
+    /* Member Functions                                                                */
+    /*---------------------------------------------------------------------------------*/
+
+    static void recursiveSetActiveInHierarchy(bool activeInHierarchy, const std::vector<SHSceneNode*>& childrenToSet) noexcept;
   };
 } // namespace SHADE