sjkillen
/
hurrmmm
2
1
Fork 0
Code Issues 21 Pull Requests Packages Projects 1 Releases Wiki Activity

Fixed weird issue with grape tscn and TASable

This commit is contained in:
alex-kumpula 2023-11-11 17:47:26 -07:00
parent 8c1b431f84
commit 9fb9b92aec
6 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
godot/Hurrmmm.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Godot.NET.Sdk/4.1.1"> <Project Sdk="Godot.NET.Sdk/4.1.3">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading> <EnableDynamicLoading>true</EnableDynamicLoading>

6
godot/Hurrmmm.csproj.old.1 Normal file
View File

@ -0,0 +1,6 @@
<Project Sdk="Godot.NET.Sdk/4.1.1">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
</PropertyGroup>
</Project>

6
godot/physics/billiard.tscn
View File

@ -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="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://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"] [node name="billiard" type="RigidBody3D"]
script = ExtResource("1_a0fke") script = ExtResource("1_a0fke")
[node name="is_targetable" parent="." instance=ExtResource("2_yrk4o")] [node name="is_targetable" parent="." instance=ExtResource("2_yrk4o")]
[node name="is_TASable" parent="." node_paths=PackedStringArray("_assignedRigidBody3D") instance=ExtResource("3_oj26f")]
_assignedRigidBody3D = NodePath("..")

6
godot/physics/grape.tscn
View File

@ -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://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="grape" instance=ExtResource("1_jlfas")]
[node name="is_TASable" parent="." index="3" node_paths=PackedStringArray("_assignedRigidBody3D") instance=ExtResource("2_qxcjc")]
_assignedRigidBody3D = NodePath("..")

9
godot/tests/TAS_system/TAS_test_003.tscn
View File

@ -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://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://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://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"] [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"] [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")] [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) 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")] [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) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.94627, 0)
continuous_cd = true 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")] [node name="TAS UI" parent="." index="7" instance=ExtResource("4_jskxr")]

9
godot/tests/control_scheme/test_basic_controls.tscn
View File

@ -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://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://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://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"] [sub_resource type="Environment" id="Environment_f0m14"]
ambient_light_source = 2 ambient_light_source = 2
@ -27,5 +28,7 @@ current = true
[node name="grape" parent="." index="4" instance=ExtResource("3_gijly")] [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) 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")] [node name="TAS UI" parent="." index="5" instance=ExtResource("4_8yatx")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.60495, 0)
[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)