From 261eb50b9bf92dd760b7b7cecc8669d7f11dfca0 Mon Sep 17 00:00:00 2001 From: Jenna Date: Fri, 3 Sep 2021 17:05:40 -0700 Subject: [PATCH] added the missing files left out by my last commit --- ...k.obj-d371cb6db33741aa3e8fd0037576609d.md5 | 3 + ....obj-d371cb6db33741aa3e8fd0037576609d.mesh | Bin 0 -> 1251 bytes ...70bd741861b7cd84d708b0c20d70c37a.etc2.stex | Bin 0 -> 10956 bytes ...x.png-70bd741861b7cd84d708b0c20d70c37a.md5 | 3 + ...70bd741861b7cd84d708b0c20d70c37a.s3tc.stex | Bin 0 -> 10956 bytes ....png-70bd741861b7cd84d708b0c20d70c37a.stex | Bin 0 -> 815 bytes .../Items/Stick/Stick Inventory.tscn | 19 +++++++ Born Without Teeth/Items/Stick/stick.mtl | 9 +++ Born Without Teeth/Items/Stick/stick.obj | 53 ++++++++++++++++++ .../Items/Stick/stick.obj.import | 19 +++++++ Born Without Teeth/Items/Stick/stick_tex.png | Bin 0 -> 805 bytes .../Items/Stick/stick_tex.png.import | 36 ++++++++++++ .../Menus/Inventory/Inventory.tscn | 32 +++++++++++ .../Menus/Inventory/Item Rotate.gd | 20 +++++++ 14 files changed, 194 insertions(+) create mode 100644 Born Without Teeth/.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.md5 create mode 100644 Born Without Teeth/.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh create mode 100644 Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.etc2.stex create mode 100644 Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.md5 create mode 100644 Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.s3tc.stex create mode 100644 Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.stex create mode 100644 Born Without Teeth/Items/Stick/Stick Inventory.tscn create mode 100644 Born Without Teeth/Items/Stick/stick.mtl create mode 100644 Born Without Teeth/Items/Stick/stick.obj create mode 100644 Born Without Teeth/Items/Stick/stick.obj.import create mode 100644 Born Without Teeth/Items/Stick/stick_tex.png create mode 100644 Born Without Teeth/Items/Stick/stick_tex.png.import create mode 100644 Born Without Teeth/Menus/Inventory/Inventory.tscn create mode 100644 Born Without Teeth/Menus/Inventory/Item Rotate.gd diff --git a/Born Without Teeth/.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.md5 b/Born Without Teeth/.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.md5 new file mode 100644 index 0000000..d9f8668 --- /dev/null +++ b/Born Without Teeth/.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.md5 @@ -0,0 +1,3 @@ +source_md5="5088a4521e7650d9102cd499c46f0d56" +dest_md5="2d7382245ddb60a6a0b27752a50c4445" + diff --git a/Born Without Teeth/.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh b/Born Without Teeth/.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh new file mode 100644 index 0000000000000000000000000000000000000000..80bb69de540732e6643fc187d4a11240cb99fbb9 GIT binary patch literal 1251 zcmbVM$!=3I6ul`eLq`gfA{KyDmX!iq79ofY8#dtsEa$}~R^JfWP6bFPG=5iT)%rW`7-%PvE0F!+CJtVjFI0zD?3kw{~qt*u#>#uWH$c3=_hZ1vLIywbB%~d%Qb}ko66xB@8A;4^DT~!Dv zr&Bt>+AhtN%##ZMlT#DL<2PT&P#YV9KNMPhEV!GGq{KLJnrzEElYkCF_TWx zODxAb=;+r7-QO^-X+^ZYy}Z4|y57c#JP!V=ai0&S=l5|&J9c1iMeEjny0^ijeXPBm z2IpJDeSLiMyN8chJpaIt`lFtRZ!SEJd!wC}A9eO|@FO1H2ij3qu-|*1I^kRTM+uMm z8^03n&9(1eLk`M1*@w<>Z^F0Uzr*Kq{2hb8EkEJjPR)<+UEb2);LZ1q@zC)3B|7nt zaN1mOXdR*5DC5*OkyT5CI%gv13~zGShq%+_42&lFK4F7HdIxoYBfFsAMcqTx-=_x% z>3#GENRcBX*)jSPdI)omP*0I$Pw0%EqMp&Yzlc*QT+xbn4U9!_dMu1Cw9_}r%iE1R zoMBg$DP&N6{&V0D@FAa&Czy16um2FeN9K%qWD=*py;iw$RT)zF1s_03&UbU(JKrTR V$^U8agjHInvujbfoF@2t`v)%1>rnsz literal 0 HcmV?d00001 diff --git a/Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.etc2.stex b/Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.etc2.stex new file mode 100644 index 0000000000000000000000000000000000000000..a4f659f500404c6df076507c6d77a392b87152b9 GIT binary patch literal 10956 zcmeHNT}V@57=F*$*;KGO$xsMV3@d^lJ^lnmiAC)q$Tqb)75!KmBtmH}XStCjODHRw zSzZ*YK}B8kLs4CnX0_~#h<>2L5HB*QhR($5EKldCZ$BR#2%=)}Z5Pj;oqc=1=Q;29 z>|*bt1@;0rj6M?qAQjv~$iC5L1~X^~Jn*v9p8*O$Elg10c=veOIpkA6`klMV#<|`v z``X}26ISC@`lN7Qt4z>VmSg;*8)Y>H|C)~9{Y(~Ump z=|&&)bfXVgm)4COb(ZRoNpsYRKG7U?>mlmI`ZU+mjlSsVMql)Fqc2#O){Pu>(Yk3)>qf4po4x;Q zE-*isAKLE_>jTyYtPj{ZU^&2YfaL(o0hR+S2UrfU9AG)Xa)9Lk%K?@HEC*N)upD4H zz;YlGbKp!-_VTM-z;L=`dwBK$i9Na~d#Cq)AZ}Ckven+e3-c9M@#`o3W#j6KD_$=B zs+g`e*1Ue)UmjPMQ?#P%R=nAq=AT<020q>Nt|`DD-gwa4INcO8zPN|?0fRuDO|p6d|nH2WS;Eovx!6`a?cn3XWVV7KSo56ASP5#9{?aC zqU;R&h^YNczpI~ox9herfdI}4xTaWgo99g^WP{Y2n4K3StTzs*2QXpinC~C4M zCH*Zd&zu@qNrpYj;w_bu1WMn7gj16G!gy`*G!>*Z$2u2Ck~Rm>LmsV@#$P`Gyc3BM4kgjn(?QD8L)ZkUo=>+Y;sxqJ-tM znM;T|5GX)PqhTf({`CF|&|K>AsDq|(IM1U#XdI~Il7qqFV190X+i-BQC_vs64}d2& e6?lgOU`AS6V@XMAiN#_`Q3qDz)%}djqkaQgMG~t3 literal 0 HcmV?d00001 diff --git a/Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.md5 b/Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.md5 new file mode 100644 index 0000000..13db892 --- /dev/null +++ b/Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.md5 @@ -0,0 +1,3 @@ +source_md5="85ba8a7810af4735139c30f1f3b1cf28" +dest_md5="e1ae966c0c700512929806b1bbb87ed0" + diff --git a/Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.s3tc.stex b/Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.s3tc.stex new file mode 100644 index 0000000000000000000000000000000000000000..12b5b57d7f62f3ee9a97c842cf6019f32bf2c2ce GIT binary patch literal 10956 zcmeI2&r1|x7{{Mv*J;Ag4$&SqSPfG*mgo>fL`%>jR^s~OB@03j51W5NV6)U=ATYr$ zK?|8-=xd!CPu9hQ7llq;0yBa-SY0A;Y3-WR#eei`G2Yg3xIk0~bHELRX5EFq)vwydq z)T;R+{IJw@W?yx(F?D=({Y8gPqlaNbsOE89vnNGaKaW^FJ*Unydqt!g)I1(HyTsl$ z6nBm>run4^m)pML$MumLdlWZ%h~h>MQQYVS*D<-VBbUi-c9R?XHh5WF4vfDDiUGC&5%02v?yWPl8i0Wv@a$N(AmzYLTF zfC#f)Iz?Tw+Rt@X`(~cMvaEYuXMHtQA8s5Fuf9TMxN&2euc;gevtxU$E1vqU$3o?q zg9AF>Bu8{E)!op!eALl-d3mMUH|PCwMJV2%VfK^Cr_u6ocKM{G0RdN)5*NNo6pDNm|nm_bsRIXSkl*H^1;NSIv;cEUnIXjkVUUA zkMI8aTTeoJWPl8i0Wv@acFVxk&r_}9#4$(be0pT=b$j=GVwU+U`%m3kTX;LPbgAR^ z+4~#+D!l-Jr^lLe!uH*an@Pu@5|_itSk`FEXp58ag8rWV9xo_~@xpkaB>3P%`2$ES z*4nl9Zh4}0b~bSG0m!fRim7f-CwC`RLermSQwWf5lUG1fI5PwA?ma+F4Pz<`1vUS- zBlAe!LEfize5bU_03YS|m+RjE7Gyr_P|wdM0Ag|v*z;k4dyI+ZwhIlDQ=A{az7J;Q Hccs4oOi89I literal 0 HcmV?d00001 diff --git a/Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.stex b/Born Without Teeth/.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.stex new file mode 100644 index 0000000000000000000000000000000000000000..9f8e39f1a351da70d26b8f3bc9c67663a7e75c00 GIT binary patch literal 815 zcmZ>F2@YvsU|;}Y79eI|5MXBnlETak3;}-b3Y|cLmrIHZD8%dO;SvO-8$g(Y2}t_H ze47KL7>k44ofy`glX=O&z;x2n#WAE}&fDu7vxO5Sj(_~_^eW?;$jJu+-C=XRjwmi# zyg+i&YLBJPnmewXTpDz0>S0&$_M~M&PMlq;ncWL7*dI7K>15M_Zf8O39Tt`x#~$w7 z_x^T~q4<$Itu^+CKR)@s?E3ESRp)PC&z!=&%G&&YgyzzD`;9I>Vh+Cj^ZWT__kO3m zx-GnLXYuJ@d%qShoA+00R{Wj~YhTa&{(4tkZLXb3{J!#QbC!R+edY4X4>d2B>D{mW zvFP=qtDhJC{B=5g*Sz{KOVaBWSH!k*u1hP=iIF$-(ENRPZv6d6yZRXz1sgS`>ySNfBWZ|toQr!pP%maEuNQGd;iqpFSXX;g1`37EfAf9%wS&tg0eJ&V!&Rq1Bq|MJS( zttr3$lwHja4}JL}M9+EB?yb`%pR}5}=E<%Jw`%MY%V!_3QJw0u;!4noi}Nz}$8J@> zbvk@cjq9s({mRz;f7i8X_`hbH>2m+}u1&!KUZ$rGo)y1WP}!_W)-%`q*t($dhkSLil@i3yJ`mhp083i z&8;%%zf}CBvf^jgx}_7uABE(}zul^s33SVylfGdghyEE$ul&P5N8$gj8?*i{0R@_; LtDnm{r-UW|D)@s$ literal 0 HcmV?d00001 diff --git a/Born Without Teeth/Items/Stick/Stick Inventory.tscn b/Born Without Teeth/Items/Stick/Stick Inventory.tscn new file mode 100644 index 0000000..f6f10c4 --- /dev/null +++ b/Born Without Teeth/Items/Stick/Stick Inventory.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://Items/Stick/stick_tex.png" type="Texture" id=1] +[ext_resource path="res://Items/Stick/stick.obj" type="ArrayMesh" id=2] +[ext_resource path="res://Menus/Inventory/Item Rotate.gd" type="Script" id=3] + +[sub_resource type="SpatialMaterial" id=1] +albedo_texture = ExtResource( 1 ) + +[node name="Stick Inventory" type="StaticBody"] + +[node name="CSGMesh" type="CSGMesh" parent="."] +transform = Transform( 0.216506, -0.25, 0, 0.125, 0.433013, 0, 0, 0, 0.25, 0.15, -0.5, 0 ) +mesh = ExtResource( 2 ) +material = SubResource( 1 ) +script = ExtResource( 3 ) + +[node name="Camera" type="Camera" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.5 ) diff --git a/Born Without Teeth/Items/Stick/stick.mtl b/Born Without Teeth/Items/Stick/stick.mtl new file mode 100644 index 0000000..6456fae --- /dev/null +++ b/Born Without Teeth/Items/Stick/stick.mtl @@ -0,0 +1,9 @@ +# picocad material +newmtl stick_mtl +ka 1.000000 1.000000 1.000000 +kd 1.000000 1.000000 1.000000 +ks 0.000000 0.000000 0.000000 +tr 1.000000 +illum 1 +ns 0.000000 +map_kd stick_tex.png diff --git a/Born Without Teeth/Items/Stick/stick.obj b/Born Without Teeth/Items/Stick/stick.obj new file mode 100644 index 0000000..cd1d414 --- /dev/null +++ b/Born Without Teeth/Items/Stick/stick.obj @@ -0,0 +1,53 @@ +# picocad model +mtllib stick.mtl +o stick +v -0.25 2.5 0.25 +v 0.25 2.5 0.25 +v 0.25 -0.5 0.25 +v -0.25 -0.5 0.25 +v -0.25 2.5 -0.25 +v 0.25 2.5 -0.25 +v 0.25 -0.5 -0.25 +v -0.25 -0.5 -0.25 + +vt 0 1 +vt 0.0781 1 +vt 0.0781 0.9219 +vt 0 0.9219 +vt -0.0156 1 +vt 0.0781 1 +vt 0.0781 0.9219 +vt 0 0.9219 +vt 0.0156 1 +vt 0.0781 1 +vt 0.0781 0.9375 +vt 0.0156 0.9375 +vt 0 1 +vt 0.0781 1 +vt 0.0781 0.9219 +vt 0 0.9219 +vt 0 1 +vt 0.0781 1 +vt 0.0781 0.9219 +vt 0 0.9219 +vt 0 0.9844 +vt 0.0625 0.9844 +vt 0.0625 0.9219 +vt 0 0.9219 + +vn 0 0 -1 +vn 0 0 1 +vn 0 1 0 +vn -1 0 0 +vn 1 0 0 +vn 0 -1 0 + +usemtl stick_mtl +s off +f 4/4/1 3/3/1 2/2/1 1/1/1 +f 7/8/2 8/7/2 5/6/2 6/5/2 +f 1/12/3 2/11/3 6/10/3 5/9/3 +f 8/16/4 4/15/4 1/14/4 5/13/4 +f 3/20/5 7/19/5 6/18/5 2/17/5 +f 8/24/6 7/23/6 3/22/6 4/21/6 + diff --git a/Born Without Teeth/Items/Stick/stick.obj.import b/Born Without Teeth/Items/Stick/stick.obj.import new file mode 100644 index 0000000..03a64af --- /dev/null +++ b/Born Without Teeth/Items/Stick/stick.obj.import @@ -0,0 +1,19 @@ +[remap] + +importer="wavefront_obj" +type="Mesh" +path="res://.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh" + +[deps] + +files=[ "res://.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh" ] + +source_file="res://Items/Stick/stick.obj" +dest_files=[ "res://.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh", "res://.import/stick.obj-d371cb6db33741aa3e8fd0037576609d.mesh" ] + +[params] + +generate_tangents=true +scale_mesh=Vector3( 1, 1, 1 ) +offset_mesh=Vector3( 0, 0, 0 ) +optimize_mesh=true diff --git a/Born Without Teeth/Items/Stick/stick_tex.png b/Born Without Teeth/Items/Stick/stick_tex.png new file mode 100644 index 0000000000000000000000000000000000000000..2dd70ee5df7e47d11777cda37b01caef394be489 GIT binary patch literal 805 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1SEZ8zRh7^V7lPx;uuoF`1Y=ShH#?9@sHmZ zy}hwUQ?=Qd=Wp|57g?=izDi3?GBdShy%f9snnJufWh`7K@E!G8%EH;Dn0Ykd#flJd z)yXs8Tw2({7duDv@rQZuZF$4*7aMf_tZRGxu-tv>^P>IbrCGt6rJG_NZ42_Ut$5^q z+Wb%CGxy*B_WV9Lf4wSmvAXWRyQe1D>(}s{X+NJgyYk=LWi#i;MR1)7PiOnHKlt~% z^Oq++sCn8Y8Nc7&;Pa22#*IIpEnYNpdfwfw&!!*OXU)6u`~I6RytA}-dH#`^vg_Yh zVdO8#{^z@q+3)2~o4)}vf0kCiKV7pmZ0q-ZCk}tvcP6ys-t?VM zxfj&@TgdfD;~CG3y~YX4^9^>imYkk{<+qVN*TvsP@f}gs@y`;g;-6)u9k}(|NIrh! z_kCwTy5+;;TmCXx@bCJ?>XX0!bKJ#`(r=%p=d>FyNI%!W0MfC0^S67`f41%Yo@%#0 z?|tpe_19KiyEnaZ2GCZJ(a*UTG#%guMhKbULwv!b#W%M;Nn9;z9=P+q^oiXQtlxI6 zviF~P#pa>dwz|2`Pw_6jviGz3-89eptMvU|Y}jWZ`0xFf3OU2fb$2ejE}pHrJu*mm zzI9Qp_w$`ahdYnW$vE@7ua2+k+x+y?+ia4y-P!0{JGHxPw(8CoPD;@pDPQmWd$d<~ z?&hZ-c7A6%BXsvrSgzL6DVM@GXKde~>g@dd)6or2@1OEN%fr7l>SKxBW0&N-j}K=| zzQk%|WEsBq|Fc(fmxi<-^^sgO z-(>faS1!qKyS_7DpS!sJN~_DYGgTLOFHbzZ+D7`uCe!jqizAm_iTZTGX5kdA@72sd z=bx)*xO@8l%H@tIHtDnm{r-UW| D(g}p? literal 0 HcmV?d00001 diff --git a/Born Without Teeth/Items/Stick/stick_tex.png.import b/Born Without Teeth/Items/Stick/stick_tex.png.import new file mode 100644 index 0000000..b006ed1 --- /dev/null +++ b/Born Without Teeth/Items/Stick/stick_tex.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.s3tc.stex" +path.etc2="res://.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} + +[deps] + +source_file="res://Items/Stick/stick_tex.png" +dest_files=[ "res://.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.s3tc.stex", "res://.import/stick_tex.png-70bd741861b7cd84d708b0c20d70c37a.etc2.stex" ] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=true +flags/filter=true +flags/mipmaps=true +flags/anisotropic=false +flags/srgb=1 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Born Without Teeth/Menus/Inventory/Inventory.tscn b/Born Without Teeth/Menus/Inventory/Inventory.tscn new file mode 100644 index 0000000..3c9765b --- /dev/null +++ b/Born Without Teeth/Menus/Inventory/Inventory.tscn @@ -0,0 +1,32 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Items/Stick/Stick Inventory.tscn" type="PackedScene" id=1] + +[sub_resource type="World" id=1] + +[node name="Inventory" type="CanvasLayer"] +follow_viewport_enable = true + +[node name="MarginContainer" type="MarginContainer" parent="."] +margin_right = 1004.0 +margin_bottom = 590.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Slot 1" type="ViewportContainer" parent="MarginContainer"] +margin_right = 1004.0 +margin_bottom = 590.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Slot 1 Viewport" type="Viewport" parent="MarginContainer/Slot 1"] +size = Vector2( 100, 100 ) +own_world = true +world = SubResource( 1 ) +transparent_bg = true +handle_input_locally = false +render_target_update_mode = 3 + +[node name="KinematicBody" parent="MarginContainer/Slot 1/Slot 1 Viewport" instance=ExtResource( 1 )] diff --git a/Born Without Teeth/Menus/Inventory/Item Rotate.gd b/Born Without Teeth/Menus/Inventory/Item Rotate.gd new file mode 100644 index 0000000..5ef1acc --- /dev/null +++ b/Born Without Teeth/Menus/Inventory/Item Rotate.gd @@ -0,0 +1,20 @@ +extends CSGMesh + + +# Declare member variables here. Examples: +var rotational_point = Vector3(0,0,0) +var axis = Vector3(0,1,0) +var last_angle = 0 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): +# pass + #last_angle+=delta + transform = transform.rotated(axis, delta)