Moved SceneView childNodes to Set and added multiple nodes adding/r…

…emoving
SceneView · Nov 27, 2023 · 1804219 · 1804219
1 parent 7b6a6cd
commit 1804219
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 9 deletions.
diff --git a/arsceneview/src/main/java/io/github/sceneview/ar/ARScene.kt b/arsceneview/src/main/java/io/github/sceneview/ar/ARScene.kt
@@ -275,7 +275,7 @@ fun ARScene(
                 }
             },
             update = { sceneView ->
-                sceneView.childNodes = childNodes
+                sceneView.childNodes = childNodes.toSet()
                 sceneView.scene = scene
                 sceneView.setCameraNode(cameraNode)
                 sceneView.mainLightNode = mainLightNode

diff --git a/sceneview/src/main/java/io/github/sceneview/Scene.kt b/sceneview/src/main/java/io/github/sceneview/Scene.kt
@@ -48,7 +48,7 @@ fun Scene(
     /**
      * List of the scene's nodes that can be linked to a `mutableStateOf<List<Node>>()`
      */
-    childNodes: List<Node> = listOf(),
+    childNodes: List<Node> = rememberNodes(),
     /**
      * Provide your own instance if you want to share Filament resources between multiple views.
      */
@@ -191,7 +191,7 @@ fun Scene(
                 }
             },
             update = { sceneView ->
-                sceneView.childNodes = childNodes
+                sceneView.childNodes = childNodes.toSet()
                 sceneView.scene = scene
                 sceneView.setCameraNode(cameraNode)
                 sceneView.mainLightNode = mainLightNode

diff --git a/sceneview/src/main/java/io/github/sceneview/SceneView.kt b/sceneview/src/main/java/io/github/sceneview/SceneView.kt
@@ -296,16 +296,15 @@ open class SceneView @JvmOverloads constructor(
             skybox = value?.skybox
         }
 
-    var childNodes = listOf<Node>()
-        @Suppress("ConvertArgumentToSet")
+    var childNodes = setOf<Node>()
         set(value) {
             (field - value).forEach {
                 removeNode(it)
             }
             (value - field).forEach {
                 addNode(it)
             }
-            field = value.toList()
+            field = value
         }
 
     /**
@@ -459,7 +458,7 @@ open class SceneView @JvmOverloads constructor(
     }
 
     /**
-     * Add a node to the scene as a direct child.
+     * Add a node to the [Scene] as a direct child.
      *
      * If the node is already in the scene, no change is made.
      *
@@ -472,16 +471,47 @@ open class SceneView @JvmOverloads constructor(
     }
 
     /**
-     * Removes a node from the children of this NodeParent.
+     * Add multiple nodes to the [Scene] as a direct child.
+     *
+     * If the nodes are already in the scene, no change is made.
+     *
+     * @param nodes the nodes to add as children
+     * @throws IllegalArgumentException if the child is the same object as the parent, or if the
+     * parent is a descendant of the child
+     */
+    fun addChildNodes(nodes: List<Node>) {
+        childNodes = childNodes + nodes
+    }
+
+    /**
+     * Removes a node from the children of this [Scene].
      *
      * If the node is not in the scene, no change is made.
      *
-     * @param child the node to remove from the children
+     * @param node the node to remove from the children
      */
     fun removeChildNode(node: Node) {
         childNodes = childNodes - node
     }
 
+    /**
+     * Removes multiple nodes from the children of this [Scene].
+     *
+     * If the nodes are not in the scene, no change is made.
+     *
+     * @param nodes the nodes to remove from the children
+     */
+    fun removeChildNodes(nodes: List<Node>) {
+        childNodes = childNodes - nodes
+    }
+
+    /**
+     * Removes all nodes from the children of this [Scene].
+     */
+    fun clearChildNodes() {
+        childNodes = setOf()
+    }
+
     /**
      * Set the background to transparent.
      */