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

Sdk/GraphicsComponent: Allows to setup an offset to renderables 

Former-commit-id: a5e9ceb3f30e79a0d3b96b6866a06441cbc0b463 [formerly 8af071cedec0a6aca00ff9c12d66e8a0817049c6] [formerly cd7e7040fd68dd5a74a0b458a3a305c251257b51 [formerly 0f9382c169a260d5fa34fe9b1ab64c3d19dbd385]]
Former-commit-id: 774af2326cb64824f85835c83464bc19884005e1 [formerly 4b676844f6dd56940b4f503c6a943905ea8a54c3]
Former-commit-id: 0673e4d4cd88c99d24e0e153a61d2726e2e2c039
This commit is contained in:
Lynix 2016-09-04 20:02:23 +02:00
parent e63e5754b9
commit ba6c562367
12 changed files with 34 additions and 19 deletions
Show Stats 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 AddToRenderQueue(Nz::AbstractRenderQueue* renderQueue) const;
inline void Attach(Nz::InstancedRenderableRef renderable, int renderOrder = 0); 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(); 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" // This file is part of the "Nazara Development Kit"
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp // 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 <algorithm>
#include "GraphicsComponent.hpp"
namespace Ndk namespace Ndk
{ {
@ -36,10 +38,13 @@ namespace Ndk
{ {
EnsureTransformMatrixUpdate(); EnsureTransformMatrixUpdate();
Ndk::RenderSystem& renderSystem = m_entity->GetWorld()->GetSystem<Ndk::RenderSystem>();
for (const Renderable& object : m_renderables) for (const Renderable& object : m_renderables)
{ {
if (!object.dataUpdated) 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.renderable->UpdateData(&object.data);
object.dataUpdated = true; object.dataUpdated = true;
} }
@ -56,9 +61,15 @@ namespace Ndk
*/ */
inline void GraphicsComponent::Attach(Nz::InstancedRenderableRef renderable, int renderOrder) 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); m_renderables.emplace_back(m_transformMatrix);
Renderable& r = m_renderables.back(); Renderable& r = m_renderables.back();
r.data.localMatrix = localMatrix;
r.data.renderOrder = renderOrder; r.data.renderOrder = renderOrder;
r.renderable = std::move(renderable); 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)); 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>(); 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; m_transformMatrixUpdated = true;
} }

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

@ -54,8 +54,8 @@ namespace Nz
struct InstanceData struct InstanceData
{ {
InstanceData(const Matrix4f& referenceMatrix) : InstanceData(const Matrix4f& transformationMatrix) :
transformMatrix(&referenceMatrix), localMatrix(transformationMatrix),
flags(0) flags(0)
{ {
} }
@ -67,6 +67,7 @@ namespace Nz
data = std::move(instanceData.data); data = std::move(instanceData.data);
flags = instanceData.flags; flags = instanceData.flags;
renderOrder = instanceData.renderOrder; renderOrder = instanceData.renderOrder;
localMatrix = instanceData.localMatrix;
transformMatrix = instanceData.transformMatrix; transformMatrix = instanceData.transformMatrix;
volume = instanceData.volume; volume = instanceData.volume;
@ -75,7 +76,8 @@ namespace Nz
std::vector<UInt8> data; std::vector<UInt8> data;
BoundingVolumef volume; BoundingVolumef volume;
const Matrix4f* transformMatrix; Matrix4f localMatrix;
mutable Matrix4f transformMatrix;
UInt32 flags; UInt32 flags;
int renderOrder; int renderOrder;
}; };

3
include/Nazara/Graphics/Model.inl
View File

@ -18,8 +18,9 @@ namespace Nz
*/ */
inline void Model::AddToRenderQueue(AbstractRenderQueue* renderQueue, const Matrix4f& transformMatrix, unsigned int renderOrder) inline void Model::AddToRenderQueue(AbstractRenderQueue* renderQueue, const Matrix4f& transformMatrix, unsigned int renderOrder)
{ {
InstanceData instanceData(transformMatrix); InstanceData instanceData(Nz::Matrix4f::Identity());
instanceData.renderOrder = renderOrder; instanceData.renderOrder = renderOrder;
instanceData.transformMatrix = transformMatrix;
return AddToRenderQueue(renderQueue, instanceData); return AddToRenderQueue(renderQueue, instanceData);
} }

2
src/Nazara/Graphics/Billboard.cpp
View File

@ -30,7 +30,7 @@ namespace Nz
if (!m_material) if (!m_material)
return; return;
Nz::Vector3f position = instanceData.transformMatrix->GetTranslation(); Nz::Vector3f position = instanceData.transformMatrix.GetTranslation();
renderQueue->AddBillboards(instanceData.renderOrder, m_material, 1, &position, &m_size, &m_sinCos, &m_color); renderQueue->AddBillboards(instanceData.renderOrder, m_material, 1, &position, &m_size, &m_sinCos, &m_color);
} }

2
src/Nazara/Graphics/InstancedRenderable.cpp
View File

@ -80,7 +80,7 @@ namespace Nz
NazaraAssert(instanceData, "Invalid instance data"); NazaraAssert(instanceData, "Invalid instance data");
NazaraUnused(instanceData); NazaraUnused(instanceData);
instanceData->volume.Update(*instanceData->transformMatrix); instanceData->volume.Update(instanceData->transformMatrix);
} }
/*! /*!

2
src/Nazara/Graphics/Model.cpp
View File

@ -82,7 +82,7 @@ namespace Nz
meshData.primitiveMode = mesh->GetPrimitiveMode(); meshData.primitiveMode = mesh->GetPrimitiveMode();
meshData.vertexBuffer = mesh->GetVertexBuffer(); meshData.vertexBuffer = mesh->GetVertexBuffer();
renderQueue->AddMesh(instanceData.renderOrder, material, meshData, mesh->GetAABB(), *instanceData.transformMatrix); renderQueue->AddMesh(instanceData.renderOrder, material, meshData, mesh->GetAABB(), instanceData.transformMatrix);
} }
} }

2
src/Nazara/Graphics/SkeletalModel.cpp
View File

@ -69,7 +69,7 @@ namespace Nz
meshData.primitiveMode = mesh->GetPrimitiveMode(); meshData.primitiveMode = mesh->GetPrimitiveMode();
meshData.vertexBuffer = SkinningManager::GetBuffer(mesh, &m_skeleton); meshData.vertexBuffer = SkinningManager::GetBuffer(mesh, &m_skeleton);
renderQueue->AddMesh(instanceData.renderOrder, material, meshData, m_skeleton.GetAABB(), *instanceData.transformMatrix); renderQueue->AddMesh(instanceData.renderOrder, material, meshData, m_skeleton.GetAABB(), instanceData.transformMatrix);
} }
} }

8
src/Nazara/Graphics/Sprite.cpp
View File

@ -62,19 +62,19 @@ namespace Nz
Vector3f origin(m_origin.x, -m_origin.y, m_origin.z); Vector3f origin(m_origin.x, -m_origin.y, m_origin.z);
*colorPtr++ = m_color; *colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(Vector3f(-origin)); *posPtr++ = instanceData->transformMatrix.Transform(Vector3f(-origin));
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftTop); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftTop);
*colorPtr++ = m_color; *colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() - origin); *posPtr++ = instanceData->transformMatrix.Transform(m_size.x*Vector3f::Right() - origin);
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightTop); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightTop);
*colorPtr++ = m_color; *colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(m_size.y*Vector3f::Down() - origin); *posPtr++ = instanceData->transformMatrix.Transform(m_size.y*Vector3f::Down() - origin);
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftBottom); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftBottom);
*colorPtr++ = m_color; *colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down() - origin); *posPtr++ = instanceData->transformMatrix.Transform(m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down() - origin);
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightBottom); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightBottom);
} }

2
src/Nazara/Graphics/TextSprite.cpp
View File

@ -310,7 +310,7 @@ namespace Nz
Vector3f localPos = localVertex->position.x*Vector3f::Right() + localVertex->position.y*Vector3f::Down(); Vector3f localPos = localVertex->position.x*Vector3f::Right() + localVertex->position.y*Vector3f::Down();
localPos *= m_scale; localPos *= m_scale;
*pos++ = instanceData->transformMatrix->Transform(localPos); *pos++ = instanceData->transformMatrix.Transform(localPos);
*color++ = m_color * localVertex->color; *color++ = m_color * localVertex->color;
*uv++ = localVertex->uv; *uv++ = localVertex->uv;

8
src/Nazara/Graphics/TileMap.cpp
View File

@ -71,19 +71,19 @@ namespace Nz
Vector3f tileLeftCorner(x * m_tileSize.x, y * -m_tileSize.y, 0.f); Vector3f tileLeftCorner(x * m_tileSize.x, y * -m_tileSize.y, 0.f);
*colorPtr++ = tile.color; *colorPtr++ = tile.color;
*posPtr++ = instanceData->transformMatrix->Transform(tileLeftCorner); *posPtr++ = instanceData->transformMatrix.Transform(tileLeftCorner);
*texCoordPtr++ = tile.textureCoords.GetCorner(RectCorner_LeftTop); *texCoordPtr++ = tile.textureCoords.GetCorner(RectCorner_LeftTop);
*colorPtr++ = tile.color; *colorPtr++ = tile.color;
*posPtr++ = instanceData->transformMatrix->Transform(tileLeftCorner + m_tileSize.x * Vector3f::Right()); *posPtr++ = instanceData->transformMatrix.Transform(tileLeftCorner + m_tileSize.x * Vector3f::Right());
*texCoordPtr++ = tile.textureCoords.GetCorner(RectCorner_RightTop); *texCoordPtr++ = tile.textureCoords.GetCorner(RectCorner_RightTop);
*colorPtr++ = tile.color; *colorPtr++ = tile.color;
*posPtr++ = instanceData->transformMatrix->Transform(tileLeftCorner + m_tileSize.y * Vector3f::Down()); *posPtr++ = instanceData->transformMatrix.Transform(tileLeftCorner + m_tileSize.y * Vector3f::Down());
*texCoordPtr++ = tile.textureCoords.GetCorner(RectCorner_LeftBottom); *texCoordPtr++ = tile.textureCoords.GetCorner(RectCorner_LeftBottom);
*colorPtr++ = tile.color; *colorPtr++ = tile.color;
*posPtr++ = instanceData->transformMatrix->Transform(tileLeftCorner + m_tileSize.x * Vector3f::Right() + m_tileSize.y * Vector3f::Down()); *posPtr++ = instanceData->transformMatrix.Transform(tileLeftCorner + m_tileSize.x * Vector3f::Right() + m_tileSize.y * Vector3f::Down());
*texCoordPtr++ = tile.textureCoords.GetCorner(RectCorner_RightBottom); *texCoordPtr++ = tile.textureCoords.GetCorner(RectCorner_RightBottom);
} }
spriteCount += layer.tiles.size(); spriteCount += layer.tiles.size();