Handle hi-res value animations between scenes

RandomStudio · Feb 3, 2025 · 041d9ae · 041d9ae
1 parent e206fe2
commit 041d9ae
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tether-artnet-controller"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 repository = "/~https://github.com/RandomStudio/tether-artnet-controller"
 homepage = "/~https://github.com/RandomStudio/tether-artnet-controller"

diff --git a/example.project.json b/example.project.json
@@ -135,13 +135,13 @@
             ]
           },
           "pan": {
-            "ControlValue": 67
+            "ControlValue": 17028
           },
           "tilt": {
-            "ControlValue": 92
+            "ControlValue": 24253
           },
           "zoom": {
-            "ControlValue": 255
+            "ControlValue": 61406
           }
         },
         "Hero Right": {
@@ -157,13 +157,13 @@
             ]
           },
           "pan": {
-            "ControlValue": 15
+            "ControlValue": 46958
           },
           "tilt": {
-            "ControlValue": 73
+            "ControlValue": 23221
           },
           "zoom": {
-            "ControlValue": 255
+            "ControlValue": 46958
           }
         },
         "Hex Left": {
@@ -179,18 +179,18 @@
             ]
           },
           "Pan": {
-            "ControlValue": 0
+            "ControlValue": 13932
           },
           "Tilt": {
-            "ControlValue": 0
+            "ControlValue": 25801
           },
           "Zoom": {
-            "ControlValue": 0
+            "ControlValue": 65535
           }
         },
         "Hex Right": {
           "Brightness": {
-            "ControlValue": 41000
+            "ControlValue": 65535
           },
           "Colour": {
             "ColourValue": [
@@ -201,13 +201,13 @@
             ]
           },
           "Pan": {
-            "ControlValue": 0
+            "ControlValue": 29413
           },
           "Tilt": {
-            "ControlValue": 0
+            "ControlValue": 26317
           },
           "Zoom": {
-            "ControlValue": 0
+            "ControlValue": 41797
           }
         }
       }
@@ -228,13 +228,13 @@
             ]
           },
           "pan": {
-            "ControlValue": 56500
+            "ControlValue": 0
           },
           "tilt": {
-            "ControlValue": 36000
+            "ControlValue": 32509
           },
           "zoom": {
-            "ControlValue": 54000
+            "ControlValue": 45410
           }
         },
         "Hero Right": {
@@ -250,18 +250,18 @@
             ]
           },
           "pan": {
-            "ControlValue": 57500
+            "ControlValue": 0
           },
           "tilt": {
-            "ControlValue": 35500
+            "ControlValue": 30445
           },
           "zoom": {
-            "ControlValue": 41000
+            "ControlValue": 39217
           }
         },
         "Hex Left": {
           "Brightness": {
-            "ControlValue": 35000
+            "ControlValue": 65535
           },
           "Colour": {
             "ColourValue": [
@@ -275,15 +275,15 @@
             "ControlValue": 0
           },
           "Tilt": {
-            "ControlValue": 34500
+            "ControlValue": 34057
           },
           "Zoom": {
-            "ControlValue": 0
+            "ControlValue": 38701
           }
         },
         "Hex Right": {
           "Brightness": {
-            "ControlValue": 41000
+            "ControlValue": 65535
           },
           "Colour": {
             "ColourValue": [
@@ -297,10 +297,10 @@
             "ControlValue": 0
           },
           "Tilt": {
-            "ControlValue": 37000
+            "ControlValue": 31993
           },
           "Zoom": {
-            "ControlValue": 0
+            "ControlValue": 31477
           }
         }
       }
@@ -312,8 +312,8 @@
   },
   "artnetConfig": {
     "Unicast": [
-      "127.0.0.1",
-      "127.0.0.1"
+      "10.0.0.105",
+      "10.0.0.99"
     ]
   }
 }
diff --git a/src/model.rs b/src/model.rs
@@ -366,7 +366,7 @@ impl Model {
                                         let duration = Duration::from_millis(ms);
                                         let start_value =
                                             control_macro.current_value as f32 / u16::MAX as f32;
-                                        let end_value = target_value as f32 / u16::MAX as f32;
+                                        let end_value = target_value / u16::MAX as f32;
 
                                         control_macro.animation = Some(Animation::new(
                                             duration,
@@ -500,9 +500,9 @@ impl Model {
                                                                 control_macro_in_fixture
                                                                     .current_value
                                                                     as f32
-                                                                    / 255.0,
+                                                                    / u16::MAX as f32,
                                                                 *control_macro_in_scene as f32
-                                                                    / 255.0,
+                                                                    / u16::MAX as f32,
                                                                 Box::new(SineInOut),
                                                             ))
                                                     } else {