From 2bf7a3686fa1c2f28c3652669ee3873ab3869536 Mon Sep 17 00:00:00 2001 From: Snorre Date: Sat, 5 Apr 2025 18:15:43 +0200 Subject: [PATCH] gjklsfdhg --- resources/player.tscn | 20 ++++++++++++---- scenes/test.tscn | 56 ++----------------------------------------- 2 files changed, 18 insertions(+), 58 deletions(-) diff --git a/resources/player.tscn b/resources/player.tscn index 48b0731..9d8cfc8 100644 --- a/resources/player.tscn +++ b/resources/player.tscn @@ -1,16 +1,19 @@ -[gd_scene load_steps=7 format=3 uid="uid://8fmy7u5fyonc"] +[gd_scene load_steps=8 format=3 uid="uid://8fmy7u5fyonc"] [ext_resource type="Script" uid="uid://bf27rxigs8b22" path="res://scripts/XRHand.cs" id="1_gyc3h"] [ext_resource type="Script" uid="uid://dglj0x0bpkx5i" path="res://scripts/XrOrigin3d.cs" id="1_ucfva"] [ext_resource type="Script" uid="uid://typrll7n6g3e" path="res://scripts/Mouth.cs" id="3_un1ji"] [sub_resource type="CapsuleMesh" id="CapsuleMesh_ij1v8"] -radius = 0.1 -height = 0.2 +radius = 0.05 +height = 0.1 [sub_resource type="SphereShape3D" id="SphereShape3D_iyx0m"] radius = 0.01 +[sub_resource type="SphereShape3D" id="SphereShape3D_un1ji"] +radius = 0.1 + [sub_resource type="SphereShape3D" id="SphereShape3D_ucfva"] radius = 0.03 @@ -35,6 +38,11 @@ freeze_mode = 1 shape = SubResource("SphereShape3D_iyx0m") disabled = true +[node name="Area3D" type="Area3D" parent="LeftHand"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="LeftHand/Area3D"] +shape = SubResource("SphereShape3D_un1ji") + [node name="RightHand" type="XRController3D" parent="." node_paths=PackedStringArray("body")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.412168, 0.292391, 0) tracker = &"right_hand" @@ -52,11 +60,15 @@ freeze_mode = 1 shape = SubResource("SphereShape3D_iyx0m") disabled = true +[node name="Area3D" type="Area3D" parent="RightHand"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="RightHand/Area3D"] +shape = SubResource("SphereShape3D_un1ji") + [node name="XRCamera3D" type="XRCamera3D" parent="." node_paths=PackedStringArray("RightHand", "LeftHand")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.821388, 0.40056) near = 0.005 script = ExtResource("3_un1ji") -MaxEatWeight = 0.1 RightHand = NodePath("../RightHand") LeftHand = NodePath("../LeftHand") diff --git a/scenes/test.tscn b/scenes/test.tscn index ca10256..3527647 100644 --- a/scenes/test.tscn +++ b/scenes/test.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=10 format=3 uid="uid://din25343yu8wv"] +[gd_scene load_steps=9 format=3 uid="uid://din25343yu8wv"] [ext_resource type="PackedScene" uid="uid://csh2n73hb2co8" path="res://models/banana.fbx" id="2_bl13t"] [ext_resource type="PackedScene" uid="uid://8fmy7u5fyonc" path="res://resources/player.tscn" id="2_iyx0m"] -[ext_resource type="PackedScene" uid="uid://ctjaib3jr4ug5" path="res://resources/food/test_pellet.tscn" id="3_iyx0m"] [sub_resource type="FastNoiseLite" id="FastNoiseLite_bl13t"] @@ -34,7 +33,7 @@ skeleton = NodePath("") shape = SubResource("WorldBoundaryShape3D_lpvoh") [node name="Bananan" type="RigidBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0676612, 0.724976, -0.380918) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0676612, 0.46696, -0.00682727) [node name="banana" parent="Bananan" instance=ExtResource("2_bl13t")] transform = Transform3D(0.02, 0, 0, 0, 0.02, 0, 0, 0, 0.02, 0, 0, 0) @@ -49,54 +48,3 @@ shape = SubResource("CapsuleShape3D_74lek") [node name="Player" parent="." instance=ExtResource("2_iyx0m")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.0012418) - -[node name="test pellet" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00932735, 0.01, -0.0187979) - -[node name="test pellet2" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0320477, 0.01, -0.0179864) - -[node name="test pellet3" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0320477, 0.01, 0.00716831) - -[node name="test pellet4" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0109501, 0.01, 0.0104141) - -[node name="test pellet5" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0166389, 0.01, 0.00392256) - -[node name="test pellet6" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0182618, 0.01, -0.0196093) - -[node name="test pellet7" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0393593, 0.01, 0.00554545) - -[node name="test pellet8" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0125817, 0.01, 0.0233972) - -[node name="test pellet9" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0158188, 0.01, 0.0339459) - -[node name="test pellet10" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0393507, 0.01, 0.0315116) - -[node name="test pellet11" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00609013, 0.01, 0.0526091) - -[node name="test pellet12" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0426051, 0.01, 0.0380031) - -[node name="test pellet13" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.044228, 0.01, -0.0204207) - -[node name="test pellet14" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00527874, 0.01, -0.0398954) - -[node name="test pellet15" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.062071, 0.01, -0.00824909) - -[node name="test pellet16" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.031245, 0.01, -0.0415182) - -[node name="test pellet17" parent="." instance=ExtResource("3_iyx0m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0718171, 0.01, -0.000134636)