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

Sdk/GraphicsComponent: Allows to setup an offset to renderables

Browse Source 
Former-commit-id: 8803527725eb537ec2a85e64479ac9037b59da48 [formerly 8d2aca710c0fa942c6a5b89e0c6cba5722cf1601] [formerly e44866a9ffea3643893ffff5d9fe8418b00b961d [formerly 6efd8e148208de0d2817679321acca69f75617fc]]
Former-commit-id: e79e25aca4df5fc5ee79b5963a35050d8c3cd79c [formerly 8e324bda1c9e43fb88aaf31e2d38b0ff587aa03f]
Former-commit-id: 735155f96801d382e36f9be78c44afbcb35cb236
This commit is contained in:
Lynix
2016-09-04 20:02:23 +02:00
parent 2b27ba35c3
commit 05053fdf5e
12 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SDK/include/NDK/Components/GraphicsComponent.hpp
View File

@@ -32,6 +32,7 @@ namespace Ndk
inline void AddToRenderQueue(Nz::AbstractRenderQueue* renderQueue) const;
inline void Attach(Nz::InstancedRenderableRef renderable, int renderOrder = 0);
inline void Attach(Nz::InstancedRenderableRef renderable, const Nz::Matrix4f& localMatrix, int renderOrder = 0);
inline void Clear();

13
SDK/include/NDK/Components/GraphicsComponent.inl
View File

@@ -2,8 +2,10 @@
// This file is part of the "Nazara Development Kit"
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
#include <NDK/Components/GraphicsComponent.hpp>
#include <NDK/World.hpp>
#include <NDK/Systems/RenderSystem.hpp>
#include <algorithm>
#include "GraphicsComponent.hpp"
namespace Ndk
{
@@ -36,10 +38,13 @@ namespace Ndk
{
EnsureTransformMatrixUpdate();
Ndk::RenderSystem& renderSystem = m_entity->GetWorld()->GetSystem<Ndk::RenderSystem>();
for (const Renderable& object : m_renderables)
{
if (!object.dataUpdated)
{
object.data.transformMatrix = Nz::Matrix4f::ConcatenateAffine(renderSystem.GetCoordinateSystemMatrix(), Nz::Matrix4f::ConcatenateAffine(object.data.localMatrix, m_transformMatrix));
object.renderable->UpdateData(&object.data);
object.dataUpdated = true;
}
@@ -56,9 +61,15 @@ namespace Ndk
*/
inline void GraphicsComponent::Attach(Nz::InstancedRenderableRef renderable, int renderOrder)
{
return Attach(renderable, Nz::Matrix4f::Identity(), renderOrder);
}
inline void GraphicsComponent::Attach(Nz::InstancedRenderableRef renderable, const Nz::Matrix4f& localMatrix, int renderOrder)
{
m_renderables.emplace_back(m_transformMatrix);
Renderable& r = m_renderables.back();
r.data.localMatrix = localMatrix;
r.data.renderOrder = renderOrder;
r.renderable = std::move(renderable);
r.renderableInvalidationSlot.Connect(r.renderable->OnInstancedRenderableInvalidateData, std::bind(&GraphicsComponent::InvalidateRenderableData, this, std::placeholders::_1, std::placeholders::_2, m_renderables.size() - 1));

2
SDK/src/NDK/Components/GraphicsComponent.cpp
View File

@@ -133,7 +133,7 @@ namespace Ndk
Ndk::RenderSystem& renderSystem = m_entity->GetWorld()->GetSystem<Ndk::RenderSystem>();
m_transformMatrix = Nz::Matrix4f::ConcatenateAffine(renderSystem.GetCoordinateSystemMatrix(), m_entity->GetComponent<NodeComponent>().GetTransformMatrix());
m_transformMatrix = m_entity->GetComponent<NodeComponent>().GetTransformMatrix();
m_transformMatrixUpdated = true;
}