AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-28 06:11:07 +00:00
Code Issues Releases Wiki Activity

Rename some members of Far::TopologyRefinerFactory::TopologyDescriptor for consistency

Browse Source 
- propagate changes to tutorials / examples
This commit is contained in:
manuelk 2014-12-12 11:19:24 -08:00
parent ce55f56d50
commit 9a3a88546d
11 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/mayaPolySmooth/mayaPolySmooth.cpp
View File

@ -342,8 +342,8 @@ gatherTopology( MFnMesh const & inMeshFn,
int * vertsPerFace = new int[desc.numFaces],
* vertIndices = new int[inMeshFn.numFaceVertices()];
desc.vertsPerFace = vertsPerFace;
desc.vertIndices = vertIndices;
desc.numVertsPerFace = vertsPerFace;
desc.vertIndicesPerFace = vertIndices;
// Create Topology
@ -386,8 +386,8 @@ gatherTopology( MFnMesh const & inMeshFn,
OpenSubdiv::Far::TopologyRefiner * refiner =
OpenSubdiv::Far::TopologyRefinerFactory<Descriptor>::Create(type, options, desc);
delete [] desc.vertsPerFace;
delete [] desc.vertIndices;
delete [] desc.numVertsPerFace;
delete [] desc.vertIndicesPerFace;
delete [] desc.creaseVertexIndexPairs;
delete [] desc.creaseWeights;

4
opensubdiv/far/topologyRefinerFactory.cpp
View File

@ -212,7 +212,7 @@ TopologyRefinerFactory<TopologyRefinerFactoryBase::TopologyDescriptor>::resizeCo
for (int face=0; face<desc.numFaces; ++face) {
refiner.setNumBaseFaceVertices(face, desc.vertsPerFace[face]);
refiner.setNumBaseFaceVertices(face, desc.numVertsPerFace[face]);
}
}
@ -227,7 +227,7 @@ TopologyRefinerFactory<TopologyRefinerFactoryBase::TopologyDescriptor>::assignCo
for (int vert=0; vert<dstFaceVerts.size(); ++vert) {
dstFaceVerts[vert] = desc.vertIndices[idx++];
dstFaceVerts[vert] = desc.vertIndicesPerFace[idx++];
}
}
}

4
opensubdiv/far/topologyRefinerFactory.h
View File

@ -67,8 +67,8 @@ public:
int numVertices,
numFaces;
Index const * vertsPerFace,
* vertIndices;
int const * numVertsPerFace;
Index const * vertIndicesPerFace;
int numCreases;
Index const * creaseVertexIndexPairs;

4
tutorials/far/tutorial_0/far_tutorial_0.cpp
View File

@ -115,8 +115,8 @@ int main(int, char **) {
Descriptor desc;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.vertsPerFace = g_vertsperface;
desc.vertIndices = g_vertIndices;
desc.numVertsPerFace = g_vertsperface;
desc.vertIndicesPerFace = g_vertIndices;
// Instantiate a FarTopologyRefiner from the descriptor

4
tutorials/far/tutorial_2/far_tutorial_2.cpp
View File

@ -217,8 +217,8 @@ createFarTopologyRefiner() {
Descriptor desc;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.vertsPerFace = g_vertsperface;
desc.vertIndices = g_vertIndices;
desc.numVertsPerFace = g_vertsperface;
desc.vertIndicesPerFace = g_vertIndices;
// Instantiate a Far::TopologyRefiner from the descriptor
Far::TopologyRefiner * refiner = Far::TopologyRefinerFactory<Descriptor>::Create(type, options, desc);

4
tutorials/far/tutorial_3/far_tutorial_3.cpp
View File

@ -174,8 +174,8 @@ int main(int, char **) {
Descriptor desc;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.vertsPerFace = g_vertsperface;
desc.vertIndices = g_vertIndices;
desc.numVertsPerFace = g_vertsperface;
desc.vertIndicesPerFace = g_vertIndices;
// Create a face-varying channel descriptor
Descriptor::FVarChannel uvs;

8
tutorials/far/tutorial_4/far_tutorial_4.cpp
View File

@ -172,10 +172,10 @@ createTopologyRefiner() {
options.SetVtxBoundaryInterpolation(Sdc::Options::VTX_BOUNDARY_EDGE_ONLY);
Descriptor desc;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.vertsPerFace = g_vertsperface;
desc.vertIndices = g_vertIndices;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.numVertsPerFace = g_vertsperface;
desc.vertIndicesPerFace = g_vertIndices;
// Instantiate a FarTopologyRefiner from the descriptor.
return Far::TopologyRefinerFactory<Descriptor>::Create(type, options, desc);

8
tutorials/far/tutorial_5/far_tutorial_5.cpp
View File

@ -222,10 +222,10 @@ createTopologyRefiner() {
options.SetVtxBoundaryInterpolation(Sdc::Options::VTX_BOUNDARY_EDGE_ONLY);
Descriptor desc;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.vertsPerFace = g_vertsperface;
desc.vertIndices = g_vertIndices;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.numVertsPerFace = g_vertsperface;
desc.vertIndicesPerFace = g_vertIndices;
// Instantiate a FarTopologyRefiner from the descriptor.
Far::TopologyRefiner * refiner =

4
tutorials/far/tutorial_6/far_tutorial_6.cpp
View File

@ -249,8 +249,8 @@ createTopologyRefiner() {
Descriptor desc;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.vertsPerFace = g_vertsperface;
desc.vertIndices = g_faceverts;
desc.numVertsPerFace = g_vertsperface;
desc.vertIndicesPerFace = g_faceverts;
desc.numCreases = g_ncreases;
desc.creaseVertexIndexPairs = g_creaseverts;
desc.creaseWeights = g_creaseweights;

8
tutorials/far/tutorial_7/far_tutorial_7.cpp
View File

@ -224,10 +224,10 @@ createTopologyRefiner() {
options.SetVtxBoundaryInterpolation(Sdc::Options::VTX_BOUNDARY_EDGE_ONLY);
Descriptor desc;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.vertsPerFace = g_vertsperface;
desc.vertIndices = g_vertIndices;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.numVertsPerFace = g_vertsperface;
desc.vertIndicesPerFace = g_vertIndices;
// Instantiate a FarTopologyRefiner from the descriptor.
return Far::TopologyRefinerFactory<Descriptor>::Create(type, options, desc);

8
tutorials/osd/tutorial_0/osd_tutorial_0.cpp
View File

@ -155,10 +155,10 @@ createTopologyRefiner(int maxlevel) {
options.SetVtxBoundaryInterpolation(Sdc::Options::VTX_BOUNDARY_EDGE_ONLY);
Descriptor desc;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.vertsPerFace = g_vertsperface;
desc.vertIndices = g_vertIndices;
desc.numVertices = g_nverts;
desc.numFaces = g_nfaces;
desc.numVertsPerFace = g_vertsperface;
desc.vertIndicesPerFace = g_vertIndices;
// Instantiate a FarTopologyRefiner from the descriptor
Far::TopologyRefiner * refiner =