From 08aa133472c4f952c2f8150d95a8811bf53513ab Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 5 Apr 2019 11:32:00 +0200
Subject: [PATCH] Fixed other compilation errors / warnings

---
 libraries/image/src/image/CubeMap.cpp | 2 +-
 libraries/shared/src/BRDF.cpp         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/image/src/image/CubeMap.cpp b/libraries/image/src/image/CubeMap.cpp
index 12c547933a..f5637062af 100644
--- a/libraries/image/src/image/CubeMap.cpp
+++ b/libraries/image/src/image/CubeMap.cpp
@@ -638,7 +638,7 @@ void CubeMap::convolveMipFaceForGGX(const GGXSamples& samples, CubeMap& output,
 
 glm::vec4 CubeMap::computeConvolution(const glm::vec3& N, const GGXSamples& samples) const {
     // from tangent-space vector to world-space
-    glm::vec3 bitangent = std::abs(N.z) < 0.999 ? glm::vec3(0.0, 0.0, 1.0) : glm::vec3(1.0, 0.0, 0.0);
+    glm::vec3 bitangent = std::abs(N.z) < 0.999f ? glm::vec3(0.0f, 0.0f, 1.0f) : glm::vec3(1.0f, 0.0f, 0.0f);
     glm::vec3 tangent = glm::normalize(glm::cross(bitangent, N));
     bitangent = glm::cross(N, tangent);
 
diff --git a/libraries/shared/src/BRDF.cpp b/libraries/shared/src/BRDF.cpp
index 726a233fc7..fe438f12a1 100644
--- a/libraries/shared/src/BRDF.cpp
+++ b/libraries/shared/src/BRDF.cpp
@@ -10,16 +10,16 @@ namespace ggx {
 float evaluate(float NdotH, float roughness) {
     float alpha = roughness * roughness;
     float alphaSquared = alpha * alpha;
-    float denom = (float)(NdotH * NdotH * (alphaSquared - 1.0) + 1.0);
+    float denom = (float)(NdotH * NdotH * (alphaSquared - 1.0f) + 1.0f);
     return alphaSquared / (denom * denom);
 }
 
 glm::vec3 sample(const glm::vec2& Xi, const float roughness) {
     const float a = roughness * roughness;
 
-    float phi = (float)(2.0 * M_PI * Xi.x);
-    float cosTheta = (float)(std::sqrt((1.0 - Xi.y) / (1.0 + (a*a - 1.0) * Xi.y)));
-    float sinTheta = (float)(std::sqrt(1.0 - cosTheta * cosTheta));
+    float phi = 2.0f * (float) M_PI * Xi.x;
+    float cosTheta = std::sqrt((1.0f - Xi.y) / (1.0f + (a*a - 1.0f) * Xi.y));
+    float sinTheta = std::sqrt(1.0f - cosTheta * cosTheta);
 
     // from spherical coordinates to cartesian coordinates
     glm::vec3 H;