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

Build: Fix empty install commands

Browse Source 
Former-commit-id: b1bc095ab7394364acbeaf672f6d4c6dcbfc2c71 [formerly 1b44b6b1fea962ed28b401f36c2ad12a8324ef2a]
Former-commit-id: b2193ae86ce18618874827a440ab23abeb83a5e6
This commit is contained in:
Lynix
2016-07-31 12:59:04 +02:00
parent 487bc7383c
commit 3eceba1770
6 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
#define NAZARA_PARTICLEEMITTER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Signal.hpp>
#include <Nazara/Graphics/Config.hpp>
namespace Nz
@@ -20,7 +21,7 @@ namespace Nz
public:
ParticleEmitter();
ParticleEmitter(const ParticleEmitter& emitter) = default;
ParticleEmitter(ParticleEmitter&& emitter) = default;
ParticleEmitter(ParticleEmitter&& emitter);
virtual ~ParticleEmitter();
virtual void Emit(ParticleGroup& system, float elapsedTime) const;
@@ -36,7 +37,11 @@ namespace Nz
void SetEmissionRate(float rate);
ParticleEmitter& operator=(const ParticleEmitter& emitter) = default;
ParticleEmitter& operator=(ParticleEmitter&& emitter) = default;
ParticleEmitter& operator=(ParticleEmitter&& emitter);
// Signals:
NazaraSignal(OnParticleEmitterMove, const ParticleEmitter* /*oldParticleEmitter*/, const ParticleEmitter* /*newParticleEmitter*/);
NazaraSignal(OnParticleEmitterRelease, const ParticleEmitter* /*particleEmitter*/);
private:
virtual void SetupParticles(ParticleMapper& mapper, unsigned int count) const = 0;

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

@@ -8,6 +8,7 @@
#define NAZARA_PARTICLEGROUP_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/signal.hpp>
#include <Nazara/Graphics/ParticleController.hpp>
#include <Nazara/Graphics/ParticleDeclaration.hpp>
#include <Nazara/Graphics/ParticleEmitter.hpp>
@@ -62,6 +63,9 @@ namespace Nz
ParticleGroup& operator=(const ParticleGroup& emitter);
// Signals:
NazaraSignal(OnParticleGroupRelease, const ParticleGroup* /*particleGroup*/);
private:
void MakeBoundingVolume() const override;
void ResizeBuffer();