From e27ddfe3f11d3a21f42d769771338d74514ed415 Mon Sep 17 00:00:00 2001 From: JonShard Date: Thu, 16 Jul 2026 15:09:12 +0200 Subject: [PATCH] Reorganize project into folder structure --- {Prefabs => Containers}/container.gd | 3 +- {Prefabs => Containers}/container.gd.uid | 0 {Prefabs => Containers}/container.tscn | 2 +- plate.tscn => Containers/plate.tscn | 2 +- BurgerBuns.tscn => Items/BurgerBuns.tscn | 6 +- Charcoal.tscn => Items/Charcoal.tscn | 0 PickupCube.tscn => Items/PickupCube.tscn | 8 +- burger.tscn => Items/burger.tscn | 4 +- .../cooked_burger.tscn | 8 +- hamburger.tscn => Items/hamburger.tscn | 4 +- .../combinable_item.gd | 0 .../combinable_item.gd.uid | 0 .../combinable_item.tscn | 15 ++-- .../combine_recipe.gd | 0 .../combine_recipe.gd.uid | 0 combine_zone.gd => Prefabs/combine_zone.gd | 0 .../combine_zone.gd.uid | 0 cookable_item.gd => Prefabs/cookable_item.gd | 0 .../cookable_item.gd.uid | 0 .../cookable_item.tscn | 4 +- food_item.gd => Prefabs/food_item.gd | 4 +- food_item.gd.uid => Prefabs/food_item.gd.uid | 0 food_item.tscn => Prefabs/food_item.tscn | 2 +- JonScene.tscn => Scenes/JonScene.tscn | 58 ++++++------ Scenes/JonScene.tscn1973786020.tmp | 90 +++++++++++++++++++ .../BurgerBunsDispenser.tscn | 4 +- Counter.tscn => Stations/Counter.tscn | 0 Hob.tscn => Stations/Hob.tscn | 2 +- hob.gd => Stations/hob.gd | 0 hob.gd.uid => Stations/hob.gd.uid | 0 .../item_dispenser.gd | 0 .../item_dispenser.gd.uid | 0 main.tscn | 10 +-- 33 files changed, 156 insertions(+), 70 deletions(-) rename {Prefabs => Containers}/container.gd (95%) rename {Prefabs => Containers}/container.gd.uid (100%) rename {Prefabs => Containers}/container.tscn (94%) rename plate.tscn => Containers/plate.tscn (98%) rename BurgerBuns.tscn => Items/BurgerBuns.tscn (96%) rename Charcoal.tscn => Items/Charcoal.tscn (100%) rename PickupCube.tscn => Items/PickupCube.tscn (94%) rename burger.tscn => Items/burger.tscn (96%) rename cooked_burger.tscn => Items/cooked_burger.tscn (94%) rename hamburger.tscn => Items/hamburger.tscn (98%) rename combinable_item.gd => Prefabs/combinable_item.gd (100%) rename combinable_item.gd.uid => Prefabs/combinable_item.gd.uid (100%) rename combinable_item.tscn => Prefabs/combinable_item.tscn (66%) rename combine_recipe.gd => Prefabs/combine_recipe.gd (100%) rename combine_recipe.gd.uid => Prefabs/combine_recipe.gd.uid (100%) rename combine_zone.gd => Prefabs/combine_zone.gd (100%) rename combine_zone.gd.uid => Prefabs/combine_zone.gd.uid (100%) rename cookable_item.gd => Prefabs/cookable_item.gd (100%) rename cookable_item.gd.uid => Prefabs/cookable_item.gd.uid (100%) rename cookable_item.tscn => Prefabs/cookable_item.tscn (79%) rename food_item.gd => Prefabs/food_item.gd (55%) rename food_item.gd.uid => Prefabs/food_item.gd.uid (100%) rename food_item.tscn => Prefabs/food_item.tscn (86%) rename JonScene.tscn => Scenes/JonScene.tscn (81%) create mode 100644 Scenes/JonScene.tscn1973786020.tmp rename BurgerBunsDispenser.tscn => Stations/BurgerBunsDispenser.tscn (98%) rename Counter.tscn => Stations/Counter.tscn (100%) rename Hob.tscn => Stations/Hob.tscn (98%) rename hob.gd => Stations/hob.gd (100%) rename hob.gd.uid => Stations/hob.gd.uid (100%) rename item_dispenser.gd => Stations/item_dispenser.gd (100%) rename item_dispenser.gd.uid => Stations/item_dispenser.gd.uid (100%) diff --git a/Prefabs/container.gd b/Containers/container.gd similarity index 95% rename from Prefabs/container.gd rename to Containers/container.gd index 853dba1..9c01565 100644 --- a/Prefabs/container.gd +++ b/Containers/container.gd @@ -28,8 +28,9 @@ func _on_body_entered (body) -> void: var picked_by = xr_pickable.get_picked_up_by() if picked_by and picked_by.is_in_group("station"): print("Container in station") - var food_item = get_node("FoodItem") + var food_item = body.get_node("FoodItem") if food_item.type == FoodItem.Type.MEAL or food_item.type == FoodItem.Type.SIDE: + print("Food is meal or side!") # if we're full of that type: # return # body disble pickable diff --git a/Prefabs/container.gd.uid b/Containers/container.gd.uid similarity index 100% rename from Prefabs/container.gd.uid rename to Containers/container.gd.uid diff --git a/Prefabs/container.tscn b/Containers/container.tscn similarity index 94% rename from Prefabs/container.tscn rename to Containers/container.tscn index 2e3da29..f2fab10 100644 --- a/Prefabs/container.tscn +++ b/Containers/container.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://du31pqeytu8as"] -[ext_resource type="Script" uid="uid://6lyhyial1fh5" path="res://Prefabs/container.gd" id="1_r4cle"] +[ext_resource type="Script" uid="uid://6lyhyial1fh5" path="res://Containers/container.gd" id="1_r4cle"] [sub_resource type="SphereShape3D" id="SphereShape3D_vlqg6"] radius = 0.2 diff --git a/plate.tscn b/Containers/plate.tscn similarity index 98% rename from plate.tscn rename to Containers/plate.tscn index 768c808..131c757 100644 --- a/plate.tscn +++ b/Containers/plate.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://bp3v1jl8pctro"] [ext_resource type="Script" uid="uid://bfrlpbsqg5lqr" path="res://addons/godot-xr-tools/objects/pickable.gd" id="1_nq5sa"] -[ext_resource type="PackedScene" uid="uid://du31pqeytu8as" path="res://Prefabs/container.tscn" id="1_s5yhh"] +[ext_resource type="PackedScene" uid="uid://du31pqeytu8as" path="res://Containers/container.tscn" id="1_s5yhh"] [ext_resource type="PackedScene" uid="uid://c25yxb0vt53vc" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_left.tscn" id="2_3bkoa"] [ext_resource type="Animation" uid="uid://db62hs5s4n2b3" path="res://addons/godot-xr-tools/hands/animations/left/Grip 4.res" id="3_6v47p"] [ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="4_dhtvl"] diff --git a/BurgerBuns.tscn b/Items/BurgerBuns.tscn similarity index 96% rename from BurgerBuns.tscn rename to Items/BurgerBuns.tscn index 27d62ff..77a5e54 100644 --- a/BurgerBuns.tscn +++ b/Items/BurgerBuns.tscn @@ -6,9 +6,9 @@ [ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="4_wb51u"] [ext_resource type="PackedScene" uid="uid://c25yxb0vt53vc" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_left.tscn" id="5_wqyr2"] [ext_resource type="Animation" uid="uid://bediglpx0rj7i" path="res://addons/godot-xr-tools/hands/animations/left/Grip 5.res" id="6_ftab3"] -[ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://combinable_item.tscn" id="7_wb51u"] -[ext_resource type="Script" uid="uid://coidnv8b2yvxr" path="res://combine_recipe.gd" id="8_wqyr2"] -[ext_resource type="PackedScene" uid="uid://b3m2ag8g5rj4r" path="res://hamburger.tscn" id="9_wb51u"] +[ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://Prefabs/combinable_item.tscn" id="7_wb51u"] +[ext_resource type="Script" uid="uid://coidnv8b2yvxr" path="res://Prefabs/combine_recipe.gd" id="8_wqyr2"] +[ext_resource type="PackedScene" uid="uid://b3m2ag8g5rj4r" path="res://Items/hamburger.tscn" id="9_wb51u"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_vlqg6"] height = 0.10708985 diff --git a/Charcoal.tscn b/Items/Charcoal.tscn similarity index 100% rename from Charcoal.tscn rename to Items/Charcoal.tscn diff --git a/PickupCube.tscn b/Items/PickupCube.tscn similarity index 94% rename from PickupCube.tscn rename to Items/PickupCube.tscn index 14790ba..ab93c68 100644 --- a/PickupCube.tscn +++ b/Items/PickupCube.tscn @@ -6,10 +6,10 @@ [ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="4_hc3f7"] [ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="5_a0a5b"] [ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="6_bdp75"] -[ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://combinable_item.tscn" id="7_bdp75"] -[ext_resource type="PackedScene" uid="uid://cucc3gaqu2nab" path="res://Charcoal.tscn" id="8_a0a5b"] -[ext_resource type="PackedScene" uid="uid://7earnjgdmwgx" path="res://cookable_item.tscn" id="10_65ccv"] -[ext_resource type="Script" uid="uid://coidnv8b2yvxr" path="res://combine_recipe.gd" id="11_recipe"] +[ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://Prefabs/combinable_item.tscn" id="7_bdp75"] +[ext_resource type="PackedScene" uid="uid://cucc3gaqu2nab" path="res://Items/Charcoal.tscn" id="8_a0a5b"] +[ext_resource type="PackedScene" uid="uid://7earnjgdmwgx" path="res://Prefabs/cookable_item.tscn" id="10_65ccv"] +[ext_resource type="Script" uid="uid://coidnv8b2yvxr" path="res://Prefabs/combine_recipe.gd" id="11_recipe"] [sub_resource type="BoxShape3D" id="BoxShape3D_m1xbq"] size = Vector3(0.1, 0.1, 0.1) diff --git a/burger.tscn b/Items/burger.tscn similarity index 96% rename from burger.tscn rename to Items/burger.tscn index f956ee5..32b1e23 100644 --- a/burger.tscn +++ b/Items/burger.tscn @@ -7,8 +7,8 @@ [ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="5_w8sii"] [ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="6_mvnl5"] [ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="7_wqxjj"] -[ext_resource type="PackedScene" uid="uid://7earnjgdmwgx" path="res://cookable_item.tscn" id="9_hwyyd"] -[ext_resource type="PackedScene" uid="uid://cfc4ho67u4r5e" path="res://cooked_burger.tscn" id="9_r8jvx"] +[ext_resource type="PackedScene" uid="uid://7earnjgdmwgx" path="res://Prefabs/cookable_item.tscn" id="9_hwyyd"] +[ext_resource type="PackedScene" uid="uid://cfc4ho67u4r5e" path="res://Items/cooked_burger.tscn" id="9_r8jvx"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_fco8w"] height = 0.0338974 diff --git a/cooked_burger.tscn b/Items/cooked_burger.tscn similarity index 94% rename from cooked_burger.tscn rename to Items/cooked_burger.tscn index ca5c8d3..c4e5164 100644 --- a/cooked_burger.tscn +++ b/Items/cooked_burger.tscn @@ -6,10 +6,10 @@ [ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="5_ychvb"] [ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="6_etdv2"] [ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="7_rl64h"] -[ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://combinable_item.tscn" id="10_ut7mg"] -[ext_resource type="PackedScene" uid="uid://7earnjgdmwgx" path="res://cookable_item.tscn" id="11_5ch2b"] -[ext_resource type="Script" uid="uid://coidnv8b2yvxr" path="res://combine_recipe.gd" id="11_rjayc"] -[ext_resource type="PackedScene" uid="uid://b3m2ag8g5rj4r" path="res://hamburger.tscn" id="11_ut7mg"] +[ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://Prefabs/combinable_item.tscn" id="10_ut7mg"] +[ext_resource type="PackedScene" uid="uid://7earnjgdmwgx" path="res://Prefabs/cookable_item.tscn" id="11_5ch2b"] +[ext_resource type="Script" uid="uid://coidnv8b2yvxr" path="res://Prefabs/combine_recipe.gd" id="11_rjayc"] +[ext_resource type="PackedScene" uid="uid://b3m2ag8g5rj4r" path="res://Items/hamburger.tscn" id="11_ut7mg"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_fco8w"] height = 0.04777527 diff --git a/hamburger.tscn b/Items/hamburger.tscn similarity index 98% rename from hamburger.tscn rename to Items/hamburger.tscn index 39eb897..4e8960d 100644 --- a/hamburger.tscn +++ b/Items/hamburger.tscn @@ -6,7 +6,7 @@ [ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="4_cljtj"] [ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="5_dunns"] [ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="6_fh0f6"] -[ext_resource type="PackedScene" uid="uid://bfj80jh13t6e5" path="res://food_item.tscn" id="7_yy3y8"] +[ext_resource type="PackedScene" uid="uid://bfj80jh13t6e5" path="res://Prefabs/food_item.tscn" id="7_yy3y8"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_fco8w"] height = 0.10392761 @@ -78,4 +78,4 @@ sides = 16 material = SubResource("StandardMaterial3D_6l01i") [node name="FoodItem" parent="." index="5" unique_id=63948206 instance=ExtResource("7_yy3y8")] -item_type = null +type = 0 diff --git a/combinable_item.gd b/Prefabs/combinable_item.gd similarity index 100% rename from combinable_item.gd rename to Prefabs/combinable_item.gd diff --git a/combinable_item.gd.uid b/Prefabs/combinable_item.gd.uid similarity index 100% rename from combinable_item.gd.uid rename to Prefabs/combinable_item.gd.uid diff --git a/combinable_item.tscn b/Prefabs/combinable_item.tscn similarity index 66% rename from combinable_item.tscn rename to Prefabs/combinable_item.tscn index bafd8ff..fb92cf9 100644 --- a/combinable_item.tscn +++ b/Prefabs/combinable_item.tscn @@ -1,21 +1,16 @@ [gd_scene format=3 uid="uid://3lr2dhy62rhk"] -[ext_resource type="Script" uid="uid://dounic663dn5q" path="res://combinable_item.gd" id="1_q21ti"] -[ext_resource type="Script" uid="uid://coidnv8b2yvxr" path="res://combine_recipe.gd" id="2_anbu7"] -[ext_resource type="Script" uid="uid://e3im02nq5cye" path="res://combine_zone.gd" id="4_0om48"] - -[sub_resource type="Resource" id="Resource_recipe_cube"] -script = ExtResource("2_anbu7") -ingredient_id = &"burger_buns" -result = null +[ext_resource type="Script" uid="uid://dounic663dn5q" path="res://Prefabs/combinable_item.gd" id="1_q21ti"] +[ext_resource type="Script" uid="uid://coidnv8b2yvxr" path="res://Prefabs/combine_recipe.gd" id="2_anbu7"] +[ext_resource type="Script" uid="uid://e3im02nq5cye" path="res://Prefabs/combine_zone.gd" id="4_0om48"] [sub_resource type="BoxShape3D" id="BoxShape3D_combine"] size = Vector3(0.16, 0.16, 0.16) [node name="CombinableItem" type="Node3D" unique_id=996936271] script = ExtResource("1_q21ti") -id = &"cooked_burger" -recipes = Array[ExtResource("2_anbu7")]([SubResource("Resource_recipe_cube")]) +id = &"some_food_item" +recipes = Array[ExtResource("2_anbu7")]([null]) [node name="CombineZone" type="Area3D" parent="." unique_id=1514178016] script = ExtResource("4_0om48") diff --git a/combine_recipe.gd b/Prefabs/combine_recipe.gd similarity index 100% rename from combine_recipe.gd rename to Prefabs/combine_recipe.gd diff --git a/combine_recipe.gd.uid b/Prefabs/combine_recipe.gd.uid similarity index 100% rename from combine_recipe.gd.uid rename to Prefabs/combine_recipe.gd.uid diff --git a/combine_zone.gd b/Prefabs/combine_zone.gd similarity index 100% rename from combine_zone.gd rename to Prefabs/combine_zone.gd diff --git a/combine_zone.gd.uid b/Prefabs/combine_zone.gd.uid similarity index 100% rename from combine_zone.gd.uid rename to Prefabs/combine_zone.gd.uid diff --git a/cookable_item.gd b/Prefabs/cookable_item.gd similarity index 100% rename from cookable_item.gd rename to Prefabs/cookable_item.gd diff --git a/cookable_item.gd.uid b/Prefabs/cookable_item.gd.uid similarity index 100% rename from cookable_item.gd.uid rename to Prefabs/cookable_item.gd.uid diff --git a/cookable_item.tscn b/Prefabs/cookable_item.tscn similarity index 79% rename from cookable_item.tscn rename to Prefabs/cookable_item.tscn index 052be98..109e231 100644 --- a/cookable_item.tscn +++ b/Prefabs/cookable_item.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://7earnjgdmwgx"] -[ext_resource type="Script" uid="uid://bs7cxydoxk1cx" path="res://cookable_item.gd" id="1_6hwx6"] -[ext_resource type="PackedScene" uid="uid://cucc3gaqu2nab" path="res://Charcoal.tscn" id="2_rpt7j"] +[ext_resource type="Script" uid="uid://bs7cxydoxk1cx" path="res://Prefabs/cookable_item.gd" id="1_6hwx6"] +[ext_resource type="PackedScene" uid="uid://cucc3gaqu2nab" path="res://Items/Charcoal.tscn" id="2_rpt7j"] [node name="CookableItem" type="Node" unique_id=280820828] script = ExtResource("1_6hwx6") diff --git a/food_item.gd b/Prefabs/food_item.gd similarity index 55% rename from food_item.gd rename to Prefabs/food_item.gd index 69fe647..fa3ba3f 100644 --- a/food_item.gd +++ b/Prefabs/food_item.gd @@ -2,7 +2,7 @@ class_name FoodItem extends Node # Define the Enum at the top of your script -enum Type { MEAL, SIDE, INGREDIENT } +enum Type { MEAL, SIDE, INGREDIENT, NONE } @export var id: String -@export var type: ItemType = Type.INGREDIENT +@export var type: Type = Type.NONE diff --git a/food_item.gd.uid b/Prefabs/food_item.gd.uid similarity index 100% rename from food_item.gd.uid rename to Prefabs/food_item.gd.uid diff --git a/food_item.tscn b/Prefabs/food_item.tscn similarity index 86% rename from food_item.tscn rename to Prefabs/food_item.tscn index ceca1a4..489b0c9 100644 --- a/food_item.tscn +++ b/Prefabs/food_item.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bfj80jh13t6e5"] -[ext_resource type="Script" uid="uid://5tpoohkopryv" path="res://food_item.gd" id="1_0na5k"] +[ext_resource type="Script" uid="uid://5tpoohkopryv" path="res://Prefabs/food_item.gd" id="1_0na5k"] [node name="FoodItem" type="Node" unique_id=63948206] script = ExtResource("1_0na5k") diff --git a/JonScene.tscn b/Scenes/JonScene.tscn similarity index 81% rename from JonScene.tscn rename to Scenes/JonScene.tscn index 184665d..b43f12a 100644 --- a/JonScene.tscn +++ b/Scenes/JonScene.tscn @@ -1,28 +1,28 @@ [gd_scene format=3 uid="uid://do6mrslyqe5qe"] -[ext_resource type="Script" uid="uid://b4ldkd3ngs0vp" path="res://main.gd" id="1_2yrrf"] -[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_lc11c"] -[ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://Textures/dev_material_3d.tres" id="3_wlcqk"] -[ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://Hob.tscn" id="4_cposl"] -[ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://Counter.tscn" id="5_rbb5l"] -[ext_resource type="PackedScene" uid="uid://e4i6o5oriecx" path="res://PickupCube.tscn" id="6_65p64"] -[ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://Textures/sky/NightSkyHDRI009_16K.tres" id="7_a81vl"] -[ext_resource type="PackedScene" uid="uid://c0lknik4noobs" path="res://BurgerBuns.tscn" id="8_wlcqk"] -[ext_resource type="PackedScene" uid="uid://c6rift56ql3f8" path="res://BurgerBunsDispenser.tscn" id="9_wlcqk"] -[ext_resource type="PackedScene" uid="uid://bp3v1jl8pctro" path="res://plate.tscn" id="10_rbb5l"] -[ext_resource type="PackedScene" uid="uid://dpot5qie20vf6" path="res://burger.tscn" id="11_65p64"] -[ext_resource type="PackedScene" uid="uid://b3m2ag8g5rj4r" path="res://hamburger.tscn" id="12_65p64"] +[ext_resource type="Script" uid="uid://b4ldkd3ngs0vp" path="res://main.gd" id="1_57ppd"] +[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_o1b3t"] +[ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://Textures/dev_material_3d.tres" id="3_irf4n"] +[ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://Stations/Hob.tscn" id="4_ctden"] +[ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://Stations/Counter.tscn" id="5_di04w"] +[ext_resource type="PackedScene" uid="uid://e4i6o5oriecx" path="res://Items/PickupCube.tscn" id="6_eoxxy"] +[ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://Textures/sky/NightSkyHDRI009_16K.tres" id="7_n8fyw"] +[ext_resource type="PackedScene" uid="uid://c0lknik4noobs" path="res://Items/BurgerBuns.tscn" id="8_rraok"] +[ext_resource type="PackedScene" uid="uid://c6rift56ql3f8" path="res://Stations/BurgerBunsDispenser.tscn" id="9_sq0s2"] +[ext_resource type="PackedScene" uid="uid://bp3v1jl8pctro" path="res://Containers/plate.tscn" id="10_ay2w6"] +[ext_resource type="PackedScene" uid="uid://dpot5qie20vf6" path="res://Items/burger.tscn" id="11_qn1ku"] +[ext_resource type="PackedScene" uid="uid://b3m2ag8g5rj4r" path="res://Items/hamburger.tscn" id="12_hfwnn"] [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"] size = Vector3(5, 0.1, 5) [sub_resource type="BoxMesh" id="BoxMesh_24d3s"] -material = ExtResource("3_wlcqk") +material = ExtResource("3_irf4n") size = Vector3(5, 0.1, 5) [sub_resource type="Environment" id="Environment_bvwq1"] background_mode = 2 -sky = ExtResource("7_a81vl") +sky = ExtResource("7_n8fyw") reflected_light_source = 2 ssr_enabled = true ssao_enabled = true @@ -30,9 +30,9 @@ ssil_enabled = true sdfgi_enabled = true [node name="Main" type="Node3D" unique_id=1312265607] -script = ExtResource("1_2yrrf") +script = ExtResource("1_57ppd") -[node name="XROrigin3D" parent="." unique_id=2055526621 instance=ExtResource("2_lc11c")] +[node name="XROrigin3D" parent="." unique_id=2055526621 instance=ExtResource("2_o1b3t")] [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) @@ -47,44 +47,44 @@ shape = SubResource("BoxShape3D_vlqg6") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00018164515, 0.0006352663, -0.002532661) mesh = SubResource("BoxMesh_24d3s") -[node name="Hob" parent="." unique_id=1687971542 instance=ExtResource("4_cposl")] +[node name="Hob" parent="." unique_id=1687971542 instance=ExtResource("4_ctden")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.29336345, 0.8981018, -1.484) -[node name="Counter" parent="." unique_id=1487893288 instance=ExtResource("5_rbb5l")] +[node name="Counter" parent="." unique_id=1487893288 instance=ExtResource("5_di04w")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.73186195, 0.8981018, -1.484) -[node name="PickableObject" parent="." unique_id=1675596942 instance=ExtResource("6_65p64")] +[node name="PickableObject" parent="." unique_id=1675596942 instance=ExtResource("6_eoxxy")] transform = Transform3D(1, 0, -2.2351742e-08, -2.9802322e-08, 1.0000001, 0, -2.6077032e-08, 1.4901161e-08, 1, 0.5842906, 1.5761534, -1.8163961) -[node name="PickableObject2" parent="." unique_id=713087634 instance=ExtResource("6_65p64")] +[node name="PickableObject2" parent="." unique_id=713087634 instance=ExtResource("6_eoxxy")] transform = Transform3D(1, 0, -2.2351742e-08, -2.9802322e-08, 1.0000001, 0, -2.6077032e-08, 1.4901161e-08, 1, -0.14558735, 1.5607953, -1.8242048) [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1177077250] environment = SubResource("Environment_bvwq1") -[node name="BurgerBuns" parent="." unique_id=1088240294 instance=ExtResource("8_wlcqk")] +[node name="BurgerBuns" parent="." unique_id=1088240294 instance=ExtResource("8_rraok")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8162017, 1.6081157, -1.4714175) -[node name="BurgerBunsDispenser" parent="." unique_id=1720683779 instance=ExtResource("9_wlcqk")] +[node name="BurgerBunsDispenser" parent="." unique_id=1720683779 instance=ExtResource("9_sq0s2")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.832131, 0.40028095, -1.4813508) -[node name="BurgerBuns2" parent="." unique_id=1909843084 instance=ExtResource("8_wlcqk")] +[node name="BurgerBuns2" parent="." unique_id=1909843084 instance=ExtResource("8_rraok")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.1282921, 1.4976386, -1.0923254) -[node name="Plate" parent="." unique_id=190487773 instance=ExtResource("10_rbb5l")] +[node name="Plate" parent="." unique_id=190487773 instance=ExtResource("10_ay2w6")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.53572595, 1.4458435, -1.135189) -[node name="burger" parent="." unique_id=1417604760 instance=ExtResource("11_65p64")] +[node name="burger" parent="." unique_id=1417604760 instance=ExtResource("11_qn1ku")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.91607785, 1.4235804, -1.0899508) -[node name="burger2" parent="." unique_id=1584460510 instance=ExtResource("11_65p64")] +[node name="burger2" parent="." unique_id=1584460510 instance=ExtResource("11_qn1ku")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.23121053, 1.4235804, -1.3225337) -[node name="burger3" parent="." unique_id=1884095916 instance=ExtResource("11_65p64")] +[node name="burger3" parent="." unique_id=1884095916 instance=ExtResource("11_qn1ku")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.22395861, 1.4235804, -1.1413177) -[node name="burger4" parent="." unique_id=1844818864 instance=ExtResource("11_65p64")] +[node name="burger4" parent="." unique_id=1844818864 instance=ExtResource("11_qn1ku")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.40808713, 1.4235804, -1.1413177) -[node name="Hamburger" parent="." unique_id=761091445 instance=ExtResource("12_65p64")] +[node name="Hamburger" parent="." unique_id=761091445 instance=ExtResource("12_hfwnn")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5295425, 1.994761, -1.1201752) diff --git a/Scenes/JonScene.tscn1973786020.tmp b/Scenes/JonScene.tscn1973786020.tmp new file mode 100644 index 0000000..b43f12a --- /dev/null +++ b/Scenes/JonScene.tscn1973786020.tmp @@ -0,0 +1,90 @@ +[gd_scene format=3 uid="uid://do6mrslyqe5qe"] + +[ext_resource type="Script" uid="uid://b4ldkd3ngs0vp" path="res://main.gd" id="1_57ppd"] +[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_o1b3t"] +[ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://Textures/dev_material_3d.tres" id="3_irf4n"] +[ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://Stations/Hob.tscn" id="4_ctden"] +[ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://Stations/Counter.tscn" id="5_di04w"] +[ext_resource type="PackedScene" uid="uid://e4i6o5oriecx" path="res://Items/PickupCube.tscn" id="6_eoxxy"] +[ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://Textures/sky/NightSkyHDRI009_16K.tres" id="7_n8fyw"] +[ext_resource type="PackedScene" uid="uid://c0lknik4noobs" path="res://Items/BurgerBuns.tscn" id="8_rraok"] +[ext_resource type="PackedScene" uid="uid://c6rift56ql3f8" path="res://Stations/BurgerBunsDispenser.tscn" id="9_sq0s2"] +[ext_resource type="PackedScene" uid="uid://bp3v1jl8pctro" path="res://Containers/plate.tscn" id="10_ay2w6"] +[ext_resource type="PackedScene" uid="uid://dpot5qie20vf6" path="res://Items/burger.tscn" id="11_qn1ku"] +[ext_resource type="PackedScene" uid="uid://b3m2ag8g5rj4r" path="res://Items/hamburger.tscn" id="12_hfwnn"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"] +size = Vector3(5, 0.1, 5) + +[sub_resource type="BoxMesh" id="BoxMesh_24d3s"] +material = ExtResource("3_irf4n") +size = Vector3(5, 0.1, 5) + +[sub_resource type="Environment" id="Environment_bvwq1"] +background_mode = 2 +sky = ExtResource("7_n8fyw") +reflected_light_source = 2 +ssr_enabled = true +ssao_enabled = true +ssil_enabled = true +sdfgi_enabled = true + +[node name="Main" type="Node3D" unique_id=1312265607] +script = ExtResource("1_57ppd") + +[node name="XROrigin3D" parent="." unique_id=2055526621 instance=ExtResource("2_o1b3t")] + +[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) + +[node name="Floor" type="StaticBody3D" parent="." unique_id=122279514] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.05, 0) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Floor" unique_id=958841648] +shape = SubResource("BoxShape3D_vlqg6") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Floor/CollisionShape3D" unique_id=1939997056] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00018164515, 0.0006352663, -0.002532661) +mesh = SubResource("BoxMesh_24d3s") + +[node name="Hob" parent="." unique_id=1687971542 instance=ExtResource("4_ctden")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.29336345, 0.8981018, -1.484) + +[node name="Counter" parent="." unique_id=1487893288 instance=ExtResource("5_di04w")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.73186195, 0.8981018, -1.484) + +[node name="PickableObject" parent="." unique_id=1675596942 instance=ExtResource("6_eoxxy")] +transform = Transform3D(1, 0, -2.2351742e-08, -2.9802322e-08, 1.0000001, 0, -2.6077032e-08, 1.4901161e-08, 1, 0.5842906, 1.5761534, -1.8163961) + +[node name="PickableObject2" parent="." unique_id=713087634 instance=ExtResource("6_eoxxy")] +transform = Transform3D(1, 0, -2.2351742e-08, -2.9802322e-08, 1.0000001, 0, -2.6077032e-08, 1.4901161e-08, 1, -0.14558735, 1.5607953, -1.8242048) + +[node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1177077250] +environment = SubResource("Environment_bvwq1") + +[node name="BurgerBuns" parent="." unique_id=1088240294 instance=ExtResource("8_rraok")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8162017, 1.6081157, -1.4714175) + +[node name="BurgerBunsDispenser" parent="." unique_id=1720683779 instance=ExtResource("9_sq0s2")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.832131, 0.40028095, -1.4813508) + +[node name="BurgerBuns2" parent="." unique_id=1909843084 instance=ExtResource("8_rraok")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.1282921, 1.4976386, -1.0923254) + +[node name="Plate" parent="." unique_id=190487773 instance=ExtResource("10_ay2w6")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.53572595, 1.4458435, -1.135189) + +[node name="burger" parent="." unique_id=1417604760 instance=ExtResource("11_qn1ku")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.91607785, 1.4235804, -1.0899508) + +[node name="burger2" parent="." unique_id=1584460510 instance=ExtResource("11_qn1ku")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.23121053, 1.4235804, -1.3225337) + +[node name="burger3" parent="." unique_id=1884095916 instance=ExtResource("11_qn1ku")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.22395861, 1.4235804, -1.1413177) + +[node name="burger4" parent="." unique_id=1844818864 instance=ExtResource("11_qn1ku")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.40808713, 1.4235804, -1.1413177) + +[node name="Hamburger" parent="." unique_id=761091445 instance=ExtResource("12_hfwnn")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5295425, 1.994761, -1.1201752) diff --git a/BurgerBunsDispenser.tscn b/Stations/BurgerBunsDispenser.tscn similarity index 98% rename from BurgerBunsDispenser.tscn rename to Stations/BurgerBunsDispenser.tscn index a4bf49d..d753374 100644 --- a/BurgerBunsDispenser.tscn +++ b/Stations/BurgerBunsDispenser.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://c6rift56ql3f8"] -[ext_resource type="Script" uid="uid://0y6wnjcsum6" path="res://item_dispenser.gd" id="1_myl3s"] +[ext_resource type="Script" uid="uid://0y6wnjcsum6" path="res://Stations/item_dispenser.gd" id="1_myl3s"] [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="1_p30r1"] -[ext_resource type="PackedScene" uid="uid://c0lknik4noobs" path="res://BurgerBuns.tscn" id="2_1q74o"] +[ext_resource type="PackedScene" uid="uid://c0lknik4noobs" path="res://Items/BurgerBuns.tscn" id="2_1q74o"] [sub_resource type="SphereShape3D" id="SphereShape3D_xmbo2"] radius = 0.3 diff --git a/Counter.tscn b/Stations/Counter.tscn similarity index 100% rename from Counter.tscn rename to Stations/Counter.tscn diff --git a/Hob.tscn b/Stations/Hob.tscn similarity index 98% rename from Hob.tscn rename to Stations/Hob.tscn index ab673b1..2530c24 100644 --- a/Hob.tscn +++ b/Stations/Hob.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://j7caslh27nor"] -[ext_resource type="Script" uid="uid://bsn8vhv5adxdo" path="res://hob.gd" id="1_7jc4g"] +[ext_resource type="Script" uid="uid://bsn8vhv5adxdo" path="res://Stations/hob.gd" id="1_7jc4g"] [ext_resource type="Texture2D" uid="uid://b7n8d4krwbcvl" path="res://Textures/5.png" id="2_0sasq"] [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="2_er1dp"] diff --git a/hob.gd b/Stations/hob.gd similarity index 100% rename from hob.gd rename to Stations/hob.gd diff --git a/hob.gd.uid b/Stations/hob.gd.uid similarity index 100% rename from hob.gd.uid rename to Stations/hob.gd.uid diff --git a/item_dispenser.gd b/Stations/item_dispenser.gd similarity index 100% rename from item_dispenser.gd rename to Stations/item_dispenser.gd diff --git a/item_dispenser.gd.uid b/Stations/item_dispenser.gd.uid similarity index 100% rename from item_dispenser.gd.uid rename to Stations/item_dispenser.gd.uid diff --git a/main.tscn b/main.tscn index b048f6e..88dac01 100644 --- a/main.tscn +++ b/main.tscn @@ -3,12 +3,12 @@ [ext_resource type="Script" uid="uid://b4ldkd3ngs0vp" path="res://main.gd" id="1_0xm2m"] [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_h2yge"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://Textures/dev_material_3d.tres" id="3_272bh"] -[ext_resource type="PackedScene" uid="uid://e4i6o5oriecx" path="res://PickupCube.tscn" id="3_h2yge"] -[ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://Hob.tscn" id="3_lquwl"] -[ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://Counter.tscn" id="4_7mycd"] +[ext_resource type="PackedScene" uid="uid://e4i6o5oriecx" path="res://Items/PickupCube.tscn" id="3_h2yge"] +[ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://Stations/Hob.tscn" id="3_lquwl"] +[ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://Stations/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"] +[ext_resource type="PackedScene" uid="uid://dpot5qie20vf6" path="res://Items/burger.tscn" id="8_5vw27"] +[ext_resource type="PackedScene" uid="uid://bp3v1jl8pctro" path="res://Containers/plate.tscn" id="9_kek77"] [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"] size = Vector3(5, 0.1, 5)