Replace instant with web_time (#3296)
This commit is contained in:
parent
ea15987ad4
commit
209cbeb030
|
|
@ -1206,12 +1206,12 @@ dependencies = [
|
||||||
"arboard",
|
"arboard",
|
||||||
"document-features",
|
"document-features",
|
||||||
"egui",
|
"egui",
|
||||||
"instant",
|
|
||||||
"log",
|
"log",
|
||||||
"puffin",
|
"puffin",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"serde",
|
"serde",
|
||||||
"smithay-clipboard",
|
"smithay-clipboard",
|
||||||
|
"web-time",
|
||||||
"webbrowser",
|
"webbrowser",
|
||||||
"winit",
|
"winit",
|
||||||
]
|
]
|
||||||
|
|
@ -4052,6 +4052,17 @@ dependencies = [
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "web-time"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "fa75ec260dcf59cc310827bae1d7f629809b173dbfe808a633e19754dd4282a5"
|
||||||
|
dependencies = [
|
||||||
|
"js-sys",
|
||||||
|
"once_cell",
|
||||||
|
"wasm-bindgen",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "webbrowser"
|
name = "webbrowser"
|
||||||
version = "0.8.10"
|
version = "0.8.10"
|
||||||
|
|
|
||||||
|
|
@ -60,8 +60,9 @@ egui = { version = "0.22.0", path = "../egui", default-features = false, feature
|
||||||
"log",
|
"log",
|
||||||
] }
|
] }
|
||||||
log = { version = "0.4", features = ["std"] }
|
log = { version = "0.4", features = ["std"] }
|
||||||
winit = { version = "0.28", default-features = false }
|
|
||||||
raw-window-handle = "0.5.0"
|
raw-window-handle = "0.5.0"
|
||||||
|
web-time = { version = "0.1" } # We use web-time so we can (maybe) compile for web
|
||||||
|
winit = { version = "0.28", default-features = false }
|
||||||
|
|
||||||
#! ### Optional dependencies
|
#! ### Optional dependencies
|
||||||
|
|
||||||
|
|
@ -73,17 +74,8 @@ document-features = { version = "0.2", optional = true }
|
||||||
|
|
||||||
puffin = { version = "0.16", optional = true }
|
puffin = { version = "0.16", optional = true }
|
||||||
serde = { version = "1.0", optional = true, features = ["derive"] }
|
serde = { version = "1.0", optional = true, features = ["derive"] }
|
||||||
|
|
||||||
webbrowser = { version = "0.8.3", optional = true }
|
webbrowser = { version = "0.8.3", optional = true }
|
||||||
|
|
||||||
[target.'cfg(not(target_arch="wasm32"))'.dependencies]
|
|
||||||
instant = { version = "0.1" }
|
|
||||||
|
|
||||||
[target.'cfg(target_arch="wasm32")'.dependencies]
|
|
||||||
instant = { version = "0.1", features = [
|
|
||||||
"wasm-bindgen",
|
|
||||||
] } # We use instant so we can (maybe) compile for web
|
|
||||||
|
|
||||||
[target.'cfg(any(target_os="linux", target_os="dragonfly", target_os="freebsd", target_os="netbsd", target_os="openbsd"))'.dependencies]
|
[target.'cfg(any(target_os="linux", target_os="dragonfly", target_os="freebsd", target_os="netbsd", target_os="openbsd"))'.dependencies]
|
||||||
smithay-clipboard = { version = "0.6.3", optional = true }
|
smithay-clipboard = { version = "0.6.3", optional = true }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ pub struct EventResponse {
|
||||||
|
|
||||||
/// Handles the integration between egui and winit.
|
/// Handles the integration between egui and winit.
|
||||||
pub struct State {
|
pub struct State {
|
||||||
start_time: instant::Instant,
|
start_time: web_time::Instant,
|
||||||
egui_input: egui::RawInput,
|
egui_input: egui::RawInput,
|
||||||
pointer_pos_in_points: Option<egui::Pos2>,
|
pointer_pos_in_points: Option<egui::Pos2>,
|
||||||
any_pointer_button_down: bool,
|
any_pointer_button_down: bool,
|
||||||
|
|
@ -95,7 +95,7 @@ impl State {
|
||||||
};
|
};
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
start_time: instant::Instant::now(),
|
start_time: web_time::Instant::now(),
|
||||||
egui_input,
|
egui_input,
|
||||||
pointer_pos_in_points: None,
|
pointer_pos_in_points: None,
|
||||||
any_pointer_button_down: false,
|
any_pointer_button_down: false,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue