ported to Godot 5 and fixed collisions on tooling script

Movement tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.4.1">
+<Project Sdk="Godot.NET.Sdk/4.5.0">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>

assets/greyboxing/city.blend.import

@@ -15,9 +15,11 @@ dest_files=["res://.godot/imported/city.blend-135341795722816c412126e50c6067d4.s
 
 nodes/root_type=""
 nodes/root_name=""
+nodes/root_script=null
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
 nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
@@ -32,6 +34,9 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/import_rest_as_RESET=false
 import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
 _subresources={}
 blender/nodes/visible=0
 blender/nodes/active_collection_only=false
@@ -51,3 +56,4 @@ blender/materials/export_materials=1
 blender/animation/limit_playback=true
 blender/animation/always_sample=true
 blender/animation/group_tracks=true
+gltf/naming_version=2

maps/city.tscn

@@ -32,7 +32,7 @@ ssil_enabled = true
 [node name="Main" type="Node3D"]
 
 [node name="Player" parent="." instance=ExtResource("1_2vsi6")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7981, 116.718, 0.300598)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.0247686, 107.458466, -0.69836044)
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_1bvp3")

project.godot

@@ -16,7 +16,7 @@ warnings/check_invalid_track_paths=false
 
 config/name="Movement tests"
 run/main_scene="uid://pk8ypa04qy6x"
-config/features=PackedStringArray("4.4", "C#", "Forward Plus")
+config/features=PackedStringArray("4.5", "C#", "Forward Plus")
 config/icon="res://icon.svg"
 
 [autoload]

systems/inputs/base_mode/base_mode.tres

@@ -32,9 +32,6 @@
 
 [sub_resource type="Resource" id="Resource_vkvga"]
 script = ExtResource("4_1rw8g")
-x = 0
-y = 1
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_kb1id"]
 script = ExtResource("6_li5ak")
@@ -43,17 +40,11 @@ order = 2
 [sub_resource type="Resource" id="Resource_rwam6"]
 script = ExtResource("7_si4d4")
 lower_threshold = 0.1
-upper_threshold = 1.0
 
 [sub_resource type="Resource" id="Resource_1igva"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_vkvga")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_kb1id"), SubResource("Resource_rwam6")])
-triggers = Array[ExtResource("8_2tfaw")]([])
 
 [sub_resource type="Resource" id="Resource_88x08"]
 script = ExtResource("1_qmhk6")
@@ -64,33 +55,21 @@ metadata/_guide_input_mappings_collapsed = true
 [sub_resource type="Resource" id="Resource_05q5j"]
 script = ExtResource("10_cvxqo")
 axis = 2
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_tn8ci"]
 script = ExtResource("7_si4d4")
-lower_threshold = 0.2
-upper_threshold = 1.0
 
 [sub_resource type="Resource" id="Resource_1koh7"]
 script = ExtResource("11_j3axn")
 scale = Vector3(0.3, 0.3, 0.3)
-apply_delta_time = false
 
 [sub_resource type="Resource" id="Resource_eep0a"]
 script = ExtResource("12_kxb2c")
-x = true
-y = true
-z = true
 
 [sub_resource type="Resource" id="Resource_dew8i"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_05q5j")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_tn8ci"), SubResource("Resource_1koh7"), SubResource("Resource_eep0a")])
-triggers = Array[ExtResource("8_2tfaw")]([])
 
 [sub_resource type="Resource" id="Resource_tgr2g"]
 script = ExtResource("1_qmhk6")
@@ -101,33 +80,21 @@ metadata/_guide_input_mappings_collapsed = true
 [sub_resource type="Resource" id="Resource_pf0ii"]
 script = ExtResource("10_cvxqo")
 axis = 3
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_nh7x4"]
 script = ExtResource("7_si4d4")
-lower_threshold = 0.2
-upper_threshold = 1.0
 
 [sub_resource type="Resource" id="Resource_04n84"]
 script = ExtResource("11_j3axn")
 scale = Vector3(0.1, 0.1, 0.1)
-apply_delta_time = false
 
 [sub_resource type="Resource" id="Resource_m3aj7"]
 script = ExtResource("12_kxb2c")
-x = true
-y = true
-z = true
 
 [sub_resource type="Resource" id="Resource_qu2wi"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_pf0ii")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_nh7x4"), SubResource("Resource_04n84"), SubResource("Resource_m3aj7")])
-triggers = Array[ExtResource("8_2tfaw")]([])
 
 [sub_resource type="Resource" id="Resource_iarn8"]
 script = ExtResource("1_qmhk6")
@@ -138,20 +105,13 @@ metadata/_guide_input_mappings_collapsed = true
 [sub_resource type="Resource" id="Resource_si4d4"]
 script = ExtResource("10_cvxqo")
 axis = 4
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_2tfaw"]
 script = ExtResource("15_g6bbx")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_q86qg"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_si4d4")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_2tfaw")])
 
 [sub_resource type="Resource" id="Resource_cvxqo"]
@@ -163,20 +123,13 @@ metadata/_guide_input_mappings_collapsed = false
 [sub_resource type="Resource" id="Resource_llfhp"]
 script = ExtResource("10_cvxqo")
 axis = 4
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_ib0yi"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_r6kml"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_llfhp")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_ib0yi")])
 
 [sub_resource type="Resource" id="Resource_tb8ii"]
@@ -187,20 +140,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_r6kml")])
 [sub_resource type="Resource" id="Resource_cqc4k"]
 script = ExtResource("10_cvxqo")
 axis = 4
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_vanwy"]
 script = ExtResource("17_s8kjn")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_bkx7d"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_cqc4k")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_vanwy")])
 
 [sub_resource type="Resource" id="Resource_iihs4"]
@@ -212,20 +158,13 @@ metadata/_guide_input_mappings_collapsed = false
 [sub_resource type="Resource" id="Resource_fykw6"]
 script = ExtResource("10_cvxqo")
 axis = 5
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_rvpjj"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_s8kjn"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_fykw6")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_rvpjj")])
 metadata/_guide_triggers_collapsed = false
 
@@ -237,20 +176,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_s8kjn")])
 [sub_resource type="Resource" id="Resource_qkgmj"]
 script = ExtResource("10_cvxqo")
 axis = 5
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_st2ej"]
 script = ExtResource("17_s8kjn")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_818lq"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_qkgmj")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_st2ej")])
 
 [sub_resource type="Resource" id="Resource_2hs2y"]
@@ -261,20 +193,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_818lq")])
 [sub_resource type="Resource" id="Resource_lfx76"]
 script = ExtResource("19_qkgmj")
 button = 2
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_oruo7"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_4ee3d"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_lfx76")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_oruo7")])
 
 [sub_resource type="Resource" id="Resource_0s4kt"]
@@ -284,21 +209,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_4ee3d")])
 
 [sub_resource type="Resource" id="Resource_1fkas"]
 script = ExtResource("19_qkgmj")
-button = 0
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_6pxii"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_jy4f1"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_1fkas")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_6pxii")])
 metadata/_guide_triggers_collapsed = false
 
@@ -309,18 +226,10 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_jy4f1")])
 
 [sub_resource type="Resource" id="Resource_oapce"]
 script = ExtResource("19_qkgmj")
-button = 0
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_8w5gu"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_oapce")
-modifiers = Array[ExtResource("5_0qat1")]([])
-triggers = Array[ExtResource("8_2tfaw")]([])
 metadata/_guide_triggers_collapsed = false
 
 [sub_resource type="Resource" id="Resource_xt1x5"]
@@ -331,20 +240,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_8w5gu")])
 [sub_resource type="Resource" id="Resource_li5ak"]
 script = ExtResource("19_qkgmj")
 button = 10
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_paxxe"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_500v3"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_li5ak")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_paxxe")])
 
 [sub_resource type="Resource" id="Resource_ew1hw"]
@@ -355,20 +257,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_500v3")])
 [sub_resource type="Resource" id="Resource_g6bbx"]
 script = ExtResource("19_qkgmj")
 button = 1
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_yp12v"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_1rw8g"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_g6bbx")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_yp12v")])
 
 [sub_resource type="Resource" id="Resource_0qat1"]
@@ -380,20 +275,13 @@ metadata/_guide_input_mappings_collapsed = false
 [sub_resource type="Resource" id="Resource_j3axn"]
 script = ExtResource("19_qkgmj")
 button = 3
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_kxb2c"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_v2ywt"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_j3axn")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_kxb2c")])
 
 [sub_resource type="Resource" id="Resource_vtk18"]
@@ -403,6 +291,5 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_v2ywt")])
 
 [resource]
 script = ExtResource("23_llfhp")
-display_name = ""
 mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_cvxqo"), SubResource("Resource_tb8ii"), SubResource("Resource_iihs4"), SubResource("Resource_vibkn"), SubResource("Resource_2hs2y"), SubResource("Resource_0s4kt"), SubResource("Resource_d2r0d"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1"), SubResource("Resource_vtk18")])
 metadata/_custom_type_script = "uid://dsa1dnifd6w32"

tools/generate_collisions.gd

@@ -1,9 +1,12 @@
 @tool
 extends Node3D
 
-@export_tool_button("Clear collisions", "Callable") var clear_col_action = clear_collisions
 @export_tool_button("Generate collisions", "Callable") var generate_col_action = generate_collisions
 
+@export_group("Layers and masks")
+@export_flags_3d_physics var collision_layer
+@export_flags_3d_physics var collision_mask
+
 func get_all_children_of_type(node, type) -> Array:
 	var nodes : Array = []
 	for child in node.get_children():
@@ -22,11 +25,16 @@ func generate_collisions_on_meshes(meshes: Array):
 	for mesh_instance: MeshInstance3D in meshes:
 		mesh_instance.create_trimesh_collision()
 		
+func set_collision_mask_on_bodies(bodies: Array):
+	for staticbody: StaticBody3D in bodies:
+		staticbody.collision_layer = collision_layer
+		staticbody.collision_mask = collision_mask
+
 func generate_collisions():
 	var mesh_instances = get_all_children_of_type(self, MeshInstance3D)
 	clear_collisions_on_meshes(mesh_instances)
 	generate_collisions_on_meshes(mesh_instances)
 	
-func clear_collisions():
+	var staticbody_instances = get_all_children_of_type(self, StaticBody3D)
-	var mesh_instances = get_all_children_of_type(self, MeshInstance3D)
+	set_collision_mask_on_bodies(staticbody_instances)
-	clear_collisions_on_meshes(mesh_instances)
+