aboutsummaryrefslogtreecommitdiff
path: root/demos/smoke/Simulation.cpp
diff options
context:
space:
mode:
authorDustin Graves <dustin@lunarg.com>2016-04-06 10:16:05 -0600
committerDustin Graves <dustin@lunarg.com>2016-04-06 12:03:51 -0600
commit8cfaf1beebcfc3bfcd26d060257b3339df25972d (patch)
treedbcec476c19c019b95e7d640fa64d2bfc8020e45 /demos/smoke/Simulation.cpp
parent6eae0eb4a02dfb28c5e80c8f369f8defc648f9b7 (diff)
downloadusermoji-8cfaf1beebcfc3bfcd26d060257b3339df25972d.tar.xz
demos/tests: Fix MSVS type warnings
Fixes the following MSVS warnings: - C4800 - forcing value to bool 'true' or 'false' - C4244 - conversion from type1 to type2, possible loss of data - C4267 - conversion from size_t to type, possible loss of data Change-Id: I78576c48c5d42e4c9116a83c5f4a4f4a5035e0fc
Diffstat (limited to 'demos/smoke/Simulation.cpp')
-rw-r--r--demos/smoke/Simulation.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/demos/smoke/Simulation.cpp b/demos/smoke/Simulation.cpp
index dab45d70..c219647e 100644
--- a/demos/smoke/Simulation.cpp
+++ b/demos/smoke/Simulation.cpp
@@ -297,11 +297,8 @@ Simulation::Simulation(int object_count)
float scale = mesh.scale(type);
objects_.emplace_back(Object{
- type,
- glm::vec3(0.5 + 0.5 * (float) i / object_count),
- color.pick(),
- Animation(random_dev_(), scale),
- Path(random_dev_()),
+ type, glm::vec3(0.5f + 0.5f * (float)i / object_count),
+ color.pick(), Animation(random_dev_(), scale), Path(random_dev_()),
});
}
}