Merge pull request #394 from aaronfranke/pong

Update and improve all Pong demos

Author: aaronfranke

2d/pong/ball.gd

@@ -1,13 +1,13 @@
 [gd_scene load_steps=13 format=2]
 
-[ext_resource path="res://paddle.gd" type="Script" id=1]
+[ext_resource path="res://scripts/paddle.gd" type="Script" id=1]
 [ext_resource path="res://left_pallete.png" type="Texture" id=2]
 [ext_resource path="res://right_pallete.png" type="Texture" id=3]
-[ext_resource path="res://ball.gd" type="Script" id=4]
+[ext_resource path="res://scripts/ball.gd" type="Script" id=4]
 [ext_resource path="res://ball.png" type="Texture" id=5]
 [ext_resource path="res://separator.png" type="Texture" id=6]
-[ext_resource path="res://wall.gd" type="Script" id=7]
-[ext_resource path="res://ceiling_floor.gd" type="Script" id=8]
+[ext_resource path="res://scripts/wall.gd" type="Script" id=7]
+[ext_resource path="res://scripts/ceiling_floor.gd" type="Script" id=8]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 4, 16 )
@@ -21,86 +21,85 @@ extents = Vector2( 10, 200 )
 [sub_resource type="RectangleShape2D" id=4]
 extents = Vector2( 320, 10 )
 
-[node name="game" type="Node2D"]
+[node name="Pong" type="Node2D"]
 
-[node name="ColorRect" type="ColorRect" parent="."]
+[node name="Background" type="ColorRect" parent="."]
 margin_right = 640.0
 margin_bottom = 400.0
 color = Color( 0.141176, 0.152941, 0.164706, 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="left" type="Area2D" parent="."]
+[node name="Left" type="Area2D" parent="."]
 position = Vector2( 67.6285, 192.594 )
 script = ExtResource( 1 )
 
-[node name="sprite" type="Sprite" parent="left"]
+[node name="Sprite" type="Sprite" parent="Left"]
 texture = ExtResource( 2 )
 
-[node name="collision" type="CollisionShape2D" parent="left"]
+[node name="Collision" type="CollisionShape2D" parent="Left"]
 shape = SubResource( 1 )
 
-[node name="right" type="Area2D" parent="."]
+[node name="Right" type="Area2D" parent="."]
 position = Vector2( 563.815, 188.919 )
 script = ExtResource( 1 )
-ball_dir = -1
 
-[node name="sprite" type="Sprite" parent="right"]
+[node name="Sprite" type="Sprite" parent="Right"]
 texture = ExtResource( 3 )
 
-[node name="collision" type="CollisionShape2D" parent="right"]
+[node name="Collision" type="CollisionShape2D" parent="Right"]
 shape = SubResource( 1 )
 
-[node name="ball" type="Area2D" parent="."]
+[node name="Ball" type="Area2D" parent="."]
 position = Vector2( 320.5, 191.124 )
 script = ExtResource( 4 )
 
-[node name="sprite" type="Sprite" parent="ball"]
+[node name="Sprite" type="Sprite" parent="Ball"]
 texture = ExtResource( 5 )
 
-[node name="collision" type="CollisionShape2D" parent="ball"]
+[node name="Collision" type="CollisionShape2D" parent="Ball"]
 shape = SubResource( 2 )
 
-[node name="separator" type="Sprite" parent="."]
+[node name="Separator" type="Sprite" parent="."]
 position = Vector2( 320, 200 )
 texture = ExtResource( 6 )
 
-[node name="left_wall" type="Area2D" parent="."]
+[node name="LeftWall" type="Area2D" parent="."]
 position = Vector2( -10, 200 )
 script = ExtResource( 7 )
 
-[node name="collision" type="CollisionShape2D" parent="left_wall"]
+[node name="Collision" type="CollisionShape2D" parent="LeftWall"]
 shape = SubResource( 3 )
 
-[node name="right_wall" type="Area2D" parent="."]
+[node name="RightWall" type="Area2D" parent="."]
 position = Vector2( 650, 200 )
 script = ExtResource( 7 )
 
-[node name="collision" type="CollisionShape2D" parent="right_wall"]
+[node name="Collision" type="CollisionShape2D" parent="RightWall"]
 shape = SubResource( 3 )
 
-[node name="ceiling" type="Area2D" parent="."]
+[node name="Ceiling" type="Area2D" parent="."]
 position = Vector2( 320, -10 )
 script = ExtResource( 8 )
 
-[node name="collision" type="CollisionShape2D" parent="ceiling"]
+[node name="Collision" type="CollisionShape2D" parent="Ceiling"]
 shape = SubResource( 4 )
 
-[node name="floor" type="Area2D" parent="."]
+[node name="Floor" type="Area2D" parent="."]
 position = Vector2( 320, 410 )
 script = ExtResource( 8 )
-y_direction = -1
+_bounce_direction = -1
 
-[node name="collision" type="CollisionShape2D" parent="floor"]
+[node name="Collision" type="CollisionShape2D" parent="Floor"]
 shape = SubResource( 4 )
 
 [node name="Camera2D" type="Camera2D" parent="."]
 offset = Vector2( 320, 200 )
 current = true
-[connection signal="area_entered" from="left" to="left" method="_on_area_entered"]
-[connection signal="area_entered" from="right" to="right" method="_on_area_entered"]
-[connection signal="area_entered" from="left_wall" to="left_wall" method="_on_wall_area_entered"]
-[connection signal="area_entered" from="right_wall" to="right_wall" method="_on_wall_area_entered"]
-[connection signal="area_entered" from="ceiling" to="ceiling" method="_on_area_entered"]
-[connection signal="area_entered" from="floor" to="floor" method="_on_area_entered"]
+[connection signal="area_entered" from="Left" to="Left" method="_on_area_entered"]
+[connection signal="area_entered" from="Right" to="Right" method="_on_area_entered"]
+[connection signal="area_entered" from="LeftWall" to="LeftWall" method="_on_wall_area_entered"]
+[connection signal="area_entered" from="RightWall" to="RightWall" method="_on_wall_area_entered"]
+[connection signal="area_entered" from="Ceiling" to="Ceiling" method="_on_area_entered"]
+[connection signal="area_entered" from="Floor" to="Floor" method="_on_area_entered"]

2d/pong/ceiling_floor.gd

@@ -15,7 +15,7 @@ _global_script_class_icons={
 
 [application]
 
-config/name="Pong"
+config/name="Pong with GDScript"
 run/main_scene="pong.tscn"
 config/icon="res://icon.png"
 
@@ -36,21 +36,31 @@ singletons=[  ]
 left_move_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)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
  ]
 }
 left_move_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)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null)
  ]
 }
 right_move_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)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":1,"axis_value":1.0,"script":null)
  ]
 }
 right_move_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)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":1,"axis_value":-1.0,"script":null)
  ]
 }
 

2d/pong/paddle.gd

@@ -0,0 +1,18 @@
+extends Area2D
+
+const DEFAULT_SPEED = 100
+
+var direction = Vector2.LEFT
+
+onready var _initial_pos = position
+onready var _speed = DEFAULT_SPEED
+
+func _process(delta):
+	_speed += delta * 2
+	position += _speed * delta * direction
+
+
+func reset():
+	direction = Vector2.LEFT
+	position = _initial_pos
+	_speed = DEFAULT_SPEED

2d/pong/pong.tscn

@@ -0,0 +1,7 @@
+extends Area2D
+
+export var _bounce_direction = 1
+
+func _on_area_entered( area ):
+	if area.name == "Ball":
+		area.direction = (area.direction + Vector2(0, _bounce_direction)).normalized()

2d/pong/project.godot

@@ -0,0 +1,27 @@
+extends Area2D
+
+const MOVE_SPEED = 100
+
+var _ball_dir
+var _up
+var _down
+
+onready var _screen_size_y = get_viewport_rect().size.y
+
+func _ready():
+	var n = name.to_lower()
+	_up = n + "_move_up"
+	_down = n + "_move_down"
+	_ball_dir = 1 if n == "left" else -1
+
+
+func _process(delta):
+	# Move up and down based on input.
+	var input = Input.get_action_strength(_down) - Input.get_action_strength(_up)
+	position.y = clamp(position.y + input * MOVE_SPEED * delta, 16, _screen_size_y - 16)
+
+
+func _on_area_entered(area):
+	if area.name == "Ball":
+		# Assign new direction.
+		area.direction = Vector2(_ball_dir, randf() * 2 - 1).normalized()

2d/pong/scripts/ball.gd

@@ -1,7 +1,6 @@
 extends Area2D
 
-
-func _on_wall_area_entered( area ):
-	if area.get_name() == "ball":
+func _on_wall_area_entered(area):
+	if area.name == "Ball":
 		#oops, ball went out of game place, reset
 		area.reset()

2d/pong/scripts/ceiling_floor.gd

@@ -2,17 +2,12 @@
 
 public class Ball : Area2D
 {
-    private const int BallSpeed = 100;
+    private const int DefaultSpeed = 100;
 
     public Vector2 direction = Vector2.Left;
 
     private Vector2 _initialPos;
-
-    public void Reset()
-    {
-        Position = _initialPos;
-        direction = Vector2.Left;
-    }
+    private float _speed = DefaultSpeed;
 
     public override void _Ready()
     {
@@ -21,6 +16,14 @@ public override void _Ready()
 
     public override void _Process(float delta)
     {
-        Position += BallSpeed * delta * direction;
+        _speed += delta * 2;
+        Position += _speed * delta * direction;
+    }
+
+    public void Reset()
+    {
+        direction = Vector2.Left;
+        Position = _initialPos;
+        _speed = DefaultSpeed;
     }
 }