Fix HSlider and test_collision_pairs in 3D Physics Tests (#971)

Co-authored-by: Hugo Locurcio <[email protected]>

3d/physics_tests/project.godot

@@ -8,29 +8,13 @@
 
 config_version=5
 
-_global_script_classes=[{
-"base": "MenuButton",
-"class": &"OptionMenu",
-"language": &"GDScript",
-"path": "res://utils/option_menu.gd"
-}, {
-"base": "Node",
-"class": &"Test",
-"language": &"GDScript",
-"path": "res://test.gd"
-}]
-_global_script_class_icons={
-"OptionMenu": "",
-"Test": ""
-}
-
 [application]
 
 config/name="3D Physics Tests"
+config/tags=PackedStringArray("3d", "demo", "official", "physics")
 run/main_scene="res://main.tscn"
-config/features=PackedStringArray("4.0")
+config/features=PackedStringArray("4.1")
 config/icon="res://icon.webp"
-config/tags=PackedStringArray("3d", "demo", "official", "physics")
 
 [autoload]
 
@@ -62,44 +46,44 @@ ui_down={
 }
 toggle_full_screen={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":70,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":70,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 exit={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":16777217,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":16777217,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 toggle_debug_collision={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":67,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":67,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 restart_test={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":82,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":82,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 toggle_pause={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":80,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":80,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 character_right={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":16777233,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":68,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":16777233,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":68,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 character_left={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":16777231,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":16777231,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 character_jump={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":16777232,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":16777232,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }

3d/physics_tests/tests/functional/test_collision_pairs.tscn

@@ -17,11 +17,12 @@
 points = PackedVector3Array(-0.7, 0, -0.7, -0.3, 0, 0.8, 0.8, 0, -0.3, 0, -1, 0)
 
 [node name="Test" type="Node3D"]
-script = ExtResource( "2" )
+script = ExtResource("2")
 
-[node name="Options" parent="." instance=ExtResource( "5" )]
+[node name="Options" parent="." instance=ExtResource("5")]
 
 [node name="Controls" type="VBoxContainer" parent="."]
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = 25.0
@@ -29,77 +30,51 @@ offset_top = 417.0
 offset_right = -806.0
 offset_bottom = -141.0
 theme_override_constants/separation = 10
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="OffsetX" type="HBoxContainer" parent="Controls"]
-offset_right = 193.0
-offset_bottom = 26.0
+layout_mode = 2
 theme_override_constants/separation = 20
 alignment = 2
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Label" type="Label" parent="Controls/OffsetX"]
-offset_left = 103.0
-offset_right = 165.0
-offset_bottom = 26.0
+layout_mode = 2
 text = "Offset X"
 
 [node name="HSlider" type="HSlider" parent="Controls/OffsetX"]
-offset_left = 185.0
-offset_right = 193.0
-offset_bottom = 16.0
+custom_minimum_size = Vector2(230, 2.08165e-12)
+layout_mode = 2
 min_value = -1.0
 max_value = 1.0
 step = 0.01
 
 [node name="OffsetY" type="HBoxContainer" parent="Controls"]
-offset_top = 36.0
-offset_right = 193.0
-offset_bottom = 62.0
+layout_mode = 2
 theme_override_constants/separation = 20
 alignment = 2
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Label" type="Label" parent="Controls/OffsetY"]
-offset_left = 103.0
-offset_right = 165.0
-offset_bottom = 26.0
+layout_mode = 2
 text = "Offset Y"
 
 [node name="HSlider" type="HSlider" parent="Controls/OffsetY"]
-offset_left = 185.0
-offset_right = 193.0
-offset_bottom = 16.0
+custom_minimum_size = Vector2(230, 2.08165e-12)
+layout_mode = 2
 min_value = -1.0
 max_value = 1.0
 step = 0.01
 
 [node name="OffsetZ" type="HBoxContainer" parent="Controls"]
-offset_top = 72.0
-offset_right = 193.0
-offset_bottom = 98.0
+layout_mode = 2
 theme_override_constants/separation = 20
 alignment = 2
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Label" type="Label" parent="Controls/OffsetZ"]
-offset_left = 104.0
-offset_right = 165.0
-offset_bottom = 26.0
+layout_mode = 2
 text = "Offset Z"
 
 [node name="HSlider" type="HSlider" parent="Controls/OffsetZ"]
-offset_left = 185.0
-offset_right = 193.0
-offset_bottom = 16.0
+custom_minimum_size = Vector2(230, 2.08165e-12)
+layout_mode = 2
 min_value = -1.0
 max_value = 1.0
 step = 0.01
@@ -107,55 +82,55 @@ step = 0.01
 [node name="Shapes" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.35591, 0)
 
-[node name="RigidBodyBox" type="RigidDynamicBody3D" parent="Shapes"]
+[node name="RigidBodyBox" type="RigidBody3D" parent="Shapes"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 0, 0)
 freeze = true
 
 [node name="CollisionShape" type="CollisionShape3D" parent="Shapes/RigidBodyBox"]
 transform = Transform3D(0.579556, 0.0885213, 0.145926, 0, 0.939693, -0.205212, -0.155291, 0.330366, 0.544604, 0, 0, 0)
-shape = SubResource( "1" )
+shape = SubResource("1")
 
-[node name="RigidBodySphere" type="RigidDynamicBody3D" parent="Shapes"]
+[node name="RigidBodySphere" type="RigidBody3D" parent="Shapes"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, 0)
 freeze = true
 
 [node name="CollisionShape" type="CollisionShape3D" parent="Shapes/RigidBodySphere"]
 transform = Transform3D(1.2, 0, 0, 0, 1.2, 0, 0, 0, 1.2, 0, 0, 0)
-shape = SubResource( "2" )
+shape = SubResource("2")
 
-[node name="RigidBodyCapsule" type="RigidDynamicBody3D" parent="Shapes"]
+[node name="RigidBodyCapsule" type="RigidBody3D" parent="Shapes"]
 freeze = true
 
 [node name="CollisionShape" type="CollisionShape3D" parent="Shapes/RigidBodyCapsule"]
 transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0)
-shape = SubResource( "3" )
+shape = SubResource("3")
 
-[node name="RigidBodyCylinder" type="RigidDynamicBody3D" parent="Shapes"]
+[node name="RigidBodyCylinder" type="RigidBody3D" parent="Shapes"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 0, 0)
 freeze = true
 
 [node name="CollisionShape" type="CollisionShape3D" parent="Shapes/RigidBodyCylinder"]
 transform = Transform3D(0.772741, -0.258819, 2.59821e-08, 0.2, 0.933013, -0.207055, 0.0535898, 0.25, 0.772741, 0, 0, 0)
-shape = SubResource( "4" )
+shape = SubResource("4")
 
-[node name="RigidBodyConvexPolygon" type="RigidDynamicBody3D" parent="Shapes"]
+[node name="RigidBodyConvexPolygon" type="RigidBody3D" parent="Shapes"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, -0.211, 0)
 freeze = true
 
 [node name="CollisionShape" type="CollisionShape3D" parent="Shapes/RigidBodyConvexPolygon"]
 transform = Transform3D(2, 0, 0, 0, 2.95442, 0.347296, 0, -0.520945, 1.96962, 0, 0.35, 0)
-shape = SubResource( "5" )
+shape = SubResource("5")
 
 [node name="RigidBodyConcavePolygon" type="StaticBody3D" parent="Shapes"]
 transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, -6, 3.934)
 
 [node name="CollisionShape" type="CollisionShape3D" parent="Shapes/RigidBodyConcavePolygon"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
-shape = ExtResource( "1" )
+shape = ExtResource("1")
 
 [node name="Camera3D" type="Camera3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 8.38087, 11.8164)
-script = ExtResource( "4" )
+script = ExtResource("4")
 
 [connection signal="value_changed" from="Controls/OffsetX/HSlider" to="." method="set_x_offset"]
 [connection signal="value_changed" from="Controls/OffsetY/HSlider" to="." method="set_y_offset"]