Merge pull request #1471 from manongjohn/onionskin_opacity_control

Onion Skin Opacity control
tahoma2d · May 19, 2024 · 59c100c · 59c100c
2 parents 4de0457 + 8bf7d37
commit 59c100c
Show file tree

Hide file tree

Showing 10 changed files with 464 additions and 58 deletions.
diff --git a/toonz/sources/include/toonz/onionskinmask.h b/toonz/sources/include/toonz/onionskinmask.h
@@ -62,21 +62,26 @@ class DVAPI OnionSkinMask {
 
   int getMos(int index) const {
     assert(0 <= index && index < (int)m_mos.size());
-    return m_mos[index];
+    return m_mos[index].first;
   }
 
   int getFos(int index) const {
     assert(0 <= index && index < (int)m_fos.size());
-    return m_fos[index];
+    return m_fos[index].first;
   }
 
   void setMos(int drow, bool on);  //!< Sets a Mobile OS frame shifted by drow
                                    //! around current xsheet frame
   void setFos(int row,
               bool on);  //!< Sets a Fixed OS frame to the specified xsheet row
 
-  bool isMos(int drow) const;
-  bool isFos(int row) const;
+  void setMosOpacity(int drow, double opacity);
+  double getMosOpacity(int drow);
+  void setFosOpacity(int row, double opacity);
+  double getFosOpacity(int row);
+
+  bool isMos(int drow);
+  bool isFos(int row);
 
   bool getMosRange(int &drow0, int &drow1) const;
 
@@ -146,7 +151,8 @@ since underlying onion-skinned drawings must be visible.
   void clearGhostFlipKey() { m_ghostFlipKeys.clear(); }
 
 private:
-  std::vector<int> m_fos, m_mos;  //!< Fixed and Mobile Onion Skin indices
+  std::vector<std::pair<int, double>> m_fos,
+      m_mos;                      //!< Fixed and Mobile Onion Skin indices and opacity
   bool m_enabled;                 //!< Whether onion skin is enabled
   bool m_wholeScene;              //!< Whether the OS works on the entire scene
   bool m_everyFrame;              //!< Whether the OS renders every frame or only on new exposures.

diff --git a/toonz/sources/include/toonz/stageplayer.h b/toonz/sources/include/toonz/stageplayer.h
@@ -76,6 +76,7 @@ class DVAPI Player {
 
   int m_onionSkinDistance;  //!< Temporal distance from an onion skin
                             //!'companion' (supposedly)
+  double m_fade;            //! Onion skin opacity to use. -1 = autocalculated
 
   int m_ancestorColumnIndex;  //!< Index of this object's hierarchycal root
                               //!(top-most column)

diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp
@@ -2474,6 +2474,7 @@ void SceneViewer::drawSceneOverlay() {
   player.m_guidedBackStroke       = -1;
   player.m_isVisibleinOSM         = false;
   player.m_onionSkinDistance      = c_noOnionSkin;
+  player.m_fade                   = -1.0;
   player.m_dpiAff                 = getDpiAffine(sl, frameId);
   player.m_ancestorColumnIndex    = -1;
   player.m_opacity                = scene->getOverlayOpacity();

diff --git a/toonz/sources/toonz/xshcolumnviewer.cpp b/toonz/sources/toonz/xshcolumnviewer.cpp
@@ -2683,6 +2683,7 @@ void ColumnTransparencyPopup::onSliderChange(int val) {
   m_value->setText(QString::number(val));
   connect(m_value, SIGNAL(textChanged(const QString &)), this,
           SLOT(onValueChanged(const QString &)));
+  onSliderReleased();
 }
 
 //----------------------------------------------------------------