Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

feature/Coin #32

Merged
cromer merged 22 commits from feature/Coin into develop 2022-08-27 22:39:01 -04:00
Conversation 0 Commits 22 Files Changed 30 +70 -47
3 changed files with 70 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a27f968297 - Show all commits

6
godot/Main.tscn
View File

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Main.gdns" type="Script" id=1]
[ext_resource path="res://levels/Prototype.tscn" type="PackedScene" id=2]
[ext_resource path="res://GUI/GameOver.tscn" type="PackedScene" id=3]
[node name="Main" type="Node"]
pause_mode = 2
@ -10,3 +11,6 @@ level = ExtResource( 2 )
[node name="Level" type="Node" parent="."]
pause_mode = 1
[node name="GameOver" parent="." instance=ExtResource( 3 )]
visible = false

21
src/gui/game_over/GameOverScreen.cpp
View File

@ -1,12 +1,16 @@
#include "gui/game_over/GameOverScreen.h"
#include <Resource.hpp>
#include <Ref.hpp>
#include <Node.hpp>
#include <SceneTree.hpp>
#include <PackedScene.hpp>
#include <Viewport.hpp>
using namespace godot;
void GameOverScreen::_register_methods()
{
register_method("_on_restart_button_pressed", &GameOverScreen::_on_restart_button_pressed);
register_method("_on_animation_finished", &GameOverScreen::_on_botonreiniciar_pressed);
}
GameOverScreen::GameOverScreen()
@ -19,9 +23,20 @@ GameOverScreen::~GameOverScreen()
void GameOverScreen::_init()
{
_resource_loader = ResourceLoader::get_singleton();
}
void GameOverScreen::_on_restart_button_pressed()
void GameOverScreen::_on_botonreiniciar_pressed()
{
get_tree()->change_scene("res://monitor/GUI.tscn");
if (_resource_loader->exists("res://levels/Prototype.tscn")) //CAMBIAR A DINAMICO
{
Ref<PackedScene> level_scene = _resource_loader->load("res://levels/Prototype.tscn");
auto level = level_scene->instance();
auto level_node = get_tree()->get_root()->find_node("Level");
level_node->add_child(level);
}
}

14
src/gui/game_over/GameOverScreen.h
View File

@ -1,10 +1,10 @@
#ifndef ALAI_GAME_OVER_SCREEN
#define ALAI_GAME_OVER_SCREEN
#ifndef ALAI_GAME_OVER_SCREEN_H
#define ALAI_GAME_OVER_SCREEN_H
#include <Godot.hpp>
#include <Node.hpp>
#include <Control.hpp>
#include <ResourceLoader.hpp>
namespace godot
{
@ -17,6 +17,7 @@ namespace godot
GODOT_CLASS(GameOverScreen, Control)
private:
ResourceLoader *_resource_loader;
public:
/**
@ -49,8 +50,11 @@ namespace godot
* @brief Called when the collected of the coin is entered.
*
*/
void _on_restart_button_pressed();
void _on_botonreiniciar_pressed();
};
}
#endif