fix: migrate Scene to UiHelper, fix build regression, update MCP

Thomas Gorisse · claude · Thomas Gorisse · commit a0012ee431fe · 2026-03-17T08:37:50.000+01:00
- Scene.kt: replace manual SurfaceHolder.Callback/SurfaceTextureListener
  with Filament UiHelper for both SurfaceView and TextureView branches.
  UiHelper handles surface lifecycle more robustly, fixing the black-screen
  issue on Feature Level 1 / OpenGL ES emulators (Apple M3 translator).
  Swap chain flags now sourced from uiHelper.swapChainFlags.

- build.gradle: restore AGP to 8.13.2 (was accidentally downgraded to 8.11.2)

- Remove .github/workflows/publish-release.yml: closeAndReleaseRepository
  task no longer exists with SonatypeHost.CENTRAL_PORTAL — upload-release.yml
  handles the full publish cycle in one step.

- mcp: add geometry-scene sample (cube/sphere/plane, no GLB required),
  bump to 3.0.1, publish to npm.

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
diff --git a/mcp/dist/index.js b/mcp/dist/index.js
@@ -14,7 +14,7 @@ try {
 catch {
     API_DOCS = "SceneView API docs not found. Run `npm run prepare` to bundle llms.txt.";
 }
-const server = new Server({ name: "@sceneview/mcp", version: "3.0.0" }, { capabilities: { resources: {}, tools: {} } });
+const server = new Server({ name: "@sceneview/mcp", version: "3.0.1" }, { capabilities: { resources: {}, tools: {} } });
 server.setRequestHandler(ListResourcesRequestSchema, async () => ({
     resources: [
         {
diff --git a/mcp/dist/samples.js b/mcp/dist/samples.js
@@ -30,6 +30,61 @@ fun ModelViewerScreen() {
             )
         }
     }
+}`,
+    },
+    "geometry-scene": {
+        id: "geometry-scene",
+        title: "3D Geometry Scene",
+        description: "Procedural 3D scene using primitive geometry nodes (cube, sphere, plane) — no GLB required",
+        dependency: "io.github.sceneview:sceneview:3.0.0",
+        prompt: "Create an Android Compose screen called `GeometrySceneScreen` that renders a full-screen 3D scene with a red rotating cube, a metallic blue sphere, and a green floor plane. No model files — use SceneView built-in geometry nodes. Orbit camera. Use SceneView `io.github.sceneview:sceneview:3.0.0`.",
+        code: `@Composable
+fun GeometrySceneScreen() {
+    val engine = rememberEngine()
+    val materialLoader = rememberMaterialLoader(engine)
+    val t = rememberInfiniteTransition(label = "spin")
+    val angle by t.animateFloat(
+        initialValue = 0f, targetValue = 360f,
+        animationSpec = infiniteRepeatable(tween(4_000, easing = LinearEasing)),
+        label = "angle"
+    )
+
+    Scene(
+        modifier = Modifier.fillMaxSize(),
+        engine = engine,
+        materialLoader = materialLoader,
+        mainLightNode = rememberMainLightNode(engine) { intensity(80_000f) },
+        cameraManipulator = rememberCameraManipulator()
+    ) {
+        // Rotating red cube
+        CubeNode(
+            engine,
+            size = Size(0.5f, 0.5f, 0.5f),
+            materialInstance = materialLoader.createColorInstance(
+                Color.Red, metallic = 0f, roughness = 0.5f
+            ),
+            position = Position(x = -0.6f),
+            rotation = Rotation(y = angle)
+        )
+        // Metallic blue sphere
+        SphereNode(
+            engine,
+            radius = 0.3f,
+            materialInstance = materialLoader.createColorInstance(
+                Color.Blue, metallic = 0.8f, roughness = 0.2f
+            ),
+            position = Position(x = 0.6f)
+        )
+        // Floor plane
+        PlaneNode(
+            engine,
+            size = Size(2f, 0f, 2f),
+            materialInstance = materialLoader.createColorInstance(
+                Color(0xFF4CAF50), metallic = 0f, roughness = 0.9f
+            ),
+            position = Position(y = -0.35f)
+        )
+    }
 }`,
     },
     "ar-tap-to-place": {
diff --git a/mcp/package.json b/mcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sceneview-mcp",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "MCP server for SceneView — 3D and AR with Jetpack Compose for Android. Give Claude the full SceneView SDK so it writes correct, compilable Kotlin.",
   "keywords": [
     "mcp",
diff --git a/mcp/src/index.ts b/mcp/src/index.ts
@@ -23,7 +23,7 @@ try {
 }
 
 const server = new Server(
-  { name: "@sceneview/mcp", version: "3.0.0" },
+  { name: "@sceneview/mcp", version: "3.0.1" },
   { capabilities: { resources: {}, tools: {} } }
 );
 
diff --git a/mcp/src/samples.ts b/mcp/src/samples.ts
@@ -1,5 +1,6 @@
 export type SampleId =
   | "model-viewer"
+  | "geometry-scene"
   | "ar-tap-to-place"
   | "ar-placement-cursor"
   | "ar-augmented-image"
@@ -50,6 +51,63 @@ fun ModelViewerScreen() {
 }`,
   },
 
+  "geometry-scene": {
+    id: "geometry-scene",
+    title: "3D Geometry Scene",
+    description: "Procedural 3D scene using primitive geometry nodes (cube, sphere, plane) — no GLB required",
+    dependency: "io.github.sceneview:sceneview:3.0.0",
+    prompt:
+      "Create an Android Compose screen called `GeometrySceneScreen` that renders a full-screen 3D scene with a red rotating cube, a metallic blue sphere, and a green floor plane. No model files — use SceneView built-in geometry nodes. Orbit camera. Use SceneView `io.github.sceneview:sceneview:3.0.0`.",
+    code: `@Composable
+fun GeometrySceneScreen() {
+    val engine = rememberEngine()
+    val materialLoader = rememberMaterialLoader(engine)
+    val t = rememberInfiniteTransition(label = "spin")
+    val angle by t.animateFloat(
+        initialValue = 0f, targetValue = 360f,
+        animationSpec = infiniteRepeatable(tween(4_000, easing = LinearEasing)),
+        label = "angle"
+    )
+
+    Scene(
+        modifier = Modifier.fillMaxSize(),
+        engine = engine,
+        materialLoader = materialLoader,
+        mainLightNode = rememberMainLightNode(engine) { intensity(80_000f) },
+        cameraManipulator = rememberCameraManipulator()
+    ) {
+        // Rotating red cube
+        CubeNode(
+            engine,
+            size = Size(0.5f, 0.5f, 0.5f),
+            materialInstance = materialLoader.createColorInstance(
+                Color.Red, metallic = 0f, roughness = 0.5f
+            ),
+            position = Position(x = -0.6f),
+            rotation = Rotation(y = angle)
+        )
+        // Metallic blue sphere
+        SphereNode(
+            engine,
+            radius = 0.3f,
+            materialInstance = materialLoader.createColorInstance(
+                Color.Blue, metallic = 0.8f, roughness = 0.2f
+            ),
+            position = Position(x = 0.6f)
+        )
+        // Floor plane
+        PlaneNode(
+            engine,
+            size = Size(2f, 0f, 2f),
+            materialInstance = materialLoader.createColorInstance(
+                Color(0xFF4CAF50), metallic = 0f, roughness = 0.9f
+            ),
+            position = Position(y = -0.35f)
+        )
+    }
+}`,
+  },
+
   "ar-tap-to-place": {
     id: "ar-tap-to-place",
     title: "AR Tap-to-Place",
diff --git a/sceneview/src/main/java/io/github/sceneview/Scene.kt b/sceneview/src/main/java/io/github/sceneview/Scene.kt
@@ -3,11 +3,9 @@ package io.github.sceneview
 import android.content.Context
 import android.content.Context.WINDOW_SERVICE
 import android.graphics.PixelFormat
-import android.graphics.SurfaceTexture
 import android.opengl.EGLContext
 import android.view.MotionEvent
 import android.view.Surface
-import android.view.SurfaceHolder
 import android.view.SurfaceView
 import android.view.TextureView
 import android.view.WindowManager
@@ -43,6 +41,7 @@ import com.google.android.filament.SwapChain
 import com.google.android.filament.View
 import com.google.android.filament.Viewport
 import com.google.android.filament.android.DisplayHelper
+import com.google.android.filament.android.UiHelper
 import io.github.sceneview.collision.CollisionSystem
 import io.github.sceneview.collision.HitResult
 import io.github.sceneview.environment.Environment
@@ -360,41 +359,54 @@ fun Scene(
         (context.getSystemService(WINDOW_SERVICE) as WindowManager).defaultDisplay
     }
 
+    // UiHelper manages swap chain creation/destruction and handles surface lifecycle more robustly
+    // than a bare SurfaceHolder.Callback (fixes rendering on Feature Level 1 / OpenGL ES emulators).
+    val uiHelperRef = remember { AtomicReference<UiHelper?>(null) }
+    DisposableEffect(engine) {
+        onDispose { uiHelperRef.getAndSet(null)?.detach() }
+    }
+
+    // Shared RendererCallback — wired to whichever surface type is active.
+    fun makeRendererCallback(viewHeight: () -> Int) = object : UiHelper.RendererCallback {
+        override fun onNativeWindowChanged(surface: Surface) {
+            val uiHelper = uiHelperRef.get() ?: return
+            swapChainRef.getAndSet(
+                engine.createSwapChain(surface, uiHelper.swapChainFlags)
+            )?.let { engine.destroySwapChain(it) }
+            displayHelper.attach(renderer, display)
+            if (cameraGestureDetectorRef.get() == null) {
+                cameraGestureDetectorRef.set(
+                    CameraGestureDetector(
+                        viewHeight = viewHeight,
+                        cameraManipulator = cameraManipulator
+                    )
+                )
+            }
+        }
+
+        override fun onDetachedFromSurface() {
+            cameraGestureDetectorRef.set(null)
+            swapChainRef.getAndSet(null)?.let { engine.destroySwapChain(it) }
+            engine.flushAndWait()
+            displayHelper.detach()
+        }
+
+        override fun onResizeView(width: Int, height: Int) {
+            applyResize(width, height)
+            engine.drainFramePipeline()
+        }
+    }
+
     when (surfaceType) {
         SurfaceType.Surface -> AndroidView(
             modifier = modifier,
             factory = { ctx ->
                 SurfaceView(ctx).also { sv ->
                     if (!isOpaque) sv.holder.setFormat(PixelFormat.TRANSLUCENT)
-                    sv.holder.addCallback(object : SurfaceHolder.Callback {
-                        override fun surfaceCreated(holder: SurfaceHolder) {}
-
-                        override fun surfaceChanged(
-                            holder: SurfaceHolder, format: Int, width: Int, height: Int
-                        ) {
-                            if (swapChainRef.get() == null) {
-                                swapChainRef.set(engine.createSwapChain(holder.surface))
-                                displayHelper.attach(renderer, display)
-                                cameraGestureDetectorRef.set(
-                                    CameraGestureDetector(
-                                        viewHeight = { sv.height },
-                                        cameraManipulator = cameraManipulator
-                                    )
-                                )
-                            }
-                            applyResize(width, height)
-                            engine.drainFramePipeline()
-                        }
-
-                        override fun surfaceDestroyed(holder: SurfaceHolder) {
-                            cameraGestureDetectorRef.set(null)
-                            swapChainRef.getAndSet(null)?.let {
-                                runCatching { engine.destroySwapChain(it) }
-                            }
-                            engine.flushAndWait()
-                            displayHelper.detach()
-                        }
-                    })
+                    val uiHelper = UiHelper(UiHelper.ContextErrorHandler { })
+                    uiHelper.renderCallback = makeRendererCallback { sv.height }
+                    uiHelper.attachTo(sv)
+                    uiHelperRef.set(uiHelper)
                     sv.setOnTouchListener { _, event -> touchDispatcher(event); true }
                 }
             },
@@ -406,45 +418,10 @@ fun Scene(
             factory = { ctx ->
                 TextureView(ctx).also { tv ->
                     tv.isOpaque = isOpaque
-                    var textureSurface: Surface? = null
-                    tv.surfaceTextureListener = object : TextureView.SurfaceTextureListener {
-                        override fun onSurfaceTextureAvailable(
-                            st: SurfaceTexture, width: Int, height: Int
-                        ) {
-                            textureSurface = Surface(st)
-                            swapChainRef.set(engine.createSwapChain(textureSurface!!))
-                            displayHelper.attach(renderer, display)
-                            cameraGestureDetectorRef.set(
-                                CameraGestureDetector(
-                                    viewHeight = { tv.height },
-                                    cameraManipulator = cameraManipulator
-                                )
-                            )
-                            applyResize(width, height)
-                            engine.drainFramePipeline()
-                        }
-
-                        override fun onSurfaceTextureSizeChanged(
-                            st: SurfaceTexture, width: Int, height: Int
-                        ) {
-                            applyResize(width, height)
-                            engine.drainFramePipeline()
-                        }
-
-                        override fun onSurfaceTextureDestroyed(st: SurfaceTexture): Boolean {
-                            cameraGestureDetectorRef.set(null)
-                            swapChainRef.getAndSet(null)?.let {
-                                runCatching { engine.destroySwapChain(it) }
-                            }
-                            engine.flushAndWait()
-                            displayHelper.detach()
-                            textureSurface?.release()
-                            textureSurface = null
-                            return true
-                        }
-
-                        override fun onSurfaceTextureUpdated(st: SurfaceTexture) {}
-                    }
+                    val uiHelper = UiHelper(UiHelper.ContextErrorHandler { })
+                    uiHelper.renderCallback = makeRendererCallback { tv.height }
+                    uiHelper.attachTo(tv)
+                    uiHelperRef.set(uiHelper)
                     tv.setOnTouchListener { _, event -> touchDispatcher(event); true }
                 }
             },

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ try {`
`14`	`14`	`catch {`
`15`	`15`	API_DOCS = "SceneView API docs not found. Run `npm run prepare` to bundle llms.txt.";
`16`	`16`	`}`
`17`		`-const server = new Server({ name: "@sceneview/mcp", version: "3.0.0" }, { capabilities: { resources: {}, tools: {} } });`
	`17`	`+const server = new Server({ name: "@sceneview/mcp", version: "3.0.1" }, { capabilities: { resources: {}, tools: {} } });`
`18`	`18`	`server.setRequestHandler(ListResourcesRequestSchema, async () => ({`
`19`	`19`	`resources: [`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sceneview-mcp",`
`3`		`- "version": "3.0.0",`
	`3`	`+ "version": "3.0.1",`
`4`	`4`	`"description": "MCP server for SceneView — 3D and AR with Jetpack Compose for Android. Give Claude the full SceneView SDK so it writes correct, compilable Kotlin.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"mcp",`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ try {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`const server = new Server(`
`26`		`- { name: "@sceneview/mcp", version: "3.0.0" },`
	`26`	`+ { name: "@sceneview/mcp", version: "3.0.1" },`
`27`	`27`	`{ capabilities: { resources: {}, tools: {} } }`
`28`	`28`	`);`
`29`	`29`