Merge branch 'imp/turn-at-input'

CharTween.gd

@@ -1,19 +1,19 @@
 extends Tween
 
-export var duration = 0.75
+export var duration = 0.1
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	pass # Replace with function body.
 
 func connect_into(o):
-	connect("tween_all_completed", o, "_on_tween_completed")
+	connect("tween_completed", o, "_on_tween_completed")
 	pass
 
 func move_char(c, t_pos):
 	interpolate_property(c, "position", c.get_position(), t_pos, duration, Tween.TRANS_LINEAR, Tween.EASE_OUT_IN)
 	pass
 
-func rotate_char(c, t_rot):
-	interpolate_property(c, "rotation_degrees", c.rotation_degrees, t_rot, duration, Tween.TRANS_LINEAR, Tween.EASE_OUT)
+func rotate_char(c, from, to):
+	interpolate_property(c, "rotation_degrees", from, to, duration, Tween.TRANS_LINEAR, Tween.EASE_OUT)
 	pass

Player.gd

@@ -3,9 +3,6 @@ extends Area2D
 # Nodes
 var grid:TileMap
 onready var tween = $Tween
-onready var rayFront = $RayFront
-onready var rayLeft = $RayLeft
-onready var rayRight = $RayRight
 
 # Misc
 var cell_size
@@ -20,6 +17,11 @@ enum Direction {
 	LEFT = 3
 }
 
+enum Side {
+	LEFT = -1
+	RIGHT = 1
+}
+
 # Movement
 var posix
 var posiy
@@ -49,56 +51,89 @@ func _ready():
 	posix = int (position.x / 64)
 	posiy = int (position.y / 64)
 
-	turn(dire)
+	apply_turn()
 
 	tween.connect_into(self)
 
 func _unhandled_input(event):
 	if event.is_pressed():
 		if event.is_action(turn_left_action):
-			dire_delta = -1
+			prepare_turn(Side.LEFT)
 			get_tree().set_input_as_handled()
 		elif event.is_action(turn_right_action):
-			dire_delta = 1
+			prepare_turn(Side.RIGHT)
 			get_tree().set_input_as_handled()
 
 func _on_game_start():
 	move()
 
-func _on_tween_completed():
-	move()
+func _on_tween_completed(_o, key):
+	if (key == ":position"):
+		move()
 
 func _on_crash(body):
 	die()
 	generate_wall()
+	# TODO : use enum for blocks
 	grid.set_cell(posix, posiy, 2)
 
 func generate_wall():
+	# TODO : use enum for blocks
 	grid.set_cell(posix - dirx, posiy - diry, 1)
 
-func move():
-	if !alive:
+func prepare_turn(left_or_right:int):
+	var current_angle = (dire + dire_delta) * 90
+
+	dire_delta += left_or_right
+	if dire_delta > Side.RIGHT:
+		dire_delta = Side.RIGHT
+		return
+	elif dire_delta < Side.LEFT:
+		dire_delta = Side.LEFT
 		return
 
-	generate_wall()
+	var aim_angle = current_angle + 90 * left_or_right
 
-	if dire_delta == -1 and !rayLeft.is_colliding():
-		tween.rotate_char(self, rotation_degrees - 90)
+	tween.rotate_char(self, current_angle, aim_angle)
+	tween.start()
 
-		dire += dire_delta
-		if dire < 0:
-			dire = 3
+func can_turn():
+	return dire_delta != 0 and !has_block_on(dire_delta)
 
-	elif dire_delta == 1 and !rayRight.is_colliding():
-		tween.rotate_char(self, rotation_degrees + 90)
+func apply_turn():
+	dire += dire_delta
+	dire_delta = 0
 
-		dire += dire_delta
-		if dire > 3:
-			dire = 0
+	if dire < 0:
+		dire = 3
+	elif dire > 3:
+		dire = 0
 
-	turn(dire)
-	dire_delta = 0
+	dirx = 0
+	diry = 0
+	if dire == Direction.UP:
+		diry -= 1
+	elif dire == Direction.RIGHT:
+		dirx += 1
+	elif dire == Direction.DOWN:
+		diry += 1
+	elif dire == Direction.LEFT:
+		dirx -= 1
+	else:
+		push_error("dire out of range")
+
+func move():
+	if !alive:
+		return
+
+	generate_wall()
+
+	if can_turn():
+		apply_turn()
+
+	go_forward()
 
+func go_forward():
 	posix += dirx
 	posiy += diry
 
@@ -106,17 +141,12 @@ func move():
 	tween.move_char(self, target_pos)
 	tween.start()
 
-func turn(dir:int):
-	dirx = 0
-	diry = 0
-	if dir == Direction.UP:
-		diry -= 1
-	elif dir == Direction.RIGHT:
-		dirx += 1
-	elif dir == Direction.DOWN:
-		diry += 1
-	else:
-		dirx -= 1
+func has_block_on(left_or_right:int):
+	var bposx:int = posix - diry * left_or_right
+	var bposy:int = posiy + dirx * left_or_right
+
+	# TODO : use enum for blocks
+	return grid.get_cell(bposx, bposy) == 1
 
 func die():
 	alive = false

Player.tscn

@@ -22,34 +22,6 @@ __meta__ = {
 "_edit_lock_": true
 }
 
-[node name="RayFront" type="RayCast2D" parent="."]
-position = Vector2( 0, -30 )
-enabled = true
-exclude_parent = false
-cast_to = Vector2( 0, -64 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="RayLeft" type="RayCast2D" parent="."]
-position = Vector2( -30, 0 )
-enabled = true
-exclude_parent = false
-cast_to = Vector2( -64, 0 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="RayRight" type="RayCast2D" parent="."]
-position = Vector2( 30, 0 )
-enabled = true
-exclude_parent = false
-cast_to = Vector2( 64, 0 )
-__meta__ = {
-"_edit_lock_": true
-}
-
 [node name="Tween" type="Tween" parent="."]
 script = ExtResource( 3 )
-duration = 0.1
 [connection signal="body_entered" from="." to="." method="_on_crash"]