summaryrefslogtreecommitdiff
path: root/src/renderer/mod.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/renderer/mod.rs')
-rw-r--r--src/renderer/mod.rs12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index 54a6667..b37dc09 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -6,7 +6,7 @@ use fxhash::FxHashMap;
use winit::window::Window;
use crate::{
- Config, Diagnostics, Input,
+ Config, Diagnostics, InputManager,
camera::Camera,
config::{CELLS_IN_CHUNK, CHUNK_SIZE},
content::materials::MaterialId,
@@ -578,7 +578,7 @@ impl RendererState {
camera: &mut Camera,
config: &mut Config,
diagnostics: &Diagnostics,
- input: &Input,
+ input_manager: &InputManager,
) {
puffin::profile_function!();
@@ -626,7 +626,7 @@ impl RendererState {
.resizable(false)
// TODO collapse button
.show_collapsible(ui, &mut true, |panel_ui| {
- draw_egui(panel_ui, config, camera, diagnostics, input, sim)
+ draw_egui(panel_ui, config, camera, diagnostics, input_manager, sim)
});
});
@@ -747,11 +747,7 @@ impl RendererState {
for (id, slot) in &self.renderer_rb_entities {
if let Some(entity) = sim.entities.get(id)
&& let Some(cells) = &entity.data.cells
- && let Some((pos, (cos, sin))) = entity.data.transform(&SimCtx {
- cell_manager: &mut sim.cell_manager,
- particle_manager: &mut sim.particle_manager,
- rb_manager: &mut sim.rb_manager,
- })
+ && let Some((pos, (cos, sin))) = entity.data._transform(&sim.rb_manager)
{
instances.push(RendererInstance {
centre: pos.to_array(),