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

Add ALT modifier for snaping angle/spacing and locking horizon movement.

Browse source
This commit is contained in:
manongjohn 2021-11-05 17:03:35 -04:00
parent 2119fd8160
commit 550ede19bf
3 changed files with 89 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
toonz/sources/tnztools/perspectivetool.cpp
View file

@ -562,6 +562,8 @@ void PerspectiveTool::leftButtonDown(const TPointD &pos, const TMouseEvent &e) {
m_isRightMoving = false;
m_selecting = false;
m_totalSpacing = 0;
m_firstPos = pos;
int controlIdx = -1;
@ -758,6 +760,21 @@ TPointD calculateCenterPoint(TPointD leftHandlePos, TPointD leftPivotPos,
return newCenterPoint;
}
TPointD calculateHorizonPoint(TPointD firstPoint, double rotation,
double distance) {
TPointD refPoint;
double theta = rotation * (3.14159 / 180);
double yLength = std::sin(theta) * distance;
double xLength = std::cos(theta) * distance;
refPoint.x = firstPoint.x + xLength;
refPoint.y = firstPoint.y + yLength;
return refPoint;
}
void PerspectiveTool::leftButtonDrag(const TPointD &pos, const TMouseEvent &e) {
if (!m_perspectiveObjs.size()) return;
@ -815,12 +832,30 @@ void PerspectiveTool::leftButtonDrag(const TPointD &pos, const TMouseEvent &e) {
if (a2 < eps || b2 < eps) return;
dAngle = asin(cross(a, b) / sqrt(a2 * b2)) * M_180_PI;
if (e.isAltPressed()) {
m_totalSpacing += dAngle;
if (std::abs(m_totalSpacing) >= 10) {
dAngle = m_totalSpacing < 0 ? -45 : 45;
m_totalSpacing = 0;
} else
dAngle = 0;
}
} else if (m_isSpacing) {
double da = std::sqrt(std::pow(centerPoint.x - m_firstPos.x, 2) +
std::pow(centerPoint.y - m_firstPos.y, 2));
double db = std::sqrt(std::pow(centerPoint.x - pos.x, 2) +
std::pow(centerPoint.y - pos.y, 2));
dSpace = da - db;
if (e.isAltPressed()) {
m_totalSpacing += dSpace;
if (std::abs(m_totalSpacing) >= 10) {
dSpace = m_totalSpacing < 0 ? -10 : 10;
m_totalSpacing = 0;
} else
dSpace = 0;
}
} else if (!m_isShifting &&
mainObj->getType() == PerspectiveType::VanishingPoint) {
TPointD leftPivotPos = mainObj->getLeftPivotPos();
@ -843,8 +878,14 @@ void PerspectiveTool::leftButtonDrag(const TPointD &pos, const TMouseEvent &e) {
mainObj->setLeftHandlePos(newPos);
// Also move Center Point
centerPoint = calculateCenterPoint(newPos, leftPivotPos, rightHandlePos,
rightPivotPos);
if (mainObj->isHorizon() && e.isAltPressed()) {
TPointD otherHorizonPoint =
calculateHorizonPoint(centerPoint, mainObj->getRotation(), 100);
centerPoint = calculateCenterPoint(newPos, leftPivotPos, centerPoint,
otherHorizonPoint);
} else
centerPoint = calculateCenterPoint(newPos, leftPivotPos, rightHandlePos,
rightPivotPos);
mainObj->setCenterPoint(centerPoint);
// Check Right Handle
@ -868,8 +909,14 @@ void PerspectiveTool::leftButtonDrag(const TPointD &pos, const TMouseEvent &e) {
mainObj->setRightHandlePos(newPos);
// Also move Center Point
centerPoint = calculateCenterPoint(leftHandlePos, leftPivotPos, newPos,
rightPivotPos);
if (mainObj->isHorizon() && e.isAltPressed()) {
TPointD otherHorizonPoint =
calculateHorizonPoint(centerPoint, mainObj->getRotation(), 100);
centerPoint = calculateCenterPoint(centerPoint, otherHorizonPoint,
newPos, rightPivotPos);
} else
centerPoint = calculateCenterPoint(leftHandlePos, leftPivotPos, newPos,
rightPivotPos);
mainObj->setCenterPoint(centerPoint);
// Check Left Handle
@ -890,6 +937,22 @@ void PerspectiveTool::leftButtonDrag(const TPointD &pos, const TMouseEvent &e) {
obj->shiftPerspectiveObject(dPos);
else if (m_isCenterMoving) { // Moving
TPointD objCenterPoint = obj->getCenterPoint();
if (obj->isHorizon() && e.isAltPressed()) {
double distance =
std::sqrt(std::pow(dPos.x, 2) + std::pow(dPos.y, 2));
double rotation = mainObj->getRotation();
if (rotation != 90 && rotation != 270) {
if (dPos.x < 0) distance *= -1;
if (rotation > 90 && rotation < 270) distance *= -1;
} else if ((rotation == 90 && dPos.y < 0) ||
(rotation == 270 && dPos.y > 0))
distance *= -1;
TPointD newCenter =
calculateHorizonPoint(objCenterPoint, rotation, distance);
dPos = newCenter - objCenterPoint;
}
obj->setCenterPoint(objCenterPoint + dPos);
// Also Move Left and Right Handles

9
toonz/sources/tnztools/perspectivetool.h
View file

@ -49,7 +49,12 @@ public:
void setCenterPoint(TPointD point) { m_centerPoint = point; }
TPointD getCenterPoint() { return m_centerPoint; }
void setRotation(double angle) { m_rotation = angle; }
void setRotation(double angle) {
// Normalize the angle between 0 and 360
int a = (int)angle % 360;
m_rotation = (double)a + (angle - (int)angle);
if (m_rotation < 0) m_rotation = 360.0 + m_rotation;
}
virtual double getRotation() { return m_rotation; }
void setParallel(bool isParallel) { m_parallel = isParallel; }
@ -480,6 +485,8 @@ protected:
TPointD m_mousePos, m_firstPos;
double m_totalSpacing;
int m_mainControlIndex;
bool m_propertyUpdating = false;

23
toonz/sources/toonz/statusbar.cpp
View file

@ -344,15 +344,20 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
lMap.insert({"T_Zoom", tr("Zoom Tool: Zooms viewer")});
lMap.insert({"T_Rotate", tr("Rotate Tool: Rotate the workspace")});
lMap.insert({"T_Ruler", tr("Ruler Tool: Measures distances on the canvas")});
lMap.insert({"T_PerspectiveGrid",
tr("Perspective Grid Tool: Set up perspective grids") + spacer +
tr("%1%2Move Perspective Objects")
.arg(trModKey("Shift"))
.arg(cmdTextSeparator) +
spacer +
tr("%1%2Select multiple Perspective Objects")
.arg(trModKey("Ctrl+Click/Drag"))
.arg(cmdTextSeparator)});
lMap.insert(
{"T_PerspectiveGrid",
tr("Perspective Grid Tool: Set up perspective grids") + spacer +
tr("%1%2Move Perspective Objects")
.arg(trModKey("Shift"))
.arg(cmdTextSeparator) +
spacer +
tr("%1%2Select multiple Perspective Objects")
.arg(trModKey("Ctrl+Click/Drag"))
.arg(cmdTextSeparator) +
spacer +
tr("%1%2Snap rotation & space/lock center movement to horizon")
.arg(trModKey("Alt"))
.arg(cmdTextSeparator)});
lMap.insert(
{"T_Finger", tr("Finger Tool: Smudges small areas to cover with line")});
lMap.insert({"T_Dummy", tr("This tool doesn't work on this layer type.")});