Revision: 55882
http://sourceforge.net/p/brlcad/code/55882
Author: starseeker
Date: 2013-06-27 15:02:27 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Don't define things we aren't using...
Modified Paths:
--------------
brlcad/trunk/src/libbrep/opennurbs_ext.cpp
Modified: brlcad/trunk/src/libbrep/opennurbs_ext.cpp
===================================================================
--- brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2013-06-27 15:00:33 UTC (rev
55881)
+++ brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2013-06-27 15:02:27 UTC (rev
55882)
@@ -942,15 +942,12 @@
int divDepth,
int depthLimit)
{
- const ON_Surface* surf = m_face->SurfaceOf();
- ON_Interval usurf = surf->Domain(0);
- ON_Interval vsurf = surf->Domain(1);
double uq = u.Length()*0.25;
double vq = v.Length()*0.25;
- surf->FrameAt(u.Mid() - uq, v.Mid() - vq, frames[5]);
- surf->FrameAt(u.Mid() - uq, v.Mid() + vq, frames[6]);
- surf->FrameAt(u.Mid() + uq, v.Mid() - vq, frames[7]);
- surf->FrameAt(u.Mid() + uq, v.Mid() + vq, frames[8]);
+ localsurf->FrameAt(u.Mid() - uq, v.Mid() - vq, frames[5]);
+ localsurf->FrameAt(u.Mid() - uq, v.Mid() + vq, frames[6]);
+ localsurf->FrameAt(u.Mid() + uq, v.Mid() - vq, frames[7]);
+ localsurf->FrameAt(u.Mid() + uq, v.Mid() + vq, frames[8]);
BBNode* quads[4];
@@ -1469,9 +1466,6 @@
int divDepth,
int depthLimit)
{
- const ON_Surface* surf = m_face->SurfaceOf();
- ON_Interval usurf = surf->Domain(0);
- ON_Interval vsurf = surf->Domain(1);
double uq = u.Length()*0.25;
double vq = v.Length()*0.25;
localsurf->FrameAt(u.Mid() - uq, v.Mid() - vq, frames[5]);
@@ -1494,8 +1488,6 @@
BBNode* parent = (divDepth == 0) ? initialBBox(ctree, localsurf,
m_face, u, v) :
surfaceBBox(localsurf, false, frames, u, v);
- ON_Interval first(0, 0.5);
- ON_Interval second(0.5, 1.0);
if ((!isVFlat || (width/height > ratio)) && (!isUFlat || (height/width
> ratio))) {
ON_Interval firstu(u.Min(), usplit);
@@ -1757,6 +1749,9 @@
//ON_BoundingBox bbox = q0surf->BoundingBox();
//bu_log("%d - in bbq0 rpp %f %f %f %f %f %f\n", divDepth,
bbox.m_min.x, bbox.m_max.x, bbox.m_min.y, bbox.m_max.y, bbox.m_min.z,
bbox.m_max.z);
+ ON_Interval first(0, 0.5);
+ ON_Interval second(0.5, 1.0);
+
quads[0] = subdivideSurface(east, u.ParameterAt(first), v,
newframes, divDepth + 1, depthLimit);
delete east;
@@ -1894,6 +1889,9 @@
newframes[3] = sharedframes[0];
localsurf->FrameAt(u.Mid(), v.Mid() - vq, newframes[4]);
+ ON_Interval first(0, 0.5);
+ ON_Interval second(0.5, 1.0);
+
//ON_BoundingBox bbox = q0surf->BoundingBox();
//bu_log("%d - in bbq0 rpp %f %f %f %f %f %f\n", divDepth,
bbox.m_min.x, bbox.m_max.x, bbox.m_min.y, bbox.m_max.y, bbox.m_min.z,
bbox.m_max.z);
quads[0] = subdivideSurface(south, u, v.ParameterAt(first),
newframes, divDepth + 1, depthLimit);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
