Fix broken environment geometry animation

Jay Abi-Saad · Jay Abi-Saad · commit e65c3d84ff10 · 2025-12-19T18:03:14.000-08:00
Fixes: b/470450138

Change-Id: I6fbdb13462920b50f0f0765bcb989a4d653e1002
diff --git a/xr/scenecore/scenecore-spatial-rendering/src/main/java/androidx/xr/scenecore/spatial/rendering/SpatialEnvironmentFeatureImpl.kt b/xr/scenecore/scenecore-spatial-rendering/src/main/java/androidx/xr/scenecore/spatial/rendering/SpatialEnvironmentFeatureImpl.kt
@@ -130,7 +130,13 @@ internal class SpatialEnvironmentFeatureImpl(
                 )
             }
             if (animationName != null) {
-                impressApi.animateGltfModel(geometryImpressNode, animationName, true)
+                // animateGltfModel is itself an asynchronous call, and it blocks execution
+                // until the animation finishes. We need to wrap this call in a coroutine so
+                // that we can proceed with the parenting of the environment instead of
+                // waiting for the animation to complete.
+                coroutineScope.launch {
+                    impressApi.animateGltfModel(geometryImpressNode, animationName, true)
+                }
             }
             impressApi.setImpressNodeParent(geometryImpressNode, subspaceNode)
         }
diff --git a/xr/scenecore/scenecore-spatial-rendering/src/test/java/androidx/xr/scenecore/spatial/rendering/SpatialEnvironmentFeatureImplTest.kt b/xr/scenecore/scenecore-spatial-rendering/src/test/java/androidx/xr/scenecore/spatial/rendering/SpatialEnvironmentFeatureImplTest.kt
@@ -463,6 +463,22 @@ class SpatialEnvironmentFeatureImplTest {
         assertThat(actualParentHandle).isEqualTo(expectedParentHandle)
     }
 
+    @Test
+    fun setPreferredSpatialEnvironment_asyncAnimation_startsAnimation() = runBlocking {
+        val exr = fakeLoadEnvironment("fakeEnvironment")
+        val gltf = fakeLoadGltfAsset("fakeGltfAsset")
+        val animationName = "fakeAnimation"
+
+        environment.preferredSpatialEnvironment =
+            SpatialEnvironmentPreference(exr, gltf, null, null, animationName)
+
+        // Will execute animateGltfModel.
+        runUiThreadTasks()
+
+        val loopingAnimatingNodes = fakeImpressApi.impressNodeLoopAnimatingSize()
+        assertThat(loopingAnimatingNodes).isEqualTo(1)
+    }
+
     @Test
     fun dispose_clearsResources() = runBlocking {
         val exr = fakeLoadEnvironment("fakeEnvironment")

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,13 @@ internal class SpatialEnvironmentFeatureImpl(`
`130`	`130`	`)`
`131`	`131`	`}`
`132`	`132`	`if (animationName != null) {`
`133`		`- impressApi.animateGltfModel(geometryImpressNode, animationName, true)`
	`133`	`+ // animateGltfModel is itself an asynchronous call, and it blocks execution`
	`134`	`+ // until the animation finishes. We need to wrap this call in a coroutine so`
	`135`	`+ // that we can proceed with the parenting of the environment instead of`
	`136`	`+ // waiting for the animation to complete.`
	`137`	`+ coroutineScope.launch {`
	`138`	`+ impressApi.animateGltfModel(geometryImpressNode, animationName, true)`
	`139`	`+ }`
`134`	`140`	`}`
`135`	`141`	`impressApi.setImpressNodeParent(geometryImpressNode, subspaceNode)`
`136`	`142`	`}`