Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gltf_viewer: make auto-scale into a UI setting.

Browse Source
This commit is contained in:
Philip Rideout
2021-06-28 12:30:02 -07:00
parent 6307fb3563
commit b841709729
10 changed files with 66 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libs/viewer/src/SimpleViewer.cpp
View File

@@ -334,8 +334,7 @@ SimpleViewer::~SimpleViewer() {
delete mImGuiHelper;
}
void SimpleViewer::populateScene(FilamentAsset* asset, bool scale,
FilamentInstance* instanceToAnimate) {
void SimpleViewer::populateScene(FilamentAsset* asset, FilamentInstance* instanceToAnimate) {
if (mAsset != asset) {
removeAsset();
mAsset = asset;
@@ -345,13 +344,7 @@ void SimpleViewer::populateScene(FilamentAsset* asset, bool scale,
return;
}
mAnimator = instanceToAnimate ? instanceToAnimate->getAnimator() : asset->getAnimator();
if (scale) {
auto& tcm = mEngine->getTransformManager();
auto root = tcm.getInstance(mAsset->getRoot());
filament::math::mat4f transform = fitIntoUnitCube(mAsset->getBoundingBox(), 4);
tcm.setTransform(root, transform);
}
updateRootTransform();
mScene->addEntities(asset->getLightEntities(), asset->getLightEntityCount());
}
@@ -393,6 +386,19 @@ void SimpleViewer::setIndirectLight(filament::IndirectLight* ibl,
}
}
void SimpleViewer::updateRootTransform() {
if (mAsset == nullptr) {
return;
}
auto& tcm = mEngine->getTransformManager();
auto root = tcm.getInstance(mAsset->getRoot());
filament::math::mat4f transform;
if (mSettings.viewer.autoScaleEnabled) {
transform = fitIntoUnitCube(mAsset->getBoundingBox(), 4);
}
tcm.setTransform(root, transform);
}
void SimpleViewer::updateIndirectLight() {
using namespace filament::math;
if (mIndirectLight) {
@@ -723,6 +729,10 @@ void SimpleViewer::updateUserInterface() {
if (ImGui::CollapsingHeader("Scene")) {
ImGui::Indent();
ImGui::Checkbox("Scale to unit cube", &mSettings.viewer.autoScaleEnabled);
updateRootTransform();
ImGui::Checkbox("Show skybox", &mSettings.viewer.skyboxEnabled);
ImGui::ColorEdit3("Background color", &mSettings.viewer.backgroundColor.r);