Graphics/InstancedRenderable: Replace constructor AABB with UpdateAABB method
This commit is contained in:
@@ -14,7 +14,6 @@
|
||||
namespace Nz
|
||||
{
|
||||
Model::Model(std::shared_ptr<GraphicalMesh> graphicalMesh, const Boxf& aabb) :
|
||||
InstancedRenderable(aabb),
|
||||
m_graphicalMesh(std::move(graphicalMesh))
|
||||
{
|
||||
m_submeshes.reserve(m_graphicalMesh->GetSubMeshCount());
|
||||
@@ -29,6 +28,8 @@ namespace Nz
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
UpdateAABB(aabb);
|
||||
}
|
||||
|
||||
void Model::BuildElement(std::size_t passIndex, const WorldInstance& worldInstance, std::vector<std::unique_ptr<RenderElement>>& elements) const
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
namespace Nz
|
||||
{
|
||||
Sprite::Sprite(std::shared_ptr<Material> material) :
|
||||
InstancedRenderable(Nz::Boxf(-1000.f, -1000.f, -1000.f, 2000.f, 2000.f, 2000.f)),
|
||||
m_material(std::move(material)),
|
||||
m_color(Color::White),
|
||||
m_textureCoords(0.f, 0.f, 1.f, 1.f),
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
namespace Nz
|
||||
{
|
||||
TextSprite::TextSprite(std::shared_ptr<Material> material) :
|
||||
InstancedRenderable(Nz::Boxf(-10000.f, -10000.f, -10000.f, 20000.f, 20000.f, 20000.f)),
|
||||
InstancedRenderable(),
|
||||
m_material(std::move(material))
|
||||
{
|
||||
}
|
||||
@@ -208,10 +208,7 @@ namespace Nz
|
||||
indices->count++;
|
||||
}
|
||||
|
||||
/*m_localBounds = drawer.GetBounds();
|
||||
|
||||
InvalidateBoundingVolume();
|
||||
InvalidateInstanceData(0);*/
|
||||
UpdateAABB(bounds);
|
||||
|
||||
clearOnFail.Reset();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user