Merge pull request #400 from aaronfranke/2d-physics-pl

aaronfranke · web-flow · commit 704ebeec8152 · 2020-02-03T16:33:06.000-05:00
Update 2D physics platformer
diff --git a/2d/particles/particles.tscn b/2d/particles/particles.tscn
@@ -190,7 +190,7 @@ scale = 0.5
 scale_random = 1.0
 color = Color( 0.214844, 1, 0.392731, 1 )
 
-[node name="Node" type="Node"]
+[node name="Particles" type="Node"]
 
 [node name="Fire" type="Particles2D" parent="."]
 material = SubResource( 1 )
diff --git a/2d/physics_platformer/Stage.tscn b/2d/physics_platformer/Stage.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=21 format=2]
+[gd_scene load_steps=22 format=2]
 
 [ext_resource path="res://Tileset.tres" type="TileSet" id=1]
 [ext_resource path="res://coin/Coin.tscn" type="PackedScene" id=2]
@@ -8,14 +8,7 @@
 [ext_resource path="res://player/Player.tscn" type="PackedScene" id=6]
 [ext_resource path="res://enemy/Enemy.tscn" type="PackedScene" id=7]
 [ext_resource path="res://background/ParallaxBg.tscn" type="PackedScene" id=8]
-
-
-
-
-
-
-
-
+[ext_resource path="res://audio/music.ogg" type="AudioStream" id=9]
 
 [sub_resource type="PhysicsMaterial" id=1]
 friction = 0.0
@@ -53,7 +46,7 @@ friction = 0.0
 [sub_resource type="PhysicsMaterial" id=12]
 friction = 0.0
 
-[node name="Stage" type="Node"]
+[node name="Stage" type="Node2D"]
 
 [node name="TileMap" type="TileMap" parent="."]
 tile_set = ExtResource( 1 )
@@ -64,7 +57,8 @@ __meta__ = {
 "_edit_lock_": true
 }
 
-[node name="Coins" type="Node" parent="."]
+[node name="Coins" type="Node2D" parent="."]
+editor/display_folded = true
 
 [node name="Coin" parent="Coins" instance=ExtResource( 2 )]
 position = Vector2( 672, 1179 )
@@ -192,7 +186,8 @@ position = Vector2( 4236.75, 541.058 )
 [node name="Coin42" parent="Coins" instance=ExtResource( 2 )]
 position = Vector2( 4172.75, 541.058 )
 
-[node name="Props" type="Node" parent="."]
+[node name="Props" type="Node2D" parent="."]
+editor/display_folded = true
 
 [node name="MovingPlatform" parent="Props" instance=ExtResource( 3 )]
 position = Vector2( 1451.86, 742.969 )
@@ -219,7 +214,8 @@ position = Vector2( 927.698, 1120.81 )
 position = Vector2( 251.684, 1045.6 )
 physics_material_override = SubResource( 1 )
 
-[node name="Enemies" type="Node" parent="."]
+[node name="Enemies" type="Node2D" parent="."]
+editor/display_folded = true
 
 [node name="Enemy1" parent="Enemies" instance=ExtResource( 7 )]
 position = Vector2( 834.664, 1309.6 )
@@ -277,3 +273,6 @@ size_flags_vertical = 0
 text = "This is a simple demo on how to make a platformer game with Godot.\"This version uses physics and the 2D physics engine for motion and collision.\"\"The demo also shows the benefits of using the scene system, where coins,\"enemies and the player are edited separatedly and instanced in the stage.\"\"To edit the base tiles for the  tileset, open the tileset_edit.tscn file and follow \"instructions.\""
 autowrap = true
 
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 9 )
+autoplay = true
diff --git a/2d/physics_platformer/Stage2.tscn b/2d/physics_platformer/Stage2.tscn
@@ -4,10 +4,7 @@
 [ext_resource path="res://player/Player.tscn" type="PackedScene" id=2]
 [ext_resource path="res://background/ParallaxBg.tscn" type="PackedScene" id=3]
 
-
-
-
-[node name="Stage" type="Node"]
+[node name="Stage2" type="Node2D"]
 
 [node name="TileMap" type="TileMap" parent="."]
 tile_set = ExtResource( 1 )
@@ -32,4 +29,3 @@ size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "This is a simple demo on how to make a platformer game with Godot.\"This version uses physics and the 2D physics engine for motion and collision.\"\"The demo also shows the benefits of using the scene system, where coins,\"enemies and the player are edited separatedly and instanced in the stage.\"\"To edit the base tiles for the  tileset, open the tileset_edit.tscn file and follow \"instructions.\""
 autowrap = true
-
diff --git a/2d/physics_platformer/TilesetEdit.tscn b/2d/physics_platformer/TilesetEdit.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://tiles_demo.png" type="Texture" id=1]
 
-[node name="Node" type="Node"]
+[node name="TilesetEdit" type="Node2D"]
 
 [node name="Floor" type="Sprite" parent="."]
 texture = ExtResource( 1 )
@@ -156,4 +156,3 @@ text = "This scene serves as a tool for editing the tileset.
 This will save a tileset. Saving over it will merge your changes.
 
 Finally, the saved tileset resource (tileset.tres in this case), can be opened to be used into a TileMap node for editing a tile map."
-
diff --git a/2d/physics_platformer/background/ParallaxBg.tscn b/2d/physics_platformer/background/ParallaxBg.tscn
@@ -71,4 +71,3 @@ position = Vector2( 0, 225 )
 texture = ExtResource( 6 )
 centered = false
 region_rect = Rect2( 0, 0, 800, 256 )
-
diff --git a/2d/physics_platformer/coin/Coin.tscn b/2d/physics_platformer/coin/Coin.tscn
@@ -105,6 +105,7 @@ emission_sphere_radius = 20.0
 flag_disable_z = true
 gravity = Vector3( 0, 0, 0 )
 initial_velocity = 1.0
+angular_velocity = 0.0191222
 orbit_velocity = 0.0
 orbit_velocity_random = 0.0
 scale = 0.3
@@ -117,7 +118,7 @@ script = ExtResource( 1 )
 texture = ExtResource( 2 )
 hframes = 4
 
-[node name="Anim" type="AnimationPlayer" parent="."]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 autoplay = "spin"
 anims/spin = SubResource( 1 )
 anims/taken = SubResource( 2 )
@@ -139,5 +140,4 @@ texture = ExtResource( 4 )
 
 [node name="Enabler" type="VisibilityEnabler2D" parent="."]
 pause_particles = false
-
 [connection signal="body_entered" from="." to="." method="_on_body_enter"]
diff --git a/2d/physics_platformer/coin/coin.gd b/2d/physics_platformer/coin/coin.gd
@@ -1,11 +1,8 @@
-extends Area2D
-
 class_name Coin
+extends Area2D
 
-# Member variables
 var taken = false
 
-
-func _on_body_enter( body ):
+func _on_body_enter(body):
 	if not taken and body is Player:
-		($Anim as AnimationPlayer).play("taken")
+		($AnimationPlayer as AnimationPlayer).play("taken")
diff --git a/2d/physics_platformer/enemy/Enemy.tscn b/2d/physics_platformer/enemy/Enemy.tscn
@@ -117,6 +117,7 @@ flag_disable_z = true
 spread = 180.0
 gravity = Vector3( 0, 98, 0 )
 initial_velocity = 322.73
+angular_velocity = 1.5
 orbit_velocity = 0.0
 orbit_velocity_random = 0.0
 scale = 2.4
@@ -133,7 +134,7 @@ position = Vector2( 16.2569, 11.0034 )
 scale = Vector2( 23.5056, 10.8629 )
 pause_particles = false
 
-[node name="Anim" type="AnimationPlayer" parent="."]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/explode = SubResource( 2 )
 anims/idle = SubResource( 3 )
 anims/walk = SubResource( 4 )
@@ -179,4 +180,3 @@ stream = ExtResource( 4 )
 
 [node name="SoundExplode" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource( 5 )
-
diff --git a/2d/physics_platformer/enemy/enemy.gd b/2d/physics_platformer/enemy/enemy.gd
@@ -1,53 +1,30 @@
-extends RigidBody2D
-
 class_name Enemy
+extends RigidBody2D
 
-# Member variables
 const WALK_SPEED = 50
-const STATE_WALKING = 0
-const STATE_DYING = 1
 
-# state machine
-var state = STATE_WALKING
+enum State {
+	WALKING,
+	DYING
+}
+
+var state = State.WALKING
 
 var direction = -1
 var anim = ""
 
-onready var rc_left = $RaycastLeft
-onready var rc_right = $RaycastRight
-
 var Bullet = preload("res://player/bullet.gd")
 
-
-func _die():
-	queue_free()
-
-func _pre_explode():
-	#make sure nothing collides against this
-	$Shape1.queue_free()
-	$Shape2.queue_free()
-	$Shape3.queue_free()
-	
-	# Stay there
-	mode = MODE_STATIC
-	($SoundExplode as AudioStreamPlayer2D).play()
-	
-func _bullet_collider(cc, s, dp):
-	mode = MODE_RIGID
-	state = STATE_DYING
-	
-	s.set_angular_velocity(sign(dp.x) * 33.0)
-	set_friction(1)
-	cc.disable()
-	($SoundHit as AudioStreamPlayer2D).play()
+onready var rc_left = $RaycastLeft
+onready var rc_right = $RaycastRight
 
 func _integrate_forces(s):
 	var lv = s.get_linear_velocity()
 	var new_anim = anim
 
-	if state == STATE_DYING:
+	if state == State.DYING:
 		new_anim = "explode"
-	elif state == STATE_WALKING:
+	elif state == State.WALKING:
 		new_anim = "walk"
 		
 		var wall_side = 0.0
@@ -81,6 +58,31 @@ func _integrate_forces(s):
 	
 	if anim != new_anim:
 		anim = new_anim
-		($Anim as AnimationPlayer).play(anim)
+		($AnimationPlayer as AnimationPlayer).play(anim)
 	
 	s.set_linear_velocity(lv)
+
+
+func _die():
+	queue_free()
+
+
+func _pre_explode():
+	#make sure nothing collides against this
+	$Shape1.queue_free()
+	$Shape2.queue_free()
+	$Shape3.queue_free()
+	
+	# Stay there
+	mode = MODE_STATIC
+	($SoundExplode as AudioStreamPlayer2D).play()
+
+
+func _bullet_collider(cc, s, dp):
+	mode = MODE_RIGID
+	state = State.DYING
+	
+	s.set_angular_velocity(sign(dp.x) * 33.0)
+	set_friction(1)
+	cc.disable()
+	($SoundHit as AudioStreamPlayer2D).play()
diff --git a/2d/physics_platformer/platform/MovingPlatform.tscn b/2d/physics_platformer/platform/MovingPlatform.tscn
@@ -3,7 +3,7 @@
 [ext_resource path="res://platform/moving_platform.gd" type="Script" id=1]
 [ext_resource path="res://platform/moving_platform.png" type="Texture" id=2]
 
-[node name="Moving_platform" type="Node2D"]
+[node name="MovingPlatform" type="Node2D"]
 script = ExtResource( 1 )
 
 [node name="Platform" type="RigidBody2D" parent="."]
@@ -14,4 +14,3 @@ texture = ExtResource( 2 )
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Platform"]
 polygon = PoolVector2Array( -88, -24, 88, -24, 88, 24, -88, 24 )
-
diff --git a/2d/physics_platformer/platform/OneWayPlatform.tscn b/2d/physics_platformer/platform/OneWayPlatform.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 100, 10 )
 
-[node name="One_way_platform" type="StaticBody2D"]
+[node name="OneWayPlatform" type="StaticBody2D"]
 
 [node name="Sprite" type="Sprite" parent="."]
 texture = ExtResource( 1 )
@@ -14,4 +14,3 @@ texture = ExtResource( 1 )
 position = Vector2( 1.46304, -13.1672 )
 shape = SubResource( 1 )
 one_way_collision = true
-
diff --git a/2d/physics_platformer/platform/moving_platform.gd b/2d/physics_platformer/platform/moving_platform.gd
@@ -1,17 +1,14 @@
-extends Node2D
-
 class_name MovingPlatform
+extends Node2D
 
-# Member variables
 export var motion = Vector2()
 export var cycle = 1.0
 
 var accum = 0.0
 
-
 func _physics_process(delta):
-	accum += delta * (1.0 / cycle) * PI * 2.0
-	accum = fmod(accum, PI * 2.0)
+	accum += delta * (1.0 / cycle) * TAU
+	accum = fmod(accum, TAU)
 	
 	var d = sin(accum)
 	var xf = Transform2D()
diff --git a/2d/physics_platformer/player/Bullet.tscn b/2d/physics_platformer/player/Bullet.tscn
@@ -80,7 +80,6 @@ shape = SubResource( 3 )
 [node name="Timer" type="Timer" parent="."]
 one_shot = true
 
-[node name="Anim" type="AnimationPlayer" parent="."]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/shutdown = SubResource( 4 )
-
 [connection signal="timeout" from="Timer" to="." method="disable"]
diff --git a/2d/physics_platformer/player/Player.tscn b/2d/physics_platformer/player/Player.tscn
@@ -229,7 +229,7 @@ local_coords = false
 process_material = SubResource( 4 )
 texture = ExtResource( 3 )
 
-[node name="Anim" type="AnimationPlayer" parent="."]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/crouch = SubResource( 5 )
 anims/falling = SubResource( 6 )
 anims/falling_weapon = SubResource( 7 )
@@ -295,4 +295,3 @@ stream = ExtResource( 8 )
 
 [node name="SoundJump" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource( 9 )
-
diff --git a/2d/physics_platformer/player/bullet.gd b/2d/physics_platformer/player/bullet.gd
@@ -1,17 +1,15 @@
-extends RigidBody2D
-
 class_name Bullet
+extends RigidBody2D
 
-# Member variables
 var disabled = false
 
-
 func _ready():
 	($Timer as Timer).start()
 
+
 func disable():
 	if disabled:
 		return
-		
-	($Anim as AnimationPlayer).play("shutdown")
-	disabled = true
+	
+	($AnimationPlayer as AnimationPlayer).play("shutdown")
+	disabled = true
diff --git a/2d/physics_platformer/player/player.gd b/2d/physics_platformer/player/player.gd
diff --git a/2d/physics_platformer/project.godot b/2d/physics_platformer/project.godot
