AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-24 16:51:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #504 from davidgyu/cleanup

Browse Source 
Comment cleanups discovered while reviewing Far
This commit is contained in:
George ElKoura 2015-05-20 19:40:49 -07:00
commit a7d9d6a9b4
7 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opensubdiv/far/gregoryBasis.h
View File

@ -217,7 +217,7 @@ public:
// Control Vertices based on :
// "Approximating Subdivision Surfaces with Gregory Patches for Hardware
// Tessellation" Loop, Schaefer, Ni, Castafio (ACM ToG Siggraph Asia
// Tessellation" Loop, Schaefer, Ni, Castano (ACM ToG Siggraph Asia
// 2009)
//
// P3 e3- e2+ P2

2
opensubdiv/far/patchDescriptor.h
View File

@ -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 :
///

1
opensubdiv/far/patchMap.h
View File

@ -182,7 +182,6 @@ PatchMap::FindPatch( int faceid, float u, float v ) const {
return 0;
}
// Constructor
} // end namespace Far
} // end namespace OPENSUBDIV_VERSION

13
opensubdiv/far/patchTablesFactory.cpp
View File

@ -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

2
opensubdiv/far/protoStencil.h
View File

@ -53,7 +53,7 @@ public:
_maxsize(maxSize), _interpolateVarying(interpolateVarying) { }
~Allocator() {
clearBigStencils();
clearBigStencils();
}
// Returns the number of stencils in the allocator

2
opensubdiv/osd/glslPatchGregory.glsl
View File

@ -277,7 +277,7 @@ void main()
// Control Vertices based on :
// "Approximating Subdivision Surfaces with Gregory Patches for Hardware Tessellation"
// Loop, Schaefer, Ni, Castafio (ACM ToG Siggraph Asia 2009)
// Loop, Schaefer, Ni, Castano (ACM ToG Siggraph Asia 2009)
//
// P3 e3- e2+ E2
// O--------O--------O--------O

2
opensubdiv/osd/hlslPatchGregory.hlsl
View File

@ -337,7 +337,7 @@ GregDomainVertex hs_main_patches(
// Control Vertices based on :
// "Approximating Subdivision Surfaces with Gregory Patches for Hardware Tessellation"
// Loop, Schaefer, Ni, Castafio (ACM ToG Siggraph Asia 2009)
// Loop, Schaefer, Ni, Castano (ACM ToG Siggraph Asia 2009)
//
// P3 e3- e2+ E2
// O--------O--------O--------O