From ead7fac1f88ddea6d69633b02507f0b1fe471dbc Mon Sep 17 00:00:00 2001 From: HungryProton Date: Tue, 19 May 2020 01:09:33 +0200 Subject: [PATCH] clear editor on node removal, fix add node search text placeholder, minor fixes --- examples/templates/fence.cgraph | 2 +- examples/templates/ground_v1.cgraph | 2 +- examples/templates/ground_with_grass_1.cgraph | 2 +- examples/templates/tents.cgraph | 2 +- src/editor/gui/add_node_panel.gd | 4 ++-- src/editor/gui/add_node_panel.tscn | 3 ++- src/editor/gui/editor_view.gd | 2 ++ 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/examples/templates/fence.cgraph b/examples/templates/fence.cgraph index 67944aff..b2109cfa 100644 --- a/examples/templates/fence.cgraph +++ b/examples/templates/fence.cgraph @@ -1 +1 @@ -{"connections":[{"from":"GraphNode2","from_port":0,"to":"GraphNode3","to_port":0},{"from":"GraphNode4","from_port":0,"to":"GraphNode5","to_port":0},{"from":"GraphNode3","from_port":0,"to":"GraphNode6","to_port":0},{"from":"GraphNode7","from_port":0,"to":"GraphNode6","to_port":1},{"from":"GraphNode6","from_port":0,"to":"GraphNode5","to_port":1},{"from":"GraphNode5","from_port":0,"to":"GraphNode","to_port":0}],"nodes":[{"data":{},"editor":{"offset_x":-620,"offset_y":-60,"slots":{"0":"Path"}},"name":"GraphNode2","type":"nodetree_input_curve"},{"data":{},"editor":{"offset_x":120,"offset_y":-160,"slots":{}},"name":"GraphNode5","type":"duplicate_nodes"},{"data":{},"editor":{"offset_x":-160,"offset_y":-200,"slots":{"0":"fence_planks"}},"name":"GraphNode4","type":"input_generic"},{"data":{},"editor":{"offset_x":-400,"offset_y":160,"slots":{"0":0,"1":90,"2":0}},"name":"GraphNode7","type":"value_vector3"},{"data":{},"editor":{"offset_x":-120,"offset_y":-60,"slots":{}},"name":"GraphNode6","type":"rotate_transforms_offset"},{"data":{},"editor":{"offset_x":380,"offset_y":-160,"slots":{}},"name":"GraphNode","type":"final_output"},{"data":{},"editor":{"offset_x":-400,"offset_y":-60,"slots":{"1":1.086,"2":0,"3":1,"4":true}},"name":"GraphNode3","type":"curve_sample_points_constant"}]} +{"connections":[{"from":"GraphNode2","from_port":0,"to":"GraphNode3","to_port":0},{"from":"GraphNode4","from_port":0,"to":"GraphNode5","to_port":0},{"from":"GraphNode3","from_port":0,"to":"GraphNode6","to_port":0},{"from":"GraphNode7","from_port":0,"to":"GraphNode6","to_port":1},{"from":"GraphNode6","from_port":0,"to":"GraphNode5","to_port":1},{"from":"GraphNode5","from_port":0,"to":"GraphNode","to_port":0}],"nodes":[{"data":{},"editor":{"offset_x":-620,"offset_y":-60,"slots":{"0":"Path"}},"name":"GraphNode2","type":"nodetree_input_curve"},{"data":{},"editor":{"offset_x":120,"offset_y":-160,"slots":{}},"name":"GraphNode5","type":"duplicate_nodes"},{"data":{},"editor":{"offset_x":-160,"offset_y":-200,"slots":{"0":"fence_planks","1":false}},"name":"GraphNode4","type":"input_generic"},{"data":{},"editor":{"offset_x":-400,"offset_y":160,"slots":{"0":0,"1":90,"2":0}},"name":"GraphNode7","type":"value_vector3"},{"data":{},"editor":{"offset_x":-120,"offset_y":-60,"slots":{"2":true}},"name":"GraphNode6","type":"rotate_transforms_offset"},{"data":{},"editor":{"offset_x":380,"offset_y":-160,"slots":{}},"name":"GraphNode","type":"final_output"},{"data":{},"editor":{"offset_x":-400,"offset_y":-60,"slots":{"1":1.086,"2":0,"3":1,"4":true}},"name":"GraphNode3","type":"curve_sample_points_constant"}]} diff --git a/examples/templates/ground_v1.cgraph b/examples/templates/ground_v1.cgraph index 956eaf87..e0b05964 100644 --- a/examples/templates/ground_v1.cgraph +++ b/examples/templates/ground_v1.cgraph @@ -1 +1 @@ -{"connections":[{"from":"GraphNode5","from_port":0,"to":"GraphNode6","to_port":0},{"from":"GraphNode6","from_port":1,"to":"GraphNode4","to_port":2},{"from":"GraphNode6","from_port":0,"to":"GraphNode8","to_port":0},{"from":"GraphNode8","from_port":0,"to":"GraphNode4","to_port":0},{"from":"GraphNode8","from_port":2,"to":"GraphNode4","to_port":1},{"from":"GraphNode7","from_port":0,"to":"GraphNode4","to_port":3},{"from":"GraphNode10","from_port":0,"to":"GraphNode9","to_port":0},{"from":"GraphNode8","from_port":1,"to":"GraphNode9","to_port":1},{"from":"GraphNode12","from_port":0,"to":"GraphNode11","to_port":1},{"from":"GraphNode4","from_port":0,"to":"GraphNode14","to_port":0},{"from":"GraphNode3","from_port":0,"to":"GraphNode14","to_port":1},{"from":"GraphNode2","from_port":0,"to":"GraphNode14","to_port":2},{"from":"GraphNode15","from_port":0,"to":"GraphNode14","to_port":3},{"from":"GraphNode17","from_port":0,"to":"GraphNode14","to_port":5},{"from":"GraphNode14","from_port":0,"to":"GraphNode10","to_port":0},{"from":"GraphNode9","from_port":0,"to":"GraphNode11","to_port":0},{"from":"GraphNode18","from_port":0,"to":"GraphNode16","to_port":1},{"from":"GraphNode11","from_port":0,"to":"GraphNode16","to_port":0},{"from":"GraphNode16","from_port":0,"to":"GraphNode","to_port":0},{"from":"GraphNode13","from_port":0,"to":"GraphNode12","to_port":1},{"from":"GraphNode8","from_port":1,"to":"GraphNode13","to_port":1}],"nodes":[{"data":{},"editor":{"offset_x":-780,"offset_y":280,"slots":{}},"name":"GraphNode8","type":"break_vector"},{"data":{},"editor":{"offset_x":-1160,"offset_y":380,"slots":{"0":"Box"}},"name":"GraphNode5","type":"input_box"},{"data":{},"editor":{"offset_x":-500,"offset_y":520,"slots":{"0":"seed","1":1}},"name":"GraphNode3","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":400,"offset_y":140,"slots":{"0":0,"1":0,"2":0}},"name":"GraphNode12","type":"value_vector3"},{"data":{},"editor":{"offset_x":700,"offset_y":280,"slots":{}},"name":"GraphNode11","type":"offset_transform_constant"},{"data":{},"editor":{"offset_x":400,"offset_y":280,"slots":{"1":0,"3":false,"4":false}},"name":"GraphNode9","type":"extrude_curve_straight"},{"data":{},"editor":{"offset_x":-500,"offset_y":360,"slots":{"0":1,"1":1}},"name":"GraphNode4","type":"curve_generator_square"},{"data":{},"editor":{"offset_x":-980,"offset_y":380,"slots":{}},"name":"GraphNode6","type":"expose_box_info"},{"data":{},"editor":{"offset_x":-780,"offset_y":520,"slots":{"0":0,"1":1,"2":0}},"name":"GraphNode7","type":"value_vector3"},{"data":{},"editor":{"offset_x":-500,"offset_y":640,"slots":{"0":"steps","1":4}},"name":"GraphNode2","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":140,"offset_y":520,"slots":{}},"name":"GraphNode10","type":"curve_tesselate_exact"},{"data":{},"editor":{"offset_x":-200,"offset_y":520,"slots":{"1":0,"2":3,"3":4,"4":50,"6":0.5}},"name":"GraphNode14","type":"curve_midpoint_displacement"},{"data":{},"editor":{"offset_x":1020,"offset_y":380,"slots":{"2":false}},"name":"GraphNode16","type":"set_material_to_node"},{"data":{},"editor":{"offset_x":80,"offset_y":140,"slots":{"0":4,"1":0,"2":-2}},"name":"GraphNode13","type":"math_scalar_2"},{"data":{},"editor":{"offset_x":-500,"offset_y":760,"slots":{"0":"displacement","1":4}},"name":"GraphNode15","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":-780,"offset_y":740,"slots":{"0":0,"1":0,"2":1}},"name":"GraphNode17","type":"value_vector3"},{"data":{},"editor":{"offset_x":1300,"offset_y":380,"slots":{}},"name":"GraphNode","type":"final_output"},{"data":{},"editor":{"offset_x":700,"offset_y":480,"slots":{"0":"floor mat"}},"name":"GraphNode18","type":"inspector_spatial_material"}]} +{"connections":[{"from":"GraphNode5","from_port":0,"to":"GraphNode6","to_port":0},{"from":"GraphNode6","from_port":1,"to":"GraphNode4","to_port":2},{"from":"GraphNode6","from_port":0,"to":"GraphNode8","to_port":0},{"from":"GraphNode8","from_port":0,"to":"GraphNode4","to_port":0},{"from":"GraphNode8","from_port":2,"to":"GraphNode4","to_port":1},{"from":"GraphNode7","from_port":0,"to":"GraphNode4","to_port":3},{"from":"GraphNode10","from_port":0,"to":"GraphNode9","to_port":0},{"from":"GraphNode8","from_port":1,"to":"GraphNode9","to_port":1},{"from":"GraphNode12","from_port":0,"to":"GraphNode11","to_port":1},{"from":"GraphNode4","from_port":0,"to":"GraphNode14","to_port":0},{"from":"GraphNode3","from_port":0,"to":"GraphNode14","to_port":1},{"from":"GraphNode2","from_port":0,"to":"GraphNode14","to_port":2},{"from":"GraphNode15","from_port":0,"to":"GraphNode14","to_port":3},{"from":"GraphNode17","from_port":0,"to":"GraphNode14","to_port":5},{"from":"GraphNode14","from_port":0,"to":"GraphNode10","to_port":0},{"from":"GraphNode9","from_port":0,"to":"GraphNode11","to_port":0},{"from":"GraphNode18","from_port":0,"to":"GraphNode16","to_port":1},{"from":"GraphNode11","from_port":0,"to":"GraphNode16","to_port":0},{"from":"GraphNode16","from_port":0,"to":"GraphNode","to_port":0},{"from":"GraphNode13","from_port":0,"to":"GraphNode12","to_port":1},{"from":"GraphNode8","from_port":1,"to":"GraphNode13","to_port":1}],"nodes":[{"data":{},"editor":{"offset_x":-780,"offset_y":280,"slots":{}},"name":"GraphNode8","type":"break_vector"},{"data":{},"editor":{"offset_x":-1160,"offset_y":380,"slots":{"0":"Box"}},"name":"GraphNode5","type":"input_box"},{"data":{},"editor":{"offset_x":-500,"offset_y":520,"slots":{"0":"seed","1":1}},"name":"GraphNode3","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":400,"offset_y":140,"slots":{"0":0,"1":0,"2":0}},"name":"GraphNode12","type":"value_vector3"},{"data":{},"editor":{"offset_x":700,"offset_y":280,"slots":{"2":false,"3":false}},"name":"GraphNode11","type":"offset_transform_constant"},{"data":{},"editor":{"offset_x":400,"offset_y":280,"slots":{"1":0,"3":false,"4":false}},"name":"GraphNode9","type":"extrude_curve_straight"},{"data":{},"editor":{"offset_x":-500,"offset_y":360,"slots":{"0":1,"1":1}},"name":"GraphNode4","type":"curve_generator_square"},{"data":{},"editor":{"offset_x":-980,"offset_y":380,"slots":{}},"name":"GraphNode6","type":"expose_box_info"},{"data":{},"editor":{"offset_x":-780,"offset_y":520,"slots":{"0":0,"1":1,"2":0}},"name":"GraphNode7","type":"value_vector3"},{"data":{},"editor":{"offset_x":-500,"offset_y":640,"slots":{"0":"steps","1":4}},"name":"GraphNode2","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":140,"offset_y":520,"slots":{}},"name":"GraphNode10","type":"curve_tesselate_exact"},{"data":{},"editor":{"offset_x":-200,"offset_y":520,"slots":{"1":0,"2":3,"3":4,"4":50,"6":0.5}},"name":"GraphNode14","type":"curve_midpoint_displacement"},{"data":{},"editor":{"offset_x":1020,"offset_y":380,"slots":{"2":false}},"name":"GraphNode16","type":"set_material_to_node"},{"data":{},"editor":{"offset_x":80,"offset_y":140,"slots":{"0":4,"1":0,"2":-2}},"name":"GraphNode13","type":"math_scalar_2"},{"data":{},"editor":{"offset_x":-500,"offset_y":760,"slots":{"0":"displacement","1":4}},"name":"GraphNode15","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":-780,"offset_y":740,"slots":{"0":0,"1":0,"2":1}},"name":"GraphNode17","type":"value_vector3"},{"data":{},"editor":{"offset_x":1300,"offset_y":380,"slots":{}},"name":"GraphNode","type":"final_output"},{"data":{},"editor":{"offset_x":700,"offset_y":480,"slots":{"0":"floor mat"}},"name":"GraphNode18","type":"inspector_spatial_material"}]} diff --git a/examples/templates/ground_with_grass_1.cgraph b/examples/templates/ground_with_grass_1.cgraph index 1fcd8370..db79c332 100644 --- a/examples/templates/ground_with_grass_1.cgraph +++ b/examples/templates/ground_with_grass_1.cgraph @@ -1 +1 @@ -{"connections":[{"from":"GraphNode5","from_port":1,"to":"GraphNode3","to_port":1},{"from":"GraphNode4","from_port":0,"to":"GraphNode5","to_port":0},{"from":"GraphNode6","from_port":0,"to":"GraphNode7","to_port":0},{"from":"GraphNode2","from_port":0,"to":"GraphNode8","to_port":1},{"from":"GraphNode13","from_port":0,"to":"GraphNode12","to_port":1},{"from":"GraphNode14","from_port":0,"to":"GraphNode13","to_port":0},{"from":"GraphNode14","from_port":0,"to":"GraphNode13","to_port":2},{"from":"GraphNode15","from_port":0,"to":"GraphNode11","to_port":1},{"from":"GraphNode17","from_port":0,"to":"GraphNode16","to_port":1},{"from":"GraphNode18","from_port":0,"to":"GraphNode16","to_port":2},{"from":"GraphNode7","from_port":0,"to":"GraphNode","to_port":0},{"from":"GraphNode23","from_port":0,"to":"GraphNode2","to_port":0},{"from":"GraphNode22","from_port":0,"to":"GraphNode3","to_port":0},{"from":"GraphNode5","from_port":0,"to":"GraphNode24","to_port":0},{"from":"GraphNode24","from_port":0,"to":"GraphNode22","to_port":0},{"from":"GraphNode24","from_port":2,"to":"GraphNode22","to_port":2},{"from":"GraphNode25","from_port":0,"to":"GraphNode11","to_port":2},{"from":"GraphNode26","from_port":0,"to":"GraphNode17","to_port":0},{"from":"GraphNode3","from_port":0,"to":"GraphNode12","to_port":0},{"from":"GraphNode12","from_port":0,"to":"GraphNode8","to_port":0},{"from":"GraphNode8","from_port":0,"to":"GraphNode11","to_port":0},{"from":"GraphNode16","from_port":0,"to":"GraphNode7","to_port":1},{"from":"GraphNode11","from_port":0,"to":"GraphNode16","to_port":0},{"from":"GraphNode20","from_port":0,"to":"GraphNode18","to_port":0},{"from":"GraphNode20","from_port":0,"to":"GraphNode18","to_port":1},{"from":"GraphNode20","from_port":0,"to":"GraphNode18","to_port":2}],"nodes":[{"data":{},"editor":{"offset_x":1580,"offset_y":-200,"slots":{}},"name":"GraphNode","type":"final_output"},{"data":{},"editor":{"offset_x":200,"offset_y":-200,"slots":{"2":0,"3":true}},"name":"GraphNode12","type":"offset_transforms_random"},{"data":{},"editor":{"offset_x":-100,"offset_y":-340,"slots":{"0":0.5,"1":0,"2":1}},"name":"GraphNode13","type":"value_vector3"},{"data":{},"editor":{"offset_x":460,"offset_y":-200,"slots":{"2":0,"3":false,"4":false}},"name":"GraphNode8","type":"exclude_points_from_noise"},{"data":{},"editor":{"offset_x":-320,"offset_y":-320,"slots":{"0":0.487}},"name":"GraphNode14","type":"value_scalar"},{"data":{},"editor":{"offset_x":480,"offset_y":20,"slots":{"0":0,"1":360,"2":0}},"name":"GraphNode15","type":"value_vector3"},{"data":{},"editor":{"offset_x":760,"offset_y":-200,"slots":{"2":0,"3":true}},"name":"GraphNode11","type":"rotate_transforms_random"},{"data":{},"editor":{"offset_x":760,"offset_y":0,"slots":{"0":8,"1":3,"2":8,"3":1,"4":2}},"name":"GraphNode17","type":"simplex_noise"},{"data":{},"editor":{"offset_x":-400,"offset_y":-200,"slots":{"2":2.75,"3":false,"5":false}},"name":"GraphNode3","type":"create_point_grid"},{"data":{},"editor":{"offset_x":-660,"offset_y":-280,"slots":{"0":0,"1":0,"2":0}},"name":"GraphNode22","type":"value_vector3"},{"data":{},"editor":{"offset_x":460,"offset_y":-320,"slots":{"0":"seed","1":1}},"name":"GraphNode25","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":1320,"offset_y":-200,"slots":{}},"name":"GraphNode7","type":"make_multimesh"},{"data":{},"editor":{"offset_x":-1240,"offset_y":-200,"slots":{"0":"Box"}},"name":"GraphNode4","type":"input_box"},{"data":{},"editor":{"offset_x":-860,"offset_y":-280,"slots":{}},"name":"GraphNode24","type":"break_vector"},{"data":{},"editor":{"offset_x":-1040,"offset_y":-200,"slots":{}},"name":"GraphNode5","type":"expose_box_info"},{"data":{},"editor":{"offset_x":160,"offset_y":-20,"slots":{"0":117,"1":4,"2":24,"3":1,"4":2}},"name":"GraphNode2","type":"simplex_noise"},{"data":{},"editor":{"offset_x":260,"offset_y":260,"slots":{"0":"seed","1":1}},"name":"GraphNode26","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":-100,"offset_y":-20,"slots":{"0":"seed","1":1}},"name":"GraphNode23","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":1060,"offset_y":-200,"slots":{"0":"Grass","1":false}},"name":"GraphNode6","type":"input_generic"},{"data":{},"editor":{"offset_x":1060,"offset_y":0,"slots":{}},"name":"GraphNode16","type":"scale_transforms_from_noise"},{"data":{},"editor":{"offset_x":760,"offset_y":240,"slots":{"0":0,"1":0,"2":0}},"name":"GraphNode18","type":"value_vector3"},{"data":{},"editor":{"offset_x":540,"offset_y":260,"slots":{"0":3}},"name":"GraphNode20","type":"value_scalar"}]} +{"connections":[{"from":"GraphNode5","from_port":1,"to":"GraphNode3","to_port":1},{"from":"GraphNode4","from_port":0,"to":"GraphNode5","to_port":0},{"from":"GraphNode6","from_port":0,"to":"GraphNode7","to_port":0},{"from":"GraphNode2","from_port":0,"to":"GraphNode8","to_port":1},{"from":"GraphNode13","from_port":0,"to":"GraphNode12","to_port":1},{"from":"GraphNode14","from_port":0,"to":"GraphNode13","to_port":0},{"from":"GraphNode14","from_port":0,"to":"GraphNode13","to_port":2},{"from":"GraphNode15","from_port":0,"to":"GraphNode11","to_port":1},{"from":"GraphNode17","from_port":0,"to":"GraphNode16","to_port":1},{"from":"GraphNode18","from_port":0,"to":"GraphNode16","to_port":2},{"from":"GraphNode7","from_port":0,"to":"GraphNode","to_port":0},{"from":"GraphNode23","from_port":0,"to":"GraphNode2","to_port":0},{"from":"GraphNode22","from_port":0,"to":"GraphNode3","to_port":0},{"from":"GraphNode5","from_port":0,"to":"GraphNode24","to_port":0},{"from":"GraphNode24","from_port":0,"to":"GraphNode22","to_port":0},{"from":"GraphNode24","from_port":2,"to":"GraphNode22","to_port":2},{"from":"GraphNode25","from_port":0,"to":"GraphNode11","to_port":2},{"from":"GraphNode26","from_port":0,"to":"GraphNode17","to_port":0},{"from":"GraphNode3","from_port":0,"to":"GraphNode12","to_port":0},{"from":"GraphNode12","from_port":0,"to":"GraphNode8","to_port":0},{"from":"GraphNode8","from_port":0,"to":"GraphNode11","to_port":0},{"from":"GraphNode16","from_port":0,"to":"GraphNode7","to_port":1},{"from":"GraphNode20","from_port":0,"to":"GraphNode18","to_port":0},{"from":"GraphNode20","from_port":0,"to":"GraphNode18","to_port":1},{"from":"GraphNode20","from_port":0,"to":"GraphNode18","to_port":2},{"from":"GraphNode11","from_port":0,"to":"GraphNode16","to_port":0}],"nodes":[{"data":{},"editor":{"offset_x":1580,"offset_y":-200,"slots":{}},"name":"GraphNode","type":"final_output"},{"data":{},"editor":{"offset_x":200,"offset_y":-200,"slots":{"2":0,"3":true}},"name":"GraphNode12","type":"offset_transforms_random"},{"data":{},"editor":{"offset_x":-100,"offset_y":-340,"slots":{"0":0.5,"1":0,"2":1}},"name":"GraphNode13","type":"value_vector3"},{"data":{},"editor":{"offset_x":460,"offset_y":-200,"slots":{"2":0,"3":false,"4":false}},"name":"GraphNode8","type":"exclude_points_from_noise"},{"data":{},"editor":{"offset_x":-320,"offset_y":-320,"slots":{"0":0.487}},"name":"GraphNode14","type":"value_scalar"},{"data":{},"editor":{"offset_x":480,"offset_y":20,"slots":{"0":0,"1":360,"2":0}},"name":"GraphNode15","type":"value_vector3"},{"data":{},"editor":{"offset_x":760,"offset_y":-200,"slots":{"2":0,"3":true}},"name":"GraphNode11","type":"rotate_transforms_random"},{"data":{},"editor":{"offset_x":760,"offset_y":0,"slots":{"0":8,"1":3,"2":8,"3":1,"4":2}},"name":"GraphNode17","type":"simplex_noise"},{"data":{},"editor":{"offset_x":-400,"offset_y":-200,"slots":{"2":2.75,"3":false,"5":false}},"name":"GraphNode3","type":"create_point_grid"},{"data":{},"editor":{"offset_x":-660,"offset_y":-280,"slots":{"0":0,"1":0,"2":0}},"name":"GraphNode22","type":"value_vector3"},{"data":{},"editor":{"offset_x":460,"offset_y":-320,"slots":{"0":"seed","1":1}},"name":"GraphNode25","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":1320,"offset_y":-200,"slots":{}},"name":"GraphNode7","type":"make_multimesh"},{"data":{},"editor":{"offset_x":-1240,"offset_y":-200,"slots":{"0":"Box"}},"name":"GraphNode4","type":"input_box"},{"data":{},"editor":{"offset_x":-860,"offset_y":-280,"slots":{}},"name":"GraphNode24","type":"break_vector"},{"data":{},"editor":{"offset_x":-1040,"offset_y":-200,"slots":{}},"name":"GraphNode5","type":"expose_box_info"},{"data":{},"editor":{"offset_x":160,"offset_y":-20,"slots":{"0":117,"1":4,"2":24,"3":1,"4":2}},"name":"GraphNode2","type":"simplex_noise"},{"data":{},"editor":{"offset_x":260,"offset_y":260,"slots":{"0":"seed","1":1}},"name":"GraphNode26","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":-100,"offset_y":-20,"slots":{"0":"seed","1":1}},"name":"GraphNode23","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":1060,"offset_y":-200,"slots":{"0":"Grass","1":false}},"name":"GraphNode6","type":"input_generic"},{"data":{},"editor":{"offset_x":1060,"offset_y":0,"slots":{}},"name":"GraphNode16","type":"scale_transforms_from_noise"},{"data":{},"editor":{"offset_x":760,"offset_y":240,"slots":{"0":0,"1":0,"2":0}},"name":"GraphNode18","type":"value_vector3"},{"data":{},"editor":{"offset_x":540,"offset_y":260,"slots":{"0":3}},"name":"GraphNode20","type":"value_scalar"}]} diff --git a/examples/templates/tents.cgraph b/examples/templates/tents.cgraph index 1d265a89..50ac8a11 100644 --- a/examples/templates/tents.cgraph +++ b/examples/templates/tents.cgraph @@ -1 +1 @@ -{"connections":[{"from":"GraphNode2","from_port":0,"to":"GraphNode","to_port":0},{"from":"GraphNode4","from_port":0,"to":"GraphNode5","to_port":0},{"from":"GraphNode6","from_port":0,"to":"GraphNode2","to_port":0},{"from":"GraphNode5","from_port":0,"to":"GraphNode3","to_port":0},{"from":"GraphNode5","from_port":1,"to":"GraphNode3","to_port":1},{"from":"GraphNode3","from_port":0,"to":"GraphNode7","to_port":0},{"from":"GraphNode8","from_port":0,"to":"GraphNode7","to_port":1},{"from":"GraphNode7","from_port":0,"to":"GraphNode9","to_port":0},{"from":"GraphNode10","from_port":0,"to":"GraphNode9","to_port":1},{"from":"GraphNode9","from_port":0,"to":"GraphNode2","to_port":1},{"from":"GraphNode11","from_port":0,"to":"GraphNode7","to_port":2},{"from":"GraphNode11","from_port":0,"to":"GraphNode9","to_port":2},{"from":"GraphNode11","from_port":0,"to":"GraphNode2","to_port":2},{"from":"GraphNode4","from_port":0,"to":"GraphNode3","to_port":4}],"nodes":[{"data":{},"editor":{"offset_x":860,"offset_y":0,"slots":{}},"name":"GraphNode","type":"final_output"},{"data":{},"editor":{"offset_x":-460,"offset_y":0,"slots":{}},"name":"GraphNode5","type":"expose_box_info"},{"data":{},"editor":{"offset_x":-260,"offset_y":0,"slots":{"2":0.668,"3":false,"5":true}},"name":"GraphNode3","type":"create_point_grid"},{"data":{},"editor":{"offset_x":20,"offset_y":0,"slots":{"2":0}},"name":"GraphNode7","type":"offset_transforms_random"},{"data":{},"editor":{"offset_x":280,"offset_y":0,"slots":{"2":0,"3":true}},"name":"GraphNode9","type":"rotate_transforms_random"},{"data":{},"editor":{"offset_x":20,"offset_y":180,"slots":{"0":0,"1":20,"2":0}},"name":"GraphNode10","type":"value_vector3"},{"data":{},"editor":{"offset_x":560,"offset_y":0,"slots":{"2":0}},"name":"GraphNode2","type":"duplicate_nodes_random"},{"data":{},"editor":{"offset_x":-260,"offset_y":-140,"slots":{"0":"seed","1":1}},"name":"GraphNode11","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":280,"offset_y":-140,"slots":{"0":"Tents","1":true}},"name":"GraphNode6","type":"input_generic"},{"data":{},"editor":{"offset_x":-660,"offset_y":100,"slots":{"0":"Box"}},"name":"GraphNode4","type":"input_box"},{"data":{},"editor":{"offset_x":-260,"offset_y":220,"slots":{"0":0.25,"1":0,"2":0.25}},"name":"GraphNode8","type":"value_vector3"}]} +{"connections":[{"from":"GraphNode2","from_port":0,"to":"GraphNode","to_port":0},{"from":"GraphNode4","from_port":0,"to":"GraphNode5","to_port":0},{"from":"GraphNode6","from_port":0,"to":"GraphNode2","to_port":0},{"from":"GraphNode5","from_port":0,"to":"GraphNode3","to_port":0},{"from":"GraphNode5","from_port":1,"to":"GraphNode3","to_port":1},{"from":"GraphNode3","from_port":0,"to":"GraphNode7","to_port":0},{"from":"GraphNode8","from_port":0,"to":"GraphNode7","to_port":1},{"from":"GraphNode7","from_port":0,"to":"GraphNode9","to_port":0},{"from":"GraphNode10","from_port":0,"to":"GraphNode9","to_port":1},{"from":"GraphNode9","from_port":0,"to":"GraphNode2","to_port":1},{"from":"GraphNode11","from_port":0,"to":"GraphNode7","to_port":2},{"from":"GraphNode11","from_port":0,"to":"GraphNode9","to_port":2},{"from":"GraphNode11","from_port":0,"to":"GraphNode2","to_port":2},{"from":"GraphNode4","from_port":0,"to":"GraphNode3","to_port":4}],"nodes":[{"data":{},"editor":{"offset_x":860,"offset_y":0,"slots":{}},"name":"GraphNode","type":"final_output"},{"data":{},"editor":{"offset_x":-460,"offset_y":0,"slots":{}},"name":"GraphNode5","type":"expose_box_info"},{"data":{},"editor":{"offset_x":-260,"offset_y":0,"slots":{"2":0.668,"3":false,"5":true}},"name":"GraphNode3","type":"create_point_grid"},{"data":{},"editor":{"offset_x":20,"offset_y":0,"slots":{"2":0,"3":true}},"name":"GraphNode7","type":"offset_transforms_random"},{"data":{},"editor":{"offset_x":280,"offset_y":0,"slots":{"2":0,"3":true}},"name":"GraphNode9","type":"rotate_transforms_random"},{"data":{},"editor":{"offset_x":20,"offset_y":180,"slots":{"0":0,"1":20,"2":0}},"name":"GraphNode10","type":"value_vector3"},{"data":{},"editor":{"offset_x":560,"offset_y":0,"slots":{"2":0}},"name":"GraphNode2","type":"duplicate_nodes_random"},{"data":{},"editor":{"offset_x":-260,"offset_y":-140,"slots":{"0":"seed","1":1}},"name":"GraphNode11","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":280,"offset_y":-140,"slots":{"0":"Tents","1":true}},"name":"GraphNode6","type":"input_generic"},{"data":{},"editor":{"offset_x":-660,"offset_y":100,"slots":{"0":"Box"}},"name":"GraphNode4","type":"input_box"},{"data":{},"editor":{"offset_x":-260,"offset_y":220,"slots":{"0":0.25,"1":0,"2":0.25}},"name":"GraphNode8","type":"value_vector3"}]} diff --git a/src/editor/gui/add_node_panel.gd b/src/editor/gui/add_node_panel.gd index d8ef7abc..b083b6f3 100644 --- a/src/editor/gui/add_node_panel.gd +++ b/src/editor/gui/add_node_panel.gd @@ -46,12 +46,12 @@ func _refresh_concept_nodes_list(nodes := [], folder_collapsed := true) -> void: if nodes.empty(): nodes = _node_library.get_list().values() - + if !_search_text: folder_collapsed = true else: folder_collapsed = false - + for node in nodes: if _filter_node(node): var item_parent = _get_or_create_category(node.category, folder_collapsed) diff --git a/src/editor/gui/add_node_panel.tscn b/src/editor/gui/add_node_panel.tscn index a404e6b9..315c0e41 100644 --- a/src/editor/gui/add_node_panel.tscn +++ b/src/editor/gui/add_node_panel.tscn @@ -3,6 +3,7 @@ [ext_resource path="res://addons/concept_graph/src/editor/gui/add_node_panel.gd" type="Script" id=1] [node name="AddNodeDialog" type="WindowDialog"] +visible = true margin_right = 417.0 margin_bottom = 277.0 rect_min_size = Vector2( 512, 400 ) @@ -42,7 +43,7 @@ __meta__ = { margin_right = 484.0 margin_bottom = 24.0 size_flags_horizontal = 3 -placeholder_text = "Search node (press enter)" +placeholder_text = "Search node" caret_blink = true [node name="NodeTree" type="Tree" parent="MarginContainer/VBoxContainer"] diff --git a/src/editor/gui/editor_view.gd b/src/editor/gui/editor_view.gd index 17e2356a..23c3f110 100644 --- a/src/editor/gui/editor_view.gd +++ b/src/editor/gui/editor_view.gd @@ -50,6 +50,7 @@ func enable_template_editor_for(node: ConceptGraph) -> void: _current_template = weakref(node._template) node.connect("template_path_changed", self, "_on_load_template") + node.connect("tree_exited", self, "clear_template_editor") node._template.connect("graph_changed", self, "_on_graph_changed") node._template.connect("popup_request", self, "_show_node_dialog") node._template.undo_redo = undo_redo @@ -92,6 +93,7 @@ func clear_template_editor() -> void: template.disconnect("graph_changed", self, "_on_graph_changed") template.disconnect("popup_request", self, "_show_node_dialog") graph.disconnect("template_path_changed", self, "_on_load_template") + graph.disconnect("tree_exited", self, "clear_template_editor") _template_parent.remove_child(template) graph.add_child(template)