fix: remove old collision shape for the start line mesh (#36)

* fix: reimport scenes * fix: remove old collision shape for the start line mesh * chore: add changelog entry
MechanicalFlower · Dec 30, 2023 · 6f2c477 · 6f2c477
1 parent a05a637
commit 6f2c477
Show file tree

Hide file tree

Showing 19 changed files with 198 additions and 168 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Fixed
 - Correct loading of sound effects for the menu ([#27](https://github.com/MechanicalFlower/Marble/pull/27))
 - Include `override.cfg` in each export presets ([#28](https://github.com/MechanicalFlower/Marble/pull/28))
+- Remove the old collision shape use for the start line mesh ([#36](https://github.com/MechanicalFlower/Marble/pull/36))
 ### Security
 ### Dependencies
 - Bump `actions/upload-artifact` from 3 to 4 ([#32](https://github.com/MechanicalFlower/Marble/pull/32))

diff --git a/scenes/blocks/bumper.tscn b/scenes/blocks/bumper.tscn
@@ -112,11 +112,9 @@ stream = ExtResource("5_wrpvs")
 
 [node name="ForwardDown" parent="." instance=ExtResource("5")]
 transform = Transform3D(-0.999273, 0, 0.0381262, 0, 1, 0, -0.0381262, 0, -0.999273, 0, 2.5, 4)
-collision_mask = 0
 
 [node name="Hopper2" parent="." instance=ExtResource("6")]
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, -2, -7)
-collision_mask = 0
 
 [node name="Positions" type="Node3D" parent="."]
 

diff --git a/scenes/blocks/forward_down.tscn b/scenes/blocks/forward_down.tscn
@@ -11,6 +11,7 @@ data = PackedVector3Array(-0.7391, -0.3061, -1, -0.9239, -0.3827, -1, -0.6652, -
 [sub_resource type="BoxShape3D" id="2"]
 
 [node name="ForwardDown" type="StaticBody3D"]
+collision_mask = 0
 script = ExtResource("1")
 
 [node name="forward_down" type="MeshInstance3D" parent="."]
@@ -24,16 +25,16 @@ shape = SubResource("1")
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1)
 collision_layer = 2
-collision_mask = 0
+collision_mask = 4
 
 [node name="CollisionShape" type="CollisionShape3D" parent="BeginArea"]
 shape = SubResource("2")
 
 [node name="EndArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 3)
-collision_layer = 3
-collision_mask = 0
+collision_layer = 2
+collision_mask = 4
 script = ExtResource("4")
 
 [node name="CollisionShape" type="CollisionShape3D" parent="EndArea"]

diff --git a/scenes/blocks/forward_up.tscn b/scenes/blocks/forward_up.tscn
@@ -10,36 +10,37 @@ data = PackedVector3Array(-0.8315, -0.5556, -1, -0.7391, -0.3061, -1, -0.9239, -
 
 [sub_resource type="BoxShape3D" id="2"]
 
-[node name="ForwardUp" type="StaticBody"]
+[node name="ForwardUp" type="StaticBody3D"]
+collision_mask = 0
 script = ExtResource("1")
 
-[node name="Mesh" type="MeshInstance" parent="."]
+[node name="Mesh" type="MeshInstance3D" parent="."]
 material_override = ExtResource("2")
 mesh = ExtResource("3")
 
-[node name="CollisionShape" type="CollisionShape" parent="."]
+[node name="CollisionShape" type="CollisionShape3D" parent="."]
 shape = SubResource("3")
 
-[node name="BeginArea" type="Area" parent="."]
+[node name="BeginArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1)
 collision_layer = 2
-collision_mask = 0
+collision_mask = 4
 
-[node name="CollisionShape" type="CollisionShape" parent="BeginArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="BeginArea"]
 shape = SubResource("2")
 
-[node name="EndArea" type="Area" parent="."]
+[node name="EndArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 3)
-collision_layer = 3
-collision_mask = 0
+collision_layer = 2
+collision_mask = 4
 script = ExtResource("4")
 
-[node name="CollisionShape" type="CollisionShape" parent="EndArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="EndArea"]
 shape = SubResource("2")
 
-[node name="Positions" type="Spatial" parent="."]
+[node name="Positions" type="Node3D" parent="."]
 
-[node name="Position3D" type="Position3D" parent="Positions"]
+[node name="Position3D" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 1)
diff --git a/scenes/blocks/hopper.tscn b/scenes/blocks/hopper.tscn
@@ -11,46 +11,47 @@ data = PackedVector3Array(-4.8296, 1, 1.2941, -4.8712, 0.5255, 0, -5, 1, 0, -4.2
 
 [sub_resource type="BoxShape3D" id="2"]
 
-[node name="Hopper" type="StaticBody"]
+[node name="Hopper" type="StaticBody3D"]
+collision_mask = 0
 script = ExtResource("1")
 
-[node name="Mesh" type="MeshInstance" parent="."]
+[node name="Mesh" type="MeshInstance3D" parent="."]
 material_override = ExtResource("2")
 mesh = ExtResource("3")
 skeleton = NodePath("")
 
-[node name="CollisionShape" type="CollisionShape" parent="."]
+[node name="CollisionShape" type="CollisionShape3D" parent="."]
 shape = SubResource("3")
 
-[node name="BeginArea" type="Area" parent="."]
+[node name="BeginArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
 collision_layer = 2
-collision_mask = 0
+collision_mask = 4
 
-[node name="CollisionShape" type="CollisionShape" parent="BeginArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="BeginArea"]
 shape = SubResource("2")
 
-[node name="EndArea" type="Area" parent="."]
+[node name="EndArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3, 2)
-collision_layer = 3
-collision_mask = 0
+collision_layer = 2
+collision_mask = 4
 script = ExtResource("5")
 
-[node name="CollisionShape" type="CollisionShape" parent="EndArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="EndArea"]
 shape = SubResource("2")
 
 [node name="TubeVerticalToHorizontal" parent="." instance=ExtResource("4")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0)
 
-[node name="Positions" type="Spatial" parent="."]
+[node name="Positions" type="Node3D" parent="."]
 
-[node name="Position3D" type="Position3D" parent="Positions"]
+[node name="Position3D" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.88835, 2.19611)
 
-[node name="Position3D3" type="Position3D" parent="Positions"]
+[node name="Position3D3" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 7)
 
-[node name="Position3D2" type="Position3D" parent="Positions"]
+[node name="Position3D2" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.465407, 7)
diff --git a/scenes/blocks/hopper2.tscn b/scenes/blocks/hopper2.tscn
@@ -11,46 +11,47 @@ data = PackedVector3Array(-4.7052, 0.051, 1.2608, -4.9205, 0.6064, 0, -4.7528, 0
 
 [sub_resource type="BoxShape3D" id="2"]
 
-[node name="Hopper2" type="StaticBody"]
+[node name="Hopper2" type="StaticBody3D"]
+collision_mask = 0
 script = ExtResource("1")
 
-[node name="Mesh" type="MeshInstance" parent="."]
+[node name="Mesh" type="MeshInstance3D" parent="."]
 material_override = ExtResource("2")
 mesh = ExtResource("3")
 skeleton = NodePath("")
 
-[node name="CollisionShape" type="CollisionShape" parent="."]
+[node name="CollisionShape" type="CollisionShape3D" parent="."]
 shape = SubResource("3")
 
-[node name="BeginArea" type="Area" parent="."]
+[node name="BeginArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
 collision_layer = 2
-collision_mask = 0
+collision_mask = 4
 
-[node name="CollisionShape" type="CollisionShape" parent="BeginArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="BeginArea"]
 shape = SubResource("2")
 
-[node name="EndArea" type="Area" parent="."]
+[node name="EndArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 2)
-collision_layer = 3
-collision_mask = 0
+collision_layer = 2
+collision_mask = 4
 script = ExtResource("5")
 
-[node name="CollisionShape" type="CollisionShape" parent="EndArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="EndArea"]
 shape = SubResource("2")
 
 [node name="TubeVerticalToHorizontal" parent="." instance=ExtResource("4")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4, 0)
 
-[node name="Positions" type="Spatial" parent="."]
+[node name="Positions" type="Node3D" parent="."]
 
-[node name="Position3D" type="Position3D" parent="Positions"]
+[node name="Position3D" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.90863, 2.20723)
 
-[node name="Position3D3" type="Position3D" parent="Positions"]
+[node name="Position3D3" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 5.85359)
 
-[node name="Position3D2" type="Position3D" parent="Positions"]
+[node name="Position3D2" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.22568, 5.85359)
diff --git a/scenes/blocks/hopper3.tscn b/scenes/blocks/hopper3.tscn
@@ -11,46 +11,47 @@ data = PackedVector3Array(-2.8598, 1.645, 0.7663, -3, 2, 0, -2.8978, 2, 0.7765,
 
 [sub_resource type="BoxShape3D" id="2"]
 
-[node name="Hopper3" type="StaticBody"]
+[node name="Hopper3" type="StaticBody3D"]
+collision_mask = 0
 script = ExtResource("1")
 
-[node name="Mesh" type="MeshInstance" parent="."]
+[node name="Mesh" type="MeshInstance3D" parent="."]
 material_override = ExtResource("2")
 mesh = ExtResource("3")
 skeleton = NodePath("")
 
-[node name="CollisionShape" type="CollisionShape" parent="."]
+[node name="CollisionShape" type="CollisionShape3D" parent="."]
 shape = SubResource("3")
 
-[node name="BeginArea" type="Area" parent="."]
+[node name="BeginArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0)
 collision_layer = 2
-collision_mask = 0
+collision_mask = 4
 
-[node name="CollisionShape" type="CollisionShape" parent="BeginArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="BeginArea"]
 shape = SubResource("2")
 
-[node name="EndArea" type="Area" parent="."]
+[node name="EndArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3, 2)
-collision_layer = 3
-collision_mask = 0
+collision_layer = 2
+collision_mask = 4
 script = ExtResource("5")
 
-[node name="CollisionShape" type="CollisionShape" parent="EndArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="EndArea"]
 shape = SubResource("2")
 
 [node name="TubeVerticalToHorizontal" parent="." instance=ExtResource("4")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0)
 
-[node name="Positions" type="Spatial" parent="."]
+[node name="Positions" type="Node3D" parent="."]
 
-[node name="Position3D" type="Position3D" parent="Positions"]
+[node name="Position3D" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.09029, 1.96006)
 
-[node name="Position3D3" type="Position3D" parent="Positions"]
+[node name="Position3D3" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.87745, 3.94573)
 
-[node name="Position3D2" type="Position3D" parent="Positions"]
+[node name="Position3D2" type="Marker3D" parent="Positions"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.171754, 4)
diff --git a/scenes/blocks/looping.tscn b/scenes/blocks/looping.tscn
@@ -10,31 +10,32 @@ data = PackedVector3Array(-0.8938, 0.0384, 0.3902, -1, 0, 0, -0.8, 0, 0, -0.9875
 
 [sub_resource type="BoxShape3D" id="2"]
 
-[node name="Looping" type="StaticBody"]
+[node name="Looping" type="StaticBody3D"]
+collision_mask = 0
 script = ExtResource("1")
 
-[node name="Mesh" type="MeshInstance" parent="."]
+[node name="Mesh" type="MeshInstance3D" parent="."]
 material_override = ExtResource("2")
 mesh = ExtResource("3")
 
-[node name="CollisionShape" type="CollisionShape" parent="."]
+[node name="CollisionShape" type="CollisionShape3D" parent="."]
 shape = SubResource("3")
 
-[node name="BeginArea" type="Area" parent="."]
+[node name="BeginArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1)
 collision_layer = 2
-collision_mask = 0
+collision_mask = 4
 
-[node name="CollisionShape" type="CollisionShape" parent="BeginArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="BeginArea"]
 shape = SubResource("2")
 
-[node name="EndArea" type="Area" parent="."]
+[node name="EndArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, 1)
-collision_layer = 3
-collision_mask = 0
+collision_layer = 2
+collision_mask = 4
 script = ExtResource("4")
 
-[node name="CollisionShape" type="CollisionShape" parent="EndArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="EndArea"]
 shape = SubResource("2")
diff --git a/scenes/blocks/start_line.tscn b/scenes/blocks/start_line.tscn
diff --git a/scenes/blocks/tube_vertical_to_horizontal.tscn b/scenes/blocks/tube_vertical_to_horizontal.tscn
@@ -9,31 +9,32 @@ data = PackedVector3Array(-0.1951, -0.0143, 1.9001, 0, 0, 2, -0.1951, -0.0192, 2
 
 [sub_resource type="BoxShape3D" id="2"]
 
-[node name="TubeVerticalToHorizontal" type="StaticBody"]
+[node name="TubeVerticalToHorizontal" type="StaticBody3D"]
+collision_mask = 0
 script = ExtResource("1")
 
-[node name="Mesh" type="MeshInstance" parent="."]
+[node name="Mesh" type="MeshInstance3D" parent="."]
 material_override = ExtResource("2")
 mesh = ExtResource("3")
 skeleton = NodePath("")
 
-[node name="CollisionShape" type="CollisionShape" parent="."]
+[node name="CollisionShape" type="CollisionShape3D" parent="."]
 shape = SubResource("3")
 
-[node name="BeginArea" type="Area" parent="."]
+[node name="BeginArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 collision_layer = 2
-collision_mask = 0
+collision_mask = 4
 
-[node name="CollisionShape" type="CollisionShape" parent="BeginArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="BeginArea"]
 shape = SubResource("2")
 
-[node name="EndArea" type="Area" parent="."]
+[node name="EndArea" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 2)
-collision_layer = 3
-collision_mask = 0
+collision_layer = 2
+collision_mask = 4
 
-[node name="CollisionShape" type="CollisionShape" parent="EndArea"]
+[node name="CollisionShape" type="CollisionShape3D" parent="EndArea"]
 shape = SubResource("2")