copy episode 3 over

bitwes · bitwes · commit 4d38bf3ba96c · 2019-11-23T14:02:47.000-05:00
diff --git a/TddAndPong/Episode4/default_env.tres b/TddAndPong/Episode4/default_env.tres
@@ -0,0 +1,8 @@
+[gd_resource type="Environment" load_steps=2 format=2]
+
+[sub_resource type="ProceduralSky" id=1]
+
+[resource]
+background_mode = 2
+background_sky = SubResource( 1 )
+
diff --git a/TddAndPong/Episode4/icon.png b/TddAndPong/Episode4/icon.png
diff --git a/TddAndPong/Episode4/icon.png.import b/TddAndPong/Episode4/icon.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://icon.png"
+dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/TddAndPong/Episode4/project.godot b/TddAndPong/Episode4/project.godot
@@ -0,0 +1,27 @@
+; Engine configuration file.
+; It's best edited using the editor UI and not directly,
+; since the parameters that go here are not all obvious.
+;
+; Format:
+;   [section] ; section goes between []
+;   param=value ; assign values to parameters
+
+config_version=4
+
+_global_script_classes=[  ]
+_global_script_class_icons={
+
+}
+
+[application]
+
+config/name="PongGutDemo"
+config/icon="res://icon.png"
+
+[editor_plugins]
+
+enabled=PoolStringArray( "gut" )
+
+[rendering]
+
+environment/default_environment="res://default_env.tres"
diff --git a/TddAndPong/Episode4/scenes/Ball.tscn b/TddAndPong/Episode4/scenes/Ball.tscn
@@ -0,0 +1,12 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://scripts/ball.gd" type="Script" id=1]
+
+[sub_resource type="CircleShape2D" id=1]
+
+[node name="Ball" type="Area2D"]
+script = ExtResource( 1 )
+
+[node name="Shape" type="CollisionShape2D" parent="."]
+shape = SubResource( 1 )
+
diff --git a/TddAndPong/Episode4/scenes/Game.tscn b/TddAndPong/Episode4/scenes/Game.tscn
@@ -0,0 +1,27 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://scripts/game.gd" type="Script" id=1]
+[ext_resource path="res://scenes/Ball.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scenes/Wall.tscn" type="PackedScene" id=3]
+[ext_resource path="res://scenes/Paddle.tscn" type="PackedScene" id=4]
+
+[node name="Game" type="Node2D"]
+script = ExtResource( 1 )
+
+[node name="Ball" parent="." instance=ExtResource( 2 )]
+position = Vector2( 462, 218 )
+
+[node name="TopWall" parent="." instance=ExtResource( 3 )]
+position = Vector2( 464, 156 )
+_color = Color( 0.941176, 0.0784314, 0.0784314, 1 )
+
+[node name="BottomWall" parent="." instance=ExtResource( 3 )]
+position = Vector2( 469, 291 )
+_color = Color( 0.0431373, 0.909804, 0.2, 1 )
+
+[node name="P1Paddle" parent="." instance=ExtResource( 4 )]
+position = Vector2( 353, 225 )
+
+[node name="P2Paddle" parent="." instance=ExtResource( 4 )]
+position = Vector2( 578, 218 )
+
diff --git a/TddAndPong/Episode4/scenes/Paddle.tscn b/TddAndPong/Episode4/scenes/Paddle.tscn
@@ -0,0 +1,14 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://scripts/paddle.gd" type="Script" id=1]
+
+[sub_resource type="RectangleShape2D" id=1]
+extents = Vector2( 10, 54.8 )
+
+[node name="Paddle" type="Area2D"]
+script = ExtResource( 1 )
+
+[node name="Shape" type="CollisionShape2D" parent="."]
+shape = SubResource( 1 )
+
+[connection signal="area_entered" from="." to="." method="_on_Paddle_area_entered"]
diff --git a/TddAndPong/Episode4/scenes/Wall.tscn b/TddAndPong/Episode4/scenes/Wall.tscn
@@ -0,0 +1,15 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://scripts/wall.gd" type="Script" id=1]
+
+[sub_resource type="RectangleShape2D" id=1]
+extents = Vector2( 102, 10 )
+
+[node name="Wall" type="Area2D"]
+script = ExtResource( 1 )
+
+[node name="Shape" type="CollisionShape2D" parent="."]
+position = Vector2( 0, -1 )
+shape = SubResource( 1 )
+
+[connection signal="area_entered" from="." to="." method="_on_Wall_area_entered"]
diff --git a/TddAndPong/Episode4/scripts/ball.gd b/TddAndPong/Episode4/scripts/ball.gd
@@ -0,0 +1,26 @@
+extends Area2D
+
+var _speed = 0
+var _direction = Vector2(0, 0)
+
+func get_speed():
+	return _speed
+	
+func set_speed(speed):
+	_speed = speed
+	
+func get_direction():
+	return _direction
+
+func set_direction(direction):
+	if(!direction.is_normalized()):
+		_direction = direction.normalized()
+	else:
+		_direction = direction
+
+func _process(delta):
+	var new_pos =  _speed * _direction * delta
+	set_position(get_position() + new_pos)
+	
+func _draw():
+	draw_circle(Vector2(0 ,0), $Shape.shape.radius, Color(0, 0, 1))
diff --git a/TddAndPong/Episode4/scripts/game.gd b/TddAndPong/Episode4/scripts/game.gd
@@ -0,0 +1,6 @@
+extends Node2D
+
+func _ready():
+	$Ball.set_speed(300)
+	$Ball.set_direction(Vector2(1, 1))
+
diff --git a/TddAndPong/Episode4/scripts/paddle.gd b/TddAndPong/Episode4/scripts/paddle.gd
@@ -0,0 +1,14 @@
+extends Area2D
+
+func bounce(ball):
+	var new_y = rand_range(-.5, .5)
+	var new_x = ball.get_direction().x * -1
+	ball.set_direction(Vector2(new_x, new_y))
+	
+func _draw():
+	var e = $Shape.shape.extents
+	draw_rect(Rect2(e.x * -1, e.y * -1, e.x * 2, e.y * 2), Color(1, 1, 1))#_color)
+	
+
+func _on_Paddle_area_entered(area):
+	bounce(area)
diff --git a/TddAndPong/Episode4/scripts/wall.gd b/TddAndPong/Episode4/scripts/wall.gd
@@ -0,0 +1,20 @@
+extends Area2D
+
+export var _color = Color(1, 1, 1) setget set_color, get_color
+
+func get_color():
+	return _color
+
+func set_color(color):
+	_color = color
+
+
+func _draw():
+	var e = $Shape.shape.extents
+	draw_rect(Rect2(e.x * -1, e.y * -1, e.x * 2, e.y * 2), _color)
+
+func bounce(ball):
+	ball.set_direction(ball.get_direction() * Vector2(1, -1))
+
+func _on_Wall_area_entered(area):
+	bounce(area)
diff --git a/TddAndPong/Episode4/test/Tests.tscn b/TddAndPong/Episode4/test/Tests.tscn
@@ -0,0 +1,24 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://addons/gut/gut.gd" type="Script" id=1]
+[ext_resource path="res://addons/gut/icon.png" type="Texture" id=2]
+
+[node name="Tests" type="Node2D"]
+
+[node name="Gut" type="Control" parent="."]
+self_modulate = Color( 1, 1, 1, 0 )
+margin_right = 740.0
+margin_bottom = 250.0
+rect_min_size = Vector2( 740, 250 )
+script = ExtResource( 1 )
+__meta__ = {
+"_editor_icon": ExtResource( 2 )
+}
+_select_script = "test_paddle"
+_run_on_load = true
+_should_maximize = true
+_yield_between_tests = false
+_include_subdirectories = true
+_directory1 = "res://test"
+_double_strategy = 1
+
diff --git a/TddAndPong/Episode4/test/integration/test_wall_and_ball.gd b/TddAndPong/Episode4/test/integration/test_wall_and_ball.gd
@@ -0,0 +1,23 @@
+extends 'res://addons/gut/test.gd'
+
+var WallScene = load('res://scenes/Wall.tscn')
+var BallScene = load('res://scenes/Ball.tscn')
+
+
+func test_ball_bounces_off_wall():
+	var wall = WallScene.instance()
+	add_child(wall)
+	wall.set_position(Vector2(100, 100))
+	
+	var ball = BallScene.instance()
+	add_child(ball)
+	ball.set_position(Vector2(120, 200))
+	ball.set_speed(100)
+	ball.set_direction(Vector2(0, -1))
+	
+	yield(yield_for(2), YIELD)
+	
+	assert_gt(ball.get_direction().y, 0)
+	
+	remove_child(wall)
+	remove_child(ball)
diff --git a/TddAndPong/Episode4/test/unit/test_ball.gd b/TddAndPong/Episode4/test/unit/test_ball.gd
@@ -0,0 +1,36 @@
+extends 'res://addons/gut/test.gd'
+
+var Ball = load('res://scripts/ball.gd')
+
+func test_can_create_ball():
+	var b = Ball.new()
+	assert_not_null(b)
+	
+func test_get_set_speed():
+	var b = Ball.new()
+	assert_accessors(b, 'speed', 0, 100)
+
+func test_get_set_direction():
+	var b = Ball.new()
+	assert_accessors(b, 'direction', Vector2(0, 0), Vector2(1, 1).normalized())
+	
+func test_ball_moves_on_process():
+	var b = Ball.new()
+	b.set_speed(10)
+	b.set_direction(Vector2(1, 0))
+	simulate(b, 1, 1)
+	assert_eq(b.get_position(), Vector2(10, 0))
+
+func test_ball_moves_vertically_on_process():
+	var b = Ball.new()
+	b.set_speed(10)
+	b.set_direction(Vector2(0, 1))
+	simulate(b, 1, .5)
+	assert_eq(b.get_position(), Vector2(0, 5))
+	
+func test_set_direction_normalizes_vector():
+	var b = Ball.new()
+	var dir = Vector2(500, 500)
+	b.set_direction(dir)
+	assert_eq(b.get_direction(), dir.normalized())
+	
diff --git a/TddAndPong/Episode4/test/unit/test_paddle.gd b/TddAndPong/Episode4/test/unit/test_paddle.gd
@@ -0,0 +1,56 @@
+extends 'res://addons/gut/test.gd'
+
+var Paddle = load('res://scripts/paddle.gd')
+var Ball = load('res://scripts/ball.gd')
+
+func test_can_make_paddle():
+	assert_not_null(Paddle.new())
+
+func test_bounce_inverts_x():
+	var ball = double(Ball).new()
+	var paddle = Paddle.new()
+	
+	stub(ball, 'get_direction').to_return(Vector2(1, 1))
+	paddle.bounce(ball)
+	var new_x =  get_call_parameters(ball, 'set_direction')[0].x
+	assert_eq(new_x, -1.0)
+
+
+func test_bounce_inverts_x_other_direction():
+	var ball = double(Ball).new()
+	var paddle = Paddle.new()
+	
+	stub(ball, 'get_direction').to_return(Vector2(-1, 1))
+	paddle.bounce(ball)
+	var new_x =  get_call_parameters(ball, 'set_direction')[0].x
+	assert_eq(new_x, 1.0)
+
+func test_bounce_changes_y_randomly():
+	var paddle = Paddle.new()
+	var ball = double(Ball).new()
+	stub(ball, 'get_direction').to_return(Vector2(1, 1))
+	stub(ball, 'set_direction').to_do_nothing()
+	
+	for i in range(1000):
+		paddle.bounce(ball)
+		
+	var last_y = get_call_parameters(ball, 'set_direction', 0)[0].y
+	var current_y = 0
+	var num_equal = 0
+	var min_y = 3
+	var max_y = -3
+	for i in range(1, 1000):
+		current_y = get_call_parameters(ball, 'set_direction', i)[0].y
+		if(current_y == last_y):
+			num_equal += 1
+		last_y = current_y
+		
+		max_y = max(max_y, current_y)
+		min_y = min(min_y, current_y)
+		
+	assert_eq(num_equal, 0)
+	
+	assert_between(min_y, -.5, -.3)
+	assert_between(max_y, .3, .5)
+		
+		
diff --git a/TddAndPong/Episode4/test/unit/test_wall.gd b/TddAndPong/Episode4/test/unit/test_wall.gd
@@ -0,0 +1,22 @@
+extends 'res://addons/gut/test.gd'
+
+var Wall = load('res://scripts/wall.gd')
+var Ball = load('res://scripts/ball.gd')
+
+func test_can_make_wall():
+	assert_not_null(Wall.new())
+	
+
+func test_bounce_inverts_ball_y_diredtion():
+	var wall = Wall.new()
+	var ball = double(Ball).new()
+	var dir = Vector2(1, 1).normalized()
+	stub(ball, 'get_direction').to_return(dir)
+	
+	wall.bounce(ball)
+	assert_called(ball, 'set_direction', [dir * Vector2(1, -1)])
+	
+func test_get_set_color():
+	assert_accessors(Wall.new(), 'color', Color(1, 1, 1), Color(0, 0, 0))
+	
+	
