Merge remote-tracking branch 'origin/main'

ThomasGorisse · ThomasGorisse · commit e8f6fbf170fc · 2024-05-29T18:13:41.000+02:00
diff --git a/sceneview/src/main/java/io/github/sceneview/node/ModelNode.kt b/sceneview/src/main/java/io/github/sceneview/node/ModelNode.kt
@@ -116,10 +116,10 @@ open class ModelNode(
         RenderableNode(modelInstance, it)
     }
     val lightNodes = modelInstance.lightEntities.map {
-        LightNode(modelInstance, it).apply { parent = this }
+        LightNode(modelInstance, it).apply { parent = this@ModelNode }
     }
     val cameraNodes = modelInstance.camerasEntities.map {
-        CameraNode(modelInstance, it).apply { parent = this }
+        CameraNode(modelInstance, it).apply { parent = this@ModelNode }
     }
     val emptyNodes = modelInstance.emptyNodeEntities.map {
         EmptyNode(modelInstance, it)

Original file line number	Diff line number	Diff line change
`@@ -116,10 +116,10 @@ open class ModelNode(`
`116`	`116`	`RenderableNode(modelInstance, it)`
`117`	`117`	`}`
`118`	`118`	`val lightNodes = modelInstance.lightEntities.map {`
`119`		`- LightNode(modelInstance, it).apply { parent = this }`
	`119`	`+ LightNode(modelInstance, it).apply { parent = this@ModelNode }`
`120`	`120`	`}`
`121`	`121`	`val cameraNodes = modelInstance.camerasEntities.map {`
`122`		`- CameraNode(modelInstance, it).apply { parent = this }`
	`122`	`+ CameraNode(modelInstance, it).apply { parent = this@ModelNode }`
`123`	`123`	`}`
`124`	`124`	`val emptyNodes = modelInstance.emptyNodeEntities.map {`
`125`	`125`	`EmptyNode(modelInstance, it)`