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

merge develop

Browse Source
This commit is contained in:
Chris Cromer 2022-04-09 22:16:27 -04:00
parent b3392035c9
commit ac86f148ba
Signed by: cromer
GPG Key ID: FA91071797BEEEC2
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
godot/Main.tscn
View File

@ -7,3 +7,9 @@
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="Level1" parent="." instance=ExtResource( 2 )] [node name="Level1" parent="." instance=ExtResource( 2 )]
[node name="StateMachine" type="Node" parent="."]
[node name="Walk" type="Node" parent="StateMachine"]
[node name="Run" type="Node" parent="StateMachine"]

20
godot/characters/player/Player.tscn
View File

@ -1,13 +1,14 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://characters/player/sprites/green.tres" type="SpriteFrames" id=1] [ext_resource path="res://characters/player/sprites/green.tres" type="SpriteFrames" id=1]
[ext_resource path="res://characters/player/Player.gdns" type="Script" id=2] [ext_resource path="res://characters/player/states/Idle.gdns" type="Script" id=2]
[ext_resource path="res://characters/player/Player.gdns" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 7, 11.5 ) extents = Vector2( 7, 11.5 )
[node name="Player" type="KinematicBody2D"] [node name="Player" type="KinematicBody2D"]
script = ExtResource( 2 ) script = ExtResource( 3 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
frames = ExtResource( 1 ) frames = ExtResource( 1 )
@ -18,4 +19,15 @@ centered = false
position = Vector2( 12, 12.5 ) position = Vector2( 12, 12.5 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[connection signal="player_moved" from="." to="." method="_on_Player_player_moved"] [node name="StateMachine" type="Node" parent="."]
[node name="Idle" type="Node" parent="StateMachine"]
script = ExtResource( 2 )
[node name="Move" type="Node" parent="StateMachine"]
[node name="Jump" type="Node" parent="StateMachine"]
[node name="DoubleJump" type="Node" parent="StateMachine"]
[node name="Fall" type="Node" parent="StateMachine"]

10
src/godot.cpp
View File

@ -1,7 +1,12 @@
#include <Godot.hpp> #include <Godot.hpp>
#include "StateMachine.h"
#include "State.h"
#include "Walk.h"
#include "Run.h"
#include "Main.h" #include "Main.h"
#include "Player.h" #include "Player.h"
#include "PlayerIdle.h"
using namespace godot; using namespace godot;
@ -21,6 +26,11 @@ extern "C" void GDN_EXPORT godot_gdnative_terminate(godot_gdnative_terminate_opt
extern "C" void GDN_EXPORT godot_nativescript_init(void *handle) extern "C" void GDN_EXPORT godot_nativescript_init(void *handle)
{ {
Godot::nativescript_init(handle); Godot::nativescript_init(handle);
register_class<StateMachine>();
register_class<State>();
register_class<Walk>();
register_class<Run>();
register_class<Main>(); register_class<Main>();
register_class<Player>(); register_class<Player>();
register_class<PlayerIdle>();
} }