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 branch '2.x/develop' into feature/rename_get_anatomy_data

Browse source
This commit is contained in:
iLLiCiTiT 2020-12-03 21:59:44 +01:00
commit d6a75d8cbe
66 changed files with 618 additions and 1612 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pype/settings/defaults/project_anatomy/attributes.json
View file

@ -9,5 +9,21 @@
"resolutionWidth": 1920,
"resolutionHeight": 1080,
"pixelAspect": 1,
"applications": []
"applications": [],
"task_short_names": {
"Generic": "gener",
"Art": "art",
"Modeling": "mdl",
"Texture": "tex",
"Lookdev": "look",
"Rigging": "rig",
"Edit": "edit",
"Layout": "lay",
"Setdress": "dress",
"Animation": "anim",
"FX": "fx",
"Lighting": "lgt",
"Paint": "paint",
"Compositing": "comp"
}
}

0
pype/settings/defaults/project_settings/Ftrack.json → pype/settings/defaults/project_settings/ftrack.json
View file

39
pype/settings/defaults/project_settings/ftrack/project_schemas/default.json Normal file
View file

@ -0,0 +1,39 @@
{
"object_types": ["Milestone", "Task", "Folder", "Asset Build", "Shot", "Library", "Sequence"],
"version_workflow": ["Pending Review", "Client Review", "On Farm", "Reviewed", "Render Complete", "Approved", "CBB", "Delivered", "Render Failed", "data"],
"task_workflow": ["Not Ready", "Ready", "Change Requested", "In progress", "Pending Review", "On Farm", "Waiting", "Render Complete", "Complete", "CBB", "On Hold", "Render Failed", "Omitted"],
"overrides": [{
"task_types": ["Animation"],
"statuses": ["Not Ready", "Ready", "Change Requested", "Blocking", "Animating", "blocking review", "anim review", "Complete", "CBB", "On Hold", "Omitted"]
}, {
"task_types": ["Lighting"],
"statuses": ["Not Ready", "Ready", "Change Requested", "In progress", "To render", "On Farm", "Render Complete", "Complete", "CBB", "On Hold", "Render Failed", "Omitted"]
}],
"task_type_schema": ["Layout", "Animation", "Modeling", "Previz", "Lookdev", "FX", "Lighting", "Compositing", "Rigging", "Texture", "Matte-paint", "Roto-paint", "Art", "Match-moving", "Production", "Build", "Setdress", "Edit", "R&D", "Boards"],
"schemas": [{
"object_type": "Shot",
"statuses": ["Omitted", "Normal", "Complete"],
"task_types": []
}, {
"object_type": "Asset Build",
"statuses": ["Omitted", "Normal", "Complete"],
"task_types": ["Setups", "Sets", "Characters", "Props", "Locations", "Assembly", "R&D", "Elements"]
}, {
"object_type": "Milestone",
"statuses": ["Normal", "Complete"],
"task_types": ["Generic"]
}],
"task_templates": [{
"name": "Character",
"task_types": ["Art", "Modeling", "Lookdev", "Rigging"]
}, {
"name": "Element",
"task_types": ["Modeling", "Lookdev"]
}, {
"name": "Prop",
"task_types": ["Modeling", "Lookdev", "Rigging"]
}, {
"name": "Location",
"task_types": ["Layout", "Setdress"]
}]
}

46
pype/settings/defaults/project_settings/global.json
View file

@ -27,12 +27,12 @@
"video_filters": [],
"audio_filters": [],
"input": [
"gamma 2.2"
"-gamma 2.2"
],
"output": [
"pix_fmt yuv420p",
"crf 18",
"intra"
"-pix_fmt yuv420p",
"-crf 18",
"-intra"
]
},
"filter": {
@ -76,18 +76,16 @@
},
"IntegrateAssetNew": {
"template_name_profiles": {
"template_name_profiles": {
"publish": {
"families": [],
"tasks": []
},
"render": {
"families": [
"review",
"render",
"prerender"
]
}
"publish": {
"families": [],
"tasks": []
},
"render": {
"families": [
"review",
"render",
"prerender"
]
}
}
},
@ -135,15 +133,13 @@
}
},
"Workfiles": {
"last_workfile_on_startup": {
"profiles": [
{
"hosts": [],
"tasks": [],
"enabled": true
}
]
},
"last_workfile_on_startup": [
{
"hosts": [],
"tasks": [],
"enabled": true
}
],
"sw_folders": {
"compositing": [
"nuke",

7
pype/settings/defaults/project_settings/harmony.json Normal file
View file

@ -0,0 +1,7 @@
{
"publish": {},
"general": {
"skip_resolution_check": false,
"skip_timelines_check": false
}
}

91
pype/settings/defaults/project_settings/maya.json
View file

@ -132,7 +132,7 @@
"regex": ""
},
"ValidateMeshHasOverlappingUVs": {
"enabled": true
"enabled": false
},
"ExtractCameraAlembic": {
"enabled": true,
@ -145,23 +145,78 @@
}
},
"load": {
"colors": {
"model": [0.821, 0.518, 0.117],
"rig": [0.144, 0.443, 0.463],
"pointcache": [0.368, 0.821, 0.117],
"animation": [0.368, 0.821, 0.117],
"ass": [1.0, 0.332, 0.312],
"camera": [0.447, 0.312, 1.0],
"camerarig": [0.447, 0.312, 1.0],
"fbx": [1.0, 0.931, 0.312],
"mayaAscii": [0.312, 1.0, 0.747],
"setdress": [0.312, 1.0, 0.747],
"layout": [0.312, 1.0, 0.747],
"vdbcache": [0.312, 1.0, 0.428],
"vrayproxy": [0.258, 0.95, 0.541],
"yeticache": [0.2, 0.8, 0.3],
"yetiRig": [0, 0.8, 0.5]
}
"colors": {
"model": [
0.821,
0.518,
0.117
],
"rig": [
0.144,
0.443,
0.463
],
"pointcache": [
0.368,
0.821,
0.117
],
"animation": [
0.368,
0.821,
0.117
],
"ass": [
1.0,
0.332,
0.312
],
"camera": [
0.447,
0.312,
1.0
],
"fbx": [
1.0,
0.931,
0.312
],
"mayaAscii": [
0.312,
1.0,
0.747
],
"setdress": [
0.312,
1.0,
0.747
],
"layout": [
0.312,
1.0,
0.747
],
"vdbcache": [
0.312,
1.0,
0.428
],
"vrayproxy": [
0.258,
0.95,
0.541
],
"yeticache": [
0.2,
0.8,
0.3
],
"yetiRig": [
0.0,
0.8,
0.5
]
}
},
"workfile_build": {
"profiles": [

6
pype/settings/defaults/project_settings/standalonepublisher.json
View file

@ -19,7 +19,7 @@
"create_camera": "Camera",
"create_editorial": "Editorial",
"create_image": "Image",
"create_matchmove": "matchmove",
"create_matchmove": "Matchmove",
"": ""
},
"create_workfile": {
@ -112,7 +112,7 @@
},
"create_matchmove": {
"name": "matchmove",
"label": "Matchmove script",
"label": "Matchmove Scripts",
"family": "matchmove",
"icon": "empire",
"defaults": [
@ -123,4 +123,4 @@
"help": "Script exported from matchmoving application"
}
}
}
}

212
pype/settings/defaults/project_settings/tools/slates/example_HD.json
View file

@ -1,212 +0,0 @@
{
"width": 1920,
"height": 1080,
"destination_path": "{destination_path}",
"style": {
"*": {
"font-family": "arial",
"font-color": "#ffffff",
"font-bold": false,
"font-italic": false,
"bg-color": "#0077ff",
"alignment-horizontal": "left",
"alignment-vertical": "top"
},
"layer": {
"padding": 0,
"margin": 0
},
"rectangle": {
"padding": 0,
"margin": 0,
"bg-color": "#E9324B",
"fill": true
},
"main_frame": {
"padding": 0,
"margin": 0,
"bg-color": "#252525"
},
"table": {
"padding": 0,
"margin": 0,
"bg-color": "transparent"
},
"table-item": {
"padding": 5,
"padding-bottom": 10,
"margin": 0,
"bg-color": "#212121",
"bg-alter-color": "#272727",
"font-color": "#dcdcdc",
"font-bold": false,
"font-italic": false,
"alignment-horizontal": "left",
"alignment-vertical": "top",
"word-wrap": false,
"ellide": true,
"max-lines": 1
},
"table-item-col[0]": {
"font-size": 20,
"font-color": "#898989",
"font-bold": true,
"ellide": false,
"word-wrap": true,
"max-lines": null
},
"table-item-col[1]": {
"font-size": 40,
"padding-left": 10
},
"#colorbar": {
"bg-color": "#9932CC"
}
},
"items": [{
"type": "layer",
"direction": 1,
"name": "MainLayer",
"style": {
"#MainLayer": {
"width": 1094,
"height": 1000,
"margin": 25,
"padding": 0
},
"#LeftSide": {
"margin-right": 25
}
},
"items": [{
"type": "layer",
"name": "LeftSide",
"items": [{
"type": "layer",
"direction": 1,
"style": {
"table-item": {
"bg-color": "transparent",
"padding-bottom": 20
},
"table-item-col[0]": {
"font-size": 20,
"font-color": "#898989",
"alignment-horizontal": "right"
},
"table-item-col[1]": {
"alignment-horizontal": "left",
"font-bold": true,
"font-size": 40
}
},
"items": [{
"type": "table",
"values": [
["Show:", "{project[name]}"]
],
"style": {
"table-item-field[0:0]": {
"width": 150
},
"table-item-field[0:1]": {
"width": 580
}
}
}, {
"type": "table",
"values": [
["Submitting For:", "{intent}"]
],
"style": {
"table-item-field[0:0]": {
"width": 160
},
"table-item-field[0:1]": {
"width": 218,
"alignment-horizontal": "right"
}
}
}]
}, {
"type": "rectangle",
"style": {
"bg-color": "#bc1015",
"width": 1108,
"height": 5,
"fill": true
}
}, {
"type": "table",
"use_alternate_color": true,
"values": [
["Version name:", "{version_name}"],
["Date:", "{date}"],
["Shot Types:", "{shot_type}"],
["Submission Note:", "{submission_note}"]
],
"style": {
"table-item": {
"padding-bottom": 20
},
"table-item-field[0:1]": {
"font-bold": true
},
"table-item-field[3:0]": {
"word-wrap": true,
"ellide": true,
"max-lines": 4
},
"table-item-col[0]": {
"alignment-horizontal": "right",
"width": 150
},
"table-item-col[1]": {
"alignment-horizontal": "left",
"width": 958
}
}
}]
}, {
"type": "layer",
"name": "RightSide",
"items": [{
"type": "placeholder",
"name": "thumbnail",
"path": "{thumbnail_path}",
"style": {
"width": 730,
"height": 412
}
}, {
"type": "placeholder",
"name": "colorbar",
"path": "{color_bar_path}",
"return_data": true,
"style": {
"width": 730,
"height": 55
}
}, {
"type": "table",
"use_alternate_color": true,
"values": [
["Vendor:", "{vendor}"],
["Shot Name:", "{shot_name}"],
["Frames:", "{frame_start} - {frame_end} ({duration})"]
],
"style": {
"table-item-col[0]": {
"alignment-horizontal": "left",
"width": 200
},
"table-item-col[1]": {
"alignment-horizontal": "right",
"width": 530,
"font-size": 30
}
}
}]
}]
}]
}

24
pype/settings/defaults/system_settings/modules.json
View file

@ -58,13 +58,25 @@
"show": {
"avalon_auto_sync": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_role": [
"API",
"Administrator"
],
"read_security_role": [
"API",
"Administrator"
]
},
"library_project": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_role": [
"API",
"Administrator"
],
"read_security_role": [
"API",
"Administrator"
]
}
},
"is_hierarchical": {
@ -154,7 +166,7 @@
"message_time": 0.5
},
"Clockify": {
"enabled": true,
"enabled": false,
"workspace_name": "studio name"
},
"Deadline": {
@ -190,4 +202,4 @@
"Idle Manager": {
"enabled": true
}
}
}

54
pype/settings/lib.py
View file

@ -17,6 +17,13 @@ M_DYNAMIC_KEY_LABEL = "__dynamic_keys_labels__"
# NOTE key popping not implemented yet
M_POP_KEY = "__pop_key__"
METADATA_KEYS = (
M_OVERRIDEN_KEY,
M_ENVIRONMENT_KEY,
M_DYNAMIC_KEY_LABEL,
M_POP_KEY
)
# Folder where studio overrides are stored
STUDIO_OVERRIDES_PATH = os.getenv("PYPE_PROJECT_CONFIGS") or ""
@ -413,27 +420,35 @@ def apply_overrides(source_data, override_data):
return merge_overrides(_source_data, override_data)
def get_system_settings():
def get_system_settings(clear_metadata=True):
"""System settings with applied studio overrides."""
default_values = get_default_settings()[SYSTEM_SETTINGS_KEY]
studio_values = get_studio_system_settings_overrides()
return apply_overrides(default_values, studio_values)
result = apply_overrides(default_values, studio_values)
if clear_metadata:
clear_metadata_from_settings(result)
return result
def get_default_project_settings():
def get_default_project_settings(clear_metadata=True):
"""Project settings with applied studio's default project overrides."""
default_values = get_default_settings()[PROJECT_SETTINGS_KEY]
studio_values = get_studio_project_settings_overrides()
return apply_overrides(default_values, studio_values)
result = apply_overrides(default_values, studio_values)
if clear_metadata:
clear_metadata_from_settings(result)
return result
def get_default_anatomy_settings():
"""Project anatomy data with applied studio's default project overrides."""
default_values = get_default_settings()[PROJECT_ANATOMY_KEY]
studio_values = get_studio_project_anatomy_overrides()
result = apply_overrides(default_values, studio_values)
if clear_metadata:
clear_metadata_from_settings(result)
return result
return apply_overrides(default_values, studio_values)
def get_anatomy_settings(project_name):
@ -447,10 +462,13 @@ def get_anatomy_settings(project_name):
studio_overrides = get_default_anatomy_settings()
project_overrides = get_project_anatomy_overrides(project_name)
return apply_overrides(studio_overrides, project_overrides)
result = apply_overrides(studio_overrides, project_overrides)
if clear_metadata:
clear_metadata_from_settings(result)
return result
def get_project_settings(project_name):
def get_project_settings(project_name, clear_metadata=True):
"""Project settings with applied studio and project overrides."""
if not project_name:
raise ValueError(
@ -458,10 +476,13 @@ def get_project_settings(project_name):
" Call `get_default_project_settings` to get project defaults."
)
studio_overrides = get_default_project_settings()
studio_overrides = get_default_project_settings(False)
project_overrides = get_project_settings_overrides(project_name)
return apply_overrides(studio_overrides, project_overrides)
result = apply_overrides(studio_overrides, project_overrides)
if clear_metadata:
clear_metadata_from_settings(result)
return result
def get_current_project_settings():
@ -491,3 +512,16 @@ def get_environments():
"""
return find_environments(get_system_settings())
def clear_metadata_from_settings(values):
"""Remove all metadata keys from loaded settings."""
if isinstance(values, dict):
for key in tuple(values.keys()):
if key in METADATA_KEYS:
values.pop(key)
else:
clear_metadata_from_settings(values[key])
elif isinstance(values, list):
for item in values:
clear_metadata_from_settings(item)