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

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

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