add clearAssets method to viewer
This commit is contained in:
@@ -359,6 +359,7 @@ SceneAsset *FilamentViewer::loadGlb(const char *const uri) {
|
||||
Log("Unknown error loading asset.");
|
||||
} else {
|
||||
_assets.push_back(asset);
|
||||
Log("GLB loaded, asset at index %d", _assets.size() - 1);
|
||||
}
|
||||
return asset;
|
||||
}
|
||||
@@ -376,10 +377,25 @@ SceneAsset *FilamentViewer::loadGltf(const char *const uri,
|
||||
return asset;
|
||||
}
|
||||
|
||||
|
||||
void FilamentViewer::clearAssets() {
|
||||
Log("Clearing all assets");
|
||||
mtx.lock();
|
||||
int i = 0;
|
||||
for (auto asset : _assets) {
|
||||
_sceneAssetLoader->remove(asset);
|
||||
Log("Cleared asset %d", i);
|
||||
i++;
|
||||
}
|
||||
_assets.clear();
|
||||
mtx.unlock();
|
||||
}
|
||||
|
||||
void FilamentViewer::removeAsset(SceneAsset *asset) {
|
||||
mtx.lock();
|
||||
_sceneAssetLoader->remove(asset);
|
||||
_view->setCamera(_mainCamera);
|
||||
// todo - what if we are using a camera from this asset?
|
||||
|
||||
bool erased = false;
|
||||
for (auto it = _assets.begin(); it != _assets.end();) {
|
||||
if (*it == asset) {
|
||||
|
||||
@@ -57,6 +57,8 @@ namespace polyvox {
|
||||
SceneAsset* loadGlb(const char* const uri);
|
||||
SceneAsset* loadGltf(const char* const uri, const char* relativeResourcePath);
|
||||
void removeAsset(SceneAsset* asset);
|
||||
// removes all add assets from the current scene
|
||||
void clearAssets();
|
||||
|
||||
void updateViewportAndCameraProjection(int height, int width, float scaleFactor);
|
||||
void render();
|
||||
|
||||
@@ -31,7 +31,9 @@ SceneAsset::SceneAsset(FilamentAsset *asset, Engine *engine,
|
||||
Log("Created animation buffers for %d", _embeddedAnimationStatus.size());
|
||||
}
|
||||
|
||||
SceneAsset::~SceneAsset() { _asset = nullptr; }
|
||||
SceneAsset::~SceneAsset() {
|
||||
// we defer all destructor work to SceneAssetLoader so we don't need to do anything here
|
||||
}
|
||||
|
||||
void SceneAsset::applyWeights(float *weights, int count) {
|
||||
RenderableManager &rm = _engine->getRenderableManager();
|
||||
@@ -110,6 +112,19 @@ void SceneAsset::stopAnimation(int index) {
|
||||
_embeddedAnimationStatus[index].started = false;
|
||||
}
|
||||
|
||||
// void SceneAsset:swapTexture() {
|
||||
// materialInstance = material2.createInstance()
|
||||
// baseColor = loadTexture(filament.engine, context.resources, R.drawable.wall_tex_at, TextureType.COLOR)
|
||||
// normal = loadTexture(filament.engine, context.resources,R.drawable.wall_tex_n,TextureType.NORMAL)
|
||||
// ao = loadTexture(filament.engine, context.resources,R.drawable.wall_tex_ao,TextureType.DATA)
|
||||
// roughnessMetallic = loadTexture(filament.engine, context.resources,R.drawable.wall_tex_ms,TextureType.DATA)
|
||||
// val rm = filament.engine.renderableManager
|
||||
// val sampler = TextureSampler()
|
||||
// sampler.anisotropy = 8.0f
|
||||
// material.setParameter("baseColorIndex",0)
|
||||
// material.setParameter("baseColorMap",baseColor,sampler)
|
||||
// }
|
||||
|
||||
void SceneAsset::updateEmbeddedAnimations() {
|
||||
auto now = high_resolution_clock::now();
|
||||
for (auto &status : _embeddedAnimationStatus) {
|
||||
|
||||
@@ -115,9 +115,10 @@ SceneAsset *SceneAssetLoader::fromGlb(const char *uri) {
|
||||
}
|
||||
|
||||
void SceneAssetLoader::remove(SceneAsset *asset) {
|
||||
_resourceLoader->evictResourceData();
|
||||
_scene->removeEntities(asset->_asset->getEntities(),
|
||||
asset->_asset->getEntityCount());
|
||||
_resourceLoader->evictResourceData();
|
||||
_assetLoader->destroyAsset(asset->_asset);
|
||||
delete asset;
|
||||
}
|
||||
} // namespace polyvox
|
||||
Reference in New Issue
Block a user