Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:17:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some double to float conversion warnings in Windows builds

Browse source
This commit is contained in:
David Rowe 2015-05-22 12:32:02 -07:00
parent da8f99508c
commit a01830f8f8
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -1175,7 +1175,7 @@ void EntityTreeRenderer::entityCollisionWithEntity(const EntityItemID& idA, cons
return; return;
} }
// Don't respond to small continuous contacts. // Don't respond to small continuous contacts.
const float COLLISION_MINUMUM_PENETRATION = 0.005; const float COLLISION_MINUMUM_PENETRATION = 0.005f;
if ((collision.type != CONTACT_EVENT_TYPE_START) && (glm::length(collision.penetration) < COLLISION_MINUMUM_PENETRATION)) { if ((collision.type != CONTACT_EVENT_TYPE_START) && (glm::length(collision.penetration) < COLLISION_MINUMUM_PENETRATION)) {
return; return;
} }

4
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
View file

@ -25,8 +25,8 @@
#include "EntityTreeRenderer.h" #include "EntityTreeRenderer.h"
const float DPI = 30.47; const float DPI = 30.47f;
const float METERS_TO_INCHES = 39.3701; const float METERS_TO_INCHES = 39.3701f;
EntityItem* RenderableWebEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { EntityItem* RenderableWebEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
return new RenderableWebEntityItem(entityID, properties); return new RenderableWebEntityItem(entityID, properties);

10
tools/vhacd-util/src/VHACDUtilApp.cpp
View file

@ -255,27 +255,27 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
vHacdDepth = parser.value(vHacdDepthOption).toInt(); vHacdDepth = parser.value(vHacdDepthOption).toInt();
} }
float vHacdAlpha = 0.05; float vHacdAlpha = 0.05f;
if (parser.isSet(vHacdAlphaOption)) { if (parser.isSet(vHacdAlphaOption)) {
vHacdAlpha = parser.value(vHacdAlphaOption).toFloat(); vHacdAlpha = parser.value(vHacdAlphaOption).toFloat();
} }
float vHacdBeta = 0.05; float vHacdBeta = 0.05f;
if (parser.isSet(vHacdBetaOption)) { if (parser.isSet(vHacdBetaOption)) {
vHacdBeta = parser.value(vHacdBetaOption).toFloat(); vHacdBeta = parser.value(vHacdBetaOption).toFloat();
} }
float vHacdGamma = 0.00125; float vHacdGamma = 0.00125f;
if (parser.isSet(vHacdGammaOption)) { if (parser.isSet(vHacdGammaOption)) {
vHacdGamma = parser.value(vHacdGammaOption).toFloat(); vHacdGamma = parser.value(vHacdGammaOption).toFloat();
} }
float vHacdDelta = 0.05; float vHacdDelta = 0.05f;
if (parser.isSet(vHacdDeltaOption)) { if (parser.isSet(vHacdDeltaOption)) {
vHacdDelta = parser.value(vHacdDeltaOption).toFloat(); vHacdDelta = parser.value(vHacdDeltaOption).toFloat();
} }
float vHacdConcavity = 0.0025; float vHacdConcavity = 0.0025f;
if (parser.isSet(vHacdConcavityOption)) { if (parser.isSet(vHacdConcavityOption)) {
vHacdConcavity = parser.value(vHacdConcavityOption).toFloat(); vHacdConcavity = parser.value(vHacdConcavityOption).toFloat();
} }