Made materialInstance nullable

SceneView · Oct 30, 2023 · 66ad099 · 66ad099
1 parent 8dda173
commit 66ad099
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/sceneview/src/main/java/io/github/sceneview/node/CubeNode.kt b/sceneview/src/main/java/io/github/sceneview/node/CubeNode.kt
@@ -21,7 +21,7 @@ open class CubeNode(
      * Should return the material to bind for the zero-based index of the primitive, must be less
      * than the [Geometry.submeshes] size passed to constructor.
      */
-    materialInstances: (index: Int) -> MaterialInstance,
+    materialInstances: (index: Int) -> MaterialInstance?,
     /**
      * The parent node.
      *
@@ -51,7 +51,7 @@ open class CubeNode(
         /**
          * Binds a material instance to all primitives.
          */
-        materialInstance: MaterialInstance,
+        materialInstance: MaterialInstance?,
         parent: Node? = null,
         renderableApply: RenderableManager.Builder.() -> Unit = {}
     ) : this(

diff --git a/sceneview/src/main/java/io/github/sceneview/node/CylinderNode.kt b/sceneview/src/main/java/io/github/sceneview/node/CylinderNode.kt
@@ -22,7 +22,7 @@ open class CylinderNode(
      * Should return the material to bind for the zero-based index of the primitive, must be less
      * than the [Geometry.submeshes] size passed to constructor.
      */
-    materialInstances: (index: Int) -> MaterialInstance,
+    materialInstances: (index: Int) -> MaterialInstance?,
     /**
      * The parent node.
      *
@@ -56,7 +56,7 @@ open class CylinderNode(
         /**
          * Binds a material instance to all primitives.
          */
-        materialInstance: MaterialInstance,
+        materialInstance: MaterialInstance?,
         parent: Node? = null,
         renderableApply: RenderableManager.Builder.() -> Unit = {}
     ) : this(

diff --git a/sceneview/src/main/java/io/github/sceneview/node/GeometryNode.kt b/sceneview/src/main/java/io/github/sceneview/node/GeometryNode.kt
@@ -45,7 +45,7 @@ open class GeometryNode(
      * Should return the material to bind for the zero-based index of the primitive, must be less
      * than the [Geometry.submeshes] size passed to constructor.
      */
-    materialInstances: (index: Int) -> MaterialInstance,
+    materialInstances: (index: Int) -> MaterialInstance?,
     /**
      * The parent node.
      *
@@ -75,7 +75,7 @@ open class GeometryNode(
         /**
          * Binds a material instance to all primitives.
          */
-        materialInstance: MaterialInstance,
+        materialInstance: MaterialInstance?,
         parent: Node? = null,
         renderableApply: RenderableManager.Builder.() -> Unit = {}
     ) : this(
@@ -105,7 +105,7 @@ open class BaseGeometryNode<T : Geometry>(
      * Should return the material to bind for the zero-based index of the primitive, must be less
      * than the [Geometry.submeshes] size passed to constructor.
      */
-    materialInstances: (index: Int) -> MaterialInstance,
+    materialInstances: (index: Int) -> MaterialInstance?,
     /**
      * The parent node.
      *
@@ -125,7 +125,7 @@ open class BaseGeometryNode<T : Geometry>(
         /**
          * Binds a material instance to all primitives.
          */
-        materialInstance: MaterialInstance,
+        materialInstance: MaterialInstance?,
         parent: Node? = null,
         renderableApply: RenderableManager.Builder.() -> Unit = {}
     ) : this(
@@ -141,7 +141,7 @@ open class BaseGeometryNode<T : Geometry>(
             .geometry(geometry)
             .apply {
                 geometry.submeshes.forEachIndexed { index, _ ->
-                    material(index, materialInstances(index))
+                    materialInstances(index)?.let { material(index, it) }
                 }
             }
             .apply(renderableApply)

diff --git a/sceneview/src/main/java/io/github/sceneview/node/PlaneNode.kt b/sceneview/src/main/java/io/github/sceneview/node/PlaneNode.kt
@@ -23,7 +23,7 @@ open class PlaneNode(
      * Should return the material to bind for the zero-based index of the primitive, must be less
      * than the [Geometry.submeshes] size passed to constructor.
      */
-    materialInstances: (index: Int) -> MaterialInstance,
+    materialInstances: (index: Int) -> MaterialInstance?,
     /**
      * The parent node.
      *
@@ -55,7 +55,7 @@ open class PlaneNode(
         /**
          * Binds a material instance to all primitives.
          */
-        materialInstance: MaterialInstance,
+        materialInstance: MaterialInstance?,
         parent: Node? = null,
         renderableApply: RenderableManager.Builder.() -> Unit = {}
     ) : this(

diff --git a/sceneview/src/main/java/io/github/sceneview/node/SphereNode.kt b/sceneview/src/main/java/io/github/sceneview/node/SphereNode.kt
@@ -22,7 +22,7 @@ open class SphereNode(
      * Should return the material to bind for the zero-based index of the primitive, must be less
      * than the [Geometry.submeshes] size passed to constructor.
      */
-    materialInstances: (index: Int) -> MaterialInstance,
+    materialInstances: (index: Int) -> MaterialInstance?,
     /**
      * The parent node.
      *
@@ -56,7 +56,7 @@ open class SphereNode(
         /**
          * Binds a material instance to all primitives.
          */
-        materialInstance: MaterialInstance,
+        materialInstance: MaterialInstance?,
         parent: Node? = null,
         renderableApply: RenderableManager.Builder.() -> Unit = {}
     ) : this(