sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics/InstancedRenderable: Add signal to tell some renderables need to be rebuild

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-11-21 19:06:10 +01:00
parent d040cc6767
commit 8f1cc79dc2
6 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Graphics/ForwardFramePipeline.hpp
View File

@@ -68,6 +68,7 @@ namespace Nz
{
UInt32 renderMask = 0;
NazaraSlot(InstancedRenderable, OnElementInvalidated, onElementInvalidated);
NazaraSlot(InstancedRenderable, OnMaterialInvalidated, onMaterialInvalidated);
};

1
include/Nazara/Graphics/InstancedRenderable.hpp
View File

@@ -38,6 +38,7 @@ namespace Nz
InstancedRenderable& operator=(InstancedRenderable&&) noexcept = default;
NazaraSignal(OnAABBUpdate, InstancedRenderable* /*instancedRenderable*/, const Boxf& /*aabb*/);
NazaraSignal(OnElementInvalidated, InstancedRenderable* /*instancedRenderable*/);
NazaraSignal(OnMaterialInvalidated, InstancedRenderable* /*instancedRenderable*/, std::size_t /*materialIndex*/, const std::shared_ptr<Material>& /*newMaterial*/);
protected:

5
include/Nazara/Graphics/Sprite.inl
View File

@@ -56,19 +56,20 @@ namespace Nz
vertices++;
vertices->color = m_color * m_cornerColor[UnderlyingCast(RectCorner::LeftBottom)];
vertices->position = m_size.y * Vector3f::Down() - origin;
vertices->position = m_size.y * Vector3f::Up() - origin;
vertices->uv = m_textureCoords.GetCorner(RectCorner::LeftBottom);
aabb.ExtendTo(vertices->position);
vertices++;
vertices->color = m_color * m_cornerColor[UnderlyingCast(RectCorner::RightBottom)];
vertices->position = m_size.x * Vector3f::Right() + m_size.y * Vector3f::Down() - origin;
vertices->position = m_size.x * Vector3f::Right() + m_size.y * Vector3f::Up() - origin;
vertices->uv = m_textureCoords.GetCorner(RectCorner::RightBottom);
aabb.ExtendTo(vertices->position);
UpdateAABB(aabb);
OnElementInvalidated(this);
}
}

1
include/Nazara/Graphics/TextSprite.inl
View File

@@ -12,6 +12,7 @@ namespace Nz
{
m_atlases.clear();
m_vertices.clear();
OnElementInvalidated(this);
}
inline void TextSprite::SetMaterial(std::shared_ptr<Material> material)