Browse Source

Merge pull request #276 from g-pechorin/master

lt operator for aiVector3
Kim Kulling 11 years ago
parent
commit
0f71d46c35
2 changed files with 6 additions and 0 deletions
  1. 1 0
      include/assimp/vector3.h
  2. 5 0
      include/assimp/vector3.inl

+ 1 - 0
include/assimp/vector3.h

@@ -88,6 +88,7 @@ public:
 	// comparison
 	bool operator== (const aiVector3t& other) const;
 	bool operator!= (const aiVector3t& other) const;
+	bool operator < (const aiVector3t& other) const;
 
 	bool Equal(const aiVector3t& other, TReal epsilon = 1e-6) const;
 

+ 5 - 0
include/assimp/vector3.inl

@@ -159,6 +159,11 @@ AI_FORCE_INLINE bool aiVector3t<TReal>::Equal(const aiVector3t<TReal>& other, TR
 }
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
+AI_FORCE_INLINE bool aiVector3t<TReal>::operator < (const aiVector3t<TReal>& other) const {
+	return x != other.x ? x < other.x : y != other.y ? y < other.y : z < other.z;
+}
+// ------------------------------------------------------------------------------------------------
+template <typename TReal>
 AI_FORCE_INLINE const aiVector3t<TReal> aiVector3t<TReal>::SymMul(const aiVector3t<TReal>& o) {
 	return aiVector3t<TReal>(x*o.x,y*o.y,z*o.z);
 }