OpenToonz - An open-source full-featured 2D animation creation software
C
Fix brush size sale in geometric and brush tool for vector level
Abel You6fbf51917729
diff --git a/toonz/sources/tnztools/geometrictool.cpp b/toonz/sources/tnztools/geometrictool.cppindex cb6f23cef..1103ac6cf 100644--- a/toonz/sources/tnztools/geometrictool.cpp+++ b/toonz/sources/tnztools/geometrictool.cpp@@ -36,6 +36,11 @@#include "toonz/mypaintbrushstyle.h"#include "toonz/ttilesaver.h"+#include "toonz/tscenehandle.h"+#include "toonz/toonzscene.h"+#include "toonz/tcamera.h"+#include "toonz/stage.h"+// For Qt translation support#include <QCoreApplication>@@ -620,7 +625,8 @@ public:return thick;}else- return m_param->m_toolSize.getValue() * 0.5;+ return m_param->m_toolSize.getValue() * 0.5 * Stage::inch /+ m_tool->getApplication()->getCurrentScene()->getScene()->getCurrentCamera()->getDpi().x;}void setIsPrompting(bool value) { m_isPrompting = value; }diff --git a/toonz/sources/tnztools/toonzvectorbrushtool.cpp b/toonz/sources/tnztools/toonzvectorbrushtool.cppindex 5f5ad33d5..c7fe06084 100644--- a/toonz/sources/tnztools/toonzvectorbrushtool.cpp+++ b/toonz/sources/tnztools/toonzvectorbrushtool.cpp@@ -30,6 +30,9 @@#include "toonz/stage2.h"#include "toonz/preferences.h"#include "toonz/tonionskinmaskhandle.h"+#include "toonz/tscenehandle.h"+#include "toonz/toonzscene.h"+#include "toonz/tcamera.h"// TnzCore includes#include "tstream.h"@@ -507,12 +510,12 @@ void addStrokeToImage(TTool::Application *application, const TVectorImageP &vi,double computeThickness(double pressure, const TDoublePairProperty &property,bool enablePressure, bool isPath ) {if (isPath) return 0.0;- if (!enablePressure) return property.getValue().second * 0.2;+ if (!enablePressure) return property.getValue().second * 0.5;double t = pressure * pressure * pressure;double thick0 = property.getValue().first;double thick1 = property.getValue().second;if (thick1 < 0.0001) thick0 = thick1 = 0.0;- return (thick0 + (thick1 - thick0) * t) * 0.2;+ return (thick0 + (thick1 - thick0) * t) * 0.5;}} // namespace@@ -1069,7 +1072,7 @@ void ToonzVectorBrushTool::inputPaintTracks(const TTrackList &tracks) {while(track.pointsAdded) {const TTrackPoint &p = track.current();double t = computeThickness(p.pressure, m_thickness, m_pressure.getValue(), m_isPath);- gen.add(TThickPoint(p.position, t), 0);+ gen.add(TThickPoint(p.position, t * Stage::inch / m_cameraDpi), 0);--track.pointsAdded;}@@ -1101,6 +1104,7 @@ void ToonzVectorBrushTool::inputPaintTracks(const TTrackList &tracks) {void ToonzVectorBrushTool::updateModifiers() {m_pixelSize = getPixelSize();+ m_cameraDpi = getApplication()->getCurrentScene()->getScene()->getCurrentCamera()->getDpi().x;int smoothRadius = (int)round(m_smooth.getValue());m_modifierAssistants->magnetism = m_assistants.getValue() ? 1 : 0;m_modifierSegmentation->setStep(TPointD(m_pixelSize, m_pixelSize));@@ -1587,8 +1591,8 @@ void ToonzVectorBrushTool::draw() {elseglColor3d(1.0, 0.0, 0.0);- tglDrawCircle(m_brushPos, 0.5 * m_minThick);- tglDrawCircle(m_brushPos, 0.5 * m_maxThick);+ tglDrawCircle(m_brushPos, 0.5 * m_minThick * Stage::inch / m_cameraDpi);+ tglDrawCircle(m_brushPos, 0.5 * m_maxThick * Stage::inch / m_cameraDpi);}//--------------------------------------------------------------------------------------------------------------diff --git a/toonz/sources/tnztools/toonzvectorbrushtool.h b/toonz/sources/tnztools/toonzvectorbrushtool.hindex 26b318ccf..4202b3bef 100644--- a/toonz/sources/tnztools/toonzvectorbrushtool.h+++ b/toonz/sources/tnztools/toonzvectorbrushtool.h@@ -233,6 +233,7 @@ protected:m_presetsLoaded, m_firstFrameRange;bool m_propertyUpdating;+ double m_cameraDpi;};#endif // TOONZVECTORBRUSHTOOL_H