From 0c1439c4f3bac693ae7eed741cacb7fdf420ba45 Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Sun, 12 Nov 2023 14:38:27 -0700 Subject: [PATCH] a --- godot/Objects/domino/domino2.tscn | 12 +++++++++++- godot/tests/control_scheme/test_basic_controls.tscn | 8 ++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/godot/Objects/domino/domino2.tscn b/godot/Objects/domino/domino2.tscn index 116e195..6256a9a 100644 --- a/godot/Objects/domino/domino2.tscn +++ b/godot/Objects/domino/domino2.tscn @@ -1,8 +1,18 @@ -[gd_scene load_steps=2 format=3 uid="uid://b7qky0n2ea40e"] +[gd_scene load_steps=3 format=3 uid="uid://b7qky0n2ea40e"] [ext_resource type="PackedScene" uid="uid://dmttoc025f26x" path="res://Domino.glb" id="1_n2u88"] +[sub_resource type="BoxShape3D" id="BoxShape3D_ckxw5"] +size = Vector3(0.050583, 0.0932653, 0.0171852) + [node name="Domino" instance=ExtResource("1_n2u88")] +[node name="Domino2" parent="." index="2"] +transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) + [node name="CollisionShape3D" parent="." index="3"] transform = Transform3D(0.999984, 0, 0, 0, 0.999984, 0, 0, 0, 0.999984, 0, 0, 0) + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="." index="4"] +transform = Transform3D(0.999984, 0, 0, 0, 0.999984, 0, 0, 0, 0.999984, 0, 0, 0) +shape = SubResource("BoxShape3D_ckxw5") diff --git a/godot/tests/control_scheme/test_basic_controls.tscn b/godot/tests/control_scheme/test_basic_controls.tscn index 0de6714..02362e9 100644 --- a/godot/tests/control_scheme/test_basic_controls.tscn +++ b/godot/tests/control_scheme/test_basic_controls.tscn @@ -1,15 +1,16 @@ -[gd_scene load_steps=15 format=3 uid="uid://70bb2yncbl"] +[gd_scene load_steps=16 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"] -[ext_resource type="PackedScene" path="res://cake.tscn" id="5_udc7s"] +[ext_resource type="PackedScene" uid="uid://cx4ohbn84hmc3" path="res://cake.tscn" id="5_udc7s"] [ext_resource type="PackedScene" uid="uid://cfpiau12q3fut" path="res://Objects/child/child.tscn" id="6_52mue"] [ext_resource type="PackedScene" uid="uid://dfkyytk42ecwk" path="res://Objects/igloo/igloo.tscn" id="7_ifsxo"] [ext_resource type="Script" path="res://tests/control_scheme/screen_shader.gd" id="8_crgih"] [ext_resource type="Shader" path="res://tests/control_scheme/screen_shader.gdshader" id="8_w6ylu"] [ext_resource type="AudioStream" uid="uid://dw06bektw4j8m" path="res://audio/TricksterGhostNew.mp3" id="10_4mw33"] +[ext_resource type="PackedScene" uid="uid://b7qky0n2ea40e" path="res://Objects/domino/domino2.tscn" id="11_2c1js"] [sub_resource type="Gradient" id="Gradient_iyif7"] offsets = PackedFloat32Array(0.333333, 0.635088, 1) @@ -88,3 +89,6 @@ transform = Transform3D(0.495368, 0.868683, -1.47631e-08, -0.635304, 0.362283, 0 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="11"] stream = ExtResource("10_4mw33") autoplay = true + +[node name="Domino" parent="." index="12" instance=ExtResource("11_2c1js")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.50107, 1.40023, 0)