From e9deac38024f0f040ada2bedcea4d6d9ecaa6307 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 26 Sep 2016 13:19:30 +0200 Subject: [PATCH] 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 --- include/Nazara/Graphics/ParticleStruct.hpp | 1 + src/Nazara/Graphics/ParticleDeclaration.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/include/Nazara/Graphics/ParticleStruct.hpp b/include/Nazara/Graphics/ParticleStruct.hpp index 72ce961b9..895e8fca2 100644 --- a/include/Nazara/Graphics/ParticleStruct.hpp +++ b/include/Nazara/Graphics/ParticleStruct.hpp @@ -17,6 +17,7 @@ namespace Nz struct ParticleStruct_Billboard { Color color; + Vector2f size; Vector3f normal; Vector3f position; Vector3f velocity; diff --git a/src/Nazara/Graphics/ParticleDeclaration.cpp b/src/Nazara/Graphics/ParticleDeclaration.cpp index dff382d2c..ebd84e95d 100644 --- a/src/Nazara/Graphics/ParticleDeclaration.cpp +++ b/src/Nazara/Graphics/ParticleDeclaration.cpp @@ -291,6 +291,7 @@ namespace Nz declaration->EnableComponent(ParticleComponent_Normal, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, normal)); declaration->EnableComponent(ParticleComponent_Position, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, position)); 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)); NazaraAssert(declaration->GetStride() == sizeof(ParticleStruct_Billboard), "Invalid stride for declaration ParticleLayout_Billboard");