Simplify client::Sim::view

Ralith · Jan 22, 2024 · e5ae491 · e5ae491
1 parent 1153055
commit e5ae491
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/client/src/local_character_controller.rs b/client/src/local_character_controller.rs
@@ -21,8 +21,12 @@ impl LocalCharacterController {
         }
     }
 
-    pub fn position(&self) -> Position {
-        self.position
+    /// Get the current position with orientation applied to it
+    pub fn oriented_position(&self) -> Position {
+        Position {
+            node: self.position.node,
+            local: self.position.local * self.orientation.to_homogeneous(),
+        }
     }
 
     pub fn orientation(&self) -> na::UnitQuaternion<f32> {

diff --git a/client/src/sim.rs b/client/src/sim.rs
@@ -437,14 +437,11 @@ impl Sim {
     }
 
     pub fn view(&self) -> Position {
-        let mut pos = self.local_character_controller.position();
+        let mut pos = self.local_character_controller.oriented_position();
         let up = self.graph.get_relative_up(&pos).unwrap();
         pos.local *= common::math::translate_along(
             &(up.as_ref() * (self.cfg.character.character_radius - 1e-3)),
-        ) * self
-            .local_character_controller
-            .orientation()
-            .to_homogeneous();
+        );
         pos
     }