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

Merge pull request #132 from janisozaur/parentheses

Browse source 
Encapsulate expressions in parentheses
This commit is contained in:
Shinya Kitaoka 2016-04-13 14:14:19 +09:00
commit 9c6c0f1688
10 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toonz/sources/common/tgeometry/tcurveutil.cpp
View file

@ -396,11 +396,12 @@ int intersect(const TQuadratic &q,
return 0; return 0;
} }
if (q.getP2() - q.getP1() == q.getP1() - q.getP0()) //pure il secondo e' unsegmento.... if (q.getP2() - q.getP1() == q.getP1() - q.getP0()) {//pure il secondo e' unsegmento....
if (firstIsQuad) if (firstIsQuad)
return intersect(TSegment(q.getP0(), q.getP2()), s, intersections); return intersect(TSegment(q.getP0(), q.getP2()), s, intersections);
else else
return intersect(s, TSegment(q.getP0(), q.getP2()), intersections); return intersect(s, TSegment(q.getP0(), q.getP2()), intersections);
}
vector<TPointD> bez, pol; vector<TPointD> bez, pol;
bez.push_back(q.getP0()); bez.push_back(q.getP0());

2
toonz/sources/include/tgeometry.h
View file

@ -885,7 +885,7 @@ template <>
inline TRectT<double>::TRectT(const TDimensionT<double> &d) inline TRectT<double>::TRectT(const TDimensionT<double> &d)
: x0(0.0), y0(0.0), x1(d.lx), y1(d.ly){}; : x0(0.0), y0(0.0), x1(d.lx), y1(d.ly){};
template <> template <>
inline bool TRectT<double>::isEmpty() const { return x0 == x1 && y0 == y1 || x0 > x1 || y0 > y1; } inline bool TRectT<double>::isEmpty() const { return (x0 == x1 && y0 == y1) || x0 > x1 || y0 > y1; }
template <> template <>
inline void TRectT<double>::empty() { x0 = y0 = x1 = y1 = 0; } inline void TRectT<double>::empty() { x0 = y0 = x1 = y1 = 0; }
template <> template <>

2
toonz/sources/include/tpixel.h
View file

@ -248,7 +248,7 @@ public:
: r(rr), g(gg), b(bb), m(mm){}; : r(rr), g(gg), b(bb), m(mm){};
inline bool operator==(const TPixelD &p) const { return r == p.r && g == p.g && b == p.b && m == p.m; }; inline bool operator==(const TPixelD &p) const { return r == p.r && g == p.g && b == p.b && m == p.m; };
inline bool operator<(const TPixelD &p) const { return r < p.r || r == p.r && (g < p.g || g == p.g && (b < p.b || b == p.b && (m < p.m))); }; inline bool operator<(const TPixelD &p) const { return r < p.r || (r == p.r && (g < p.g || (g == p.g && (b < p.b || (b == p.b && (m < p.m)))))); };
inline bool operator>=(const TPixelD &p) const { return !operator<(p); }; inline bool operator>=(const TPixelD &p) const { return !operator<(p); };
inline bool operator!=(const TPixelD &p) const { return !operator==(p); }; inline bool operator!=(const TPixelD &p) const { return !operator==(p); };

2
toonz/sources/tnztools/skeletonsubtools.cpp
View file

@ -825,7 +825,7 @@ void IKTool::initEngine(const TPointD &pos)
Skeleton::Bone *next = m_skeleton->getBoneByColumnIndex(*it++); Skeleton::Bone *next = m_skeleton->getBoneByColumnIndex(*it++);
for (; it != links.end(); ++it) for (; it != links.end(); ++it)
stack.push_back(std::make_pair(*it, prev)); stack.push_back(std::make_pair(*it, prev));
if (links.size() > 1 || prev && next && prev->getParent() == bone && next->getParent() == bone) { if (links.size() > 1 || (prev && next && (prev->getParent() == bone && next->getParent() == bone))) {
bone = next; bone = next;
} else { } else {
m_joints.push_back(Joint(bone, prev, sign)); m_joints.push_back(Joint(bone, prev, sign));

3
toonz/sources/tnztools/typetool.cpp
View file

@ -1218,13 +1218,14 @@ void TypeTool::leftButtonDown(const TPointD &pos, const TMouseEvent &)
if (!vi && !ti) if (!vi && !ti)
return; return;
if (m_isFrameCreated) if (m_isFrameCreated) {
if (vi) if (vi)
m_undo = new UndoTypeTool(0, 0, getApplication()->getCurrentLevel()->getSimpleLevel(), m_undo = new UndoTypeTool(0, 0, getApplication()->getCurrentLevel()->getSimpleLevel(),
getCurrentFid(), m_isFrameCreated, m_isLevelCreated); getCurrentFid(), m_isFrameCreated, m_isLevelCreated);
else else
m_undo = new RasterUndoTypeTool(0, 0, getApplication()->getCurrentLevel()->getSimpleLevel(), m_undo = new RasterUndoTypeTool(0, 0, getApplication()->getCurrentLevel()->getSimpleLevel(),
getCurrentFid(), m_isFrameCreated, m_isLevelCreated); getCurrentFid(), m_isFrameCreated, m_isLevelCreated);
}
// closeImeWindow(); // closeImeWindow();
// if(m_viewer) m_viewer->enableIme(true); // if(m_viewer) m_viewer->enableIme(true);

3
toonz/sources/toonz/iocommand.cpp
View file

@ -570,7 +570,7 @@ void substituteLevel(TXsheet *xsh, TXshLevel *srcLevel, TXshLevel *dstLevel)
xsh->getCells(r0, c, rowCount, &cells[0]); xsh->getCells(r0, c, rowCount, &cells[0]);
bool changed = false; bool changed = false;
for (int i = 0; i < rowCount; i++) { for (int i = 0; i < rowCount; i++) {
if (!cells[i].isEmpty()) if (!cells[i].isEmpty()) {
if (cells[i].m_level.getPointer() == srcLevel) { if (cells[i].m_level.getPointer() == srcLevel) {
cells[i].m_level = dstLevel; cells[i].m_level = dstLevel;
changed = true; changed = true;
@ -584,6 +584,7 @@ void substituteLevel(TXsheet *xsh, TXshLevel *srcLevel, TXshLevel *dstLevel)
} }
} }
} }
}
if (changed) if (changed)
xsh->setCells(r0, c, rowCount, &cells[0]); xsh->setCells(r0, c, rowCount, &cells[0]);
} }

6
toonz/sources/toonzlib/doubleparamcmd.cpp
View file

@ -250,14 +250,14 @@ void KeyframeSetter::getRotatingSpeedHandles(
} }
} }
// SpeedInOut * Linear * // SpeedInOut * Linear *
if (ty[0] == 2 && ty[1] == 1 || ty[1] == 2 && ty[2] == 1) { if ((ty[0] == 2 && ty[1] == 1) || (ty[1] == 2 && ty[2] == 1)) {
int k = ty[1] == 1 ? kIndex - 1 : kIndex; int k = ty[1] == 1 ? kIndex - 1 : kIndex;
double speed = getNorm(param->getSpeedIn(k)); double speed = getNorm(param->getSpeedIn(k));
if (speed > epsilon) if (speed > epsilon)
rotatingSpeeds.push_back(std::make_pair(-speed, k)); rotatingSpeeds.push_back(std::make_pair(-speed, k));
} }
// * Linear * SpeedInOut // * Linear * SpeedInOut
if (ty[1] == 1 && ty[2] == 2 || ty[2] == 1 && ty[3] == 2) { if ((ty[1] == 1 && ty[2] == 2) || (ty[2] == 1 && ty[3] == 2)) {
int k = ty[2] == 2 ? kIndex : kIndex + 1; int k = ty[2] == 2 ? kIndex : kIndex + 1;
double speed = getNorm(param->getSpeedOut(k)); double speed = getNorm(param->getSpeedOut(k));
if (speed > epsilon) if (speed > epsilon)
@ -623,7 +623,7 @@ void KeyframeSetter::setSpeedIn(const TPointD &speedIn)
double outNorm = getNorm(m_keyframe.m_speedOut); double outNorm = getNorm(m_keyframe.m_speedOut);
if (m_kIndex + 1 == m_param->getKeyframeCount() || if (m_kIndex + 1 == m_param->getKeyframeCount() ||
isSpeedInOut(m_kIndex) || isSpeedInOut(m_kIndex) ||
m_keyframe.m_type == TDoubleKeyframe::Expression && m_keyframe.m_expressionText.find("cycle") != string::npos) { (m_keyframe.m_type == TDoubleKeyframe::Expression && m_keyframe.m_expressionText.find("cycle") != string::npos)) {
// update next segment speed vector // update next segment speed vector
double inNorm = getNorm(m_keyframe.m_speedIn); double inNorm = getNorm(m_keyframe.m_speedIn);
if (inNorm < eps) if (inNorm < eps)

4
toonz/sources/toonzlib/tstageobject.cpp
View file

@ -1925,11 +1925,11 @@ void TStageObject::loadData(TIStream &is)
if (tnzVersion < VersionNumber(1, 16) && !keyframes.empty()) { if (tnzVersion < VersionNumber(1, 16) && !keyframes.empty()) {
std::map<int, TStageObject::Keyframe>::iterator itKf = keyframes.begin(); std::map<int, TStageObject::Keyframe>::iterator itKf = keyframes.begin();
std::set<int> keyframeIndexSet; std::set<int> keyframeIndexSet;
for (itKf; itKf != keyframes.end(); itKf++) for (; itKf != keyframes.end(); itKf++)
if (is52FullKeyframe(itKf->first)) if (is52FullKeyframe(itKf->first))
keyframeIndexSet.insert(itKf->first); keyframeIndexSet.insert(itKf->first);
std::set<int>::iterator itKfInd = keyframeIndexSet.begin(); std::set<int>::iterator itKfInd = keyframeIndexSet.begin();
for (itKfInd; itKfInd != keyframeIndexSet.end(); itKfInd++) for (; itKfInd != keyframeIndexSet.end(); itKfInd++)
setkey(m_scale, *itKfInd); setkey(m_scale, *itKfInd);
} }
updateKeyframes(); updateKeyframes();

4
toonz/sources/toonzqt/functionpaneltools.cpp
View file

@ -382,10 +382,10 @@ void MoveHandleDragTool::drag(QMouseEvent *e)
if (m_nSpeed != QPointF(0, 0)) { if (m_nSpeed != QPointF(0, 0)) {
QPointF delta = posF - p0; QPointF delta = posF - p0;
posF -= m_nSpeed * (delta.x() * m_nSpeed.x() + delta.y() * m_nSpeed.y()); posF -= m_nSpeed * (delta.x() * m_nSpeed.x() + delta.y() * m_nSpeed.y());
if (m_handle == FunctionPanel::SpeedIn && posF.x() > p0.x() || m_handle == FunctionPanel::SpeedOut && posF.x() < p0.x()) if ((m_handle == FunctionPanel::SpeedIn && posF.x() > p0.x()) || (m_handle == FunctionPanel::SpeedOut && posF.x() < p0.x()))
posF = p0; posF = p0;
} else { } else {
if (m_handle == FunctionPanel::SpeedIn && posF.x() > p0.x() || m_handle == FunctionPanel::SpeedOut && posF.x() < p0.x()) if ((m_handle == FunctionPanel::SpeedIn && posF.x() > p0.x()) || (m_handle == FunctionPanel::SpeedOut && posF.x() < p0.x()))
posF.setX(p0.x()); posF.setX(p0.x());
} }

4
toonz/sources/toonzqt/functionselection.cpp
View file

@ -590,8 +590,8 @@ void FunctionSelection::doCut()
if (i + 1 < n && kk.contains(i + 1) && !cellsSelection) if (i + 1 < n && kk.contains(i + 1) && !cellsSelection)
delta += curve->keyframeIndexToFrame(i) - curve->keyframeIndexToFrame(i + 1); delta += curve->keyframeIndexToFrame(i) - curve->keyframeIndexToFrame(i + 1);
} else { } else {
if (cellsSelection && bottomRow <= curve->keyframeIndexToFrame(i) || if ((cellsSelection && bottomRow <= curve->keyframeIndexToFrame(i)) ||
!cellsSelection && delta != 0) (!cellsSelection && delta != 0))
moveUndo->addMovement(curve, j, delta); moveUndo->addMovement(curve, j, delta);
j++; j++;
} }