aboutsummaryrefslogtreecommitdiff
path: root/dep/g3dlite/source/MeshAlgAdjacency.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dep/g3dlite/source/MeshAlgAdjacency.cpp')
-rw-r--r--dep/g3dlite/source/MeshAlgAdjacency.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/dep/g3dlite/source/MeshAlgAdjacency.cpp b/dep/g3dlite/source/MeshAlgAdjacency.cpp
index f0bf3382131..e3bdbd635e1 100644
--- a/dep/g3dlite/source/MeshAlgAdjacency.cpp
+++ b/dep/g3dlite/source/MeshAlgAdjacency.cpp
@@ -5,7 +5,7 @@
@created 2003-09-14
@edited 2010-04-26
- Copyright 2000-2010, Morgan McGuire.
+ Copyright 2000-2012, Morgan McGuire.
All rights reserved.
*/
@@ -125,6 +125,11 @@ public:
return *this;
}
+ bool isValid() const {
+ return ! m_end;
+ }
+
+ /** @deprecated Use isValid */
bool hasMore() const {
return ! m_end;
}
@@ -254,7 +259,7 @@ void MeshAlg::computeAdjacency(
MeshEdgeTable::Iterator cur = edgeTable.begin();
Array<Edge> tempEdgeArray;
- while (cur.hasMore()) {
+ while (cur.isValid()) {
MeshEdgeTable::FaceIndexArray& faceIndexArray = cur.faceIndex();
// Process this edge
@@ -620,7 +625,7 @@ void MeshAlg::weldAdjacency(
Array<Face>& faceArray,
Array<Edge>& edgeArray,
Array<Vertex>& vertexArray,
- double radius) {
+ float radius) {
// Num vertices
const int n = originalGeometry.size();