leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

examples/application: fix running on wasm

Browse source 
Was using `time` unconditionally.
This commit is contained in:
Kirill Chibisov 2025-06-24 19:15:46 +09:00 • committed by GitHub
parent fe1eab07ae
commit fa0795a50c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/application.rs
View file

@ -7,6 +7,8 @@ use std::fmt::Debug;
use std::num::NonZeroU32; use std::num::NonZeroU32;
use std::sync::mpsc::{self, Receiver, Sender}; use std::sync::mpsc::{self, Receiver, Sender};
use std::sync::Arc; use std::sync::Arc;
#[cfg(all(not(android_platform), not(web_platform)))]
use std::time::Instant;
use std::{fmt, mem}; use std::{fmt, mem};
use ::tracing::{error, info}; use ::tracing::{error, info};
@ -15,6 +17,8 @@ use cursor_icon::CursorIcon;
use rwh_06::{DisplayHandle, HasDisplayHandle}; use rwh_06::{DisplayHandle, HasDisplayHandle};
#[cfg(not(android_platform))] #[cfg(not(android_platform))]
use softbuffer::{Context, Surface}; use softbuffer::{Context, Surface};
#[cfg(all(web_platform, not(android_platform)))]
use web_time::Instant;
use winit::application::ApplicationHandler; use winit::application::ApplicationHandler;
use winit::cursor::{Cursor, CustomCursor, CustomCursorSource}; use winit::cursor::{Cursor, CustomCursor, CustomCursorSource};
use winit::dpi::{LogicalSize, PhysicalPosition, PhysicalSize}; use winit::dpi::{LogicalSize, PhysicalPosition, PhysicalSize};
@ -615,7 +619,7 @@ struct WindowState {
animated_fill_color: bool, animated_fill_color: bool,
/// The application start time. Used for color fill animation /// The application start time. Used for color fill animation
#[cfg(not(android_platform))] #[cfg(not(android_platform))]
start_time: std::time::Instant, start_time: Instant,
/// Redraw continuously /// Redraw continuously
continuous_redraw: bool, continuous_redraw: bool,
/// Cursor position over the window. /// Cursor position over the window.
@ -674,7 +678,7 @@ impl WindowState {
animated_fill_color: false, animated_fill_color: false,
continuous_redraw: false, continuous_redraw: false,
#[cfg(not(android_platform))] #[cfg(not(android_platform))]
start_time: std::time::Instant::now(), start_time: Instant::now(),
ime, ime,
cursor_position: Default::default(), cursor_position: Default::default(),
cursor_hidden: Default::default(), cursor_hidden: Default::default(),

6
examples/util/fill.rs
View file

@ -23,8 +23,12 @@ mod platform {
use std::mem; use std::mem;
use std::mem::ManuallyDrop; use std::mem::ManuallyDrop;
use std::num::NonZeroU32; use std::num::NonZeroU32;
#[cfg(all(not(android_platform), not(web_platform)))]
use std::time::Instant;
use softbuffer::{Context, Surface}; use softbuffer::{Context, Surface};
#[cfg(all(web_platform, not(android_platform)))]
use web_time::Instant;
use winit::window::{Window, WindowId}; use winit::window::{Window, WindowId};
thread_local! { thread_local! {
@ -105,7 +109,7 @@ mod platform {
} }
#[allow(dead_code)] #[allow(dead_code)]
pub fn fill_window_with_animated_color(window: &dyn Window, start: std::time::Instant) { pub fn fill_window_with_animated_color(window: &dyn Window, start: Instant) {
let time = start.elapsed().as_secs_f32() * 1.5; let time = start.elapsed().as_secs_f32() * 1.5;
let blue = (time.sin() * 255.0) as u32; let blue = (time.sin() * 255.0) as u32;
let green = ((time.cos() * 255.0) as u32) << 8; let green = ((time.cos() * 255.0) as u32) << 8;