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

free all resources in SceneManager

Browse Source
This commit is contained in:
Nick Fisher
2024-06-19 13:12:28 +08:00
parent 6cfa86fe75
commit 3785580b01
2 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
thermion_dart/native/include/SceneManager.hpp
View File

@@ -179,7 +179,6 @@ namespace thermion_filament
gltfio::TextureProvider *_stbDecoder = nullptr; gltfio::TextureProvider *_stbDecoder = nullptr;
gltfio::TextureProvider *_ktxDecoder = nullptr; gltfio::TextureProvider *_ktxDecoder = nullptr;
std::mutex _mutex; std::mutex _mutex;
Material *_gizmoMaterial;
utils::NameComponentManager *_ncm; utils::NameComponentManager *_ncm;
@@ -201,8 +200,9 @@ namespace thermion_filament
const char *entityName); const char *entityName);
EntityId addGizmo(); EntityId addGizmo();
utils::Entity _gizmoX; utils::Entity _gizmo[3];
utils::Entity _gizmoY; Material* _gizmoMaterial;
utils::Entity _gizmoZ; MaterialInstance* _gizmoMaterialInstances[3];
}; };
} }

79
thermion_dart/native/src/SceneManager.cpp
View File

@@ -93,10 +93,28 @@ namespace thermion_filament
SceneManager::~SceneManager() SceneManager::~SceneManager()
{ {
destroyAll();
for(int i =0; i < 3; i++) {
_engine->destroy(_gizmo[i]);
_engine->destroy(_gizmoMaterialInstances[i]);
}
_engine->destroy(_gizmoMaterial);
_gltfResourceLoader->asyncCancelLoad(); _gltfResourceLoader->asyncCancelLoad();
_ubershaderProvider->destroyMaterials(); _ubershaderProvider->destroyMaterials();
destroyAll();
delete _animationComponentManager;
delete _collisionComponentManager;
delete _ncm;
delete _gltfResourceLoader;
delete _stbDecoder;
delete _ktxDecoder;
delete _ubershaderProvider;
AssetLoader::destroy(&_assetLoader); AssetLoader::destroy(&_assetLoader);
} }
int SceneManager::getInstanceCount(EntityId entityId) int SceneManager::getInstanceCount(EntityId entityId)
@@ -2045,72 +2063,57 @@ namespace thermion_filament
auto &entityManager = EntityManager::get(); auto &entityManager = EntityManager::get();
_gizmoY = entityManager.create(); _gizmo[1] = entityManager.create();
auto materialY = _gizmoMaterial->createInstance(); _gizmoMaterialInstances[1] = _gizmoMaterial->createInstance();
materialY->setParameter("color", math::float3{1.0f, 0.0f, 0.0f}); _gizmoMaterialInstances[1]->setParameter("color", math::float3{1.0f, 0.0f, 0.0f});
RenderableManager::Builder(1) RenderableManager::Builder(1)
.boundingBox({{}, {1.0f, 1.0f, 1.0f}}) .boundingBox({{}, {1.0f, 1.0f, 1.0f}})
.material(0, materialY) .material(0, _gizmoMaterialInstances[1])
.geometry(0, RenderableManager::PrimitiveType::TRIANGLES, vb, .geometry(0, RenderableManager::PrimitiveType::TRIANGLES, vb,
ib, 0, indexCount) ib, 0, indexCount)
.culling(false) .culling(false)
.build(*_engine, _gizmoY); .build(*_engine, _gizmo[1]);
_gizmoX = entityManager.create(); _gizmo[0] = entityManager.create();
auto materialX = _gizmoMaterial->createInstance(); _gizmoMaterialInstances[0] = _gizmoMaterial->createInstance();
materialX->setParameter("color", math::float3{0.0f, 1.0f, 0.0f}); _gizmoMaterialInstances[0]->setParameter("color", math::float3{0.0f, 1.0f, 0.0f});
auto xTransform = math::mat4f::translation(math::float3{0.0f, 0.05f, -0.05f}) * math::mat4f::rotation(-math::F_PI_2, math::float3{0, 0, 1}); auto xTransform = math::mat4f::translation(math::float3{0.0f, 0.05f, -0.05f}) * math::mat4f::rotation(-math::F_PI_2, math::float3{0, 0, 1});
auto *instanceBufferX = InstanceBuffer::Builder(1).localTransforms(&xTransform).build(*_engine); auto *instanceBufferX = InstanceBuffer::Builder(1).localTransforms(&xTransform).build(*_engine);
RenderableManager::Builder(1) RenderableManager::Builder(1)
.boundingBox({{}, {1.0f, 1.0f, 1.0f}}) .boundingBox({{}, {1.0f, 1.0f, 1.0f}})
.instances(1, instanceBufferX) .instances(1, instanceBufferX)
.material(0, materialX) .material(0, _gizmoMaterialInstances[0])
.geometry(0, RenderableManager::PrimitiveType::TRIANGLES, vb, .geometry(0, RenderableManager::PrimitiveType::TRIANGLES, vb,
ib, 0, indexCount) ib, 0, indexCount)
.culling(false) .culling(false)
.build(*_engine, _gizmoX); .build(*_engine, _gizmo[0]);
_gizmoZ = entityManager.create(); _gizmo[2] = entityManager.create();
auto materialZ = _gizmoMaterial->createInstance(); _gizmoMaterialInstances[2] = _gizmoMaterial->createInstance();
materialZ->setParameter("color", math::float3{0.0f, 0.0f, 1.0f}); _gizmoMaterialInstances[2]->setParameter("color", math::float3{0.0f, 0.0f, 1.0f});
auto zTransform = math::mat4f::translation(math::float3{0.0f, 0.05f, -0.05f}) * math::mat4f::rotation(3 * math::F_PI_2, math::float3{1, 0, 0}); auto zTransform = math::mat4f::translation(math::float3{0.0f, 0.05f, -0.05f}) * math::mat4f::rotation(3 * math::F_PI_2, math::float3{1, 0, 0});
auto *instanceBufferZ = InstanceBuffer::Builder(1).localTransforms(&zTransform).build(*_engine); auto *instanceBufferZ = InstanceBuffer::Builder(1).localTransforms(&zTransform).build(*_engine);
RenderableManager::Builder(1) RenderableManager::Builder(1)
.boundingBox({{}, {1.0f, 1.0f, 1.0f}}) .boundingBox({{}, {1.0f, 1.0f, 1.0f}})
.instances(1, instanceBufferZ) .instances(1, instanceBufferZ)
.material(0, materialZ) .material(0, _gizmoMaterialInstances[2])
.geometry(0, RenderableManager::PrimitiveType::TRIANGLES, vb, .geometry(0, RenderableManager::PrimitiveType::TRIANGLES, vb,
ib, 0, indexCount) ib, 0, indexCount)
.culling(false) .culling(false)
.build(*_engine, _gizmoZ); .build(*_engine, _gizmo[2]);
// auto localTransforms = math::mat4f[3] {
// math::mat4f(),
// math::mat4f::translation(math::float3 { 0.0f, 0.05f, -0.05f}) * math::mat4f::rotation(3 * math::F_PI_2, math::float3 { 1, 0, 0 }) ,
// math::mat4f::translation(math::float3 { 0.0f, 0.05f, -0.05f}) * math::mat4f::rotation(math::F_PI_2, math::float3 { 0, 0, 1 })
// };
// RenderableManager::Builder(1)
// .boundingBox({{}, {1.0f, 1.0f, 1.0f}})
// .instances(3, instanceBuffer)
// .material(0, _gizmoMaterial->getDefaultInstance())
// .geometry(0, RenderableManager::PrimitiveType::TRIANGLES, vb,
// ib, 0, indexCount)
// .culling(false)
// .build(*_engine, _gizmo);
auto &rm = _engine->getRenderableManager(); auto &rm = _engine->getRenderableManager();
rm.setPriority(rm.getInstance(_gizmoX), 7); rm.setPriority(rm.getInstance(_gizmo[0]), 7);
rm.setPriority(rm.getInstance(_gizmoY), 7); rm.setPriority(rm.getInstance(_gizmo[1]), 7);
rm.setPriority(rm.getInstance(_gizmoZ), 7); rm.setPriority(rm.getInstance(_gizmo[2]), 7);
return Entity::smuggle(_gizmoX); return Entity::smuggle(_gizmo[0]);
} }
void SceneManager::getGizmo(EntityId *out) void SceneManager::getGizmo(EntityId *out)
{ {
out[0] = Entity::smuggle(_gizmoX); out[0] = Entity::smuggle(_gizmo[0]);
out[1] = Entity::smuggle(_gizmoY); out[1] = Entity::smuggle(_gizmo[1]);
out[2] = Entity::smuggle(_gizmoZ); out[2] = Entity::smuggle(_gizmo[2]);
} }
} // namespace thermion_filament } // namespace thermion_filament