Add support for fixture channel modes (#495)

* Add support for multiple fixture modes

* Make most things work

* Fix Fixture types window

* Fix adding fixtures

* Fix a bug in Add Fixture window

* Make mode selectable

* Use dmx modes in stock fixtures

Author: aroffringa

CMakeLists.txt

@@ -143,6 +143,7 @@ set(THEATREFILES
   theatre/effect.cpp
   theatre/fixture.cpp
   theatre/fixturefunction.cpp
+  theatre/fixturemode.cpp
   theatre/fixturetype.cpp
   theatre/folder.cpp
   theatre/folderobject.cpp
@@ -173,7 +174,7 @@ include_directories(external/hsluv)
 include_directories($<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 
 add_library(glight-object OBJECT
-  ${GUIFILES} ${SYSTEMFILES} ${THEATREFILES} ${EXTERNALFILES})
+  ${THEATREFILES} ${SYSTEMFILES} ${GUIFILES} ${EXTERNALFILES})
 
 add_executable(glight $<TARGET_OBJECTS:glight-object> glight.cpp)
 

gui/components/colorselectwidget.cpp

@@ -82,8 +82,7 @@ void ColorSelectWidget::OpenVariableSelection() {
       effect->SetName(string_dialog.Value());
       theatre::Management &management = Instance::Management();
       system::ObservingPtr<theatre::Effect> added =
-          management.AddEffect(std::move(effect), parent)
-              .GetObserver<theatre::Effect>();
+          management.AddEffectPtr(std::move(effect), parent);
       for (size_t i = 0; i != added->NInputs(); ++i)
         management.AddSourceValue(*added, i);
       Instance::Events().EmitUpdate();

gui/components/fixturelist.cpp

@@ -43,7 +43,7 @@ void FixtureList::Fill() {
     Gtk::TreeModel::iterator iter = model_->append();
     const Gtk::TreeModel::Row &row = *iter;
     row[columns_.title_] = fixture->Name();
-    row[columns_.type_] = fixture->Type().Name();
+    row[columns_.type_] = fixture->Mode().Name();
     row[columns_.fixture_] = fixture.GetObserver();
     row[columns_.group_] = nullptr;
   }

gui/components/powermonitor.cpp

@@ -6,6 +6,8 @@
 
 #include <glibmm/main.h>
 
+#include "theatre/fixture.h"
+#include "theatre/fixturetype.h"
 #include "theatre/management.h"
 #include "theatre/theatre.h"
 
@@ -67,10 +69,10 @@ std::map<size_t, std::pair<double, double>> GetPowerPerPhase(
   std::map<size_t, std::pair<double, double>> phases;
   for (const system::TrackablePtr<theatre::Fixture>& fixture :
        theatre.Fixtures()) {
-    const double fixture_power = fixture->Type().GetPower(*fixture, snapshot);
+    const double fixture_power = fixture->Mode().GetPower(*fixture, snapshot);
     std::pair<double, double>& phase_power = phases[fixture->ElectricPhase()];
     phase_power.first += fixture_power;
-    phase_power.second += fixture->Type().MaxPower();
+    phase_power.second += fixture->Mode().Type().MaxPower();
   }
   if (phases.empty()) phases.emplace(0, std::make_pair(0.0, 0.0));
   return phases;

gui/components/reorderwidget.cpp

@@ -1,6 +1,7 @@
 #include "reorderwidget.h"
 
 #include "../../theatre/fixture.h"
+#include "../../theatre/fixturemode.h"
 #include "../../theatre/fixturetype.h"
 
 #include <ranges>
@@ -37,9 +38,10 @@ void ReorderWidget::Append(system::ObservingPtr<theatre::NamedObject> object) {
   Gtk::TreeModel::iterator iter = model_->append();
   const Gtk::TreeModel::Row& row = *iter;
   row[columns_.title_] = object->Name();
-  if (theatre::Fixture* fixture = dynamic_cast<theatre::Fixture*>(object.Get());
+  if (const theatre::Fixture* fixture =
+          dynamic_cast<const theatre::Fixture*>(object.Get());
       fixture) {
-    row[columns_.type_] = fixture->Type().Name();
+    row[columns_.type_] = fixture->Mode().Type().Name();
   }
   row[columns_.object_] = std::move(object);
   signal_changed_();

gui/components/visualizationwidget.cpp

@@ -18,6 +18,7 @@
 #include "theatre/fixture.h"
 #include "theatre/fixturecontrol.h"
 #include "theatre/fixturegroup.h"
+#include "theatre/fixturetype.h"
 #include "theatre/management.h"
 #include "theatre/managementtools.h"
 #include "theatre/theatre.h"
@@ -160,8 +161,8 @@ void VisualizationWidget::updateMidiColors() {
     size_t pad = 0;
     for (const system::TrackablePtr<theatre::Fixture> &fixture : fixtures) {
       if (fixture->IsVisible()) {
-        const glight::theatre::FixtureType &type = fixture->Type();
-        const size_t shape_count = type.ShapeCount();
+        const glight::theatre::FixtureMode &mode = fixture->Mode();
+        const size_t shape_count = mode.Type().ShapeCount();
         for (size_t shape_index = 0; shape_index != shape_count;
              ++shape_index) {
           const theatre::Color color =
@@ -617,8 +618,7 @@ void VisualizationWidget::onDistributeEvenly() {
 }
 
 void VisualizationWidget::onAddFixtures() {
-  sub_window_ = std::make_unique<windows::AddFixtureWindow>(_eventTransmitter,
-                                                            *_management);
+  sub_window_ = std::make_unique<windows::AddFixtureWindow>();
   sub_window_->set_transient_for(*main_window_);
   sub_window_->set_modal(true);
   sub_window_->show();
@@ -743,7 +743,7 @@ void VisualizationWidget::SetTilt(const theatre::Coordinate2D &position) {
   bool is_changed = false;
   for (const system::ObservingPtr<theatre::Fixture> &fixture :
        _selectedFixtures) {
-    if (fixture->Type().CanBeamTilt()) {
+    if (fixture->Mode().Type().CanBeamTilt()) {
       constexpr theatre::Coordinate2D offset(0.5, 0.5);
       const theatre::Coordinate2D direction =
           position - fixture->GetXY() - offset;
@@ -752,8 +752,8 @@ void VisualizationWidget::SetTilt(const theatre::Coordinate2D &position) {
                                     direction.Y() * direction.Y());
       double tilt = std::atan(z / dist) - fixture->StaticTilt();
       if (fixture->IsUpsideDown()) tilt = -tilt;
-      const double begin_tilt = fixture->Type().MinTilt();
-      const double end_tilt = fixture->Type().MaxTilt();
+      const double begin_tilt = fixture->Mode().Type().MinTilt();
+      const double end_tilt = fixture->Mode().Type().MaxTilt();
       const double min_value = std::min(begin_tilt, end_tilt);
       const double max_value = std::max(begin_tilt, end_tilt);
       tilt = system::RadialClamp(tilt, min_value, max_value);
@@ -778,15 +778,15 @@ void VisualizationWidget::SetPan(const theatre::Coordinate2D &position) {
   bool is_changed = false;
   for (const system::ObservingPtr<theatre::Fixture> &fixture :
        _selectedFixtures) {
-    if (fixture->Type().CanBeamRotate()) {
+    if (fixture->Mode().Type().CanBeamRotate()) {
       constexpr theatre::Coordinate2D offset(0.5, 0.5);
       const theatre::Coordinate2D direction =
           position - fixture->GetXY() - offset;
       const bool is_zero = direction.Y() == 0.0 && direction.X() == 0.0;
       const double angle =
           is_zero ? 0.0 : std::atan2(direction.Y(), direction.X());
-      double begin_pan = fixture->Type().MinPan();
-      double end_pan = fixture->Type().MaxPan();
+      double begin_pan = fixture->Mode().Type().MinPan();
+      double end_pan = fixture->Mode().Type().MaxPan();
       if (fixture->IsUpsideDown()) {
         std::swap(begin_pan, end_pan);
       }

gui/dialogs/createchasedialog.cpp

@@ -107,7 +107,7 @@ void CreateChaseDialog::onCreateChaseButtonClicked() {
     theatre::Management &management = Instance::Management();
     std::unique_lock<std::mutex> lock(management.Mutex());
 
-    _newChase = management.AddChase().GetObserver<theatre::Chase>();
+    _newChase = management.AddChasePtr();
     management.AddSourceValue(*_newChase, 0);
     _newChase->SetName(folder.GetAvailableName("Chase"));
     folder.Add(_newChase);

gui/mainwindow/actions.cpp

@@ -77,7 +77,7 @@ void NewEmptyPreset(ObjectBrowser &browser,
   Management &management = Instance::Management();
   std::unique_lock<std::mutex> lock(management.Mutex());
   ObservingPtr<theatre::PresetCollection> preset_collection =
-      management.AddPresetCollection().GetObserver<theatre::PresetCollection>();
+      management.AddPresetCollectionPtr();
   preset_collection->SetName(parent_folder.GetAvailableName("Preset"));
   parent_folder.Add(preset_collection);
   management.AddSourceValue(*preset_collection, 0);
@@ -94,7 +94,7 @@ void NewPresetFromCurrent(ObjectBrowser &browser) {
   Management &management = Instance::Management();
   std::unique_lock<std::mutex> lock(management.Mutex());
   ObservingPtr<theatre::PresetCollection> preset_collection =
-      management.AddPresetCollection().GetObserver<theatre::PresetCollection>();
+      management.AddPresetCollectionPtr();
   preset_collection->SetName(parent.GetAvailableName("Preset"));
   parent.Add(preset_collection);
   preset_collection->SetFromCurrentSituation(management);
@@ -112,7 +112,7 @@ void NewPresetFromFixtures(
   Management &management = Instance::Management();
   std::unique_lock<std::mutex> lock(management.Mutex());
   ObservingPtr<theatre::PresetCollection> preset_collection =
-      management.AddPresetCollection().GetObserver<theatre::PresetCollection>();
+      management.AddPresetCollectionPtr();
   preset_collection->SetName(parent_folder.GetAvailableName("Preset"));
   parent_folder.Add(preset_collection);
   preset_collection->SetFromCurrentFixtures(management, fixtures);
@@ -142,7 +142,7 @@ void NewTimeSequence(ObjectBrowser &browser,
   std::unique_lock<std::mutex> lock(management.Mutex());
   Folder &parent_folder = browser.SelectedFolder();
   ObservingPtr<theatre::TimeSequence> time_sequence =
-      management.AddTimeSequence().GetObserver<theatre::TimeSequence>();
+      management.AddTimeSequencePtr();
   time_sequence->SetName(parent_folder.GetAvailableName("Seq"));
   parent_folder.Add(time_sequence);
   management.AddSourceValue(*time_sequence, 0);
@@ -164,8 +164,7 @@ void NewEffect(theatre::EffectType effect_type, ObjectBrowser &browser,
   effect->SetName(
       parent_folder.GetAvailableName(EffectTypeToName(effect_type)));
   ObservingPtr<Effect> added =
-      management.AddEffect(std::move(effect), parent_folder)
-          .GetObserver<Effect>();
+      management.AddEffectPtr(std::move(effect), parent_folder);
   for (size_t i = 0; i != added->NInputs(); ++i)
     management.AddSourceValue(*added, i);
   lock.unlock();

gui/renderengine.cpp

@@ -1,6 +1,8 @@
 #include "renderengine.h"
 
 #include "../theatre/fixture.h"
+#include "../theatre/fixturemode.h"
+#include "../theatre/fixturetype.h"
 #include "../theatre/theatre.h"
 
 #include "system/math.h"
@@ -49,14 +51,15 @@ struct DrawData {
 
 void DrawFixtureProjection(const DrawData &data,
                            const theatre::Fixture &fixture) {
-  const theatre::FixtureType &type = fixture.Type();
+  const theatre::FixtureMode &mode = fixture.Mode();
+  const theatre::FixtureType &type = mode.Type();
   const size_t shape_count = type.ShapeCount();
   for (size_t shape_index = 0; shape_index != shape_count; ++shape_index) {
     const double tilt = fixture.GetBeamTilt(data.snapshot, shape_index);
     const double direction =
         fixture.GetBeamDirection(data.snapshot, shape_index);
     const double beam_angle =
-        type.CanZoom() ? type.GetZoom(fixture, data.snapshot, shape_index) * 0.5
+        type.CanZoom() ? mode.GetZoom(fixture, data.snapshot, shape_index) * 0.5
                        : type.MinBeamAngle() * 0.5;
     const double x = fixture.GetPosition().X() + 0.5;
     const double y = fixture.GetPosition().Y() + 0.5;
@@ -140,7 +143,8 @@ void DrawFixtureProjection(const DrawData &data,
 }
 
 void DrawFixtureBeam(const DrawData &data, const theatre::Fixture &fixture) {
-  const theatre::FixtureType &type = fixture.Type();
+  const theatre::FixtureMode &mode = fixture.Mode();
+  const theatre::FixtureType &type = mode.Type();
   const size_t shape_count = type.ShapeCount();
   for (size_t shape_index = 0; shape_index != shape_count; ++shape_index) {
     const theatre::Color c = fixture.GetColor(data.snapshot, shape_index);
@@ -152,7 +156,7 @@ void DrawFixtureBeam(const DrawData &data, const theatre::Fixture &fixture) {
       const double z = fixture.GetPosition().Z();
       const double beam_angle =
           type.CanZoom()
-              ? type.GetZoom(fixture, data.snapshot, shape_index) * 0.5
+              ? mode.GetZoom(fixture, data.snapshot, shape_index) * 0.5
               : type.MinBeamAngle() * 0.5;
       const double tilt = fixture.GetBeamTilt(data.snapshot, shape_index);
       const double cos_tilt = std::cos(tilt);
@@ -214,7 +218,7 @@ void DrawFixtureBeam(const DrawData &data, const theatre::Fixture &fixture) {
 
 void DrawFixture(DrawData &data, const theatre::Fixture &fixture,
                  FixtureState &fixture_state) {
-  size_t shapeCount = fixture.Type().ShapeCount();
+  size_t shapeCount = fixture.Mode().Type().ShapeCount();
   for (size_t i = 0; i != shapeCount; ++i) {
     const size_t shapeIndex = shapeCount - i - 1;
     const theatre::Color c = fixture.GetColor(data.snapshot, shapeIndex);