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

Fix LogoDemo after mapper change

This commit is contained in:
Jérôme Leclercq 2017-10-06 09:18:14 +02:00
parent ecbc8343a5
commit f42be919e6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/Particles/LogoDemo.cpp
View File

@ -21,7 +21,7 @@ struct ParticleData
{ {
Nz::Color color; Nz::Color color;
Nz::Vector2f destination; Nz::Vector2f destination;
Nz::Vector2f position; Nz::Vector3f position;
Nz::Vector2f velocity; Nz::Vector2f velocity;
}; };
@ -33,18 +33,18 @@ struct SpriteController : public Nz::ParticleController
return; return;
auto destPtr = mapper.GetComponentPtr<Nz::Vector2f>(Nz::ParticleComponent_Userdata0); auto destPtr = mapper.GetComponentPtr<Nz::Vector2f>(Nz::ParticleComponent_Userdata0);
auto posPtr = mapper.GetComponentPtr<Nz::Vector2f>(Nz::ParticleComponent_Position); auto posPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Position);
auto velPtr = mapper.GetComponentPtr<Nz::Vector2f>(Nz::ParticleComponent_Velocity); auto velPtr = mapper.GetComponentPtr<Nz::Vector2f>(Nz::ParticleComponent_Velocity);
std::uniform_real_distribution<float> dis(-1.f, 1.f); std::uniform_real_distribution<float> dis(-1.f, 1.f);
for (unsigned int i = startId; i <= endId; ++i) for (unsigned int i = startId; i <= endId; ++i)
{ {
Nz::Vector2f newVel = destPtr[i] - posPtr[i]; Nz::Vector2f newVel = destPtr[i] - Nz::Vector2f(posPtr[i]);
float length; float length;
newVel.Normalize(&length); newVel.Normalize(&length);
float distance = SquaredDistancePointSegment(oldMousePos, actualMousePos, posPtr[i]); float distance = SquaredDistancePointSegment(oldMousePos, actualMousePos, Nz::Vector2f(posPtr[i]));
if (distance < 250.f) if (distance < 250.f)
{ {
Nz::Vector2f mouseLine = actualMousePos - oldMousePos; Nz::Vector2f mouseLine = actualMousePos - oldMousePos;
@ -162,7 +162,7 @@ ParticleDemo("Logo", sharedData)
m_declaration = Nz::ParticleDeclaration::New(); m_declaration = Nz::ParticleDeclaration::New();
m_declaration->EnableComponent(Nz::ParticleComponent_Color, Nz::ComponentType_Color, NazaraOffsetOf(ParticleData, color)); m_declaration->EnableComponent(Nz::ParticleComponent_Color, Nz::ComponentType_Color, NazaraOffsetOf(ParticleData, color));
m_declaration->EnableComponent(Nz::ParticleComponent_Position, Nz::ComponentType_Float2, NazaraOffsetOf(ParticleData, position)); m_declaration->EnableComponent(Nz::ParticleComponent_Position, Nz::ComponentType_Float3, NazaraOffsetOf(ParticleData, position));
m_declaration->EnableComponent(Nz::ParticleComponent_Userdata0, Nz::ComponentType_Float2, NazaraOffsetOf(ParticleData, destination)); m_declaration->EnableComponent(Nz::ParticleComponent_Userdata0, Nz::ComponentType_Float2, NazaraOffsetOf(ParticleData, destination));
m_declaration->EnableComponent(Nz::ParticleComponent_Velocity, Nz::ComponentType_Float2, NazaraOffsetOf(ParticleData, velocity)); m_declaration->EnableComponent(Nz::ParticleComponent_Velocity, Nz::ComponentType_Float2, NazaraOffsetOf(ParticleData, velocity));
} }
@ -265,7 +265,7 @@ void LogoExample::ResetParticles(float elapsed)
{ {
sprite->color = data.color; sprite->color = data.color;
sprite->destination = offset + Nz::Vector2f(data.pos); sprite->destination = offset + Nz::Vector2f(data.pos);
sprite->position.Set(disX(m_shared.randomGen) - float(width), disY(m_shared.randomGen)); sprite->position.Set(disX(m_shared.randomGen) - float(width), disY(m_shared.randomGen), 0.f);
sprite->velocity = Nz::Vector2f::Zero(); sprite->velocity = Nz::Vector2f::Zero();
sprite++; sprite++;
} }