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: 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
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);
}