razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Add brush snap to Grid toolbar option

Browse source
This commit is contained in:
manongjohn 2021-11-03 23:46:49 -04:00
parent ee8fc57567
commit fa61b14844
7 changed files with 424 additions and 366 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
toonz/sources/tnztools/fullcolorbrushtool.cpp
View file

@ -60,6 +60,7 @@ TEnv::DoubleVar FullcolorModifierOpacity("FullcolorModifierOpacity", 100);
TEnv::IntVar FullcolorModifierEraser("FullcolorModifierEraser", 0);
TEnv::IntVar FullcolorModifierLockAlpha("FullcolorModifierLockAlpha", 0);
TEnv::StringVar FullcolorBrushPreset("FullcolorBrushPreset", "<custom>");
TEnv::IntVar FullcolorBrushSnapGrid("FullcolorBrushSnapGrid", 0);
//----------------------------------------------------------------------------------
@ -135,7 +136,8 @@ FullColorBrushTool::FullColorBrushTool(std::string name)
, m_tileSaver(0)
, m_notifier(0)
, m_presetsLoaded(false)
, m_firstTime(true) {
, m_firstTime(true)
, m_snapGrid("Grid", false) {
bind(TTool::RasterImage | TTool::EmptyTarget);
m_thickness.setNonLinearSlider();
@ -148,12 +150,14 @@ FullColorBrushTool::FullColorBrushTool(std::string name)
m_prop.bind(m_modifierEraser);
m_prop.bind(m_modifierLockAlpha);
m_prop.bind(m_pressure);
m_prop.bind(m_snapGrid);
m_prop.bind(m_preset);
m_preset.setId("BrushPreset");
m_modifierEraser.setId("RasterEraser");
m_modifierLockAlpha.setId("LockAlpha");
m_pressure.setId("PressureSensitivity");
m_snapGrid.setId("SnapGrid");
m_brushTimer.start();
}
@ -192,6 +196,7 @@ void FullColorBrushTool::updateTranslation() {
m_modifierOpacity.setQStringName(tr("Opacity"));
m_modifierEraser.setQStringName(tr("Eraser"));
m_modifierLockAlpha.setQStringName(tr("Lock Alpha"));
m_snapGrid.setQStringName(tr("Grid"));
}
//---------------------------------------------------------------------------------------------------
@ -336,12 +341,16 @@ void FullColorBrushTool::leftButtonDown(const TPointD &pos,
}
if (e.isAltPressed()) {
m_snapAssistant = true;
m_isStraight = true;
m_firstPoint = pos;
m_lastPoint = pos;
}
if (m_snapGrid.getValue()) {
m_firstPoint = pos;
m_lastPoint = pos;
}
/* update color here since the current style might be switched with numpad
* shortcut keys */
updateCurrentStyle();
@ -384,6 +393,7 @@ void FullColorBrushTool::leftButtonDown(const TPointD &pos,
invalidateRect +=
TRectD(previousBrushPos - thickOffset, previousBrushPos + thickOffset);
invalidate(invalidateRect.enlarge(2.0));
m_perspectiveIndex = -1;
}
//-------------------------------------------------------------------------------------------------------------
@ -391,16 +401,27 @@ void FullColorBrushTool::leftButtonDown(const TPointD &pos,
void FullColorBrushTool::leftButtonDrag(const TPointD &pos,
const TMouseEvent &e) {
TRectD invalidateRect;
if (m_isStraight) {
invalidateRect = TRectD(m_firstPoint, m_lastPoint).enlarge(2);
m_lastPoint = pos;
if (e.isAltPressed()) {
TPointD usePos = pos;
if (e.isAltPressed() || m_snapGrid.getValue()) {
double distance = (m_brushPos.x - m_maxCursorThick + 1) * 0.5;
TRectD brushRect =
TRectD(TPointD(m_brushPos.x - distance, m_brushPos.y - distance),
TPointD(m_brushPos.x + distance, m_brushPos.y + distance));
invalidateRect += (brushRect);
PerspectiveTool *perspectiveTool = dynamic_cast<PerspectiveTool *>(
TTool::getTool("T_PerspectiveGrid", TTool::RasterImage));
std::vector<PerspectiveObject *> perspectiveObjs =
perspectiveTool->getPerspectiveObjects();
TPointD pointToUse = TPointD(0.0, 0.0);
TPointD dpiScale = getViewer()->getDpiScale();
TPointD refPoint = m_firstPoint;
refPoint.x *= dpiScale.x;
refPoint.y *= dpiScale.y;
if (e.isAltPressed() || m_perspectiveIndex < 0) {
// let's get info about our current location
double denominator = m_lastPoint.x - m_firstPoint.x;
double numerator = m_lastPoint.y - m_firstPoint.y;
@ -415,18 +436,6 @@ void FullColorBrushTool::leftButtonDrag(const TPointD &pos,
// now let's get the angle of each of the assistant points
std::vector<double> anglesToAssistants;
TPointD pointToUse = TPointD(0.0, 0.0);
PerspectiveTool *perspectiveTool = dynamic_cast<PerspectiveTool *>(
TTool::getTool("T_PerspectiveGrid", TTool::RasterImage));
if (perspectiveTool) {
TPointD dpiScale = getViewer()->getDpiScale();
TPointD refPoint = m_firstPoint;
refPoint.x *= dpiScale.x;
refPoint.y *= dpiScale.y;
std::vector<PerspectiveObject *> perspectiveObjs =
perspectiveTool->getPerspectiveObjects();
for (auto data : perspectiveObjs) {
TPointD point = data->getReferencePoint(refPoint);
point.x /= dpiScale.x;
@ -450,14 +459,19 @@ void FullColorBrushTool::leftButtonDrag(const TPointD &pos,
for (int i = 0; i < anglesToAssistants.size(); i++) {
double newDifference = abs(angle - anglesToAssistants.at(i));
if (newDifference < difference ||
(180 - newDifference) < difference) {
if (newDifference < difference || (180 - newDifference) < difference) {
difference = std::min(newDifference, (180 - newDifference));
pointToUse = perspectiveObjs.at(i)->getReferencePoint(refPoint);
pointToUse.x /= dpiScale.x;
pointToUse.y /= dpiScale.y;
m_perspectiveIndex = i;
}
}
} else {
pointToUse =
perspectiveObjs.at(m_perspectiveIndex)->getReferencePoint(refPoint);
pointToUse.x /= dpiScale.x;
pointToUse.y /= dpiScale.y;
}
double distanceFirstToLast =
@ -487,7 +501,7 @@ void FullColorBrushTool::leftButtonDrag(const TPointD &pos,
newY = ((1 - ratio) * m_firstPoint.y) + (ratio * pointToUse.y);
}
m_lastPoint = TPointD(newX, newY);
usePos = m_lastPoint = TPointD(newX, newY);
invalidateRect += TRectD(m_firstPoint, m_lastPoint).enlarge(2);
} else if (e.isCtrlPressed()) {
double distance = (m_brushPos.x - m_maxCursorThick + 1) * 0.5;
@ -549,6 +563,7 @@ void FullColorBrushTool::leftButtonDrag(const TPointD &pos,
// else
// m_oldPressure = m_enabledPressure ? e.m_pressure : 1.0;
if (m_isStraight) {
m_mousePos = pos;
m_brushPos = pos;
invalidate(invalidateRect);
@ -565,7 +580,7 @@ void FullColorBrushTool::leftButtonDrag(const TPointD &pos,
TRasterP ras = ri->getRaster();
TPointD rasCenter = ras->getCenterD();
TPointD point(pos + rasCenter);
TPointD point(usePos + rasCenter);
double pressure;
if (getApplication()->getCurrentLevelStyle()->getTagId() ==
4001) // mypaint brush case
@ -602,7 +617,7 @@ void FullColorBrushTool::leftButtonUp(const TPointD &pos,
TRasterP ras = ri->getRaster();
TPointD rasCenter = ras->getCenterD();
TPointD point;
if (e.isCtrlPressed() || m_snapAssistant || e.isAltPressed())
if (e.isCtrlPressed() || m_snapGrid.getValue() || e.isAltPressed())
point = TPointD(m_lastPoint + rasCenter);
else
point = TPointD(pos + rasCenter);
@ -655,8 +670,8 @@ void FullColorBrushTool::leftButtonUp(const TPointD &pos,
m_strokeRect.empty();
m_mousePressed = false;
m_isStraight = false;
m_snapAssistant = false;
m_oldPressure = -1.0;
m_perspectiveIndex = -1;
}
//---------------------------------------------------------------------------------------------------------------
@ -838,6 +853,7 @@ bool FullColorBrushTool::onPropertyChanged(std::string propertyName) {
FullcolorModifierOpacity = m_modifierOpacity.getValue();
FullcolorModifierEraser = m_modifierEraser.getValue() ? 1 : 0;
FullcolorModifierLockAlpha = m_modifierLockAlpha.getValue() ? 1 : 0;
FullcolorBrushSnapGrid = m_snapGrid.getValue() ? 1 : 0;
if (m_preset.getValue() != CUSTOM_WSTR) {
m_preset.setValue(CUSTOM_WSTR);
@ -952,6 +968,7 @@ void FullColorBrushTool::loadLastBrush() {
m_modifierOpacity.setValue(FullcolorModifierOpacity);
m_modifierEraser.setValue(FullcolorModifierEraser ? true : false);
m_modifierLockAlpha.setValue(FullcolorModifierLockAlpha ? true : false);
m_snapGrid.setValue(FullcolorBrushSnapGrid ? true : false);
}
//------------------------------------------------------------------

4
toonz/sources/tnztools/fullcolorbrushtool.h
View file

@ -95,6 +95,7 @@ protected:
TBoolProperty m_modifierEraser;
TBoolProperty m_modifierLockAlpha;
TEnumProperty m_preset;
TBoolProperty m_snapGrid;
TPixel32 m_currentColor;
bool m_enabledPressure;
@ -126,10 +127,11 @@ protected:
bool m_isStraight = false;
TPointD m_firstPoint;
TPointD m_lastPoint;
bool m_snapAssistant = false;
double m_oldPressure = -1.0;
bool m_propertyUpdating = false;
int m_perspectiveIndex = -1;
};
//------------------------------------------------------------

4
toonz/sources/tnztools/tooloptions.cpp
View file

@ -2114,7 +2114,7 @@ void BrushToolOptionsBox::filterControls() {
it != m_labels.end(); it++) {
bool isModifier = (it.key().substr(0, 8) == "Modifier");
bool isCommon = (it.key() == "Lock Alpha" || it.key() == "Pressure" ||
it.key() == "Preset:");
it.key() == "Preset:" || it.key() == "Grid");
bool visible = isCommon || (isModifier == showModifiers);
it.value()->setVisible(visible);
}
@ -2123,7 +2123,7 @@ void BrushToolOptionsBox::filterControls() {
it != m_controls.end(); it++) {
bool isModifier = (it.key().substr(0, 8) == "Modifier");
bool isCommon = (it.key() == "Lock Alpha" || it.key() == "Pressure" ||
it.key() == "Preset:");
it.key() == "Preset:" || it.key() == "Grid");
bool visible = isCommon || (isModifier == showModifiers);
if (QWidget *widget = dynamic_cast<QWidget *>(it.value()))
widget->setVisible(visible);

65
toonz/sources/tnztools/toonzrasterbrushtool.cpp
View file

@ -61,6 +61,7 @@ TEnv::DoubleVar RasterBrushHardness("RasterBrushHardness", 100);
TEnv::DoubleVar RasterBrushModifierSize("RasterBrushModifierSize", 0);
TEnv::StringVar RasterBrushPreset("RasterBrushPreset", "<custom>");
TEnv::IntVar BrushLockAlpha("InknpaintBrushLockAlpha", 0);
TEnv::IntVar BrushSnapGrid("InknpaintBrushSnapGrid", 0);
//-------------------------------------------------------------------
#define CUSTOM_WSTR L"<custom>"
@ -890,7 +891,8 @@ ToonzRasterBrushTool::ToonzRasterBrushTool(std::string name, int targetType)
, m_targetType(targetType)
, m_workingFrameId(TFrameId())
, m_notifier(0)
, m_modifierLockAlpha("Lock Alpha", false) {
, m_modifierLockAlpha("Lock Alpha", false)
, m_snapGrid("Grid", false) {
bind(targetType);
m_rasThickness.setNonLinearSlider();
@ -911,6 +913,9 @@ ToonzRasterBrushTool::ToonzRasterBrushTool(std::string name, int targetType)
m_prop[0].bind(m_pressure);
m_prop[0].bind(m_snapGrid);
m_snapGrid.setId("SnapGrid");
m_prop[0].bind(m_preset);
m_preset.setId("BrushPreset");
m_preset.addValue(CUSTOM_WSTR);
@ -1110,6 +1115,7 @@ void ToonzRasterBrushTool::updateTranslation() {
m_pencil.setQStringName(tr("Pencil"));
m_pressure.setQStringName(tr("Pressure"));
m_modifierLockAlpha.setQStringName(tr("Lock Alpha"));
m_snapGrid.setQStringName(tr("Grid"));
}
//---------------------------------------------------------------------------------------------------
@ -1301,12 +1307,16 @@ void ToonzRasterBrushTool::leftButtonDown(const TPointD &pos,
}
if (e.isAltPressed()) {
m_snapAssistant = true;
m_isStraight = true;
m_firstPoint = pos;
m_lastPoint = pos;
}
if (m_snapGrid.getValue()) {
m_firstPoint = pos;
m_lastPoint = pos;
}
// assert(0<=m_styleId && m_styleId<2);
TImageP img = getImage(true);
TToonzImageP ri(img);
@ -1442,6 +1452,7 @@ void ToonzRasterBrushTool::leftButtonDown(const TPointD &pos,
// updating m_brushPos is needed to refresh viewer properly
m_mousePos = pos;
m_brushPos = getCenteredCursorPos(pos);
m_perspectiveIndex = -1;
}
//-------------------------------------------------------------------------------------------------------------
@ -1455,16 +1466,27 @@ void ToonzRasterBrushTool::leftButtonDrag(const TPointD &pos,
}
TRectD invalidateRect;
if (m_isStraight) {
invalidateRect = TRectD(m_firstPoint, m_lastPoint).enlarge(2);
m_lastPoint = pos;
if (e.isAltPressed()) {
TPointD usePos = pos;
if (e.isAltPressed() || m_snapGrid.getValue()) {
double distance = (m_brushPos.x - m_maxCursorThick + 1) * 0.5;
TRectD brushRect =
TRectD(TPointD(m_brushPos.x - distance, m_brushPos.y - distance),
TPointD(m_brushPos.x + distance, m_brushPos.y + distance));
invalidateRect += (brushRect);
PerspectiveTool *perspectiveTool = dynamic_cast<PerspectiveTool *>(
TTool::getTool("T_PerspectiveGrid", TTool::ToonzImage));
std::vector<PerspectiveObject *> perspectiveObjs =
perspectiveTool->getPerspectiveObjects();
TPointD pointToUse = TPointD(0.0, 0.0);
TPointD dpiScale = getViewer()->getDpiScale();
TPointD refPoint = m_firstPoint;
refPoint.x *= dpiScale.x;
refPoint.y *= dpiScale.y;
if (e.isAltPressed() || m_perspectiveIndex < 0) {
// let's get info about our current location
double denominator = m_lastPoint.x - m_firstPoint.x;
double numerator = m_lastPoint.y - m_firstPoint.y;
@ -1479,18 +1501,7 @@ void ToonzRasterBrushTool::leftButtonDrag(const TPointD &pos,
// now let's get the angle of each of the assistant points
std::vector<double> anglesToAssistants;
TPointD pointToUse = TPointD(0.0, 0.0);
PerspectiveTool *perspectiveTool = dynamic_cast<PerspectiveTool *>(
TTool::getTool("T_PerspectiveGrid", TTool::ToonzImage));
if (perspectiveTool) {
TPointD dpiScale = getViewer()->getDpiScale();
TPointD refPoint = m_firstPoint;
refPoint.x *= dpiScale.x;
refPoint.y *= dpiScale.y;
std::vector<PerspectiveObject *> perspectiveObjs =
perspectiveTool->getPerspectiveObjects();
for (auto data : perspectiveObjs) {
TPointD point = data->getReferencePoint(refPoint);
point.x /= dpiScale.x;
@ -1514,14 +1525,19 @@ void ToonzRasterBrushTool::leftButtonDrag(const TPointD &pos,
for (int i = 0; i < anglesToAssistants.size(); i++) {
double newDifference = abs(angle - anglesToAssistants.at(i));
if (newDifference < difference ||
(180 - newDifference) < difference) {
if (newDifference < difference || (180 - newDifference) < difference) {
difference = std::min(newDifference, (180 - newDifference));
pointToUse = perspectiveObjs.at(i)->getReferencePoint(refPoint);
pointToUse.x /= dpiScale.x;
pointToUse.y /= dpiScale.y;
m_perspectiveIndex = i;
}
}
} else {
pointToUse =
perspectiveObjs.at(m_perspectiveIndex)->getReferencePoint(refPoint);
pointToUse.x /= dpiScale.x;
pointToUse.y /= dpiScale.y;
}
double distanceFirstToLast =
@ -1551,7 +1567,7 @@ void ToonzRasterBrushTool::leftButtonDrag(const TPointD &pos,
newY = ((1 - ratio) * m_firstPoint.y) + (ratio * pointToUse.y);
}
m_lastPoint = TPointD(newX, newY);
usePos = m_lastPoint = TPointD(newX, newY);
invalidateRect += TRectD(m_firstPoint, m_lastPoint).enlarge(2);
} else if (e.isCtrlPressed()) {
double distance = (m_brushPos.x - m_maxCursorThick + 1) * 0.5;
@ -1609,10 +1625,6 @@ void ToonzRasterBrushTool::leftButtonDrag(const TPointD &pos,
}
}
int maxThickness = m_rasThickness.getValue().second;
double thickness = (m_pressure.getValue())
? computeThickness(e.m_pressure, m_rasThickness) * 2
: maxThickness;
// if (m_dragCount < 3 && !m_isMyPaintStyleSelected && thickness > 0.0) {
// if (m_hardness.getValue() == 100 || m_pencil.getValue()) {
// std::vector<TThickPoint> sequence =
@ -1676,13 +1688,14 @@ void ToonzRasterBrushTool::leftButtonDrag(const TPointD &pos,
// m_dragCount++;
if (m_isStraight) {
m_mousePos = pos;
m_brushPos = getCenteredCursorPos(pos);
invalidate(invalidateRect);
return;
}
TPointD centeredPos = getCenteredCursorPos(pos);
TPointD centeredPos = getCenteredCursorPos(usePos);
TToonzImageP ti = TImageP(getImage(true));
TPointD rasCenter = ti->getRaster()->getCenterD();
@ -1819,7 +1832,7 @@ void ToonzRasterBrushTool::leftButtonUp(const TPointD &pos,
return;
}
TPointD centeredPos = getCenteredCursorPos(pos);
if (e.isCtrlPressed() || m_snapAssistant || e.isAltPressed())
if (e.isCtrlPressed() || m_snapGrid.getValue() || e.isAltPressed())
centeredPos = getCenteredCursorPos(m_lastPoint);
double pressure = m_pressure.getValue() && e.isTablet() ? e.m_pressure : 0.5;
// if (!e.isTablet()) m_oldThickness = -1.0;
@ -1828,6 +1841,7 @@ void ToonzRasterBrushTool::leftButtonUp(const TPointD &pos,
finishRasterBrush(centeredPos, pressure);
int tc = ToonzCheck::instance()->getChecks();
if (tc & ToonzCheck::eGap || tc & ToonzCheck::eAutoclose) invalidate();
m_perspectiveIndex = -1;
}
//---------------------------------------------------------------------------------------------------------------
@ -2069,7 +2083,6 @@ void ToonzRasterBrushTool::finishRasterBrush(const TPointD &pos,
}
delete m_tileSaver;
m_isStraight = false;
m_snapAssistant = false;
m_oldPressure = -1.0;
// m_oldThickness = -1.0;
// m_dragCount = 0;
@ -2321,6 +2334,7 @@ bool ToonzRasterBrushTool::onPropertyChanged(std::string propertyName) {
RasterBrushHardness = m_hardness.getValue();
RasterBrushModifierSize = m_modifierSize.getValue();
BrushLockAlpha = m_modifierLockAlpha.getValue();
BrushSnapGrid = m_snapGrid.getValue();
// Recalculate/reset based on changed settings
if (propertyName == m_rasThickness.getName()) {
@ -2459,6 +2473,7 @@ void ToonzRasterBrushTool::loadLastBrush() {
m_smooth.setValue(BrushSmooth);
m_modifierSize.setValue(RasterBrushModifierSize);
m_modifierLockAlpha.setValue(BrushLockAlpha ? 1 : 0);
m_snapGrid.setValue(BrushSnapGrid ? 1 : 0);
// Recalculate based on prior values
m_minThick = m_rasThickness.getValue().first;

4
toonz/sources/tnztools/toonzrasterbrushtool.h
View file

@ -183,6 +183,7 @@ protected:
TBoolProperty m_pressure;
TDoubleProperty m_modifierSize;
TBoolProperty m_modifierLockAlpha;
TBoolProperty m_snapGrid;
RasterStrokeGenerator *m_rasterTrack;
TTileSetCM32 *m_tileSet;
@ -230,13 +231,14 @@ protected:
bool m_propertyUpdating = false;
bool m_isStraight = false;
bool m_snapAssistant = false;
TPointD m_firstPoint;
TPointD m_lastPoint;
double m_oldPressure = -1.0;
// double m_oldThickness = -1.0;
// int m_dragCount = 0;
int m_perspectiveIndex = -1;
protected:
static void drawLine(const TPointD &point, const TPointD &centre,
bool horizontal, bool isDecimal);

57
toonz/sources/tnztools/toonzvectorbrushtool.cpp
View file

@ -71,6 +71,7 @@ TEnv::IntVar V_VectorBrushAutoClose("VectorBrushAutoClose", 0);
TEnv::IntVar V_VectorBrushAutoFill("VectorBrushAutoFill", 0);
TEnv::IntVar V_VectorBrushAutoGroup("VectorBrushAutoGroup", 0);
TEnv::StringVar V_VectorBrushPreset("VectorBrushPreset", "<custom>");
TEnv::IntVar V_VectorBrushSnapGrid("VectorBrushSnapGrid", 0);
//-------------------------------------------------------------------
@ -535,7 +536,8 @@ ToonzVectorBrushTool::ToonzVectorBrushTool(std::string name, int targetType)
, m_autoGroup("Auto Group", false)
, m_autoFill("Auto Fill", false)
, m_targetType(targetType)
, m_workingFrameId(TFrameId()) {
, m_workingFrameId(TFrameId())
, m_snapGrid("Grid", false) {
bind(targetType);
m_thickness.setNonLinearSlider();
@ -572,6 +574,8 @@ ToonzVectorBrushTool::ToonzVectorBrushTool(std::string name, int targetType)
m_snapSensitivity.addValue(MEDIUM_WSTR);
m_snapSensitivity.addValue(HIGH_WSTR);
m_prop[0].bind(m_snapGrid);
m_prop[0].bind(m_preset);
m_preset.addValue(CUSTOM_WSTR);
@ -597,6 +601,7 @@ ToonzVectorBrushTool::ToonzVectorBrushTool(std::string name, int targetType)
m_capStyle.setId("Cap");
m_joinStyle.setId("Join");
m_miterJoinLimit.setId("Miter");
m_snapGrid.setId("SnapGrid");
}
//-------------------------------------------------------------------------------------------------------
@ -777,6 +782,7 @@ void ToonzVectorBrushTool::leftButtonDown(const TPointD &pos,
// updating m_brushPos is needed to refresh viewer properly
m_brushPos = m_mousePos = pos;
m_perspectiveIndex = -1;
}
//-------------------------------------------------------------------------------------------------------------
@ -792,16 +798,30 @@ void ToonzVectorBrushTool::leftButtonDrag(const TPointD &pos,
m_lastPoint = pos;
bool nonShiftStraight = false;
TPointD usePos = pos;
if (!m_isPath &&
(e.isAltPressed() && !e.isCtrlPressed() && !e.isShiftPressed())) {
((e.isAltPressed() && !e.isCtrlPressed() && !e.isShiftPressed()) ||
m_snapGrid.getValue())) {
invalidateRect = TRectD(m_firstPoint, m_lastPoint).enlarge(2);
nonShiftStraight = true;
if (!m_snapGrid.getValue()) nonShiftStraight = true;
double distance = (m_brushPos.x) * 0.5;
TRectD brushRect =
TRectD(TPointD(m_brushPos.x - distance, m_brushPos.y - distance),
TPointD(m_brushPos.x + distance, m_brushPos.y + distance));
invalidateRect += (brushRect);
PerspectiveTool *perspectiveTool = dynamic_cast<PerspectiveTool *>(
TTool::getTool("T_PerspectiveGrid", TTool::VectorImage));
std::vector<PerspectiveObject *> perspectiveObjs =
perspectiveTool->getPerspectiveObjects();
TPointD pointToUse = TPointD(0.0, 0.0);
TPointD dpiScale = getViewer()->getDpiScale();
TPointD refPoint = m_firstPoint;
refPoint.x *= dpiScale.x;
refPoint.y *= dpiScale.y;
if ((e.isAltPressed() && !e.isCtrlPressed() && !e.isShiftPressed()) ||
m_perspectiveIndex < 0) {
// let's get info about our current location
double denominator = m_lastPoint.x - m_firstPoint.x;
double numerator = m_lastPoint.y - m_firstPoint.y;
@ -816,18 +836,6 @@ void ToonzVectorBrushTool::leftButtonDrag(const TPointD &pos,
// now let's get the angle of each of the assistant points
std::vector<double> anglesToAssistants;
TPointD pointToUse = TPointD(0.0, 0.0);
PerspectiveTool *perspectiveTool = dynamic_cast<PerspectiveTool *>(
TTool::getTool("T_PerspectiveGrid", TTool::VectorImage));
if (perspectiveTool) {
TPointD dpiScale = getViewer()->getDpiScale();
TPointD refPoint = m_firstPoint;
refPoint.x *= dpiScale.x;
refPoint.y *= dpiScale.y;
std::vector<PerspectiveObject *> perspectiveObjs =
perspectiveTool->getPerspectiveObjects();
for (auto data : perspectiveObjs) {
TPointD point = data->getReferencePoint(refPoint);
point.x /= dpiScale.x;
@ -856,8 +864,14 @@ void ToonzVectorBrushTool::leftButtonDrag(const TPointD &pos,
pointToUse = perspectiveObjs.at(i)->getReferencePoint(refPoint);
pointToUse.x /= dpiScale.x;
pointToUse.y /= dpiScale.y;
m_perspectiveIndex = i;
}
}
} else {
pointToUse =
perspectiveObjs.at(m_perspectiveIndex)->getReferencePoint(refPoint);
pointToUse.x /= dpiScale.x;
pointToUse.y /= dpiScale.y;
}
double distanceFirstToLast =
@ -887,7 +901,7 @@ void ToonzVectorBrushTool::leftButtonDrag(const TPointD &pos,
newY = ((1 - ratio) * m_firstPoint.y) + (ratio * pointToUse.y);
}
m_lastPoint = TPointD(newX, newY);
usePos = m_lastPoint = TPointD(newX, newY);
invalidateRect += TRectD(m_firstPoint, m_lastPoint).enlarge(2);
} else if (e.isCtrlPressed() && !e.isAltPressed() && !e.isShiftPressed()) {
invalidateRect = TRectD(m_firstPoint, m_lastPoint).enlarge(2);
@ -947,7 +961,7 @@ void ToonzVectorBrushTool::leftButtonDrag(const TPointD &pos,
}
}
m_lastDragPos = pos;
m_lastDragPos = usePos;
m_lastDragEvent = e;
double thickness = (m_pressure.getValue() || m_isPath)
@ -994,7 +1008,8 @@ void ToonzVectorBrushTool::leftButtonDrag(const TPointD &pos,
m_track.removeMiddlePoints();
invalidateRect += m_track.getModifiedRegion();
} else if (m_dragDraw) {
addTrackPoint(TThickPoint(pos, thickness), getPixelSize() * getPixelSize());
addTrackPoint(TThickPoint(usePos, thickness),
getPixelSize() * getPixelSize());
invalidateRect += m_track.getLastModifiedRegion();
}
@ -1076,6 +1091,7 @@ void ToonzVectorBrushTool::leftButtonUp(const TPointD &pos,
notifyImageChanged();
TUndoManager::manager()->add(undo);
m_perspectiveIndex = -1;
return;
}
@ -1083,7 +1099,7 @@ void ToonzVectorBrushTool::leftButtonUp(const TPointD &pos,
if (m_track.isEmpty()) {
m_styleId = 0;
m_track.clear();
m_perspectiveIndex = -1;
return;
}
@ -1237,6 +1253,7 @@ void ToonzVectorBrushTool::leftButtonUp(const TPointD &pos,
assert(stroke);
m_track.clear();
m_toggleSnap = false;
m_perspectiveIndex = -1;
}
//--------------------------------------------------------------------------------------------------
@ -1891,6 +1908,7 @@ bool ToonzVectorBrushTool::onPropertyChanged(std::string propertyName) {
V_VectorBrushSnap = m_snap.getValue();
int snapSensitivityIndex = m_snapSensitivity.getIndex();
V_VectorBrushSnapSensitivity = snapSensitivityIndex;
V_VectorBrushSnapGrid = m_snapGrid.getValue();
// Recalculate/reset based on changed settings
m_minThick = m_thickness.getValue().first;
@ -2067,6 +2085,7 @@ void ToonzVectorBrushTool::loadLastBrush() {
m_autoGroup.setValue(V_VectorBrushAutoGroup);
m_autoClose.setValue(V_VectorBrushAutoClose);
m_autoFill.setValue(V_VectorBrushAutoFill);
m_snapGrid.setValue(V_VectorBrushSnapGrid);
// Recalculate based on prior values
m_minThick = m_thickness.getValue().first;

3
toonz/sources/tnztools/toonzvectorbrushtool.h
View file

@ -163,6 +163,7 @@ protected:
TEnumProperty m_capStyle;
TEnumProperty m_joinStyle;
TIntProperty m_miterJoinLimit;
TBoolProperty m_snapGrid;
StrokeGenerator m_track;
StrokeGenerator m_rangeTrack;
@ -215,6 +216,8 @@ protected:
TPointD m_firstPoint;
TPointD m_lastPoint;
int m_perspectiveIndex = -1;
};
#endif // TOONZVECTORBRUSHTOOL_H