Revision: 41817
http://brlcad.svn.sourceforge.net/brlcad/?rev=41817&view=rev
Author: erikgreenwald
Date: 2010-12-28 21:48:08 +0000 (Tue, 28 Dec 2010)
Log Message:
-----------
MFC 41816
Modified Paths:
--------------
brlcad/branches/bottie/src/proc-db/brepintersect.cpp
Property Changed:
----------------
brlcad/branches/bottie/src/proc-db/
Property changes on: brlcad/branches/bottie/src/proc-db
___________________________________________________________________
Modified: svn:ignore
- *.g
.deps
.libs
Makefile
Makefile.in
bottest
brep_cube
brep_simple
brepintersect
breplicator
brickwall
clutter
coil
contours
csgbrep
fence
globe
human
kurt
lens
masonry
metaball
mkbuilding
molecule
nmgmodel
picket_fence
pipe
pipetest
pix2g
pyramid
rawbot
room
sketch
sphflake
spltest
spring
surfaceintersect
tea
tea_nmg
tire
torii
tube
vegetation
wavy
wdb_example
+ *.g
.deps
.libs
Makefile
Makefile.in
bottest
brep_cube
brep_simple
brepintersect
breplicator
brickwall
clutter
coil
contours
csgbrep
fence
globe
human
kurt
lens
masonry
metaball
mkbuilding
molecule
nmgmodel
picket_fence
pipe
pipetest
pix2g
pyramid
rawbot
room
sketch
sphflake
spltest
spring
surfaceintersect
tea
tea_nmg
tire
torii
tube
vegetation
wavy
wdb_example
terrain
Modified: brlcad/branches/bottie/src/proc-db/brepintersect.cpp
===================================================================
--- brlcad/branches/bottie/src/proc-db/brepintersect.cpp 2010-12-28
20:01:03 UTC (rev 41816)
+++ brlcad/branches/bottie/src/proc-db/brepintersect.cpp 2010-12-28
21:48:08 UTC (rev 41817)
@@ -102,21 +102,21 @@
return true;
} else if (VNEAR_ZERO(v3, tol)) {
return true;
- } else if (VAPPROXEQUAL(v2, v3, tol)) {
+ } else if (VNEAR_EQUAL(v2, v3, tol)) {
return true;
} else
return false;
} else if (VNEAR_ZERO(v2, tol)) {
if (VNEAR_ZERO(v3, tol)) {
return true;
- } else if (VAPPROXEQUAL(v1, v3, tol)) {
+ } else if (VNEAR_EQUAL(v1, v3, tol)) {
return true;
} else
return false;
- } else if (VAPPROXEQUAL(v1, v2, tol)) {
+ } else if (VNEAR_EQUAL(v1, v2, tol)) {
if (VNEAR_ZERO(v3, tol)) {
return true;
- } else if (VAPPROXEQUAL(v2, v3, tol)) {
+ } else if (VNEAR_EQUAL(v2, v3, tol)) {
return true;
} else
return false;
@@ -335,7 +335,7 @@
if (-tol <= s && s <= 1.0 + tol && -tol <= t && t <= 1.0 + tol) {
ON_3dPoint Ps = x1 + s * (x2 - x1); /* The answer according to
equation P*/
ON_3dPoint Qt = x3 + t * (x4 - x3); /* The answer according to
equation Q*/
- assert(VAPPROXEQUAL(Ps, Qt, tol)); /* check to see if they agree,
just a sanity check*/
+ assert(VNEAR_EQUAL(Ps, Qt, tol)); /* check to see if they agree,
just a sanity check*/
x[0] = Ps;
return 1;
} else {
@@ -472,7 +472,7 @@
for (i = 0; i < 3; i++) {
rv = SegmentSegmentIntersect(triangle[i],
triangle[(i+1)%3], p, q, x, tol);
if (rv == 1) {
- if (points_found == 0 || !VAPPROXEQUAL(out[0], x[0],
tol)) { /* in rare cases we can get the same point twice*/
+ if (points_found == 0 || !VNEAR_EQUAL(out[0], x[0],
tol)) { /* in rare cases we can get the same point twice*/
out[points_found] = x[0];
points_found++;
}
@@ -538,7 +538,7 @@
ON_3dPoint P = result[j];
bool dup = false;
for (k = 0; k < number_found; k++) {
- if (VAPPROXEQUAL(out[k], P, tol)) {
+ if (VNEAR_EQUAL(out[k], P, tol)) {
dup = true;
break;
}
@@ -558,7 +558,7 @@
ON_3dPoint P = result[j];
bool dup = false;
for (k = 0; k < number_found; k++) {
- if (VAPPROXEQUAL(out[k], P, tol)) {
+ if (VNEAR_EQUAL(out[k], P, tol)) {
dup = true;
break;
}
@@ -863,13 +863,13 @@
while (!outline.IsClosed(tol)) {
if (i >= segments.Count()) {
return -1;
- } else if (VAPPROXEQUAL(segments[i].from, outline[outline.Count() -
1], tol)) {
+ } else if (VNEAR_EQUAL(segments[i].from, outline[outline.Count() -
1], tol)) {
outline.Append(segments[i].to);
- } else if (VAPPROXEQUAL(segments[i].to, outline[0], tol)) {
+ } else if (VNEAR_EQUAL(segments[i].to, outline[0], tol)) {
outline.Insert(0, segments[i].from);
- } else if (VAPPROXEQUAL(segments[i].from, outline[0], tol) &&
flippable[i]) {
+ } else if (VNEAR_EQUAL(segments[i].from, outline[0], tol) &&
flippable[i]) {
outline.Insert(0, segments[i].to);
- } else if (VAPPROXEQUAL(segments[i].to, outline[outline.Count() -
1], tol) && flippable[i]) {
+ } else if (VNEAR_EQUAL(segments[i].to, outline[outline.Count() -
1], tol) && flippable[i]) {
outline.Append(segments[i].from);
} else {
i++;
@@ -918,7 +918,7 @@
{
/* This will eventually be implemented in a much more efficient way */
for (int i = 0; i < mesh->m_V.Count(); i++) {
- if (VAPPROXEQUAL(mesh->m_V[i], P, tol)) {
+ if (VNEAR_EQUAL(mesh->m_V[i], P, tol)) {
return i;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
