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

Graphics/ParticleStruct: Add size member to ParticleStruct_Billboard 

Former-commit-id: c8578baad436d18d609d4cc7cf1d773ba01b8616 [formerly fff8b8fce1a6b0a5330dc983e46676d9de6bc810] [formerly 9d584febdb50e4680d4beb24c5fb65371b838ffa [formerly cdbfc358e3c66ade396353c5d996c6d5c7fba313]]
Former-commit-id: 54ab0d22f7e947a2ee01fa9f36bd0e81af40e91d [formerly fc75d5fcd8351f4c9bccfd4c3a57131365d52ea4]
Former-commit-id: 79f3c8b08ad0089988e59139baaf87bf2aa5460b
This commit is contained in:
Lynix 2016-09-26 13:19:30 +02:00
parent a7b98c407a
commit e9deac3802
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Graphics/ParticleStruct.hpp
View File

@ -17,6 +17,7 @@ namespace Nz
struct ParticleStruct_Billboard struct ParticleStruct_Billboard
{ {
Color color; Color color;
Vector2f size;
Vector3f normal; Vector3f normal;
Vector3f position; Vector3f position;
Vector3f velocity; Vector3f velocity;

1
src/Nazara/Graphics/ParticleDeclaration.cpp
View File

@ -291,6 +291,7 @@ namespace Nz
declaration->EnableComponent(ParticleComponent_Normal, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, normal)); declaration->EnableComponent(ParticleComponent_Normal, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, normal));
declaration->EnableComponent(ParticleComponent_Position, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, position)); declaration->EnableComponent(ParticleComponent_Position, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, position));
declaration->EnableComponent(ParticleComponent_Rotation, ComponentType_Float1, NazaraOffsetOf(ParticleStruct_Billboard, rotation)); declaration->EnableComponent(ParticleComponent_Rotation, ComponentType_Float1, NazaraOffsetOf(ParticleStruct_Billboard, rotation));
declaration->EnableComponent(ParticleComponent_Size, ComponentType_Float2, NazaraOffsetOf(ParticleStruct_Billboard, size));
declaration->EnableComponent(ParticleComponent_Velocity, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, velocity)); declaration->EnableComponent(ParticleComponent_Velocity, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, velocity));
NazaraAssert(declaration->GetStride() == sizeof(ParticleStruct_Billboard), "Invalid stride for declaration ParticleLayout_Billboard"); NazaraAssert(declaration->GetStride() == sizeof(ParticleStruct_Billboard), "Invalid stride for declaration ParticleLayout_Billboard");