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

develop #40

Merged
cromer merged 4 commits from develop into master 2022-08-29 20:51:15 -04:00
Conversation 0 Commits 4 Files Changed 1 +34 -18
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 12df454946 - Show all commits

32
src/player/Player.cpp
View File

@ -100,8 +100,16 @@ void alai::player::Player::_physics_process(float delta)
snap_vector = godot::Vector2::DOWN * 20.0; snap_vector = godot::Vector2::DOWN * 20.0;
} }
auto is_on_platform = false;
auto platform_detector = get_node<godot::RayCast2D>("PlatformDetector"); auto platform_detector = get_node<godot::RayCast2D>("PlatformDetector");
auto is_on_platform = platform_detector->is_colliding(); if (platform_detector != nullptr)
{
is_on_platform = platform_detector->is_colliding();
}
else
{
WARN_PRINT("PlatformDetector not found!");
}
velocity = move_and_slide_with_snap(velocity, snap_vector, godot::Vector2::UP, !is_on_platform, 4, 0.9, false); velocity = move_and_slide_with_snap(velocity, snap_vector, godot::Vector2::UP, !is_on_platform, 4, 0.9, false);
//velocity = move_and_slide(velocity, Vector2::UP, !is_on_platform); //velocity = move_and_slide(velocity, Vector2::UP, !is_on_platform);
@ -131,10 +139,12 @@ void alai::player::Player::_physics_process(float delta)
dup->queue_free(); dup->queue_free();
}*/ }*/
auto jump_sound = get_node<godot::AudioStreamPlayer>("Sounds/Jump"); auto jump_sound = get_node<godot::AudioStreamPlayer>("Sounds/Jump");
if (jump_sound != nullptr) { if (jump_sound != nullptr)
{
jump_sound->play(); jump_sound->play();
} }
else { else
{
WARN_PRINT("Player jump sound not found!"); WARN_PRINT("Player jump sound not found!");
} }
velocity.y = -get_bounce_force(); velocity.y = -get_bounce_force();
@ -151,6 +161,8 @@ void alai::player::Player::_physics_process(float delta)
// Clamp the player's position inside the camera's limits // Clamp the player's position inside the camera's limits
auto camera = get_node<godot::Camera2D>("Camera2D"); auto camera = get_node<godot::Camera2D>("Camera2D");
if (camera != nullptr)
{
auto position = get_global_position(); auto position = get_global_position();
auto sprite_node = get_node<godot::AnimatedSprite>("AnimatedSprite"); auto sprite_node = get_node<godot::AnimatedSprite>("AnimatedSprite");
if (sprite_node != nullptr) if (sprite_node != nullptr)
@ -164,6 +176,11 @@ void alai::player::Player::_physics_process(float delta)
position.y = godot::Math::clamp((float) position.y, (float) camera->get_limit(1), (float) camera->get_limit(3)); position.y = godot::Math::clamp((float) position.y, (float) camera->get_limit(1), (float) camera->get_limit(3));
} }
set_global_position(position); set_global_position(position);
}
else
{
WARN_PRINT("Camera node not found!");
}
// If the player is off screen reload the scene // If the player is off screen reload the scene
auto notifier = get_node<godot::VisibilityNotifier2D>("Camera2D/VisibilityNotifier2D"); auto notifier = get_node<godot::VisibilityNotifier2D>("Camera2D/VisibilityNotifier2D");
@ -175,6 +192,10 @@ void alai::player::Player::_physics_process(float delta)
event->emit_signal("player_died"); event->emit_signal("player_died");
} }
} }
else
{
WARN_PRINT("Visibility notifier not found!");
}
auto state = get_node("StateMachine")->get_child(0); auto state = get_node("StateMachine")->get_child(0);
if (state != nullptr) if (state != nullptr)
@ -270,11 +291,6 @@ godot::Vector2 alai::player::Player::get_velocity()
void alai::player::Player::_on_player_touched() void alai::player::Player::_on_player_touched()
{ {
/*auto error = get_tree()->change_scene("res://Main.tscn");
if (error != godot::Error::OK)
{
ERR_PRINT(godot::String().num((int) error) + " Could not load scene!");
}*/
auto event = get_node<alai::Event>("/root/Event"); auto event = get_node<alai::Event>("/root/Event");
event->emit_signal("player_died"); event->emit_signal("player_died");
} }