Skip to content

refactor: move Bugdroid GLTF rendering to SceneCore #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fuentespatrick merged 2 commits into from
Aug 13, 2026
Merged

refactor: move Bugdroid GLTF rendering to SceneCore #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5eac18
refactor: move Bugdroid GLTF rendering to SceneCore
fuentespatrick Aug 12, 2026
6dfb701
Update dependencies
fuentespatrick Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ plugins {

android {
namespace = "com.example.helloandroidxr"
compileSdk = 36
compileSdk = 37

defaultConfig {
applicationId = "com.example.helloandroidxr"
minSdk = 24
targetSdk = 36
targetSdk = 37
versionCode = 1
versionName = "1.0"

Expand Down
40 changes: 11 additions & 29 deletions app/src/main/java/com/example/helloandroidxr/ui/HelloAndroidXRApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.window.core.layout.WindowSizeClass
import androidx.xr.compose.platform.LocalSession
import androidx.xr.compose.platform.LocalSpatialCapabilities
import androidx.xr.compose.platform.LocalSpatialConfiguration
import androidx.xr.compose.spatial.ContentEdge
import androidx.xr.compose.spatial.Orbiter
import androidx.xr.compose.spatial.Subspace
Expand All @@ -69,16 +69,12 @@ import androidx.xr.compose.subspace.layout.fillMaxSize
import androidx.xr.compose.subspace.layout.fillMaxWidth
import androidx.xr.compose.subspace.layout.height
import androidx.xr.compose.subspace.layout.movable
import androidx.xr.compose.subspace.layout.offset
import androidx.xr.compose.subspace.layout.padding
import androidx.xr.compose.subspace.layout.resizable
import androidx.xr.compose.subspace.layout.rotate
import androidx.xr.compose.subspace.layout.size
import androidx.xr.compose.subspace.layout.width
import androidx.xr.runtime.math.Quaternion
import com.example.helloandroidxr.R
import com.example.helloandroidxr.ui.components.BugdroidControls
import com.example.helloandroidxr.ui.components.BugdroidModel
import com.example.helloandroidxr.ui.components.BugdroidSliderControls
import com.example.helloandroidxr.ui.components.EnvironmentControls
import com.example.helloandroidxr.ui.components.SearchBar
Expand All @@ -95,7 +91,14 @@ import kotlinx.coroutines.launch

@Composable
fun HelloAndroidXRApp() {
val viewModel = BugdroidViewModel()
val viewModel = remember { BugdroidViewModel() }
val session = LocalSession.current
LaunchedEffect(session) {
if (session != null) {
viewModel.initSession(session)
}
}

val uiState by viewModel.uiState.collectAsState()
if (LocalSpatialCapabilities.current.isSpatialUiEnabled) {
SpatialLayout(
Expand Down Expand Up @@ -344,7 +347,6 @@ private fun PrimaryContent(
if (uiState.showBugdroid) R.string.hide_bugdroid else R.string.show_bugdroid
val animateStringResId =
if (uiState.animateBugdroid) R.string.stop_animation_bugdroid else R.string.animate_bugdroid
val modelTransform = uiState.modelTransform
Surface(modifier.fillMaxSize()) {
Column(modifier.padding(48.dp), horizontalAlignment = Alignment.CenterHorizontally) {
Box(modifier.padding(48.dp), contentAlignment = Alignment.Center) {
Expand All @@ -371,26 +373,6 @@ private fun PrimaryContent(
}
}
}
BugdroidModel(
modelTransform = modelTransform,
showBugdroid = uiState.showBugdroid,
animateBugdroid = uiState.animateBugdroid,
modifier = SubspaceModifier
.fillMaxSize()
.rotate(
Quaternion(
x = modelTransform.rotation.x,
y = modelTransform.rotation.y,
z = modelTransform.rotation.z,
w = modelTransform.rotation.w
)
)
.offset(
x = modelTransform.offset.x.dp,
y = modelTransform.offset.y.dp,
z = modelTransform.offset.z.dp // Relative position from the panel
)
)
}
}
} else {
Expand All @@ -408,7 +390,7 @@ private fun BlockOfContentOne(
onSliderGroupSelected: (SliderGroup) -> Unit,
onResetModel: () -> Unit
) {
if (LocalSpatialConfiguration.current.hasXrSpatialFeature && showBugdroid) {
if (LocalSpatialCapabilities.current.isContent3dEnabled && showBugdroid) {
BugdroidControls(
onSliderGroupSelected = onSliderGroupSelected,
onResetModel = {
Expand All @@ -433,7 +415,7 @@ private fun BlockOfContentTwo(
onMaterialColorChange: (ModelMaterialColor) -> Unit,
onMaterialPropertiesChange: (ModelMaterialProperties) -> Unit,
) {
if (LocalSpatialConfiguration.current.hasXrSpatialFeature && showBugdroid) {
if (LocalSpatialCapabilities.current.isContent3dEnabled && showBugdroid) {
BugdroidSliderControls(
visibleSliderGroup = uiState.visibleSliderGroup,
modelTransform = uiState.modelTransform,
Expand Down
159 changes: 0 additions & 159 deletions app/src/main/java/com/example/helloandroidxr/ui/components/BugdroidModel.kt
View file
Open in desktop

This file was deleted.

Loading
Loading