From c5decc54091befd5bd1e3dcebd3cf5aaf8bd3229 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 5 Feb 2008 21:45:16 +0000
Subject: [PATCH] use geom.tol in FinishUpBoundingBox
---
Parser/OpenFile.cpp | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index 61885ec310..23d48a7eff 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.170 2008-01-28 11:05:33 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.171 2008-02-05 21:45:16 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -98,33 +98,39 @@ static void FinishUpBoundingBox()
range[i] = CTX.max[i] - CTX.min[i];
}
- if(range[0] == 0. && range[1] == 0. && range[2] == 0.) {
+ if(range[0] < CTX.geom.tolerance &&
+ range[1] < CTX.geom.tolerance &&
+ range[2] < CTX.geom.tolerance) {
CTX.min[0] -= 1.; CTX.min[1] -= 1.;
CTX.max[0] += 1.; CTX.max[1] += 1.;
CTX.lc = 1.;
}
- else if(range[0] == 0. && range[1] == 0.) {
+ else if(range[0] < CTX.geom.tolerance &&
+ range[1] < CTX.geom.tolerance) {
CTX.lc = range[2];
CTX.min[0] -= CTX.lc; CTX.min[1] -= CTX.lc;
CTX.max[0] += CTX.lc; CTX.max[1] += CTX.lc;
+ printf("hello!\n");
}
- else if(range[0] == 0. && range[2] == 0.) {
+ else if(range[0] < CTX.geom.tolerance &&
+ range[2] < CTX.geom.tolerance) {
CTX.lc = range[1];
CTX.min[0] -= CTX.lc; CTX.max[0] += CTX.lc;
}
- else if(range[1] == 0. && range[2] == 0.) {
+ else if(range[1] < CTX.geom.tolerance &&
+ range[2] < CTX.geom.tolerance) {
CTX.lc = range[0];
CTX.min[1] -= CTX.lc; CTX.max[1] += CTX.lc;
}
- else if(range[0] == 0.) {
+ else if(range[0] < CTX.geom.tolerance) {
CTX.lc = sqrt(DSQR(range[1]) + DSQR(range[2]));
CTX.min[0] -= CTX.lc; CTX.max[0] += CTX.lc;
}
- else if(range[1] == 0.) {
+ else if(range[1] < CTX.geom.tolerance) {
CTX.lc = sqrt(DSQR(range[0]) + DSQR(range[2]));
CTX.min[1] -= CTX.lc; CTX.max[1] += CTX.lc;
}
- else if(range[2] == 0.) {
+ else if(range[2] < CTX.geom.tolerance) {
CTX.lc = sqrt(DSQR(range[0]) + DSQR(range[1]));
}
else {
--
GitLab