Merge pull request #103 from shinolab/develop

fix vsync option
shinolab · Oct 15, 2024 · 30d7d4a · 30d7d4a
2 parents 01c8489 + 04bb78b
commit 30d7d4a
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/SOEMAUTDServer/ThirdPartyNotice.txt b/SOEMAUTDServer/ThirdPartyNotice.txt
@@ -188,7 +188,7 @@ bit-vec 0.8.0 (Apache-2.0 OR MIT)
 https://github.com/contain-rs/bit-vec
 ---------------------------------------------------------
 
-bitfield-struct 0.9.1 (MIT)
+bitfield-struct 0.9.2 (MIT)
 https://github.com/wrenger/bitfield-struct-rs.git
 ---------------------------------------------------------
 
@@ -380,7 +380,7 @@ httpdate 1.0.3 (Apache-2.0 OR MIT)
 https://github.com/pyfisch/httpdate
 ---------------------------------------------------------
 
-hyper 1.4.1 (MIT)
+hyper 1.5.0 (MIT)
 https://github.com/hyperium/hyper
 ---------------------------------------------------------
 

diff --git a/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt b/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt
@@ -170,7 +170,7 @@ bit-vec 0.8.0 (Apache-2.0 OR MIT)
 https://github.com/contain-rs/bit-vec
 ---------------------------------------------------------
 
-bitfield-struct 0.9.1 (MIT)
+bitfield-struct 0.9.2 (MIT)
 https://github.com/wrenger/bitfield-struct-rs.git
 ---------------------------------------------------------
 
@@ -350,7 +350,7 @@ httpdate 1.0.3 (Apache-2.0 OR MIT)
 https://github.com/pyfisch/httpdate
 ---------------------------------------------------------
 
-hyper 1.4.1 (MIT)
+hyper 1.5.0 (MIT)
 https://github.com/hyperium/hyper
 ---------------------------------------------------------
 

diff --git a/simulator/ThirdPartyNotice.txt b/simulator/ThirdPartyNotice.txt
@@ -170,7 +170,7 @@ bit-vec 0.8.0 (Apache-2.0 OR MIT)
 https://github.com/contain-rs/bit-vec
 ---------------------------------------------------------
 
-bitfield-struct 0.9.1 (MIT)
+bitfield-struct 0.9.2 (MIT)
 https://github.com/wrenger/bitfield-struct-rs.git
 ---------------------------------------------------------
 
@@ -574,7 +574,7 @@ httpdate 1.0.3 (Apache-2.0 OR MIT)
 https://github.com/pyfisch/httpdate
 ---------------------------------------------------------
 
-hyper 1.4.1 (MIT)
+hyper 1.5.0 (MIT)
 https://github.com/hyperium/hyper
 ---------------------------------------------------------
 

diff --git a/simulator/src/context.rs b/simulator/src/context.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use autd3_derive::Builder;
 use winit::window::Window;
 
-use crate::{error::SimulatorError, surface::SurfaceWrapper};
+use crate::{error::SimulatorError, surface::SurfaceWrapper, State};
 
 #[derive(Builder)]
 pub struct Context {
@@ -17,6 +17,7 @@ pub struct Context {
 
 impl Context {
     pub async fn init(
+        state: &State,
         surface: &mut SurfaceWrapper,
         window: Arc<Window>,
     ) -> Result<Self, SimulatorError> {
@@ -51,7 +52,7 @@ impl Context {
             )
             .await?;
 
-        surface.configure(window);
+        surface.configure(state, window);
 
         Ok(Self {
             _instance: instance,

diff --git a/simulator/src/simulator.rs b/simulator/src/simulator.rs
@@ -36,7 +36,7 @@ impl Simulator {
                 .build(&event_loop)?,
         );
         let mut surface = SurfaceWrapper::new();
-        let context = Context::init(&mut surface, window.clone()).await?;
+        let context = Context::init(&state, &mut surface, window.clone()).await?;
         let renderer = Renderer::new(&state, &context, &surface, window.clone())?;
         let server = ServerWrapper::new(state.port, state.lightweight, state.lightweight_port);
         Ok(Self {

diff --git a/simulator/src/surface.rs b/simulator/src/surface.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use autd3_derive::Builder;
 use winit::{dpi::PhysicalSize, window::Window};
 
-use crate::{context::Context, error::SimulatorError};
+use crate::{context::Context, error::SimulatorError, State};
 
 #[derive(Builder)]
 pub struct SurfaceWrapper {
@@ -36,9 +36,9 @@ impl SurfaceWrapper {
         Ok(())
     }
 
-    pub fn configure(&mut self, window: Arc<Window>) {
+    pub fn configure(&mut self, state: &State, window: Arc<Window>) {
         let size = window.inner_size();
-        self.config = Some(Self::surface_configuration(&size, true));
+        self.config = Some(Self::surface_configuration(&size, state.vsync));
     }
 
     pub fn resize(&mut self, context: &Context, size: &PhysicalSize<u32>) {

diff --git a/src-tauri/ThirdPartyNotice.txt b/src-tauri/ThirdPartyNotice.txt
@@ -228,7 +228,7 @@ bit-vec 0.8.0 (Apache-2.0 OR MIT)
 https://github.com/contain-rs/bit-vec
 ---------------------------------------------------------
 
-bitfield-struct 0.9.1 (MIT)
+bitfield-struct 0.9.2 (MIT)
 https://github.com/wrenger/bitfield-struct-rs.git
 ---------------------------------------------------------
 
@@ -763,7 +763,7 @@ httpdate 1.0.3 (Apache-2.0 OR MIT)
 https://github.com/pyfisch/httpdate
 ---------------------------------------------------------
 
-hyper 1.4.1 (MIT)
+hyper 1.5.0 (MIT)
 https://github.com/hyperium/hyper
 ---------------------------------------------------------
 
@@ -1609,7 +1609,7 @@ tao-macros 0.1.3 (Apache-2.0 OR MIT)
 https://github.com/tauri-apps/tao
 ---------------------------------------------------------
 
-tauri 2.0.3 (Apache-2.0 OR MIT)
+tauri 2.0.4 (Apache-2.0 OR MIT)
 https://github.com/tauri-apps/tauri
 ---------------------------------------------------------
 
@@ -1645,7 +1645,7 @@ tauri-runtime 2.1.0 (Apache-2.0 OR MIT)
 https://github.com/tauri-apps/tauri
 ---------------------------------------------------------
 
-tauri-runtime-wry 2.1.0 (Apache-2.0 OR MIT)
+tauri-runtime-wry 2.1.1 (Apache-2.0 OR MIT)
 https://github.com/tauri-apps/tauri
 ---------------------------------------------------------