[3DP] Update to Godot 3.1.2

Conform to style guide, add WASD movement, add controller support

Author: aaronfranke

3d/platformer/bullet.gd

@@ -1,5 +1,4 @@
-
 extends RigidBody
 
-# Member variables
-var disabled = false
+#warning-ignore:unused_class_variable
+var enabled = true

3d/platformer/bullet.tscn

@@ -25,7 +25,7 @@ surfaces/0 = {
 "vertex_count": 34
 }
 
-[sub_resource type="SpatialMaterial" id=6]
+[sub_resource type="SpatialMaterial" id=3]
 albedo_color = Color( 0.7, 0.7, 0.7, 1 )
 metallic = 0.1
 roughness = 0.0
@@ -35,8 +35,7 @@ emission_energy = 3.71
 emission_operator = 0
 emission_on_uv2 = false
 
-[sub_resource type="Animation" id=3]
-resource_name = "life"
+[sub_resource type="Animation" id=4]
 length = 2.0
 tracks/0/type = "value"
 tracks/0/path = NodePath("Sphere:visible")
@@ -63,7 +62,7 @@ tracks/1/keys = {
 "values": [ true, false ]
 }
 tracks/2/type = "method"
-tracks/2/path = NodePath(".:")
+tracks/2/path = NodePath(".")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/imported = false
@@ -77,19 +76,19 @@ tracks/2/keys = {
 } ]
 }
 
-[sub_resource type="Gradient" id=8]
+[sub_resource type="Gradient" id=5]
 colors = PoolColorArray( 1, 1, 1, 1, 1, 1, 1, 0 )
 
-[sub_resource type="GradientTexture" id=9]
-gradient = SubResource( 8 )
+[sub_resource type="GradientTexture" id=6]
+gradient = SubResource( 5 )
 
 [sub_resource type="ParticlesMaterial" id=7]
 spread = 0.0
 gravity = Vector3( 0, 0, 0 )
 scale = 0.3
-color_ramp = SubResource( 9 )
+color_ramp = SubResource( 6 )
 
-[sub_resource type="SphereShape" id=5]
+[sub_resource type="SphereShape" id=8]
 radius = 0.27
 
 [node name="Bullet" type="RigidBody"]
@@ -102,13 +101,11 @@ __meta__ = {
 [node name="Sphere" type="MeshInstance" parent="."]
 transform = Transform( 0.24972, 0, 0, 0, 0.24972, 0, 0, 0, 0.24972, 0.00159812, 0.0110106, 0.0045104 )
 mesh = SubResource( 2 )
-skeleton = NodePath("..:")
-material/0 = SubResource( 6 )
+material/0 = SubResource( 3 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-root_node = NodePath("..:")
 autoplay = "life"
-anims/life = SubResource( 3 )
+anims/life = SubResource( 4 )
 
 [node name="Particles" type="Particles" parent="."]
 amount = 16
@@ -120,4 +117,4 @@ process_material = SubResource( 7 )
 draw_pass_1 = SubResource( 2 )
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
-shape = SubResource( 5 )
+shape = SubResource( 8 )

3d/platformer/coin.gd

@@ -1,10 +1,7 @@
-
 extends Area
 
-# Member variables
 var taken = false
 
-
 func _on_coin_body_enter(body):
 	if not taken and body is preload("res://player.gd"):
 		get_node("Animation").play("take")

3d/platformer/coin.tscn

@@ -85,23 +85,24 @@ tracks/2/keys = {
 "values": [ true ]
 }
 
-[sub_resource type="SphereShape" id=7]
+[sub_resource type="SphereShape" id=5]
 radius = 0.312546
 
-[sub_resource type="Gradient" id=8]
+[sub_resource type="Gradient" id=6]
 colors = PoolColorArray( 1, 1, 1, 1, 1, 1, 1, 0 )
 
-[sub_resource type="GradientTexture" id=9]
-gradient = SubResource( 8 )
+[sub_resource type="GradientTexture" id=7]
+gradient = SubResource( 6 )
 
-[sub_resource type="ParticlesMaterial" id=10]
+[sub_resource type="ParticlesMaterial" id=8]
 emission_shape = 2
 emission_box_extents = Vector3( 0.3, 0.3, 0.3 )
 initial_velocity = 5.51
+angular_velocity = 4.27461e-05
 scale = 0.1
-color_ramp = SubResource( 9 )
+color_ramp = SubResource( 7 )
 
-[sub_resource type="SpatialMaterial" id=11]
+[sub_resource type="SpatialMaterial" id=9]
 flags_transparent = true
 flags_unshaded = true
 vertex_color_use_as_albedo = true
@@ -114,8 +115,8 @@ particles_anim_loop = false
 albedo_color = Color( 1, 1, 0.759137, 1 )
 albedo_texture = ExtResource( 3 )
 
-[sub_resource type="QuadMesh" id=12]
-material = SubResource( 11 )
+[sub_resource type="QuadMesh" id=10]
+material = SubResource( 9 )
 
 [node name="Coin" type="Area"]
 input_ray_pickable = false
@@ -128,18 +129,16 @@ __meta__ = {
 transform = Transform( 0.2, 0, 0, 0, -3.25841e-08, 0.2, 0, -0.2, -3.25841e-08, 0.00550658, 0.532125, 0.000651598 )
 layers = 2
 mesh = SubResource( 2 )
-skeleton = NodePath("..:")
 material/0 = null
 
 [node name="Animation" type="AnimationPlayer" parent="."]
-root_node = NodePath("..:")
 autoplay = "spin"
 anims/spin = SubResource( 3 )
 anims/take = SubResource( 4 )
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00894194, 0.575859, 0.0193955 )
-shape = SubResource( 7 )
+shape = SubResource( 5 )
 
 [node name="VisibilityEnabler" type="VisibilityEnabler" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0321827, 0.57887, 0.0268312 )
@@ -155,6 +154,6 @@ emitting = false
 one_shot = true
 explosiveness = 1.0
 visibility_aabb = AABB( -4.12919, -4, -4, 8.25837, 8, 8 )
-process_material = SubResource( 10 )
-draw_pass_1 = SubResource( 12 )
+process_material = SubResource( 8 )
+draw_pass_1 = SubResource( 10 )
 [connection signal="body_entered" from="." to="." method="_on_coin_body_enter"]

3d/platformer/enemy.gd

@@ -1,7 +1,5 @@
-
 extends RigidBody
 
-# Member variables
 const STATE_WALKING = 0
 const STATE_DYING = 1
 
@@ -14,15 +12,17 @@ var rot_speed = 1
 
 var dying = false
 
+onready var gravity = ProjectSettings.get_setting("physics/3d/default_gravity") * ProjectSettings.get_setting("physics/3d/default_gravity_vector")
 
 func _integrate_forces(state):
 	var delta = state.get_step()
 	var lv = state.get_linear_velocity()
 	var g = state.get_total_gravity()
-	# get_total_gravity returns zero for the first few frames, leading to errors
-	if g == Vector3.ZERO: g = Vector3 (0, -9.8, 0)
+	# get_total_gravity returns zero for the first few frames, leading to errors.
+	if g == Vector3.ZERO:
+		g = gravity
 
-	lv += g * delta # Apply gravity
+	lv += g * delta # Apply gravity.
 	var up = -g.normalized()
 
 	if dying:
@@ -34,22 +34,20 @@ func _integrate_forces(state):
 		var dp = state.get_contact_local_normal(i)
 
 		if cc:
-			if cc is preload("res://bullet.gd") and not cc.disabled:
+			if cc is preload("res://bullet.gd") and cc.enabled:
 				set_mode(MODE_RIGID)
 				dying = true
-				#lv = s.get_contact_local_normal(i)*400
 				state.set_angular_velocity(-dp.cross(up).normalized() * 33.0)
 				get_node("AnimationPlayer").play("impact")
 				get_node("AnimationPlayer").queue("explode")
-				set_friction(1)
-				cc.disabled = true
-				get_node("sound_hit").play()
+				cc.enabled = false
+				get_node("SoundHit").play()
 				return
 
-	var col_floor = get_node("Armature/ray_floor").is_colliding()
-	var col_wall = get_node("Armature/ray_wall").is_colliding()
+	var col_floor = get_node("Armature/RayFloor").is_colliding()
+	var col_wall = get_node("Armature/RayWall").is_colliding()
 
-	var advance = not col_wall and col_floor
+	var advance = col_floor and not col_wall
 
 	var dir = get_node("Armature").get_transform().basis[2].normalized()
 	var deaccel_dir = dir
@@ -60,7 +58,7 @@ func _integrate_forces(state):
 		deaccel_dir = dir.cross(g).normalized()
 	else:
 		if prev_advance:
-			rot_dir = 1 # randf()*2.0 - 1.0
+			rot_dir = 1
 
 		dir = Basis(up, rot_dir * rot_speed * delta).xform(dir)
 		get_node("Armature").set_transform(Transform().looking_at(-dir, up))