Skip to content

Commit

Permalink
Fix formatting with pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
wjt committed Sep 24, 2024
1 parent 5491e92 commit 8552cc3
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 20 deletions.
5 changes: 4 additions & 1 deletion addons/DampedOscillator/DampedOscillator.gd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ extends EditorPlugin


func _enter_tree():
add_autoload_singleton("DampedOscillator", "res://addons/DampedOscillator/scripts/damped_oscillator.tscn")
add_autoload_singleton(
"DampedOscillator", "res://addons/DampedOscillator/scripts/damped_oscillator.tscn"
)


func _exit_tree():
remove_autoload_singleton("DampedOscillator")
24 changes: 14 additions & 10 deletions addons/DampedOscillator/scripts/AnimationInstance.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
extends Node


# node values
var node
var propertie
Expand All @@ -19,38 +18,43 @@ var active = true
signal started
signal ended


func _physics_process(delta):
# Do the math
var force = -spring_force * displacement - damp * velocity
velocity += force * delta
displacement += velocity * delta

# Check if node is gone
var wr = weakref(node)

if !wr.get_ref():
set_physics_process(false)
queue_free()
return

# Apply the math

match typeof(node.get(propertie)):
TYPE_FLOAT:
node.set(propertie, original_value + displacement*scale_factor)
node.set(propertie, original_value + displacement * scale_factor)
TYPE_INT:
node.set(propertie, original_value + int(displacement*scale_factor))
node.set(propertie, original_value + int(displacement * scale_factor))
TYPE_VECTOR2:
node.set(propertie, original_value + Vector2(displacement,-displacement)*scale_factor )

node.set(
propertie, original_value + Vector2(displacement, -displacement) * scale_factor
)

if abs(velocity - 0) < 0.001:
end() # Bye bye
end() # Bye bye


func start():
set_physics_process(true)
active = true
emit_signal("started")


func end():
emit_signal("ended")
node.set(propertie, original_value)
Expand Down
19 changes: 10 additions & 9 deletions addons/DampedOscillator/scripts/DampedOscillator.gd
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,24 @@ extends Node
var animation_instance = preload("res://addons/DampedOscillator/scripts/animation_instance.tscn")
var queue_sysem_enabled = false

func animate(node, propertie: String, string: float, damp: float, velocity: float, scale_factor: float):

func animate(
node, propertie: String, string: float, damp: float, velocity: float, scale_factor: float
):
# Spawn new animation instance
var i = animation_instance.instantiate()

# Update node values
i.node = node
i.propertie = propertie
i.original_value = node.get(propertie)

# Update oscillator values
i.spring_force = string
i.damp = damp
i.velocity = velocity
i.scale_factor = scale_factor



# Queue system
for animation in get_children():
if animation.node == node and animation.propertie == propertie:
Expand All @@ -29,13 +31,12 @@ func animate(node, propertie: String, string: float, damp: float, velocity: floa
add_child(i)
return
i.active = false
animation.ended.connect(Callable(i,"start"))

animation.ended.connect(Callable(i, "start"))
i.original_value = animation.original_value
i.set_physics_process(false)
add_child(i)
return

# Yayy finally
add_child(i)

0 comments on commit 8552cc3

Please sign in to comment.