Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-26 05:42:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix incorrect position of the container during updating

Browse source
This commit is contained in:
Kayla Man 2023-08-25 11:54:44 +08:00
parent d0857a63e0
commit 098bacddb9
6 changed files with 85 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
openpype/hosts/max/api/lib.py
View file

@ -371,9 +371,41 @@ def unique_namespace(namespace, format="%02d",
def get_namespace(container_name):
"""Get the namespace and name of the sub-container
Args:
container_name (str): the name of master container
Raises:
RuntimeError: when there is no master container found
Returns:
namespace (str): namespace of the sub-container
name (str): name of the sub-container
"""
node = rt.getNodeByName(container_name)
if not node:
raise RuntimeError("Master Container Not Found..")
name = rt.getUserProp(node, "name")
namespace = rt.getUserProp(node, "namespace")
return namespace, name
def object_transform_set(container_children):
"""A function which allows to store the transform of
previous loaded object(s)
Args:
container_children(list): A list of nodes
Returns:
transform_set (dict): A dict with all transform data of
the previous loaded object(s)
"""
transform_set = {}
for node in container_children:
name = f"{node.name}.transform"
transform_set[name] = node.pos
name = f"{node.name}.scale"
transform_set[name] = node.scale
name = f"{node.name}.rotation"
transform_set[name] = node.rotation
return transform_set

11
openpype/hosts/max/plugins/load/load_camera_fbx.py
View file

@ -2,7 +2,9 @@ import os
from openpype.hosts.max.api import lib, maintained_selection
from openpype.hosts.max.api.lib import (
unique_namespace, get_namespace
unique_namespace,
get_namespace,
object_transform_set
)
from openpype.hosts.max.api.pipeline import (
containerise,
@ -61,6 +63,7 @@ class FbxLoader(load.LoaderPlugin):
sub_node_name = f"{namespace}:{name}"
inst_container = rt.getNodeByName(sub_node_name)
rt.Select(inst_container.Children)
transform_data = object_transform_set(inst_container.Children)
for prev_fbx_obj in rt.selection:
if rt.isValidNode(prev_fbx_obj):
rt.Delete(prev_fbx_obj)
@ -77,6 +80,12 @@ class FbxLoader(load.LoaderPlugin):
if fbx_object.Parent != inst_container:
fbx_object.Parent = inst_container
fbx_object.name = f"{namespace}:{fbx_object.name}"
fbx_object.pos = transform_data[
f"{fbx_object.name}.transform"]
fbx_object.rotation = transform_data[
f"{fbx_object.name}.rotation"]
fbx_object.scale = transform_data[
f"{fbx_object.name}.scale"]
for children in node.Children:
if rt.classOf(children) == rt.Container:

12
openpype/hosts/max/plugins/load/load_max_scene.py
View file

@ -2,7 +2,9 @@ import os
from openpype.hosts.max.api import lib
from openpype.hosts.max.api.lib import (
unique_namespace, get_namespace
unique_namespace,
get_namespace,
object_transform_set
)
from openpype.hosts.max.api.pipeline import (
containerise, import_custom_attribute_data,
@ -62,6 +64,7 @@ class MaxSceneLoader(load.LoaderPlugin):
# delete the old container with attribute
# delete old duplicate
rt.Select(node.Children)
transform_data = object_transform_set(node.Children)
for prev_max_obj in rt.GetCurrentSelection():
if rt.isValidNode(prev_max_obj) and prev_max_obj.name != sub_container_name: # noqa
rt.Delete(prev_max_obj)
@ -77,7 +80,12 @@ class MaxSceneLoader(load.LoaderPlugin):
for max_obj, obj_name in zip(current_max_objects,
current_max_object_names):
max_obj.name = f"{namespace}:{obj_name}"
max_obj.pos = transform_data[
f"{max_obj.name}.transform"]
max_obj.rotation = transform_data[
f"{max_obj.name}.rotation"]
max_obj.scale = transform_data[
f"{max_obj.name}.scale"]
lib.imprint(container["instance_node"], {
"representation": str(representation["_id"])

11
openpype/hosts/max/plugins/load/load_model_fbx.py
View file

@ -6,7 +6,9 @@ from openpype.hosts.max.api.pipeline import (
)
from openpype.hosts.max.api import lib
from openpype.hosts.max.api.lib import (
unique_namespace, get_namespace
unique_namespace,
get_namespace,
object_transform_set
)
from openpype.hosts.max.api.lib import maintained_selection
@ -56,6 +58,7 @@ class FbxModelLoader(load.LoaderPlugin):
sub_node_name = f"{namespace}:{name}"
inst_container = rt.getNodeByName(sub_node_name)
rt.Select(inst_container.Children)
transform_data = object_transform_set(inst_container.Children)
for prev_fbx_obj in rt.selection:
if rt.isValidNode(prev_fbx_obj):
rt.Delete(prev_fbx_obj)
@ -71,6 +74,12 @@ class FbxModelLoader(load.LoaderPlugin):
if fbx_object.Parent != inst_container:
fbx_object.Parent = inst_container
fbx_object.name = f"{namespace}:{fbx_object.name}"
fbx_object.pos = transform_data[
f"{fbx_object.name}.transform"]
fbx_object.rotation = transform_data[
f"{fbx_object.name}.rotation"]
fbx_object.scale = transform_data[
f"{fbx_object.name}.scale"]
for children in node.Children:
if rt.classOf(children) == rt.Container:

12
openpype/hosts/max/plugins/load/load_model_obj.py
View file

@ -2,7 +2,10 @@ import os
from openpype.hosts.max.api import lib
from openpype.hosts.max.api.lib import (
unique_namespace, get_namespace
unique_namespace,
get_namespace,
maintained_selection,
object_transform_set
)
from openpype.hosts.max.api.lib import maintained_selection
from openpype.hosts.max.api.pipeline import (
@ -56,6 +59,7 @@ class ObjLoader(load.LoaderPlugin):
sub_node_name = f"{namespace}:{name}"
inst_container = rt.getNodeByName(sub_node_name)
rt.Select(inst_container.Children)
transform_data = object_transform_set(inst_container.Children)
for prev_obj in rt.selection:
if rt.isValidNode(prev_obj):
rt.Delete(prev_obj)
@ -67,6 +71,12 @@ class ObjLoader(load.LoaderPlugin):
for selection in selections:
selection.Parent = inst_container
selection.name = f"{namespace}:{selection.name}"
selection.pos = transform_data[
f"{selection.name}.transform"]
selection.rotation = transform_data[
f"{selection.name}.rotation"]
selection.scale = transform_data[
f"{selection.name}.scale"]
with maintained_selection():
rt.Select(node)

14
openpype/hosts/max/plugins/load/load_model_usd.py
View file

@ -2,7 +2,9 @@ import os
from openpype.hosts.max.api import lib
from openpype.hosts.max.api.lib import (
unique_namespace, get_namespace
unique_namespace,
get_namespace,
object_transform_set
)
from openpype.hosts.max.api.lib import maintained_selection
from openpype.hosts.max.api.pipeline import (
@ -63,8 +65,10 @@ class ModelUSDLoader(load.LoaderPlugin):
node = rt.GetNodeByName(node_name)
namespace, name = get_namespace(node_name)
sub_node_name = f"{namespace}:{name}"
transform_data = None
for n in node.Children:
rt.Select(n.Children)
transform_data = object_transform_set(n.Children)
for prev_usd_asset in rt.selection:
if rt.isValidNode(prev_usd_asset):
rt.Delete(prev_usd_asset)
@ -85,8 +89,14 @@ class ModelUSDLoader(load.LoaderPlugin):
import_custom_attribute_data(asset, asset.Children)
for children in asset.Children:
children.name = f"{namespace}:{children.name}"
asset.name = sub_node_name
children.pos = transform_data[
f"{children.name}.transform"]
children.rotation = transform_data[
f"{children.name}.rotation"]
children.scale = transform_data[
f"{children.name}.scale"]
asset.name = sub_node_name
with maintained_selection():
rt.Select(node)