Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3408 from pypeclub/bugfix/houdini-vdb-bgeo-loading-updating-fix

Browse source 
Houdini: fix loading and updating vbd/bgeo sequences
This commit is contained in:
Ondřej Samohel 2022-06-27 12:02:04 +02:00 • committed by GitHub
commit 714c588487
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
openpype/hosts/houdini/plugins/load/load_bgeo.py
View file

@ -44,7 +44,8 @@ class BgeoLoader(load.LoaderPlugin):
# Explicitly create a file node # Explicitly create a file node
file_node = container.createNode("file", node_name=node_name) file_node = container.createNode("file", node_name=node_name)
file_node.setParms({"file": self.format_path(self.fname, is_sequence)}) file_node.setParms(
{"file": self.format_path(self.fname, context["representation"])})
# Set display on last node # Set display on last node
file_node.setDisplayFlag(True) file_node.setDisplayFlag(True)
@ -62,15 +63,15 @@ class BgeoLoader(load.LoaderPlugin):
) )
@staticmethod @staticmethod
def format_path(path, is_sequence): def format_path(path, representation):
"""Format file path correctly for single bgeo or bgeo sequence.""" """Format file path correctly for single bgeo or bgeo sequence."""
if not os.path.exists(path): if not os.path.exists(path):
raise RuntimeError("Path does not exist: %s" % path) raise RuntimeError("Path does not exist: %s" % path)
is_sequence = bool(representation["context"].get("frame"))
# The path is either a single file or sequence in a folder. # The path is either a single file or sequence in a folder.
if not is_sequence: if not is_sequence:
filename = path filename = path
print("single")
else: else:
filename = re.sub(r"(.*)\.(\d+)\.(bgeo.*)", "\\1.$F4.\\3", path) filename = re.sub(r"(.*)\.(\d+)\.(bgeo.*)", "\\1.$F4.\\3", path)
@ -94,9 +95,9 @@ class BgeoLoader(load.LoaderPlugin):
# Update the file path # Update the file path
file_path = get_representation_path(representation) file_path = get_representation_path(representation)
file_path = self.format_path(file_path) file_path = self.format_path(file_path, representation)
file_node.setParms({"fileName": file_path}) file_node.setParms({"file": file_path})
# Update attribute # Update attribute
node.setParms({"representation": str(representation["_id"])}) node.setParms({"representation": str(representation["_id"])})

27
openpype/hosts/houdini/plugins/load/load_vdb.py
View file

@ -40,7 +40,8 @@ class VdbLoader(load.LoaderPlugin):
# Explicitly create a file node # Explicitly create a file node
file_node = container.createNode("file", node_name=node_name) file_node = container.createNode("file", node_name=node_name)
file_node.setParms({"file": self.format_path(self.fname)}) file_node.setParms(
{"file": self.format_path(self.fname, context["representation"])})
# Set display on last node # Set display on last node
file_node.setDisplayFlag(True) file_node.setDisplayFlag(True)
@ -57,30 +58,20 @@ class VdbLoader(load.LoaderPlugin):
suffix="", suffix="",
) )
def format_path(self, path): @staticmethod
def format_path(path, representation):
"""Format file path correctly for single vdb or vdb sequence.""" """Format file path correctly for single vdb or vdb sequence."""
if not os.path.exists(path): if not os.path.exists(path):
raise RuntimeError("Path does not exist: %s" % path) raise RuntimeError("Path does not exist: %s" % path)
is_sequence = bool(representation["context"].get("frame"))
# The path is either a single file or sequence in a folder. # The path is either a single file or sequence in a folder.
is_single_file = os.path.isfile(path) if not is_sequence:
if is_single_file:
filename = path filename = path
else: else:
# The path points to the publish .vdb sequence folder so we filename = re.sub(r"(.*)\.(\d+)\.vdb$", "\\1.$F4.vdb", path)
# find the first file in there that ends with .vdb
files = sorted(os.listdir(path))
first = next((x for x in files if x.endswith(".vdb")), None)
if first is None:
raise RuntimeError(
"Couldn't find first .vdb file of "
"sequence in: %s" % path
)
# Set <frame>.vdb to $F.vdb filename = os.path.join(path, filename)
first = re.sub(r"\.(\d+)\.vdb$", ".$F.vdb", first)
filename = os.path.join(path, first)
filename = os.path.normpath(filename) filename = os.path.normpath(filename)
filename = filename.replace("\\", "/") filename = filename.replace("\\", "/")
@ -100,7 +91,7 @@ class VdbLoader(load.LoaderPlugin):
# Update the file path # Update the file path
file_path = get_representation_path(representation) file_path = get_representation_path(representation)
file_path = self.format_path(file_path) file_path = self.format_path(file_path, representation)
file_node.setParms({"file": file_path}) file_node.setParms({"file": file_path})