Skip to content

Add usda and usdc file format for viewer3D #3083

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
servantftransperfect wants to merge 1 commit into
base: develop
Choose a base branch
from
+6 −2
Open

Add usda and usdc file format for viewer3D #3083

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
2 changes: 1 addition & 1 deletion meshroom/core/attribute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class Attribute(BaseObject):
"""
LINK_EXPRESSION_REGEX = re.compile(r'^\{[A-Za-z]+[A-Za-z0-9_.\[\]]*\}$')
VALID_IMAGE_SEMANTICS = ["image", "imageList", "sequence"]
VALID_3D_EXTENSIONS = [".obj", ".stl", ".fbx", ".gltf", ".abc", ".ply"]
VALID_3D_EXTENSIONS = [".obj", ".stl", ".fbx", ".gltf", ".abc", ".ply", ".usdc", ".usda"]
VALID_TEXT_EXTENSIONS = [".txt", ".json", ".log", ".csv", ".md"]

@staticmethod
Expand Down
2 changes: 2 additions & 0 deletions meshroom/ui/qml/Viewer3D/MediaLoader.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ import Utils 1.0
component = sceneLoaderEntityComponent
}
break
case ".usda":
case ".usdc":
case ".abc":
case ".json":
case ".sfm":
Expand Down
2 changes: 2 additions & 0 deletions meshroom/ui/qml/Viewer3D/Viewer3DSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ Item {
readonly property var supportedExtensions: {
var exts = [".obj", ".stl", ".fbx", ".gltf", ".ply"];
if (supportSfmData) {
exts.push(".usda")
exts.push(".usdc")
exts.push(".abc")
exts.push(".json")
exts.push(".sfm")
Expand Down
2 changes: 1 addition & 1 deletion tests/test_attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import logging
logger = logging.getLogger('test')

valid3DExtensionFiles = [(f'test.{ext}', True) for ext in ('obj', 'stl', 'fbx', 'gltf', 'abc', 'ply')]
valid3DExtensionFiles = [(f'test.{ext}', True) for ext in ('obj', 'stl', 'fbx', 'gltf', 'abc', 'ply', 'usda', 'usdc')]
invalid3DExtensionFiles = [(f'test.{ext}', False) for ext in ('', 'exe', 'jpg', 'png', 'py')]

valid2DSemantics= [(semantic, True) for semantic in ('image', 'imageList', 'sequence')]
Expand Down
Loading