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

make Android use new API, add delete_viewer method

Browse Source
This commit is contained in:
Nick Fisher
2022-08-20 22:19:14 +10:00
parent 1bbd460b9b
commit ce346510e6
9 changed files with 104 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ios/src/FilamentViewer.cpp
View File

@@ -334,7 +334,26 @@ void FilamentViewer::setBackgroundImage(const char *resourcePath) {
float3(1.0f));
}
FilamentViewer::~FilamentViewer() { cleanup(); }
FilamentViewer::~FilamentViewer() {
clearAssets();
_resourceLoader->asyncCancelLoad();
Log("c1");
_materialProvider->destroyMaterials();
Log("c2");
AssetLoader::destroy(&_assetLoader);
Log("c3");
delete _sceneAssetLoader;
_engine->destroy(_view);
Log("c4");
_engine->destroy(_scene);
Log("c5");
_engine->destroy(_renderer);
Log("c6");
_engine->destroy(_swapChain);
Log("c7");
Engine::destroy(&_engine); // clears engine*
Log("c8");
}
Renderer *FilamentViewer::getRenderer() { return _renderer; }
@@ -529,12 +548,6 @@ void FilamentViewer::loadIbl(const char *const iblPath) {
}
}
void FilamentViewer::cleanup() {
_resourceLoader->asyncCancelLoad();
_materialProvider->destroyMaterials();
AssetLoader::destroy(&_assetLoader);
};
void FilamentViewer::render() {
if (!_view || !_mainCamera || !_swapChain) {