Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Maya: Add additional playblast options to review Extractor. #3384

Merged
merged 39 commits into from
Jul 13, 2022
Merged

Maya: Add additional playblast options to review Extractor. #3384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
569d7c9
Add hardware fog keys to Schema
Jun 21, 2022
cb6e093
Add SSAO options to schema
Jun 21, 2022
697916c
Append enum for fog falloff.
Jun 21, 2022
ed0ba7e
Append Antialiasing and MotionBlur Sampling
Jun 21, 2022
de6bd72
Appen defaults.
Jun 21, 2022
269c752
Append settings defaults.
Jun 21, 2022
f916590
Merge branch 'OP-3438_Maya-missing-playblast-options' of https://gith…
Jun 21, 2022
759cea4
Start separating "lineAAEnable"
Jun 22, 2022
6adcf61
Merge branch 'develop' into OP-3438_Maya-missing-playblast-options
Jun 22, 2022
277682c
Revert "Start separating "lineAAEnable""
Jun 22, 2022
f43042e
Change hwFogEnable into fogging flag.
Jun 22, 2022
3852215
Remove flags
Jun 22, 2022
82909fe
Merge branch 'develop' into OP-3438_Maya-missing-playblast-options
Jun 22, 2022
137ef3e
Remove keys that fail.
Jun 22, 2022
5b03724
Append capture schema.
Jun 23, 2022
4a521ec
Adjust
Jun 23, 2022
ea6b098
Adjust `load_capture_preset()` to work with additional settings.
Jun 23, 2022
f5e3f56
Append AA flag as schema key.
Jun 23, 2022
f497956
Adjust schema defaults.
Jun 23, 2022
98b912f
Change key check placement.
Jun 23, 2022
ae897ed
Append Fog Color Key to schema.
Jun 23, 2022
4c1bba0
Append Fog Color to functionk, fix loop bug.
Jun 23, 2022
bb339e0
Append schema default for color.
Jun 23, 2022
f2ef34c
Update openpype/hosts/maya/api/lib.py
Jun 23, 2022
3af840f
Add Color Options
Jun 24, 2022
df6a5e1
Merge branch 'OP-3438_Maya-missing-playblast-options' of https://gith…
Jun 24, 2022
d0f1f89
Append SSAO Radius minimum.
Jun 24, 2022
54b8056
Adjust defaults.
Jun 24, 2022
96fefa3
Add Fog Density
Jun 24, 2022
66cce36
Adjust defaults to Maya Values
Jun 24, 2022
5b9168b
Append density default
Jun 24, 2022
76cf10a
Add missing hwFogDensity key.
Jun 24, 2022
0486b99
Change hwFogDensity into float key.
Jun 24, 2022
f25c662
Replace `hwFogEnable` with `fogging` flag.
Jun 25, 2022
b74e144
Update openpype/settings/defaults/project_settings/maya.json
Jun 27, 2022
800a2f9
Update openpype/settings/defaults/project_settings/maya.json
Jun 27, 2022
dd5cef5
Adjust setting position
Jun 28, 2022
e9f67f8
Adjust some defaults.
Jun 28, 2022
f76d84d
Append "Depth of Field" to plablast options and function.
Jul 6, 2022
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
79 changes: 78 additions & 1 deletion openpype/hosts/maya/api/lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,19 +2522,79 @@ def load_capture_preset(data=None):
temp_options2['multiSampleEnable'] = False
temp_options2['multiSampleCount'] = preset[id][key]

if key == 'renderDepthOfField':
temp_options2['renderDepthOfField'] = preset[id][key]

if key == 'ssaoEnable':
if preset[id][key] is True:
temp_options2['ssaoEnable'] = True
else:
temp_options2['ssaoEnable'] = False

if key == 'ssaoSamples':
temp_options2['ssaoSamples'] = preset[id][key]

if key == 'ssaoAmount':
temp_options2['ssaoAmount'] = preset[id][key]

if key == 'ssaoRadius':
temp_options2['ssaoRadius'] = preset[id][key]

if key == 'hwFogDensity':
temp_options2['hwFogDensity'] = preset[id][key]

if key == 'ssaoFilterRadius':
temp_options2['ssaoFilterRadius'] = preset[id][key]

if key == 'alphaCut':
temp_options2['transparencyAlgorithm'] = 5
temp_options2['transparencyQuality'] = 1

if key == 'headsUpDisplay':
temp_options['headsUpDisplay'] = True

if key == 'fogging':
temp_options['fogging'] = preset[id][key] or False

if key == 'hwFogStart':
temp_options2['hwFogStart'] = preset[id][key]

if key == 'hwFogEnd':
temp_options2['hwFogEnd'] = preset[id][key]

if key == 'hwFogAlpha':
temp_options2['hwFogAlpha'] = preset[id][key]

if key == 'hwFogFalloff':
temp_options2['hwFogFalloff'] = int(preset[id][key])

if key == 'hwFogColorR':
temp_options2['hwFogColorR'] = preset[id][key]

if key == 'hwFogColorG':
temp_options2['hwFogColorG'] = preset[id][key]

if key == 'hwFogColorB':
temp_options2['hwFogColorB'] = preset[id][key]

if key == 'motionBlurEnable':
if preset[id][key] is True:
temp_options2['motionBlurEnable'] = True
else:
temp_options2['motionBlurEnable'] = False

if key == 'motionBlurSampleCount':
temp_options2['motionBlurSampleCount'] = preset[id][key]

if key == 'motionBlurShutterOpenFraction':
temp_options2['motionBlurShutterOpenFraction'] = preset[id][key]

if key == 'lineAAEnable':
if preset[id][key] is True:
temp_options2['lineAAEnable'] = True
else:
temp_options2['lineAAEnable'] = False

else:
temp_options[str(key)] = preset[id][key]

Expand All @@ -2544,7 +2604,24 @@ def load_capture_preset(data=None):
'gpuCacheDisplayFilter',
'multiSample',
'ssaoEnable',
'textureMaxResolution'
'ssaoSamples',
'ssaoAmount',
'ssaoFilterRadius',
'ssaoRadius',
'hwFogStart',
'hwFogEnd',
'hwFogAlpha',
'hwFogFalloff',
'hwFogColorR',
'hwFogColorG',
'hwFogColorB',
'hwFogDensity',
'textureMaxResolution',
'motionBlurEnable',
'motionBlurSampleCount',
'motionBlurShutterOpenFraction',
'lineAAEnable',
'renderDepthOfField'
]:
temp_options.pop(key, None)

Expand Down
22 changes: 20 additions & 2 deletions openpype/settings/defaults/project_settings/maya.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,11 +496,29 @@
"override_viewport_options": true,
"displayLights": "default",
"textureMaxResolution": 1024,
"multiSample": 4,
"renderDepthOfField": true,
"shadows": true,
"textures": true,
"twoSidedLighting": true,
"ssaoEnable": true,
"lineAAEnable": true,
"multiSample": 8,
"ssaoEnable": false,
"ssaoAmount": 1,
"ssaoRadius": 16,
"ssaoFilterRadius": 16,
"ssaoSamples": 16,
"fogging": false,
"hwFogFalloff": "0",
"hwFogDensity": 0.0,
"hwFogStart": 0,
"hwFogEnd": 100,
"hwFogAlpha": 0,
"hwFogColorR": 1.0,
"hwFogColorG": 1.0,
"hwFogColorB": 1.0,
"motionBlurEnable": false,
"motionBlurSampleCount": 8,
"motionBlurShutterOpenFraction": 0.2,
"cameras": false,
"clipGhosts": false,
"controlVertices": false,
Expand Down
149 changes: 143 additions & 6 deletions openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,15 @@
"decimal": 0
},
{
"type": "number",
"key": "multiSample",
"label": "Anti Aliasing Samples",
"decimal": 0,
"minimum": 0,
"maximum": 32
"type": "splitter"
},
{
"type":"boolean",
"key": "renderDepthOfField",
"label": "Depth of Field"
},
{
"type": "splitter"
},
{
"type": "boolean",
Expand All @@ -224,11 +227,145 @@
"key": "twoSidedLighting",
"label": "Two Sided Lighting"
},
{
"type": "splitter"
},
{
"type": "boolean",
"key": "lineAAEnable",
"label": "Enable Anti-Aliasing"
},
{
"type": "number",
"key": "multiSample",
"label": "Anti Aliasing Samples",
"decimal": 0,
"minimum": 0,
"maximum": 32
},
{
"type": "splitter"
},
{
"type": "boolean",
"key": "ssaoEnable",
"label": "Screen Space Ambient Occlusion"
},
{
"type": "number",
"key": "ssaoAmount",
"label": "SSAO Amount"
},
{
"type": "number",
"key": "ssaoRadius",
"label": "SSAO Radius"
},
{
"type": "number",
"key": "ssaoFilterRadius",
"label": "SSAO Filter Radius",
"decimal": 0,
"minimum": 1,
"maximum": 32
},
{
"type": "number",
"key": "ssaoSamples",
"label": "SSAO Samples",
"decimal": 0,
"minimum": 8,
"maximum": 32
},
{
"type": "splitter"
},
{
"type": "boolean",
"key": "fogging",
"label": "Enable Hardware Fog"
},
{
"type": "enum",
"key": "hwFogFalloff",
"label": "Hardware Falloff",
"enum_items": [
{ "0": "Linear"},
{ "1": "Exponential"},
{ "2": "Exponential Squared"}
]
},
{
"type": "number",
"key": "hwFogDensity",
"label": "Fog Density",
"decimal": 2,
"minimum": 0,
"maximum": 1
},
{
"type": "number",
"key": "hwFogStart",
"label": "Fog Start"
},
{
"type": "number",
"key": "hwFogEnd",
"label": "Fog End"
},
{
"type": "number",
"key": "hwFogAlpha",
"label": "Fog Alpha"
},
{
"type": "number",
"key": "hwFogColorR",
"label": "Fog Color R",
"decimal": 2,
"minimum": 0,
"maximum": 1
},
{
"type": "number",
"key": "hwFogColorG",
"label": "Fog Color G",
"decimal": 2,
"minimum": 0,
"maximum": 1
},
{
"type": "number",
"key": "hwFogColorB",
"label": "Fog Color B",
"decimal": 2,
"minimum": 0,
"maximum": 1
},
{
"type": "splitter"
},
{
"type": "boolean",
"key": "motionBlurEnable",
"label": "Enable Motion Blur"
},
{
"type": "number",
"key": "motionBlurSampleCount",
"label": "Motion Blur Sample Count",
"decimal": 0,
"minimum": 8,
"maximum": 32
},
{
"type": "number",
"key": "motionBlurShutterOpenFraction",
"label": "Shutter Open Fraction",
"decimal": 3,
"minimum": 0.01,
"maximum": 32
},
{
"type": "splitter"
},
Expand Down
3 changes: 2 additions & 1 deletion openpype/vendor/python/common/capture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,8 @@ def replace(m):
"transparencyAlgorithm": 1,
"transparencyQuality": 0.33,
"useMaximumHardwareLights": True,
"vertexAnimationCache": 0
"vertexAnimationCache": 0,
"renderDepthOfField": 0
}


Expand Down