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

fix: allow destroying instances independently of owner

Browse Source
This commit is contained in:
Nick Fisher
2025-01-02 16:46:44 +08:00
parent 8e0ba8ac4e
commit 3e181b6aff
13 changed files with 141 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
thermion_dart/native/include/scene/GeometrySceneAsset.hpp
View File

@@ -16,18 +16,20 @@ namespace thermion
class GeometrySceneAsset : public SceneAsset
{
public:
GeometrySceneAsset(bool isInstance,
Engine *engine,
GeometrySceneAsset(Engine *engine,
VertexBuffer *vertexBuffer,
IndexBuffer *indexBuffer,
MaterialInstance **materialInstances,
size_t materialInstanceCount,
RenderableManager::PrimitiveType primitiveType,
Box boundingBox);
Box boundingBox,
GeometrySceneAsset *instanceParent = std::nullptr_t());
~GeometrySceneAsset();
SceneAsset *createInstance(MaterialInstance **materialInstances = nullptr, size_t materialInstanceCount = 0) override;
void destroyInstance(SceneAsset *sceneAsset) override;
SceneAssetType getType() override
{
return SceneAsset::SceneAssetType::Geometry;
@@ -35,7 +37,11 @@ namespace thermion
bool isInstance() override
{
return _isInstance;
return _instanceOwner;
}
SceneAsset *getInstanceOwner() override {
return _instanceOwner;
}
utils::Entity getEntity() override
@@ -132,7 +138,7 @@ namespace thermion
MaterialInstance **_materialInstances = nullptr;
size_t _materialInstanceCount = 0;
Box _boundingBox;
bool _isInstance = false;
GeometrySceneAsset *_instanceOwner = std::nullptr_t();
utils::Entity _entity;
RenderableManager::PrimitiveType _primitiveType;
std::vector<std::unique_ptr<GeometrySceneAsset>> _instances;

2
thermion_dart/native/include/scene/Gizmo.hpp
View File

@@ -66,7 +66,9 @@ namespace thermion
SceneAssetType getType() override { return SceneAssetType::Gizmo; }
utils::Entity getEntity() override { return _parent; }
bool isInstance() override { return false; }
SceneAsset *getInstanceOwner() override { return std::nullptr_t(); }
SceneAsset *createInstance(MaterialInstance **materialInstances, size_t materialInstanceCount) override { return nullptr; }
void destroyInstance(SceneAsset *instance) override { return; }
MaterialInstance **getMaterialInstances() override { return _materialInstances.data(); }
size_t getMaterialInstanceCount() override { return _materialInstances.size(); }

11
thermion_dart/native/include/scene/GltfSceneAsset.hpp
View File

@@ -13,7 +13,6 @@
#include <utils/NameComponentManager.h>
#include "scene/GltfSceneAssetInstance.hpp"
#include "components/AnimationComponentManager.hpp"
#include "components/CollisionComponentManager.hpp"
@@ -49,6 +48,12 @@ namespace thermion
SceneAsset *createInstance(MaterialInstance **materialInstances = nullptr, size_t materialInstanceCount = 0) override;
void destroyInstance(SceneAsset *asset) override {
auto it = std::remove_if(_instances.begin(), _instances.end(), [=](auto &sceneAsset)
{ return sceneAsset.get() == asset; });
_instances.erase(it, _instances.end());
};
SceneAssetType getType() override
{
return SceneAsset::SceneAssetType::Gltf;
@@ -59,6 +64,10 @@ namespace thermion
return false;
}
SceneAsset *getInstanceOwner() override {
return std::nullptr_t();
}
utils::Entity getEntity() override
{
return _asset->getRoot();

16
thermion_dart/native/include/scene/GltfSceneAssetInstance.hpp
View File

@@ -12,7 +12,6 @@
#include <gltfio/MaterialProvider.h>
#include <utils/NameComponentManager.h>
#include "scene/SceneAsset.hpp"
namespace thermion
@@ -20,16 +19,20 @@ namespace thermion
using namespace filament;
class GltfSceneAsset;
class GltfSceneAssetInstance : public SceneAsset
{
public:
GltfSceneAssetInstance(
GltfSceneAsset *instanceOwner,
gltfio::FilamentInstance *instance,
Engine *engine,
utils::NameComponentManager* ncm,
MaterialInstance **materialInstances = nullptr,
size_t materialInstanceCount = 0,
int instanceIndex = -1) : _ncm(ncm),
int instanceIndex = -1) : _instanceOwner(instanceOwner),
_ncm(ncm),
_instance(instance),
_materialInstances(materialInstances),
_materialInstanceCount(materialInstanceCount)
@@ -43,6 +46,10 @@ namespace thermion
return std::nullptr_t();
};
void destroyInstance(SceneAsset *instance) override {
}
SceneAssetType getType() override
{
return SceneAsset::SceneAssetType::Gltf;
@@ -53,6 +60,8 @@ namespace thermion
return true;
}
SceneAsset *getInstanceOwner() override;
utils::Entity getEntity() override
{
return _instance->getRoot();
@@ -156,8 +165,9 @@ namespace thermion
filament::Engine *_engine;
utils::NameComponentManager *_ncm;
gltfio::FilamentInstance *_instance;
MaterialInstance **_materialInstances = nullptr;
MaterialInstance **_materialInstances = std::nullptr_t();
size_t _materialInstanceCount = 0;
GltfSceneAsset *_instanceOwner = std::nullptr_t();
};
} // namespace thermion

5
thermion_dart/native/include/scene/GridOverlay.hpp
View File

@@ -22,9 +22,14 @@ public:
SceneAssetType getType() override { return SceneAsset::SceneAssetType::Gizmo; }
bool isInstance() override { return false; }
SceneAsset *getInstanceOwner() override { return std::nullptr_t(); }
SceneAsset* createInstance(MaterialInstance** materialInstances = nullptr,
size_t materialInstanceCount = 0) override;
void destroyInstance(SceneAsset *instance) override {
}
MaterialInstance** getMaterialInstances() override { return &_materialInstance; }
size_t getMaterialInstanceCount() override { return 1; }

3
thermion_dart/native/include/scene/SceneAsset.hpp
View File

@@ -30,6 +30,9 @@ class SceneAsset {
}
virtual bool isInstance() = 0;
virtual SceneAsset* getInstanceOwner() = 0;
virtual void destroyInstance(SceneAsset *instance) = 0;
virtual SceneAsset* createInstance(MaterialInstance **materialInstances, size_t materialInstanceCount) = 0;