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

Graphics: Rename ParticleSystem to ParticleGroup

Browse Source 
Preparing for integration into the ECS


Former-commit-id: 201e28c9f00ee31f809d9de3d9a37f57a7fe740c [formerly 9b88616308f9801482fc8811a9a19a7231dce2a7]
Former-commit-id: 579f4e9597f94620f922fb145931202d8fc9cc96
This commit is contained in:
Lynix
2016-07-29 13:24:19 +02:00
parent 364cbed673
commit 9fa7267523
9 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/Engine/Graphics/ParticleSystem.cpp → tests/Engine/Graphics/ParticleGroup.cpp
View File

@@ -1,4 +1,4 @@
#include <Nazara/Graphics/ParticleSystem.hpp>
#include <Nazara/Graphics/ParticleGroup.hpp>
#include <Catch/catch.hpp>
#include <Nazara/Core/SparsePtr.hpp>
@@ -8,7 +8,7 @@ class TestParticleController : public Nz::ParticleController
{
public:
// Be aware that the interval is [startId, endId] and NOT [startId, endId)
void Apply(Nz::ParticleSystem& system, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime) override
void Apply(Nz::ParticleGroup& system, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime) override
{
Nz::SparsePtr<Nz::Vector3f> positionPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Position);
Nz::SparsePtr<Nz::Vector3f> velocityPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Velocity);
@@ -32,7 +32,7 @@ class TestParticleEmitter : public Nz::ParticleEmitter
public:
~TestParticleEmitter() override = default;
void Emit(Nz::ParticleSystem& system, float elapsedTime) const override
void Emit(Nz::ParticleGroup& system, float elapsedTime) const override
{
system.GenerateParticles(GetEmissionCount());
}
@@ -49,7 +49,7 @@ class TestParticleGenerator : public Nz::ParticleGenerator
~TestParticleGenerator() override = default;
// Be aware that the interval is [startId, endId] and NOT [startId, endId)
void Generate(Nz::ParticleSystem& system, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId) override
void Generate(Nz::ParticleGroup& system, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId) override
{
Nz::SparsePtr<Nz::Vector3f> positionPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Position);
Nz::SparsePtr<Nz::Vector3f> velocityPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Velocity);
@@ -68,35 +68,35 @@ class TestParticleGenerator : public Nz::ParticleGenerator
}
};
SCENARIO("ParticleSystem", "[GRAPHICS][PARTICLESYSTEM]")
SCENARIO("ParticleGroup", "[GRAPHICS][PARTICLEGROUP]")
{
GIVEN("A particle system of maximum 10 billboards with its generators")
{
// These need to be alive longer than the particle system
TestParticleController particleController;
TestParticleGenerator particleGenerator;
Nz::ParticleSystem particleSystem(10, Nz::ParticleLayout_Billboard);
Nz::ParticleGroup particleGroup(10, Nz::ParticleLayout_Billboard);
particleSystem.AddController(&particleController);
particleGroup.AddController(&particleController);
TestParticleEmitter particleEmitter;
particleEmitter.SetEmissionCount(10);
particleSystem.AddEmitter(&particleEmitter);
particleGroup.AddEmitter(&particleEmitter);
particleSystem.AddGenerator(&particleGenerator);
particleGroup.AddGenerator(&particleGenerator);
WHEN("We update to generate 10 particles")
{
particleSystem.Update(1.f);
particleGroup.Update(1.f);
THEN("There must be 10 particles")
{
REQUIRE(particleSystem.GetParticleCount() == 10);
REQUIRE(particleGroup.GetParticleCount() == 10);
}
AND_THEN("We update to make them die")
{
particleSystem.Update(2.f);
REQUIRE(particleSystem.GetParticleCount() == 0);
particleGroup.Update(2.f);
REQUIRE(particleGroup.GetParticleCount() == 0);
}
}
}