Merge pull request #4852 from blackwarthog/feature08b_assistants

Krita-Like Assistant Tool Alternative
opentoonz · Jun 13, 2023 · acb064f · acb064f
2 parents c3f51a9 + 145ef44
commit acb064f
Show file tree

Hide file tree

Showing 143 changed files with 10,424 additions and 819 deletions.
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qss
@@ -1794,6 +1794,7 @@ SchematicViewer {
   qproperty-FxColumnColor: #5e5645;
   qproperty-PaletteColumnColor: #42756e;
   qproperty-MeshColumnColor: #594d75;
+  qproperty-MetaColumnColor: #8c8c8c;
   qproperty-ReferenceColumnColor: #4d5052;
   qproperty-TableColor: #62628c;
   qproperty-ActiveCameraColor: #4073a3;
@@ -2343,6 +2344,9 @@ XsheetViewer {
   qproperty-MeshColumnColor: #594d75;
   qproperty-MeshColumnBorderColor: #423956;
   qproperty-SelectedMeshColumnColor: #656692;
+  qproperty-MetaColumnColor: #8c8c8c;
+  qproperty-MetaColumnBorderColor: #c8c8c8;
+  qproperty-SelectedMetaColumnColor: #a6a6a6;
   qproperty-SoundTextColumnColor: #a7a7a7;
   qproperty-SoundTextColumnBorderColor: #8e8e8e;
   qproperty-SelectedSoundTextColumnColor: #adb9c0;

diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qss
@@ -1794,6 +1794,7 @@ SchematicViewer {
   qproperty-FxColumnColor: #5e5645;
   qproperty-PaletteColumnColor: #42756e;
   qproperty-MeshColumnColor: #594d75;
+  qproperty-MetaColumnColor: #8c8c8c;
   qproperty-ReferenceColumnColor: #3d3d3d;
   qproperty-TableColor: #62628c;
   qproperty-ActiveCameraColor: #4073a3;
@@ -2343,6 +2344,9 @@ XsheetViewer {
   qproperty-MeshColumnColor: #594d75;
   qproperty-MeshColumnBorderColor: #423956;
   qproperty-SelectedMeshColumnColor: #656692;
+  qproperty-MetaColumnColor: #8c8c8c;
+  qproperty-MetaColumnBorderColor: #c8c8c8;
+  qproperty-SelectedMetaColumnColor: #a6a6a6;
   qproperty-SoundTextColumnColor: #a7a7a7;
   qproperty-SoundTextColumnBorderColor: #8e8e8e;
   qproperty-SelectedSoundTextColumnColor: #adb9c0;

diff --git a/stuff/config/qss/Default/Default.qss b/stuff/config/qss/Default/Default.qss
@@ -1794,6 +1794,7 @@ SchematicViewer {
   qproperty-FxColumnColor: #5e5645;
   qproperty-PaletteColumnColor: #42756e;
   qproperty-MeshColumnColor: #594d75;
+  qproperty-MetaColumnColor: #8c8c8c;
   qproperty-ReferenceColumnColor: #555555;
   qproperty-TableColor: #62628c;
   qproperty-ActiveCameraColor: #4073a3;
@@ -2343,6 +2344,9 @@ XsheetViewer {
   qproperty-MeshColumnColor: #594d75;
   qproperty-MeshColumnBorderColor: #423956;
   qproperty-SelectedMeshColumnColor: #656692;
+  qproperty-MetaColumnColor: #8c8c8c;
+  qproperty-MetaColumnBorderColor: #c8c8c8;
+  qproperty-SelectedMetaColumnColor: #a6a6a6;
   qproperty-SoundTextColumnColor: #a7a7a7;
   qproperty-SoundTextColumnBorderColor: #8e8e8e;
   qproperty-SelectedSoundTextColumnColor: #adb9c0;

diff --git a/stuff/config/qss/Default/less/Default.less b/stuff/config/qss/Default/less/Default.less
@@ -454,6 +454,7 @@
 @xsheet-ReferenceColumn-color:              lighten(@bg, 5);
 @xsheet-PaletteColumn-color:                #42756e;
 @xsheet-MeshColumn-color:                   #594d75;
+@xsheet-MetaColumn-color:                   #8c8c8c;
 @xsheet-SoundTextColumn-color:              #a7a7a7;
 @xsheet-SoundColumn-color:                  #578a8a;
 @xsheet-SoundColumnHL-color:                #34FE5E;

diff --git a/stuff/config/qss/Default/less/layouts/schematic.less b/stuff/config/qss/Default/less/layouts/schematic.less
@@ -13,6 +13,7 @@ SchematicViewer {
   qproperty-FxColumnColor: @xsheet-FxColumn-color;
   qproperty-PaletteColumnColor: @xsheet-PaletteColumn-color;
   qproperty-MeshColumnColor: @xsheet-MeshColumn-color;
+  qproperty-MetaColumnColor: @xsheet-MetaColumn-color;
   qproperty-ReferenceColumnColor: @xsheet-ReferenceColumn-color;
 
   qproperty-TableColor: saturate(lighten(@schematic-TableColor, @nodeLightness), @nodeSaturation);

diff --git a/stuff/config/qss/Default/less/layouts/xsheet.less b/stuff/config/qss/Default/less/layouts/xsheet.less
@@ -134,6 +134,10 @@ XsheetViewer {
   qproperty-MeshColumnBorderColor: desaturate(darken(@xsheet-MeshColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
   qproperty-SelectedMeshColumnColor: mix(shade(@xsheet-MeshColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
 
+  qproperty-MetaColumnColor: @xsheet-MetaColumn-color;
+  qproperty-MetaColumnBorderColor: desaturate(darken(@xsheet-MetaColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
+  qproperty-SelectedMetaColumnColor: mix(shade(@xsheet-MetaColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
+
   qproperty-SoundTextColumnColor: @xsheet-SoundTextColumn-color;
   qproperty-SoundTextColumnBorderColor: desaturate(darken(@xsheet-SoundTextColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
   qproperty-SelectedSoundTextColumnColor: mix(shade(@xsheet-SoundTextColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
@@ -143,7 +147,7 @@ XsheetViewer {
   qproperty-SelectedSoundColumnColor: mix(shade(@xsheet-SoundColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
   qproperty-SoundColumnHlColor: @xsheet-SoundColumnHL-color;
   qproperty-SoundColumnTrackColor: @xsheet-SoundColumnTrack-color;
-
+  
   qproperty-ActiveCameraColor: @xsheet-ActiveCamera-color;
   qproperty-SelectedActiveCameraColor: mix(shade(@xsheet-ActiveCamera-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
   qproperty-OtherCameraColor: @xsheet-OtherCamera-color;

diff --git a/stuff/config/qss/Default/less/themes/Light.less b/stuff/config/qss/Default/less/themes/Light.less
@@ -206,6 +206,7 @@
 @xsheet-ReferenceColumn-color:              #c2c2c2;
 @xsheet-PaletteColumn-color:                #a9d4ca;
 @xsheet-MeshColumn-color:                   #b8a2cf;
+@xsheet-MetaColumn-color:                   #a8a8a8;
 @xsheet-SoundColumn-color:                  #aad6d6;
 @xsheet-SoundTextColumn-color:              #c2c2c2;
 @xsheet-ActiveCamera-color:                 #b7dbfc;

diff --git a/stuff/config/qss/Default/less/themes/Neutral.less b/stuff/config/qss/Default/less/themes/Neutral.less
@@ -230,6 +230,7 @@
 @xsheet-ReferenceColumn-color:              #959595;
 @xsheet-PaletteColumn-color:                #599586;
 @xsheet-MeshColumn-color:                   #8b73a7;
+@xsheet-MetaColumnColor:                    #8c8c8c;
 @xsheet-SoundColumn-color:                  #749e9e;
 @xsheet-SoundColumnHL-color:                #f5ffe6;
 @xsheet-SoundColumnTrack-color:             rgba(0,0,0,0.8);

diff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qss
@@ -1794,6 +1794,7 @@ SchematicViewer {
   qproperty-FxColumnColor: #ceb694;
   qproperty-PaletteColumnColor: #a9d4ca;
   qproperty-MeshColumnColor: #b8a2cf;
+  qproperty-MetaColumnColor: #a8a8a8;
   qproperty-ReferenceColumnColor: #c2c2c2;
   qproperty-TableColor: #cbcbe4;
   qproperty-ActiveCameraColor: #b7dbfc;
@@ -2343,6 +2344,9 @@ XsheetViewer {
   qproperty-MeshColumnColor: #b8a2cf;
   qproperty-MeshColumnBorderColor: #9278ac;
   qproperty-SelectedMeshColumnColor: #a49dc2;
+  qproperty-MetaColumnColor: #a8a8a8;
+  qproperty-MetaColumnBorderColor: #686868;
+  qproperty-SelectedMetaColumnColor: #c2c2c2;
   qproperty-SoundTextColumnColor: #c2c2c2;
   qproperty-SoundTextColumnBorderColor: #9c9c9c;
   qproperty-SelectedSoundTextColumnColor: #abb3b9;

diff --git a/stuff/config/qss/Neutral/Neutral.qss b/stuff/config/qss/Neutral/Neutral.qss
@@ -1794,6 +1794,7 @@ SchematicViewer {
   qproperty-FxColumnColor: #928562;
   qproperty-PaletteColumnColor: #599586;
   qproperty-MeshColumnColor: #8b73a7;
+  qproperty-MetaColumnColor: #8c8c8c;
   qproperty-ReferenceColumnColor: #959595;
   qproperty-TableColor: #a4a4bf;
   qproperty-ActiveCameraColor: #6491be;
@@ -2343,6 +2344,9 @@ XsheetViewer {
   qproperty-MeshColumnColor: #8b73a7;
   qproperty-MeshColumnBorderColor: #654f7e;
   qproperty-SelectedMeshColumnColor: #a18fc3;
+  qproperty-MetaColumnColor: #8c8c8c;
+  qproperty-MetaColumnBorderColor: #c8c8c8;
+  qproperty-SelectedMetaColumnColor: #a6a6a6;
   qproperty-SoundTextColumnColor: #a7a7a7;
   qproperty-SoundTextColumnBorderColor: #818181;
   qproperty-SelectedSoundTextColumnColor: #bbbfc3;

diff --git a/toonz/sources/common/tcolor/tpixel.cpp b/toonz/sources/common/tcolor/tpixel.cpp
@@ -14,6 +14,8 @@ const TPixelRGBM32 TPixelRGBM32::Blue(0, 0, maxChannelValue);
 const TPixelRGBM32 TPixelRGBM32::Yellow(maxChannelValue, maxChannelValue, 0);
 const TPixelRGBM32 TPixelRGBM32::Cyan(0, maxChannelValue, maxChannelValue);
 const TPixelRGBM32 TPixelRGBM32::Magenta(maxChannelValue, 0, maxChannelValue);
+const TPixelRGBM32 TPixelRGBM32::Gray(maxChannelValue/2, maxChannelValue/2,
+                                      maxChannelValue/2);
 const TPixelRGBM32 TPixelRGBM32::White(maxChannelValue, maxChannelValue,
                                        maxChannelValue);
 const TPixelRGBM32 TPixelRGBM32::Black(0, 0, 0);
@@ -26,6 +28,8 @@ const TPixelRGBM64 TPixelRGBM64::Blue(0, 0, maxChannelValue);
 const TPixelRGBM64 TPixelRGBM64::Yellow(maxChannelValue, maxChannelValue, 0);
 const TPixelRGBM64 TPixelRGBM64::Cyan(0, maxChannelValue, maxChannelValue);
 const TPixelRGBM64 TPixelRGBM64::Magenta(maxChannelValue, 0, maxChannelValue);
+const TPixelRGBM64 TPixelRGBM64::Gray(maxChannelValue/2, maxChannelValue/2,
+                                      maxChannelValue/2);
 const TPixelRGBM64 TPixelRGBM64::White(maxChannelValue, maxChannelValue,
                                        maxChannelValue);
 const TPixelRGBM64 TPixelRGBM64::Black(0, 0, 0);
@@ -37,6 +41,7 @@ const TPixelD TPixelD::Blue(0, 0, 1);
 const TPixelD TPixelD::Yellow(1, 1, 0);
 const TPixelD TPixelD::Cyan(0, 1, 1);
 const TPixelD TPixelD::Magenta(1, 0, 1);
+const TPixelD TPixelD::Gray(0.5, 0.5, 0.5);
 const TPixelD TPixelD::White(1, 1, 1);
 const TPixelD TPixelD::Black(0, 0, 0);
 const TPixelD TPixelD::Transparent(0, 0, 0, 0);