Merge remote-tracking branch 'opentoonz/master' into feature08_assistants

Author: blackwarthog

toonz/sources/colorfx/colorfxutils.cpp

@@ -3,7 +3,6 @@
 #include "colorfxutils.h"
 #include "drawutil.h"
 #include "tregion.h"
-#include "tflash.h"
 
 RubberDeform::RubberDeform() : m_pPolyOri(0), m_polyLoc() {}
 
@@ -100,276 +99,3 @@ void RubberDeform::refinePoly(const double rf) {
   }
   m_polyLoc = tmpv;
 }
-
-// ------------------- SFlashUtils -------------------------------------------
-
-void SFlashUtils::computeOutline(const TRegion *region,
-                                 TRegionOutline::PointVector &polyline) const {
-  if (!region) return;
-
-  const double pixelSize = 1.0;
-  polyline.clear();
-
-  std::vector<TPointD> polyline2d;
-
-  int edgeSize = region->getEdgeCount();
-
-  for (int i = 0; i < edgeSize; i++) {
-    TEdge &edge = *region->getEdge(i);
-    stroke2polyline(polyline2d, *edge.m_s, pixelSize, edge.m_w0, edge.m_w1);
-  }
-  int pointNumber = polyline2d.size();
-  polyline.reserve(pointNumber);
-  for (int j = 0; j < pointNumber; j++) {
-    polyline.push_back(T3DPointD(polyline2d[j], 0.0));
-  }
-}
-
-void SFlashUtils::computeRegionOutline() {
-  if (!m_r) return;
-
-  int subRegionNumber = m_r->getSubregionCount();
-  TRegionOutline::PointVector app;
-
-  m_ro.m_exterior.clear();
-  computeOutline(m_r, app);
-
-  m_ro.m_exterior.push_back(app);
-  m_ro.m_interior.clear();
-  m_ro.m_interior.reserve(subRegionNumber);
-  for (int i = 0; i < subRegionNumber; i++) {
-    app.clear();
-    computeOutline(m_r->getSubregion(i), app);
-    m_ro.m_interior.push_back(app);
-  }
-
-  m_ro.m_bbox = m_r->getBBox();
-}
-
-void SFlashUtils::PointVector2QuadsArray(const std::vector<T3DPointD> &pv,
-                                         std::vector<TQuadratic *> &quadArray,
-                                         std::vector<TQuadratic *> &toBeDeleted,
-                                         const bool isRounded) const {
-  int nbPv                                    = pv.size();
-  quadArray.clear();
-
-  if (isRounded) {
-    if (nbPv <= 2) {
-      if (nbPv == 1) {
-        TPointD p0, p1, p2;
-        p0 = TPointD(pv[0].x, pv[0].y);
-        p1 = TPointD(pv[0].x, pv[0].y);
-        p2 = TPointD(pv[0].x, pv[0].y);
-        quadArray.push_back(new TQuadratic(p0, p1, p2));
-        toBeDeleted.push_back(quadArray.back());
-      }
-      if (nbPv == 2) {
-        TPointD p0, p1, p2;
-        p0 = TPointD(pv[0].x, pv[0].y);
-        p1 = TPointD((pv[0].x + pv[1].x) / 2, (pv[0].y + pv[1].y) / 2);
-        p2 = TPointD(pv[1].x, pv[1].y);
-        quadArray.push_back(new TQuadratic(p0, p1, p2));
-        toBeDeleted.push_back(quadArray.back());
-      }
-      return;
-    }
-
-    for (int i = 0; i < (nbPv - 2); i++) {
-      TPointD p0, p1, p2;
-      p0 = TPointD((pv[i].x + pv[i + 1].x) / 2, (pv[i].y + pv[i + 1].y) / 2);
-      p1 = TPointD(pv[i + 1].x, pv[i + 1].y);
-      p2 = TPointD((pv[i + 1].x + pv[i + 2].x) / 2,
-                   (pv[i + 1].y + pv[i + 2].y) / 2);
-      quadArray.push_back(new TQuadratic(p0, p1, p2));
-      toBeDeleted.push_back(quadArray.back());
-    }
-    TPointD p0, p1, p2;
-    p0 = TPointD((pv[nbPv - 2].x + pv[nbPv - 1].x) / 2,
-                 (pv[nbPv - 2].y + pv[nbPv - 1].y) / 2);
-    p1 = TPointD(pv[nbPv - 1].x, pv[nbPv - 1].y);
-    p2 = TPointD((pv[0].x + pv[1].x) / 2, (pv[0].y + pv[1].y) / 2);
-    quadArray.push_back(new TQuadratic(p0, p1, p2));
-    toBeDeleted.push_back(quadArray.back());
-  } else {
-    for (int i = 0; i < (nbPv - 1); i++) {
-      TPointD p0, p1, p2;
-      p0 = TPointD(pv[i].x, pv[i].y);
-      p2 = TPointD(pv[i + 1].x, pv[i + 1].y);
-      p1 = TPointD((p0.x + p2.x) * 0.5, (p0.y + p2.y) * 0.5);
-      quadArray.push_back(new TQuadratic(p0, p1, p2));
-      toBeDeleted.push_back(quadArray.back());
-    }
-    TPointD p0, p1, p2;
-    p0 = TPointD(pv[nbPv - 1].x, pv[nbPv - 1].y);
-    p2 = TPointD(pv[0].x, pv[0].y);
-    p1 = TPointD((p0.x + p2.x) * 0.5, (p0.y + p2.y) * 0.5);
-    quadArray.push_back(new TQuadratic(p0, p1, p2));
-    toBeDeleted.push_back(quadArray.back());
-  }
-}
-
-void SFlashUtils::drawRegionOutline(TFlash &flash, const bool isRounded) const {
-  if (!m_r) return;
-
-  std::vector<std::vector<TQuadratic *>> quads;
-  std::vector<TQuadratic *> toBeDeleted;
-  std::vector<TQuadratic *> quadArray;
-  PointVector2QuadsArray(*(m_ro.m_exterior.begin()), quadArray, toBeDeleted,
-                         isRounded);
-  quads.push_back(quadArray);
-
-  TRegionOutline::Boundary::const_iterator iinter     = m_ro.m_interior.begin();
-  TRegionOutline::Boundary::const_iterator iinter_end = m_ro.m_interior.end();
-  for (; iinter != iinter_end; iinter++) {
-    PointVector2QuadsArray(*iinter, quadArray, toBeDeleted, isRounded);
-    quads.push_back(quadArray);
-  }
-
-  flash.drawPolygon(quads);
-  clearPointerContainer(toBeDeleted);
-}
-
-int SFlashUtils::nbDiffVerts(const std::vector<TPointD> &pv) const {
-  std::vector<TPointD> lpv;
-  if (pv.size() == 0) return 0;
-  lpv.push_back(pv[0]);
-  for (int i = 1; i < (int)pv.size(); i++) {
-    bool isDiff = true;
-    for (int j = 0; j < (int)lpv.size() && isDiff; j++)
-      isDiff = lpv[j] == pv[i] ? false : isDiff;
-    if (isDiff) {
-      lpv.push_back(pv[i]);
-    }
-  }
-  return lpv.size();
-}
-
-void SFlashUtils::Triangle2Quad(std::vector<TPointD> &p) const {
-  TPointD e;
-  int i, j;
-  i = j = -1;
-  if (p[0] == p[1]) {
-    i = 0;
-    j = 1;
-    e = p[2] - p[3];
-  } else if (p[0] == p[2]) {
-  } else if (p[0] == p[3]) {
-    i = 0;
-    j = 3;
-    e = p[2] - p[1];
-  } else if (p[1] == p[2]) {
-    i = 1;
-    j = 2;
-    e = p[3] - p[0];
-  } else if (p[1] == p[3]) {
-  } else if (p[2] == p[3]) {
-    i = 2;
-    j = 3;
-    e = p[0] - p[1];
-  }
-  e    = normalize(e);
-  p[j] = p[i] + e * 0.001;
-}
-
-void SFlashUtils::drawGradedPolyline(TFlash &flash, std::vector<TPointD> &pvv,
-                                     const TPixel32 &c1,
-                                     const TPixel32 &c2) const {
-  std::vector<TPointD> pv;
-  pv       = pvv;
-  int nbDV = nbDiffVerts(pv);
-  if (nbDV < 3 || nbDV > 4) return;
-  if (nbDV == 3) Triangle2Quad(pv);
-
-  // Direction Of polyline
-  TPointD u   = pv[0] - pv[1];
-  TPointD up  = (pv[0] + pv[1]) * 0.5;
-  u           = normalize(u);
-  u           = rotate90(u);
-  TPointD up1 = up + u;
-  TPointD up2 = up - u;
-  double d1   = (tdistance(up1, pv[2]) + tdistance(up1, pv[3])) * 0.5;
-  double d2   = (tdistance(up2, pv[2]) + tdistance(up2, pv[3])) * 0.5;
-
-  std::vector<TPointD> lpv;
-  if (d1 > d2) {
-    lpv = pv;
-  } else {
-    lpv.push_back(pv[1]);
-    lpv.push_back(pv[0]);
-    lpv.push_back(pv[3]);
-    lpv.push_back(pv[2]);
-  }
-
-  // Transformation of gradient square
-  const double flashGrad = 16384.0;  // size of gradient square
-  flash.setGradientFill(true, c1, c2, 0);
-  TPointD p0((lpv[0] + lpv[3]) * 0.5);
-  TPointD p1((lpv[1] + lpv[2]) * 0.5);
-  double lv = (tdistance(p0, p1));
-  double lh = 0.5 * (tdistance(lpv[0], lpv[3]) + tdistance(lpv[1], lpv[2]));
-  TPointD center =
-      0.25 * lpv[0] + 0.25 * lpv[1] + 0.25 * lpv[2] + 0.25 * lpv[3];
-  TPointD e(p0 - p1);
-
-  double angle = rad2degree(atan(e));
-  angle        = angle <= 0 ? 270 + angle : angle - 90;
-  TRotation rM(angle);
-  TTranslation tM(center.x, center.y);
-  TScale sM(lh / (flashGrad), lv / (flashGrad));
-
-  flash.setFillStyleMatrix(tM * sM * rM);
-  flash.drawPolyline(pv);
-}
-
-//------------------------------------------------------------
-
-//------------------------------------------------------------
-void SFlashUtils::drawGradedRegion(TFlash &flash, std::vector<TPointD> &pvv,
-                                   const TPixel32 &c1, const TPixel32 &c2,
-                                   const TRegion &r) const {
-  std::vector<TPointD> pv;
-  pv       = pvv;
-  int nbDV = nbDiffVerts(pv);
-  if (nbDV < 3 || nbDV > 4) return;
-  if (nbDV == 3) Triangle2Quad(pv);
-
-  // Direction Of polyline
-  TPointD u   = pv[0] - pv[1];
-  TPointD up  = (pv[0] + pv[1]) * 0.5;
-  u           = normalize(u);
-  u           = rotate90(u);
-  TPointD up1 = up + u;
-  TPointD up2 = up - u;
-  double d1   = (tdistance(up1, pv[2]) + tdistance(up1, pv[3])) * 0.5;
-  double d2   = (tdistance(up2, pv[2]) + tdistance(up2, pv[3])) * 0.5;
-
-  std::vector<TPointD> lpv;
-  if (d1 > d2) {
-    lpv = pv;
-  } else {
-    lpv.push_back(pv[1]);
-    lpv.push_back(pv[0]);
-    lpv.push_back(pv[3]);
-    lpv.push_back(pv[2]);
-  }
-
-  // Transformation of gradient square
-  const double flashGrad = 16384.0;  // size of gradient square
-  flash.setGradientFill(true, c1, c2, 0);
-  TPointD p0((lpv[0] + lpv[3]) * 0.5);
-  TPointD p1((lpv[1] + lpv[2]) * 0.5);
-  double lv = (tdistance(p0, p1));
-  double lh = 0.5 * (tdistance(lpv[0], lpv[3]) + tdistance(lpv[1], lpv[2]));
-  TPointD center =
-      0.25 * lpv[0] + 0.25 * lpv[1] + 0.25 * lpv[2] + 0.25 * lpv[3];
-  TPointD e(p0 - p1);
-
-  double angle = rad2degree(atan(e));
-  angle        = angle <= 0 ? 270 + angle : angle - 90;
-  TRotation rM(angle);
-  TTranslation tM(center.x, center.y);
-  TScale sM(lh / (flashGrad), lv / (flashGrad));
-
-  flash.setFillStyleMatrix(tM * sM * rM);
-  flash.drawRegion(r);
-}

toonz/sources/colorfx/colorfxutils.h

@@ -31,31 +31,4 @@ class RubberDeform {
   void deform(const double n);
 };
 
-class SFlashUtils {
-  void computeOutline(const TRegion *region,
-                      TRegionOutline::PointVector &polyline) const;
-  void PointVector2QuadsArray(const std::vector<T3DPointD> &pv,
-                              std::vector<TQuadratic *> &quadArray,
-                              std::vector<TQuadratic *> &toBeDeleted,
-                              const bool isRounded) const;
-  int nbDiffVerts(const std::vector<TPointD> &pv) const;
-  void Triangle2Quad(std::vector<TPointD> &p) const;
-
-public:
-  const TRegion *m_r;
-  TRegionOutline m_ro;
-
-  SFlashUtils(){};
-  SFlashUtils(const TRegion *r) : m_r(r){};
-  virtual ~SFlashUtils(){};
-
-  void computeRegionOutline();
-  void drawRegionOutline(TFlash &flash, const bool isRounded = true) const;
-  void drawGradedPolyline(TFlash &flash, std::vector<TPointD> &pv,
-                          const TPixel32 &c1, const TPixel32 &c2) const;
-  void drawGradedRegion(TFlash &flash, std::vector<TPointD> &pv,
-                        const TPixel32 &c1, const TPixel32 &c2,
-                        const TRegion &r) const;
-};
-
 #endif