Commit 343315f4 authored by Philip Trettner's avatar Philip Trettner
Browse files

Fixed msvc warnings

parent 00f5d2f8
...@@ -141,7 +141,7 @@ namespace detail ...@@ -141,7 +141,7 @@ namespace detail
if(x == 0.0f) if(x == 0.0f)
return 0; return 0;
else if(glm::isnan(x)) else if(glm::isnan(x))
return ~0; return ~0u;
else if(glm::isinf(x)) else if(glm::isinf(x))
return 0x1f << 6; return 0x1f << 6;
...@@ -153,9 +153,9 @@ namespace detail ...@@ -153,9 +153,9 @@ namespace detail
if(x == 0) if(x == 0)
return 0.0f; return 0.0f;
else if(x == ((1 << 11) - 1)) else if(x == ((1 << 11) - 1))
return ~0;//NaN return ~0u;//NaN
else if(x == (0x1f << 6)) else if(x == (0x1f << 6))
return ~0;//Inf return ~0u;//Inf
uint result = packed11ToFloat(x); uint result = packed11ToFloat(x);
return reinterpret_cast<float&>(result); return reinterpret_cast<float&>(result);
...@@ -164,11 +164,11 @@ namespace detail ...@@ -164,11 +164,11 @@ namespace detail
GLM_FUNC_QUALIFIER glm::uint floatTo10bit(float x) GLM_FUNC_QUALIFIER glm::uint floatTo10bit(float x)
{ {
if(x == 0.0f) if(x == 0.0f)
return 0; return 0u;
else if(glm::isnan(x)) else if(glm::isnan(x))
return ~0; return ~0u;
else if(glm::isinf(x)) else if(glm::isinf(x))
return 0x1f << 5; return 0x1fu << 5;
return float2packed10(reinterpret_cast<uint&>(x)); return float2packed10(reinterpret_cast<uint&>(x));
} }
......
...@@ -113,7 +113,7 @@ SharedGeometryData loadGeometryDataFromVAP(const std::string& _filename, bool _c ...@@ -113,7 +113,7 @@ SharedGeometryData loadGeometryDataFromVAP(const std::string& _filename, bool _c
int texCoordDimension = -1; int texCoordDimension = -1;
int normalDimension = 3; int normalDimension = 3;
int metaDataDimension = 4; int metaDataDimension = 4;
(void)sizeof(metaDataDimension); (void)(metaDataDimension);
std::vector<glm::vec4> positionData; std::vector<glm::vec4> positionData;
std::vector<glm::vec3> texCoordData; std::vector<glm::vec3> texCoordData;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment