diff options
Diffstat (limited to 'src/3rdparty/assimp/code/SpatialSort.h')
| -rw-r--r-- | src/3rdparty/assimp/code/SpatialSort.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/3rdparty/assimp/code/SpatialSort.h b/src/3rdparty/assimp/code/SpatialSort.h index b594fc6d1..36b7a2767 100644 --- a/src/3rdparty/assimp/code/SpatialSort.h +++ b/src/3rdparty/assimp/code/SpatialSort.h @@ -2,7 +2,8 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. Redistribution and use of this software in source and binary forms, @@ -117,7 +118,7 @@ public: * @param poResults The container to store the indices of the found positions. * Will be emptied by the call so it may contain anything. * @return An iterator to iterate over all vertices in the given area.*/ - void FindPositions( const aiVector3D& pPosition, float pRadius, + void FindPositions( const aiVector3D& pPosition, ai_real pRadius, std::vector<unsigned int>& poResults) const; // ------------------------------------------------------------------------------------ @@ -139,7 +140,7 @@ public: * be counted in. * @return Number of unique vertices (n). */ unsigned int GenerateMappingTable(std::vector<unsigned int>& fill, - float pRadius) const; + ai_real pRadius) const; protected: /** Normal of the sorting plane, normalized. The center is always at (0, 0, 0) */ @@ -151,10 +152,10 @@ protected: { unsigned int mIndex; ///< The vertex referred by this entry aiVector3D mPosition; ///< Position - float mDistance; ///< Distance of this vertex to the sorting plane + ai_real mDistance; ///< Distance of this vertex to the sorting plane Entry() { /** intentionally not initialized.*/ } - Entry( unsigned int pIndex, const aiVector3D& pPosition, float pDistance) + Entry( unsigned int pIndex, const aiVector3D& pPosition, ai_real pDistance) : mIndex( pIndex), mPosition( pPosition), mDistance( pDistance) { } |