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

Merge pull request #600 from barfowl/fvar_channel

Browse Source 
Made channel argument non-optional for internal face-varying methods
This commit is contained in:
Jeremy Cowles 2015-06-03 19:37:00 -07:00
commit d716431b64
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opensubdiv/far/patchTable.h
View File

@ -352,22 +352,22 @@ private:
struct FVarPatchChannel;
typedef std::vector<FVarPatchChannel> FVarPatchChannelVector;
FVarPatchChannel & getFVarPatchChannel(int channel = 0);
FVarPatchChannel const & getFVarPatchChannel(int channel = 0) const;
FVarPatchChannel & getFVarPatchChannel(int channel);
FVarPatchChannel const & getFVarPatchChannel(int channel) const;
void allocateFVarPatchChannels(int numChannels);
void allocateFVarPatchChannelValues(
int numPatches, int numVerticesTotal, int channel = 0);
int numPatches, int numVerticesTotal, int channel);
void setFVarPatchChannelLinearInterpolation(
Sdc::Options::FVarLinearInterpolation interpolation, int channel = 0);
Sdc::Options::FVarLinearInterpolation interpolation, int channel);
PatchDescriptor::Type getFVarPatchType(int patch, int channel = 0) const;
Vtr::Array<PatchDescriptor::Type> getFVarPatchTypes(int channel = 0);
PatchDescriptor::Type getFVarPatchType(int patch, int channel) const;
Vtr::Array<PatchDescriptor::Type> getFVarPatchTypes(int channel);
IndexArray getFVarValues(int channel = 0);
ConstIndexArray getPatchFVarValues(int patch, int channel = 0) const;
IndexArray getFVarValues(int channel);
ConstIndexArray getPatchFVarValues(int patch, int channel) const;
private:

8
opensubdiv/vtr/level.cpp
View File

@ -948,10 +948,10 @@ Level::gatherQuadRegularCornerPatchPoints(
intFacePoints = level.getFaceVertices(intFace);
nextFacePoints = level.getFaceVertices(nextFace);
} else {
thisFacePoints = level.getFaceFVarValues(face);
prevFacePoints = level.getFaceFVarValues(prevFace);
intFacePoints = level.getFaceFVarValues(intFace);
nextFacePoints = level.getFaceFVarValues(nextFace);
thisFacePoints = level.getFaceFVarValues(face, fvarChannel);
prevFacePoints = level.getFaceFVarValues(prevFace, fvarChannel);
intFacePoints = level.getFaceFVarValues(intFace, fvarChannel);
nextFacePoints = level.getFaceFVarValues(nextFace, fvarChannel);
}
patchPoints[0] = thisFacePoints[ cornerVertInFace];

14
opensubdiv/vtr/level.h
View File

@ -205,13 +205,13 @@ public:
bool isFaceHole(Index faceIndex) const;
// Face-varying
Sdc::Options getFVarOptions(int channel = 0) const;
Sdc::Options getFVarOptions(int channel) const;
int getNumFVarChannels() const { return (int) _fvarChannels.size(); }
int getNumFVarValues(int channel = 0) const;
ConstIndexArray getFaceFVarValues(Index faceIndex, int channel = 0) const;
int getNumFVarValues(int channel) const;
ConstIndexArray getFaceFVarValues(Index faceIndex, int channel) const;
FVarLevel & getFVarLevel(int channel = 0) { return *_fvarChannels[channel]; }
FVarLevel const & getFVarLevel(int channel = 0) const { return *_fvarChannels[channel]; }
FVarLevel & getFVarLevel(int channel) { return *_fvarChannels[channel]; }
FVarLevel const & getFVarLevel(int channel) const { return *_fvarChannels[channel]; }
// Manifold/non-manifold tags:
void setEdgeNonManifold(Index edgeIndex, bool b);
@ -327,9 +327,9 @@ public:
// Create, destroy and populate face-varying channels:
int createFVarChannel(int fvarValueCount, Sdc::Options const& options);
void destroyFVarChannel(int channel = 0);
void destroyFVarChannel(int channel);
IndexArray getFaceFVarValues(Index faceIndex, int channel = 0);
IndexArray getFaceFVarValues(Index faceIndex, int channel);
void completeFVarChannelTopology(int channel, int regBoundaryValence);