diff --git a/godot/Hurrmmm.csproj b/godot/Hurrmmm.csproj index 8ee8c44..e25452c 100644 --- a/godot/Hurrmmm.csproj +++ b/godot/Hurrmmm.csproj @@ -1,4 +1,4 @@ - + net6.0 true diff --git a/godot/Hurrmmm.csproj.old.1 b/godot/Hurrmmm.csproj.old.1 new file mode 100644 index 0000000..8ee8c44 --- /dev/null +++ b/godot/Hurrmmm.csproj.old.1 @@ -0,0 +1,6 @@ + + + net6.0 + true + + \ No newline at end of file diff --git a/godot/physics/billiard.tscn b/godot/physics/billiard.tscn index c29d363..26d287c 100644 --- a/godot/physics/billiard.tscn +++ b/godot/physics/billiard.tscn @@ -1,9 +1,13 @@ -[gd_scene load_steps=3 format=3 uid="uid://cpj2gefpjwogk"] +[gd_scene load_steps=4 format=3 uid="uid://cpj2gefpjwogk"] [ext_resource type="Script" path="res://physics/billiard.gd" id="1_a0fke"] [ext_resource type="PackedScene" uid="uid://cbp8c4kpmr0hk" path="res://control_scheme/is_targetable.tscn" id="2_yrk4o"] +[ext_resource type="PackedScene" uid="uid://bjhii55pagkb5" path="res://TAS_system/is_TASable.tscn" id="3_oj26f"] [node name="billiard" type="RigidBody3D"] script = ExtResource("1_a0fke") [node name="is_targetable" parent="." instance=ExtResource("2_yrk4o")] + +[node name="is_TASable" parent="." node_paths=PackedStringArray("_assignedRigidBody3D") instance=ExtResource("3_oj26f")] +_assignedRigidBody3D = NodePath("..") diff --git a/godot/physics/grape.tscn b/godot/physics/grape.tscn index cfabd01..14a17fe 100644 --- a/godot/physics/grape.tscn +++ b/godot/physics/grape.tscn @@ -1,5 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://c43pr474qofhl"] +[gd_scene load_steps=3 format=3 uid="uid://c43pr474qofhl"] [ext_resource type="PackedScene" uid="uid://bsge8trc5uwb0" path="res://grape.glb" id="1_jlfas"] +[ext_resource type="PackedScene" uid="uid://bjhii55pagkb5" path="res://TAS_system/is_TASable.tscn" id="2_qxcjc"] [node name="grape" instance=ExtResource("1_jlfas")] + +[node name="is_TASable" parent="." index="3" node_paths=PackedStringArray("_assignedRigidBody3D") instance=ExtResource("2_qxcjc")] +_assignedRigidBody3D = NodePath("..") diff --git a/godot/tests/TAS_system/TAS_test_003.tscn b/godot/tests/TAS_system/TAS_test_003.tscn index 2c2eb36..e80a146 100644 --- a/godot/tests/TAS_system/TAS_test_003.tscn +++ b/godot/tests/TAS_system/TAS_test_003.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=7 format=3 uid="uid://1wrwvnt1xuwr"] +[gd_scene load_steps=6 format=3 uid="uid://1wrwvnt1xuwr"] [ext_resource type="PackedScene" uid="uid://bua7f25rpewkp" path="res://small_room.glb" id="1_m1abe"] [ext_resource type="PackedScene" uid="uid://drmb4sitb74fx" path="res://control_scheme/controller.tscn" id="2_1yuny"] [ext_resource type="PackedScene" uid="uid://c43pr474qofhl" path="res://physics/grape.tscn" id="3_kg8e8"] -[ext_resource type="PackedScene" uid="uid://bjhii55pagkb5" path="res://TAS_system/is_TASable.tscn" id="4_4hrbu"] [ext_resource type="PackedScene" uid="uid://b1uf31ed6h0ir" path="res://UI/TAS UI/TAS UI.tscn" id="4_jskxr"] [sub_resource type="Environment" id="Environment_f0m14"] @@ -30,14 +29,8 @@ initial_target = NodePath("../grape") [node name="grape" parent="." index="5" instance=ExtResource("3_kg8e8")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.98064, 0.385236) -[node name="is_TASable" parent="grape" index="3" node_paths=PackedStringArray("_assignedRigidBody3D") instance=ExtResource("4_4hrbu")] -_assignedRigidBody3D = NodePath("..") - [node name="grape2" parent="." index="6" instance=ExtResource("3_kg8e8")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.94627, 0) continuous_cd = true -[node name="is_TASable" parent="grape2" index="3" node_paths=PackedStringArray("_assignedRigidBody3D") instance=ExtResource("4_4hrbu")] -_assignedRigidBody3D = NodePath("..") - [node name="TAS UI" parent="." index="7" instance=ExtResource("4_jskxr")] diff --git a/godot/tests/control_scheme/test_basic_controls.tscn b/godot/tests/control_scheme/test_basic_controls.tscn index 3907bf9..22b9b5f 100644 --- a/godot/tests/control_scheme/test_basic_controls.tscn +++ b/godot/tests/control_scheme/test_basic_controls.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://70bb2yncbl"] +[gd_scene load_steps=6 format=3 uid="uid://70bb2yncbl"] [ext_resource type="PackedScene" uid="uid://bua7f25rpewkp" path="res://small_room.glb" id="1_2ticn"] [ext_resource type="PackedScene" uid="uid://drmb4sitb74fx" path="res://control_scheme/controller.tscn" id="2_dcvuq"] [ext_resource type="PackedScene" uid="uid://c43pr474qofhl" path="res://physics/grape.tscn" id="3_gijly"] +[ext_resource type="PackedScene" uid="uid://b1uf31ed6h0ir" path="res://UI/TAS UI/TAS UI.tscn" id="4_8yatx"] [sub_resource type="Environment" id="Environment_f0m14"] ambient_light_source = 2 @@ -27,5 +28,7 @@ current = true [node name="grape" parent="." index="4" instance=ExtResource("3_gijly")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.56762, 0.385236) -[node name="grape2" parent="." index="5" instance=ExtResource("3_gijly")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.60495, 0) +[node name="TAS UI" parent="." index="5" instance=ExtResource("4_8yatx")] + +[node name="grape2" parent="." index="6" instance=ExtResource("3_gijly")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.115958, 1.77839, -0.189013)