#5893: Handle visibiltiy of attached entities. Move show/hide functio…

…ns to scenelib.h
codereader · Feb 12, 2022 · d7e9a56 · d7e9a56
1 parent 42abd0b
commit d7e9a56
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 52 deletions.
diff --git a/libs/scenelib.h b/libs/scenelib.h
@@ -235,6 +235,55 @@ inline bool Node_hasSelectedChildNodes(const scene::INodePtr& node)
 namespace scene
 {
 
+inline void setNodeHidden(const INodePtr& node, bool hide)
+{
+    if (!node->supportsStateFlag(Node::eHidden))
+    {
+        return;
+    }
+
+    if (hide)
+    {
+        node->enable(Node::eHidden);
+    }
+    else
+    {
+        node->disable(Node::eHidden);
+    }
+}
+
+inline void showNode(const INodePtr& node)
+{
+    setNodeHidden(node, false);
+}
+
+inline void showSubgraph(const INodePtr& node)
+{
+    showNode(node);
+
+    node->foreachNode([&](const INodePtr& child)
+    {
+        showNode(child);
+        return true;
+    });
+}
+
+inline void hideNode(const INodePtr& node)
+{
+    setNodeHidden(node, true);
+}
+
+inline void hideSubgraph(const INodePtr& node)
+{
+    hideNode(node);
+
+    node->foreachNode([&](const INodePtr& child)
+    {
+        hideNode(child);
+        return true;
+    });
+}
+
 /**
  * greebo: This walker removes all encountered child nodes without
  * traversing each node's children. This deselects all removed nodes as well.

diff --git a/radiantcore/entity/EntityNode.cpp b/radiantcore/entity/EntityNode.cpp
@@ -317,6 +317,11 @@ void EntityNode::onInsertIntoScene(scene::IMapRootNode& root)
 
     attachToRenderSystem();
 
+    for (const auto& attachment : _attachedEnts)
+    {
+        attachment->onInsertIntoScene(root);
+    }
+
 	SelectableNode::onInsertIntoScene(root);
     TargetableNode::onInsertIntoScene(root);
 }
@@ -328,6 +333,11 @@ void EntityNode::onRemoveFromScene(scene::IMapRootNode& root)
 
     detachFromRenderSystem();
 
+    for (const auto& attachment : _attachedEnts)
+    {
+        attachment->onRemoveFromScene(root);
+    }
+
 	_modelKey.disconnectUndoSystem(root.getUndoSystem());
 	_spawnArgs.disconnectUndoSystem(root.getUndoSystem());
 
@@ -451,6 +461,23 @@ std::size_t EntityNode::getHighlightFlags()
 	return isGroupMember() ? (Highlight::Selected | Highlight::GroupMember) : Highlight::Selected;
 }
 
+void EntityNode::onVisibilityChanged(bool isVisibleNow)
+{
+    SelectableNode::onVisibilityChanged(isVisibleNow);
+
+    for (const auto& node : _attachedEnts)
+    {
+        if (isVisibleNow)
+        {
+            scene::showSubgraph(node);
+        }
+        else
+        {
+            scene::hideSubgraph(node);
+        }
+    }
+}
+
 ModelKey& EntityNode::getModelKey()
 {
 	return _modelKey;

diff --git a/radiantcore/entity/EntityNode.h b/radiantcore/entity/EntityNode.h
@@ -190,6 +190,8 @@ class EntityNode :
     // Optional implementation: gets invoked by the EntityModule when the settings are changing
     virtual void onEntitySettingsChanged();
 
+    void onVisibilityChanged(bool isVisibleNow) override;
+
     // Returns the current world origin of this entity (also up to date during transformations)
     virtual const Vector3& getWorldPosition() const = 0;
 

diff --git a/radiantcore/selection/algorithm/General.cpp b/radiantcore/selection/algorithm/General.cpp
@@ -170,64 +170,15 @@ void selectAllOfType(const cmd::ArgumentList& args)
 	SceneChangeNotify();
 }
 
-class HideSubgraphWalker :
-	public scene::NodeVisitor
-{
-public:
-	bool pre(const scene::INodePtr& node)
-	{
-        if (node->supportsStateFlag(scene::Node::eHidden))
-        {
-		    node->enable(scene::Node::eHidden);
-        }
-
-		return true;
-	}
-};
-
-class ShowSubgraphWalker :
-	public scene::NodeVisitor
-{
-public:
-	bool pre(const scene::INodePtr& node)
-	{
-        if (node->supportsStateFlag(scene::Node::eHidden))
-        {
-            node->disable(scene::Node::eHidden);
-        }
-
-		return true;
-	}
-};
-
 inline void hideSubgraph(const scene::INodePtr& node, bool hide)
 {
 	if (hide)
 	{
-		HideSubgraphWalker walker;
-		node->traverse(walker);
-	}
-	else
-	{
-		ShowSubgraphWalker walker;
-		node->traverse(walker);
-	}
-}
-
-inline void hideNode(const scene::INodePtr& node, bool hide)
-{
-    if (!node->supportsStateFlag(scene::Node::eHidden))
-    {
-        return;
-    }
-
-	if (hide)
-	{
-		node->enable(scene::Node::eHidden);
+        scene::hideSubgraph(node);
 	}
 	else
 	{
-		node->disable(scene::Node::eHidden);
+        scene::showSubgraph(node);
 	}
 }
 
@@ -332,7 +283,7 @@ class HideAllWalker :
 	{}
 
 	bool pre(const scene::INodePtr& node) {
-		hideNode(node, _hide);
+		scene::setNodeHidden(node, _hide);
 		return true;
 	}
 };