Skip to content

usdzconvert is not compatible with USD-23 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MagicalTux wants to merge 1 commit into
base: master
Choose a base branch
from
Open

usdzconvert is not compatible with USD-23 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions usdzconvert/usdStageWithFbx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def processNormals(self, fbxMesh, usdMesh, vertexIndices):

indices = self.getIndicesWithLayerElements(fbxMesh, fbxLayerNormals)
interpolation = self.getInterpolationWithLayerElements(fbxLayerNormals)
normalPrimvar = usdMesh.CreatePrimvar('normals', Sdf.ValueTypeNames.Normal3fArray, interpolation)
normalPrimvar = UsdGeom.PrimvarsAPI(usdMesh).CreatePrimvar('normals', Sdf.ValueTypeNames.Normal3fArray, interpolation)
normalPrimvar.Set(normals)
if len(indices) != 0:
normalPrimvar.SetIndices(Vt.IntArray(indices))
Expand Down Expand Up @@ -454,7 +454,7 @@ def processUVs(self, fbxMesh, usdMesh, vertexIndices):
else:
texCoordSet = usdUtils.makeValidIdentifier(texCoordSet)

uvPrimvar = usdMesh.CreatePrimvar(texCoordSet, Sdf.ValueTypeNames.Float2Array, interpolation)
uvPrimvar = UsdGeom.PrimvarsAPI(usdMesh).CreatePrimvar(texCoordSet, Sdf.ValueTypeNames.Float2Array, interpolation)
uvPrimvar.Set(uvs)
if len(indices) != 0:
uvPrimvar.SetIndices(Vt.IntArray(indices))
Expand Down
4 changes: 2 additions & 2 deletions usdzconvert/usdStageWithGlTF.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ def processPrimitive(self, nodeIdx, gltfPrimitive, path, skinIdx, skeleton):
if count == 0: # no indices
count = accessor.count
elif key == 'NORMAL':
normalPrimvar = usdGeom.CreatePrimvar('normals', Sdf.ValueTypeNames.Normal3fArray, UsdGeom.Tokens.vertex)
normalPrimvar = UsdGeom.PrimvarsAPI(usdGeom).CreatePrimvar('normals', Sdf.ValueTypeNames.Normal3fArray, UsdGeom.Tokens.vertex)
normalPrimvar.Set(accessor.data)
elif key == 'TANGENT':
pass
Expand All @@ -1157,7 +1157,7 @@ def processPrimitive(self, nodeIdx, gltfPrimitive, path, skinIdx, skeleton):

texCoordSet = key[9:]
primvarName = 'st' if texCoordSet == '0' else 'st' + texCoordSet
uvs = usdGeom.CreatePrimvar(primvarName, Sdf.ValueTypeNames.TexCoord2fArray, UsdGeom.Tokens.vertex)
uvs = UsdGeom.PrimvarsAPI(usdGeom).CreatePrimvar(primvarName, Sdf.ValueTypeNames.TexCoord2fArray, UsdGeom.Tokens.vertex)
uvs.Set(newData)
elif key == 'COLOR_0':
data = accessor.data
Expand Down
8 changes: 4 additions & 4 deletions usdzconvert/usdStageWithObj.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,14 @@ def createMesh(self, geomPath, group, groupName, usdStage):

if minUvIndex >= 0:
if group.uvsHaveOwnIndices:
uvPrimvar = usdMesh.CreatePrimvar('st', Sdf.ValueTypeNames.TexCoord2fArray, UsdGeom.Tokens.faceVarying)
uvPrimvar = UsdGeom.PrimvarsAPI(usdMesh).CreatePrimvar('st', Sdf.ValueTypeNames.TexCoord2fArray, UsdGeom.Tokens.faceVarying)
uvPrimvar.Set(self.uvs[minUvIndex:maxUvIndex+1])
if minUvIndex == 0: # optimization
uvPrimvar.SetIndices(Vt.IntArray(group.uvIndices))
else:
uvPrimvar.SetIndices(Vt.IntArray(list(map(lambda x: x - minUvIndex, group.uvIndices))))
else:
uvPrimvar = usdMesh.CreatePrimvar('st', Sdf.ValueTypeNames.TexCoord2fArray, UsdGeom.Tokens.vertex)
uvPrimvar = UsdGeom.PrimvarsAPI(usdMesh).CreatePrimvar('st', Sdf.ValueTypeNames.TexCoord2fArray, UsdGeom.Tokens.vertex)
uvPrimvar.Set(self.uvs[minUvIndex:maxUvIndex+1])

# normals
Expand All @@ -281,14 +281,14 @@ def createMesh(self, geomPath, group, groupName, usdStage):

if minNormalIndex >= 0:
if group.normalsHaveOwnIndices:
normalPrimvar = usdMesh.CreatePrimvar('normals', Sdf.ValueTypeNames.Normal3fArray, UsdGeom.Tokens.faceVarying)
normalPrimvar = UsdGeom.PrimvarsAPI(usdMesh).CreatePrimvar('normals', Sdf.ValueTypeNames.Normal3fArray, UsdGeom.Tokens.faceVarying)
normalPrimvar.Set(self.normals[minNormalIndex:maxNormalIndex+1])
if minNormalIndex == 0: # optimization
normalPrimvar.SetIndices(Vt.IntArray(group.normalIndices))
else:
normalPrimvar.SetIndices(Vt.IntArray(list(map(lambda x: x - minNormalIndex, group.normalIndices))))
else:
normalPrimvar = usdMesh.CreatePrimvar('normals', Sdf.ValueTypeNames.Normal3fArray, UsdGeom.Tokens.vertex)
normalPrimvar = UsdGeom.PrimvarsAPI(usdMesh).CreatePrimvar('normals', Sdf.ValueTypeNames.Normal3fArray, UsdGeom.Tokens.vertex)
normalPrimvar.Set(self.normals[minNormalIndex:maxNormalIndex+1])

# materials
Expand Down