Skip to content

Update model viewer sample to use version 2.0.2 #405

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
merged 3 commits into from
Mar 26, 2024
Merged

Update model viewer sample to use version 2.0.2 #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3044398
update model viewer to use version 2.0.2
Jan 30, 2024
2d49450
Fix env set indirect light and skybox from HDR
waliahimanshu Feb 1, 2024
9b4d4c4
Merge branch 'main' into hw/update-model-viewer-sample-to-2.0.2
ThomasGorisse Mar 26, 2024
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: 1 addition & 3 deletions samples/model-viewer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,5 @@ dependencies {
implementation project(":samples:common")

// SceneView
// releaseImplementation "io.github.sceneview:sceneview:2.0.0"
// debugImplementation project(":sceneview_2_0_0")
implementation "io.github.sceneview:sceneview:2.0.0"
implementation "io.github.sceneview:sceneview:2.0.2"
}
4 changes: 2 additions & 2 deletions samples/model-viewer/src/main/java/io/github/sceneview/sample/modelviewer/Activity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import androidx.fragment.app.commit
import io.github.sceneview.utils.doOnApplyWindowInsets
import io.github.sceneview.utils.setFullScreen
import io.github.sceneview.sample.doOnApplyWindowInsets
import io.github.sceneview.sample.setFullScreen

class Activity : AppCompatActivity(R.layout.activity) {

Expand Down
59 changes: 21 additions & 38 deletions samples/model-viewer/src/main/java/io/github/sceneview/sample/modelviewer/MainFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,59 +6,42 @@ import androidx.core.view.isGone
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import io.github.sceneview.SceneView
import io.github.sceneview.loaders.loadHdrIndirectLight
import io.github.sceneview.loaders.loadHdrSkybox
import io.github.sceneview.math.Position
import io.github.sceneview.math.Rotation
import io.github.sceneview.nodes.ModelNode
import io.github.sceneview.nodes.ViewNode
import io.github.sceneview.math.Scale
import io.github.sceneview.node.ModelNode
import kotlinx.coroutines.launch

class MainFragment : Fragment(R.layout.fragment_main) {

lateinit var sceneView: SceneView
lateinit var loadingView: View
private lateinit var sceneView: SceneView
private lateinit var loadingView: View

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

sceneView = view.findViewById<SceneView>(R.id.sceneView).apply {
setLifecycle(lifecycle)
}
sceneView = view.findViewById(R.id.sceneView)
loadingView = view.findViewById(R.id.loadingView)

lifecycleScope.launchWhenCreated {
viewLifecycleOwner.lifecycleScope.launch {
val hdrFile = "environments/studio_small_09_2k.hdr"
sceneView.loadHdrIndirectLight(hdrFile, specularFilter = true) {
intensity(30_000f)
}
sceneView.loadHdrSkybox(hdrFile) {
intensity(50_000f)
}

val model = sceneView.modelLoader.loadModel("models/MaterialSuite.glb")!!
val modelNode = ModelNode(sceneView, model).apply {
transform(
position = Position(z = -4.0f),
rotation = Rotation(x = 15.0f)
)
scaleToUnitsCube(2.0f)
// TODO: Fix centerOrigin
// centerOrigin(Position(x=-1.0f, y=-1.0f))
playAnimation()
sceneView.environmentLoader.loadHDREnvironment(hdrFile).apply {
sceneView.indirectLight = this?.indirectLight
sceneView.skybox = this?.skybox
}
sceneView.addChildNode(modelNode)

val viewNode = ViewNode(
sceneView = sceneView,
viewResourceId = R.layout.view_node_layout
).apply {
transform(
position = Position(z = -4f),
rotation = Rotation()
)
sceneView.cameraNode.apply {
position = Position(z = 4.0f)
}
sceneView.addChildNode(viewNode)

val modelFile = "models/MaterialSuite.glb"
val modelInstance = sceneView.modelLoader.createModelInstance(modelFile)

val modelNode = ModelNode(
modelInstance = modelInstance,
scaleToUnits = 2.0f,
)
modelNode.scale = Scale(0.05f)
Copy link
Contributor Author

@waliahimanshu waliahimanshu Feb 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

model is too big - without scaling its not visible scalling down!

sceneView.addChildNode(modelNode)
loadingView.isGone = true
}
}
Expand Down
2 changes: 0 additions & 2 deletions samples/model-viewer/src/main/res/layout/fragment_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:background="@drawable/info_background"
tools:context="io.github.sceneview.sample.modelviewer.Activity">

<ImageView
android:id="@+id/imageView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:alpha="0.5"
android:src="@drawable/logo"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
Expand Down