From 59f7b7f8635b50b84a557b8a4689ed0624817764 Mon Sep 17 00:00:00 2001 From: KawaiiZenbo Date: Sat, 25 Oct 2025 19:20:51 -0700 Subject: [PATCH] add booths --- Models/Furniture/90sGameroomBoothDouble.glb | Bin 0 -> 14644 bytes .../90sGameroomBoothDouble.glb.import | 42 ++++++++++++++++++ Models/Furniture/90sGameroomBoothSingle.glb | Bin 0 -> 11500 bytes .../90sGameroomBoothSingle.glb.import | 42 ++++++++++++++++++ Models/Furniture/90sShowroomBoothDouble.glb | Bin 0 -> 7592 bytes .../90sShowroomBoothDouble.glb.import | 42 ++++++++++++++++++ Models/Furniture/90sShowroomBoothSingle.glb | Bin 0 -> 6028 bytes .../90sShowroomBoothSingle.glb.import | 42 ++++++++++++++++++ Scenes/FreeRoam/Generic/Generic1Stage.tscn | 12 ++++- Scenes/Props/Physics/BouncyBall.tscn | 2 +- Scenes/Props/Physics/ShowroomChairRed.tscn | 2 +- .../90sGameroomBoothDouble.tscn | 27 +++++++++++ .../90sGameroomBoothSingle.tscn | 27 +++++++++++ .../90sShowroomBoothDouble.tscn | 27 +++++++++++ .../90sShowroomBoothSingle.tscn | 27 +++++++++++ Scripts/Player/Player.gd | 1 + 16 files changed, 290 insertions(+), 3 deletions(-) create mode 100644 Models/Furniture/90sGameroomBoothDouble.glb create mode 100644 Models/Furniture/90sGameroomBoothDouble.glb.import create mode 100644 Models/Furniture/90sGameroomBoothSingle.glb create mode 100644 Models/Furniture/90sGameroomBoothSingle.glb.import create mode 100644 Models/Furniture/90sShowroomBoothDouble.glb create mode 100644 Models/Furniture/90sShowroomBoothDouble.glb.import create mode 100644 Models/Furniture/90sShowroomBoothSingle.glb create mode 100644 Models/Furniture/90sShowroomBoothSingle.glb.import create mode 100644 Scenes/Props/StaticFurniture/90sGameroomBoothDouble.tscn create mode 100644 Scenes/Props/StaticFurniture/90sGameroomBoothSingle.tscn create mode 100644 Scenes/Props/StaticFurniture/90sShowroomBoothDouble.tscn create mode 100644 Scenes/Props/StaticFurniture/90sShowroomBoothSingle.tscn diff --git a/Models/Furniture/90sGameroomBoothDouble.glb b/Models/Furniture/90sGameroomBoothDouble.glb new file mode 100644 index 0000000000000000000000000000000000000000..1bf59f282c7e66c15cff3c1b95e3d8d87a326ac1 GIT binary patch literal 14644 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4e2e9ce1fe590aa21717ee8f82dcc1267d771020 GIT binary patch literal 7592 zcmb_gYiwM_6+Vd*V&_4K^TI%|b3+Kk8|S|E8GNr}MCUgUePbEX-3L1Nk7~(WE|u33quM}fIF(K2Gg&R6 z?LCpr3}Y&V6Q?3fnP9!_O*>C7;M%_dzt9nx~WFrX#$ z0OhpAkx^|pIRu_|KOG z%%`&HKW|5{wzwW?yb?#Y$v%yRW0oF?#q3x}4}t4zgsq5;?$uc#FZ^nU+S@EVEV!^r zd^pW)@y(=;@aL{>R(MCfE7b*4WXCd4mB9Uhww)b2yDBW84=OE`@@oLf{2Jk~Wt)a> z>R~;K6o-*sTzV^_M=U)ai|bK4%C}!++>9c7*o&wM7Z!{NUNr2Omd+Necr0SYZ9|V* zwh@g)Y_5TC!wB2)sHsOI_AEs}2hVnhnTjBeJAIFF4od2kMZg`Y^j<1L1fM`N*8oMT zG@#S~24oGw;%$w^BX-!r(`qAuMqK>GVtN!MFm&ccg_w=h#lz94XyS>kpTYz*`7dT! zh8~H>?TEMs!iLEgBVxn&EH%KTpY0H(Bu;UUaLBpqR~CVvl}i0m6|7Pb;QjLvFvyRkFb0e=Ai7Go2!15Lsxy9 zrq0)Tj_xBB>Tw%~QPr)PqURS@^=^e@^ErHldNc}ys`nXlXX2z~-qHEYV1X*zNEDa`zZB@Q9mXufn7&izTpk}6 zy7c>wW}<@2XDnRyG0R*z=gTlIe6roS^u=q=4xE=Rywbe+pCc~gi!b_^&wD(OVchao zwR7@@ap%GQTirtKlg;1s`d!8?0Z#Yd>NNy1jQ!mD@u(O-lfvVOQ^Y(C_Ve${{28@? z4)Iz3FuvSVu;8;D@Fy_jh0Fr*r^9TAV_=(XZ#K+!SVr2EnBJ-`%A8Q`lVeIw1P*c{ zWEi)6vb`vCUU>19F(u~$2RRoqj4z(6D^Aq(a>tmgDJdBB6?{=s1*6tNm-*j6SLexI zVk~>_e8A^(&4gKA%1C_W)EZCrIb(S*J`MORKN+)(9Hqe{JQ&hAL6evpYuE&t|k(?24wsm=umpV$CrOG;Jp08C&ijS9(7fG z=F-#6Tc3W^#0G`Aefa z1#VXO(_z;2eg-=mU%T3T?Z=JYO&|Z)X?*e28zVnI=Dz!%cbvaQwz`+L)T>yP@pf$6 z>^%O#kat7(^Tj7NWZhG>&pB5QzuBzdv3D9bJEz|t^4{!w-ucPWZa3NTv9s*T+2TL; z-0M8i5O#mLX`8EJ)Q+BBGV1=|@?FJpToCU7^Ave6ae1|i zq0SOZzFhM>rvdv#8JiM=Q;y5xk@B9R>metek`qtKiNu@}DdQmLMJ4B+l5>g26d4CK zEh;rFDm9%7d#JnQbFHN=_lXzu3HO_)^d4jGG49Eku;@2Mm;2enU66gwnERaXh2*O; z63e?F<-N}rg~glBGluAa082j0NPZdSdhNdSsN4R=@9_Dl;!^E!f5()2U6glUk;i*H zq04Wx@WnhucMNZW)b&(MbW!w;KNsAOK0M~W@ch@nV}8Neq-n~UtqMNQ)__sKIL`Bg ze83OZljV6mn;r?jCA&g?!hZJIRt@C%NN zPsS_bm*C0Lj2a-VhG_iyJz^q)GH_n+U7llOUD-nS*Y>u5c#rga##bUoG4TF|w$hH7Xj ztpZ&|*FoZXaMok2rW@%dtZu|uPd8v@x*q!cjj#r^h89C(6|DeWLCa_fT|>)3m(#U$ zh`MMY=t5dV8=$uibRB$F(I$AS!eH$hXtIrEkn5stpxdaP?w}p;eh0=HIzWd>1J$Sr z(QJT)n=m-~bvQ*G##%Z;+hO$xMit#m3lPQ47)!9Or)tn@cv}j(5_BcvT?9Y%p!L{0 zgqi6kYM>6*j1iqmfBxu7n!z~cS15p*N0-VI(0Xbas5O&b~pMwsps{_cYo@4K`U zbSGr)qP^4(+D@&I&=FB1#xD92GSYxl=1zijN0_46Cv=Ol+ zpj8W6i%L>$z4J`XLiZW`ZldmYn_s(dRNyPCeEvCnAHI0l=QEz~Z=U)79w;1scTC1` zaaDa$#)cRKpJPC5g3oySQzzY>^)KDgxa=|Kxd-~)x+c$g`;~r2;TIKt@r%W$-1E2p zX>7}@EzX&b?stm=?>h&7bza4)3}a7`_Y`@FRT=i>DKU6TY?5C@Y?5DW|K1P9TQ~4> z6W*JG^RFL&AU*@Wx~*2M<=ZOXTKV?Mw^+`SFXg13v?J|GKhkd%?%WdGPktj7U}ky^ z?mmHEC0>*TKqT(wB1jSTd3P~5EAgK2&0UIjVg+WV%fx+NfwyL*cyF!+t$`fBWy`T& z4O)#=?C47ITc-DHtE(SfDSpcYSn!i)TRq4Kes?7n|F4j`{J#sS%UJ3%mbwzp@w@JH z-*MeQpJ$d)*ODjsJWpT}pDlPSX8DYnt6U9gu@HIWcbx0PRpRLPU)w9}-Dr26 zG&P1*Q&dW+B2htQ2x$cfN)$z{05w7K-lP%;2?q#4RG}&AAIeju5`6%wRK7F2V~=Uv>P*VZ2-yMuJy?(H3QC(Ni7HDgLdIT55YiBu9~J*q0h5hc?F2THSA z)G|u*;UOg%9{{H8=W`Jynd%N`LOnWsbYe853LA`ir~ zK{^rdFZk_F4R-bi`xD(kx6+(V4+ij7Sn9sdeJmZE(h%YC&h!I8Hs0T#=-QVW?Cnbi z85j>Ko$*Z2p6XAf?~ix!?H*R6s&1+L&v0~0cU2=YS4^YWipvOx>hN%6NSQuHzN=jW zNOyntJOkAVVXB(xs+wkNIs&x|m~O;OEoM0`AiYS_-I%Hyx^70Mj5DI7MP|lhk6N=t zU&yfje+Yc4&6H#Fikw#?)5lNQ`0;BW>^jum(XsEohgGFnAC4%AWOt&AOpJ+h2^%WJlf4bqQwrZKS8_{s^9FsuX z1gvX@W>7s6cqI-usZoROm}VH3W}2$0yG}%n04|uAs^MCOW$8LhvV3Lb;I4K9PYbTB z6e0FATZA*2>+>{Havcm+M_yy&DaRA$nzrS{T*ozCU5hyu=!P4! z4R}=@1Fmh`q#6`_sCX!1MohPyS!#eIJj)(tDgoc@^k)nin6NId0Io>++7lHpW-S2x zmphm!098;_0BOb_a_Hhf$8;)yMu_XiVyc4zXsQX!u{h*tx@EYwGx^ZdgN7&Ac5TZr z^ujlbQ}AIJnrf4Oehs)2+t5*UBNm(O8sO5;wu^}@PH~H{%emW^SAm|Da(k%^NNCAD zz?qu3$MVa=U!BfV*L?rg5s zW~^jodaCBWxLF#w<`N>WZp;w7i=@fh){XfrUS@3?RD?O^4e!9@wJifr<(#cc(xzJ! zjch&BzO~Y{>9$p3K2yod%^hbR=A|XqW2Ldrw77#TO{$q&y0$?-UkfL{c#)l|{`c#iZ5Z5EaDaOP z7ku&~_-hQqr?rS*#5tdE;#a@=-4?Ny(1|Z}!693L^ElsqA^*M%Lk`CCKZP#aa$S4A z{Ocy6xF7_|(6%z`}WD41I`ki@+s5=N0i5iBGuT6CMgbCHlC33HN0` zdc*SYH?>vaFVAiar_g-~mv!R%MLyyF(%W~0SN`_F=;=Q-hEwP*5-R-A6@dC_ral8 zMkT#P;^e=7+k;`e^-Zt#jWga`yE9?OYj2PK$@kv)bpDAt%l~P8Qz+}w84>4%`tZWjtNhEqs`1fJ(j`94363xMq;to8%+kv| zSr@j12^?pn4$=xaM(3qCrv3`Q7ll6O|MB&s{)O{j0Y-SM|2oF|KJ#vIob&1xMVemgpysZ=(n}l=Zf~_>lNZ6{xOK)QC}yGWxs^eAD^GWj!_)Nb#vgA^7&ZId+Bp+ zoF5$O;Ol<<>{{Nx`tx6KJbmsluM+;oUi3J=&0Wd+i%(zYc)5RCpMi4)eJgrekNRT} z1|gjKy5g96ikIxD=kpj+pCb;Z{i`hc73t0`j zlYNBQXl>TaRb8| zENJd-$V#lXgsnomimhRrSOenS1X<5Evn|-iW{3i96Ob*CdN4KvX@G2G_p)sm-3w`8 zjchAejgT!s8+p40Gg~p=fVKfM3$ZT^t%i6PV}Ax(1EX5((?n}xRD<~@v`rYr*beME z2C>*3>@JM%fVj}^1a=o>2fH1Zi`HchW4Erhe5%HOlHUizK8{i&1T&J8bqw6XTF{BsZYgsY>Wcm2mbc?tI<+&jPU(eS%FWzq?WBmS4eeVnNv-1|? p%vK|()yO5~m~vjlb5Av>f>iUY*PyN8xu=>`Ko)UUHQH*-{10%xlvDr! literal 0 HcmV?d00001 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