@@ -24,53 +24,6 @@ mod shaders {
24
24
include ! ( concat!( env!( "OUT_DIR" ) , "/entry_points.rs" ) ) ;
25
25
}
26
26
27
- /// Abstraction for getting timestamps even when `std::time` isn't supported.
28
- enum PortableInstant {
29
- #[ cfg( not( target_arch = "wasm32" ) ) ]
30
- Native ( std:: time:: Instant ) ,
31
-
32
- #[ cfg( target_arch = "wasm32" ) ]
33
- Web {
34
- performance_timestamp_ms : f64 ,
35
-
36
- // HACK(eddyb) cached `window().performance()` to speed up/simplify `elapsed`.
37
- cached_window_performance : web_sys:: Performance ,
38
- } ,
39
- }
40
-
41
- impl PortableInstant {
42
- fn now ( ) -> Self {
43
- #[ cfg( not( target_arch = "wasm32" ) ) ]
44
- {
45
- Self :: Native ( std:: time:: Instant :: now ( ) )
46
- }
47
- #[ cfg( target_arch = "wasm32" ) ]
48
- {
49
- let performance = web_sys:: window ( )
50
- . expect ( "missing window" )
51
- . performance ( )
52
- . expect ( "missing window.performance" ) ;
53
- Self :: Web {
54
- performance_timestamp_ms : performance. now ( ) ,
55
- cached_window_performance : performance,
56
- }
57
- }
58
- }
59
-
60
- fn elapsed_secs_f32 ( & self ) -> f32 {
61
- match self {
62
- #[ cfg( not( target_arch = "wasm32" ) ) ]
63
- Self :: Native ( instant) => instant. elapsed ( ) . as_secs_f32 ( ) ,
64
-
65
- #[ cfg( target_arch = "wasm32" ) ]
66
- Self :: Web {
67
- performance_timestamp_ms,
68
- cached_window_performance,
69
- } => ( ( cached_window_performance. now ( ) - performance_timestamp_ms) / 1000.0 ) as f32 ,
70
- }
71
- }
72
- }
73
-
74
27
fn mouse_button_index ( button : MouseButton ) -> usize {
75
28
match button {
76
29
MouseButton :: Left => 0 ,
@@ -243,7 +196,7 @@ async fn run(
243
196
compiled_shader_modules,
244
197
) ;
245
198
246
- let start = PortableInstant :: now ( ) ;
199
+ let start = web_time :: Instant :: now ( ) ;
247
200
248
201
let ( mut cursor_x, mut cursor_y) = ( 0.0 , 0.0 ) ;
249
202
let ( mut drag_start_x, mut drag_start_y) = ( 0.0 , 0.0 ) ;
@@ -363,7 +316,7 @@ async fn run(
363
316
..Default :: default ( )
364
317
} ) ;
365
318
366
- let time = start. elapsed_secs_f32 ( ) ;
319
+ let time = start. elapsed ( ) . as_secs_f32 ( ) ;
367
320
for ( i, press_time) in mouse_button_press_time. iter_mut ( ) . enumerate ( ) {
368
321
if ( mouse_button_press_since_last_frame & ( 1 << i) ) != 0 {
369
322
* press_time = time;
0 commit comments