Redefine Ori as a quaternion

common/src/comp/mod.rs

@@ -17,6 +17,7 @@ pub mod inventory;
 mod last;
 mod location;
 mod misc;
+pub mod ori;
 mod phys;
 mod player;
 pub mod poise;
@@ -61,9 +62,9 @@ pub use inventory::{
 pub use last::Last;
 pub use location::{Waypoint, WaypointArea};
 pub use misc::Object;
+pub use ori::Ori;
 pub use phys::{
-    Collider, ForceUpdate, Gravity, Mass, Ori, PhysicsState, Pos, PreviousVelDtCache, Scale,
-    Sticky, Vel,
+    Collider, ForceUpdate, Gravity, Mass, PhysicsState, Pos, PreviousVelDtCache, Scale, Sticky, Vel,
 };
 pub use player::Player;
 pub use poise::{Poise, PoiseChange, PoiseSource, PoiseState};

common/src/comp/ori.rs

@@ -0,0 +1,175 @@
+use crate::util::Dir;
+use serde::{Deserialize, Serialize};
+use specs::Component;
+use specs_idvs::IdvStorage;
+use std::f32::consts::PI;
+use vek::{Quaternion, Vec2, Vec3};
+
+// Orientation
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(into = "SerdeOri")]
+#[serde(from = "SerdeOri")]
+pub struct Ori(Quaternion<f32>);
+
+impl Default for Ori {
+    /// Returns the default orientation (no rotation; default Dir)
+    fn default() -> Self { Self(Quaternion::identity()) }
+}
+
+impl Ori {
+    pub fn new(quat: Quaternion<f32>) -> Self {
+        debug_assert!(quat.into_vec4().map(f32::is_finite).reduce_and());
+        debug_assert!(quat.into_vec4().is_normalized());
+        Self(quat)
+    }
+
+    /// Tries to convert into a Dir and then the appropriate rotation
+    pub fn from_unnormalized_vec(vec: Vec3<f32>) -> Option<Self> {
+        Dir::from_unnormalized(vec).map(Self::from)
+    }
+
+    pub fn to_vec(self) -> Vec3<f32> { *self.look_dir() }
+
+    pub fn to_quat(self) -> Quaternion<f32> { self.0 }
+
+    /// Transform the vector from local into global vector space
+    pub fn relative_to_world(&self, vec: Vec3<f32>) -> Vec3<f32> { self.0 * vec }
+
+    /// Transform the vector from global into local vector space
+    pub fn relative_to_self(&self, vec: Vec3<f32>) -> Vec3<f32> { self.0.inverse() * vec }
+
+    pub fn look_dir(&self) -> Dir { Dir::new(self.0.normalized() * *Dir::default()) }
+
+    pub fn up(&self) -> Dir { self.pitched_up(PI / 2.0).look_dir() }
+
+    pub fn down(&self) -> Dir { self.pitched_down(PI / 2.0).look_dir() }
+
+    pub fn left(&self) -> Dir { self.yawed_left(PI / 2.0).look_dir() }
+
+    pub fn right(&self) -> Dir { self.yawed_right(PI / 2.0).look_dir() }
+
+    pub fn slerp(ori1: Self, ori2: Self, s: f32) -> Self {
+        Self(Quaternion::slerp(ori1.0, ori2.0, s).normalized())
+    }
+
+    pub fn slerped_towards(self, ori: Ori, s: f32) -> Self { Self::slerp(self, ori, s) }
+
+    /// Multiply rotation quaternion by `q`
+    pub fn rotated(self, q: Quaternion<f32>) -> Self { Self((self.0 * q).normalized()) }
+
+    /// Premultiply rotation quaternion by `q`
+    pub fn rotated_world(self, q: Quaternion<f32>) -> Self { Self((q * self.0).normalized()) }
+
+    pub fn pitched_up(self, angle_radians: f32) -> Self {
+        self.rotated(Quaternion::rotation_x(angle_radians))
+    }
+
+    pub fn pitched_down(self, angle_radians: f32) -> Self {
+        self.rotated(Quaternion::rotation_x(-angle_radians))
+    }
+
+    pub fn yawed_left(self, angle_radians: f32) -> Self {
+        self.rotated(Quaternion::rotation_z(angle_radians))
+    }
+
+    pub fn yawed_right(self, angle_radians: f32) -> Self {
+        self.rotated(Quaternion::rotation_z(-angle_radians))
+    }
+
+    pub fn rolled_left(self, angle_radians: f32) -> Self {
+        self.rotated(Quaternion::rotation_y(-angle_radians))
+    }
+
+    pub fn rolled_right(self, angle_radians: f32) -> Self {
+        self.rotated(Quaternion::rotation_y(angle_radians))
+    }
+
+    /// Returns a version without sideways tilt (roll)
+    pub fn uprighted(self) -> Self { self.look_dir().into() }
+
+    fn is_normalized(&self) -> bool { self.0.into_vec4().is_normalized() }
+}
+
+impl From<Dir> for Ori {
+    fn from(dir: Dir) -> Self {
+        // rotate horizontally first and then vertically to prevent rolling
+        let from = *Dir::default();
+        let q1 = (*dir * Vec3::new(1.0, 1.0, 0.0))
+            .try_normalized()
+            .map(|hv| Quaternion::<f32>::rotation_from_to_3d(from, hv).normalized())
+            .unwrap_or_default();
+        let q2 = (from + Vec3::new(0.0, 0.0, dir.z))
+            .try_normalized()
+            .map(|to| Quaternion::<f32>::rotation_from_to_3d(from, to).normalized())
+            .unwrap_or_default();
+        Self((q1 * q2).normalized())
+    }
+}
+
+impl From<Ori> for Quaternion<f32> {
+    fn from(Ori(q): Ori) -> Self { q }
+}
+
+impl From<Quaternion<f32>> for Ori {
+    fn from(quat: Quaternion<f32>) -> Self { Self(quat.normalized()) }
+}
+
+impl From<vek::quaternion::repr_simd::Quaternion<f32>> for Ori {
+    fn from(
+        vek::quaternion::repr_simd::Quaternion { x, y, z, w }: vek::quaternion::repr_simd::Quaternion<f32>,
+    ) -> Self {
+        Self(Quaternion { x, y, z, w }.normalized())
+    }
+}
+
+impl From<Ori> for vek::quaternion::repr_simd::Quaternion<f32> {
+    fn from(Ori(Quaternion { x, y, z, w }): Ori) -> Self {
+        vek::quaternion::repr_simd::Quaternion { x, y, z, w }
+    }
+}
+
+impl From<Ori> for Dir {
+    fn from(ori: Ori) -> Self { ori.look_dir() }
+}
+
+impl From<Ori> for Vec3<f32> {
+    fn from(ori: Ori) -> Self { *ori.look_dir() }
+}
+
+impl From<Ori> for Vec2<f32> {
+    fn from(ori: Ori) -> Self { ori.look_dir().xy() }
+}
+
+// Validate at Deserialization
+#[derive(Copy, Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+struct SerdeOri(Quaternion<f32>);
+
+impl From<SerdeOri> for Ori {
+    fn from(serde_quat: SerdeOri) -> Self {
+        let quat: Quaternion<f32> = serde_quat.0;
+        if quat.into_vec4().map(f32::is_nan).reduce_or() {
+            tracing::warn!(
+                ?quat,
+                "Deserialized rotation quaternion containing NaNs, replacing with default"
+            );
+            Default::default()
+        } else if !Self(quat).is_normalized() {
+            tracing::warn!(
+                ?quat,
+                "Deserialized unnormalized rotation quaternion (magnitude: {}), replacing with \
+                 default",
+                quat.magnitude()
+            );
+            Default::default()
+        } else {
+            Self::new(quat)
+        }
+    }
+}
+impl Into<SerdeOri> for Ori {
+    fn into(self) -> SerdeOri { SerdeOri(self.0) }
+}
+
+impl Component for Ori {
+    type Storage = IdvStorage<Self>;
+}

common/src/comp/phys.rs

@@ -1,4 +1,4 @@
-use crate::{uid::Uid, util::Dir};
+use crate::uid::Uid;
 use serde::{Deserialize, Serialize};
 use specs::{Component, DerefFlaggedStorage, NullStorage};
 use specs_idvs::IdvStorage;
@@ -20,18 +20,6 @@ impl Component for Vel {
     type Storage = IdvStorage<Self>;
 }
 
-// Orientation
-#[derive(Copy, Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Ori(pub Dir);
-
-impl Ori {
-    pub fn vec(&self) -> &Vec3<f32> { &*self.0 }
-}
-
-impl Component for Ori {
-    type Storage = IdvStorage<Self>;
-}
-
 /// Cache of Velocity (of last tick) * dt (of curent tick)
 /// It's updated and read in physics sys to speed up entity<->entity collisions
 /// no need to send it via network

common/src/states/basic_beam.rs

@@ -182,7 +182,7 @@ impl CharacterBehavior for Data {
                     update.server_events.push_front(ServerEvent::BeamSegment {
                         properties,
                         pos,
-                        ori: Ori(data.inputs.look_dir),
+                        ori: Ori::from(data.inputs.look_dir),
                     });
                     update.character = CharacterState::BasicBeam(Data {
                         timer: self

common/src/states/climb.rs

@@ -1,5 +1,5 @@
 use crate::{
-    comp::{CharacterState, Climb, EnergySource, StateUpdate},
+    comp::{CharacterState, Climb, EnergySource, Ori, StateUpdate},
     consts::GRAVITY,
     event::LocalEvent,
     states::behavior::{CharacterBehavior, JoinData},
@@ -64,14 +64,13 @@ impl CharacterBehavior for Data {
         }
 
         // Set orientation direction based on wall direction
-        let ori_dir = Vec2::from(wall_dir);
-
-        // Smooth orientation
-        update.ori.0 = Dir::slerp_to_vec3(
-            update.ori.0,
-            ori_dir.into(),
-            if data.physics.on_ground { 9.0 } else { 2.0 } * data.dt.0,
-        );
+        if let Some(ori_dir) = Dir::from_unnormalized(Vec2::from(wall_dir).into()) {
+            // Smooth orientation
+            update.ori = update.ori.slerped_towards(
+                Ori::from(ori_dir),
+                if data.physics.on_ground { 9.0 } else { 2.0 } * data.dt.0,
+            );
+        };
 
         // Apply Vertical Climbing Movement
         if update.vel.0.z <= CLIMB_SPEED {

common/src/states/glide.rs

@@ -1,6 +1,6 @@
 use super::utils::handle_climb;
 use crate::{
-    comp::{inventory::slot::EquipSlot, CharacterState, StateUpdate},
+    comp::{inventory::slot::EquipSlot, CharacterState, Ori, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
     util::Dir,
 };
@@ -49,8 +49,10 @@ impl CharacterBehavior for Data {
             };
 
         // Determine orientation vector from movement direction vector
-        let horiz_vel = Vec2::from(update.vel.0);
-        update.ori.0 = Dir::slerp_to_vec3(update.ori.0, horiz_vel.into(), 2.0 * data.dt.0);
+        let horiz_vel = Vec2::<f32>::from(update.vel.0);
+        if let Some(dir) = Dir::from_unnormalized(update.vel.0) {
+            update.ori = update.ori.slerped_towards(Ori::from(dir), 2.0 * data.dt.0);
+        };
 
         // Apply Glide antigrav lift
         let horiz_speed_sq = horiz_vel.magnitude_squared();

common/src/states/utils.rs

@@ -188,7 +188,7 @@ pub fn handle_forced_movement(
 
             update.vel.0 += Vec2::broadcast(data.dt.0)
                 * accel
-                * (data.inputs.move_dir * efficiency + (*update.ori.0).xy() * strength);
+                * (data.inputs.move_dir * efficiency + Vec2::from(update.ori) * strength);
         },
         ForcedMovement::Leap {
             vertical,
@@ -231,11 +231,11 @@ pub fn handle_orientation(data: &JoinData, update: &mut StateUpdate, rate: f32)
     } else if !data.inputs.move_dir.is_approx_zero() {
         data.inputs.move_dir
     } else {
-        update.ori.0.xy()
+        update.ori.into()
     };
 
     // Smooth orientation
-    update.ori.0 = Dir::slerp_to_vec3(update.ori.0, ori_dir.into(), rate * data.dt.0);
+    update.ori = Dir::slerp_to_vec3(update.ori.look_dir(), ori_dir.into(), rate * data.dt.0).into();
 }
 
 /// Updates components to move player as if theyre swimming

common/sys/src/agent.rs

@@ -195,7 +195,7 @@ impl<'a> System<'a> for Sys {
                 let mut inputs = &mut controller.inputs;
 
                 // Default to looking in orientation direction (can be overridden below)
-                inputs.look_dir = ori.0;
+                inputs.look_dir = ori.look_dir();
 
                 const AVG_FOLLOW_DIST: f32 = 6.0;
                 const MAX_FOLLOW_DIST: f32 = 12.0;

common/sys/src/beam.rs

@@ -149,8 +149,8 @@ impl<'a> System<'a> for Sys {
                 let hit = entity != b
                     && !health_b.is_dead
                     // Collision shapes
-                    && (sphere_wedge_cylinder_collision(pos.0, frame_start_dist, frame_end_dist, *ori.0, beam_segment.angle, pos_b.0, rad_b, height_b)
-                    || last_pos_b_maybe.map_or(false, |pos_maybe| {sphere_wedge_cylinder_collision(pos.0, frame_start_dist, frame_end_dist, *ori.0, beam_segment.angle, (pos_maybe.0).0, rad_b, height_b)}));
+                    && (sphere_wedge_cylinder_collision(pos.0, frame_start_dist, frame_end_dist, *ori.look_dir(), beam_segment.angle, pos_b.0, rad_b, height_b)
+                    || last_pos_b_maybe.map_or(false, |pos_maybe| {sphere_wedge_cylinder_collision(pos.0, frame_start_dist, frame_end_dist, *ori.look_dir(), beam_segment.angle, (pos_maybe.0).0, rad_b, height_b)}));
 
                 if hit {
                     // See if entities are in the same group
@@ -183,7 +183,7 @@ impl<'a> System<'a> for Sys {
                         attacker_info,
                         b,
                         inventory_b_maybe,
-                        ori.0,
+                        ori.look_dir(),
                         false,
                         1.0,
                         |e| server_emitter.emit(e),

common/sys/src/melee.rs

@@ -95,10 +95,12 @@ impl<'a> System<'a> for Sys {
             )
                 .join()
             {
+                let look_dir = *ori.look_dir();
+
                 // 2D versions
                 let pos2 = Vec2::from(pos.0);
                 let pos_b2 = Vec2::<f32>::from(pos_b.0);
-                let ori2 = Vec2::from(*ori.0);
+                let ori2 = Vec2::from(look_dir);
 
                 // Scales
                 let scale = scale_maybe.map_or(1.0, |s| s.0);
@@ -128,7 +130,7 @@ impl<'a> System<'a> for Sys {
                         GroupTarget::OutOfGroup
                     };
 
-                    let dir = Dir::new((pos_b.0 - pos.0).try_normalized().unwrap_or(*ori.0));
+                    let dir = Dir::new((pos_b.0 - pos.0).try_normalized().unwrap_or(look_dir));
 
                     let attacker_info = Some(AttackerInfo {
                         entity,

common/sys/src/projectile.rs

@@ -8,6 +8,7 @@ use common::{
     resources::DeltaTime,
     span,
     uid::UidAllocator,
+    util::Dir,
     GroupTarget,
 };
 use specs::{
@@ -125,7 +126,7 @@ impl<'a> System<'a> for Sys {
                                     attacker_info,
                                     target_entity,
                                     inventories.get(target_entity),
-                                    ori.0,
+                                    ori.look_dir(),
                                     false,
                                     1.0,
                                     |e| server_emitter.emit(e),
@@ -192,9 +193,9 @@ impl<'a> System<'a> for Sys {
                 }
             } else if let Some(dir) = velocities
                 .get(entity)
-                .and_then(|vel| vel.0.try_normalized())
+                .and_then(|vel| Dir::from_unnormalized(vel.0))
             {
-                ori.0 = dir.into();
+                *ori = dir.into();
             }
 
             if projectile.time_left == Duration::default() {

common/sys/src/shockwave.rs

@@ -104,13 +104,14 @@ impl<'a> System<'a> for Sys {
             let frame_start_dist = (shockwave.speed * (time_since_creation - dt)).max(0.0);
             let frame_end_dist = (shockwave.speed * time_since_creation).max(frame_start_dist);
             let pos2 = Vec2::from(pos.0);
+            let look_dir = ori.look_dir();
 
             // From one frame to the next a shockwave travels over a strip of an arc
             // This is used for collision detection
             let arc_strip = ArcStrip {
                 origin: pos2,
                 // TODO: make sure this is not Vec2::new(0.0, 0.0)
-                dir: ori.0.xy(),
+                dir: look_dir.xy(),
                 angle: shockwave.angle,
                 start: frame_start_dist,
                 end: frame_end_dist,
@@ -194,7 +195,7 @@ impl<'a> System<'a> for Sys {
                     && (!shockwave.requires_ground || physics_state_b.on_ground);
 
                 if hit {
-                    let dir = Dir::new((pos_b.0 - pos.0).try_normalized().unwrap_or(*ori.0));
+                    let dir = Dir::from_unnormalized(pos_b.0 - pos.0).unwrap_or(look_dir);
 
                     let attacker_info =
                         shockwave_owner

server/src/cmd.rs

@@ -21,7 +21,6 @@ use common::{
     resources::TimeOfDay,
     terrain::{Block, BlockKind, SpriteKind, TerrainChunkSize},
     uid::Uid,
-    util::Dir,
     vol::RectVolSize,
     Damage, DamageSource, Explosion, LoadoutBuilder, RadiusEffect,
 };
@@ -1163,18 +1162,23 @@ fn handle_object(
             server
                 .state
                 .create_object(pos, *obj_type)
-                .with(comp::Ori(
-                    // converts player orientation into a 90° rotation for the object by using the
-                    // axis with the highest value
-                    Dir::from_unnormalized(ori.0.map(|e| {
-                        if e.abs() == ori.0.map(|e| e.abs()).reduce_partial_max() {
-                            e
-                        } else {
-                            0.0
-                        }
-                    }))
+                .with(
+                    comp::Ori::from_unnormalized_vec(
+                        // converts player orientation into a 90° rotation for the object by using
+                        // the axis with the highest value
+                        {
+                            let look_dir = ori.look_dir();
+                            look_dir.map(|e| {
+                                if e.abs() == look_dir.map(|e| e.abs()).reduce_partial_max() {
+                                    e
+                                } else {
+                                    0.0
+                                }
+                            })
+                        },
+                    )
                     .unwrap_or_default(),
-                ))
+                )
                 .build();
             server.notify_client(
                 client,

server/src/events/inventory_manip.rs

@@ -503,7 +503,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
     for (pos, ori, item) in dropped_items {
         state
             .create_object(Default::default(), comp::object::Body::Pouch)
-            .with(comp::Pos(pos.0 + *ori.0 + Vec3::unit_z()))
+            .with(comp::Pos(pos.0 + *ori.look_dir() + Vec3::unit_z()))
             .with(item)
             .with(comp::Vel(Vec3::zero()))
             .build();
@@ -521,7 +521,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
             ),
             _ => {
                 vel.0
-                    + *ori.0 * 20.0
+                    + *ori.look_dir() * 20.0
                     + Vec3::unit_z() * 15.0
                     + Vec3::<f32>::zero().map(|_| rand::thread_rng().gen::<f32>() - 0.5) * 4.0
             },

server/src/state_ext.rs

@@ -11,7 +11,6 @@ use common::{
     },
     effect::Effect,
     uid::{Uid, UidAllocator},
-    util::Dir,
 };
 use common_net::{
     msg::{CharacterInfo, PlayerListUpdate, PresenceKind, ServerGeneral},
@@ -148,15 +147,14 @@ impl StateExt for State {
             .create_entity_synced()
             .with(pos)
             .with(comp::Vel(Vec3::zero()))
-            .with(comp::Ori(Dir::new(
-                Vec3::new(
+            .with(
+                comp::Ori::from_unnormalized_vec(Vec3::new(
                     thread_rng().gen_range(-1.0..1.0),
                     thread_rng().gen_range(-1.0..1.0),
                     0.0,
-                )
-                .try_normalized()
+                ))
                 .unwrap_or_default(),
-            )))
+            )
             .with(comp::Collider::Box {
                 radius: body.radius(),
                 z_min: 0.0,
@@ -209,7 +207,7 @@ impl StateExt for State {
             .create_entity_synced()
             .with(pos)
             .with(vel)
-            .with(comp::Ori(Dir::from_unnormalized(vel.0).unwrap_or_default()))
+            .with(comp::Ori::from_unnormalized_vec(vel.0).unwrap_or_default())
             .with(comp::Mass(0.0))
             .with(comp::Collider::Point)
             .with(body)

voxygen/src/ecs/comp.rs

@@ -1,4 +1,4 @@
-use common::util::Dir;
+use common::comp::Ori;
 use specs::Component;
 use specs_idvs::IdvStorage;
 use vek::*;
@@ -33,7 +33,7 @@ impl Component for HpFloaterList {
 #[derive(Copy, Clone, Debug)]
 pub struct Interpolated {
     pub pos: Vec3<f32>,
-    pub ori: Dir,
+    pub ori: Ori,
 }
 impl Component for Interpolated {
     type Storage = IdvStorage<Self>;

voxygen/src/ecs/sys/interpolation.rs

@@ -2,7 +2,6 @@ use crate::ecs::comp::Interpolated;
 use common::{
     comp::{Ori, Pos, Vel},
     resources::DeltaTime,
-    util::Dir,
 };
 use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage};
 use tracing::warn;
@@ -31,16 +30,16 @@ impl<'a> System<'a> for Sys {
             // Update interpolation values
             if i.pos.distance_squared(pos.0) < 64.0 * 64.0 {
                 i.pos = Lerp::lerp(i.pos, pos.0 + vel.0 * 0.03, 10.0 * dt.0);
-                i.ori = Dir::slerp(i.ori, ori.0, 5.0 * dt.0);
+                i.ori = Ori::slerp(i.ori, *ori, 5.0 * dt.0);
             } else {
                 i.pos = pos.0;
-                i.ori = ori.0;
+                i.ori = *ori;
             }
         }
         // Insert interpolation components for entities which don't have them
         for (entity, pos, ori) in (&entities, &positions, &orientations, !&interpolated)
             .join()
-            .map(|(e, p, o, _)| (e, p.0, o.0))
+            .map(|(e, p, o, _)| (e, p.0, *o))
             .collect::<Vec<_>>()
         {
             interpolated

voxygen/src/hud/mod.rs

@@ -1707,10 +1707,13 @@ impl Hud {
                 .set(self.ids.velocity, ui_widgets);
             // Player's orientation vector
             let orientation_text = match debug_info.ori {
-                Some(ori) => format!(
-                    "Orientation: ({:.1}, {:.1}, {:.1})",
-                    ori.0.x, ori.0.y, ori.0.z,
-                ),
+                Some(ori) => {
+                    let look_dir = ori.look_dir();
+                    format!(
+                        "Orientation: ({:.1}, {:.1}, {:.1})",
+                        look_dir.x, look_dir.y, look_dir.z,
+                    )
+                },
                 None => "Player has no Ori component".to_owned(),
             };
             Text::new(&orientation_text)

voxygen/src/scene/figure/mod.rs

@@ -584,7 +584,7 @@ impl FigureMgr {
                 .map(|i| {
                     (
                         (anim::vek::Vec3::from(i.pos),),
-                        anim::vek::Vec3::from(*i.ori),
+                        anim::vek::Vec3::from(i.ori.to_vec()),
                     )
                 })
                 .unwrap_or((

voxygen/src/scene/mod.rs

@@ -571,17 +571,12 @@ impl Scene {
                 })
                 .map(|(pos, ori, interpolated, light_anim)| {
                     // Use interpolated values if they are available
-                    let (pos, ori) =
-                        interpolated.map_or((pos.0, ori.map(|o| o.0)), |i| (i.pos, Some(i.ori)));
-                    let rot = {
-                        if let Some(o) = ori {
-                            Mat3::rotation_z(-o.x.atan2(o.y))
-                        } else {
-                            Mat3::identity()
-                        }
-                    };
+                    let (pos, rot) = interpolated
+                        .map_or((pos.0, ori.copied().unwrap_or_default()), |i| {
+                            (i.pos, i.ori)
+                        });
                     Light::new(
-                        pos + (rot * light_anim.offset),
+                        pos + (rot.to_quat() * light_anim.offset),
                         light_anim.col,
                         light_anim.strength,
                     )

voxygen/src/scene/particle.rs

@@ -375,7 +375,7 @@ impl ParticleMgr {
             .join()
         {
             if let CharacterState::BasicBeam(b) = character_state {
-                let particle_ori = b.particle_ori.unwrap_or(*ori.vec());
+                let particle_ori = b.particle_ori.unwrap_or_else(|| ori.to_vec());
                 if b.stage_section == StageSection::Cast {
                     if b.static_data.base_hps > 0 {
                         // Emit a light when using healing
@@ -586,7 +586,8 @@ impl ParticleMgr {
 
             let radians = shockwave.properties.angle.to_radians();
 
-            let theta = ori.0.y.atan2(ori.0.x);
+            let ori_vec = ori.to_vec();
+            let theta = ori_vec.y.atan2(ori_vec.x);
             let dtheta = radians / distance;
 
             let heartbeats = self.scheduler.heartbeats(Duration::from_millis(1));