Commit 69a41638 authored by David Thompson's avatar David Thompson
Browse files

Progress on "force create face".

parent 9971a98c
......@@ -74,7 +74,7 @@ template<typename T, typename U, typename V>
void ForceCreateFace::pointsForLoop(
T& polypts,
int numPtsToUse,
U start,
U& curCoord,
U finish,
int numCoordsPerPoint,
V pmodel
......@@ -82,11 +82,10 @@ void ForceCreateFace::pointsForLoop(
{
// Map user point coordinates into model points.
polypts.reserve(polypts.size() + numPtsToUse);
U specEnd = start + numPtsToUse * numCoordsPerPoint;
U cit;
for (cit = start; cit != finish && cit != specEnd; cit += numCoordsPerPoint)
U specEnd = curCoord + numPtsToUse * numCoordsPerPoint;
for (; curCoord != finish && curCoord != specEnd; curCoord += numCoordsPerPoint)
{
internal::Point pt = pmodel->projectPoint(cit, cit + numCoordsPerPoint);
internal::Point pt = pmodel->projectPoint(curCoord, curCoord + numCoordsPerPoint);
if (!polypts.empty() && polypts.back() == pt)
{
continue;
......@@ -99,9 +98,9 @@ template<typename T, typename U, typename V, typename W>
void ForceCreateFace::pointsForLoop(
T& polypts,
int numEdgesToUse,
U curEdge,
U& curEdge,
U edgesFinish,
V curEdgeDir,
V& curEdgeDir,
V edgeDirFinish,
W& outerLoopEdges
)
......
......@@ -46,10 +46,10 @@ protected:
virtual smtk::model::OperatorResult operateInternal();
template<typename T, typename U, typename V>
void pointsForLoop(T& polypts, int numPtsToUse, U start, U finish, int numCoordsPerPoint, V pmodel);
void pointsForLoop(T& polypts, int numPtsToUse, U& start, U finish, int numCoordsPerPoint, V pmodel);
template<typename T, typename U, typename V, typename W>
void pointsForLoop(T& polypts, int numEdgesToUse, U curEdge, U edgesFinish, V curEdgeDir, V edgeDirFinish, W& outerLoopEdges);
void pointsForLoop(T& polypts, int numEdgesToUse, U& curEdge, U edgesFinish, V& curEdgeDir, V edgeDirFinish, W& outerLoopEdges);
};
} // namespace polygon
......
......@@ -115,8 +115,8 @@ class TestPolygonCreation(smtk.testing.TestCase):
cam.SetViewUp(0,1,0)
self.renderer.ResetCamera()
self.renderWindow.Render()
smtk.testing.INTERACTIVE = True
self.interact()
#smtk.testing.INTERACTIVE = True
#self.interact()
# Skip the image match if we don't have a baseline.
# This allows the test to succeed even on systems without the test
# data but requires a match on systems with the test data.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment