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

Sdk/GraphicsComponent: Add Detach method

Browse Source 
Former-commit-id: 08d5c0fa0d1cd09d6f58a0dfe75a3d952b62cae6 [formerly 75463d92e087e8791feda751fe2514c18fedf942]
Former-commit-id: aebd5945083f9339294077701093184f7700704b
This commit is contained in:
Lynix
2016-06-20 13:11:31 +02:00
parent daf1dadda0
commit 31f052d405
10 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,14 +55,27 @@ namespace Nz
struct InstanceData
{
InstanceData(Matrix4f& referenceMatrix) :
transformMatrix(referenceMatrix),
transformMatrix(&referenceMatrix),
flags(0)
{
}
InstanceData(InstanceData&& instanceData) noexcept = default;
InstanceData& operator=(InstanceData&& instanceData) noexcept
{
data = std::move(instanceData.data);
flags = instanceData.flags;
renderOrder = instanceData.renderOrder;
transformMatrix = instanceData.transformMatrix;
volume = instanceData.volume;
return *this;
}
std::vector<UInt8> data;
BoundingVolumef volume;
Matrix4f& transformMatrix;
Matrix4f* transformMatrix;
UInt32 flags;
int renderOrder;
};