replaced fraction with num

Author: Ivan-1F

Cargo.lock

@@ -57,12 +57,11 @@ egui_dock = "0.12"
 egui_extras = { version = "*", features = ["all_loaders"] }
 image = { version = "0.24", features = ["jpeg", "png"] }
 
-fraction = "0.15.1"
-
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
 serde_repr = "0.1"
 
 iyes_perf_ui = "0.2.3"
 bevy-inspector-egui = "0.24.0"
 url = "2.5.0"
+num = "0.4.3"

Cargo.toml

@@ -1,37 +1,43 @@
-use fraction::prelude::*;
+use num::{Rational32, FromPrimitive};
 
 #[derive(Clone, Copy, Debug)]
-pub struct Beat(pub Fraction);
+pub struct Beat(pub Rational32);
 
 impl Into<f32> for Beat {
     fn into(self) -> f32 {
-        self.0.try_into().unwrap()
+        *self.0.numer() as f32 / *self.0.denom() as f32
     }
 }
 
-impl Into<Fraction> for Beat {
-    fn into(self) -> Fraction {
+impl Into<Rational32> for Beat {
+    fn into(self) -> Rational32 {
         self.0
     }
 }
 
-impl<T> From<T> for Beat where Fraction: From<T> {
-    fn from(value: T) -> Self {
-        Self(Fraction::from(value))
+impl From<f32> for Beat {
+    fn from(value: f32) -> Self {
+        Self(Rational32::from_f32(value).unwrap())
+    }
+}
+
+impl From<Rational32> for Beat {
+    fn from(value: Rational32) -> Self {
+        Self(value)
     }
 }
 
 impl Beat {
-    pub fn beat(&self) -> u32 {
-        self.0.trunc().try_into().unwrap()
+    pub fn beat(&self) -> i32 {
+        *self.0.trunc().numer()
     }
 
-    pub fn numer(&self) -> u32 {
-        *self.0.fract().numer().unwrap() as u32
+    pub fn numer(&self) -> i32 {
+        *self.0.fract().numer()
     }
 
-    pub fn denom(&self) -> u32 {
-        *self.0.fract().denom().unwrap() as u32
+    pub fn denom(&self) -> i32 {
+        *self.0.fract().denom()
     }
 
     pub fn value(&self) -> f32 {

src/chart/beat.rs

@@ -38,7 +38,7 @@ use bevy_mod_picking::prelude::*;
 use chart::beat::Beat;
 use chart::line::{LineOpacity, LinePosition, LineRotation};
 use egui_dock::{DockArea, DockState, NodeIndex, Style};
-use fraction::prelude::*;
+use num::{Rational32, FromPrimitive};
 
 fn main() {
     App::new()
@@ -337,7 +337,7 @@ fn compute_line_system(
     let beat = time.0 / (60.0 / 174.0);
     for (mut position, mut rotation, mut opacity, entity) in &mut line_query {
         let mut events: Vec<_> = event_query.iter().filter(|e| e.line_id == entity).collect();
-        events.sort_by_key(|e| <Beat as Into<Fraction>>::into(e.start_beat));
+        events.sort_by_key(|e| <Beat as Into<Rational32>>::into(e.start_beat));
         for event in events {
             let value = event.evaluate(beat);
             if let Some(value) = value {
@@ -396,7 +396,7 @@ fn update_note_y_system(
             .map(|(s, _)| *s)
             .collect();
         speed_events
-            .sort_by(|a, b| Fraction::from(a.start_time).cmp(&Fraction::from(b.start_time)));
+            .sort_by(|a, b| Rational32::from_f32(a.start_time).cmp(&Rational32::from_f32(b.start_time)));
 
         let distance = |time| {
             distance_at(&speed_events, time) * (game_viewport.0.height() * (120.0 / 900.0))

src/main.rs

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use egui::Ui;
-use fraction::Fraction;
+use num::Rational32;
 
 use crate::{chart::{beat::Beat, note::Note}, selection::Selected};
 
@@ -18,7 +18,7 @@ pub fn inspector_ui_system(In(ui): In<&mut Ui>, mut selected_notes: Query<&mut N
             ui.add(egui::DragValue::new(&mut denom).clamp_range(1..=u32::MAX).speed(1));
 
             if beat != selected_note.beat.beat() || numer != selected_note.beat.numer() || denom != selected_note.beat.denom() {
-                selected_note.beat = Beat::from(Fraction::new(beat * denom + numer, denom));
+                selected_note.beat = Beat::from(Rational32::new_raw(beat * denom + numer, denom));
             }
         });
     }