Skip to content

#3487: publish xgen files, 3dpaint textures #189

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#3487: publish xgen files, 3dpaint textures #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b79d2f9
#3487: publish xgen files, 3dpaint textures
Sudarshanhavale Feb 5, 2020
c1341cb
#3487 Removed comment-out lines as it won't be necessary for code.
Sudarshanhavale Feb 6, 2020
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
50 changes: 50 additions & 0 deletions core/templates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,42 @@ paths:
sequence_asset_publish_standin: '@sequence_asset_publish_area_scene/standin/@geom_subdirs/@sequence_asset_version_name.{maya.std.ext}'
shot_asset_publish_standin: '@shot_asset_publish_area_scene/standin/@geom_subdirs/@shot_asset_version_name.{maya.std.ext}'

# XGEN FILES
project_publish_xgen_file: '@project_publish_area_scene/@project_version_name_xgen_file.xgen'
sequence_publish_xgen_file: '@sequence_publish_area_scene/@sequence_version_name_xgen_file.xgen'
shot_publish_xgen_file: '@shot_publish_area_scene/@shot_version_name_xgen_file.xgen'

project_asset_publish_xgen_file: '@project_asset_publish_area_scene/@project_asset_version_name_xgen_file.xgen'
sequence_asset_publish_xgen_file: '@sequence_asset_publish_area_scene/@sequence_asset_version_name_xgen_file.xgen'
shot_asset_publish_xgen_file: '@shot_asset_publish_area_scene/@shot_asset_version_name_xgen_file.xgen'

# XGEN PATCHES
project_publish_xgen_patch: '@project_publish_area_scene/@project_version_name_xgen_file.abc'
sequence_publish_xgen_patch: '@sequence_publish_area_scene/@sequence_version_name_xgen_file.abc'
shot_publish_xgen_patch: '@shot_publish_area_scene/@shot_version_name_xgen_file.abc'

project_asset_publish_xgen_patch: '@project_asset_publish_area_scene/@project_asset_version_name_xgen_file.abc'
sequence_asset_publish_xgen_patch: '@sequence_asset_publish_area_scene/@sequence_asset_version_name_xgen_file.abc'
shot_asset_publish_xgen_patch: '@shot_asset_publish_area_scene/@shot_asset_version_name_xgen_file.abc'

# XGEN COLLECTION
project_publish_xgen_collection: '@project_publish_area_scene/xgen/collections/@project_version_name[/{palette_name}]'
sequence_publish_xgen_collection: '@sequence_publish_area_scene/xgen/collections/@sequence_version_name[/{palette_name}]'
shot_publish_xgen_collection: '@shot_publish_area_scene/xgen/collections/@shot_version_name[/{palette_name}]'

project_asset_publish_xgen_collection: '@project_asset_publish_area_scene/xgen/collections/@project_asset_version_name[/{palette_name}]'
sequence_asset_publish_xgen_collection: '@sequence_asset_publish_area_scene/xgen/collections/@sequence_asset_version_name[/{palette_name}]'
shot_asset_publish_xgen_collection: '@shot_asset_publish_area_scene/xgen/collections/@shot_asset_version_name[/{palette_name}]'

# 3DPAINTTEXTURES FILES
project_publish_3dPaintTextures: '@project_publish_area_scene/@3dPaintTextures_subdir/@project_version_name'
sequence_publish_3dPaintTextures: '@sequence_publish_area_scene/@3dPaintTextures_subdir/@sequence_version_name'
shot_publish_3dPaintTextures: '@shot_publish_area_scene/@3dPaintTextures_subdir/@shot_version_name'

project_asset_publish_3dPaintTextures: '@project_asset_publish_area_scene/@3dPaintTextures_subdir/@project_asset_version_name'
sequence_asset_publish_3dPaintTextures: '@sequence_asset_publish_area_scene/@3dPaintTextures_subdir/@sequence_asset_version_name'
shot_asset_publish_3dPaintTextures: '@shot_asset_publish_area_scene/@3dPaintTextures_subdir/@shot_asset_version_name'

# REFERENCE CAMERA
project_publish_ref_cam: '@project_publish_area_model/ref_cam/@geom_subdirs/@project_version_name.abc'
sequence_publish_ref_cam: '@sequence_publish_area_model/ref_cam/@geom_subdirs/@sequence_version_name.abc'
Expand Down Expand Up @@ -573,6 +609,8 @@ strings:
2k_subdirs: '{name}/v{version}/2K'
geom_subdirs: '{name}/v{version}[/{node}]'
texture_subdirs: '{name}/v{version}[/{node}]/{channel}[/{layer}]'
xgen_collection_subdirs: 'xgen/collections[/{palette_name}]'
3dPaintTextures_subdir: 'sourceimages/3dPaintTextures'

# SCENE PUBLISH NAMES
project_publish_name: '{Step}_{name}[-{node}]'
Expand All @@ -594,6 +632,18 @@ strings:
sequence_asset_version_name: '@sequence_asset_publish_name.v{version}'
shot_asset_version_name: '@shot_asset_publish_name.v{version}'

# ASSET XGEN VERSION NAMES:
project_asset_version_name_xgen_file: '@project_asset_publish_name.v{version}__[{palette_name}]'
sequence_asset_version_name_xgen_file: '@sequence_asset_publish_name.v{version}__[{palette_name}]'
shot_asset_version_name_xgen_file: '@shot_asset_publish_name.v{version}__[{palette_name}]'
Comment on lines +636 to +638
Copy link
Collaborator

@garvitverma garvitverma Feb 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is palette_name optional? Why are we using this as an optional field?

Copy link
Collaborator Author

@Sudarshanhavale Sudarshanhavale Feb 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the earlier approach of collecting xgen palettes as a separate item, The collector was collecting disconnected palettes as well because of the same path patterns. To resolve this issue I referred the collect (layer) render images example in which we are providing node names while collecting item. So followed the same thing here and made palette names optional and passing valid values during collection.

Apparently we moved this collection logics to the as session items properties but I didn't modify those already defined templates. But yeah, since we are passing entire dependency paths from the session, maybe no need of making those as optional fields. 

I will check that once and make the required updates. Thanks for pointing this out.

Copy link

@aparna-d2 aparna-d2 Feb 7, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whatever the method of collection, this template looks wrong. making only palette_name optional as in this template means you are looking for a file called name.v001__. Only make something optional in a template if it is truly optional in real life i.e. if a path should be allowed without that part of the template.
Same goes for xgen_collection_subdirs as well - do we expect only xgen/collections to exist without a palette_name subfolder? If not, make it not optional.

Copy link
Collaborator Author

@Sudarshanhavale Sudarshanhavale Feb 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, palette_name not an optional field in the updated templates and also confirmed that its working fine with items that are added as session item properties.


# SCENE XGEN VERSION NAMES
project_version_name_xgen_file: '@project_publish_name.v{version}__[{palette_name}]'
sequence_version_name_xgen_file: '@sequence_publish_name.v{version}__[{palette_name}]'
shot_version_name_xgen_file: '@shot_publish_name.v{version}__[{palette_name}]'






Expand Down
49 changes: 49 additions & 0 deletions core/templates/maya.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@ keys:
ass: Arnold (.ass)
default: ass

palette_name:
type: str
filter_by: '^[a-zA-Z](\w+)?[a-zA-Z0-9]$'

description_name:
type: str
filter_by: '^[a-zA-Z](\w+)?[a-zA-Z0-9]$'

patch_name:
type: str
filter_by: '^[a-zA-Z](\w+)?[a-zA-Z0-9]$'

Comment on lines +30 to +37
Copy link

@aparna-d2 aparna-d2 Feb 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these keys in use? If not, please remove them.

Copy link
Collaborator Author

@Sudarshanhavale Sudarshanhavale Feb 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. This was added considering the Loader requirements but yeah, removing for now as we can add it later whenever required.


paths:

# WORK AREAS
Expand Down Expand Up @@ -129,6 +142,42 @@ paths:
tk-maya_sequence_asset_work_standin: '@tk-maya_sequence_asset_work_area/cache/standin/@geom_subdirs/@sequence_asset_version_name.{maya.std.ext}'
tk-maya_shot_asset_work_standin: '@tk-maya_shot_asset_work_area/cache/standin/@geom_subdirs/@shot_asset_version_name.{maya.std.ext}'

# XGEN FILES
tk-maya_project_work_xgen_file: '@tk-maya_project_work_area/scenes/@project_version_name_xgen_file.xgen'
tk-maya_sequence_work_xgen_file: '@tk-maya_sequence_work_area/scenes/@sequence_version_name_xgen_file.xgen'
tk-maya_shot_work_xgen_file: '@tk-maya_shot_work_area/scenes/@shot_version_name_xgen_file.xgen'

tk-maya_project_asset_work_xgen_file: '@tk-maya_project_asset_work_area/scenes/@project_asset_version_name_xgen_file.xgen'
tk-maya_sequence_asset_work_xgen_file: '@tk-maya_sequence_asset_work_area/scenes/@sequence_asset_version_name_xgen_file.xgen'
tk-maya_shot_asset_work_xgen_file: '@tk-maya_shot_asset_work_area/scenes/@shot_asset_version_name_xgen_file.xgen'

# XGEN Patches
tk-maya_project_work_xgen_patch: '@tk-maya_project_work_area/scenes/@project_version_name_xgen_file.abc'
tk-maya_sequence_work_xgen_patch: '@tk-maya_sequence_work_area/scenes/@sequence_version_name_xgen_file.abc'
tk-maya_shot_work_xgen_patch: '@tk-maya_shot_work_area/scenes/@shot_version_name_xgen_file.abc'

tk-maya_project_asset_work_xgen_patch: '@tk-maya_project_asset_work_area/scenes/@project_asset_version_name_xgen_file.abc'
tk-maya_sequence_asset_work_xgen_patch: '@tk-maya_sequence_asset_work_area/scenes/@sequence_asset_version_name_xgen_file.abc'
tk-maya_shot_asset_work_xgen_patch: '@tk-maya_shot_asset_work_area/scenes/@shot_asset_version_name_xgen_file.abc'

# XGEN COLLECTIONS
tk-maya_project_work_xgen_collection: '@tk-maya_project_work_area/@xgen_collection_subdirs'
tk-maya_sequence_work_xgen_collection: '@tk-maya_sequence_work_area/@xgen_collection_subdirs'
tk-maya_shot_work_xgen_collection: '@tk-maya_shot_work_area/@xgen_collection_subdirs'

tk-maya_project_asset_work_xgen_collection: '@tk-maya_project_asset_work_area/@xgen_collection_subdirs'
tk-maya_sequence_asset_work_xgen_collection: '@tk-maya_sequence_asset_work_area/@xgen_collection_subdirs'
tk-maya_shot_asset_work_xgen_collection: '@tk-maya_shot_asset_work_area/@xgen_collection_subdirs'

# 3dPaintTextures FILES
tk-maya_project_work_3dPaintTextures: '@tk-maya_project_work_area/@3dPaintTextures_subdir/@project_version_name'
tk-maya_sequence_work_3dPaintTextures: '@tk-maya_sequence_work_area/@3dPaintTextures_subdir/@sequence_version_name'
tk-maya_shot_work_3dPaintTextures: '@tk-maya_shot_work_area/@3dPaintTextures_subdir/@shot_version_name'

tk-maya_project_asset_work_3dPaintTextures: '@tk-maya_project_asset_work_area/@3dPaintTextures_subdir/@project_asset_version_name'
tk-maya_sequence_asset_work_3dPaintTextures: '@tk-maya_sequence_asset_work_area/@3dPaintTextures_subdir/@sequence_asset_version_name'
tk-maya_shot_asset_work_3dPaintTextures: '@tk-maya_shot_asset_work_area/@3dPaintTextures_subdir/@shot_asset_version_name'

aliases:

# PUBLISH AREAS
Expand Down
Loading