diff --git a/Models/Furniture/2000sShowroomChair.glb b/Models/Furniture/2000sShowroomChair.glb new file mode 100644 index 0000000..c638858 Binary files /dev/null and b/Models/Furniture/2000sShowroomChair.glb differ diff --git a/Models/Furniture/2000sShowroomChair.glb.import b/Models/Furniture/2000sShowroomChair.glb.import new file mode 100644 index 0000000..da56706 --- /dev/null +++ b/Models/Furniture/2000sShowroomChair.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://fu15u0kr4wb3" +path="res://.godot/imported/2000sShowroomChair.glb-374a1a2bf642f6c030339cda7ff627d3.scn" + +[deps] + +source_file="res://Models/Furniture/2000sShowroomChair.glb" +dest_files=["res://.godot/imported/2000sShowroomChair.glb-374a1a2bf642f6c030339cda7ff627d3.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/Props/Physics/2000sShowroomChair.tscn b/Scenes/Props/Physics/2000sShowroomChair.tscn new file mode 100644 index 0000000..af800f2 --- /dev/null +++ b/Scenes/Props/Physics/2000sShowroomChair.tscn @@ -0,0 +1,29 @@ +[gd_scene load_steps=5 format=3 uid="uid://cs81n5dp18u2u"] + +[ext_resource type="PackedScene" uid="uid://fu15u0kr4wb3" path="res://Models/Furniture/2000sShowroomChair.glb" id="1_3pbeq"] + +[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_lbe82"] +friction = 0.5 + +[sub_resource type="BoxShape3D" id="BoxShape3D_lbe82"] +size = Vector3(0.45, 0.5, 0.45) + +[sub_resource type="BoxShape3D" id="BoxShape3D_domyf"] +size = Vector3(0.05, 0.5, 0.45) + +[node name="ShowroomChair" type="Node3D"] + +[node name="RigidBody3D" type="RigidBody3D" parent="."] +mass = 5.0 +physics_material_override = SubResource("PhysicsMaterial_lbe82") + +[node name="2000sShowroomChair" parent="RigidBody3D" instance=ExtResource("1_3pbeq")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0) + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="RigidBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.25, 0) +shape = SubResource("BoxShape3D_lbe82") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="RigidBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0.25, 0) +shape = SubResource("BoxShape3D_domyf") diff --git a/Scripts/Configs/Props.gd b/Scripts/Configs/Props.gd index b216dd3..1e2ea50 100644 --- a/Scripts/Configs/Props.gd +++ b/Scripts/Configs/Props.gd @@ -11,6 +11,11 @@ var SpawnableProps = [ "path": "res://Scenes/Props/Physics/ShowroomChairRed.tscn", "icon": "res://UI/PropIcons/ShowroomChairRed.png" }, + { + "name": "2000s Showroom Chair", + "path": "res://Scenes/Props/Physics/2000sShowroomChair.tscn", + "icon": "res://UI/PropIcons/2000sShowroomChair.png" + }, { "name": "Bouncy Ball", "path": "res://Scenes/Props/Physics/BouncyBall.tscn", diff --git a/UI/PropIcons/2000sShowroomChair.png b/UI/PropIcons/2000sShowroomChair.png new file mode 100644 index 0000000..293746a Binary files /dev/null and b/UI/PropIcons/2000sShowroomChair.png differ diff --git a/UI/PropIcons/2000sShowroomChair.png.import b/UI/PropIcons/2000sShowroomChair.png.import new file mode 100644 index 0000000..856fd71 --- /dev/null +++ b/UI/PropIcons/2000sShowroomChair.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://w055mgpehhwh" +path="res://.godot/imported/2000sShowroomChair.png-bc478fe804f459e39918f8645bd163e7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/PropIcons/2000sShowroomChair.png" +dest_files=["res://.godot/imported/2000sShowroomChair.png-bc478fe804f459e39918f8645bd163e7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1