Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 00:03:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quiet warnings

Browse source
This commit is contained in:
samcake 2016-02-05 17:18:14 -08:00
parent 502abd3e93
commit 91a28c597a
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/render/src/render/Octree.cpp
View file

@ -116,7 +116,7 @@ Octree::Index Octree::allocateCell(Index parent, const Location& location) {
assert(_cells[parent].getlocation().child(location.octant()) == location);
auto newIndex = _cells.size();
auto newIndex = (Index) _cells.size();
_cells.push_back(Cell(parent, location));
_cells[parent].setChild(location.octant(), newIndex);
@ -125,13 +125,13 @@ Octree::Index Octree::allocateCell(Index parent, const Location& location) {
Octree::Indices Octree::indexCellPath(const Locations& path) {
// First through the aallocated cells
// First through the allocated cells
Indices cellPath = indexConcreteCellPath(path);
// Catch up from the last allocated cell on the path
auto currentIndex = cellPath.back();
for (int l = cellPath.size(); l < path.size(); l++) {
for (int l = (Index) cellPath.size(); l < (Index) path.size(); l++) {
auto& location = path[l];
// Allocate the new index & connect it to the parent
@ -147,7 +147,7 @@ Octree::Indices Octree::indexCellPath(const Locations& path) {
Octree::Index Octree::allocateBrick() {
Index brickIdx = _bricks.size();
Index brickIdx = (int) _bricks.size();
_bricks.push_back(Brick());
return brickIdx;
}
@ -341,7 +341,7 @@ Octree::Location::Intersection Octree::Location::intersectCell(const Location& c
}
int Octree::selectTraverse(Index cellID, CellSelection& selection, const FrustumSelector& selector) const {
int numSelectedsIn = selection.size();
int numSelectedsIn = (int) selection.size();
auto cell = getConcreteCell(cellID);
auto cellLocation = cell.getlocation();
@ -382,12 +382,12 @@ int Octree::selectTraverse(Index cellID, CellSelection& selection, const Frustum
}
}
return selection.size() - numSelectedsIn;
return (int) selection.size() - numSelectedsIn;
}
int Octree::selectBranch(Index cellID, CellSelection& selection, const FrustumSelector& selector) const {
int numSelectedsIn = selection.size();
int numSelectedsIn = (int) selection.size();
auto cell = getConcreteCell(cellID);
auto cellLocation = cell.getlocation();
@ -407,11 +407,11 @@ int Octree::selectBranch(Index cellID, CellSelection& selection, const FrustumS
}
}
return selection.size() - numSelectedsIn;
return (int) selection.size() - numSelectedsIn;
}
int Octree::selectCellBrick(Index cellID, CellSelection& selection, bool inside) const {
int numSelectedsIn = selection.size();
int numSelectedsIn = (int) selection.size();
auto cell = getConcreteCell(cellID);
selection.cells(inside).push_back(cellID);
@ -420,7 +420,7 @@ int Octree::selectCellBrick(Index cellID, CellSelection& selection, bool inside)
selection.bricks(inside).push_back(cell.brick());
}
return selection.size() - numSelectedsIn;
return (int) selection.size() - numSelectedsIn;
}
@ -459,5 +459,5 @@ int ItemSpatialTree::selectCellItems(ItemSelection& selection, const ItemFilter&
selection.partialSubcellItems.insert(selection.partialSubcellItems.end(), brickSubcellItems.begin(), brickSubcellItems.end());
}
return selection.numItems();
return (int) selection.numItems();
}

8
libraries/render/src/render/Octree.h
View file

@ -262,7 +262,7 @@ namespace render {
Indices& cells(bool inside) { return (inside ? insideCells : partialCells); }
Indices& bricks(bool inside) { return (inside ? insideBricks : partialBricks); }
int size() const { return insideBricks.size() + partialBricks.size(); }
size_t size() const { return insideBricks.size() + partialBricks.size(); }
void clear() {
insideCells.clear();
@ -380,9 +380,9 @@ namespace render {
ItemIDs& items(bool inside) { return (inside ? insideItems : partialItems); }
ItemIDs& subcellItems(bool inside) { return (inside ? insideSubcellItems : partialSubcellItems); }
int insideNumItems() const { return insideItems.size() + insideSubcellItems.size(); }
int partialNumItems() const { return partialItems.size() + partialSubcellItems.size(); }
int numItems() const { return insideNumItems() + partialNumItems(); }
size_t insideNumItems() const { return insideItems.size() + insideSubcellItems.size(); }
size_t partialNumItems() const { return partialItems.size() + partialSubcellItems.size(); }
size_t numItems() const { return insideNumItems() + partialNumItems(); }
void clear() {
cellSelection.clear();