Skip to content
Snippets Groups Projects
Commit 718ded9d authored by Sebastian Gaida's avatar Sebastian Gaida
Browse files

[#69] change some properties for visibility

parent 5d961c25
No related branches found
No related tags found
1 merge request!56Resolve "Partikelsystem"
Pipeline #25696 failed
...@@ -19,7 +19,7 @@ void ParticleSystem::updateParticles( const float deltaTime ){ ...@@ -19,7 +19,7 @@ void ParticleSystem::updateParticles( const float deltaTime ){
for(Particle& particle :m_particles){ for(Particle& particle :m_particles){
bool alive = particle.isAlive(); bool alive = particle.isAlive();
particle.setPosition( particle.getPosition() * static_cast<float>(alive) + static_cast<float>(!alive) * m_respawnPos ); particle.setPosition( particle.getPosition() * static_cast<float>(alive) + static_cast<float>(!alive) * m_respawnPos );
particle.setVelocity( particle.getVelocity() * static_cast<float>(alive) + static_cast<float>(!alive) * glm::vec3(m_rdmVel(m_rdmEngine), m_rdmVel(m_rdmEngine),m_rdmVel(m_rdmEngine))); particle.setVelocity( particle.getVelocity() * static_cast<float>(alive) + static_cast<float>(!alive) * glm::vec3(m_rdmVel(m_rdmEngine), m_rdmVel(m_rdmEngine),0.0f));
particle.setLifeTime( (particle.getLifeTime() * alive + !alive * m_maxLifeTime ) - deltaTime ); particle.setLifeTime( (particle.getLifeTime() * alive + !alive * m_maxLifeTime ) - deltaTime );
particle.update(deltaTime); particle.update(deltaTime);
} }
......
...@@ -19,6 +19,7 @@ int main(int argc, const char** argv) { ...@@ -19,6 +19,7 @@ int main(int argc, const char** argv) {
); );
vkcv::CameraManager cameraManager(window, windowWidth, windowHeight); vkcv::CameraManager cameraManager(window, windowWidth, windowHeight);
cameraManager.getCamera().setNearFar(0.000000001f, 10.f);
window.initEvents(); window.initEvents();
...@@ -80,9 +81,9 @@ int main(int argc, const char** argv) { ...@@ -80,9 +81,9 @@ int main(int argc, const char** argv) {
{ core.getDescriptorSet(descriptorSet).layout }, { core.getDescriptorSet(descriptorSet).layout },
true); true);
const std::vector<glm::vec3> vertices = {glm::vec3(-0.1, 0.1, 0), const std::vector<glm::vec3> vertices = {glm::vec3(-0.02, 0.02, 0),
glm::vec3( 0.1, 0.1, 0), glm::vec3( 0.02, 0.02, 0),
glm::vec3(0, -0.1, 0)}; glm::vec3(0, -0.02, 0)};
vertexBuffer.fill(vertices); vertexBuffer.fill(vertices);
...@@ -134,9 +135,12 @@ int main(int argc, const char** argv) { ...@@ -134,9 +135,12 @@ int main(int argc, const char** argv) {
glm::vec3 vel1 = glm::vec3(rdmVel(rdmEngine) , rdmVel(rdmEngine), 0.0f); glm::vec3 vel1 = glm::vec3(rdmVel(rdmEngine) , rdmVel(rdmEngine), 0.0f);
glm::vec3 vel2 = glm::vec3(rdmVel(rdmEngine) , rdmVel(rdmEngine), 0.0f); glm::vec3 vel2 = glm::vec3(rdmVel(rdmEngine) , rdmVel(rdmEngine), 0.0f);
particleSystem.addParticles({ particleSystem.addParticles({
Particle(glm::vec3(0.f, 1.f, 0.f), vel0, 1.f), Particle(glm::vec3(0.f, 1.f, 0.0f), vel0, 1.f),
Particle(glm::vec3( 0.2f, 0.1f, 0.f), vel1, 2.f), Particle(glm::vec3( 0.2f, 0.1f, 0.0f), vel1, 1.5f),
Particle(glm::vec3(0.15f, 0.f, 0.1f), vel2, 3.f)}); Particle(glm::vec3(0.15f, 0.f, 0.0f), vel2, 2.f),
Particle(glm::vec3(-0.15f, 0.1f, 0.0f), vel2, 2.5f),
Particle(glm::vec3(0.25f, 0.f, 0.0f), vel2, 3.f),
Particle(glm::vec3(-0.15f, 0.2f, 0.0f), vel2, 3.5f)});
std::vector<glm::mat4> modelMatrices; std::vector<glm::mat4> modelMatrices;
std::vector<vkcv::DrawcallInfo> drawcalls; std::vector<vkcv::DrawcallInfo> drawcalls;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment