mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-22 14:11:35 +00:00
Code Issues Releases Wiki Activity

Allow to represent empty range with TilesPositionsRange

Browse source
This commit is contained in:
elsid 2022-02-01 00:35:03 +01:00
parent 1b2954f2db
commit a5b078e9a7
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/detournavigator/gettilespositions.cpp
View file

@ -29,7 +29,7 @@ namespace DetourNavigator
if (minTile.y() > maxTile.y()) if (minTile.y() > maxTile.y())
std::swap(minTile.y(), maxTile.y()); std::swap(minTile.y(), maxTile.y());
return {minTile, maxTile}; return {minTile, maxTile + osg::Vec2i(1, 1)};
} }
TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform, TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,

10
components/detournavigator/gettilespositions.hpp
View file

@ -18,8 +18,8 @@ namespace DetourNavigator
struct TilesPositionsRange struct TilesPositionsRange
{ {
TilePosition mMin; TilePosition mBegin;
TilePosition mMax; TilePosition mEnd;
}; };
TilesPositionsRange makeTilesPositionsRange(const osg::Vec2f& aabbMin, TilesPositionsRange makeTilesPositionsRange(const osg::Vec2f& aabbMin,
@ -32,10 +32,10 @@ namespace DetourNavigator
const RecastSettings& settings); const RecastSettings& settings);
template <class Callback> template <class Callback>
void getTilesPositions(const TilesPositionsRange& range, Callback&& callback) inline void getTilesPositions(const TilesPositionsRange& range, Callback&& callback)
{ {
for (int tileX = range.mMin.x(); tileX <= range.mMax.x(); ++tileX) for (int tileX = range.mBegin.x(); tileX < range.mEnd.x(); ++tileX)
for (int tileY = range.mMin.y(); tileY <= range.mMax.y(); ++tileY) for (int tileY = range.mBegin.y(); tileY < range.mEnd.y(); ++tileY)
callback(TilePosition {tileX, tileY}); callback(TilePosition {tileX, tileY});
} }
} }