Log scaling for better vol control

gui/GraphEditorWidget.cpp

@@ -48,9 +48,20 @@
 #include <QVBoxLayout>
 
 #include <algorithm>
+#include <cmath>
 #include <unordered_map>
 #include <unordered_set>
 
+namespace {
+inline float sliderToVolume(int slider) {
+  float x = static_cast<float>(slider) / 100.0f;
+  return x * x * x;
+}
+inline int volumeToSlider(float volume) {
+  return static_cast<int>(std::round(std::cbrt(volume) * 100.0f));
+}
+}
+
 class DeleteVirtualNodeCommand : public QUndoCommand {
 public:
   struct Snapshot {
@@ -1192,7 +1203,7 @@ void GraphEditorWidget::wireVolumeWidget(QtNodes::NodeId nodeId) {
   connect(vol, &NodeVolumeWidget::volumeChanged, this,
           [this, capturedId](int value) {
             auto state = m_model->nodeVolumeState(capturedId);
-            state.volume = static_cast<float>(value) / 100.0f;
+            state.volume = sliderToVolume(value);
             m_model->setNodeVolumeState(capturedId, state);
           });
 
@@ -1268,7 +1279,7 @@ void GraphEditorWidget::rebuildMixerStrips() {
     auto *slider = new ClickSlider(Qt::Horizontal);
     slider->setRange(0, 100);
     auto state = m_model->nodeVolumeState(nodeId);
-    slider->setValue(static_cast<int>(state.volume * 100.0f));
+    slider->setValue(volumeToSlider(state.volume));
     slider->setStyleSheet(QStringLiteral(
         "QSlider::groove:horizontal {"
         "  background: #1a1a1e; border-radius: 3px; height: 6px; }"
@@ -1301,7 +1312,7 @@ void GraphEditorWidget::rebuildMixerStrips() {
     connect(slider, &QSlider::valueChanged, this,
             [this, capturedId](int value) {
               auto s = m_model->nodeVolumeState(capturedId);
-              s.volume = static_cast<float>(value) / 100.0f;
+              s.volume = sliderToVolume(value);
               m_model->setNodeVolumeState(capturedId, s);
             });
 
@@ -1330,7 +1341,7 @@ void GraphEditorWidget::rebuildMixerStrips() {
                 return;
               QSignalBlocker sb(slider);
               QSignalBlocker mb(muteBtn);
-              slider->setValue(static_cast<int>(cur.volume * 100.0f));
+              slider->setValue(volumeToSlider(cur.volume));
               muteBtn->setChecked(cur.mute);
             });
 

gui/WarpGraphModel.cpp

@@ -13,6 +13,14 @@
 #include <QtNodes/NodeStyle>
 #include <QtNodes/StyleCollection>
 
+#include <cmath>
+
+namespace {
+inline int volumeToSlider(float volume) {
+  return static_cast<int>(std::round(std::cbrt(volume) * 100.0f));
+}
+}
+
 #include <algorithm>
 #include <cmath>
 
@@ -633,7 +641,7 @@ void WarpGraphModel::refreshFromClient() {
 
     float vol = volResult.value.volume;
     bool mute = volResult.value.mute;
-    int sliderVal = static_cast<int>(std::round(vol * 100.0f));
+    int sliderVal = volumeToSlider(vol);
     sliderVal = std::clamp(sliderVal, 0, 150);
 
     auto stateIt = m_volumeStates.find(qtId);
@@ -820,7 +828,7 @@ void WarpGraphModel::setNodeVolumeState(QtNodes::NodeId nodeId,
   if (wIt != m_volumeWidgets.end()) {
     auto *w = qobject_cast<NodeVolumeWidget *>(wIt->second);
     if (w) {
-      w->setVolume(static_cast<int>(state.volume * 100.0f));
+      w->setVolume(volumeToSlider(state.volume));
       w->setMuted(state.mute);
     }
   }