AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2025-01-04 06:00:17 +00:00
Code Issues Releases Wiki Activity

OsdUtilPatchPartitioner does not support face-varying data #272

Browse Source 
* instantiates FarPatchTables with face-varying data for a single uniform subdivision level, or for an adaptively subdivided mesh
* face-varying data is not regenerated if data for multiple uniform subdivision levels is present
This commit is contained in:
nathan-at-digitalfish 2014-04-09 16:30:40 -07:00
parent e011fa34af
commit 1b784ef7b3
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
opensubdiv/osdutil/patchPartitioner.h
View File

@ -120,11 +120,17 @@ OsdUtilPatchPartitioner::OsdUtilPatchPartitioner(FarPatchTables const *srcPatchT
srcPatchTables->GetPatchTable();
FarPatchTables::QuadOffsetTable const &srcQuadOffsetTable =
srcPatchTables->GetQuadOffsetTable();
FarPatchTables::FVarData const &srcFVarData =
srcPatchTables->GetFVarData();
// dst tables
FarPatchTables::PatchParamTable newPatchParamTable;
FarPatchTables::PTable newPTable;
FarPatchTables::QuadOffsetTable newQuadOffsetTable;
std::vector<float> newFVarDataTable;
bool hasFVarData = !srcFVarData.GetAllData().empty() &&
srcFVarData.GetData(1) == NULL; // multi-level face-varying data not supported
int fvarWidth = hasFVarData ? srcFVarData.GetFVarWidth() : 0;
// iterate over all patch
for (FarPatchTables::PatchArrayVector::const_iterator paIt =
@ -136,6 +142,7 @@ OsdUtilPatchPartitioner::OsdUtilPatchPartitioner(FarPatchTables const *srcPatchT
int vertexOffset = (int)newPTable.size();
int patchOffset = (int)newPatchParamTable.size();
int quadOffsetOffset = (int)newQuadOffsetTable.size();
int fvarOffset = (int)newFVarDataTable.size();
// shuffle this range in partition order
std::vector<std::pair<int, int> > sortProxy(paIt->GetNumPatches());
@ -176,6 +183,14 @@ OsdUtilPatchPartitioner::OsdUtilPatchPartitioner(FarPatchTables const *srcPatchT
srcQuadOffsetTable[patchIndex*4+j + quadOffsetOffset]);
}
}
// reorder corresponding face-varying table entry
if (hasFVarData) {
for (int j = 0; j < 4 * fvarWidth; ++j) {
newFVarDataTable.push_back(
srcFVarData.GetAllData()[patchIndex*4*fvarWidth+j + fvarOffset]);
}
}
}
// split patch array
@ -199,8 +214,8 @@ OsdUtilPatchPartitioner::OsdUtilPatchPartitioner(FarPatchTables const *srcPatchT
&srcPatchTables->GetVertexValenceTable(),
&newQuadOffsetTable,
&newPatchParamTable,
NULL,
0,
hasFVarData ? &newFVarDataTable : NULL,
fvarWidth,
srcPatchTables->GetMaxValence());
}