paddles move, fixing paddle and ball collision

Author: bitwes

TddAndPong/Episode4/project.godot

@@ -22,6 +22,29 @@ config/icon="res://icon.png"
 
 enabled=PoolStringArray( "gut" )
 
+[input]
+
+p1_up={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
+ ]
+}
+p1_down={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"unicode":0,"echo":false,"script":null)
+ ]
+}
+p2_up={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
+ ]
+}
+p2_down={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
+ ]
+}
+
 [rendering]
 
 environment/default_environment="res://default_env.tres"

TddAndPong/Episode4/scripts/game.gd

@@ -3,4 +3,16 @@ extends Node2D
 func _ready():
 	$Ball.set_speed(300)
 	$Ball.set_direction(Vector2(1, 1))
-
+	
+	$P1Paddle.set_speed(300)
+	$P2Paddle.set_speed(300)
+	
+func _process(delta):
+	if Input.is_action_pressed("p1_up"):
+		$P1Paddle.move_up(delta)
+	if Input.is_action_pressed("p1_down"):
+		$P1Paddle.move_down(delta)
+	if Input.is_action_pressed("p2_up"):
+		$P2Paddle.move_up(delta)
+	if Input.is_action_pressed("p2_down"):
+		$P2Paddle.move_down(delta)

TddAndPong/Episode4/scripts/paddle.gd

@@ -1,5 +1,7 @@
 extends Area2D
 
+var _speed = 10
+
 func bounce(ball):
 	var new_y = rand_range(-.5, .5)
 	var new_x = ball.get_direction().x * -1
@@ -12,3 +14,15 @@ func _draw():
 
 func _on_Paddle_area_entered(area):
 	bounce(area)
+
+func get_speed():
+	return _speed
+
+func set_speed(speed):
+	_speed = speed
+	
+func move_up(delta):
+	set_position(get_position() + Vector2(0, delta * _speed * -1))
+
+func move_down(delta):
+	set_position(get_position() + Vector2(0, delta * _speed))

TddAndPong/Episode4/test/Tests.tscn

@@ -14,7 +14,7 @@ script = ExtResource( 1 )
 __meta__ = {
 "_editor_icon": ExtResource( 2 )
 }
-_select_script = "test_paddle"
+_select_script = "test_wall_and_paddle"
 _run_on_load = true
 _should_maximize = true
 _yield_between_tests = false

TddAndPong/Episode4/test/integration/test_wall_and_paddle.gd

@@ -0,0 +1,24 @@
+extends 'res://addons/gut/test.gd'
+
+var Paddle = load('res://scenes/Paddle.tscn')
+var Wall = load('res://scenes/Wall.tscn')
+
+func test_wall_and_paddle_can_collide_without_error():
+	var paddle = Paddle.instance()
+	var wall = Wall.instance()
+	
+	wall.set_position(Vector2(80, 80))
+	paddle.set_position(Vector2(100, 150))
+	
+	add_child(paddle)
+	add_child(wall)
+	
+	paddle.set_speed(50)
+	paddle.move_up(1)	
+	
+	yield(yield_for(.5), YIELD)
+	assert_true(true, 'we got here')
+	
+#	remove_child(paddle)
+#	remove_child(wall)
+	

TddAndPong/Episode4/test/unit/test_paddle.gd

@@ -6,6 +6,9 @@ var Ball = load('res://scripts/ball.gd')
 func test_can_make_paddle():
 	assert_not_null(Paddle.new())
 
+func test_can_get_set_speed():
+	assert_accessors(Paddle.new(), 'speed', 10, 100)
+
 func test_bounce_inverts_x():
 	var ball = double(Ball).new()
 	var paddle = Paddle.new()
@@ -52,5 +55,27 @@ func test_bounce_changes_y_randomly():
 
 	assert_between(min_y, -.5, -.3)
 	assert_between(max_y, .3, .5)
-		
-		
+
+func test_move_up_moves_by_speed_times_delta():
+	var paddle = Paddle.new()
+	paddle.set_position(Vector2(0, 300))
+	var orig_pos = paddle.get_position()
+	paddle.set_speed(20)
+	paddle.move_up(.5)
+	assert_eq(paddle.get_position().y, orig_pos.y - 10, 'moves up by .5 * 20')
+	
+	
+func test_move_down_moves_by_speed_times_delta():
+	var paddle = Paddle.new()
+	paddle.set_position(Vector2(0, 300))
+	var orig_pos = paddle.get_position()
+	paddle.set_speed(30)
+	paddle.move_down(.5)
+	assert_eq(paddle.get_position().y, orig_pos.y + 15, 'moves up by .5 * 30')
+	
+	
+	
+	
+	
+	
+