Merge pull request #5405 from ynput/enhancement/OP-6452_Nuke-add-BBOX-knob-type-to-settings-

Nuke: adding BBox knob type to settings
This commit is contained in:
Jakub Ježek 2023-08-04 14:26:24 +02:00 committed by GitHub
commit 250dcbcd91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 13 deletions

View file

@ -1699,7 +1699,7 @@ def create_write_node_legacy(
knob_value = float(knob_value)
if knob_type == "bool":
knob_value = bool(knob_value)
if knob_type in ["2d_vector", "3d_vector"]:
if knob_type in ["2d_vector", "3d_vector", "color", "box"]:
knob_value = list(knob_value)
GN[knob_name].setValue(knob_value)
@ -1715,7 +1715,7 @@ def set_node_knobs_from_settings(node, knob_settings, **kwargs):
Args:
node (nuke.Node): nuke node
knob_settings (list): list of dict. Keys are `type`, `name`, `value`
kwargs (dict)[optional]: keys for formatable knob settings
kwargs (dict)[optional]: keys for formattable knob settings
"""
for knob in knob_settings:
log.debug("__ knob: {}".format(pformat(knob)))
@ -1732,7 +1732,7 @@ def set_node_knobs_from_settings(node, knob_settings, **kwargs):
)
continue
# first deal with formatable knob settings
# first deal with formattable knob settings
if knob_type == "formatable":
template = knob["template"]
to_type = knob["to_type"]
@ -1741,8 +1741,8 @@ def set_node_knobs_from_settings(node, knob_settings, **kwargs):
**kwargs
)
except KeyError as msg:
log.warning("__ msg: {}".format(msg))
raise KeyError(msg)
raise KeyError(
"Not able to format expression: {}".format(msg))
# convert value to correct type
if to_type == "2d_vector":
@ -1781,8 +1781,8 @@ def convert_knob_value_to_correct_type(knob_type, knob_value):
knob_value = knob_value
elif knob_type == "color_gui":
knob_value = color_gui_to_int(knob_value)
elif knob_type in ["2d_vector", "3d_vector", "color"]:
knob_value = [float(v) for v in knob_value]
elif knob_type in ["2d_vector", "3d_vector", "color", "box"]:
knob_value = [float(val_) for val_ in knob_value]
return knob_value

View file

@ -213,7 +213,7 @@
},
{
"type": "number",
"key": "y",
"key": "z",
"default": 1,
"decimal": 4,
"maximum": 99999999
@ -238,29 +238,75 @@
"object_types": [
{
"type": "number",
"key": "x",
"key": "r",
"default": 1,
"decimal": 4,
"maximum": 99999999
},
{
"type": "number",
"key": "x",
"key": "g",
"default": 1,
"decimal": 4,
"maximum": 99999999
},
{
"type": "number",
"key": "b",
"default": 1,
"decimal": 4,
"maximum": 99999999
},
{
"type": "number",
"key": "a",
"default": 1,
"decimal": 4,
"maximum": 99999999
}
]
}
]
},
{
"key": "box",
"label": "Box",
"children": [
{
"type": "text",
"key": "name",
"label": "Name"
},
{
"type": "list-strict",
"key": "value",
"label": "Value",
"object_types": [
{
"type": "number",
"key": "x",
"default": 0,
"decimal": 4,
"maximum": 99999999
},
{
"type": "number",
"key": "y",
"default": 1,
"default": 0,
"decimal": 4,
"maximum": 99999999
},
{
"type": "number",
"key": "y",
"default": 1,
"key": "r",
"default": 1920,
"decimal": 4,
"maximum": 99999999
},
{
"type": "number",
"key": "t",
"default": 1080,
"decimal": 4,
"maximum": 99999999
}