diff --git a/Cargo.lock b/Cargo.lock index 2067970f..c79c92bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2126,7 +2126,7 @@ dependencies = [ [[package]] name = "macroquad" version = "0.3.25" -source = "git+https://github.com/Mivik/prpr-macroquad?rev=039f957#039f95705ce0fcb8b6533de475862a769a3360aa" +source = "git+https://github.com/Mivik/prpr-macroquad?rev=2db08f2#2db08f295ff91c5ee07b044cccf5a49827345baa" dependencies = [ "bumpalo", "fontdue", @@ -2140,7 +2140,7 @@ dependencies = [ [[package]] name = "macroquad_macro" version = "0.1.7" -source = "git+https://github.com/Mivik/prpr-macroquad?rev=039f957#039f95705ce0fcb8b6533de475862a769a3360aa" +source = "git+https://github.com/Mivik/prpr-macroquad?rev=2db08f2#2db08f295ff91c5ee07b044cccf5a49827345baa" [[package]] name = "malloc_buf" @@ -2209,7 +2209,7 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniquad" version = "0.3.15" -source = "git+https://github.com/Mivik/prpr-miniquad?rev=dc26ae9#dc26ae99df38353ebd80eaf371008ce30590a22d" +source = "git+https://github.com/Mivik/prpr-miniquad?rev=018b3a7#018b3a70df431e9705959f4d53bba778f889f8da" dependencies = [ "jni 0.21.1", "keyboard-types", diff --git a/Cargo.toml b/Cargo.toml index a6f2230b..420e9d57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,8 +57,8 @@ objc2-foundation = "0.3.2" objc2-ui-kit = "0.3.2" objc2-uniform-type-identifiers = "0.3.2" -macroquad = { git = "https://github.com/Mivik/prpr-macroquad", rev = "039f957", default-features = false } -miniquad = { git = "https://github.com/Mivik/prpr-miniquad", rev = "dc26ae9" } +macroquad = { git = "https://github.com/Mivik/prpr-macroquad", rev = "2db08f2", default-features = false } +miniquad = { git = "https://github.com/Mivik/prpr-miniquad", rev = "018b3a7" } phira = { path = "phira", default-features = false } phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp", rev = "6967475" } phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp", rev = "6967475" } diff --git a/prpr/src/judge.rs b/prpr/src/judge.rs index ac1e4613..65fdda93 100644 --- a/prpr/src/judge.rs +++ b/prpr/src/judge.rs @@ -83,11 +83,7 @@ fn get_uptime() -> f64 { #[cfg(target_os = "windows")] fn get_uptime() -> f64 { - use std::time::SystemTime; - let start = SystemTime::UNIX_EPOCH; - let now = SystemTime::now(); - let duration = now.duration_since(start).expect("Time went backwards"); - duration.as_secs() as f64 + duration.subsec_nanos() as f64 * 1e-9 + miniquad::native::windows::get_uptime() } pub struct FlickTracker {