From fcb906d59855de15258415bdc6ab39ef8b557b67 Mon Sep 17 00:00:00 2001 From: suncaller Date: Sat, 2 Feb 2019 23:07:44 -0500 Subject: [PATCH] Clean up MSVC warning [C4305]: truncation from 'double' to 'F32' --- Engine/source/math/mConstants.h | 2 +- Engine/source/math/util/frustum.cpp | 2 +- Engine/source/scene/sceneContainer.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Engine/source/math/mConstants.h b/Engine/source/math/mConstants.h index 42b071d1e..6218e4040 100644 --- a/Engine/source/math/mConstants.h +++ b/Engine/source/math/mConstants.h @@ -44,7 +44,7 @@ #define M_CONST_E_F 2.7182818284590452353602874f -#define POINT_EPSILON (1e-4) ///< Epsilon for point types. +#define POINT_EPSILON (0.0001f) ///< Epsilon for point types. /// Result of an overlap test. diff --git a/Engine/source/math/util/frustum.cpp b/Engine/source/math/util/frustum.cpp index bfb42a6bf..2ac1824b7 100644 --- a/Engine/source/math/util/frustum.cpp +++ b/Engine/source/math/util/frustum.cpp @@ -216,7 +216,7 @@ void Frustum::setNearFarDist( F32 nearDist, F32 farDist ) // Recalculate the frustum. MatrixF xfm( mTransform ); - const F32 CENTER_EPSILON = 0.001; + const F32 CENTER_EPSILON = 0.001f; F32 centerX = mNearLeft + (mNearRight - mNearLeft) * 0.5; F32 centerY = mNearBottom + (mNearTop - mNearBottom) * 0.5; if ((centerX > CENTER_EPSILON || centerX < -CENTER_EPSILON) || (centerY > CENTER_EPSILON || centerY < -CENTER_EPSILON) ) diff --git a/Engine/source/scene/sceneContainer.cpp b/Engine/source/scene/sceneContainer.cpp index 128ef3edd..b08456b15 100644 --- a/Engine/source/scene/sceneContainer.cpp +++ b/Engine/source/scene/sceneContainer.cpp @@ -1392,7 +1392,7 @@ void SceneContainer::getBinRange( const F32 min, const F32 max, U32& minBin, U32 // This is truly lame, but it can happen. There must be a better way to // deal with this. if (minCoord == SceneContainer::csmTotalBinSize) - minCoord = SceneContainer::csmTotalBinSize - 0.01; + minCoord = SceneContainer::csmTotalBinSize - 0.01f; } AssertFatal(minCoord >= 0.0 && minCoord < SceneContainer::csmTotalBinSize, "Bad minCoord"); @@ -1415,7 +1415,7 @@ void SceneContainer::getBinRange( const F32 min, const F32 max, U32& minBin, U32 // This is truly lame, but it can happen. There must be a better way to // deal with this. if (minCoord == SceneContainer::csmTotalBinSize) - minCoord = SceneContainer::csmTotalBinSize - 0.01; + minCoord = SceneContainer::csmTotalBinSize - 0.01f; } AssertFatal(minCoord >= 0.0 && minCoord < SceneContainer::csmTotalBinSize, "Bad minCoord"); @@ -1426,7 +1426,7 @@ void SceneContainer::getBinRange( const F32 min, const F32 max, U32& minBin, U32 // This is truly lame, but it can happen. There must be a better way to // deal with this. if (maxCoord == SceneContainer::csmTotalBinSize) - maxCoord = SceneContainer::csmTotalBinSize - 0.01; + maxCoord = SceneContainer::csmTotalBinSize - 0.01f; } AssertFatal(maxCoord >= 0.0 && maxCoord < SceneContainer::csmTotalBinSize, "Bad maxCoord");