Revision: 56196
http://sourceforge.net/p/brlcad/code/56196
Author: phoenixyjll
Date: 2013-07-24 05:28:26 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
Rename shadowed variables.
Modified Paths:
--------------
brlcad/trunk/src/libbrep/intersect.cpp
Modified: brlcad/trunk/src/libbrep/intersect.cpp
===================================================================
--- brlcad/trunk/src/libbrep/intersect.cpp 2013-07-24 05:07:32 UTC (rev
56195)
+++ brlcad/trunk/src/libbrep/intersect.cpp 2013-07-24 05:28:26 UTC (rev
56196)
@@ -736,16 +736,16 @@
// Handle degenerated cases (one or both of them is a "point")
bool ispoint_curveA = curveA->BoundingBox().Diagonal().Length() <
ON_ZERO_TOLERANCE;
bool ispoint_curveB = curveB->BoundingBox().Diagonal().Length() <
ON_ZERO_TOLERANCE;
- ON_3dPoint pointA = curveA->PointAtStart();
- ON_3dPoint pointB = curveB->PointAtStart();
+ ON_3dPoint startpointA = curveA->PointAtStart();
+ ON_3dPoint startpointB = curveB->PointAtStart();
ON_ClassArray<ON_PX_EVENT> px_event;
if (ispoint_curveA && ispoint_curveB) {
// Both curves are degenerated (point-point intersection)
- if (ON_Intersect(pointA, pointB, px_event, intersection_tolerance)) {
+ if (ON_Intersect(startpointA, startpointB, px_event,
intersection_tolerance)) {
ON_X_EVENT Event;
- Event.m_A[0] = pointA;
+ Event.m_A[0] = startpointA;
Event.m_A[1] = curveA->PointAtEnd();
- Event.m_B[0] = pointB;
+ Event.m_B[0] = startpointB;
Event.m_B[1] = curveB->PointAtEnd();
Event.m_a[0] = curveA->Domain().Min();
Event.m_a[1] = curveA->Domain().Max();
@@ -758,9 +758,9 @@
return 0;
} else if (ispoint_curveA) {
// curveA is degenerated (point-curve intersection)
- if (ON_Intersect(pointA, *curveB, px_event, intersection_tolerance)) {
+ if (ON_Intersect(startpointA, *curveB, px_event,
intersection_tolerance)) {
ON_X_EVENT Event;
- Event.m_A[0] = pointA;
+ Event.m_A[0] = startpointA;
Event.m_A[1] = curveA->PointAtEnd();
Event.m_B[0] = Event.m_B[1] = px_event[0].m_B;
Event.m_a[0] = curveA->Domain().Min();
@@ -773,10 +773,10 @@
return 0;
} else if (ispoint_curveB) {
// curveB is degenerated (point-curve intersection)
- if (ON_Intersect(pointB, *curveA, px_event, intersection_tolerance)) {
+ if (ON_Intersect(startpointB, *curveA, px_event,
intersection_tolerance)) {
ON_X_EVENT Event;
Event.m_A[0] = Event.m_A[1] = px_event[0].m_B;
- Event.m_B[0] = pointB;
+ Event.m_B[0] = startpointB;
Event.m_B[1] = curveB->PointAtEnd();
Event.m_a[0] = Event.m_a[1] = px_event[0].m_b[0];
Event.m_b[0] = curveB->Domain().Min();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
