Refactor main scene into Game.tscn

This commit is contained in:
Fabien Freling 2019-02-16 18:05:52 +01:00
parent b8c6084c19
commit ceaec1ac03
9 changed files with 49 additions and 70 deletions

14
scenes/Game.gd Normal file
View file

@ -0,0 +1,14 @@
extends Node
onready var final_menu := $FinalMenu
onready var player := $Player
onready var level := $Level_01
func _on_Level_01_level_completed():
player.queue_free()
level.queue_free()
final_menu.show()
func _on_FinalMenu_retried():
get_tree().reload_current_scene()

20
scenes/Game.tscn Normal file
View file

@ -0,0 +1,20 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://scenes/Game.gd" type="Script" id=1]
[ext_resource path="res://scenes/Player.tscn" type="PackedScene" id=2]
[ext_resource path="res://levels/Level_01.tscn" type="PackedScene" id=3]
[ext_resource path="res://scenes/FinalMenu.tscn" type="PackedScene" id=4]
[node name="Game" type="Node"]
script = ExtResource( 1 )
[node name="Player" parent="." instance=ExtResource( 2 )]
transform = Transform( 0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -3, 2.0589, -3 )
[node name="Level_01" parent="." instance=ExtResource( 3 )]
[node name="FinalMenu" parent="." instance=ExtResource( 4 )]
visible = false
[connection signal="level_completed" from="Level_01" to="." method="_on_Level_01_level_completed"]
[connection signal="retried" from="FinalMenu" to="." method="_on_FinalMenu_retried"]

View file

@ -2,20 +2,5 @@ extends Spatial
signal body_entered()
func _ready():
get_node("Area").connect("body_entered", self, "collided")
func collided(body):
if body.has_method("reach_goal"):
get_node("ShineRays").hide()
body.reach_goal()
# Should be done in vertex shader
#func _process(delta):
# var camera_pos = get_viewport().get_camera().global_transform.origin
# camera_pos.y = 0
# look_at(camera_pos, Vector3(0, 1, 0))
func _on_Area_body_entered(body):
emit_signal("body_entered", body)

View file

@ -72,9 +72,6 @@ editor/display_folded = true
[node name="Flag" parent="Pole" index="0"]
transform = Transform( 5, 0, 0, 0, -4.37114e-08, -0.5, 0, 1, -2.18557e-08, 4.02201, 0.453122, 0 )
[node name="Flag.001" parent="Pole" index="1"]
transform = Transform( 5, 0, 0, 0, -4.37114e-08, -0.5, 0, 1, -2.18557e-08, 5.99137, 0.443566, -0.191931 )
[node name="Lamp" parent="." index="1"]
visible = false

View file

@ -3,7 +3,7 @@ class_name Player
export var move_speed : float = 3.0
const norm_gravity = -100
const norm_gravity = -150
var velocity = Vector3()
const MAX_SLOPE_ANGLE = 60
var has_reached_goal = false

View file

@ -5,13 +5,15 @@
[sub_resource type="BoxShape" id=1]
extents = Vector3( 1.34689, 1.43545, 1.63476 )
[node name="Player" type="KinematicBody"]
script = ExtResource( 1 )
[node name="CollisionShape" type="CollisionShape" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.39138, 0 )
shape = SubResource( 1 )
[node name="Hedgehog" parent="." instance=ExtResource( 2 )]
transform = Transform( 0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0 )
transform = Transform( 0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 1.29215, 0 )