feat: use f64 for most value types

Author: Mivik

Cargo.lock

@@ -65,7 +65,7 @@ phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp", rev = "6967475
 prpr = { path = "prpr", default-features = false }
 prpr-avc = { path = "prpr-avc" }
 prpr-l10n = { path = "prpr-l10n" }
-sasa = { git = "https://github.com/Mivik/sasa", rev = "4470cd7", default-features = false }
+sasa = { git = "https://github.com/Mivik/sasa", rev = "e76229b", default-features = false }
 
 [profile.release]
 opt-level = 2

Cargo.toml

@@ -61,7 +61,7 @@ pub struct PlayerView {
     judges: VecDeque<JudgeEvent>,
 
     current_touches: HashMap<i8, Vec2>,
-    current_time: f32,
+    current_time: f64,
 
     latest_time: Option<f32>,
 }
@@ -115,7 +115,7 @@ impl PlayerView {
         let t = res.time;
 
         let mut updated = false;
-        while self.touches.front().is_some_and(|it| it.time < t) {
+        while self.touches.front().is_some_and(|it| t > it.time as f64) {
             let Some(frame) = self.touches.pop_front() else { unreachable!() };
             for (id, pos) in frame.points {
                 if id >= 0 {
@@ -124,7 +124,7 @@ impl PlayerView {
                     self.current_touches.remove(&!id);
                 }
             }
-            self.current_time = frame.time;
+            self.current_time = frame.time as f64;
             updated = true;
         }
         if updated {
@@ -135,7 +135,7 @@ impl PlayerView {
                     let pos = vec2(pos.x(), pos.y());
                     let id = if *id >= 0 { *id } else { !*id };
                     let pos = if let Some(old) = current.remove(&id) {
-                        Vec2::tween(&old, &pos, (t - self.current_time) / (frame.time - self.current_time))
+                        Vec2::tween(&old, &pos, ((t - self.current_time) / (frame.time as f64 - self.current_time)) as f32)
                     } else {
                         return None;
                     };
@@ -149,7 +149,7 @@ impl PlayerView {
         self.chart.update(res);
 
         while let Some(event) = self.judges.front() {
-            if event.time > t {
+            if event.time as f64 > t {
                 break;
             }
             let Some(event) = self.judges.pop_front() else { unreachable!() };
@@ -195,7 +195,7 @@ impl PlayerView {
                                     mat *= note.now_transform(
                                         res,
                                         &line.ctrl_obj.borrow_mut(),
-                                        (note.height - line.height.now()) / res.aspect_ratio * note.speed,
+                                        ((note.height - line.height.now() as f64) / res.aspect_ratio as f64 * note.speed) as f32,
                                         incline_sin,
                                     );
                                     mat
@@ -206,7 +206,7 @@ impl PlayerView {
                     }
                 }
                 Err(perfect) => {
-                    note.judge = JudgeStatus::Hold(perfect, t, 0., false, f32::INFINITY);
+                    note.judge = JudgeStatus::Hold(perfect, t, 0., false, f64::INFINITY);
                 }
             }
         }

phira-monitor/src/scene.rs

@@ -126,7 +126,7 @@ impl Page for OffsetPage {
 
     fn update(&mut self, _s: &mut SharedState) -> Result<()> {
         if !self.cali.paused() {
-            let pos = self.cali.position() as f64;
+            let pos = self.cali.position();
             let now = self.tm.now();
             if now > 2. {
                 self.tm.seek_to(now - 2.);
@@ -170,7 +170,7 @@ impl Page for OffsetPage {
                 self.touched = false;
             }
             if t <= 1. {
-                let w = NOTE_WIDTH_RATIO_BASE * config.note_scale * 2.;
+                let w = NOTE_WIDTH_RATIO_BASE as f32 * config.note_scale * 2.;
                 let h = w * self.click.height() / self.click.width();
                 let r = Rect::new(ct.0 - w / 2., ny, w, h);
                 ui.fill_rect(r, (*self.click, r, ScaleType::Fit));

phira/src/page/offset.rs

@@ -917,10 +917,10 @@ impl SongScene {
                                     hash_map::Entry::Occupied(val) => *val.get(),
                                     hash_map::Entry::Vacant(place) => *place.insert(len.try_into().ok()?),
                                 };
-                                if matches!(it.phase, TouchPhase::Moved) && touch_last_update.get(&id).is_some_and(|it| *it + 1. / 20. >= t) {
+                                if matches!(it.phase, TouchPhase::Moved) && touch_last_update.get(&id).is_some_and(|it| *it as f64 + 1. / 20. >= t) {
                                     return None;
                                 }
-                                touch_last_update.insert(id, t);
+                                touch_last_update.insert(id, t as f32);
                                 if matches!(it.phase, TouchPhase::Ended | TouchPhase::Cancelled) {
                                     touch_ids.remove(&it.id);
                                     id = !id;
@@ -929,18 +929,18 @@ impl SongScene {
                             })
                             .collect();
                         if !points.is_empty() {
-                            touches.push_back(TouchFrame { time: t, points });
+                            touches.push_back(TouchFrame { time: t as f32, points });
                         }
-                        if last_send_touch_time + 1. < t || touches.len() > 20 {
+                        if last_send_touch_time as f64 + 1. < t || touches.len() > 20 {
                             if touches.is_empty() {
-                                touches.push_back(TouchFrame { time: t, points: Vec::new() });
+                                touches.push_back(TouchFrame { time: t as f32, points: Vec::new() });
                             }
                             let frames = Arc::new(touches.drain(..).collect());
                             client.blocking_send(ClientCommand::Touches { frames }).unwrap();
-                            last_send_touch_time = t;
+                            last_send_touch_time = t as f32;
                         }
                         judges.extend(judge.judgements.borrow_mut().drain(..).map(|it| JudgeEvent {
-                            time: it.0,
+                            time: it.0 as f32,
                             line_id: it.1,
                             note_id: it.2,
                             judgement: {
@@ -956,7 +956,7 @@ impl SongScene {
                                 }
                             },
                         }));
-                        if judges.len() > 10 || judges.front().is_some_and(|it| it.time + 0.6 < t) {
+                        if judges.len() > 10 || judges.front().is_some_and(|it| it.time + 0.6 < t as f32) {
                             let judges = Arc::new(judges.drain(..).collect());
                             client.blocking_send(ClientCommand::Judges { judges }).unwrap();
                         }

phira/src/scene/song.rs

@@ -33,7 +33,7 @@ pub struct UnlockScene {
     render_target: Option<RenderTarget>,
     video: Video,
     bgm: Option<Bgm>,
-    music_length: f32,
+    music_length: f64,
 
     background: SafeTexture,
 
@@ -133,7 +133,7 @@ impl Scene for UnlockScene {
             }
         }
 
-        let t = tm.now() as f32;
+        let t = tm.now();
         match self.state {
             State::Before => {
                 if t > 0.5 {
@@ -185,7 +185,7 @@ impl Scene for UnlockScene {
     fn render(&mut self, tm: &mut TimeManager, ui: &mut prpr::ui::Ui) -> Result<()> {
         let mut cam = ui.camera();
         let asp = -cam.zoom.y;
-        let t = tm.now() as f32;
+        let t = tm.now();
         cam.render_target = self.render_target;
         set_camera(&cam);
         clear_background(BLACK);
@@ -202,7 +202,7 @@ impl Scene for UnlockScene {
                 ui.loading(
                     1. - pad,
                     top - pad,
-                    t,
+                    t as f32,
                     WHITE,
                     LoadingParams {
                         width: 0.01,
@@ -215,11 +215,11 @@ impl Scene for UnlockScene {
                 let top = 1. / asp;
                 if t < 0.5 {
                     let pad = 0.07;
-                    let alpha = if t < 0.5 { 1. - t / 0.5 } else { 0. }; // TODO: more smoothly
+                    let alpha = if t < 0.5 { 1. - t as f32 / 0.5 } else { 0. }; // TODO: more smoothly
                     ui.loading(
                         1. - pad,
                         top - pad,
-                        t,
+                        t as f32,
                         semi_white(alpha),
                         LoadingParams {
                             width: 0.01,
@@ -228,7 +228,7 @@ impl Scene for UnlockScene {
                         },
                     );
                 } else {
-                    let alpha = if t < 0.5 { t / 0.5 * 0.3 } else { 0.3 };
+                    let alpha = if t < 0.5 { t as f32 / 0.5 * 0.3 } else { 0.3 };
                     let r = ui.screen_rect();
                     ui.fill_rect(r, (*self.background, r));
                     ui.fill_rect(r, semi_black(alpha));

phira/src/scene/unlock.rs

@@ -153,9 +153,9 @@ impl Video {
         self.video_stream.duration() as f64 * self.time_base().to_f64()
     }
 
-    pub fn elapsed_to_timestamp(&self, elapsed: f32) -> i64 {
+    pub fn elapsed_to_timestamp(&self, elapsed: f64) -> i64 {
         let time_base = self.time_base();
-        (elapsed as f64 * time_base.den as f64 / time_base.num as f64).round() as i64
+        (elapsed * time_base.den as f64 / time_base.num as f64).round() as i64
     }
 
     pub fn seek(&self, timestamp: i64) {

prpr-avc/src/video.rs

@@ -196,7 +196,7 @@ impl BinaryData for Color {
 impl<T: BinaryData> BinaryData for Keyframe<T> {
     fn read_binary<R: Read>(r: &mut BinaryReader<R>) -> Result<Self> {
         Ok(Self {
-            time: r.time()?,
+            time: r.time()? as f64,
             value: r.read()?,
             tween: {
                 let b = r.read::<u8>()?;
@@ -211,7 +211,7 @@ impl<T: BinaryData> BinaryData for Keyframe<T> {
     }
 
     fn write_binary<W: Write>(&self, w: &mut BinaryWriter<W>) -> Result<()> {
-        w.time(self.time)?;
+        w.time(self.time as f32)?;
         w.write(&self.value)?;
         let tween = self.tween.as_any();
         if let Some(t) = tween.downcast_ref::<StaticTween>() {
@@ -323,8 +323,8 @@ impl BinaryData for Note {
         let kind = match r.read::<u8>()? {
             0 => NoteKind::Click,
             1 => NoteKind::Hold {
-                end_time: r.read()?,
-                end_height: r.read()?,
+                end_time: r.read::<f32>()? as f64,
+                end_height: r.read::<f32>()? as f64,
             },
             2 => NoteKind::Flick,
             3 => NoteKind::Drag,
@@ -335,9 +335,9 @@ impl BinaryData for Note {
             object,
             kind,
             hitsound,
-            time: r.time()?,
-            height: r.read()?,
-            speed: if r.read()? { r.read::<f32>()? } else { 1. },
+            time: r.time()? as f64,
+            height: r.read::<f32>()? as f64,
+            speed: if r.read()? { r.read::<f32>()? as f64 } else { 1. },
             above: r.read()?,
             multiple_hint: false,
             fake: r.read()?,
@@ -356,19 +356,19 @@ impl BinaryData for Note {
             }
             NoteKind::Hold { end_time, end_height } => {
                 w.write_val(1_u8)?;
-                w.write_val(end_time)?;
-                w.write_val(end_height)?;
+                w.write_val(end_time as f32)?;
+                w.write_val(end_height as f32)?;
             }
             NoteKind::Flick => w.write_val(2_u8)?,
             NoteKind::Drag => w.write_val(3_u8)?,
         }
-        w.time(self.time)?;
-        w.write_val(self.height)?;
+        w.time(self.time as f32)?;
+        w.write_val(self.height as f32)?;
         if self.speed == 1.0 {
             w.write_val(false)?;
         } else {
             w.write_val(true)?;
-            w.write_val(self.speed)?;
+            w.write_val(self.speed as f32)?;
         }
         w.write_val(self.above)?;
         w.write_val(self.fake)?;

prpr/src/bin.rs

@@ -12,10 +12,10 @@
 
 pub use macroquad::color::Color;
 
-pub const NOTE_WIDTH_RATIO_BASE: f32 = 0.13175016;
-pub const HEIGHT_RATIO: f32 = 0.83175;
+pub const NOTE_WIDTH_RATIO_BASE: f64 = 0.13175016;
+pub const HEIGHT_RATIO: f64 = 0.83175;
 
-pub const EPS: f32 = 1e-5;
+pub const EPS: f64 = 1e-5;
 
 pub type Point = nalgebra::Point2<f32>;
 pub type Vector = nalgebra::Vector2<f32>;
@@ -95,16 +95,16 @@ impl Default for Triple {
 }
 
 impl Triple {
-    pub fn beats(&self) -> f32 {
-        self.0 as f32 + self.1 as f32 / self.2 as f32
+    pub fn beats(&self) -> f64 {
+        self.0 as f64 + self.1 as f64 / self.2 as f64
     }
 }
 
 #[derive(Default)] // the default is a dummy
 pub struct BpmList {
     /// (beats, time, bpm)
     /// time in seconds
-    elements: Vec<(f32, f32, f32)>,
+    elements: Vec<(f64, f64, f64)>,
     /// cursor for searching, value is the index of `elements`
     cursor: usize,
 }
@@ -113,11 +113,11 @@ impl BpmList {
     /// Create a new BpmList from a list of (beats, bpm) pairs
     ///
     /// Basically just calculate the time for each pair(key frame)
-    pub fn new(ranges: Vec<(f32, f32)>) -> Self {
+    pub fn new(ranges: Vec<(f64, f64)>) -> Self {
         let mut elements = Vec::new();
         let mut time = 0.0;
         let mut last_beats = 0.0;
-        let mut last_bpm: Option<f32> = None;
+        let mut last_bpm: Option<f64> = None;
         for (now_beats, bpm) in ranges {
             if let Some(bpm) = last_bpm {
                 time += (now_beats - last_beats) * (60. / bpm);
@@ -130,7 +130,7 @@ impl BpmList {
     }
 
     /// Get the time in seconds for a given beats
-    pub fn time_beats(&mut self, beats: f32) -> f32 {
+    pub fn time_beats(&mut self, beats: f64) -> f64 {
         while let Some(kf) = self.elements.get(self.cursor + 1) {
             if kf.0 > beats {
                 break;
@@ -145,12 +145,12 @@ impl BpmList {
     }
 
     /// Get the time in seconds for a given `i + n / d`
-    pub fn time(&mut self, triple: &Triple) -> f32 {
+    pub fn time(&mut self, triple: &Triple) -> f64 {
         self.time_beats(triple.beats())
     }
 
     /// Get the beat coordinate for a given time in seconds
-    pub fn beat(&mut self, time: f32) -> f32 {
+    pub fn beat(&mut self, time: f64) -> f64 {
         while let Some(kf) = self.elements.get(self.cursor + 1) {
             if kf.1 > time {
                 break;