summaryrefslogtreecommitdiffstats
path: root/src/tacmap.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/tacmap.rs')
-rw-r--r--src/tacmap.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tacmap.rs b/src/tacmap.rs
index 89d21aa..b245f77 100644
--- a/src/tacmap.rs
+++ b/src/tacmap.rs
@@ -52,7 +52,7 @@ impl TacticalMap
let camera = Camera::new(
wgpuctx,
cgmath::Point3::<f32>::new(0.0, 0.0, 1.0),
- cgmath::Deg(-90.0),
+ cgmath::Deg(0.0),
cgmath::Rad(0.0));
let projection = Projection::new(
@@ -86,8 +86,11 @@ impl TacticalMap
ui_state: &mut GameWindowUiState,
dt: Duration)
{
- self.camera_controller.update(&mut self.camera, dt);
ui_state.camera_scale = self.camera.get_scale();
+ ui_state.camera_pos = Some(self.camera.get_position());
+ self.camera.set_target(ui_state.camera_target);
+
+ self.camera_controller.update(&mut self.camera, game_state, ui_state, dt);
}
pub fn keyboard_input(