Skip to content
Snippets Groups Projects
Verified Commit 299e8f9d authored by Josch Morgenstern's avatar Josch Morgenstern
Browse files

[#111] change particle generation

parent 4172304d
Branches
Tags
1 merge request!95Resolve "Wassersimulation mit Interaktion"
Pipeline #27253 passed
...@@ -131,10 +131,10 @@ int main(int argc, const char **argv) { ...@@ -131,10 +131,10 @@ int main(int argc, const char **argv) {
int numberParticles = 50000; int numberParticles = 50000;
std::vector<Particle> particles; std::vector<Particle> particles;
for (int i = 0; i < numberParticles; i++) { for (int i = 0; i < numberParticles; i++) {
const float lo = 0.4; const float lo = -0.2;
const float hi = 0.6; const float hi = 0.2;
const float vlo = -0.5; const float vlo = 0;
const float vhi = 0.5; const float vhi = 100;
float x = lo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(hi-lo))); float x = lo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(hi-lo)));
float y = lo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(hi-lo))); float y = lo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(hi-lo)));
float z = lo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(hi-lo))); float z = lo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(hi-lo)));
...@@ -142,7 +142,8 @@ int main(int argc, const char **argv) { ...@@ -142,7 +142,8 @@ int main(int argc, const char **argv) {
float vy = vlo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(vhi-vlo))); float vy = vlo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(vhi-vlo)));
float vz = vlo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(vhi-vlo))); float vz = vlo + static_cast <float> (rand()) /( static_cast <float> (RAND_MAX/(vhi-vlo)));
glm::vec3 pos = glm::vec3(x,y,z); glm::vec3 pos = glm::vec3(x,y,z);
glm::vec3 vel = glm::vec3(vx,vy,vz); //glm::vec3 vel = glm::vec3(vx,vy,vz);
glm::vec3 vel = glm::vec3(0.0,0.0,0.0);
particles.push_back(Particle(pos, vel)); particles.push_back(Particle(pos, vel));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment