From 5a9e2575bf7bd4d18ea4daee333a877e98dae0a9 Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Sat, 19 Aug 2023 12:27:23 -0600 Subject: [PATCH] a --- godot/Models/grape_animations/idle.res | Bin 6455 -> 0 bytes godot/Models/grape_animations/pickup.res | Bin 17343 -> 0 bytes .../grape_animations/upper_body_holding.res | Bin 5461 -> 0 bytes .../grape_animations/upper_body_idle.res.res | Bin 5459 -> 0 bytes godot/Models/grape_animations/walk.res | Bin 9202 -> 0 bytes godot/Models/grape_man.glb.import | 18 +++++++--- godot/Models/grape_man.tscn | 32 +++++++++++------- godot/Player.gd | 17 ++++++---- godot/player.tscn | 19 +++++------ godot/tests/test_grape_man_animation.tscn | 2 +- 10 files changed, 52 insertions(+), 36 deletions(-) delete mode 100644 godot/Models/grape_animations/idle.res delete mode 100644 godot/Models/grape_animations/pickup.res delete mode 100644 godot/Models/grape_animations/upper_body_holding.res delete mode 100644 godot/Models/grape_animations/upper_body_idle.res.res delete mode 100644 godot/Models/grape_animations/walk.res diff --git a/godot/Models/grape_animations/idle.res b/godot/Models/grape_animations/idle.res deleted file mode 100644 index 2a3799d38d5994645d2ce6c1d881ba2aec2a3623..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6455 zcma)>eQ;FO8OARthN4iaq8Jb&Xlwmov)N>mK;jJstfZhN7{5^BlH4Qx8--;sYo{F|w7vg=iIkK3-Yw<|CBPPb2cx$Fj5XBOSWMg}x*%7OxGfq;>$)qAp z%hQ44K&CV4SQn#wW2rQbP# z=bbO|jzu)h&jDTPStp-(-uWW(xaHV~)h)m?P!$n74ETnIox0=14q}z4J9BHC4q;x{|w2b#zdcJ+FY4 za|@xb!k{&BudGe)>pxv%pSkSdz$9q7ekzd>|MsBuC&QOLu4H-&bdJZn{#5vK{UTOR zYttB+D~HP3$LFo8h7hkUt9yv&Ch|w^%qsth?jC#Zp6i5v;mTg+f3&j4ZfIx_{?6Ce zC_nHZ^~nnV`DG6)zduR!{lfn;xlZ{Lmr?&c!e4OoQRV+}DfKxl{HI&CDF4}esn1E_ z@1NbT{DTXr&spI|Zr`r_DYuHBiYkuW-s+$C;a}8PbmNQzoGhm;ZGfRO8H~A zQ~!O!Uwila%0K!H)xRkGk81OM_U)qn2Zev=g}@+G9>)XPwi0tgPcF8OH5?Y4F(4x1o!6hhI1`)NRj2jcFflVSRqW^sUf-2D;Dl zFeF1AtN$sqpW*(*;;N#d;R8z&9~56T)ML*_jfr6a>vJ2^w?q3G3gG<=LozI6_4Uwx zhD#rsJ`mjSZuM8+3>(jvWozQ*;`b*+n7?R;`R(}t)pW(f0Hee}yxqcJV&Cve!3EaVu>$kA_R%rhQxHn-CH^HWx(1sclLzMMd#`JP% zKf@S!F$~Gj&g$dPeg^j@RO2QL(oIO9h8R3IA<3Hjoaq#_2_Ow$0?^4?ZeR!W|GEhe z;<{-AR3ByzhL#Np#2+A`%ScJf_3(}`mcv~E&RI2?m~@;p_}#T zVLA)#XQ1CKzr>IXz0h(GRzv$4Mp)T>1=jGSqC-W6^gymbjftU;_4yUk4@3JI#=={R zAsHTF_3NPh44v!$Rz2mj?5tXA=D^%d-S&Fam>4#&K94fJ5!%l%4&EjV$*`H#Z-M>} ThS$JQMGTLjW&}n({>$XQ9+xzK diff --git a/godot/Models/grape_animations/pickup.res b/godot/Models/grape_animations/pickup.res deleted file mode 100644 index 3c6ff9d63ba899fd4415b58f2f534c9bd817005a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17343 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 gY!2K{Hs$q zveCKC*!Nt@cixWk3km){DGbHc`-geHW)VN~0M_s#f@d8FMGxoy#cV5Cz<)i4dFXpe z|En`m`O1sTAB)oXSD+!%d&k|IA;>GboEdQvbe{ZPEqAf{Qk4&O%yYZ}$q{o6;PQUA1I%$QT^ zzgT>}sFu!d{h}HZwo&a7h|e$mZlXSFb~zz*wCSJw$2NHxUE@)KaJWht zY@7^ZZQD-)T-yFTS$-;v|Hm<4;25azF-U_PZ8fCJc;?H-3t+5S!!Lj>gpg{;kmWCe zv1Sc%i~eTYKS@$~D3pA^%(>iR$kA5A5*g1@**Fu%nl%^#mIWczuuPVp4dee&gBogJ za1F~L2iKqnF(W8yYUm`z3K-&LfFC&!(vnySW4w7C2qTD95YlE>!&u78g>jpj*Dy6+ zic!Hc;5Tfz7(5#uZqkm!|GY4h{wPiUdJ-oU6%!B=4O83096S{h;|)nK*VJqcP;-bM jzn$}kAKm%G@98FzOq?AMF@@5=SOK1c&<%(Gy5s)=_BH*@ diff --git a/godot/Models/grape_animations/upper_body_holding.res b/godot/Models/grape_animations/upper_body_holding.res deleted file mode 100644 index c813dabe03f51e4fd9dc50eaaddface4beec6d56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5461 zcma)=TZ|J`7{`Z;ih?NUqJj!|K@e@X_jcLc5q42fP$?oRLM_{&E!*wXwupMi7`Hi(J0|XUfCGe|CyQ7{%6j?ILXQU=bP{Q&Tr4m z{(IW&`fQ)!9aC|hgmD?hRT#^w<)M7DY*(S(V+u|`b^m&3s`0}f8T&uyw~-{e*ULp? zI?n3{t%}vOtFeA#1}=BhYF0g$uMdURI1_KP>y~@vznk^l%{rhZD_?NJjas>Cg*rPU z#x%5SmdeEv+O@S?EVH7%nwak@Zd`#5jZ(Ra1}&L2ZbYi^^V_>MT>eD=z8BgZO8N1JC?^G z&wm+-449GH4(zX2kXjzhNNmFXdIia|VMZb!W~8`0U%>H@>$@6ALB6DV> zwmWl6&z>2n<EUk0BWrK+9S&e~@8pY??XyT>8wk z(1qT2LLu`u=@@j7 zLDa`FB!hUdC4Uk+$Z!A;Vb-~H@AS}xGso}{QpgcKd=DW_O){jrpmhMt5SIYml-~pW zUk{-d_jL<^r_}l*?jyY%Iyk?0%U58?`THopA3C@IyS`c7J9%+((ZrO`-~VNNm$?!- zlA&fd%Hn&ucoFZXJ`a#y1s!A%2D2JNGCWB64?zdl03qYxAN$R7b3Q$_23pR~ZmWGHf9IICPLf{2;Iq zLoz%;`AZELa1FNf zkC;b~&OJ4E>G6|aZamhLM~-CRHP}jh21pm6gAC%I$ik2e+bF*XtyzOJat%tjFX!hq zC{vH^qz9pO^H&g;^AAye75Wlu(2X@%Cf2}4j*g*5eV!#@lu-qgKd zeB$FR_RpOQ$4AT;k)vY}zsm>8UMKwqbdX^tVuvv#!<&@<7W5?;PJ*FZFdRY7B#bP6Q2iI_qDn&m diff --git a/godot/Models/grape_animations/upper_body_idle.res.res b/godot/Models/grape_animations/upper_body_idle.res.res deleted file mode 100644 index 1148b98a43672b87d2c174b71c3891c494392ab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5459 zcma)=+jA3D9LE>D;H9D>7X^hPDk|D-?n!A`phZOiC5Wg9F*HlNHqFK)2vwv-@Y*U0 z_}~mr&iKF^>I}|E3p4V7FFNXr4?g*#jQ;^0$ND{+J)7_DIXGtK%zpQ`zsrZy@Xbl` z+w#4J|GE~}Syz8&A4tG zvdebEtt9%qL3`brU91gvYzp1wy}NqVsn{KzoiXDE6gCE(fkEW8bT}&>s!14asM%Mo z+O ztWq4dy~46x8E6c8Ol8-t7KYuD?MSm|e7^&LEJah>n&T!SOHSCgc zJ4fwGaZedRF)&E27BS^EjyRQuU8@>*aLhy4Un@o?57{GiZWmKnVy2EIW@=bsW|RfR z3QNq?vc$|NOI%@zYgyttmbk)#VudBHXNfB;356x0Wl88*5(*276_$jaC84k+6_%uy zC8=XcDl8~gSdw~{q{5O?SW;S+l#V5(u%K9BN$FWq3QJmHNo!fsI+nD;f?|awt!GIq zEE$C*qh-nHSTYI=iWQcOo+YEOWEGaImL;oW$to-;R#>unmaM{(Q&@6ZmYj|yr?8+{ zVae%Pa!r<7Tc#NEjhB29p}_6Pj}ex37q0jGjx1W#H-YAd=Cm9yT<=*PhkXBKBr;$| zYB_MYUO@^xn333o!}SW1Z^Mj4KFmlhBj%RA6Z0+wR?JB3#o>Ad$#-K$B0FZJmLGFV z-;fz8aAZbeOAgm7NWLjE61g%XwQQMN`o7FafiW`@J9D^RLGrzsk;t4GspZbx(zjvqR;>g)$nwxQSEZ5Be9N+9hQJ&1}X7hBr$1RN%oKo5D zK(<)M@8X<|SNI@*7!h$!6i0k|=5vuJ4$b0ggNWXRC2JQ$FUPtbtN9wU&R(48>A2K3_5IH) zFU;P$)>?uGg5gH2I*!}60Js}BvdKN9mqIsz!T`$yG#)DEJcZMfR4@=@1`V{oS&lnG<0-6LdN(X zN3F{Xzn#oL%lZ5c%pxxT06EfK(7O4n5tsA3DZd9g`Um)F<3SPjUdNA&T5F&r1MdOe zB>}@)((9n345EHLmSpIq{66UD9xVBC*_tzbd#&$I&7RtT=W;&p!DH0panesf>*jAn zT+V-z@}Gi^?!oT9QS0Q%#gmIyojP}M$7em8kRus*4>nVuEu^1@jxvb<<B9xg5K&c757%k)va%QlD2z*Px>e;#0AXB^ksguJn|B&{tuY0)r(OUPF$KVL$ab zKzal^${;?VU&oRRZ&3b0=qN+)-%j@eY&A zlwoB2*Pf++j;-!Bx+XUqJ7kR`N5?QheLf`p5p9B*Vv){|WR}7|wyATQD3) L&Md4veop-tyI@3S diff --git a/godot/Models/grape_animations/walk.res b/godot/Models/grape_animations/walk.res deleted file mode 100644 index 5cb5329f1531aec346b334f728e31b00d139a0b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9202 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 W{0G>^bC7?DTaC|2+zkA0pZ@|5!2j3) diff --git a/godot/Models/grape_man.glb.import b/godot/Models/grape_man.glb.import index f43fa1a..daec976 100644 --- a/godot/Models/grape_man.glb.import +++ b/godot/Models/grape_man.glb.import @@ -31,7 +31,7 @@ import_script/path="" _subresources={ "animations": { "Idle": { -"save_to_file/enabled": true, +"save_to_file/enabled": false, "save_to_file/keep_custom_tracks": true, "save_to_file/path": "res://Models/grape_animations/idle.res", "settings/loop_mode": 1, @@ -1830,7 +1830,7 @@ _subresources={ "slices/amount": null }, "Pickup": { -"save_to_file/enabled": true, +"save_to_file/enabled": false, "save_to_file/keep_custom_tracks": true, "save_to_file/path": "res://Models/grape_animations/pickup.res", "settings/loop_mode": 0, @@ -3629,7 +3629,7 @@ _subresources={ "slices/amount": null }, "UpperBodyHolding": { -"save_to_file/enabled": true, +"save_to_file/enabled": false, "save_to_file/keep_custom_tracks": true, "save_to_file/path": "res://Models/grape_animations/upper_body_holding.res", "settings/loop_mode": 0, @@ -5428,7 +5428,7 @@ _subresources={ "slices/amount": null }, "UpperBodyIdle": { -"save_to_file/enabled": true, +"save_to_file/enabled": false, "save_to_file/keep_custom_tracks": true, "save_to_file/path": "res://Models/grape_animations/upper_body_idle.res.res", "settings/loop_mode": 0, @@ -7227,7 +7227,7 @@ _subresources={ "slices/amount": null }, "Walk": { -"save_to_file/enabled": true, +"save_to_file/enabled": false, "save_to_file/keep_custom_tracks": true, "save_to_file/path": "res://Models/grape_animations/walk.res", "settings/loop_mode": 1, @@ -9025,6 +9025,14 @@ _subresources={ "slice_99/start_frame": 0, "slices/amount": null } +}, +"nodes": { +"PATH:AnimationPlayer": { +"import_tracks/position": 0, +"import_tracks/rotation": 0, +"import_tracks/scale": 0, +"optimizer/enabled": false +} } } gltf/embedded_image_handling=1 diff --git a/godot/Models/grape_man.tscn b/godot/Models/grape_man.tscn index eac036b..8b7c47e 100644 --- a/godot/Models/grape_man.tscn +++ b/godot/Models/grape_man.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://bmx4xpa5svia3"] +[gd_scene load_steps=3 format=3 uid="uid://bgoo1lbt28na"] [ext_resource type="PackedScene" uid="uid://bhanbx2dyhv2d" path="res://Models/grape_man.glb" id="1_fh5yr"] [ext_resource type="Script" path="res://Models/grape_man.gd" id="2_ksje8"] @@ -8,18 +8,24 @@ transform = Transform3D(0.065, 0, 0, 0, 0.065, 0, 0, 0, 0.065, 0, 0, 0) script = ExtResource("2_ksje8") [node name="Skeleton3D" parent="rig" index="0"] -bones/0/rotation = Quaternion(0.0912427, 0, 0, 0.995829) -bones/1/rotation = Quaternion(-0.0891896, 1.18734e-07, -1.06322e-08, 0.996015) -bones/2/rotation = Quaternion(0.0133933, -1.19199e-07, 1.5966e-09, 0.99991) -bones/3/rotation = Quaternion(-0.00997737, 0.100365, -0.694951, 0.711948) -bones/4/rotation = Quaternion(0.0907207, -0.104937, 0.0616428, 0.988412) -bones/4/scale = Vector3(1, 1, 1) -bones/5/rotation = Quaternion(-0.00997737, -0.100365, 0.694951, 0.711948) -bones/6/rotation = Quaternion(0.0907207, 0.104937, -0.0616428, 0.988412) -bones/6/scale = Vector3(1, 1, 1) -bones/7/rotation = Quaternion(0.0142813, -6.34259e-18, -4.44044e-16, 0.999898) -bones/10/rotation = Quaternion(0.105246, 0.0039338, -0.0113526, 0.994374) -bones/15/rotation = Quaternion(0.105246, -0.0039338, 0.0113526, 0.994374) +bones/0/position = Vector3(0.00830117, 0.985943, 0.124772) +bones/0/rotation = Quaternion(0.838567, 0.0312173, -0.0173838, 0.543623) +bones/1/rotation = Quaternion(-0.0865421, 0.000700139, 0.000169413, 0.996248) +bones/2/rotation = Quaternion(-0.111076, -0.0110209, 0.0529719, 0.992338) +bones/3/rotation = Quaternion(0.467612, 0.0653885, -0.582913, 0.661268) +bones/4/rotation = Quaternion(0.0687327, -0.0343696, -0.655545, 0.751236) +bones/4/scale = Vector3(1.06418, 1.06418, 1.06418) +bones/5/rotation = Quaternion(0.467612, -0.0653885, 0.582913, 0.661268) +bones/6/rotation = Quaternion(0.0687327, 0.0343696, 0.655545, 0.751236) +bones/6/scale = Vector3(1.06418, 1.06418, 1.06418) +bones/7/rotation = Quaternion(0.274903, 0.0722153, -0.0203558, 0.95854) +bones/8/rotation = Quaternion(0.197065, 6.31982e-16, -1.33238e-15, 0.98039) +bones/9/position = Vector3(0.155448, 0.891297, -0.0224623) +bones/9/rotation = Quaternion(0.91662, -0.0104789, -0.00138672, 0.39962) +bones/10/rotation = Quaternion(0.268897, 0.0200174, -0.0169533, 0.962812) +bones/14/position = Vector3(-0.155448, 0.891297, -0.0224622) +bones/14/rotation = Quaternion(0.966019, 0.00733452, 0.00761147, -0.258254) +bones/15/rotation = Quaternion(-0.0622384, -0.00553498, 0.0104557, 0.997991) [node name="GrabPointLocation" type="Node3D" parent="." index="2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.29365) diff --git a/godot/Player.gd b/godot/Player.gd index 3a0c629..78c8ed7 100644 --- a/godot/Player.gd +++ b/godot/Player.gd @@ -5,16 +5,14 @@ const SPEED = 5.0 const JUMP_VELOCITY = 4.5 @export var horiz_sens = 0.25 @export var vert_sens = 0.25 -var playerCam -var playerVisuals # Get the gravity from the project settings to be synced with RigidBody nodes. var gravity = ProjectSettings.get_setting("physics/3d/default_gravity") func _ready(): Input.mouse_mode = Input.MOUSE_MODE_CAPTURED - playerCam = get_node("CameraMount") as Node3D - playerVisuals = get_node("grape_man") as Node3D + $grape_man.drop() + $CameraMount.global_rotation.x = clampf($CameraMount.global_rotation.x, deg_to_rad(-60), deg_to_rad(-11)) func _process(_delta): @@ -27,8 +25,8 @@ func _input(event): # Handle the rotation of the camera using mouse movement. if event is InputEventMouseMotion: rotate_y(deg_to_rad(-event.relative.x * horiz_sens)) - playerCam.rotate_x(deg_to_rad(event.relative.y * vert_sens)) - playerVisuals.rotate_y(deg_to_rad(event.relative.x * horiz_sens)) + $CameraMount.rotate_x(deg_to_rad(-event.relative.y * vert_sens)) + $grape_man.rotate_y(deg_to_rad(event.relative.x * horiz_sens)) $CameraMount.global_rotation.x = clampf($CameraMount.global_rotation.x, deg_to_rad(-60), deg_to_rad(-11)) func _physics_process(delta): @@ -44,7 +42,14 @@ func _physics_process(delta): if direction: velocity.x = direction.x * SPEED velocity.z = direction.z * SPEED + $grape_man.look_at(Vector3( + $grape_man.global_position.x - velocity.x, + $grape_man.global_position.y, + $grape_man.global_position.z - velocity.z, + )) + $grape_man.walk() else: + $grape_man.idle() velocity.x = move_toward(velocity.x, 0, SPEED) velocity.z = move_toward(velocity.z, 0, SPEED) diff --git a/godot/player.tscn b/godot/player.tscn index db8a447..a5461a2 100644 --- a/godot/player.tscn +++ b/godot/player.tscn @@ -1,25 +1,22 @@ -[gd_scene load_steps=6 format=3 uid="uid://7utef1nnena8"] +[gd_scene load_steps=4 format=3 uid="uid://7utef1nnena8"] [ext_resource type="Script" path="res://Player.gd" id="1_7gpdp"] -[ext_resource type="PackedScene" uid="uid://bmx4xpa5svia3" path="res://Models/grape_man.tscn" id="2_hha22"] +[ext_resource type="PackedScene" uid="uid://bgoo1lbt28na" path="res://Models/grape_man.tscn" id="2_hg0av"] -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1yhh3"] -radius = 1.2 -height = 5.8 +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kb4ms"] [node name="Player" type="CharacterBody3D"] script = ExtResource("1_7gpdp") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0) -shape = SubResource("CapsuleShape3D_1yhh3") +shape = SubResource("CapsuleShape3D_kb4ms") -[node name="grape_man" parent="." instance=ExtResource("2_hha22")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) +[node name="grape_man" parent="." instance=ExtResource("2_hg0av")] [node name="CameraMount" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.45879, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.3, 0) [node name="PlayerCam" type="Camera3D" parent="CameraMount"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 11.9417) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.39043) +current = true fov = 50.0 diff --git a/godot/tests/test_grape_man_animation.tscn b/godot/tests/test_grape_man_animation.tscn index b8ea49d..589ac63 100644 --- a/godot/tests/test_grape_man_animation.tscn +++ b/godot/tests/test_grape_man_animation.tscn @@ -51,7 +51,7 @@ layout_mode = 2 text = "Walk" [node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(0.551151, 0, 0.834406, 0, 1, 0, -0.834406, 0, 0.551151, 1.041, 0.45, 0.03) +transform = Transform3D(0.947434, 0, 0.319952, 0, 1, 0, -0.319952, 0, 0.947434, 0.401511, 0.45, 0.732763) [connection signal="pressed" from="CanvasLayer/Control/VBoxContainer/Pickup" to="." method="_on_pickup_pressed"] [connection signal="pressed" from="CanvasLayer/Control/VBoxContainer/Hold" to="." method="_on_hold_pressed"]