rokid max の anyhow を thiserror に変更 (#72)

mitoma · Dec 27, 2024 · f3b7d14 · f3b7d14
1 parent 6df7d6c
commit f3b7d14
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,7 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
+thiserror = "2.0"
 anyhow = "1.0"
 wgpu = "23.0.0"
 # fork元は winit = "0.29.x" ブランチ。いくつかのパッチを当てたものを使っている。

diff --git a/kashikishi/src/main.rs b/kashikishi/src/main.rs
@@ -216,7 +216,7 @@ impl KashikishiCallback {
                 let _ = self
                     .rokid_max_action
                     .lock()
-                    .map(|mut rokid_max_action| rokid_max_action.reset());
+                    .map(|rokid_max_action| rokid_max_action.reset());
                 world.look_current(CameraAdjustment::FitBothAndCentering)
             }
             _ => {}

diff --git a/kashikishi/src/rokid_max_ext.rs b/kashikishi/src/rokid_max_ext.rs
@@ -24,8 +24,10 @@ impl RokidMaxAction {
         }
     }
 
-    pub fn reset(&mut self) {
-        let _ = self.rokid_max.as_mut().and_then(|r| r.reset().ok());
+    pub fn reset(&self) {
+        if let Some(max) = self.rokid_max.as_ref() {
+            max.reset()
+        };
     }
 
     pub fn quaternion(&self) -> Option<Quaternion<f32>> {
@@ -55,12 +57,12 @@ impl NamespaceActionProcessors for RokidMaxAction {
         match command_name.as_str() {
             "reset" => {
                 if let Some(rokid_max) = self.rokid_max.as_mut() {
-                    let _ = rokid_max.reset();
+                    rokid_max.reset();
                 }
             }
             "toggle-mode" => {
                 if let Some(rokid_max) = self.rokid_max.as_mut() {
-                    let _ = rokid_max.reset();
+                    rokid_max.reset();
                     world.camera_operation(CameraOperation::UpdateEyeQuaternion(Some(
                         rokid_max.quaternion(),
                     )));

diff --git a/rokid_3dof/Cargo.toml b/rokid_3dof/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-anyhow.workspace = true
+thiserror.workspace = true
 bytemuck.workspace = true
 cgmath.workspace = true
 hidapi = "2.6.1"
@@ -16,6 +16,7 @@ font_rasterizer = { path = "../font_rasterizer" }
 font_collector = { path = "../font_collector" }
 stroke_parser = { path = "../stroke_parser" }
 ui_support = { path = "../ui_support" }
+anyhow.workspace = true
 log.workspace = true
 instant.workspace = true
 winit.workspace = true

diff --git a/rokid_3dof/examples/rokid_test.rs b/rokid_3dof/examples/rokid_test.rs
@@ -139,7 +139,7 @@ impl SimpleStateCallback for SingleCharCallback {
                 button: MouseButton::Right,
                 ..
             } => {
-                self.rokid_max.reset().unwrap();
+                self.rokid_max.reset();
                 InputResult::InputConsumed
             }
             WindowEvent::MouseInput {

diff --git a/rokid_3dof/src/main.rs → rokid_3dof/examples/sensor_test.rs b/rokid_3dof/src/main.rs → rokid_3dof/examples/sensor_test.rs
@@ -7,11 +7,9 @@ use rokid_3dof::RokidMax;
 
 fn main() -> anyhow::Result<()> {
     let rokid_max = RokidMax::new()?;
-
     loop {
         println!("{:?}", rokid_max.quaternion());
 
         thread::sleep(Duration::from_millis(1000));
     }
-    //Ok(())
 }