#assistants: pressure

Author: blackwarthog

toonz/sources/tnztools/fullcolorbrushtool.cpp

@@ -413,8 +413,16 @@ void FullColorBrushTool::paintTrackPoint(const TTrackPoint &point,
   TrackHandler *handler;
   if (track.size() == track.pointsAdded && !track.toolHandler && m_workRaster) {
     mypaint::Brush mypaintBrush;
-    applyToonzBrushSettings(mypaintBrush);
-    handler = new TrackHandler(m_workRaster, *this, mypaintBrush);
+    bool mypaintStyle = applyToonzBrushSettings(mypaintBrush);
+    double overridePressure = -1.0;
+    if (!m_enabledPressure && mypaintStyle) 
+      overridePressure = 0.5;
+    if (!m_enabledPressure && !mypaintStyle)
+      overridePressure = 1.0;
+    if (!track.hasPressure && !mypaintStyle)
+      overridePressure = 1.0;
+
+    handler = new TrackHandler(m_workRaster, *this, mypaintBrush, overridePressure);
     handler->brush.beginStroke();
     track.toolHandler = handler;
   }
@@ -424,7 +432,8 @@ void FullColorBrushTool::paintTrackPoint(const TTrackPoint &point,
   // paint stroke
   m_strokeSegmentRect.empty();
   handler->brush.strokeTo(point.position + rasCenter,
-                          m_enabledPressure ? point.pressure : 0.5, point.tilt,
+                          handler->overridePressure >= 0.0 ? handler->overridePressure : point.pressure,
+                          point.tilt,
                           point.time - track.previous().time);
   if (track.pointsAdded == 1 && track.finished()) handler->brush.endStroke();
 
@@ -836,7 +845,7 @@ void FullColorBrushTool::applyClassicToonzBrushSettings(
   }
 }
 
-void FullColorBrushTool::applyToonzBrushSettings(mypaint::Brush &mypaintBrush) {
+bool FullColorBrushTool::applyToonzBrushSettings(mypaint::Brush &mypaintBrush) {
   TMyPaintBrushStyle *mypaintStyle = getBrushStyle();
 
   if (mypaintStyle) {
@@ -874,9 +883,12 @@ void FullColorBrushTool::applyToonzBrushSettings(mypaint::Brush &mypaintBrush) {
       // lock-alpha already disables eraser
       mypaintBrush.setBaseValue(MYPAINT_BRUSH_SETTING_LOCK_ALPHA, 1.0);
     }
-  } else {
-    applyClassicToonzBrushSettings(mypaintBrush);
+    
+    return true;
   }
+
+  applyClassicToonzBrushSettings(mypaintBrush);
+  return false;
 }
 
 //==========================================================================================================

toonz/sources/tnztools/fullcolorbrushtool.h

@@ -34,16 +34,17 @@ class FullColorBrushTool final : public TTool, public RasterController {
   class TrackHandler : public TTrackToolHandler {
   public:
     MyPaintToonzBrush brush;
+    double overridePressure;
 
     TrackHandler(const TRaster32P &ras, RasterController &controller,
-                 const mypaint::Brush &brush)
-        : brush(ras, controller, brush) {}
+                 const mypaint::Brush &brush, double overridePressure = -1.0)
+        : brush(ras, controller, brush), overridePressure(overridePressure) {}
   };
 
 private:
   void updateCurrentStyle();
   void applyClassicToonzBrushSettings(mypaint::Brush &mypaintBrush);
-  void applyToonzBrushSettings(mypaint::Brush &mypaintBrush);
+  bool applyToonzBrushSettings(mypaint::Brush &mypaintBrush);
 
 public:
   FullColorBrushTool(std::string name);