Merge branch 'master' of https://git.offcoursegames.com/JonShard/VRyHungry1

Prefabs/container.tscn

@@ -0,0 +1,51 @@
+[gd_scene format=3 uid="uid://du31pqeytu8as"]
+
+[ext_resource type="PackedScene" uid="uid://c8l60rnugru40" path="res://addons/godot-xr-tools/objects/pickable.tscn" id="1_gc2lj"]
+[ext_resource type="PackedScene" uid="uid://c25yxb0vt53vc" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_left.tscn" id="2_2yi8i"]
+[ext_resource type="Animation" uid="uid://db62hs5s4n2b3" path="res://addons/godot-xr-tools/hands/animations/left/Grip 4.res" id="3_ruxut"]
+[ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="4_wcdop"]
+[ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="5_faibp"]
+[ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="6_uv6q4"]
+[ext_resource type="Script" uid="uid://dounic663dn5q" path="res://combinable_item.gd" id="7_tl02b"]
+[ext_resource type="Script" uid="uid://coidnv8b2yvxr" path="res://combine_recipe.gd" id="8_78en8"]
+[ext_resource type="PackedScene" uid="uid://cucc3gaqu2nab" path="res://Charcoal.tscn" id="9_tbb42"]
+[ext_resource type="Script" uid="uid://e3im02nq5cye" path="res://combine_zone.gd" id="10_gdify"]
+
+[sub_resource type="Resource" id="Resource_2hcq0"]
+script = ExtResource("4_wcdop")
+closed_pose = ExtResource("3_ruxut")
+metadata/_custom_type_script = "uid://dvobm6vcfnqe8"
+
+[sub_resource type="Resource" id="Resource_dlngj"]
+script = ExtResource("4_wcdop")
+closed_pose = ExtResource("6_uv6q4")
+metadata/_custom_type_script = "uid://dvobm6vcfnqe8"
+
+[sub_resource type="Resource" id="Resource_recipe_cube"]
+script = ExtResource("8_78en8")
+ingredient_id = &"cube"
+result = ExtResource("9_tbb42")
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_u2x4d"]
+size = Vector3(0.16, 0.16, 0.16)
+
+[node name="Container" unique_id=190487773 instance=ExtResource("1_gc2lj")]
+
+[node name="GrabPointHandLeft" parent="." index="1" unique_id=317886291 instance=ExtResource("2_2yi8i")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.067650706, 0.04601878, -0.08606844)
+hand_pose = SubResource("Resource_2hcq0")
+
+[node name="GrabPointHandRight" parent="." index="2" unique_id=248026585 instance=ExtResource("5_faibp")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.06531982, 0.042291984, -0.08604182)
+hand_pose = SubResource("Resource_dlngj")
+
+[node name="CombinableItem" type="Node" parent="." index="3" unique_id=158282297]
+script = ExtResource("7_tl02b")
+id = &"None"
+recipes = Array[ExtResource("8_78en8")]([SubResource("Resource_recipe_cube")])
+
+[node name="CombineZone" type="Area3D" parent="." index="4" unique_id=1782955181]
+script = ExtResource("10_gdify")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="CombineZone" index="0" unique_id=819250076]
+shape = SubResource("BoxShape3D_u2x4d")

burger.tscn

@@ -45,8 +45,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0005453825, 0)
 shape = SubResource("CylinderShape3D_fco8w")
 
 [node name="CSGCylinder3D" type="CSGCylinder3D" parent="." index="1" unique_id=59319982]
-radius = 0.1
+radius = 0.08300781
 height = 0.03
+sides = 16
 material = SubResource("StandardMaterial3D_bvwq1")
 
 [node name="GrabPointHandLeft" parent="." index="2" unique_id=1571481674 instance=ExtResource("3_qixic")]

main.tscn

@@ -8,6 +8,7 @@
 [ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://Counter.tscn" id="4_7mycd"]
 [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://Textures/sky/NightSkyHDRI009_16K.tres" id="6_7mycd"]
 [ext_resource type="PackedScene" uid="uid://dpot5qie20vf6" path="res://burger.tscn" id="8_5vw27"]
+[ext_resource type="PackedScene" uid="uid://bp3v1jl8pctro" path="res://plate.tscn" id="9_kek77"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"]
 size = Vector3(5, 0.1, 5)
@@ -30,6 +31,7 @@ sdfgi_enabled = true
 script = ExtResource("1_0xm2m")
 
 [node name="XROrigin3D" parent="." unique_id=2055526621 instance=ExtResource("2_h2yge")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8820953, 0)
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=1376644384]
 transform = Transform3D(-0.8660254, -0.43301278, 0.24999999, 0.3022632, -0.05510214, 0.9516306, -0.39829266, 0.8997021, 0.17860365, 0, 0, 0)
@@ -66,5 +68,8 @@ light_color = Color(1, 0.38431373, 0, 1)
 light_energy = 1.784
 shadow_enabled = true
 
-[node name="PickableObject3" parent="." unique_id=1428188966 instance=ExtResource("8_5vw27")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.572903, -1.1190817)
+[node name="burger" parent="." unique_id=1554047278 instance=ExtResource("8_5vw27")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.482068, -1.2252241)
+
+[node name="Plate" parent="." unique_id=190487773 instance=ExtResource("9_kek77")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.22971058, 1.699144, -1.8499806)

plate.tscn

@@ -0,0 +1,43 @@
+[gd_scene format=3 uid="uid://bp3v1jl8pctro"]
+
+[ext_resource type="PackedScene" uid="uid://du31pqeytu8as" path="res://Prefabs/container.tscn" id="1_s5yhh"]
+
+[sub_resource type="CylinderShape3D" id="CylinderShape3D_kek77"]
+height = 0.0635376
+radius = 0.20996094
+
+[node name="Plate" unique_id=190487773 instance=ExtResource("1_s5yhh")]
+
+[node name="CollisionShape3D" parent="." index="0"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.007171631, 0)
+shape = SubResource("CylinderShape3D_kek77")
+
+[node name="CSGCombiner3D" type="CSGCombiner3D" parent="." index="1" unique_id=1767596918]
+autosmooth = true
+smoothing_angle = 103.9
+
+[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D" index="0" unique_id=410722205]
+radius = 0.2
+height = 0.03
+sides = 16
+
+[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCylinder3D" index="0" unique_id=1041060379]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.010312311, 0)
+operation = 2
+radius = 0.15
+height = 0.03
+sides = 16
+
+[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="CSGCombiner3D" index="1" unique_id=1827566539]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.027119078, 0)
+radius = 0.15
+height = 0.02
+
+[node name="GrabPointHandLeft" parent="." index="2" unique_id=317886291]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.1699356, 0.04601878, -0.08606844)
+
+[node name="GrabPointHandRight" parent="." index="3" unique_id=248026585]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.16517048, 0.042291984, -0.08604182)
+
+[node name="CombinableItem" parent="." index="4" unique_id=158282297]
+id = &"plate"