From 81126975a122082b8b1cb88885d678808a87270c Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sat, 24 Apr 2021 19:02:03 -0400 Subject: [PATCH] fix fish render layer --- src/logic/ingame/mod.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/logic/ingame/mod.rs b/src/logic/ingame/mod.rs index a9a75c0..7c04afc 100644 --- a/src/logic/ingame/mod.rs +++ b/src/logic/ingame/mod.rs @@ -32,6 +32,7 @@ impl InGameScreen { &mut self, context_2d: &mut RaylibMode2D, game_core: &mut GameCore, + dt: f64 ) { // Build source bounds let source_bounds = Rectangle { @@ -50,6 +51,13 @@ impl InGameScreen { // Clear the background context_2d.draw_rectangle_rec(world_bounds, WATER); + // Render fish + let fish_clone = game_core.world.fish.clone(); + for fish in game_core.world.fish.iter_mut() { + fish.update_position(&mut game_core.player, dt, &fish_clone); + fish.render(context_2d); + } + // Render the world texture context_2d.draw_texture_rec( &game_core.resources.cave_mid_layer, @@ -107,20 +115,15 @@ impl Screen for InGameScreen { // Open a 2D context { - let mut context_2d = draw_handle.begin_mode2D(game_core.master_camera); + let mut context_2d = draw_handle.begin_mode2D(game_core.master_camera); // Render the world - self.render_world(&mut context_2d, game_core); + self.render_world(&mut context_2d, game_core, dt); if game_core.show_simple_debug_info { self.render_colliders(&mut context_2d, game_core); } // Render entities - let fish_clone = game_core.world.fish.clone(); - for fish in game_core.world.fish.iter_mut() { - fish.update_position(&mut game_core.player, dt, &fish_clone); - fish.render(&mut context_2d); - } for jellyfish in game_core.world.jellyfish.iter_mut() { jellyfish.handle_logic(&mut game_core.player, dt); jellyfish.render(&mut context_2d, &mut game_core.resources, dt);