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

Merge branch 'master' into SDL2

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-05-27 11:11:21 +02:00
committed by GitHub
parent 96ea792656 ca2425f310
commit 1425f99edf
211 changed files with 7628 additions and 2883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/Particles/SpacebattleDemo.cpp
View File

@@ -230,6 +230,8 @@ ParticleDemo("Space battle", sharedData)
Ndk::InitializeSystem<SpaceshipSystem>();
Nz::ModelParameters parameters;
parameters.mesh.texCoordOffset.Set(0.f, 1.f);
parameters.mesh.texCoordScale.Set(1.f, -1.f);
parameters.mesh.optimizeIndexBuffers = false;
Nz::Color grey(100, 100, 100);
@@ -266,7 +268,8 @@ ParticleDemo("Space battle", sharedData)
m_turret.cannonModel->GetMaterial(0)->SetNormalMap("resources/Turret/198_norm.jpg");
parameters.mesh.matrix.MakeIdentity();
parameters.mesh.texCoordScale.Set(1.f, 1.f);
parameters.mesh.texCoordOffset.Set(0.f, 1.f);
parameters.mesh.texCoordScale.Set(1.f, -1.f);
parameters.mesh.center = true;
m_spacestationModel = Nz::Model::LoadFromFile("resources/SpaceStation/space_station.obj", parameters);
@@ -275,7 +278,8 @@ ParticleDemo("Space battle", sharedData)
m_spacestationModel->GetMesh()->GenerateNormalsAndTangents();
parameters.mesh.texCoordScale.Set(1.f, -1.f);
parameters.mesh.texCoordOffset.Set(0.f, 0.f);
parameters.mesh.texCoordScale.Set(1.f, 1.f);
parameters.mesh.matrix.MakeRotation(Nz::EulerAnglesf(0.f, -90.f, 0.f));
m_spaceshipModel = Nz::Model::LoadFromFile("resources/space_frigate_6/space_frigate_6.obj", parameters);
@@ -592,7 +596,6 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
auto colorPtr = mapper.GetComponentPtr<Nz::Color>(Nz::ParticleComponent_Color);
auto lifePtr = mapper.GetComponentPtr<float>(Nz::ParticleComponent_Life);
float velFactor = std::pow(0.9f, elapsedTime / 0.1f);
for (unsigned int i = startId; i <= endId; ++i)
colorPtr[i].a = static_cast<Nz::UInt8>(Nz::Clamp(lifePtr[i] * 255.f, 0.f, 255.f));
}));