From 8cfaf1beebcfc3bfcd26d060257b3339df25972d Mon Sep 17 00:00:00 2001 From: Dustin Graves Date: Wed, 6 Apr 2016 10:16:05 -0600 Subject: 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 --- demos/smoke/Simulation.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'demos/smoke/Simulation.cpp') 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_()), }); } } -- cgit v1.2.3