maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert to main camera when removing assets

Browse Source
This commit is contained in:
Nick Fisher
2022-08-15 00:27:31 +10:00
parent ed2db379cb
commit 07411fe4ef
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ios/src/FilamentViewer.cpp
View File

@@ -353,8 +353,7 @@ void FilamentViewer::destroySwapChain() {
} }
SceneAsset *FilamentViewer::loadGlb(const char *const uri) { SceneAsset *FilamentViewer::loadGlb(const char *const uri) {
Log("Loading GLB at URI %s", uri); SceneAsset *asset = _sceneAssetLoader->fromGlb(uri);
SceneAsset *asset = _sceneAssetLoader->fromGlb(uri);
if (!asset) { if (!asset) {
Log("Unknown error loading asset."); Log("Unknown error loading asset.");
} else { } else {
@@ -381,6 +380,7 @@ SceneAsset *FilamentViewer::loadGltf(const char *const uri,
void FilamentViewer::clearAssets() { void FilamentViewer::clearAssets() {
Log("Clearing all assets"); Log("Clearing all assets");
mtx.lock(); mtx.lock();
_view->setCamera(_mainCamera);
int i = 0; int i = 0;
for (auto asset : _assets) { for (auto asset : _assets) {
_sceneAssetLoader->remove(asset); _sceneAssetLoader->remove(asset);
@@ -393,8 +393,9 @@ void FilamentViewer::clearAssets() {
void FilamentViewer::removeAsset(SceneAsset *asset) { void FilamentViewer::removeAsset(SceneAsset *asset) {
mtx.lock(); mtx.lock();
_sceneAssetLoader->remove(asset);
// todo - what if we are using a camera from this asset? // todo - what if we are using a camera from this asset?
_view->setCamera(_mainCamera);
_sceneAssetLoader->remove(asset);
bool erased = false; bool erased = false;
for (auto it = _assets.begin(); it != _assets.end();) { for (auto it = _assets.begin(); it != _assets.end();) {