From 1d2acbe47e700a0c780d8e82e45ea6a14441174a Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Mon, 8 Feb 2016 13:28:14 -0800 Subject: [PATCH] Bring GeometryCache render*Instance up to standard --- libraries/render-utils/src/GeometryCache.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/render-utils/src/GeometryCache.h b/libraries/render-utils/src/GeometryCache.h index 1f434d1a5d..32cdec56bf 100644 --- a/libraries/render-utils/src/GeometryCache.h +++ b/libraries/render-utils/src/GeometryCache.h @@ -166,28 +166,28 @@ public: const render::ShapePipelinePointer& pipeline = _simplePipeline); void renderSolidSphereInstance(gpu::Batch& batch, const glm::vec3& color, const render::ShapePipelinePointer& pipeline = _simplePipeline) { - renderSolidSphereInstance(batch, glm::vec4(color, 1.0), pipeline); + renderSolidSphereInstance(batch, glm::vec4(color, 1.0f), pipeline); } void renderWireSphereInstance(gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline = _simplePipeline); void renderWireSphereInstance(gpu::Batch& batch, const glm::vec3& color, const render::ShapePipelinePointer& pipeline = _simplePipeline) { - renderWireSphereInstance(batch, glm::vec4(color, 1.0), pipeline); + renderWireSphereInstance(batch, glm::vec4(color, 1.0f), pipeline); } void renderSolidCubeInstance(gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline = _simplePipeline); void renderSolidCubeInstance(gpu::Batch& batch, const glm::vec3& color, const render::ShapePipelinePointer& pipeline = _simplePipeline) { - renderSolidCubeInstance(batch, glm::vec4(color, 1.0), pipeline); + renderSolidCubeInstance(batch, glm::vec4(color, 1.0f), pipeline); } void renderWireCubeInstance(gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline = _simplePipeline); void renderWireCubeInstance(gpu::Batch& batch, const glm::vec3& color, const render::ShapePipelinePointer& pipeline = _simplePipeline) { - renderWireCubeInstance(batch, glm::vec4(color, 1.0), pipeline); + renderWireCubeInstance(batch, glm::vec4(color, 1.0f), pipeline); } // Dynamic geometry