evan/ludum-dare-50
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

collisions with objects

Browse Source
This commit is contained in:
rsninja722 2022-04-03 18:05:44 -04:00
parent ba26cbe9dd
commit d6db37ca93
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/dist/project-constants.json vendored
View File

@ -18,8 +18,8 @@
}
},
"player": {
"max_velocity": 30,
"acceleration": 20,
"max_velocity": 3,
"acceleration": 2,
"deceleration": 1,
"start_size": 0.8
}

39
game/game_logic/src/scenes/player_interaction.rs
View File

@ -181,7 +181,15 @@ impl PlayableScene {
Color::GREEN,
);
draw.draw_text(
format!("player: ({}, {}) size: {} map: ({}, {})", self.player.position.x,self.player.position.y,self.player.size,self.world_map.get_map_size().x,self.world_map.get_map_size().y).as_str(),
format!(
"player: ({}, {}) size: {} map: ({}, {})",
self.player.position.x,
self.player.position.y,
self.player.size,
self.world_map.get_map_size().x,
self.world_map.get_map_size().y
)
.as_str(),
10,
50,
20,
@ -263,21 +271,24 @@ impl PlayableScene {
for i in &self.world_colliders {
if player.position.x - player_size <= i.position.x + i.size.x / 2.0
&& player.position.x + player_size >= i.position.x + i.size.x / 2.0
&& player.position.y - player_size<= i.position.y + i.size.y / 2.0
&& player.position.y - player_size <= i.position.y + i.size.y / 2.0
&& player.position.y + player_size >= i.position.y + i.size.x / 2.0
{
if player.velocity.x < 0.0 {
player.position.x = i.position.x + i.size.x / 2.0 + player_size;
} else if player.velocity.x > 0.0 {
player.position.x = i.position.x - i.size.x / 2.0 - player_size;
}
// if player.velocity.x < 0.0 {
// player.position.x = i.position.x + i.size.x / 2.0 + player_size;
// } else if player.velocity.x > 0.0 {
// player.position.x = i.position.x - i.size.x / 2.0 - player_size;
// }
player.position.x -= velocity_modifier.x;
player.velocity.x = 0.0;
break;
}
}
if player.position.x - player_size < 0.0 || player.position.x + player_size > self.world_map.get_map_size().x {
if player.position.x - player_size < 0.0
|| player.position.x + player_size > self.world_map.get_map_size().x
{
if player.velocity.x < 0.0 {
player.position.x = player_size;
} else if player.velocity.x > 0.0 {
@ -291,20 +302,24 @@ impl PlayableScene {
for i in &self.world_colliders {
if player.position.x - player_size <= i.position.x + i.size.x / 2.0
&& player.position.x + player_size >= i.position.x + i.size.x / 2.0
&& player.position.y - player_size<= i.position.y + i.size.y / 2.0
&& player.position.y - player_size <= i.position.y + i.size.y / 2.0
&& player.position.y + player_size >= i.position.y + i.size.x / 2.0
{
if player.velocity.y < 0.0 {
player.position.y = i.position.y + i.size.y / 2.0 + player_size;
} else if player.velocity.x > 0.0 {
} else if player.velocity.y > 0.0 {
player.position.y = i.position.y - i.size.y / 2.0 - player_size;
}
player.position.y -= velocity_modifier.y;
player.velocity.y = 0.0;
break;
}
}
if player.position.y + player_size > 0.0 || player.position.y - player_size < -self.world_map.get_map_size().y {
if player.position.y + player_size > 0.0
|| player.position.y - player_size < -self.world_map.get_map_size().y
{
if player.velocity.y > 0.0 {
player.position.y = -player_size;
} else if player.velocity.y < 0.0 {