diff options
Diffstat (limited to 'demos/smoke/Simulation.cpp')
| -rw-r--r-- | demos/smoke/Simulation.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/demos/smoke/Simulation.cpp b/demos/smoke/Simulation.cpp index cc5fbabf..0346a7ee 100644 --- a/demos/smoke/Simulation.cpp +++ b/demos/smoke/Simulation.cpp @@ -26,8 +26,16 @@ class MeshPicker { public: MeshPicker() : pattern_({{ - Meshes::MESH_PYRAMID, Meshes::MESH_ICOSPHERE, Meshes::MESH_TEAPOT, Meshes::MESH_PYRAMID, Meshes::MESH_ICOSPHERE, - Meshes::MESH_PYRAMID, Meshes::MESH_PYRAMID, Meshes::MESH_PYRAMID, Meshes::MESH_PYRAMID, Meshes::MESH_PYRAMID, + Meshes::MESH_PYRAMID, + Meshes::MESH_ICOSPHERE, + Meshes::MESH_TEAPOT, + Meshes::MESH_PYRAMID, + Meshes::MESH_ICOSPHERE, + Meshes::MESH_PYRAMID, + Meshes::MESH_PYRAMID, + Meshes::MESH_PYRAMID, + Meshes::MESH_PYRAMID, + Meshes::MESH_PYRAMID, }}), cur_(-1) {} @@ -249,7 +257,10 @@ Simulation::Simulation(int object_count) : random_dev_() { float scale = mesh.scale(type); objects_.emplace_back(Object{ - type, glm::vec3(0.5f + 0.5f * (float)i / object_count), color.pick(), Animation(random_dev_(), scale), + type, + glm::vec3(0.5f + 0.5f * (float)i / object_count), + color.pick(), + Animation(random_dev_(), scale), Path(random_dev_()), }); } |
