From 7aa6ef811325fa8d6fed22a96953f575d48b680a Mon Sep 17 00:00:00 2001 From: David G Yu Date: Wed, 20 May 2015 17:43:13 -0700 Subject: [PATCH] Fixed comments and one cut-n-paste typo in Far. --- opensubdiv/far/patchDescriptor.h | 2 -- opensubdiv/far/patchMap.h | 1 - opensubdiv/far/patchTablesFactory.cpp | 13 ++++--------- opensubdiv/far/protoStencil.h | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/opensubdiv/far/patchDescriptor.h b/opensubdiv/far/patchDescriptor.h index 942aedd4..d2d9f8f6 100644 --- a/opensubdiv/far/patchDescriptor.h +++ b/opensubdiv/far/patchDescriptor.h @@ -46,8 +46,6 @@ namespace Far { /// /// * Adaptively subdivided meshes contain bicubic patches of types REGULAR, /// GREGORY, GREGORY_BOUNDARY, GREGORY_BASIS. -/// These bicubic patches are also further distinguished by a transition -/// pattern as well as a rotational orientation. /// /// Bitfield layout : /// diff --git a/opensubdiv/far/patchMap.h b/opensubdiv/far/patchMap.h index 9bca42d0..93deedf7 100644 --- a/opensubdiv/far/patchMap.h +++ b/opensubdiv/far/patchMap.h @@ -182,7 +182,6 @@ PatchMap::FindPatch( int faceid, float u, float v ) const { return 0; } -// Constructor } // end namespace Far } // end namespace OPENSUBDIV_VERSION diff --git a/opensubdiv/far/patchTablesFactory.cpp b/opensubdiv/far/patchTablesFactory.cpp index 313bb38d..55424fdd 100644 --- a/opensubdiv/far/patchTablesFactory.cpp +++ b/opensubdiv/far/patchTablesFactory.cpp @@ -580,10 +580,6 @@ PatchTablesFactory::gatherFVarData(AdaptiveContext & context, int level, int const * permutation = 0; // Gather the verts FVar values - // XXXX Patch verts should be rotated to match boundary / corner - // edges. Transition patterns should not be a concern, however - // we need to match parametric space, so this may need to be - // revisited... int orientationIndex = fvarPatchTag._boundaryIndex; if (fvarPatchType == PatchDescriptor::REGULAR) { if (fvarPatchTag._boundaryCount == 0) { @@ -598,7 +594,7 @@ PatchTablesFactory::gatherFVarData(AdaptiveContext & context, int level, { 6, 7, 8, 9, 5, 1, 2, 10, 4, 0, 3, 11, -1, -1, -1, -1 }, { -1, 4, 5, 6, -1, 0, 1, 7, -1, 3, 2, 8, -1, 11, 10, 9 } }; permutation = permuteBoundary[orientationIndex]; - vtxLevel.gatherQuadRegularBoundaryPatchPoints(faceIndex, patchVerts, orientationIndex); + vtxLevel.gatherQuadRegularBoundaryPatchPoints(faceIndex, patchVerts, orientationIndex, *fvc); } else if (fvarPatchTag._boundaryCount == 2) { // Expand corner patch vertices and rotate to restore correct orientation. static int const permuteCorner[4][16] = { @@ -1046,7 +1042,7 @@ PatchTablesFactory::identifyAdaptivePatches(AdaptiveContext & context) { } // - // We have a quad that will be represented as a B-spline or Gregory patch. Use + // We have a quad that will be represented as a B-spline or end cap patch. Use // the "composite" tag again to quickly determine if any vertex is irregular, on // a boundary, non-manifold, etc. // @@ -1057,11 +1053,10 @@ PatchTablesFactory::identifyAdaptivePatches(AdaptiveContext & context) { // for the irregular/xordinary case when a corner vertex is a boundary but there // are no boundary edges. // - // As for transition detection, assign the transition properties (even if 0) as - // their rotations override boundary rotations (when no transition) + // As for transition detection, assign the transition properties (even if 0). // // NOTE on patches around non-manifold vertices: - // In most the use of regular boundary or corner patches is what we want, + // In most cases the use of regular boundary or corner patches is what we want, // but in some, i.e. when a non-manifold vertex is infinitely sharp, using // such patches will create some discontinuities. At this point non-manifold // support is still evolving and is not strictly defined, so this is left to diff --git a/opensubdiv/far/protoStencil.h b/opensubdiv/far/protoStencil.h index c2467f5d..b29e096c 100644 --- a/opensubdiv/far/protoStencil.h +++ b/opensubdiv/far/protoStencil.h @@ -53,7 +53,7 @@ public: _maxsize(maxSize), _interpolateVarying(interpolateVarying) { } ~Allocator() { - clearBigStencils(); + clearBigStencils(); } // Returns the number of stencils in the allocator