Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:29:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[WL21389] Resolves size_t vs int warnings in GeometryCache.

Browse source 
Reviewed-by: Kris Pivin <krispivin@1stplayable.com>

Changes Committed:
	modified:   libraries/render-utils/src/GeometryCache.cpp
This commit is contained in:
LaShonda Hopper 2017-09-11 15:10:56 -04:00
parent 070c664ff2
commit 8a4ac9ebc4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/render-utils/src/GeometryCache.cpp
View file

@ -113,7 +113,7 @@ void GeometryCache::computeSimpleHullPointListForShape(const ShapeEntityItem * c
qCDebug(entities) << "------------------ Begin Vert Info( ComputeShapeInfo )[FlatShapes] -----------------------------"; qCDebug(entities) << "------------------ Begin Vert Info( ComputeShapeInfo )[FlatShapes] -----------------------------";
qCDebug(entities) << " name:" << shapePtr->getName() << ": has " << numItems << " vert info pairs."; qCDebug(entities) << " name:" << shapePtr->getName() << ": has " << numItems << " vert info pairs.";
#endif #endif
outPointList.reserve(numItems); outPointList.reserve((int)numItems);
for (gpu::BufferView::Index i = 0; i < (gpu::BufferView::Index)numItems; ++i) { for (gpu::BufferView::Index i = 0; i < (gpu::BufferView::Index)numItems; ++i) {
const geometry::Vec &curNorm = shapeNorms.get<geometry::Vec>(i); const geometry::Vec &curNorm = shapeNorms.get<geometry::Vec>(i);
#if DEBUG_SIMPLE_HULL_POINT_GENERATION #if DEBUG_SIMPLE_HULL_POINT_GENERATION
@ -514,7 +514,7 @@ void GeometryCache::buildShapes() {
} }
const GeometryCache::ShapeData * GeometryCache::getShapeData(const Shape shape) const { const GeometryCache::ShapeData * GeometryCache::getShapeData(const Shape shape) const {
if (((int)shape < 0) || ((int)shape >= _shapes.size())){ if (((int)shape < 0) || ((int)shape >= (int)_shapes.size())){
return nullptr; return nullptr;
} }
@ -522,7 +522,7 @@ const GeometryCache::ShapeData * GeometryCache::getShapeData(const Shape shape)
} }
GeometryCache::Shape GeometryCache::getShapeForEntityShape(int entityShape) { GeometryCache::Shape GeometryCache::getShapeForEntityShape(int entityShape) {
if ((entityShape < 0) || (entityShape >= MAPPING.size())){ if ((entityShape < 0) || (entityShape >= (int)MAPPING.size())){
return GeometryCache::Sphere; return GeometryCache::Sphere;
} }