Build: Fix empty install commands

Former-commit-id: 7083dfd9716873707791d46bc1fe333a6e229712 [formerly a8122cb99bcf5023ffad732fbf8d2b922faf1252]
Former-commit-id: b9913ad6e47551044afd0259f9a1b64b82b1a743
This commit is contained in:
Lynix 2016-07-31 12:59:04 +02:00
parent 9d018485cb
commit 554c17702b
6 changed files with 46 additions and 5 deletions

View File

@ -20,6 +20,7 @@ namespace Ndk
ParticleEmitterComponent(Nz::ParticleGroup* group);
ParticleEmitterComponent(const ParticleEmitterComponent& emitter);
ParticleEmitterComponent(ParticleEmitterComponent&& emitter);
~ParticleEmitterComponent();
inline bool IsActive() const;
@ -31,8 +32,12 @@ namespace Ndk
static ComponentIndex componentIndex;
private:
void OnParticleGroupRelease(const Nz::ParticleGroup* particleGroup);
void SetupParticles(Nz::ParticleMapper& mapper, unsigned int count) const override;
NazaraSlot(Nz::ParticleGroup, OnParticleGroupRelease, m_particleGroupRelease);
SetupFunc m_setupFunc;
Nz::ParticleGroup* m_particleGroup;
bool m_isActive;

View File

@ -693,9 +693,11 @@ function NazaraBuild:LoadConfig()
local paths = string.explode(self.Config["InstallDir"], ";")
for k,v in pairs(paths) do
if (#v > 0) then
self:AddInstallPath(v)
end
end
end
function NazaraBuild:MakeInstallCommands(infoTable)
if (PremakeVersion < 50) then

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;

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();

View File

@ -32,7 +32,19 @@ namespace Nz
{
}
ParticleEmitter::~ParticleEmitter() = default;
ParticleEmitter::ParticleEmitter(ParticleEmitter&& emitter) :
m_lagCompensationEnabled(emitter.m_lagCompensationEnabled),
m_emissionAccumulator(0.f),
m_emissionRate(emitter.m_emissionRate),
m_emissionCount(emitter.m_emissionCount)
{
OnParticleEmitterMove(&emitter, this);
}
ParticleEmitter::~ParticleEmitter()
{
OnParticleEmitterRelease(this);
}
/*!
* \brief Emits particles according to the delta time between the previous frame
@ -141,4 +153,14 @@ namespace Nz
{
m_emissionRate = rate;
}
ParticleEmitter& ParticleEmitter::operator=(ParticleEmitter && emitter)
{
m_emissionCount = emitter.m_emissionCount;
m_emissionRate = emitter.m_emissionRate;
m_lagCompensationEnabled = emitter.m_lagCompensationEnabled;
OnParticleEmitterMove(&emitter, this);
return *this;
}
}

View File

@ -77,7 +77,10 @@ namespace Nz
std::memcpy(m_buffer.data(), system.m_buffer.data(), system.m_particleCount*m_particleSize);
}
ParticleGroup::~ParticleGroup() = default;
ParticleGroup::~ParticleGroup()
{
OnParticleGroupRelease(this);
}
/*!
* \brief Adds a controller to the particles