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: 9ca871117d0be3d4c655225d3f3dad6b0277cdd8 [formerly 9343fd818957da74e0bb7a5715a2172eefc325e5]
Former-commit-id: 93cf58c80f0cd396211df0c95063f0ad05449e75
This commit is contained in:
Lynix
2016-07-29 13:24:19 +02:00
parent a940efd3a1
commit b273a08571
9 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Graphics.hpp
View File

@@ -63,10 +63,10 @@
#include <Nazara/Graphics/ParticleDeclaration.hpp>
#include <Nazara/Graphics/ParticleEmitter.hpp>
#include <Nazara/Graphics/ParticleGenerator.hpp>
#include <Nazara/Graphics/ParticleGroup.hpp>
#include <Nazara/Graphics/ParticleMapper.hpp>
#include <Nazara/Graphics/ParticleRenderer.hpp>
#include <Nazara/Graphics/ParticleStruct.hpp>
#include <Nazara/Graphics/ParticleSystem.hpp>
#include <Nazara/Graphics/Renderable.hpp>
#include <Nazara/Graphics/RenderTechniques.hpp>
#include <Nazara/Graphics/SceneData.hpp>

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

@@ -18,7 +18,7 @@ namespace Nz
{
class ParticleController;
class ParticleMapper;
class ParticleSystem;
class ParticleGroup;
using ParticleControllerConstRef = ObjectRef<const ParticleController>;
using ParticleControllerLibrary = ObjectLibrary<ParticleController>;
@@ -34,7 +34,7 @@ namespace Nz
ParticleController(const ParticleController& controller);
virtual ~ParticleController();
virtual void Apply(ParticleSystem& system, ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime) = 0;
virtual void Apply(ParticleGroup& system, ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime) = 0;
// Signals:
NazaraSignal(OnParticleControllerRelease, const ParticleController* /*particleController*/);

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

@@ -14,7 +14,7 @@
namespace Nz
{
class ParticleMapper;
class ParticleSystem;
class ParticleGroup;
class NAZARA_GRAPHICS_API ParticleEmitter : public Node
{
@@ -24,7 +24,7 @@ namespace Nz
ParticleEmitter(ParticleEmitter&& emitter) = default;
virtual ~ParticleEmitter();
virtual void Emit(ParticleSystem& system, float elapsedTime) const;
virtual void Emit(ParticleGroup& system, float elapsedTime) const;
void EnableLagCompensation(bool enable);

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

@@ -18,7 +18,7 @@ namespace Nz
{
class ParticleGenerator;
class ParticleMapper;
class ParticleSystem;
class ParticleGroup;
using ParticleGeneratorConstRef = ObjectRef<const ParticleGenerator>;
using ParticleGeneratorLibrary = ObjectLibrary<ParticleGenerator>;
@@ -34,7 +34,7 @@ namespace Nz
ParticleGenerator(const ParticleGenerator& generator);
virtual ~ParticleGenerator();
virtual void Generate(ParticleSystem& system, ParticleMapper& mapper, unsigned int startId, unsigned int endId) = 0;
virtual void Generate(ParticleGroup& system, ParticleMapper& mapper, unsigned int startId, unsigned int endId) = 0;
// Signals:
NazaraSignal(OnParticleGeneratorRelease, const ParticleGenerator* /*particleGenerator*/);

18
include/Nazara/Graphics/ParticleSystem.hpp → include/Nazara/Graphics/ParticleGroup.hpp
View File

@@ -4,8 +4,8 @@
#pragma once
#ifndef NAZARA_PARTICLESYSTEM_HPP
#define NAZARA_PARTICLESYSTEM_HPP
#ifndef NAZARA_PARTICLEGROUP_HPP
#define NAZARA_PARTICLEGROUP_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/ParticleController.hpp>
@@ -22,13 +22,13 @@
namespace Nz
{
class NAZARA_GRAPHICS_API ParticleSystem : public Renderable
class NAZARA_GRAPHICS_API ParticleGroup : public Renderable
{
public:
ParticleSystem(unsigned int maxParticleCount, ParticleLayout layout);
ParticleSystem(unsigned int maxParticleCount, ParticleDeclarationConstRef declaration);
ParticleSystem(const ParticleSystem& emitter);
~ParticleSystem();
ParticleGroup(unsigned int maxParticleCount, ParticleLayout layout);
ParticleGroup(unsigned int maxParticleCount, ParticleDeclarationConstRef declaration);
ParticleGroup(const ParticleGroup& emitter);
~ParticleGroup();
void AddController(ParticleControllerRef controller);
void AddEmitter(ParticleEmitter* emitter);
@@ -66,7 +66,7 @@ namespace Nz
void Update(float elapsedTime);
void UpdateBoundingVolume(const Matrix4f& transformMatrix) override;
ParticleSystem& operator=(const ParticleSystem& emitter);
ParticleGroup& operator=(const ParticleGroup& emitter);
private:
void MakeBoundingVolume() const override;
@@ -89,4 +89,4 @@ namespace Nz
};
}
#endif // NAZARA_PARTICLESYSTEM_HPP
#endif // NAZARA_PARTICLEGROUP_HPP

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

@@ -19,7 +19,7 @@ namespace Nz
class AbstractRenderQueue;
class ParticleMapper;
class ParticleRenderer;
class ParticleSystem;
class ParticleGroup;
using ParticleRendererConstRef = ObjectRef<const ParticleRenderer>;
using ParticleRendererLibrary = ObjectLibrary<ParticleRenderer>;
@@ -35,7 +35,7 @@ namespace Nz
ParticleRenderer(const ParticleRenderer& renderer);
virtual ~ParticleRenderer();
virtual void Render(const ParticleSystem& system, const ParticleMapper& mapper, unsigned int startId, unsigned int endId, AbstractRenderQueue* renderQueue) = 0;
virtual void Render(const ParticleGroup& system, const ParticleMapper& mapper, unsigned int startId, unsigned int endId, AbstractRenderQueue* renderQueue) = 0;
// Signals:
NazaraSignal(OnParticleRendererRelease, const ParticleRenderer* /*particleRenderer*/);