feat(fixtures): always show current value of fixtures in table

Author: maxjoehnk

crates/api/protos/programmer.proto

@@ -27,6 +27,15 @@ message ProgrammerState {
   uint32 wings = 9;
   repeated EffectProgrammerState effects = 10;
   bool offline = 11;
+  repeated FixtureValue fixture_values = 12;
+}
+
+message FixtureValue {
+  mizer.fixtures.FixtureId fixture = 1;
+  optional double intensity = 2;
+  optional mizer.fixtures.ColorMixerChannel color = 3;
+  optional double pan = 4;
+  optional double tilt = 5;
 }
 
 message FixtureSelection {

crates/components/fixtures/src/lib.rs

@@ -147,6 +147,8 @@ impl FixtureStates {
 pub struct FixtureState {
     pub brightness: Option<f64>,
     pub color: Option<Color>,
+    pub pan: Option<f64>,
+    pub tilt: Option<f64>,
 }
 
 #[derive(Debug, Clone, Copy, Default)]

crates/components/fixtures/src/processor.rs

@@ -75,9 +75,12 @@ impl Processor for FixtureProcessor {
 fn get_state(fixture: &impl IFixture) -> FixtureState {
     let mut fixture_state = FixtureState::default();
     fixture_state.brightness = fixture.read_control(FixtureFaderControl::Intensity);
+    fixture_state.pan = fixture.read_control(FixtureFaderControl::Pan);
+    fixture_state.tilt = fixture.read_control(FixtureFaderControl::Tilt);
     let red = fixture.read_control(FixtureFaderControl::ColorMixer(ColorChannel::Red));
     let green = fixture.read_control(FixtureFaderControl::ColorMixer(ColorChannel::Green));
     let blue = fixture.read_control(FixtureFaderControl::ColorMixer(ColorChannel::Blue));
+
     fixture_state.color = red
         .zip(green)
         .zip(blue)

crates/ui/ffi/src/apis/fixture.rs

@@ -1,6 +1,7 @@
-use crate::types::{drop_pointer, FFIFromPointer};
+use crate::types::{drop_pointer, Array, FFIFromPointer};
 use mizer_fixtures::{FixtureId, FixtureState, FixtureStates};
 use std::sync::Arc;
+use crate::apis::programmer::{FFIColorValue, FFIFixtureId};
 
 pub struct FixturesRef(pub FixtureStates);
 
@@ -26,6 +27,39 @@ pub extern "C" fn read_fixture_state(
     state.map(|state| (*state).into()).unwrap_or_default()
 }
 
+#[no_mangle]
+pub extern "C" fn read_fixture_states(
+    ptr: *const FixturesRef
+) -> FFIFixtureStates {
+    let ffi = Arc::from_pointer(ptr);
+
+    let state = ffi.0.read();
+    let fixture_values = state
+        .iter()
+        .map(|(id, state)| {
+            let id = (*id).into();
+
+            FFIFixtureValues {
+                fixture_id: id,
+                has_intensity: state.brightness.is_some().into(),
+                intensity: state.brightness.unwrap_or_default(),
+                has_color: state.color.is_some().into(),
+                color: FFIColorValue::from(state.color.unwrap_or_default()),
+                has_pan: state.pan.is_some().into(),
+                pan: state.pan.unwrap_or_default(),
+                has_tilt: state.tilt.is_some().into(),
+                tilt: state.tilt.unwrap_or_default(),
+            }
+        })
+        .collect();
+
+    std::mem::forget(ffi);
+
+    FFIFixtureStates {
+        fixture_values,
+    }
+}
+
 #[no_mangle]
 pub extern "C" fn drop_fixture_pointer(ptr: *const FixturesRef) {
     drop_pointer(ptr);
@@ -56,3 +90,21 @@ impl From<FixtureState> for FFIFixtureState {
         }
     }
 }
+
+#[repr(C)]
+pub struct FFIFixtureStates {
+    pub fixture_values: Array<FFIFixtureValues>,
+}
+
+#[repr(C)]
+pub struct FFIFixtureValues {
+    pub fixture_id: FFIFixtureId,
+    pub has_intensity: u8,
+    pub intensity: f64,
+    pub has_color: u8,
+    pub color: FFIColorValue,
+    pub has_pan: u8,
+    pub pan: f64,
+    pub has_tilt: u8,
+    pub tilt: f64,
+}

crates/ui/ffi/src/apis/programmer.rs

@@ -1,9 +1,6 @@
 use crate::types::{drop_pointer, Array, FFIFromPointer};
 use mizer_fixtures::definition::FixtureControlValue;
-use mizer_fixtures::programmer::{
-    PresetId, ProgrammedEffect, ProgrammerChannel, ProgrammerControlValue, ProgrammerState,
-    ProgrammerView,
-};
+use mizer_fixtures::programmer::{Color, PresetId, ProgrammedEffect, ProgrammerChannel, ProgrammerControlValue, ProgrammerState, ProgrammerView};
 use mizer_fixtures::FixtureId;
 use parking_lot::Mutex;
 use std::collections::HashMap;
@@ -286,6 +283,16 @@ pub struct FFIColorValue {
     pub blue: f64,
 }
 
+impl From<Color> for FFIColorValue {
+    fn from((red, green, blue): Color) -> Self {
+        Self {
+            red,
+            green,
+            blue
+        }
+    }
+}
+
 #[repr(C)]
 #[derive(Clone, Copy)]
 pub struct FFIGenericValue {

crates/ui/lib/api/plugin/ffi/plans.dart

@@ -1,6 +1,7 @@
 import 'dart:ffi' as ffi;
 
 import 'package:flutter/widgets.dart' as widgets;
+import 'package:mizer/api/plugin/ffi/programmer.dart';
 import 'package:mizer/protos/fixtures.pb.dart';
 import 'package:mizer/protos/layouts.pb.dart';
 
@@ -29,6 +30,21 @@ class FixtureState {
   }
 }
 
+class FixturesState {
+  final Map<FixtureId, FixtureValues> fixtureStates;
+
+  FixturesState({this.fixtureStates = const {}});
+}
+
+class FixtureValues {
+  final double? intensity;
+  final Color? color;
+  final double? pan;
+  final double? tilt;
+
+  FixtureValues({this.intensity, this.color, this.pan, this.tilt});
+}
+
 class FixturesRefPointer extends FFIPointer<FixturesRef> {
   final FFIBindings _bindings;
 
@@ -52,6 +68,26 @@ class FixturesRefPointer extends FFIPointer<FixturesRef> {
     );
   }
 
+  FixturesState readStates() {
+    FFIFixtureStates states = this._bindings.read_fixture_states(ptr);
+    var fixtures = new List.generate(states.fixture_values.len, (index) => states.fixture_values.array.elementAt(index).ref);
+
+    Map<FixtureId, FixtureValues> fixtureStates = {};
+
+    fixtures.forEach((fixture) {
+      fixtureStates[fixture.fixture_id.toFixtureId()] = FixtureValues(
+        intensity: fixture.has_intensity == 1 ? fixture.intensity : null,
+        color: fixture.has_color == 1
+            ? Color(red: fixture.color.red, green: fixture.color.green, blue: fixture.color.blue)
+            : null,
+        pan: fixture.has_pan == 1 ? fixture.pan : null,
+        tilt: fixture.has_tilt == 1 ? fixture.tilt : null
+      );
+    });
+
+    return FixturesState(fixtureStates: fixtureStates);
+  }
+
   @override
   void disposePointer(ffi.Pointer<FixturesRef> _ptr) {
     this._bindings.drop_fixture_pointer(_ptr);

crates/ui/lib/api/plugin/ffi/programmer.dart

@@ -54,13 +54,7 @@ class ProgrammerStatePointer extends FFIPointer<Programmer> {
   List<FixtureId> _readFixtureSelection(Array_FFIFixtureId result) {
     var fixtures = new List.generate(result.len, (index) => result.array.elementAt(index).ref);
 
-    return fixtures.map((id) {
-      if (id.sub_fixture_id != 0) {
-        return FixtureId(
-            subFixture: SubFixtureId(fixtureId: id.fixture_id, childId: id.sub_fixture_id));
-      }
-      return FixtureId(fixture: id.fixture_id);
-    }).toList();
+    return fixtures.map((id) => id.toFixtureId()).toList();
   }
 
   List<int> _readGroupSelection(Array_u32 result) {
@@ -142,3 +136,13 @@ class ProgrammerStatePointer extends FFIPointer<Programmer> {
     this._bindings.drop_programmer_pointer(_ptr);
   }
 }
+
+extension FFI on FFIFixtureId {
+  FixtureId toFixtureId() {
+    if (this.sub_fixture_id != 0) {
+      return FixtureId(
+          subFixture: SubFixtureId(fixtureId: this.fixture_id, childId: this.sub_fixture_id));
+    }
+    return FixtureId(fixture: this.fixture_id);
+  }
+}

crates/ui/lib/mixins/fixture_values_mixin.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/scheduler.dart';
+import 'package:flutter/widgets.dart';
+import 'package:mizer/api/contracts/plans.dart';
+import 'package:mizer/api/plugin/ffi/plans.dart';
+import 'package:mizer/protos/fixtures.pb.dart';
+import 'package:provider/provider.dart';
+
+@optionalTypeArgs
+mixin FixtureValuesMixin<T extends StatefulWidget> on State<T>, TickerProvider {
+  FixturesRefPointer? _fixturesPointer;
+  Ticker? _fixtureValuesTicker;
+  FixturesState _fixturesState = FixturesState();
+
+  @override
+  void initState() {
+    super.initState();
+    var plansApi = context.read<PlansApi>();
+    plansApi.getFixturesPointer().then((pointer) {
+      _fixturesPointer = pointer;
+      _fixtureValuesTicker = this.createTicker((elapsed) {
+        setState(() {
+          _fixturesState = _fixturesPointer!.readStates();
+        });
+      });
+      _fixtureValuesTicker!.start();
+    });
+  }
+
+  @override
+  void dispose() {
+    _fixturesPointer?.dispose();
+    _fixtureValuesTicker?.stop(canceled: true);
+    super.dispose();
+  }
+
+  Map<FixtureId, FixtureValues> get fixtureValues {
+    return this._fixturesState.fixtureStates;
+  }
+}

crates/ui/lib/views/fixtures/color_indicator.dart

@@ -1,18 +1,12 @@
-import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
-import 'package:mizer/protos/fixtures.pb.dart';
-import 'package:mizer/protos/programmer.pb.dart';
-import 'package:mizer/state/presets_bloc.dart';
-import 'package:provider/provider.dart';
 
 class ColorIndicator extends StatelessWidget {
-  final Iterable<ProgrammerChannel>? fixtureState;
+  final Color? color;
 
-  const ColorIndicator({super.key, this.fixtureState});
+  const ColorIndicator({super.key, this.color});
 
   @override
   Widget build(BuildContext context) {
-    var color = this.getColor(context);
     if (color == null) {
       return Container();
     }
@@ -25,38 +19,4 @@ class ColorIndicator extends StatelessWidget {
       ),
     );
   }
-
-  Color? getColor(BuildContext context) {
-    var programmerChannel =
-        fixtureState?.firstWhereOrNull((element) => element.control == FixtureControl.COLOR_MIXER);
-    if (programmerChannel == null) {
-      return null;
-    }
-    if (programmerChannel.hasPreset()) {
-      PresetsBloc bloc = context.read();
-      var preset = bloc.state.getPreset(programmerChannel.preset);
-      if (preset == null) {
-        return null;
-      }
-      return _convertPresetColor(preset.color);
-    }
-
-    return _convertColor(programmerChannel.color);
-  }
-
-  Color _convertColor(ColorMixerChannel color) {
-    int red = (color.red * 255).round();
-    int green = (color.green * 255).round();
-    int blue = (color.blue * 255).round();
-
-    return Color.fromARGB(255, red, green, blue);
-  }
-
-  Color _convertPresetColor(Preset_Color color) {
-    int red = (color.red * 255).round();
-    int green = (color.green * 255).round();
-    int blue = (color.blue * 255).round();
-
-    return Color.fromARGB(255, red, green, blue);
-  }
 }

crates/ui/lib/views/fixtures/fader_indicator.dart

@@ -1,44 +1,22 @@
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:mizer/api/contracts/programmer.dart';
-import 'package:mizer/protos/fixtures.pbenum.dart';
-import 'package:mizer/state/presets_bloc.dart';
-import 'package:provider/provider.dart';
 
 class IntensityIndicator extends StatelessWidget {
   final Widget child;
-  final Iterable<ProgrammerChannel>? fixtureState;
+  final double? value;
 
-  const IntensityIndicator({super.key, required this.child, this.fixtureState});
+  const IntensityIndicator({super.key, required this.child, this.value});
 
   @override
   Widget build(BuildContext context) {
-    var value = this.getValue(context);
     return Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          if (value != null) CustomPaint(size: Size.fromWidth(8), painter: FaderIndicatorPainter(value)),
+          if (value != null) CustomPaint(size: Size.fromWidth(8), painter: FaderIndicatorPainter(value!)),
           Expanded(child: SizedBox(width: 2)),
           child,
         ]
     );
   }
-
-  double? getValue(BuildContext context) {
-    var programmerChannel = fixtureState?.firstWhereOrNull((element) => element.control == FixtureControl.INTENSITY);
-    if (programmerChannel == null) {
-      return null;
-    }
-    if (programmerChannel.hasPreset()) {
-      PresetsBloc bloc = context.read();
-      var preset = bloc.state.getPreset(programmerChannel.preset);
-      if (preset == null) {
-        return null;
-      }
-      return preset.fader;
-    }
-    return programmerChannel.fader;
-  }
 }
 
 class FaderIndicatorPainter extends CustomPainter {