Feature/UI lighting

.github/workflows/build_and_test.yml

@@ -90,7 +90,8 @@ jobs:
           - os: windows-latest
             artifact: agave-win
           # note macos-14 is arm64 and macos-13 is x86_64
-          - os: macos-15
+          # Tensorstore does not support universal builds yet
+          - os: macos-14
             artifact: agave-macos-arm64
           - os: macos-15-intel
             artifact: agave-macos-x86_64

CMakeLists.txt

@@ -4,6 +4,8 @@ include(FetchContent)  # Needed to recognize FetchContent_Declare in renderlib
 if(APPLE)
   set(ENV{MACOSX_DEPLOYMENT_TARGET} "10.15")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
+  # Tensorstore does not support universal builds yet:
+  # set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 endif(APPLE)
 
 if(POLICY CMP0048)

agave_app/AppearanceDockWidget.cpp

@@ -5,11 +5,13 @@
 QAppearanceWidget::QAppearanceWidget(QWidget* pParent,
                                      QRenderSettings* qrs,
                                      RenderSettings* rs,
+                                     AreaLightObject* alo,
+                                     SkyLightObject* slo,
                                      QAction* pToggleRotateAction,
                                      QAction* pToggleTranslateAction)
   : QWidget(pParent)
   , m_MainLayout()
-  , m_AppearanceSettingsWidget(nullptr, qrs, rs, pToggleRotateAction, pToggleTranslateAction)
+  , m_AppearanceSettingsWidget(nullptr, qrs, rs, alo, slo, pToggleRotateAction, pToggleTranslateAction)
 {
   // Create main layout
   m_MainLayout.setAlignment(Qt::AlignTop);
@@ -25,10 +27,12 @@ QAppearanceWidget::QAppearanceWidget(QWidget* pParent,
 QAppearanceDockWidget::QAppearanceDockWidget(QWidget* parent,
                                              QRenderSettings* qrs,
                                              RenderSettings* rs,
+                                             AreaLightObject* alo,
+                                             SkyLightObject* slo,
                                              QAction* pToggleRotateAction,
                                              QAction* pToggleTranslateAction)
   : QDockWidget(parent)
-  , m_VolumeAppearanceWidget(nullptr, qrs, rs, pToggleRotateAction, pToggleTranslateAction)
+  , m_VolumeAppearanceWidget(nullptr, qrs, rs, alo, slo, pToggleRotateAction, pToggleTranslateAction)
 {
   setWindowTitle("Appearance");
 

agave_app/AppearanceDockWidget.h

@@ -15,6 +15,8 @@ class QAppearanceWidget : public QWidget
   QAppearanceWidget(QWidget* pParent = NULL,
                     QRenderSettings* qrs = nullptr,
                     RenderSettings* rs = nullptr,
+                    AreaLightObject* alo = nullptr,
+                    SkyLightObject* slo = nullptr,
                     QAction* pToggleRotateAction = nullptr,
                     QAction* pToggleTranslateAction = nullptr);
 
@@ -33,6 +35,8 @@ class QAppearanceDockWidget : public QDockWidget
   QAppearanceDockWidget(QWidget* pParent = NULL,
                         QRenderSettings* qrs = nullptr,
                         RenderSettings* rs = nullptr,
+                        AreaLightObject* alo = nullptr,
+                        SkyLightObject* slo = nullptr,
                         QAction* pToggleRotateAction = nullptr,
                         QAction* pToggleTranslateAction = nullptr);
 

agave_app/AppearanceDockWidget2.cpp

@@ -5,7 +5,7 @@ QAppearanceDockWidget2::QAppearanceDockWidget2(QWidget* pParent,
                                                ViewerWindow* vw,
                                                AppearanceObject* ado)
   : QDockWidget(pParent)
-  , m_AppearanceWidget(nullptr, rs, vw, ado)
+  , m_AppearanceWidget(nullptr, rs, ado)
 {
   setWindowTitle("Appearance");
 

agave_app/AppearanceSettingsWidget.cpp

@@ -1,13 +1,17 @@
 #include "AppearanceSettingsWidget.h"
+
 #include "QRenderSettings.h"
 #include "RangeWidget.h"
 #include "qtControls/Section.h"
+#include "qtControls/controlFactory.h"
 
 #include "ImageXYZC.h"
 #include "renderlib/AppScene.h"
+#include "renderlib/AreaLightObject.hpp"
 #include "renderlib/Colormap.h"
 #include "renderlib/Logging.h"
 #include "renderlib/RenderSettings.h"
+#include "renderlib/SkyLightObject.hpp"
 #include "tfeditor/gradients.h"
 
 #include <QFormLayout>
@@ -95,11 +99,15 @@ static const int MAX_CHANNELS_CHECKED = 4;
 QAppearanceSettingsWidget::QAppearanceSettingsWidget(QWidget* pParent,
                                                      QRenderSettings* qrs,
                                                      RenderSettings* rs,
+                                                     AreaLightObject* alo,
+                                                     SkyLightObject* slo,
                                                      QAction* pToggleRotateAction,
                                                      QAction* pToggleTranslateAction)
   : QGroupBox(pParent)
   , m_MainLayout()
   , m_qrendersettings(qrs)
+  , m_arealightObject(alo)
+  , m_skylightObject(slo)
   , m_scene(nullptr)
 {
   Controls::initFormLayout(m_MainLayout);
@@ -343,73 +351,15 @@ QAppearanceSettingsWidget::createAreaLightingControls(QAction* pRotationAction)
   m_lt0gui.m_RotateButton->setToolTip(tr("Show interactive controls in viewport for area light rotation angle"));
   btnLayout->addWidget(m_lt0gui.m_RotateButton);
   QObject::connect(m_lt0gui.m_RotateButton, &QPushButton::clicked, [this, pRotationAction]() {
-    toggleActionForObject(pRotationAction, this->m_scene->SceneAreaLight());
+    toggleActionForObject(pRotationAction, m_arealightObject->getSceneLight().get());
   });
   // dummy widget to fill space (TODO: Translate button?)
   btnLayout->addWidget(new QWidget());
   sectionLayout->addLayout(btnLayout, sectionLayout->rowCount(), 0, 1, 2);
 
-  m_lt0gui.m_thetaSlider = new QNumericSlider();
-  m_lt0gui.m_thetaSlider->setStatusTip(tr("Set angle theta for area light"));
-  m_lt0gui.m_thetaSlider->setToolTip(tr("Set angle theta for area light"));
-  m_lt0gui.m_thetaSlider->setRange(0.0, TWO_PI_F);
-  m_lt0gui.m_thetaSlider->setSingleStep(TWO_PI_F / 100.0);
-  m_lt0gui.m_thetaSlider->setValue(0.0);
-  sectionLayout->addRow("Theta", m_lt0gui.m_thetaSlider);
-  QObject::connect(
-    m_lt0gui.m_thetaSlider, &QNumericSlider::valueChanged, this, &QAppearanceSettingsWidget::OnSetAreaLightTheta);
-
-  m_lt0gui.m_phiSlider = new QNumericSlider();
-  m_lt0gui.m_phiSlider->setStatusTip(tr("Set angle phi for area light"));
-  m_lt0gui.m_phiSlider->setToolTip(tr("Set angle phi for area light"));
-  m_lt0gui.m_phiSlider->setRange(0.0, PI_F);
-  m_lt0gui.m_phiSlider->setSingleStep(PI_F / 100.0);
-  m_lt0gui.m_phiSlider->setValue(HALF_PI_F);
-  sectionLayout->addRow("Phi", m_lt0gui.m_phiSlider);
-  QObject::connect(
-    m_lt0gui.m_phiSlider, &QNumericSlider::valueChanged, this, &QAppearanceSettingsWidget::OnSetAreaLightPhi);
-
-  m_lt0gui.m_sizeSlider = new QNumericSlider();
-  m_lt0gui.m_sizeSlider->setStatusTip(tr("Set size for area light"));
-  m_lt0gui.m_sizeSlider->setToolTip(tr("Set size for area light"));
-  m_lt0gui.m_sizeSlider->setRange(0.1, 5.0);
-  m_lt0gui.m_sizeSlider->setSingleStep(5.0 / 100.0);
-  m_lt0gui.m_sizeSlider->setValue(1.0);
-  sectionLayout->addRow("Size", m_lt0gui.m_sizeSlider);
-  QObject::connect(
-    m_lt0gui.m_sizeSlider, &QNumericSlider::valueChanged, this, &QAppearanceSettingsWidget::OnSetAreaLightSize);
-
-  m_lt0gui.m_distSlider = new QNumericSlider();
-  m_lt0gui.m_distSlider->setStatusTip(tr("Set distance for area light"));
-  m_lt0gui.m_distSlider->setToolTip(tr("Set distance for area light"));
-  m_lt0gui.m_distSlider->setRange(0.1, 10.0);
-  m_lt0gui.m_distSlider->setSingleStep(1.0);
-  m_lt0gui.m_distSlider->setValue(10.0);
-  sectionLayout->addRow("Distance", m_lt0gui.m_distSlider);
-  QObject::connect(
-    m_lt0gui.m_distSlider, &QNumericSlider::valueChanged, this, &QAppearanceSettingsWidget::OnSetAreaLightDistance);
-
-  auto* arealightLayout = new QHBoxLayout();
-  m_lt0gui.m_intensitySlider = new QNumericSlider();
-  m_lt0gui.m_intensitySlider->setStatusTip(tr("Set intensity for area light"));
-  m_lt0gui.m_intensitySlider->setToolTip(tr("Set intensity for area light"));
-  m_lt0gui.m_intensitySlider->setRange(0.0, 1000.0);
-  m_lt0gui.m_intensitySlider->setSingleStep(10.0);
-  m_lt0gui.m_intensitySlider->setValue(100.0);
-  m_lt0gui.m_intensitySlider->setDecimals(1);
-  arealightLayout->addWidget(m_lt0gui.m_intensitySlider, 1);
-  m_lt0gui.m_areaLightColorButton = new QColorPushButton();
-  m_lt0gui.m_areaLightColorButton->setStatusTip(tr("Set color for area light"));
-  m_lt0gui.m_areaLightColorButton->setToolTip(tr("Set color for area light"));
-  arealightLayout->addWidget(m_lt0gui.m_areaLightColorButton, 0);
-  arealightLayout->setContentsMargins(0, 0, 0, 0);
-  sectionLayout->addRow("Intensity", arealightLayout);
-  QObject::connect(m_lt0gui.m_areaLightColorButton, &QColorPushButton::currentColorChanged, [this](const QColor& c) {
-    this->OnSetAreaLightColor(this->m_lt0gui.m_intensitySlider->value(), c);
-  });
-  QObject::connect(m_lt0gui.m_intensitySlider, &QNumericSlider::valueChanged, [this](double v) {
-    this->OnSetAreaLightColor(v, this->m_lt0gui.m_areaLightColorButton->GetColor());
-  });
+  if (m_arealightObject) {
+    createFlatList(sectionLayout, m_arealightObject);
+  }
 
   section->setContentLayout(*sectionLayout);
   return section;
@@ -421,62 +371,9 @@ QAppearanceSettingsWidget::createSkyLightingControls()
   Section* section = new Section("Sky Light", 0);
   auto* sectionLayout = Controls::createAgaveFormLayout();
 
-  auto* skylightTopLayout = new QHBoxLayout();
-  m_lt1gui.m_stintensitySlider = new QNumericSlider();
-  m_lt1gui.m_stintensitySlider->setStatusTip(tr("Set intensity for top of skylight sphere"));
-  m_lt1gui.m_stintensitySlider->setToolTip(tr("Set intensity for top of skylight sphere"));
-  m_lt1gui.m_stintensitySlider->setRange(0.0, 10.0);
-  m_lt1gui.m_stintensitySlider->setValue(1.0);
-  skylightTopLayout->addWidget(m_lt1gui.m_stintensitySlider, 1);
-  m_lt1gui.m_stColorButton = new QColorPushButton();
-  m_lt1gui.m_stColorButton->setStatusTip(tr("Set color for top of skylight sphere"));
-  m_lt1gui.m_stColorButton->setToolTip(tr("Set color for top of skylight sphere"));
-  skylightTopLayout->addWidget(m_lt1gui.m_stColorButton);
-  sectionLayout->addRow("Top", skylightTopLayout);
-  QObject::connect(m_lt1gui.m_stColorButton, &QColorPushButton::currentColorChanged, [this](const QColor& c) {
-    this->OnSetSkyLightTopColor(this->m_lt1gui.m_stintensitySlider->value(), c);
-  });
-  QObject::connect(m_lt1gui.m_stintensitySlider, &QNumericSlider::valueChanged, [this](double v) {
-    this->OnSetSkyLightTopColor(v, this->m_lt1gui.m_stColorButton->GetColor());
-  });
-
-  auto* skylightMidLayout = new QHBoxLayout();
-  m_lt1gui.m_smintensitySlider = new QNumericSlider();
-  m_lt1gui.m_smintensitySlider->setStatusTip(tr("Set intensity for middle of skylight sphere"));
-  m_lt1gui.m_smintensitySlider->setToolTip(tr("Set intensity for middle of skylight sphere"));
-  m_lt1gui.m_smintensitySlider->setRange(0.0, 10.0);
-  m_lt1gui.m_smintensitySlider->setValue(1.0);
-  skylightMidLayout->addWidget(m_lt1gui.m_smintensitySlider, 1);
-  m_lt1gui.m_smColorButton = new QColorPushButton();
-  m_lt1gui.m_smColorButton->setStatusTip(tr("Set color for middle of skylight sphere"));
-  m_lt1gui.m_smColorButton->setToolTip(tr("Set color for middle of skylight sphere"));
-  skylightMidLayout->addWidget(m_lt1gui.m_smColorButton);
-  sectionLayout->addRow("Mid", skylightMidLayout);
-  QObject::connect(m_lt1gui.m_smColorButton, &QColorPushButton::currentColorChanged, [this](const QColor& c) {
-    this->OnSetSkyLightMidColor(this->m_lt1gui.m_smintensitySlider->value(), c);
-  });
-  QObject::connect(m_lt1gui.m_smintensitySlider, &QNumericSlider::valueChanged, [this](double v) {
-    this->OnSetSkyLightMidColor(v, this->m_lt1gui.m_smColorButton->GetColor());
-  });
-
-  auto* skylightBotLayout = new QHBoxLayout();
-  m_lt1gui.m_sbintensitySlider = new QNumericSlider();
-  m_lt1gui.m_sbintensitySlider->setStatusTip(tr("Set intensity for bottom of skylight sphere"));
-  m_lt1gui.m_sbintensitySlider->setToolTip(tr("Set intensity for bottom of skylight sphere"));
-  m_lt1gui.m_sbintensitySlider->setRange(0.0, 10.0);
-  m_lt1gui.m_sbintensitySlider->setValue(1.0);
-  skylightBotLayout->addWidget(m_lt1gui.m_sbintensitySlider, 1);
-  m_lt1gui.m_sbColorButton = new QColorPushButton();
-  m_lt1gui.m_sbColorButton->setStatusTip(tr("Set color for bottom of skylight sphere"));
-  m_lt1gui.m_sbColorButton->setToolTip(tr("Set color for bottom of skylight sphere"));
-  skylightBotLayout->addWidget(m_lt1gui.m_sbColorButton);
-  sectionLayout->addRow("Bot", skylightBotLayout);
-  QObject::connect(m_lt1gui.m_sbColorButton, &QColorPushButton::currentColorChanged, [this](const QColor& c) {
-    this->OnSetSkyLightBotColor(this->m_lt1gui.m_sbintensitySlider->value(), c);
-  });
-  QObject::connect(m_lt1gui.m_sbintensitySlider, &QNumericSlider::valueChanged, [this](double v) {
-    this->OnSetSkyLightBotColor(v, this->m_lt1gui.m_sbColorButton->GetColor());
-  });
+  if (m_skylightObject) {
+    createFlatList(sectionLayout, m_skylightObject);
+  }
 
   section->setContentLayout(*sectionLayout);
   return section;
@@ -871,46 +768,17 @@ QAppearanceSettingsWidget::initClipPlaneControls(Scene* scene)
 void
 QAppearanceSettingsWidget::initLightingControls(Scene* scene)
 {
-  m_lt0gui.m_thetaSlider->setValue(scene->AreaLight().m_Theta);
-  m_lt0gui.m_phiSlider->setValue(scene->AreaLight().m_Phi);
-  m_lt0gui.m_sizeSlider->setValue(scene->AreaLight().m_Width);
-  m_lt0gui.m_distSlider->setValue(scene->AreaLight().m_Distance);
-  // split color into color and intensity.
-  QColor c;
-  float i;
-  normalizeColorForGui(scene->AreaLight().m_Color, c, i);
-  m_lt0gui.m_intensitySlider->setValue(i * scene->AreaLight().m_ColorIntensity);
-  m_lt0gui.m_areaLightColorButton->SetColor(c);
+  m_arealightObject->updatePropsFromSceneLight();
 
   // attach light observer to scene's area light source, to receive updates from viewport controls
   // TODO FIXME clean this up - it's not removed anywhere so if light(i.e. scene) outlives "this" then we have problems.
   // Currently in AGAVE this is not an issue..
-  scene->SceneAreaLight()->m_observers.push_back([this](const Light& light) {
+  m_arealightObject->getSceneLight()->m_observers.push_back([this](const Light& light) {
     // update gui controls
-
-    // bring theta into 0..2pi
-    m_lt0gui.m_thetaSlider->setValue(light.m_Theta < 0 ? light.m_Theta + TWO_PI_F : light.m_Theta);
-    // bring phi into 0..pi
-    m_lt0gui.m_phiSlider->setValue(light.m_Phi < 0 ? light.m_Phi + PI_F : light.m_Phi);
-    m_lt0gui.m_sizeSlider->setValue(light.m_Width);
-    m_lt0gui.m_distSlider->setValue(light.m_Distance);
-    // split color into color and intensity.
-    QColor c;
-    float i;
-    normalizeColorForGui(light.m_Color, c, i);
-    m_lt0gui.m_intensitySlider->setValue(i * light.m_ColorIntensity);
-    m_lt0gui.m_areaLightColorButton->SetColor(c);
+    m_arealightObject->updatePropsFromSceneLight();
   });
 
-  normalizeColorForGui(scene->SphereLight().m_ColorTop, c, i);
-  m_lt1gui.m_stintensitySlider->setValue(i * scene->SphereLight().m_ColorTopIntensity);
-  m_lt1gui.m_stColorButton->SetColor(c);
-  normalizeColorForGui(scene->SphereLight().m_ColorMiddle, c, i);
-  m_lt1gui.m_smintensitySlider->setValue(i * scene->SphereLight().m_ColorMiddleIntensity);
-  m_lt1gui.m_smColorButton->SetColor(c);
-  normalizeColorForGui(scene->SphereLight().m_ColorBottom, c, i);
-  m_lt1gui.m_sbintensitySlider->setValue(i * scene->SphereLight().m_ColorBottomIntensity);
-  m_lt1gui.m_sbColorButton->SetColor(c);
+  m_skylightObject->updatePropsFromSceneLight();
 }
 
 void

agave_app/AppearanceSettingsWidget.h

@@ -12,6 +12,8 @@
 
 #include <memory>
 
+class AreaLightObject;
+class SkyLightObject;
 class QRenderSettings;
 class ImageXYZC;
 class RangeWidget;
@@ -35,6 +37,8 @@ class QAppearanceSettingsWidget : public QGroupBox
   QAppearanceSettingsWidget(QWidget* pParent = NULL,
                             QRenderSettings* qrs = nullptr,
                             RenderSettings* rs = nullptr,
+                            AreaLightObject* alo = nullptr,
+                            SkyLightObject* slo = nullptr,
                             QAction* pToggleRotateAction = nullptr,
                             QAction* pToggleTranslateAction = nullptr);
 
@@ -89,6 +93,8 @@ public slots:
   QFormLayout m_MainLayout;
 
   QRenderSettings* m_qrendersettings;
+  AreaLightObject* m_arealightObject;
+  SkyLightObject* m_skylightObject;
 
   Section* m_clipRoiSection;
   RangeWidget* m_roiX;
@@ -121,8 +127,9 @@ public slots:
     QNumericSlider* m_phiSlider;
     QNumericSlider* m_sizeSlider;
     QNumericSlider* m_distSlider;
-    QNumericSlider* m_intensitySlider;
-    QColorPushButton* m_areaLightColorButton;
+    // QNumericSlider* m_intensitySlider;
+    // QColorPushButton* m_areaLightColorButton;
+    QColorWithIntensity* m_areaLightColor;
   } m_lt0gui;
 
   struct lt1