From b17a773c87523a402479c2617ddf1c5d95968eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Sun, 28 Aug 2022 07:55:28 +0200 Subject: [PATCH] Disable to_node and resave all tscn files --- .../workflows/linux_builds_swiftshader.yml | 10 +- AutomaticBugs/BasicData.gd | 1 + AutomaticBugs/FunctionExecutor.tscn | 2 +- CreatingAllThings/CreatingAllThings.tscn | 2 +- Nodes/Nodes.tscn | 2 +- Physics/2D/Area2D.tscn | 4 +- Physics/2D/KinematicBody2D.tscn | 4 +- Physics/2D/Physics2D.tscn | 152 +++++++++--------- Physics/2D/RigidBody2D.tscn | 4 +- Physics/2D/StaticBody2D.tscn | 4 +- Physics/3D/Physics3D.tscn | 87 +++++----- Physics/3D/RigidBody3D.gd | 1 - Physics/3D/RigidBody3D.tscn | 4 +- 13 files changed, 133 insertions(+), 144 deletions(-) diff --git a/.github/workflows/linux_builds_swiftshader.yml b/.github/workflows/linux_builds_swiftshader.yml index 689b1a7..40a9936 100644 --- a/.github/workflows/linux_builds_swiftshader.yml +++ b/.github/workflows/linux_builds_swiftshader.yml @@ -34,7 +34,7 @@ jobs: run: | cd godot scons p=linuxbsd -j2 use_asan=yes use_ubsan=yes CCFLAGS="-fsanitize=shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr" - cp bin/godot.linuxbsd.tools.64.san ../ + cp bin/godot.linuxbsd.tools.x86_64.san ../ cd ../ rm -rf godot @@ -48,10 +48,14 @@ jobs: - name: Open Editor run: | - VK_ICD_FILENAMES=$(pwd)/vk_swiftshader_icd.json DRI_PRIME=0 xvfb-run ./godot.linuxbsd.tools.64.san --audio-driver Dummy -e --quit --path $(pwd) 2>&1 | tee sanitizers_log.txt || true + VK_ICD_FILENAMES=$(pwd)/vk_swiftshader_icd.json DRI_PRIME=0 xvfb-run ./godot.linuxbsd.tools.x86_64.san --audio-driver Dummy -e --quit --path $(pwd) 2>&1 | tee sanitizers_log.txt || true misc/check_ci_log.py sanitizers_log.txt - name: Run Project run: | - VK_ICD_FILENAMES=$(pwd)/vk_swiftshader_icd.json DRI_PRIME=0 xvfb-run ./godot.linuxbsd.tools.64.san 180 --audio-driver Dummy --path $(pwd) 2>&1 | tee sanitizers_log.txt || true + VK_ICD_FILENAMES=$(pwd)/vk_swiftshader_icd.json DRI_PRIME=0 xvfb-run ./godot.linuxbsd.tools.x86_64.san 180 --audio-driver Dummy --path $(pwd) 2>&1 | tee sanitizers_log.txt || true misc/check_ci_log.py sanitizers_log.txt + + - name: Run Project GLES3 + run: | + DRI_PRIME=0 xvfb-run ./godot.linuxbsd.tools.x86_64.san 180 --rendering-driver opengl3 --audio-driver Dummy --path $(pwd) 2>&1 | tee sanitizers_log.txt || true diff --git a/AutomaticBugs/BasicData.gd b/AutomaticBugs/BasicData.gd index 39369bc..597f359 100644 --- a/AutomaticBugs/BasicData.gd +++ b/AutomaticBugs/BasicData.gd @@ -34,6 +34,7 @@ var function_exceptions: Array = [ "set_is_setup", # Just don't use, in SkeletonModification crashes "_update_shape", # TODO, probably crashes exported build "get_custom_monitor", # TODO crashes only in exported build + "to_node", # 64977 - expected, because create completelly new object ### ### Input crashes, still are some problems TODO ### diff --git a/AutomaticBugs/FunctionExecutor.tscn b/AutomaticBugs/FunctionExecutor.tscn index 94a20d3..54db372 100644 --- a/AutomaticBugs/FunctionExecutor.tscn +++ b/AutomaticBugs/FunctionExecutor.tscn @@ -3,4 +3,4 @@ [ext_resource type="Script" path="res://AutomaticBugs/FunctionExecutor.gd" id="1"] [node name="FunctionExecutor" type="Node"] -script = ExtResource( "1" ) +script = ExtResource("1") diff --git a/CreatingAllThings/CreatingAllThings.tscn b/CreatingAllThings/CreatingAllThings.tscn index e5818e8..d189b36 100644 --- a/CreatingAllThings/CreatingAllThings.tscn +++ b/CreatingAllThings/CreatingAllThings.tscn @@ -3,4 +3,4 @@ [ext_resource type="Script" path="res://CreatingAllThings/CreatingAllThings.gd" id="1"] [node name="CreatingAllThings" type="Node2D"] -script = ExtResource( "1" ) +script = ExtResource("1") diff --git a/Nodes/Nodes.tscn b/Nodes/Nodes.tscn index 2885d70..87e0aba 100644 --- a/Nodes/Nodes.tscn +++ b/Nodes/Nodes.tscn @@ -3,4 +3,4 @@ [ext_resource type="Script" path="res://Nodes/Nodes.gd" id="1"] [node name="Nodes" type="Node"] -script = ExtResource( "1" ) +script = ExtResource("1") diff --git a/Physics/2D/Area2D.tscn b/Physics/2D/Area2D.tscn index 95ef4d4..74575f1 100644 --- a/Physics/2D/Area2D.tscn +++ b/Physics/2D/Area2D.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://Physics/2D/Area2D.gd" id="2"] [node name="Area2D" type="Area2D"] -script = ExtResource( "2" ) +script = ExtResource("2") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] polygon = PackedVector2Array(4.018, -13.1782, -15.9057, 3.23778, 1.63277, 17.5492, 19.3115, 2.39594) @@ -13,7 +13,7 @@ polygon = PackedVector2Array(4.018, -13.1782, -15.9057, 3.23778, 1.63277, 17.549 polygon = PackedVector2Array(-4.58427, -16.8342, -20.5974, -4.94143, -8.23639, 16.784, 20.4187, 13.5065) [node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource( "1" ) +texture = ExtResource("1") [connection signal="area_entered" from="." to="." method="_on_Area2D_area_entered"] [connection signal="body_entered" from="." to="." method="_on_Area2D_body_entered"] diff --git a/Physics/2D/KinematicBody2D.tscn b/Physics/2D/KinematicBody2D.tscn index 161949b..a407c9e 100644 --- a/Physics/2D/KinematicBody2D.tscn +++ b/Physics/2D/KinematicBody2D.tscn @@ -4,12 +4,12 @@ [ext_resource type="Script" path="res://Physics/2D/KinematicBody2D.gd" id="2"] [node name="CharacterBody2D" type="CharacterBody2D"] -script = ExtResource( "2" ) +script = ExtResource("2") [node name="Sprite2D" type="Sprite2D" parent="."] modulate = Color(0.74902, 0.133333, 0.133333, 1) rotation = 4.45932 -texture = ExtResource( "1" ) +texture = ExtResource("1") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] polygon = PackedVector2Array(-10.6781, -7.48182, -12.4953, 17.1263, 15.2543, 6.19464, 4.32263, -14.4073) diff --git a/Physics/2D/Physics2D.tscn b/Physics/2D/Physics2D.tscn index 6f8839d..78e4c58 100644 --- a/Physics/2D/Physics2D.tscn +++ b/Physics/2D/Physics2D.tscn @@ -10,227 +10,227 @@ size = Vector2(1105.04, 20.7896) [node name="Physics2D" type="Node2D"] -script = ExtResource( "1" ) +script = ExtResource("1") [node name="Area2D" type="Node2D" parent="."] -[node name="Area2D" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D" parent="Area2D" instance=ExtResource("2")] position = Vector2(166.677, 52.3842) -[node name="Area2D2" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D2" parent="Area2D" instance=ExtResource("2")] position = Vector2(209.537, 193.663) -[node name="Area2D3" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D3" parent="Area2D" instance=ExtResource("2")] position = Vector2(450.822, 122.23) -[node name="Area2D4" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D4" parent="Area2D" instance=ExtResource("2")] position = Vector2(336.529, 293.669) -[node name="Area2D5" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D5" parent="Area2D" instance=ExtResource("2")] position = Vector2(555.59, 42.8598) -[node name="Area2D6" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D6" parent="Area2D" instance=ExtResource("2")] position = Vector2(598.45, 184.139) -[node name="Area2D7" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D7" parent="Area2D" instance=ExtResource("2")] position = Vector2(839.735, 112.705) -[node name="Area2D8" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D8" parent="Area2D" instance=ExtResource("2")] position = Vector2(725.442, 284.145) -[node name="Area2D10" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D10" parent="Area2D" instance=ExtResource("2")] position = Vector2(420.661, 330.179) -[node name="Area2D12" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D12" parent="Area2D" instance=ExtResource("2")] position = Vector2(547.653, 430.186) -[node name="Area2D14" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D14" parent="Area2D" instance=ExtResource("2")] position = Vector2(122.23, 457.171) -[node name="Area2D16" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D16" parent="Area2D" instance=ExtResource("2")] position = Vector2(249.222, 557.178) -[node name="Area2D18" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D18" parent="Area2D" instance=ExtResource("2")] position = Vector2(660.359, 444.472) -[node name="Area2D19" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D19" parent="Area2D" instance=ExtResource("2")] position = Vector2(901.644, 373.039) -[node name="Area2D20" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D20" parent="Area2D" instance=ExtResource("2")] position = Vector2(787.351, 544.478) -[node name="Area2D9" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D9" parent="Area2D" instance=ExtResource("2")] position = Vector2(660.036, 115.278) -[node name="Area2D11" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D11" parent="Area2D" instance=ExtResource("2")] position = Vector2(355.255, 161.312) -[node name="Area2D13" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D13" parent="Area2D" instance=ExtResource("2")] position = Vector2(482.247, 261.319) -[node name="Area2D15" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D15" parent="Area2D" instance=ExtResource("2")] position = Vector2(56.8237, 288.304) -[node name="Area2D17" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D17" parent="Area2D" instance=ExtResource("2")] position = Vector2(183.816, 388.311) -[node name="Area2D21" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D21" parent="Area2D" instance=ExtResource("2")] position = Vector2(594.953, 275.605) -[node name="Area2D22" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D22" parent="Area2D" instance=ExtResource("2")] position = Vector2(836.238, 204.172) -[node name="Area2D23" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D23" parent="Area2D" instance=ExtResource("2")] position = Vector2(721.945, 375.611) -[node name="Area2D24" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D24" parent="Area2D" instance=ExtResource("2")] position = Vector2(696.901, 221.117) -[node name="Area2D25" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D25" parent="Area2D" instance=ExtResource("2")] position = Vector2(392.12, 267.151) -[node name="Area2D26" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D26" parent="Area2D" instance=ExtResource("2")] position = Vector2(519.112, 367.158) -[node name="Area2D27" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D27" parent="Area2D" instance=ExtResource("2")] position = Vector2(93.689, 394.143) -[node name="Area2D28" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D28" parent="Area2D" instance=ExtResource("2")] position = Vector2(220.681, 494.15) -[node name="Area2D29" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D29" parent="Area2D" instance=ExtResource("2")] position = Vector2(631.818, 381.444) -[node name="Area2D30" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D30" parent="Area2D" instance=ExtResource("2")] position = Vector2(873.103, 310.011) -[node name="Area2D31" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D31" parent="Area2D" instance=ExtResource("2")] position = Vector2(758.81, 481.45) -[node name="Area2D32" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D32" parent="Area2D" instance=ExtResource("2")] position = Vector2(639.819, 9.43819) -[node name="Area2D33" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D33" parent="Area2D" instance=ExtResource("2")] position = Vector2(335.038, 55.4722) -[node name="Area2D34" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D34" parent="Area2D" instance=ExtResource("2")] position = Vector2(462.03, 155.479) -[node name="Area2D35" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D35" parent="Area2D" instance=ExtResource("2")] position = Vector2(36.6071, 182.464) -[node name="Area2D36" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D36" parent="Area2D" instance=ExtResource("2")] position = Vector2(163.599, 282.471) -[node name="Area2D37" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D37" parent="Area2D" instance=ExtResource("2")] position = Vector2(574.736, 169.765) -[node name="Area2D38" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D38" parent="Area2D" instance=ExtResource("2")] position = Vector2(816.021, 98.3322) -[node name="Area2D39" parent="Area2D" instance=ExtResource( "2" )] +[node name="Area2D39" parent="Area2D" instance=ExtResource("2")] position = Vector2(701.728, 269.771) [node name="CharacterBody2D" type="Node2D" parent="."] -[node name="CharacterBody2D" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="CharacterBody2D" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(90.4819, 302.4) -[node name="KinematicBody2D2" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="KinematicBody2D2" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(380.142, 465.25) -[node name="KinematicBody2D3" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="KinematicBody2D3" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(333.423, 131.54) -[node name="KinematicBody2D4" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="KinematicBody2D4" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(509.622, 242.332) -[node name="KinematicBody2D5" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="KinematicBody2D5" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(914.078, 76.812) -[node name="KinematicBody2D6" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="KinematicBody2D6" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(251.025, 329.752) -[node name="KinematicBody2D7" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="KinematicBody2D7" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(540.685, 492.602) -[node name="KinematicBody2D8" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="KinematicBody2D8" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(493.966, 158.892) -[node name="KinematicBody2D9" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="KinematicBody2D9" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(670.165, 269.684) -[node name="KinematicBody2D10" parent="CharacterBody2D" instance=ExtResource( "3" )] +[node name="KinematicBody2D10" parent="CharacterBody2D" instance=ExtResource("3")] position = Vector2(926.288, 135.628) [node name="StaticBody2D" type="Node2D" parent="."] position = Vector2(73.6327, 117.071) -[node name="StaticBody2D" parent="StaticBody2D" instance=ExtResource( "4" )] +[node name="StaticBody2D" parent="StaticBody2D" instance=ExtResource("4")] -[node name="StaticBody2D2" parent="StaticBody2D" instance=ExtResource( "4" )] +[node name="StaticBody2D2" parent="StaticBody2D" instance=ExtResource("4")] position = Vector2(171.12, 267.286) -[node name="StaticBody2D3" parent="StaticBody2D" instance=ExtResource( "4" )] +[node name="StaticBody2D3" parent="StaticBody2D" instance=ExtResource("4")] position = Vector2(618.011, -2.82837) -[node name="StaticBody2D4" parent="StaticBody2D" instance=ExtResource( "4" )] +[node name="StaticBody2D4" parent="StaticBody2D" instance=ExtResource("4")] position = Vector2(793.374, 120.208) -[node name="StaticBody2D6" parent="StaticBody2D" instance=ExtResource( "4" )] +[node name="StaticBody2D6" parent="StaticBody2D" instance=ExtResource("4")] position = Vector2(68.974, 216.436) -[node name="StaticBody2D7" parent="StaticBody2D" instance=ExtResource( "4" )] +[node name="StaticBody2D7" parent="StaticBody2D" instance=ExtResource("4")] position = Vector2(246.087, 431.281) -[node name="StaticBody2D8" parent="StaticBody2D" instance=ExtResource( "4" )] +[node name="StaticBody2D8" parent="StaticBody2D" instance=ExtResource("4")] position = Vector2(686.985, 213.607) -[node name="StaticBody2D9" parent="StaticBody2D" instance=ExtResource( "4" )] +[node name="StaticBody2D9" parent="StaticBody2D" instance=ExtResource("4")] position = Vector2(862.348, 336.644) -[node name="StaticBody2D5" parent="StaticBody2D" instance=ExtResource( "4" )] +[node name="StaticBody2D5" parent="StaticBody2D" instance=ExtResource("4")] position = Vector2(704.278, 296.985) [node name="RigidDynamicBody2D" type="Node2D" parent="."] -[node name="RigidDynamicBody2D" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidDynamicBody2D" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(178.191, 120.915) -[node name="RigidBody2D2" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D2" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(192.874, 313.132) -[node name="RigidBody2D3" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D3" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(386.426, 210.35) -[node name="RigidBody2D4" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D4" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(374.412, 43.4946) -[node name="RigidBody2D5" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D5" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(609.344, 331.82) -[node name="RigidBody2D6" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D6" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(756.177, 187.657) -[node name="RigidBody2D7" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D7" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(754.842, 43.4946) -[node name="RigidBody2D8" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D8" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(490.543, 544.06) -[node name="RigidBody2D9" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D9" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(490.543, 544.06) -[node name="RigidBody2D10" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D10" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(282.873, 201.928) -[node name="RigidBody2D11" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D11" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(281.538, 57.7651) -[node name="RigidBody2D12" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D12" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(45.7064, 532.859) -[node name="RigidBody2D13" parent="RigidDynamicBody2D" instance=ExtResource( "5" )] +[node name="RigidBody2D13" parent="RigidDynamicBody2D" instance=ExtResource("5")] position = Vector2(45.7064, 532.859) [node name="Barriers" type="Node2D" parent="."] @@ -240,23 +240,23 @@ position = Vector2(45.7064, 532.859) [node name="CollisionShape2D" type="CollisionShape2D" parent="Barriers/Corner"] position = Vector2(7.93701, 317.48) rotation = 1.5708 -shape = SubResource( "1" ) +shape = SubResource("1") [node name="Corner2" type="StaticBody2D" parent="Barriers"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Barriers/Corner2"] position = Vector2(1017.52, 365.102) rotation = 1.5708 -shape = SubResource( "1" ) +shape = SubResource("1") [node name="Corner3" type="StaticBody2D" parent="Barriers"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Barriers/Corner3"] position = Vector2(503.206, -19.0488) -shape = SubResource( "1" ) +shape = SubResource("1") [node name="Corner4" type="StaticBody2D" parent="Barriers"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Barriers/Corner4"] position = Vector2(492.094, 576.227) -shape = SubResource( "1" ) +shape = SubResource("1") diff --git a/Physics/2D/RigidBody2D.tscn b/Physics/2D/RigidBody2D.tscn index b73daeb..d58b327 100644 --- a/Physics/2D/RigidBody2D.tscn +++ b/Physics/2D/RigidBody2D.tscn @@ -5,7 +5,7 @@ [node name="RigidDynamicBody2D" type="RigidDynamicBody2D"] gravity_scale = 0.1 -script = ExtResource( "1" ) +script = ExtResource("1") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] polygon = PackedVector2Array(-2.29324, -15.2017, -12.0322, 4.46353, 8.38219, 7.64743) @@ -13,4 +13,4 @@ polygon = PackedVector2Array(-2.29324, -15.2017, -12.0322, 4.46353, 8.38219, 7.6 [node name="Sprite2D" type="Sprite2D" parent="."] modulate = Color(0.47451, 0, 0.427451, 1) rotation = 0.792379 -texture = ExtResource( "2" ) +texture = ExtResource("2") diff --git a/Physics/2D/StaticBody2D.tscn b/Physics/2D/StaticBody2D.tscn index bc5bfd7..e85f522 100644 --- a/Physics/2D/StaticBody2D.tscn +++ b/Physics/2D/StaticBody2D.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://Physics/2D/StaticBody2D.gd" id="2"] [node name="StaticBody2D" type="StaticBody2D"] -script = ExtResource( "2" ) +script = ExtResource("2") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] polygon = PackedVector2Array(-0.566719, -5.64549, -7.24092, 1.19557, -2.06841, 8.20348, 5.60692, 5.20009, 4.10522, -5.14492) @@ -12,4 +12,4 @@ polygon = PackedVector2Array(-0.566719, -5.64549, -7.24092, 1.19557, -2.06841, 8 [node name="Sprite2D" type="Sprite2D" parent="."] modulate = Color(0, 1, 1, 0.584314) rotation = 0.270526 -texture = ExtResource( "1" ) +texture = ExtResource("1") diff --git a/Physics/3D/Physics3D.tscn b/Physics/3D/Physics3D.tscn index 9dbc625..67ab1ed 100644 --- a/Physics/3D/Physics3D.tscn +++ b/Physics/3D/Physics3D.tscn @@ -10,17 +10,17 @@ rough = true [sub_resource type="StandardMaterial3D" id="2"] albedo_color = Color(1, 1, 1, 0.521569) -albedo_texture = ExtResource( "1" ) +albedo_texture = ExtResource("1") metallic = 1.0 metallic_specular = 0.86 -metallic_texture = ExtResource( "1" ) +metallic_texture = ExtResource("1") [sub_resource type="BoxShape3D" id="3"] size = Vector3(100, 4, 100) [sub_resource type="StandardMaterial3D" id="4"] diffuse_mode = 1 -albedo_texture = ExtResource( "1" ) +albedo_texture = ExtResource("1") metallic = 0.8 [sub_resource type="BoxShape3D" id="5"] @@ -39,80 +39,80 @@ transform = Transform3D(1, 0, 0, 0, -0.959707, 0.281002, 0, -0.281002, -0.959707 light_energy = 1.45 [node name="StaticArena" type="Node3D" parent="."] -script = ExtResource( "2" ) +script = ExtResource("2") [node name="StaticBody3D" type="StaticBody3D" parent="StaticArena"] collision_layer = 2147483651 collision_mask = 279045 -physics_material_override = SubResource( "1" ) +physics_material_override = SubResource("1") [node name="CSGBox3D" type="CSGBox3D" parent="StaticArena/StaticBody3D"] -material = SubResource( "2" ) +material = SubResource("2") [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticArena/StaticBody3D"] -shape = SubResource( "3" ) +shape = SubResource("3") [node name="StaticBody2" type="StaticBody3D" parent="StaticArena"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 18.1689, 1.64214) collision_layer = 2147483651 collision_mask = 279045 -physics_material_override = SubResource( "1" ) +physics_material_override = SubResource("1") [node name="CSGBox3D" type="CSGBox3D" parent="StaticArena/StaticBody2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.5124) -material = SubResource( "4" ) +material = SubResource("4") [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticArena/StaticBody2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709) -shape = SubResource( "5" ) +shape = SubResource("5") [node name="StaticBody3" type="StaticBody3D" parent="StaticArena"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 18.1689, 91.732) collision_layer = 2147483651 collision_mask = 279045 -physics_material_override = SubResource( "1" ) +physics_material_override = SubResource("1") [node name="CSGBox3D" type="CSGBox3D" parent="StaticArena/StaticBody3"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.5124) -material = SubResource( "4" ) +material = SubResource("4") [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticArena/StaticBody3"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709) -shape = SubResource( "5" ) +shape = SubResource("5") [node name="StaticBody4" type="StaticBody3D" parent="StaticArena"] transform = Transform3D(-1.62921e-07, 0, -1, 0, 1, 0, 1, 0, -1.62921e-07, -1.90218, 18.1689, 0.572887) collision_layer = 2147483651 collision_mask = 279045 -physics_material_override = SubResource( "1" ) +physics_material_override = SubResource("1") [node name="CSGBox3D" type="CSGBox3D" parent="StaticArena/StaticBody4"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.13509, -46.5124) -material = SubResource( "4" ) +material = SubResource("4") [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticArena/StaticBody4"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709) -shape = SubResource( "5" ) +shape = SubResource("5") [node name="StaticBody5" type="StaticBody3D" parent="StaticArena"] transform = Transform3D(-1.62921e-07, 0, -1, 0, 1, 0, 1, 0, -1.62921e-07, -92.1931, 18.8845, 0.814518) collision_layer = 2147483651 collision_mask = 279045 -physics_material_override = SubResource( "1" ) +physics_material_override = SubResource("1") [node name="CSGBox3D" type="CSGBox3D" parent="StaticArena/StaticBody5"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.5124) -material = SubResource( "4" ) +material = SubResource("4") [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticArena/StaticBody5"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709) -shape = SubResource( "5" ) +shape = SubResource("5") [node name="StaticBody6" type="StaticBody3D" parent="StaticArena"] transform = Transform3D(0.998532, 0.013617, -0.0524264, 0, 0.967885, 0.251394, 0.054166, -0.251025, 0.966464, -16.8315, 7.76313, 0) [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticArena/StaticBody6"] -shape = SubResource( "6" ) +shape = SubResource("6") [node name="CSGBox3D" type="CSGBox3D" parent="StaticArena/StaticBody6"] @@ -121,7 +121,7 @@ transform = Transform3D(-0.638995, 0.193375, -0.744507, 0, 0.967885, 0.251394, 0 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticArena/StaticBody7"] transform = Transform3D(1, -9.31323e-10, 0, 0, 1, 1.49012e-08, 3.72529e-09, 1.49012e-08, 1, 0, 0, 0) -shape = SubResource( "7" ) +shape = SubResource("7") [node name="CSGBox3D" type="CSGBox3D" parent="StaticArena/StaticBody7"] @@ -130,7 +130,7 @@ transform = Transform3D(-0.314953, 0.2386, -0.918626, 0, 0.967885, 0.251394, 0.9 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticArena/StaticBody8"] transform = Transform3D(1, -9.31323e-10, 0, 0, 1, 1.49012e-08, 3.72529e-09, 1.49012e-08, 1, 0, 0, 0) -shape = SubResource( "7" ) +shape = SubResource("7") [node name="CSGBox3D" type="CSGBox3D" parent="StaticArena/StaticBody8"] @@ -139,36 +139,21 @@ transform = Transform3D(0.289683, -0.599318, 0.746259, -0.123608, -0.796586, -0. [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticArena/StaticBody9"] transform = Transform3D(1, 7.45058e-09, 0, 1.49012e-08, 1, 4.84288e-08, 0, -3.1665e-08, 1, 0, 0, 0) -shape = SubResource( "7" ) +shape = SubResource("7") [node name="CSGBox3D" type="CSGBox3D" parent="StaticArena/StaticBody9"] [node name="Objects" type="Node3D" parent="."] -[node name="RigidDynamicBody3D" parent="Objects" instance=ExtResource( "3" )] +[node name="RigidDynamicBody3D" parent="Objects" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.50424, 17.1047, 14.7363) -[node name="RigidBody2" parent="Objects" instance=ExtResource( "3" )] +[node name="RigidBody2" parent="Objects" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.7864, 12.6031, 19.1751) -[node name="RigidBody3" parent="Objects" instance=ExtResource( "3" )] +[node name="RigidBody3" parent="Objects" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.9896, 10.6319, 28.8764) -[node name="RigidBody4" parent="Objects" instance=ExtResource( "3" )] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.0866, 12.6031, -18.3703) - -[node name="RigidBody5" parent="Objects" instance=ExtResource( "3" )] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.2505, 12.6031, -20.7732) - -[node name="RigidBody6" parent="Objects" instance=ExtResource( "3" )] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.085, 12.6031, 8.2937) - -[node name="RigidBody7" parent="Objects" instance=ExtResource( "3" )] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.9278, 12.6031, 23.4173) - -[node name="RigidBody8" parent="Objects" instance=ExtResource( "3" )] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.85186, 24.8548, -9.87658) - [node name="Camera3D" type="Camera3D" parent="."] transform = Transform3D(0.922114, 0.23703, -0.305815, 0.0163102, 0.765871, 0.642787, 0.386575, -0.597711, 0.702354, -25.392, 55.117, 39.851) current = true @@ -178,11 +163,11 @@ far = 200.0 [node name="Cone" type="Node3D" parent="Joints"] -[node name="RigidBody2" parent="Joints/Cone" instance=ExtResource( "3" )] +[node name="RigidBody2" parent="Joints/Cone" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 6.73046, 77.026) gravity_scale = -3.0 -[node name="RigidDynamicBody3D" parent="Joints/Cone" instance=ExtResource( "3" )] +[node name="RigidDynamicBody3D" parent="Joints/Cone" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 15.3482, 19.1751) [node name="ConeTwistJoint3D" type="ConeTwistJoint3D" parent="Joints/Cone"] @@ -191,11 +176,11 @@ nodes/node_b = NodePath("../RigidBody2") [node name="Generic" type="Node3D" parent="Joints"] -[node name="RigidDynamicBody3D" parent="Joints/Generic" instance=ExtResource( "3" )] +[node name="RigidDynamicBody3D" parent="Joints/Generic" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 33.1278, 67.0796) gravity_scale = -3.0 -[node name="RigidBody2" parent="Joints/Generic" instance=ExtResource( "3" )] +[node name="RigidBody2" parent="Joints/Generic" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 33.1278, -0.445078) [node name="Generic6DOFJoint3D" type="Generic6DOFJoint3D" parent="Joints/Generic"] @@ -204,11 +189,11 @@ nodes/node_b = NodePath("../RigidBody2") [node name="Hinge" type="Node3D" parent="Joints"] -[node name="RigidDynamicBody3D" parent="Joints/Hinge" instance=ExtResource( "3" )] +[node name="RigidDynamicBody3D" parent="Joints/Hinge" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.6153, 33.1278, 59.2096) gravity_scale = -3.0 -[node name="RigidBody2" parent="Joints/Hinge" instance=ExtResource( "3" )] +[node name="RigidBody2" parent="Joints/Hinge" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.17695, 33.1278, 19.1751) [node name="HingeJoint3D" type="HingeJoint3D" parent="Joints/Hinge"] @@ -217,11 +202,11 @@ nodes/node_b = NodePath("../RigidBody2") [node name="Pin" type="Node3D" parent="Joints"] -[node name="RigidDynamicBody3D" parent="Joints/Pin" instance=ExtResource( "3" )] +[node name="RigidDynamicBody3D" parent="Joints/Pin" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 4.83369, 116.28) gravity_scale = -3.0 -[node name="RigidBody2" parent="Joints/Pin" instance=ExtResource( "3" )] +[node name="RigidBody2" parent="Joints/Pin" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 18.4589, 10.7729) [node name="PinJoint3D" type="PinJoint3D" parent="Joints/Pin"] @@ -230,11 +215,11 @@ nodes/node_b = NodePath("../RigidBody2") [node name="Slider" type="Node3D" parent="Joints"] -[node name="RigidDynamicBody3D" parent="Joints/Slider" instance=ExtResource( "3" )] +[node name="RigidDynamicBody3D" parent="Joints/Slider" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 17.7427, 19.1751) gravity_scale = -3.0 -[node name="RigidBody2" parent="Joints/Slider" instance=ExtResource( "3" )] +[node name="RigidBody2" parent="Joints/Slider" instance=ExtResource("3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -33.3355, 16.2845, 19.1751) [node name="SliderJoint3D" type="SliderJoint3D" parent="Joints/Slider"] diff --git a/Physics/3D/RigidBody3D.gd b/Physics/3D/RigidBody3D.gd index c28127e..013d3fc 100644 --- a/Physics/3D/RigidBody3D.gd +++ b/Physics/3D/RigidBody3D.gd @@ -1,6 +1,5 @@ extends RigidDynamicBody3D - func _physics_process(delta: float) -> void: add_constant_force(Vector3(0, 4 * delta, 0), Vector3(0, 0, 0)) pass diff --git a/Physics/3D/RigidBody3D.tscn b/Physics/3D/RigidBody3D.tscn index 71b59b2..e0f6a98 100644 --- a/Physics/3D/RigidBody3D.tscn +++ b/Physics/3D/RigidBody3D.tscn @@ -9,10 +9,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 33.1278, 19.1751) gravity_scale = 5.0 continuous_cd = true linear_velocity = Vector3(0, 5, 0) -script = ExtResource( "1" ) +script = ExtResource("1") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(5, 0, 0, 0, 5, 0, 0, 0, 5, 0, 0, 0) -shape = SubResource( "1" ) +shape = SubResource("1") [node name="CSGSphere3D" type="CSGSphere3D" parent="CollisionShape3D"]