Change process() InputProcessor super trait method to pass the OSC ad…

…dress. Different OSC addresses of various systems require differernt processing logic.
SutekhVRC · Jan 1, 2024 · bd248d0 · bd248d0
1 parent d893f25
commit bd248d0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src-tauri/src/toy_handling/handling.rs b/src-tauri/src/toy_handling/handling.rs
@@ -657,9 +657,10 @@ pub async fn toy_management_handler(
                                                     .pen_system
                                                     .as_mut()
                                                     .unwrap()
-                                                    .process(ModeProcessorInputType::Float(
-                                                        float_level,
-                                                    ))
+                                                    .process(
+                                                        msg.addr.as_str(),
+                                                        ModeProcessorInputType::Float(float_level),
+                                                    )
                                                 {
                                                     // Send to mode processor if specified (Raw = no mode processing)
                                                     if let ProcessingMode::Raw = feature
@@ -701,7 +702,10 @@ pub async fn toy_management_handler(
                                                     .pen_system
                                                     .as_mut()
                                                     .unwrap()
-                                                    .process(ModeProcessorInputType::Boolean(b))
+                                                    .process(
+                                                        msg.addr.as_str(),
+                                                        ModeProcessorInputType::Boolean(b),
+                                                    )
                                                 {
                                                     // Send to mode processor if specified (Raw = no mode processing)
                                                     if let ProcessingMode::Raw = feature

diff --git a/src-tauri/src/toy_handling/input_processor/mod.rs b/src-tauri/src/toy_handling/input_processor/mod.rs
@@ -15,7 +15,7 @@ pub mod penetration_systems;
  */
 
 pub trait InputProcessor: DynClone + Debug + Send + Sync {
-    fn process(&mut self, input: ModeProcessorInputType) -> Option<f64>;
+    fn process(&mut self, addr: &str, input: ModeProcessorInputType) -> Option<f64>;
     fn is_parameter(&self, param: &String) -> bool;
 }
 dyn_clone::clone_trait_object!(InputProcessor);
diff --git a/src-tauri/src/toy_handling/input_processor/penetration_systems/sps/mod.rs b/src-tauri/src/toy_handling/input_processor/penetration_systems/sps/mod.rs
@@ -21,7 +21,7 @@ impl InputProcessor for SPSProcessor {
         self.parameter_list.contains(param)
     }
 
-    fn process(&mut self, _input: ModeProcessorInputType) -> Option<f64> {
+    fn process(&mut self, _addr: &str, _input: ModeProcessorInputType) -> Option<f64> {
         todo!()
     }
 }
diff --git a/src-tauri/src/toy_handling/input_processor/penetration_systems/tps/mod.rs b/src-tauri/src/toy_handling/input_processor/penetration_systems/tps/mod.rs
@@ -21,7 +21,7 @@ impl InputProcessor for TPSProcessor {
         self.parameter_list.contains(param)
     }
 
-    fn process(&mut self, _input: ModeProcessorInputType) -> Option<f64> {
+    fn process(&mut self, _addr: &str, _input: ModeProcessorInputType) -> Option<f64> {
         todo!()
     }
 }