From 7adfcc2766c65075bbd3a509a693d8c90271c96c Mon Sep 17 00:00:00 2001
From: Spencer Killen <sjkillen@ualberta.ca>
Date: Sat, 19 Aug 2023 18:58:08 -0600
Subject: [PATCH] a

---
 .../grape_animations/upper_body_idle.res.res    | Bin 934 -> 470 bytes
 godot/Models/grape_man.gd                       |   9 +++++++--
 godot/Models/grape_man.tscn                     |   2 +-
 godot/Player.gd                                 |   2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/godot/Models/grape_animations/upper_body_idle.res.res b/godot/Models/grape_animations/upper_body_idle.res.res
index 0f2924dd9e7642bc88c6dd43175e638f56c11870..fd30d7a6e7756bbe986aa84a3158f015341292de 100644
GIT binary patch
literal 470
zcmV;{0V)1cQ$s@n000005C8z80{{TN0RR9fwJ-f(q5`E200vY@JV2!?9m6ny6Dr`?
zMLl8ud370P!z})VnnwGETW&_6QIsRM{Y&kE(7$bPm^G7c-I%{1blo(yG|M6)DK!8x
z05$;fu~t!Sxr#P8T!ma41j94?vgFg~|Kz2uMtmeAf#raJ5Cs1VK6|^6+h)c8h5rZt
zum1*rH(f|0OA?%XdE{H0avSDMyNh)&d(vRNl&|I3+@synbW4-v|AaFKXXQLuv#;-y
zQ0o>R|0|M@Tdo|IaeG~C(yL4<3bXJrg|&oP$+0;w>@)HIx^%0W&9W@ZvdngTf>k7Q
zTKP^(7ow2}BD86-K$KMnlu{AUJUC=97fXnuLt<dlVilmQIG~hjKnTG9OZ;!BFkG6+
z|0{alZHmGt0HzVnGHP_O13w^u0+FJt9gU^f%G1%X!%hAJFr9|Y5DzMbft$i+?6M(d
zZQhcNAnNAFD_eV*dPkUWgOC~vTCC9A8!_*}Sv?zDXu+y06sZAHdpwJ^KyQgPYU}Rm
zX~Ed7Febu$(M+E_GT$Oc`t=ylf)vhh6o9hHb4Z=*P0Q2Eq5P`78SAwozJv7*;hBKu
M>l@f?15#5%L#oo>kN^Mx

literal 934
zcma)5xlY6|5H+`e<yy{`if&DWM1h2ss{jcKvZA4hOfoFdCb8w1V>={TzJpJI3Q<rj
zEu!K-_yA@cvI=1fERAM7=kw&nZMeJa=M19mLm5IDL)lKkSeQ^IXlG{t)#ug2$Mo0!
zP44@TUcw~muEQo9N8M;a1V$!ndv?&d)F5<RJN$KX8I@^B<)!w)i=;0i&qy!zAptg7
zj3pulHiDiAlBT(^Z6Ya^7s~+bdr||+))+1PR?1hoX)9n=tm%5fSV?UlU^7K8B;qVW
zCk^bTDuGj`i=HqspcR`f`YeQNElQJH&`yi(oIh9`-V2Mvdth;R84DKw!Q$|qSR8J#
z(B@KKhsvOlabO)au6~2_BV1vW@+Lk5Jdsl(<(Eo<_ReI`_QD{78fKHQ(|+5e#2{KJ
z@rr~tc|z4YSbTuBY#2Sn4_Uq27)4E46%;LvC7`z!*nZTS7)l(<ZOU7)cZy_jicO#p
zU&%`o^ZY5amr-bDc5dsBulJj^PUZRSedVS9c&kodwigC^Mc#*~liT#w%NS_(97>L1
czK~D3WeiV<VYO4)L=1Jpu!uQ?-Nirj8zqvs?EnA(

diff --git a/godot/Models/grape_man.gd b/godot/Models/grape_man.gd
index 8195d33..f04b025 100644
--- a/godot/Models/grape_man.gd
+++ b/godot/Models/grape_man.gd
@@ -1,6 +1,7 @@
 extends Node3D
 
 @onready var animation: AnimationNodeStateMachinePlayback = $AnimationTree.get("parameters/playback")
+@onready var pickup_bone_idx = $rig/Skeleton3D.find_bone("PickupBone")
 
 signal anim_check_grab(position: Vector3)
 
@@ -28,8 +29,12 @@ func idle_hold():
 	animation.travel("IdleHold")
 
 func animation_key_grab():
-	emit_signal("anim_check_grab", $GrabPointLocation.global_transform)
-	
+	emit_signal("anim_check_grab", get_pickup_bone_location())
+
+func get_pickup_bone_location() -> Vector3:
+	var trans = $rig/Skeleton3D.global_transform * $rig/Skeleton3D.get_bone_global_pose(pickup_bone_idx)
+	return trans.origin
+
 func animation_key_pickup_completed():
 	pickup_animation_in_progress = false
 	emit_signal("pickup_animation_finished")
diff --git a/godot/Models/grape_man.tscn b/godot/Models/grape_man.tscn
index 58b3d2e..6623e6b 100644
--- a/godot/Models/grape_man.tscn
+++ b/godot/Models/grape_man.tscn
@@ -153,7 +153,7 @@ 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.0930424, 0, 0, 0.995662)
+bones/0/rotation = Quaternion(0.10292, 0, 0, 0.99469)
 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)
diff --git a/godot/Player.gd b/godot/Player.gd
index 9292010..d0d5d44 100644
--- a/godot/Player.gd
+++ b/godot/Player.gd
@@ -37,7 +37,7 @@ func _input(event):
 			holding = weakref(null)
 			$grape_man/drop.play()
 		else:
-			$grape_man/drop.pickup()
+			$grape_man/pickup.play()
 			$grape_man.pickup()