internal: store bounding box with SceneAsset rather than recalculating from renderables

This commit is contained in:
Nick Fisher
2025-01-07 12:02:44 +08:00
parent 124eed0264
commit 0e5253f7b3
12 changed files with 78 additions and 25 deletions

View File

@@ -21,6 +21,7 @@ extern "C"
EMSCRIPTEN_KEEPALIVE TSceneAsset *SceneAsset_getInstance(TSceneAsset *tSceneAsset, int index);
EMSCRIPTEN_KEEPALIVE size_t SceneAsset_getInstanceCount(TSceneAsset *tSceneAsset);
EMSCRIPTEN_KEEPALIVE TSceneAsset * SceneAsset_createInstance(TSceneAsset *asset, TMaterialInstance **materialInstances, int materialInstanceCount);
EMSCRIPTEN_KEEPALIVE Aabb3 SceneAsset_getBoundingBox(TSceneAsset *asset);
#ifdef __cplusplus
}

View File

@@ -122,6 +122,10 @@ namespace thermion
return Entity(); // not currently implemented
}
const filament::Aabb getBoundingBox() const override {
return _boundingBox;
}
static std::unique_ptr<GeometrySceneAsset> create(
float *vertices, uint32_t numVertices,
float *normals, uint32_t numNormals,
@@ -136,7 +140,7 @@ namespace thermion
VertexBuffer *_vertexBuffer = nullptr;
IndexBuffer *_indexBuffer = nullptr;
std::vector<MaterialInstance*> _materialInstances;
Box _boundingBox;
Aabb _boundingBox;
GeometrySceneAsset *_instanceOwner = std::nullptr_t();
utils::Entity _entity;
RenderableManager::PrimitiveType _primitiveType;

View File

@@ -1,6 +1,7 @@
#pragma once
#include <utils/Entity.h>
#include <filament/Box.h>
#include <filament/Engine.h>
#include <filament/Material.h>
#include <filament/MaterialInstance.h>
@@ -145,6 +146,10 @@ namespace thermion
math::mat4f getRotationForAxis(Gizmo::Axis axis);
const filament::Aabb getBoundingBox() const override {
return _boundingBox;
}
private:
SceneAsset *_source;
Engine *_engine;
@@ -161,6 +166,8 @@ namespace thermion
std::vector<utils::Entity> _entities;
std::vector<MaterialInstance *> _materialInstances;
filament::Aabb _boundingBox;
GizmoPickResultType getPickResult(utils::Entity entity)
{
if (entity.isNull())

View File

@@ -167,6 +167,10 @@ namespace thermion
return entities[0];
}
const filament::Aabb getBoundingBox() const override {
return _asset->getBoundingBox();
}
private:
gltfio::FilamentAsset *_asset;
gltfio::AssetLoader *_assetLoader;

View File

@@ -159,7 +159,9 @@ namespace thermion
}
}
const filament::Aabb getBoundingBox() const override {
return _instance->getBoundingBox();
}
private:
filament::Engine *_engine;

View File

@@ -48,6 +48,10 @@ public:
const Entity* getChildEntities() override;
Entity findEntityByName(const char* name) override;
const filament::Aabb getBoundingBox() const override {
return filament::Aabb();
}
private:
Engine& _engine;
utils::Entity _gridEntity;

View File

@@ -2,10 +2,12 @@
#include <memory>
#include <utils/Entity.h>
#include <gltfio/FilamentAsset.h>
#include <filament/Scene.h>
#include <gltfio/FilamentAsset.h>
#include <math.h>
#include <utils/Entity.h>
#include "CustomGeometry.hpp"
#include "Log.hpp"
@@ -51,6 +53,8 @@ class SceneAsset {
virtual void setPriority(RenderableManager& rm, int mask) = 0;
virtual void setLayer(RenderableManager& rm, int layer) = 0;
virtual const filament::Aabb getBoundingBox() const = 0;
};