nodes/Trung0246-ComfyUI-0246
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
Trung0246
2024-01-19 03:28:55 -08:00
committed by GitHub
parent 9612f404b0
commit e4b81a4f31
3 changed files with 532 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nodes.py
+121 -42
View File
@@ -387,12 +387,25 @@ class ScriptData(dict):
def __init__(self, data):
super().__init__(data)
def script_node_exec(script, pin, **kwargs):
func = getattr(script[("script", "node", "inst")], getattr(script[("script", "node", "class")], "FUNCTION"))
if hasattr(script[("script", "node", "class")], "INPUT_IS_LIST") and script[("script", "node", "class")].INPUT_IS_LIST:
return lib0246.transpose(func(**pin), tuple)
def script_node_exec(node_inst, node_name, node_class, node_input, node_args, node_args_base, node_args_hide, node_args_hide_full, **kwargs):
if "pin" in kwargs:
func = getattr(node_inst, getattr(node_class, "FUNCTION"))
real_pin = {k: v for k, v in kwargs["pin"].items() if k in node_args_base}
flag = hasattr(node_class, "INPUT_IS_LIST") and node_class.INPUT_IS_LIST
for key, kind in node_args_hide_full:
match kind:
case "PROMPT":
real_pin[key] = [kwargs["inst"]["prompt"]] if flag else kwargs["inst"]["prompt"]
case "UNIQUE_ID":
real_pin[key] = [kwargs["inst"]["id"][-1]] if flag else kwargs["inst"]["id"][-1]
case "EXTRA_PNGINFO":
real_pin[key] = [kwargs["inst"]["workflow"]] if flag else kwargs["inst"]["workflow"]
if flag:
return lib0246.transpose(func(**real_pin), tuple)
else:
return func(**real_pin)
else:
return func(**pin)
return (node_class, node_inst, node_name, node_input, node_args, node_args_base, node_args_hide)
def script_rule_slice(func, res, pin, **kwargs):
return res.extend(func(pin=curr_pin) for curr_pin in lib0246.dict_slice(pin))
@@ -403,7 +416,7 @@ def script_rule_product(func, res, pin, **kwargs):
def script_rule_direct(func, res, pin, **kwargs):
return res.extend(func(pin=pin))
def highway_unpack(pipe_in, input_type, _prompt, _id, _workflow, flag = False):
def highway_unpack(pipe_in):
def temp_func(pin, res, **kwargs):
if res is None:
iter_inst = pipe_in.path_iter(("data", ))
@@ -418,20 +431,11 @@ def highway_unpack(pipe_in, input_type, _prompt, _id, _workflow, flag = False):
pin[key[1]].append(pipe_in[key])
else:
pin[key[1]] = [pipe_in[key]]
if "hidden" in input_type:
for key in input_type["hidden"]:
match input_type["hidden"][key]:
case "PROMPT":
pin[key] = [_prompt]
case "UNIQUE_ID":
pin[key] = [_id]
case "EXTRA_PNGINFO":
pin[key] = [_workflow]
return True
return False
return temp_func
def junction_unpack(pipe_in, input_type, regex_inst, flag = False):
def junction_unpack(pipe_in, input_type, regex_inst):
def temp_func(pin, res, **kwargs):
if res is None:
junction_unpack_raw(
@@ -453,6 +457,7 @@ def junction_unpack(pipe_in, input_type, regex_inst, flag = False):
######################################## HIJACK ########################################
########################################################################################
PROMPT_DATA = None
PROMPT_COUNT = 0
PROMPT_ID = None
PROMPT_EXTRA = None
@@ -461,8 +466,11 @@ PROMPT_CHANGE = set()
def execute_param_handle(*args, **kwargs):
global PROMPT_ID
global PROMPT_COUNT
global PROMPT_DATA
global PROMPT_EXTRA
if PROMPT_ID is None or PROMPT_ID != args[2]:
PROMPT_COUNT += 1
PROMPT_DATA = args[1]
PROMPT_ID = args[2]
PROMPT_EXTRA = args[3]
@@ -1558,7 +1566,7 @@ class ScriptNode:
match script_pin_mode:
case "pin_highway" if pipe_flag and pipe_in[("kind")] == "highway":
pin_func = highway_unpack(pipe_in, input_type, _prompt, _id, _workflow)
pin_func = highway_unpack(pipe_in)
case "pin_junction" if pipe_flag and pipe_in[("kind")] == "junction":
pin_func = junction_unpack(pipe_in, input_type, ScriptNode.FUNC_REGEX(script_ignore_regex))
case "pin_direct":
@@ -1606,6 +1614,21 @@ class ScriptNode:
case _:
pass
node_args = set()
node_args_base = set()
node_args_hide = set()
node_args_hide_full = set()
for tuple_path in lib0246.dict_iter(input_type):
node_args.add(tuple_path[1])
if tuple_path[0] == "hidden":
node_args_hide.add(tuple_path[1])
temp_type = lib0246.dict_get(input_type, tuple_path)
if isinstance(temp_type, tuple):
temp_type = temp_type[0]
node_args_hide_full.add((tuple_path[1], temp_type))
else:
node_args_base.add(tuple_path[1])
return (
pipe_in,
None if pin_func is None else ScriptData({
@@ -1615,10 +1638,17 @@ class ScriptNode:
"kind": "wrap"
}), ScriptData({
"id": _id,
"node_name": script_node,
"node_class": class_type,
"node_inst": class_type(),
"func": script_node_exec,
"func": functools.partial(
script_node_exec,
node_inst=class_type(),
node_name=script_node,
node_class=class_type,
node_input=input_type,
node_args=node_args,
node_args_base=node_args_base,
node_args_hide=node_args_hide,
node_args_hide_full=node_args_hide_full,
),
"kind": "exec"
}),
None if res_func is None else ScriptData({
@@ -1749,13 +1779,14 @@ class ScriptPile:
raise Exception(f"Script rule loop mode \"{other}\" is not supported yet.")
def temp_func(script, func, pin, res, **kwargs):
node_data = script[("script", "exec")]()
pile_data = ScriptPile.build_pile(
tuple(
getattr(script[("script", "node", "class")], "RETURN_NAMES") if \
hasattr(script[("script", "node", "class")], "RETURN_NAMES") else \
getattr(script[("script", "node", "class")], "RETURN_TYPES")
getattr(node_data[0], "RETURN_NAMES") if \
hasattr(node_data[0], "RETURN_NAMES") else \
getattr(node_data[0], "RETURN_TYPES")
),
tuple(getattr(script[("script", "node", "class")], "RETURN_TYPES")),
tuple(getattr(node_data[0], "RETURN_TYPES")),
tuple(pin.keys()),
script_rule_regex
)
@@ -1771,26 +1802,18 @@ class ScriptPile:
)
case "pin_junction":
raw_input_type = script[("script", "node", "class")].INPUT_TYPES()
pin_key_set = set(pin.keys())
node_key_set = set(map(
lambda _: _[1],
filter(
lambda _: _[0] != "hidden",
lib0246.dict_iter(raw_input_type)
)
))
diff_key_set = (pin_key_set - node_key_set) | (node_key_set - pin_key_set)
diff_key_set = (pin_key_set - node_data[5]) | (node_data[5] - pin_key_set)
if len(diff_key_set) == 0:
raise Exception("No input and output to pile up.")
input_type = {}
for input_key in lib0246.dict_iter(raw_input_type):
for input_key in lib0246.dict_iter(node_data[3]):
if input_key[1] in diff_key_set:
lib0246.dict_set(input_type, input_key, lib0246.dict_get(raw_input_type, input_key))
lib0246.dict_set(input_type, input_key, lib0246.dict_get(node_data[3], input_key))
# [TODO] Same here to take account of "hidden" input
data_dict = junction_unpack_raw(
pipe_in, input_type,
list(filter(lambda x: x != "hidden", input_type.keys())),
@@ -1928,10 +1951,6 @@ class Script:
match elem["kind"]:
case "exec" if "func" in elem:
_script_in[("script", "exec")] = elem["func"]
if "node_name" in elem:
_script_in[("script", "node", "name")] = elem["node_name"]
_script_in[("script", "node", "class")] = elem["node_class"]
_script_in[("script", "node", "inst")] = elem["node_inst"]
case "rule":
_script_in[("script", "rule")] = elem["func"]
case "wrap":
@@ -2552,6 +2571,64 @@ class Cloud:
######################################################################################
class Switch:
@classmethod
def INPUT_TYPES(s):
return {
"required": lib0246.WildDict(),
"hidden": {
"_id": "UNIQUE_ID",
"_prompt": "PROMPT",
"_workflow": "EXTRA_PNGINFO"
}
}
RETURN_TYPES = lib0246.ByPassTypeTuple(("*", ))
RETURN_NAMES = lib0246.ByPassTypeTuple(("...", ))
INPUT_IS_LIST = True
OUTPUT_IS_LIST = lib0246.TautologyAll()
FUNCTION = "execute"
CATEGORY = "0246"
def execute(self, _id = None, _prompt = None, _workflow = None, **kwargs):
output = _workflow[0]["workflow"]["nodes"][
next(i for i, _ in enumerate(_workflow[0]["workflow"]["nodes"]) if _["id"] == int(_id[0]))
]["outputs"]
res = []
for key in kwargs:
if key.startswith("switch:"):
temp_index = kwargs[key][0].split(":")[0]
if temp_index == "_":
res.append([None])
continue
for pin in output:
if pin["name"].split(":")[-1] == temp_index:
res.append(kwargs[kwargs[key][0]])
break
return res
@classmethod
def IS_CHANGED(self, _id = None, _prompt = None, _workflow = None, **kwargs):
valid_input = set()
invalid_input = set()
for key in kwargs:
if key.startswith("switch:"):
temp_index = kwargs[key][0].split(":")[0]
if temp_index != "_":
valid_input.add(temp_index)
global PROMPT_DATA
for key in PROMPT_DATA[_id[0]]["inputs"]:
curr_index = key.split(":")[0]
if curr_index.isnumeric():
if curr_index in valid_input:
continue
invalid_input.add(key)
for key in invalid_input:
del PROMPT_DATA[_id[0]]["inputs"][key]
return set(kwargs.keys())
######################################################################################
class Meta:
@classmethod
def INPUT_TYPES(s):
@@ -2606,6 +2683,7 @@ NODE_CLASS_MAPPINGS = {
"0246.Script": Script,
"0246.Hub": Hub,
"0246.Cloud": Cloud,
"0246.Switch": Switch,
# "0246.Meta": Meta,
# "0246.Pick": Pick,
}
@@ -2630,8 +2708,9 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"0246.Script": "Script",
"0246.Hub": "Hub",
"0246.Cloud": "Cloud",
"0246.Switch": "Switch",
# "0246.Meta": "Meta",
# "0246.Pick": "Pick",
}
print("\033[95m" + lib0246.HEAD_LOG + "Loaded all nodes and apis." + "\033[0m")
print("\033[95m" + lib0246.HEAD_LOG + "Loaded all nodes and apis." + "\033[0m")
web/js/nodes.js
+62
View File
@@ -155,6 +155,10 @@ app.registerExtension({
node.color = "#595959";
node.bgcolor = "#676767";
} break;
case "0246.Switch": {
node.color = LGraphCanvas.node_colors.yellow.color;
node.bgcolor = lib0246.mix_color_hue(LGraphCanvas.node_colors.green.bgcolor, "#660029");
} break;
}
// use_everywhere.js messing with colors :(
node._color = node.color;
@@ -243,6 +247,11 @@ app.registerExtension({
if (this.mark) {
const self = this.self;
self.outputs[0].shape = LiteGraph.GRID_SHAPE;
const val_widget = self.widgets.find(w => w.name === "val");
val_widget.options = val_widget.options ?? {};
val_widget.options.multiline = true;
this.self.addWidget("button", "Random Seed", null, () => {
const seed_widget = self.widgets.find(w => w.name === "seed");
seed_widget.value = Math.floor(Math.random() * (seed_widget.options.max - seed_widget.options.min + 1)) + seed_widget.options.min;
@@ -887,6 +896,59 @@ app.registerExtension({
wg0246.single_impl_input(Cloud, nodeData, app, LiteGraph.CIRCLE_SHAPE);
lib0246.hijack(Cloud.prototype, "onConnectExpand", wg0246.cloud_expand_func);
} break;
case "0246.Switch": {
wg0246.junction_impl(nodeType, nodeData, app, null, LiteGraph.GRID_SHAPE, LiteGraph.GRID_SHAPE);
lib0246.hijack(
nodeType.prototype, "onConnectionsChange",
function (type, index, connected, link_info) {
const node = this.self;
if (this.mark && !connected) {
if (type === LiteGraph.OUTPUT && node.outputs[index].name !== "..." && node.widgets) {
node.widgets.splice(node.widgets.length - 1, 1);
for (let i = 0; i < node.inputs.length; ++ i)
if (node.inputs[i].name.startsWith("switch:") && i >= node.widgets.length) {
node.inputs.splice(i --, 1);
break;
}
}
// [TODO] Maybe avoid setTimeout
window.setTimeout(() => {
for (let i = 0; i < node.widgets.length; ++ i)
if (node.inputs.findIndex(_ => _.name === node.widgets[i].value) === -1)
node.widgets[i].value = "_";
}, 0);
}
},
);
nodeType.prototype.onNameExpand = function (type, kind, ...args) {
const index = type ? args[1] : args[0];
if (kind === LiteGraph.OUTPUT)
return `${this.inputs?.find?.(_ => _.name === this.widgets?.[index]?.value)?.type ?? "_"}:${index}`;
};
lib0246.hijack(nodeType.prototype, "onConfigure", function (data) {
if (this.mark) {
const node = this.self;
for (let i = 0; i < node.outputs.length; ++ i)
if (node.outputs[i].name !== "...")
wg0246.switch_widget(node, i, data.widgets_values[i]);
}
});
lib0246.hijack(nodeType.prototype, "onConnectOutput", function (
this_slot_index,
other_slot_type,
other_slot_obj,
other_node,
other_slot_index
) {
const node = this.self;
if (!this.mark && node.outputs[this_slot_index].name === "...")
wg0246.switch_widget(node, this_slot_index, "_");
});
lib0246.hijack(nodeType.prototype, "onConnectExpand", function (mode, name) {
if (this.mark && this.res !== true)
this.res = name.startsWith("switch:");
});
} break;
}
}
},
web/js/widgets.js
+349 -322
View File
@@ -291,7 +291,7 @@ function link_shift_up(node, arr, index, flag, data) {
for (let i = 0, c = 0; i < arr.length; ++ i) {
if (node?.onConnectExpand?.("shift_output", arr[i].name, i, ...data))
continue;
arr[i].name = `${arr[i].type}:${c}`;
arr[i].name = node?.onNameExpand?.(true, LiteGraph.OUTPUT, arr[i].name, i, ...data) ?? `${arr[i].type}:${c}`;
++ c;
}
}
@@ -301,7 +301,7 @@ function link_shift_up(node, arr, index, flag, data) {
for (let i = 0, c = 0; i < arr.length; ++ i) {
if (node?.onConnectExpand?.("shift_input", arr[i].name, i, ...data))
continue;
arr[i].name = `${c}:${arr[i].type}`;
arr[i].name = node?.onNameExpand?.(true, LiteGraph.INPUT, arr[i].name, i, ...data) ?? `${c}:${arr[i].type}`;
++ c;
}
}
@@ -1014,7 +1014,7 @@ function single_impl_input_raw(inst, app, real, shape_in) {
this.self.inputs[arguments[0]].type = arguments[2].type;
} break;
case 1: {
this.self.inputs[arguments[2]].name = `${arguments[0]}:${arguments[1]}`;
this.self.inputs[arguments[2]].name = this.self?.onNameExpand?.(false, LiteGraph.INPUT, ...arguments) ?? `${arguments[0]}:${arguments[1]}`;
} break;
case 2: {
if (arguments[0] === LiteGraph.INPUT) {
@@ -1062,7 +1062,7 @@ function single_impl_output_raw(inst, app, real, shape_out) {
this.self.outputs[arguments[0]].type = arguments[2].type;
} break;
case 1: {
this.self.outputs[arguments[2]].name = `${arguments[1]}:${arguments[0]}`;
this.self.outputs[arguments[2]].name = this.self?.onNameExpand?.(false, LiteGraph.OUTPUT, ...arguments) ?? `${arguments[1]}:${arguments[0]}`;
} break;
case 2: {
if (arguments[0] === LiteGraph.OUTPUT) {
@@ -1084,11 +1084,13 @@ export function junction_impl(nodeType, nodeData, app, name, shape_in, shape_out
nodeType.prototype.onNodeCreated = function () {
if (typeof name === "string")
init_update(this, name);
const offset = this.widgets.find(w => w.name === "_offset");
if (offset) {
offset.options = offset.options ?? {};
offset.options.multiline = true;
if (this.widgets) {
const offset = this.widgets.find(w => w.name === "_offset");
if (offset) {
offset.options = offset.options ?? {};
offset.options.multiline = true;
}
}
const real = {
@@ -2270,181 +2272,182 @@ export function BOX_RANGE_WIDGET(data_type, data_name, options = {}) {
ctx.fill();
ctx.closePath();
// Draw evenly spaced grid of both row and column of specified count
ctx.beginPath();
ctx.strokeStyle = "#000000";
ctx.lineWidth = 1;
ctx.lineWidth = 0.5;
ctx.setLineDash([10, 5]);
for (let i = 0; i < this.row_count; ++ i) {
ctx.moveTo(this.flex.hold_draw[0], i * this.flex.hold_draw[3] / this.row_count + this.flex.hold_draw[1]);
ctx.lineTo(this.flex.hold_draw[2] + this.flex.hold_draw[0], i * this.flex.hold_draw[3] / this.row_count + this.flex.hold_draw[1]);
ctx.stroke();
}
for (let i = 0; i < this.col_count; ++ i) {
ctx.moveTo(i * this.flex.hold_draw[2] / this.col_count + this.flex.hold_draw[0], this.flex.hold_draw[1]);
ctx.lineTo(i * this.flex.hold_draw[2] / this.col_count + this.flex.hold_draw[0], this.flex.hold_draw[3] + this.flex.hold_draw[1]);
ctx.stroke();
}
ctx.closePath();
// Map each point to fit the grid by percentage based on previous size to current size
if (this?.box_range?.boxes)
for (let i = 0; i < this.box_range.boxes.length; ++ i) {
let curr = this.box_range.boxes[i];
const res = lib0246.calc_flex_norm(
curr[0], curr[1], curr[2], curr[3],
curr[4], curr[5], curr[6], curr[7],
this.flex.hold_draw[0], this.flex.hold_draw[1], this.flex.hold_draw[2], this.flex.hold_draw[3]
);
curr[8] = res[0];
curr[9] = res[1];
curr[10] = res[2];
curr[11] = res[3];
}
// Draw each box
if (this?.box_range?.boxes) {
for (let i = 0; i < this.box_range.boxes.length; ++ i) {
let curr = this.box_range.boxes[i];
if (this.box_range.boxes[i] === this.box_range.select[this.box_range.select.length - 1]) {
// Draw text metadata bottom left of the entire grid
ctx.beginPath();
ctx.fillStyle = "#ffffff";
ctx.font = "12px Consolas";
ctx.fillText(
// `%XY2: (${lib0246.floor(lib0246.norm(curr[8] + curr[10], this.flex.hold_draw[0], this.flex.hold_draw[2]), 2)}, ${lib0246.floor(lib0246.norm(curr[9] + curr[11], this.flex.hold_draw[1], this.flex.hold_draw[3]), 2)})`,
`%WH: (${lib0246.floor(curr[10] / this.flex.hold_draw[2], 2)}, ${lib0246.floor(curr[11] / this.flex.hold_draw[3], 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 5
);
ctx.fillText(
`%XY: (${lib0246.floor(lib0246.norm(curr[0], this.flex.hold_draw[0], this.flex.hold_draw[2]), 2)}, ${lib0246.floor(lib0246.norm(curr[1], this.flex.hold_draw[1], this.flex.hold_draw[3]), 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 20
);
ctx.fillText(
`Z: ${i}`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 35
);
ctx.fillText(
`WH: (${lib0246.floor(curr[10], 2)}, ${lib0246.floor(curr[11], 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 50
);
ctx.fillText(
`XY: (${lib0246.floor(curr[8], 2)}, ${lib0246.floor(curr[9], 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 65
);
ctx.closePath();
// Draw 4 circles for each corner
ctx.beginPath();
ctx.lineWidth = 1;
ctx.strokeStyle = "#ff7ac1";
ctx.setLineDash([]);
ctx.arc(curr[8], curr[9], this.box_range.radius, 0, Math.PI * 2);
ctx.stroke();
ctx.closePath();
ctx.beginPath();
ctx.strokeStyle = "#800044";
ctx.arc(curr[8], curr[9] + curr[11], this.box_range.radius, 0, Math.PI * 2);
ctx.stroke();
ctx.closePath();
// Delete
ctx.beginPath();
ctx.lineWidth = 1;
ctx.strokeStyle = "#ff0000";
ctx.arc(curr[8] + curr[10], curr[9], this.box_range.radius, 0, Math.PI * 2);
ctx.stroke();
ctx.closePath();
// Resize
ctx.beginPath();
ctx.strokeStyle = "#ffff00";
ctx.arc(curr[8] + curr[10], curr[9] + curr[11], this.box_range.radius, 0, Math.PI * 2);
ctx.stroke();
ctx.closePath();
}
ctx.beginPath();
ctx.fillStyle = "rgba(127, 127, 127, 0.1)";
if (this.box_range.select.length > 0 && this.box_range.select.indexOf(this.box_range.boxes[i]) === this.box_range.select.length - 1) {
ctx.lineWidth = 1.5;
ctx.strokeStyle = "#ff0000";
ctx.setLineDash([5, 5]);
} else {
ctx.lineWidth = 1;
ctx.strokeStyle = "#ffffff";
ctx.setLineDash([]);
}
ctx.rect(curr[8], curr[9], curr[10], curr[11]);
if (!this?.options?.hideOnZoom || app.canvas.ds.scale >= 0.5) {
// Draw evenly spaced grid of both row and column of specified count
ctx.beginPath();
ctx.strokeStyle = "#000000";
ctx.lineWidth = 1;
ctx.lineWidth = 0.5;
ctx.setLineDash([10, 5]);
for (let i = 0; i < this.row_count; ++ i) {
ctx.moveTo(this.flex.hold_draw[0], i * this.flex.hold_draw[3] / this.row_count + this.flex.hold_draw[1]);
ctx.lineTo(this.flex.hold_draw[2] + this.flex.hold_draw[0], i * this.flex.hold_draw[3] / this.row_count + this.flex.hold_draw[1]);
ctx.stroke();
ctx.fill();
ctx.closePath();
}
for (let i = 0; i < this.col_count; ++ i) {
ctx.moveTo(i * this.flex.hold_draw[2] / this.col_count + this.flex.hold_draw[0], this.flex.hold_draw[1]);
ctx.lineTo(i * this.flex.hold_draw[2] / this.col_count + this.flex.hold_draw[0], this.flex.hold_draw[3] + this.flex.hold_draw[1]);
ctx.stroke();
}
ctx.closePath();
// Map each point to fit the grid by percentage based on previous size to current size
if (this?.box_range?.boxes)
for (let i = 0; i < this.box_range.boxes.length; ++ i) {
let curr = this.box_range.boxes[i];
const res = lib0246.calc_flex_norm(
curr[0], curr[1], curr[2], curr[3],
curr[4], curr[5], curr[6], curr[7],
this.flex.hold_draw[0], this.flex.hold_draw[1], this.flex.hold_draw[2], this.flex.hold_draw[3]
);
curr[8] = res[0];
curr[9] = res[1];
curr[10] = res[2];
curr[11] = res[3];
}
// Draw each box
if (this?.box_range?.boxes) {
for (let i = 0; i < this.box_range.boxes.length; ++ i) {
let curr = this.box_range.boxes[i];
if (this.box_range.boxes[i] === this.box_range.select[this.box_range.select.length - 1]) {
// Draw text metadata bottom left of the entire grid
ctx.beginPath();
ctx.fillStyle = "#ffffff";
ctx.font = "12px Consolas";
ctx.fillText(
// `%XY2: (${lib0246.floor(lib0246.norm(curr[8] + curr[10], this.flex.hold_draw[0], this.flex.hold_draw[2]), 2)}, ${lib0246.floor(lib0246.norm(curr[9] + curr[11], this.flex.hold_draw[1], this.flex.hold_draw[3]), 2)})`,
`%WH: (${lib0246.floor(curr[10] / this.flex.hold_draw[2], 2)}, ${lib0246.floor(curr[11] / this.flex.hold_draw[3], 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 5
);
ctx.fillText(
`%XY: (${lib0246.floor(lib0246.norm(curr[0], this.flex.hold_draw[0], this.flex.hold_draw[2]), 2)}, ${lib0246.floor(lib0246.norm(curr[1], this.flex.hold_draw[1], this.flex.hold_draw[3]), 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 20
);
ctx.fillText(
`Z: ${i}`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 35
);
ctx.fillText(
`WH: (${lib0246.floor(curr[10], 2)}, ${lib0246.floor(curr[11], 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 50
);
ctx.fillText(
`XY: (${lib0246.floor(curr[8], 2)}, ${lib0246.floor(curr[9], 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[3] + this.flex.hold_draw[1] - 65
);
ctx.closePath();
// Draw 4 circles for each corner
ctx.beginPath();
ctx.lineWidth = 1;
ctx.strokeStyle = "#ff7ac1";
ctx.setLineDash([]);
ctx.arc(curr[8], curr[9], this.box_range.radius, 0, Math.PI * 2);
ctx.stroke();
ctx.closePath();
ctx.beginPath();
ctx.strokeStyle = "#800044";
ctx.arc(curr[8], curr[9] + curr[11], this.box_range.radius, 0, Math.PI * 2);
ctx.stroke();
ctx.closePath();
// Delete
ctx.beginPath();
ctx.lineWidth = 1;
ctx.strokeStyle = "#ff0000";
ctx.arc(curr[8] + curr[10], curr[9], this.box_range.radius, 0, Math.PI * 2);
ctx.stroke();
ctx.closePath();
// Resize
ctx.beginPath();
ctx.strokeStyle = "#ffff00";
ctx.arc(curr[8] + curr[10], curr[9] + curr[11], this.box_range.radius, 0, Math.PI * 2);
ctx.stroke();
ctx.closePath();
}
ctx.beginPath();
ctx.fillStyle = "rgba(127, 127, 127, 0.1)";
if (this.box_range.select.length > 0 && this.box_range.select.indexOf(this.box_range.boxes[i]) === this.box_range.select.length - 1) {
ctx.lineWidth = 1.5;
ctx.strokeStyle = "#ff0000";
ctx.setLineDash([5, 5]);
} else {
ctx.lineWidth = 1;
ctx.strokeStyle = "#ffffff";
ctx.setLineDash([]);
}
ctx.rect(curr[8], curr[9], curr[10], curr[11]);
ctx.stroke();
ctx.fill();
ctx.closePath();
}
for (let i = 0; i < this.box_range.boxes.length; ++ i) {
let curr = this.box_range.boxes[i];
// Draw index text starting from the box top left
ctx.beginPath();
ctx.fillStyle = LGraphCanvas.node_colors[NODE_COLOR_LIST[i % NODE_COLOR_LIST.length]].groupcolor;
ctx.font = "15px Consolas";
ctx.fillText(
`${i}`,
curr[8] + 5, curr[9] + 15
);
ctx.closePath();
}
}
for (let i = 0; i < this.box_range.boxes.length; ++ i) {
let curr = this.box_range.boxes[i];
// Draw index text starting from the box top left
// Draw ghost movement
if (this?.box_range?.begin_state && this?.box_range?.during_state) {
ctx.beginPath();
ctx.fillStyle = LGraphCanvas.node_colors[NODE_COLOR_LIST[i % NODE_COLOR_LIST.length]].groupcolor;
ctx.font = "15px Consolas";
ctx.lineWidth = 3;
ctx.setLineDash([5, 5]);
ctx.moveTo(this.box_range.begin_state[0], this.box_range.begin_state[1]);
let last_select = this.box_range.select[this.box_range.select.length - 1] ?? [];
switch (this.box_range.state.action) {
case "create": {
ctx.strokeStyle = "rgba(0, 255, 0, 0.75)";
ctx.rect(
this.box_range.begin_state[0], this.box_range.begin_state[1],
this.box_range.during_state[0] - this.box_range.begin_state[0], this.box_range.during_state[1] - this.box_range.begin_state[1],
);
} break;
case "resize": {
ctx.strokeStyle = "rgba(255, 255, 0, 0.75)";
const res = lib0246.calc_resize(
last_select[8], last_select[9], last_select[10], last_select[11],
this.box_range.during_state[0], this.box_range.during_state[1]
);
ctx.rect(res[0], res[1], res[2], res[3]);
} break;
case "move": {
ctx.strokeStyle = "rgba(0, 0, 255, 0.75)";
ctx.rect(
last_select[8] + this.box_range.during_state[0] - this.box_range.begin_state[0],
last_select[9] + this.box_range.during_state[1] - this.box_range.begin_state[1],
last_select[10], last_select[11]
);
}
}
ctx.stroke();
ctx.closePath();
ctx.beginPath();
ctx.fillStyle = "#ffffff";
ctx.font = "12px Consolas";
ctx.fillText(
`${i}`,
curr[8] + 5, curr[9] + 15
`!XY: (${lib0246.floor(this.box_range.during_state[0], 2)}, ${lib0246.floor(this.box_range.during_state[1], 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[1] + 15
);
ctx.closePath();
}
}
// Draw ghost movement
if (this?.box_range?.begin_state && this?.box_range?.during_state) {
ctx.beginPath();
ctx.lineWidth = 3;
ctx.setLineDash([5, 5]);
ctx.moveTo(this.box_range.begin_state[0], this.box_range.begin_state[1]);
let last_select = this.box_range.select[this.box_range.select.length - 1] ?? [];
switch (this.box_range.state.action) {
case "create": {
ctx.strokeStyle = "rgba(0, 255, 0, 0.75)";
ctx.rect(
this.box_range.begin_state[0], this.box_range.begin_state[1],
this.box_range.during_state[0] - this.box_range.begin_state[0], this.box_range.during_state[1] - this.box_range.begin_state[1],
);
} break;
case "resize": {
ctx.strokeStyle = "rgba(255, 255, 0, 0.75)";
const res = lib0246.calc_resize(
last_select[8], last_select[9], last_select[10], last_select[11],
this.box_range.during_state[0], this.box_range.during_state[1]
);
ctx.rect(res[0], res[1], res[2], res[3]);
} break;
case "move": {
ctx.strokeStyle = "rgba(0, 0, 255, 0.75)";
ctx.rect(
last_select[8] + this.box_range.during_state[0] - this.box_range.begin_state[0],
last_select[9] + this.box_range.during_state[1] - this.box_range.begin_state[1],
last_select[10], last_select[11]
);
}
}
ctx.stroke();
ctx.closePath();
ctx.beginPath();
ctx.fillStyle = "#ffffff";
ctx.font = "12px Consolas";
ctx.fillText(
`!XY: (${lib0246.floor(this.box_range.during_state[0], 2)}, ${lib0246.floor(this.box_range.during_state[1], 2)})`,
this.flex.hold_draw[0] + 5, this.flex.hold_draw[1] + 15
);
ctx.closePath();
}
ctx.restore();
},
mouse: function (event, pos, node) {
@@ -4082,158 +4085,160 @@ export function CLOUD_WIDGET(data_type, data_name, options = {}) {
if (!Number.isFinite(this.flex.hold_draw[2]) || !Number.isFinite(this.flex.hold_draw[3]))
return;
ctx.beginPath();
ctx.font = "9px Consolas";
ctx.textAlign = "center";
ctx.textBaseline = "middle";
for (let i = 0; i < widget.cloud.data.inst.length; ++ i)
widget.cloud.data.view[widget.cloud.data.inst[i].id] = widget.view(node, widget.cloud.data.inst[i]);
widget.cloud.data.h = shelf_layout(
widget.cloud.data.inst, widget.cloud.data.group, widget.cloud.mouse_shift,
widget.cloud.data.pos, widget.cloud.data.view, widget.cloud.data.hit, widget.cloud.data.row, widget.cloud.data.curr,
ctx, this.flex.hold_draw[0], this.flex.hold_draw[1], this.flex.hold_draw[2], this.flex.hold_draw[3],
2, 2, 5, 5,
4, 4, 4, 4,
0, 6, 2, 2,
2, 2
// 0, 0, 0, 0,
// 0, 0, 0, 0,
// 0, 0, 0, 0,
// 0, 0
);
ctx.closePath();
for (let i = 0, sum_y = 0; i < widget.cloud.data.row.length; ++ i) {
ctx.beginPath();
ctx.fillStyle = CLOUD_FILL[i % 2];
ctx.rect(
this.flex.hold_draw[0], this.flex.hold_draw[1] + sum_y,
this.flex.hold_draw[2], widget.cloud.data.row[i]
);
ctx.fill();
ctx.closePath();
sum_y += widget.cloud.data.row[i] + 2;
}
for (let inst_id in widget.cloud.data.pos) {
ctx.beginPath();
ctx.fillStyle = "#333";
if (widget.cloud.select.has(inst_id)) {
ctx.strokeStyle = "#f00";
ctx.setLineDash([3, 3]);
} else {
ctx.strokeStyle = "#666";
ctx.setLineDash([]);
}
ctx.lineWidth = 1;
ctx.roundRect(
this.flex.hold_draw[0] + widget.cloud.data.pos[inst_id][2], this.flex.hold_draw[1] + widget.cloud.data.pos[inst_id][3] + 2,
widget.cloud.data.pos[inst_id][4], widget.cloud.data.pos[inst_id][5],
5
);
ctx.fill();
ctx.stroke();
ctx.closePath();
if (!this?.options?.hideOnZoom || app.canvas.ds.scale >= 0.5) {
ctx.beginPath();
ctx.font = "9px Consolas";
ctx.textAlign = "center";
ctx.textBaseline = "middle";
switch (widget.cloud.data.inst.find(_ => _.id === inst_id).kind) {
case "weight": {
ctx.fillStyle = "#db7756";
} break;
case "rand": {
ctx.fillStyle = "#866cf0";
} break;
case "cycle": {
ctx.fillStyle = "#b05ed6";
} break;
case "pin": {
ctx.fillStyle = "#fcff63";
} break;
case "merge": {
ctx.fillStyle = "#58db5c";
} break;
default: {
ctx.fillStyle = "#ccc";
}
}
ctx.fillText(
widget.cloud.data.view[inst_id],
this.flex.hold_draw[0] + widget.cloud.data.pos[inst_id][0],
this.flex.hold_draw[1] + widget.cloud.data.pos[inst_id][1] + 2
for (let i = 0; i < widget.cloud.data.inst.length; ++ i)
widget.cloud.data.view[widget.cloud.data.inst[i].id] = widget.view(node, widget.cloud.data.inst[i]);
widget.cloud.data.h = shelf_layout(
widget.cloud.data.inst, widget.cloud.data.group, widget.cloud.mouse_shift,
widget.cloud.data.pos, widget.cloud.data.view, widget.cloud.data.hit, widget.cloud.data.row, widget.cloud.data.curr,
ctx, this.flex.hold_draw[0], this.flex.hold_draw[1], this.flex.hold_draw[2], this.flex.hold_draw[3],
2, 2, 5, 5,
4, 4, 4, 4,
0, 6, 2, 2,
2, 2
// 0, 0, 0, 0,
// 0, 0, 0, 0,
// 0, 0, 0, 0,
// 0, 0
);
ctx.closePath();
let msg_flag = widget.cloud.mouse_move && lib0246.is_inside_rect(
widget.cloud.mouse_move[0], widget.cloud.mouse_move[1],
widget.cloud.data.hit[inst_id][0], widget.cloud.data.hit[inst_id][1],
widget.cloud.data.hit[inst_id][2], widget.cloud.data.hit[inst_id][3]
), curr_p = 0;
if (msg_flag) {
for (let i = 0, sum_y = 0; i < widget.cloud.data.row.length; ++ i) {
ctx.beginPath();
ctx.fillStyle = "#fff";
ctx.font = "7px Consolas";
ctx.textAlign = "left";
ctx.textBaseline = "middle";
const curr_inst = widget.cloud.data.inst.find(_ => _.id === inst_id);
curr_p = cloud_draw_msg(ctx, widget, inst_id, `[${curr_inst.id},${curr_inst.kind}]`, curr_p);
ctx.fillStyle = CLOUD_FILL[i % 2];
ctx.rect(
this.flex.hold_draw[0], this.flex.hold_draw[1] + sum_y,
this.flex.hold_draw[2], widget.cloud.data.row[i]
);
ctx.fill();
ctx.closePath();
sum_y += widget.cloud.data.row[i] + 2;
}
const draw_group = new Set();
for (let ii = 6, jj = 0; ii < widget.cloud.data.pos[inst_id].length; ii += 5, ++ jj) {
for (let inst_id in widget.cloud.data.pos) {
ctx.beginPath();
ctx.strokeStyle = widget.cloud.data.group[widget.cloud.data.pos[inst_id][ii]].color;
ctx.setLineDash([4, 6]);
ctx.lineWidth = 0.75;
ctx.fillStyle = "#333";
if (widget.cloud.select.has(inst_id)) {
ctx.strokeStyle = "#f00";
ctx.setLineDash([3, 3]);
} else {
ctx.strokeStyle = "#666";
ctx.setLineDash([]);
}
ctx.lineWidth = 1;
ctx.roundRect(
this.flex.hold_draw[0] + widget.cloud.data.pos[inst_id][ii + 1], this.flex.hold_draw[1] + widget.cloud.data.pos[inst_id][ii + 2] + 2,
widget.cloud.data.pos[inst_id][ii + 3], widget.cloud.data.pos[inst_id][ii + 4],
2
this.flex.hold_draw[0] + widget.cloud.data.pos[inst_id][2], this.flex.hold_draw[1] + widget.cloud.data.pos[inst_id][3] + 2,
widget.cloud.data.pos[inst_id][4], widget.cloud.data.pos[inst_id][5],
5
);
ctx.fill();
ctx.stroke();
ctx.closePath();
if (msg_flag && !draw_group.has(widget.cloud.data.pos[inst_id][ii])) {
draw_group.add(widget.cloud.data.pos[inst_id][ii]);
ctx.beginPath();
ctx.font = "9px Consolas";
ctx.textAlign = "center";
ctx.textBaseline = "middle";
switch (widget.cloud.data.inst.find(_ => _.id === inst_id).kind) {
case "weight": {
ctx.fillStyle = "#db7756";
} break;
case "rand": {
ctx.fillStyle = "#866cf0";
} break;
case "cycle": {
ctx.fillStyle = "#b05ed6";
} break;
case "pin": {
ctx.fillStyle = "#fcff63";
} break;
case "merge": {
ctx.fillStyle = "#58db5c";
} break;
default: {
ctx.fillStyle = "#ccc";
}
}
ctx.fillText(
widget.cloud.data.view[inst_id],
this.flex.hold_draw[0] + widget.cloud.data.pos[inst_id][0],
this.flex.hold_draw[1] + widget.cloud.data.pos[inst_id][1] + 2
);
ctx.closePath();
let msg_flag = widget.cloud.mouse_move && lib0246.is_inside_rect(
widget.cloud.mouse_move[0], widget.cloud.mouse_move[1],
widget.cloud.data.hit[inst_id][0], widget.cloud.data.hit[inst_id][1],
widget.cloud.data.hit[inst_id][2], widget.cloud.data.hit[inst_id][3]
), curr_p = 0;
if (msg_flag) {
ctx.beginPath();
ctx.fillStyle = widget.cloud.data.group[widget.cloud.data.pos[inst_id][ii]].color;
ctx.fillStyle = "#fff";
ctx.font = "7px Consolas";
ctx.textAlign = "left";
ctx.textBaseline = "middle";
let text_msg = "", group_res = [];
cloud_group_query_group(group_res, widget.cloud.data.group, Object.keys(widget.cloud.data.group), widget.cloud.data.pos[inst_id][ii]);
if (group_res.length > 0)
text_msg += `(${group_res[0]}|${group_res.slice(1).join(",")}>${widget.cloud.data.pos[inst_id][ii]})`;
else
text_msg += `(${widget.cloud.data.pos[inst_id][ii]})`;
curr_p = cloud_draw_msg(ctx, widget, inst_id, text_msg, curr_p);
const curr_inst = widget.cloud.data.inst.find(_ => _.id === inst_id);
curr_p = cloud_draw_msg(ctx, widget, inst_id, `[${curr_inst.id},${curr_inst.kind}]`, curr_p);
ctx.closePath();
}
}
}
if (widget.cloud.data.curr.i !== null && widget.cloud.state.action === "shift") {
ctx.beginPath();
ctx.strokeStyle = "#f00";
ctx.setLineDash([4, 2]);
ctx.lineWidth = 1;
ctx.moveTo(
widget.cloud.data.curr.x,
widget.cloud.data.curr.y
);
ctx.lineTo(
widget.cloud.data.curr.x,
widget.cloud.data.curr.y + widget.cloud.data.curr.h
);
ctx.stroke();
ctx.closePath();
const draw_group = new Set();
for (let ii = 6, jj = 0; ii < widget.cloud.data.pos[inst_id].length; ii += 5, ++ jj) {
ctx.beginPath();
ctx.strokeStyle = widget.cloud.data.group[widget.cloud.data.pos[inst_id][ii]].color;
ctx.setLineDash([4, 6]);
ctx.lineWidth = 0.75;
ctx.roundRect(
this.flex.hold_draw[0] + widget.cloud.data.pos[inst_id][ii + 1], this.flex.hold_draw[1] + widget.cloud.data.pos[inst_id][ii + 2] + 2,
widget.cloud.data.pos[inst_id][ii + 3], widget.cloud.data.pos[inst_id][ii + 4],
2
);
ctx.stroke();
ctx.closePath();
if (msg_flag && !draw_group.has(widget.cloud.data.pos[inst_id][ii])) {
draw_group.add(widget.cloud.data.pos[inst_id][ii]);
ctx.beginPath();
ctx.fillStyle = widget.cloud.data.group[widget.cloud.data.pos[inst_id][ii]].color;
ctx.font = "7px Consolas";
ctx.textAlign = "left";
ctx.textBaseline = "middle";
let text_msg = "", group_res = [];
cloud_group_query_group(group_res, widget.cloud.data.group, Object.keys(widget.cloud.data.group), widget.cloud.data.pos[inst_id][ii]);
if (group_res.length > 0)
text_msg += `(${group_res[0]}|${group_res.slice(1).join(",")}>${widget.cloud.data.pos[inst_id][ii]})`;
else
text_msg += `(${widget.cloud.data.pos[inst_id][ii]})`;
curr_p = cloud_draw_msg(ctx, widget, inst_id, text_msg, curr_p);
ctx.closePath();
}
}
}
if (widget.cloud.data.curr.i !== null && widget.cloud.state.action === "shift") {
ctx.beginPath();
ctx.strokeStyle = "#f00";
ctx.setLineDash([4, 2]);
ctx.lineWidth = 1;
ctx.moveTo(
widget.cloud.data.curr.x,
widget.cloud.data.curr.y
);
ctx.lineTo(
widget.cloud.data.curr.x,
widget.cloud.data.curr.y + widget.cloud.data.curr.h
);
ctx.stroke();
ctx.closePath();
}
}
ctx.restore();
@@ -4498,6 +4503,26 @@ function hijack_widget_name(node, widget) {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
export function switch_widget(node, index, value) {
node.addWidget("combo", `switch:${index}`, value, function (value, canvas, node, pos, evt) {
const index = node.widgets.findIndex(_ => _ === this);
node.outputs[index].name = `${node.inputs.find(_ => _.name === value)?.type ?? "_"}:${index}`;
}, {
serialize: true,
values: function (widget) {
let res = ["_"];
for (let i = 0; i < node.inputs.length; ++ i)
if (node.inputs[i].link)
res.push(node.inputs[i]?.label ?? node.inputs[i].name);
return res;
}
});
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
let ERROR_TRACK = 0;
app.registerExtension({
@@ -4587,27 +4612,28 @@ app.registerExtension({
return {
BOX_RANGE: function(node, inputName, inputData, app) {
const ratio_widget = node.addCustomWidget(RATIO_WIDGET("RATIO_RANGE", inputName + "_ratio"));
inputData[1].ratio = inputData[1].ratio ?? {};
inputData[1].ratio.lock = inputData[1].ratio.lock ?? {};
inputData[1].ratio.lock.ratio = inputData[1].ratio.lock.ratio ?? false;
inputData[1].ratio.lock.width = inputData[1].ratio.lock.width ?? false;
inputData[1].ratio.lock.height = inputData[1].ratio.lock.height ?? false;
inputData[1].ratio.data = inputData[1].ratio.data ?? {};
inputData[1].ratio.data.width = inputData[1].ratio.data.width ?? 512;
inputData[1].ratio.data.height = inputData[1].ratio.data.height ?? 512;
inputData[1].ratio.data.ratio = inputData[1].ratio.data.width === 0 || inputData[1].ratio.data.height === 0 ? 0 :
(inputData[1].ratio.data.ratio ?? (inputData[1].ratio.data.width / inputData[1].ratio.data.height));
inputData[1].ratio = inputData?.[1]?.ratio ?? {};
inputData[1].ratio.lock = inputData?.[1]?.ratio.lock ?? {};
inputData[1].ratio.lock.ratio = inputData?.[1]?.ratio.lock.ratio ?? false;
inputData[1].ratio.lock.width = inputData?.[1]?.ratio.lock.width ?? false;
inputData[1].ratio.lock.height = inputData?.[1]?.ratio.lock.height ?? false;
inputData[1].ratio.data = inputData?.[1]?.ratio.data ?? {};
inputData[1].ratio.data.width = inputData?.[1]?.ratio.data.width ?? 512;
inputData[1].ratio.data.height = inputData?.[1]?.ratio.data.height ?? 512;
inputData[1].ratio.data.ratio = inputData?.[1]?.ratio.data.width === 0 || inputData?.[1]?.ratio.data.height === 0 ? 0 :
(inputData?.[1]?.ratio?.data?.ratio ?? (inputData[1].ratio.data.width / inputData[1].ratio.data.height));
inputData[1].row_count = inputData[1].row_count ?? 10;
inputData[1].col_count = inputData[1].col_count ?? 10;
inputData[1].row_count = inputData?.[1]?.row_count ?? 10;
inputData[1].col_count = inputData?.[1]?.col_count ?? 10;
const box_widget = node.addCustomWidget(BOX_RANGE_WIDGET("BOX_RANGE", inputName, inputData[1]));
inputData[1].flex = inputData[1].flex ?? {};
inputData[1].flex.ratio = inputData[1].ratio.data.ratio;
inputData[1].flex.share = inputData[1].flex.share ?? 1;
inputData[1].flex.min_h = inputData[1].flex.min_h ?? 50;
inputData[1].flex.center = inputData[1].flex.center ?? true;
inputData[1].flex = inputData?.[1]?.flex ?? {};
inputData[1].flex.ratio = inputData?.[1]?.ratio.data.ratio;
inputData[1].flex.share = inputData?.[1]?.flex.share ?? 1;
inputData[1].flex.min_h = inputData?.[1]?.flex.min_h ?? 50;
inputData[1].flex.center = inputData?.[1]?.flex.center ?? true;
widget_flex(node, box_widget, inputData[1].flex);
box_widget.linkedWidgets = [ratio_widget];
box_widget.options.hideOnZoom = inputData?.[1]?.hideOnZoom ?? true;
return {
widget: box_widget,
}
@@ -4675,8 +4701,9 @@ app.registerExtension({
center: true,
margin_x: 10,
});
if (inputData.cloud)
cloud_widget.value = inputData.cloud;
if (inputData?.[1]?.cloud)
cloud_widget.value = inputData[1].cloud;
cloud_widget.options.hideOnZoom = inputData?.[1]?.hideOnZoom ?? true;
if (!node.constructor.nodeData[CLOUD_MARK]) {
node.constructor.nodeData[CLOUD_MARK] = {};