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

Graphics: Change ParticleStruct_Sprite position and velocity type from Vector2f to Vector3f 

Former-commit-id: 3e608a9622d6c759ca0d9cc42d5f5460a6e4488a [formerly b31994657a126489c141ca6bbd4f7745876b0fb3] [formerly 833df21d1208e31b5141dca3d9777c4822556ddd [formerly 638d3aa5c15845fc49c97727aa00aca2d670bedf]]
Former-commit-id: bb2418f3523c525691ebedf044b47314fcdec6bb [formerly 43c4cae99f5b0a20431e6118f2b134e0a930633f]
Former-commit-id: ffb8160b1574acd1063dab4ca151f420ff0940e8
This commit is contained in:
Lynix 2016-08-03 13:47:17 +02:00
parent e7b940c6cf
commit cf8224b9e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,8 +35,8 @@ namespace Nz
struct ParticleStruct_Sprite
{
Color color;
Vector2f position;
Vector2f velocity;
Vector3f position;
Vector3f velocity;
UInt32 life;
float rotation;
};

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

@ -308,9 +308,9 @@ namespace Nz
declaration = &s_declarations[ParticleLayout_Sprite];
declaration->EnableComponent(ParticleComponent_Color, ComponentType_Color, NazaraOffsetOf(ParticleStruct_Sprite, color));
declaration->EnableComponent(ParticleComponent_Life, ComponentType_Int1, NazaraOffsetOf(ParticleStruct_Sprite, life));
declaration->EnableComponent(ParticleComponent_Position, ComponentType_Float2, NazaraOffsetOf(ParticleStruct_Sprite, position));
declaration->EnableComponent(ParticleComponent_Position, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Sprite, position));
declaration->EnableComponent(ParticleComponent_Rotation, ComponentType_Float1, NazaraOffsetOf(ParticleStruct_Sprite, rotation));
declaration->EnableComponent(ParticleComponent_Velocity, ComponentType_Float2, NazaraOffsetOf(ParticleStruct_Sprite, velocity));
declaration->EnableComponent(ParticleComponent_Velocity, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Sprite, velocity));
NazaraAssert(declaration->GetStride() == sizeof(ParticleStruct_Sprite), "Invalid stride for declaration ParticleLayout_Sprite");
}