Merge remote-tracking branch 'origin/assets' into assets

This commit is contained in:
rsninja722 2021-04-25 17:07:16 -04:00
commit 0b1cd6c678
2 changed files with 14 additions and 1 deletions

View File

@ -205,9 +205,11 @@ impl Screen for InGameScreen {
{ {
let mut context_2d = draw_handle.begin_mode2D(game_core.master_camera); let mut context_2d = draw_handle.begin_mode2D(game_core.master_camera);
// Clear frame // Clear frame
context_2d.clear_background(Color::BLACK); context_2d.clear_background(Color::BLACK);
// Render the world // Render the world
self.render_world(&mut context_2d, game_core, dt); self.render_world(&mut context_2d, game_core, dt);
if game_core.show_simple_debug_info { if game_core.show_simple_debug_info {
@ -234,6 +236,17 @@ impl Screen for InGameScreen {
); );
} }
// Render transponder
game_core.resources.transponder.draw(&mut context_2d, game_core.world.end_position + Vector2::new(0.0, -50.0), 0.0);
// Render Player // Render Player
game_core game_core
.player .player

View File

@ -238,7 +238,7 @@ impl GlobalResources {
)?, )?,
Vector2 { x: 10.0, y: 20.0 }, Vector2 { x: 10.0, y: 20.0 },
6, 6,
1, 2,
), ),
}) })