diff --git a/Models/Furniture/90sGameroomBoothDouble.glb b/Models/Furniture/90sGameroomBoothDouble.glb new file mode 100644 index 0000000..1bf59f2 Binary files /dev/null and b/Models/Furniture/90sGameroomBoothDouble.glb differ diff --git a/Models/Furniture/90sGameroomBoothDouble.glb.import b/Models/Furniture/90sGameroomBoothDouble.glb.import new file mode 100644 index 0000000..3f7a3a5 --- /dev/null +++ b/Models/Furniture/90sGameroomBoothDouble.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bjyfhsq4do1nx" +path="res://.godot/imported/90sGameroomBoothDouble.glb-dcc97150bb845db075f704485c8603fe.scn" + +[deps] + +source_file="res://Models/Furniture/90sGameroomBoothDouble.glb" +dest_files=["res://.godot/imported/90sGameroomBoothDouble.glb-dcc97150bb845db075f704485c8603fe.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/Models/Furniture/90sGameroomBoothSingle.glb b/Models/Furniture/90sGameroomBoothSingle.glb new file mode 100644 index 0000000..50ddf92 Binary files /dev/null and b/Models/Furniture/90sGameroomBoothSingle.glb differ diff --git a/Models/Furniture/90sGameroomBoothSingle.glb.import b/Models/Furniture/90sGameroomBoothSingle.glb.import new file mode 100644 index 0000000..5951232 --- /dev/null +++ b/Models/Furniture/90sGameroomBoothSingle.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://0u3pbwck2ur2" +path="res://.godot/imported/90sGameroomBoothSingle.glb-503f8a7835a4e4508479539fb84495c2.scn" + +[deps] + +source_file="res://Models/Furniture/90sGameroomBoothSingle.glb" +dest_files=["res://.godot/imported/90sGameroomBoothSingle.glb-503f8a7835a4e4508479539fb84495c2.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/Models/Furniture/90sShowroomBoothDouble.glb b/Models/Furniture/90sShowroomBoothDouble.glb new file mode 100644 index 0000000..4e2e9ce Binary files /dev/null and b/Models/Furniture/90sShowroomBoothDouble.glb differ diff --git a/Models/Furniture/90sShowroomBoothDouble.glb.import b/Models/Furniture/90sShowroomBoothDouble.glb.import new file mode 100644 index 0000000..eca0fd9 --- /dev/null +++ b/Models/Furniture/90sShowroomBoothDouble.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cs4vqegg8bw53" +path="res://.godot/imported/90sShowroomBoothDouble.glb-6bc5d2e9b22a638d99dbc28a55fb5fdf.scn" + +[deps] + +source_file="res://Models/Furniture/90sShowroomBoothDouble.glb" +dest_files=["res://.godot/imported/90sShowroomBoothDouble.glb-6bc5d2e9b22a638d99dbc28a55fb5fdf.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/Models/Furniture/90sShowroomBoothSingle.glb b/Models/Furniture/90sShowroomBoothSingle.glb new file mode 100644 index 0000000..b878b0e Binary files /dev/null and b/Models/Furniture/90sShowroomBoothSingle.glb differ diff --git a/Models/Furniture/90sShowroomBoothSingle.glb.import b/Models/Furniture/90sShowroomBoothSingle.glb.import new file mode 100644 index 0000000..84b2aef --- /dev/null +++ b/Models/Furniture/90sShowroomBoothSingle.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://covfe2tcx1n05" +path="res://.godot/imported/90sShowroomBoothSingle.glb-3ef846fcd49deb23cfdd194db515afe0.scn" + +[deps] + +source_file="res://Models/Furniture/90sShowroomBoothSingle.glb" +dest_files=["res://.godot/imported/90sShowroomBoothSingle.glb-3ef846fcd49deb23cfdd194db515afe0.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/Scenes/FreeRoam/Generic/Generic1Stage.tscn b/Scenes/FreeRoam/Generic/Generic1Stage.tscn index 49264eb..f5e7501 100644 --- a/Scenes/FreeRoam/Generic/Generic1Stage.tscn +++ b/Scenes/FreeRoam/Generic/Generic1Stage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=3 uid="uid://b6rem1te85htp"] +[gd_scene load_steps=37 format=3 uid="uid://b6rem1te85htp"] [ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_8m4fm"] [ext_resource type="PackedScene" uid="uid://bf4aq55iy3yey" path="res://Models/Stages/1-Stage/1StageGeneric.glb" id="2_ncqi6"] @@ -27,6 +27,8 @@ [ext_resource type="Texture2D" uid="uid://c3orc2ig7n2rc" path="res://Models/Props/CECGOBO.png" id="22_1oq0m"] [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="26_6rkbs"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="27_xpgff"] +[ext_resource type="PackedScene" uid="uid://dwv4f6bls2btr" path="res://Scenes/Props/StaticFurniture/90sShowroomBoothDouble.tscn" id="28_xsano"] +[ext_resource type="PackedScene" uid="uid://b3y3v2k05s3qx" path="res://Scenes/Props/StaticFurniture/90sShowroomBoothSingle.tscn" id="29_xsano"] [sub_resource type="Environment" id="Environment_0tsrs"] ambient_light_source = 1 @@ -498,4 +500,12 @@ script = ExtResource("27_xpgff") [node name="PropHandle" type="Node3D" parent="."] +[node name="Booths" type="Node3D" parent="."] + +[node name="90sShowroomBoothDouble" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9, 0, 1.5) + +[node name="90sShowroomBoothDouble2" parent="Booths" instance=ExtResource("29_xsano")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 9, 0, 0) + [editable path="StageModel"] diff --git a/Scenes/Props/Physics/BouncyBall.tscn b/Scenes/Props/Physics/BouncyBall.tscn index f165678..bcd3999 100644 --- a/Scenes/Props/Physics/BouncyBall.tscn +++ b/Scenes/Props/Physics/BouncyBall.tscn @@ -9,7 +9,7 @@ bounce = 10.0 [sub_resource type="SphereShape3D" id="SphereShape3D_ly1my"] radius = 0.25 -[node name="ShowroomChair" type="Node3D"] +[node name="BouncyBall" type="Node3D"] [node name="RigidBody3D" type="RigidBody3D" parent="."] physics_material_override = SubResource("PhysicsMaterial_lbe82") diff --git a/Scenes/Props/Physics/ShowroomChairRed.tscn b/Scenes/Props/Physics/ShowroomChairRed.tscn index f5a2f49..d5f1104 100644 --- a/Scenes/Props/Physics/ShowroomChairRed.tscn +++ b/Scenes/Props/Physics/ShowroomChairRed.tscn @@ -11,7 +11,7 @@ size = Vector3(0.55, 0.6, 0.55) [sub_resource type="BoxShape3D" id="BoxShape3D_domyf"] size = Vector3(0.05, 0.6, 0.55) -[node name="ShowroomChair" type="Node3D"] +[node name="ShowroomChairRed" type="Node3D"] [node name="RigidBody3D" type="RigidBody3D" parent="."] mass = 5.0 diff --git a/Scenes/Props/StaticFurniture/90sGameroomBoothDouble.tscn b/Scenes/Props/StaticFurniture/90sGameroomBoothDouble.tscn new file mode 100644 index 0000000..85c3567 --- /dev/null +++ b/Scenes/Props/StaticFurniture/90sGameroomBoothDouble.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=5 format=3 uid="uid://drefk2prtcm45"] + +[ext_resource type="PackedScene" uid="uid://bjyfhsq4do1nx" path="res://Models/Furniture/90sGameroomBoothDouble.glb" id="1_g4lvn"] + +[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_lbe82"] +friction = 0.5 + +[sub_resource type="BoxShape3D" id="BoxShape3D_lbe82"] +size = Vector3(1.2, 0.4, 1.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_domyf"] +size = Vector3(0.2, 0.6, 1.5) + +[node name="90sGameroomBoothDouble" type="Node3D"] + +[node name="90sGameroomBoothDouble" parent="." instance=ExtResource("1_g4lvn")] + +[node name="StaticBody3D" type="StaticBody3D" parent="."] +physics_material_override = SubResource("PhysicsMaterial_lbe82") + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.2, 0) +shape = SubResource("BoxShape3D_lbe82") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.7, 0) +shape = SubResource("BoxShape3D_domyf") diff --git a/Scenes/Props/StaticFurniture/90sGameroomBoothSingle.tscn b/Scenes/Props/StaticFurniture/90sGameroomBoothSingle.tscn new file mode 100644 index 0000000..6485b15 --- /dev/null +++ b/Scenes/Props/StaticFurniture/90sGameroomBoothSingle.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=5 format=3 uid="uid://du5bev7fs7kwf"] + +[ext_resource type="PackedScene" uid="uid://0u3pbwck2ur2" path="res://Models/Furniture/90sGameroomBoothSingle.glb" id="1_5ue8p"] + +[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_lbe82"] +friction = 0.5 + +[sub_resource type="BoxShape3D" id="BoxShape3D_lbe82"] +size = Vector3(0.65, 0.4, 1.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_domyf"] +size = Vector3(0.1, 0.6, 1.5) + +[node name="90sGameroomBoothSingle" type="Node3D"] + +[node name="90sGameroomBoothSingle" parent="." instance=ExtResource("1_5ue8p")] + +[node name="StaticBody3D" type="StaticBody3D" parent="."] +physics_material_override = SubResource("PhysicsMaterial_lbe82") + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.025, 0.2, 0) +shape = SubResource("BoxShape3D_lbe82") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0.7, 0) +shape = SubResource("BoxShape3D_domyf") diff --git a/Scenes/Props/StaticFurniture/90sShowroomBoothDouble.tscn b/Scenes/Props/StaticFurniture/90sShowroomBoothDouble.tscn new file mode 100644 index 0000000..573eb38 --- /dev/null +++ b/Scenes/Props/StaticFurniture/90sShowroomBoothDouble.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=5 format=3 uid="uid://dwv4f6bls2btr"] + +[ext_resource type="PackedScene" uid="uid://cs4vqegg8bw53" path="res://Models/Furniture/90sShowroomBoothDouble.glb" id="1_opex6"] + +[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_lbe82"] +friction = 0.5 + +[sub_resource type="BoxShape3D" id="BoxShape3D_lbe82"] +size = Vector3(1.2, 0.4, 1.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_domyf"] +size = Vector3(0.2, 0.6, 1.5) + +[node name="90sShowroomBoothDouble" type="Node3D"] + +[node name="90sShowroomBoothDouble" parent="." instance=ExtResource("1_opex6")] + +[node name="StaticBody3D" type="StaticBody3D" parent="."] +physics_material_override = SubResource("PhysicsMaterial_lbe82") + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.2, 0) +shape = SubResource("BoxShape3D_lbe82") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.7, 0) +shape = SubResource("BoxShape3D_domyf") diff --git a/Scenes/Props/StaticFurniture/90sShowroomBoothSingle.tscn b/Scenes/Props/StaticFurniture/90sShowroomBoothSingle.tscn new file mode 100644 index 0000000..f71eef4 --- /dev/null +++ b/Scenes/Props/StaticFurniture/90sShowroomBoothSingle.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=5 format=3 uid="uid://b3y3v2k05s3qx"] + +[ext_resource type="PackedScene" uid="uid://covfe2tcx1n05" path="res://Models/Furniture/90sShowroomBoothSingle.glb" id="1_pn4cv"] + +[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_ft2rg"] +friction = 0.5 + +[sub_resource type="BoxShape3D" id="BoxShape3D_mktyq"] +size = Vector3(0.65, 0.4, 1.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_gjci2"] +size = Vector3(0.1, 0.6, 1.5) + +[node name="90sShowroomBoothDouble" type="Node3D"] + +[node name="90sShowroomBoothSingle" parent="." instance=ExtResource("1_pn4cv")] + +[node name="StaticBody3D" type="StaticBody3D" parent="."] +physics_material_override = SubResource("PhysicsMaterial_ft2rg") + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.025, 0.2, 0) +shape = SubResource("BoxShape3D_mktyq") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0.7, 0) +shape = SubResource("BoxShape3D_gjci2") diff --git a/Scripts/Player/Player.gd b/Scripts/Player/Player.gd index d4e9e32..f2ae11e 100644 --- a/Scripts/Player/Player.gd +++ b/Scripts/Player/Player.gd @@ -210,6 +210,7 @@ func _jump(delta: float) -> Vector3: func set_held_object(body): if body is RigidBody3D: + #if body.mass > 10: return heldObject = body hrx = heldObject.rotation.x hry = heldObject.rotation.y