Relintai/material-maker
1
0
Fork 0
mirror of https://github.com/Relintai/material-maker.git synced 2025-04-01 05:55:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sdf3d -> sdf3dc conversion

Browse Source
This commit is contained in:
RodZill4 2020-02-05 06:36:49 +01:00
parent 6b183aa7a0
commit c59496a3a8
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/material_maker/nodes/io_types.mmt
View File

@ -55,7 +55,7 @@
"params":"p", "params":"p",
"slot_type":2, "slot_type":2,
"convert":[ "convert":[
{ "type":"sdf3dc", "expr":"vec2($(value)).rgb, 0.0)" } { "type":"sdf3dc", "expr":"vec2($(value), 0.0)" }
], ],
"color":{ "r":0.5, "g":0.0, "b":0.0, "a":1.0 } "color":{ "r":0.5, "g":0.0, "b":0.0, "a":1.0 }
}, },

10
material_maker/nodes/generic.gd
View File

@ -177,8 +177,9 @@ func update_node() -> void:
var type_left = 0 var type_left = 0
if typeof(input) == TYPE_DICTIONARY: if typeof(input) == TYPE_DICTIONARY:
enable_left = true enable_left = true
color_left = mm_io_types.types[input.type].color if mm_io_types.types.has(input.type):
type_left = mm_io_types.types[input.type].slot_type color_left = mm_io_types.types[input.type].color
type_left = mm_io_types.types[input.type].slot_type
set_slot(i, enable_left, type_left, color_left, false, 0, Color()) set_slot(i, enable_left, type_left, color_left, false, 0, Color())
var hsizer : HBoxContainer = HBoxContainer.new() var hsizer : HBoxContainer = HBoxContainer.new()
hsizer.size_flags_horizontal = SIZE_EXPAND | SIZE_FILL hsizer.size_flags_horizontal = SIZE_EXPAND | SIZE_FILL
@ -251,8 +252,9 @@ func update_node() -> void:
assert(typeof(output) == TYPE_DICTIONARY) assert(typeof(output) == TYPE_DICTIONARY)
assert(output.has("type")) assert(output.has("type"))
enable_right = true enable_right = true
color_right = mm_io_types.types[output.type].color if mm_io_types.types.has(output.type):
type_right = mm_io_types.types[output.type].slot_type color_right = mm_io_types.types[output.type].color
type_right = mm_io_types.types[output.type].slot_type
set_slot(i, is_slot_enabled_left(i), get_slot_type_left(i), get_slot_color_left(i), enable_right, type_right, color_right) set_slot(i, is_slot_enabled_left(i), get_slot_type_left(i), get_slot_color_left(i), enable_right, type_right, color_right)
var hsizer : HBoxContainer var hsizer : HBoxContainer
while i >= get_child_count(): while i >= get_child_count():