Merge pull request from RodZill4/dev-ui

User interface updates
This commit is contained in:
Rodz Labs 2020-03-08 23:07:50 +01:00 committed by GitHub
commit ec65dee27f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
157 changed files with 3139 additions and 2365 deletions
addons/material_maker/engine
material_maker/doc/images
create_node_menu.gifeditable_node.pngnode_3d_box.pngnode_3d_sdf_color.pngnode_3d_sdf_operators_boolean.pngnode_3d_sdf_operators_circlerepeat.pngnode_3d_sdf_operators_elongation.pngnode_3d_sdf_operators_extrusion.pngnode_3d_sdf_operators_morph.pngnode_3d_sdf_operators_repeat.pngnode_3d_sdf_operators_revolution.pngnode_3d_sdf_operators_rounded.pngnode_3d_sdf_operators_smoothboolean.pngnode_3d_sdf_render.pngnode_3d_sdf_shapes_box.pngnode_3d_sdf_shapes_capsule.pngnode_3d_sdf_shapes_cone.pngnode_3d_sdf_shapes_cylinder.pngnode_3d_sdf_shapes_sphere.pngnode_3d_sdf_shapes_torus.pngnode_3d_sdf_transforms_rotate.pngnode_3d_sdf_transforms_scale.pngnode_3d_sdf_transforms_translate.pngnode_3d_sphere.pngnode_3d_texture_apply.pngnode_3d_texture_blend.pngnode_3d_texture_colorize.pngnode_3d_texture_distort.pngnode_3d_texture_fbm.pngnode_3d_texture_from2d.pngnode_3d_texture_pattern.pngnode_3d_texture_rotate.pngnode_3d_texture_select.pngnode_example.pngnode_filter_adjusthsv.pngnode_filter_blend.pngnode_filter_blur.pngnode_filter_blur_directional.pngnode_filter_brightnesscontrast.pngnode_filter_colorize.pngnode_filter_colorize_invert.pngnode_filter_colorize_rainbow.pngnode_filter_combine.pngnode_filter_decompose.pngnode_filter_edge_detect.pngnode_filter_edge_detect_axis_aligned.pngnode_filter_edge_detect_diagonal.pngnode_filter_emboss.pngnode_filter_greyscale.pngnode_filter_invert.pngnode_filter_normal_map.pngnode_filter_occlusion.pngnode_filter_quantize.pngnode_filter_sharpen.pngnode_filter_swapchannels.pngnode_miscellaneous_buffer.pngnode_miscellaneous_comment.pngnode_miscellaneous_custom_shader.pngnode_miscellaneous_debug.pngnode_miscellaneous_export.pngnode_miscellaneous_remote.pngnode_miscellaneous_switch.pngnode_noise.pngnode_noise_color.pngnode_noise_fbm.pngnode_noise_perlin.pngnode_noise_perlin_color.pngnode_noise_perlin_warp1.pngnode_noise_perlin_warp2.pngnode_noise_voronoi.pngnode_pattern_beehive.pngnode_pattern_bricks.pngnode_pattern_bricks_basketweave.pngnode_pattern_bricks_herringbone.pngnode_pattern_bricks_spanishbond.pngnode_pattern_bricks_tiles.pngnode_pattern_fibers.pngnode_pattern_generic.pngnode_pattern_generic_checkerboard.pngnode_pattern_runes.pngnode_pattern_scratches.pngnode_pattern_truchet.pngnode_pattern_weave.pngnode_simple_gradient.pngnode_simple_gradient_circular.pngnode_simple_gradient_radial.pngnode_simple_sdf_operators_sdannularshape.pngnode_simple_sdf_operators_sdboolean.pngnode_simple_sdf_operators_sdmorph.pngnode_simple_sdf_operators_sdroundedshape.pngnode_simple_sdf_operators_sdsmoothboolean.pngnode_simple_sdf_sdshow.pngnode_simple_sdf_shapes_sdarc.pngnode_simple_sdf_shapes_sdbox.pngnode_simple_sdf_shapes_sdcircle.pngnode_simple_sdf_shapes_sdline.pngnode_simple_sdf_shapes_sdrhombus.png

View File

@ -7,6 +7,7 @@ Base class for texture generators, that defines their API
"""
signal parameter_changed
signal output_changed(index)
class InputPort:
var generator : MMGenBase = null
@ -49,6 +50,9 @@ func can_be_deleted() -> bool:
func toggle_editable() -> bool:
return false
func is_template() -> bool:
return model != null
func is_editable() -> bool:
return false
@ -117,6 +121,7 @@ func notify_output_change(output_index : int) -> void:
var targets = get_targets(output_index)
for target in targets:
target.generator.source_changed(target.input_index)
emit_signal("output_changed", output_index)
func source_changed(__) -> void:
emit_signal("parameter_changed", "__input_changed__", 0)

View File

@ -10,7 +10,13 @@ var editable : bool = false
var transmits_seed : bool = true
signal connections_changed(removed_connections, added_connections)
signal hierarchy_changed
func emit_hierarchy_changed():
var top = self
while top.get_parent() != null and top.get_parent().get_script() == get_script():
top = top.get_parent()
top.emit_signal("hierarchy_changed")
func fix_remotes() -> void:
for c in get_children():
@ -111,6 +117,8 @@ func add_generator(generator : MMGenBase) -> bool:
name = generator.name + "_" + str(index)
generator.name = name
add_child(generator)
if generator.get_script() == get_script():
emit_hierarchy_changed()
return true
func remove_generator(generator : MMGenBase) -> bool:
@ -123,6 +131,8 @@ func remove_generator(generator : MMGenBase) -> bool:
connections = new_connections
remove_child(generator)
fix_remotes()
if generator.get_script() == get_script():
emit_hierarchy_changed()
generator.queue_free()
return true
@ -130,8 +140,10 @@ func replace_generator(old : MMGenBase, new : MMGenBase) -> void:
new.name = old.name
new.position = old.position
remove_child(old)
old.free()
add_child(new)
if old.get_script() == get_script() or new.get_script() == get_script():
emit_hierarchy_changed()
old.free()
func get_connected_inputs(generator) -> Array:
var rv : Array = []
@ -316,6 +328,7 @@ func create_subgraph(gens : Array) -> MMGenGraph:
new_graph.add_child(gen_parameters)
fix_remotes()
new_graph.fix_remotes()
emit_hierarchy_changed()
return new_graph

View File

@ -82,7 +82,7 @@ func create_gen(data) -> MMGenBase:
if generator == null and data.has("type"):
if types.has(data.type):
generator = types[data.type].new()
else:
elif predefined_generators.has(data.type):
generator = create_gen(predefined_generators[data.type])
if generator == null:
print("Cannot find description for "+data.type)

Binary file not shown.

After

(image error) Size: 88 KiB

Binary file not shown.

Before

(image error) Size: 37 KiB

After

(image error) Size: 5.0 KiB

Binary file not shown.

Before

(image error) Size: 6.7 KiB

After

(image error) Size: 6.4 KiB

Binary file not shown.

Before

(image error) Size: 1.9 KiB

After

(image error) Size: 1.7 KiB

Binary file not shown.

Before

(image error) Size: 2.4 KiB

After

(image error) Size: 2.2 KiB

Binary file not shown.

Before

(image error) Size: 2.3 KiB

After

(image error) Size: 2.1 KiB

Binary file not shown.

Before

(image error) Size: 3.2 KiB

After

(image error) Size: 2.9 KiB

Binary file not shown.

Before

(image error) Size: 2.4 KiB

After

(image error) Size: 2.2 KiB

Binary file not shown.

Before

(image error) Size: 2.2 KiB

After

(image error) Size: 1.9 KiB

Binary file not shown.

Before

(image error) Size: 3.3 KiB

After

(image error) Size: 3.1 KiB

Binary file not shown.

Before

(image error) Size: 2.6 KiB

After

(image error) Size: 2.4 KiB

Binary file not shown.

Before

(image error) Size: 2.2 KiB

After

(image error) Size: 2.0 KiB

Binary file not shown.

Before

(image error) Size: 3.3 KiB

After

(image error) Size: 3.1 KiB

Binary file not shown.

Before

(image error) Size: 2.6 KiB

After

(image error) Size: 2.3 KiB

Binary file not shown.

Before

(image error) Size: 4.6 KiB

After

(image error) Size: 4.3 KiB

Binary file not shown.

Before

(image error) Size: 3.9 KiB

After

(image error) Size: 3.7 KiB

Binary file not shown.

Before

(image error) Size: 2.6 KiB

After

(image error) Size: 2.4 KiB

Binary file not shown.

Before

(image error) Size: 4.0 KiB

After

(image error) Size: 3.7 KiB

Binary file not shown.

Before

(image error) Size: 2.0 KiB

After

(image error) Size: 1.8 KiB

Binary file not shown.

Before

(image error) Size: 2.6 KiB

After

(image error) Size: 2.3 KiB

Binary file not shown.

Before

(image error) Size: 2.8 KiB

After

(image error) Size: 2.6 KiB

Binary file not shown.

Before

(image error) Size: 1.7 KiB

After

(image error) Size: 1.5 KiB

Binary file not shown.

Before

(image error) Size: 2.9 KiB

After

(image error) Size: 2.6 KiB

Binary file not shown.

Before

(image error) Size: 4.1 KiB

After

(image error) Size: 3.9 KiB

Binary file not shown.

Before

(image error) Size: 4.1 KiB

After

(image error) Size: 3.9 KiB

Binary file not shown.

Before

(image error) Size: 5.6 KiB

After

(image error) Size: 5.2 KiB

Binary file not shown.

Before

(image error) Size: 3.0 KiB

After

(image error) Size: 2.8 KiB

Binary file not shown.

Before

(image error) Size: 3.4 KiB

After

(image error) Size: 3.2 KiB

Binary file not shown.

Before

(image error) Size: 7.4 KiB

After

(image error) Size: 7.0 KiB

Binary file not shown.

Before

(image error) Size: 2.2 KiB

After

(image error) Size: 2.1 KiB

Binary file not shown.

Before

(image error) Size: 6.1 KiB

After

(image error) Size: 5.8 KiB

Binary file not shown.

Before

(image error) Size: 3.5 KiB

After

(image error) Size: 3.2 KiB

Binary file not shown.

Before

(image error) Size: 3.8 KiB

After

(image error) Size: 3.6 KiB

Binary file not shown.

Before

(image error) Size: 67 KiB

After

(image error) Size: 42 KiB

Binary file not shown.

Before

(image error) Size: 4.2 KiB

After

(image error) Size: 3.8 KiB

Binary file not shown.

Before

(image error) Size: 5.2 KiB

After

(image error) Size: 4.9 KiB

Binary file not shown.

Before

(image error) Size: 6.2 KiB

After

(image error) Size: 5.8 KiB

Binary file not shown.

Before

(image error) Size: 5.8 KiB

After

(image error) Size: 5.5 KiB

Binary file not shown.

Before

(image error) Size: 4.7 KiB

After

(image error) Size: 4.4 KiB

Binary file not shown.

Before

(image error) Size: 2.4 KiB

After

(image error) Size: 2.2 KiB

Binary file not shown.

Before

(image error) Size: 2.4 KiB

After

(image error) Size: 2.2 KiB

Binary file not shown.

Before

(image error) Size: 2.6 KiB

After

(image error) Size: 2.4 KiB

Binary file not shown.

Before

(image error) Size: 3.0 KiB

After

(image error) Size: 2.8 KiB

Binary file not shown.

Before

(image error) Size: 2.3 KiB

After

(image error) Size: 2.1 KiB

Binary file not shown.

Before

(image error) Size: 3.0 KiB

After

(image error) Size: 2.8 KiB

Binary file not shown.

Before

(image error) Size: 3.2 KiB

After

(image error) Size: 3.0 KiB

Binary file not shown.

Before

(image error) Size: 3.2 KiB

After

(image error) Size: 3.0 KiB

Binary file not shown.

Before

(image error) Size: 4.5 KiB

After

(image error) Size: 4.2 KiB

Binary file not shown.

Before

(image error) Size: 3.2 KiB

After

(image error) Size: 3.0 KiB

Binary file not shown.

Before

(image error) Size: 1.5 KiB

After

(image error) Size: 1.3 KiB

Binary file not shown.

Before

(image error) Size: 4.9 KiB

After

(image error) Size: 4.6 KiB

Binary file not shown.

Before

(image error) Size: 4.6 KiB

After

(image error) Size: 4.3 KiB

Binary file not shown.

Before

(image error) Size: 2.2 KiB

After

(image error) Size: 1.9 KiB

Binary file not shown.

Before

(image error) Size: 2.9 KiB

After

(image error) Size: 2.6 KiB

Binary file not shown.

Before

(image error) Size: 4.4 KiB

After

(image error) Size: 4.1 KiB

Binary file not shown.

Before

(image error) Size: 3.3 KiB

After

(image error) Size: 3.0 KiB

Binary file not shown.

Before

(image error) Size: 3.8 KiB

After

(image error) Size: 3.8 KiB

Binary file not shown.

Before

(image error) Size: 1.3 KiB

After

(image error) Size: 1.3 KiB

Binary file not shown.

Before

(image error) Size: 2.8 KiB

After

(image error) Size: 2.8 KiB

Binary file not shown.

Before

(image error) Size: 3.8 KiB

After

(image error) Size: 3.8 KiB

Binary file not shown.

Before

(image error) Size: 2.5 KiB

After

(image error) Size: 2.4 KiB

Binary file not shown.

Before

(image error) Size: 3.7 KiB

After

(image error) Size: 3.7 KiB

Binary file not shown.

Before

(image error) Size: 4.6 KiB

After

(image error) Size: 4.4 KiB

Binary file not shown.

Before

(image error) Size: 3.7 KiB

After

(image error) Size: 3.5 KiB

Binary file not shown.

Before

(image error) Size: 6.2 KiB

After

(image error) Size: 5.9 KiB

Binary file not shown.

Before

(image error) Size: 5.3 KiB

After

(image error) Size: 4.9 KiB

Binary file not shown.

Before

(image error) Size: 5.5 KiB

After

(image error) Size: 5.1 KiB

Binary file not shown.

Before

(image error) Size: 6.7 KiB

After

(image error) Size: 6.3 KiB

Binary file not shown.

Before

(image error) Size: 6.9 KiB

After

(image error) Size: 6.4 KiB

Binary file not shown.

Before

(image error) Size: 7.0 KiB

After

(image error) Size: 6.6 KiB

Binary file not shown.

Before

(image error) Size: 3.5 KiB

After

(image error) Size: 3.2 KiB

Binary file not shown.

Before

(image error) Size: 11 KiB

After

(image error) Size: 9.8 KiB

Binary file not shown.

Before

(image error) Size: 10 KiB

After

(image error) Size: 9.6 KiB

Binary file not shown.

Before

(image error) Size: 10 KiB

After

(image error) Size: 9.3 KiB

Binary file not shown.

Before

(image error) Size: 10 KiB

After

(image error) Size: 9.4 KiB

Binary file not shown.

Before

(image error) Size: 10 KiB

After

(image error) Size: 9.6 KiB

Binary file not shown.

Before

(image error) Size: 2.7 KiB

After

(image error) Size: 2.5 KiB

Binary file not shown.

Before

(image error) Size: 4.8 KiB

After

(image error) Size: 4.5 KiB

Binary file not shown.

Before

(image error) Size: 4.8 KiB

After

(image error) Size: 4.6 KiB

Binary file not shown.

Before

(image error) Size: 2.9 KiB

After

(image error) Size: 2.7 KiB

Binary file not shown.

Before

(image error) Size: 8.5 KiB

After

(image error) Size: 8.3 KiB

Binary file not shown.

Before

(image error) Size: 3.6 KiB

After

(image error) Size: 3.3 KiB

Binary file not shown.

Before

(image error) Size: 4.4 KiB

After

(image error) Size: 4.2 KiB

Binary file not shown.

Before

(image error) Size: 4.7 KiB

After

(image error) Size: 4.4 KiB

Binary file not shown.

Before

(image error) Size: 4.3 KiB

After

(image error) Size: 4.1 KiB

Binary file not shown.

Before

(image error) Size: 4.2 KiB

After

(image error) Size: 3.9 KiB

Binary file not shown.

Before

(image error) Size: 2.6 KiB

After

(image error) Size: 2.4 KiB

Binary file not shown.

Before

(image error) Size: 2.7 KiB

After

(image error) Size: 2.5 KiB

Binary file not shown.

Before

(image error) Size: 2.4 KiB

After

(image error) Size: 2.2 KiB

Binary file not shown.

Before

(image error) Size: 2.8 KiB

After

(image error) Size: 2.6 KiB

Binary file not shown.

Before

(image error) Size: 3.6 KiB

After

(image error) Size: 3.4 KiB

Binary file not shown.

Before

(image error) Size: 2.9 KiB

After

(image error) Size: 2.6 KiB

Binary file not shown.

Before

(image error) Size: 4.6 KiB

After

(image error) Size: 4.3 KiB

Binary file not shown.

Before

(image error) Size: 4.8 KiB

After

(image error) Size: 4.6 KiB

Binary file not shown.

Before

(image error) Size: 4.1 KiB

After

(image error) Size: 3.9 KiB

Binary file not shown.

Before

(image error) Size: 3.6 KiB

After

(image error) Size: 3.4 KiB

Binary file not shown.

Before

(image error) Size: 5.0 KiB

After

(image error) Size: 4.8 KiB

Some files were not shown because too many files have changed in this diff Show More