Skip to content
Snippets Groups Projects
Commit 97f3aaeb authored by sugarshock's avatar sugarshock
Browse files

fixed grabbing rotation

parent fd9b5ed2
No related branches found
No related tags found
No related merge requests found
Pipeline #14410 passed
......@@ -24,7 +24,7 @@ func _ready():
func _physics_process(delta):
if held_object:
var rot_dif = rotation - last_rotation
#var rot_dif = rotation - last_rotation
held_object.global_transform.origin = to_global(held_object_data["position"]) + held_object_data["global_pos_delta"]
held_object.scale = held_object_data["scale"]
update_object_glows()
......@@ -74,10 +74,12 @@ func _on_SqueezeStart():
held_object_data["position"] = to_local(kinematic_body.global_transform.origin)
held_object_data["scale"] = kinematic_body.scale
held_object_data["parent"] = kinematic_body.get_parent()
held_object_data["rotation"] = kinematic_body.global_rotation
held_object = kinematic_body
held_object.unsnap()
held_object.get_parent().remove_child(held_object)
add_child(held_object)
kinematic_body.global_rotation = held_object_data["rotation"]
held_object_data["layer"] = held_object.collision_layer
held_object_data["mask"] = held_object.collision_mask
#held_object.mode = RigidBody.MODE_STATIC
......@@ -93,9 +95,10 @@ func _on_SqueezeStart():
func _on_SqueezeEnd():
if held_object != null:
var overlap = held_object.get_nearest_overlapping_kp()
held_object_data["rotation"] = held_object.global_rotation
remove_child(held_object)
held_object_data["parent"].add_child(held_object)
held_object.global_rotation = held_object_data["rotation"]
held_object.global_transform.origin = to_global(held_object_data["position"])
held_object.scale = held_object_data["scale"]
held_object.currently_held_by = ""
......
......@@ -30,4 +30,4 @@ nodes/Grip/position = Vector2( 780, 180 )
nodes/Trigger/node = SubResource( 2 )
nodes/Trigger/position = Vector2( 560, 80 )
nodes/output/position = Vector2( 1020, 80 )
node_connections = [ "output", 0, "Grip", "Trigger", 0, "Default", "Trigger", 1, "Fist", "Grip", 0, "Trigger", "Grip", 1, "Fist2" ]
node_connections = [ "Trigger", 0, "Default", "Trigger", 1, "Fist", "Grip", 0, "Trigger", "Grip", 1, "Fist2", "output", 0, "Grip" ]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment