OpenToonz - An open-source full-featured 2D animation creation software
C
Autoclose: Refactor autoclose feature with new settings structure
Abel Youaf7ce4ff41a0
diff --git a/toonz/sources/include/toonz/autoclose.h b/toonz/sources/include/toonz/autoclose.hindex 7ad612104..d87456525 100644--- a/toonz/sources/include/toonz/autoclose.h+++ b/toonz/sources/include/toonz/autoclose.h@@ -21,12 +21,30 @@#define DVVAR DV_IMPORT_VAR#endif+struct AutocloseSettings {+ int m_closingDistance = 10;+ double m_spotAngle = 60.0;+ int m_opacity = 255;+ bool m_ignoreAPInks = true;++ AutocloseSettings() = default;++ AutocloseSettings(int distance, double angle, int opacity, bool ignoreAPInks)+ : m_closingDistance(distance)+ , m_spotAngle(angle)+ , m_opacity(opacity)+ , m_ignoreAPInks(ignoreAPInks) {}+};+class DVAPI TAutocloser {public:typedef std::pair<TPoint, TPoint> Segment;TAutocloser(const TRasterP &r, int distance, double angle, int index,- int opacity,std::set<UINT> autoPaintStyles = std::set<UINT>());+ int opacity, std::set<int> autoPaintStyles = std::set<int>());++ TAutocloser(const TRasterP &r, int ink, AutocloseSettings settings,+ std::set<int> autoPaintStyles = std::set<int>());~TAutocloser();// calcola i segmenti e li disegna sul raster@@ -76,7 +94,7 @@ private:static std::unordered_map<std::string, std::vector<TAutocloser::Segment>>m_cache;static std::mutex m_mutex;- std::set<UINT> m_autoPaintStyles;+ std::set<int> m_autoPaintStyles;// not implementedTAutocloser();diff --git a/toonz/sources/include/toonz/stage2.h b/toonz/sources/include/toonz/stage2.hindex aa38bad10..240aec8ce 100644--- a/toonz/sources/include/toonz/stage2.h+++ b/toonz/sources/include/toonz/stage2.h@@ -5,6 +5,7 @@// TnzLib includes#include "toonz/stage.h"+#include "toonz/autoclose.h"#undef DVAPI#undef DVVAR@@ -49,6 +50,7 @@ public:eInksOnly = 0x40, //!< Inks only (transparent paints).eInk1 = 0x80 //!< Ink#1 check (show style#1 on inks).};+ AutocloseSettings autoCloseSettings;public:static ToonzCheck *instance();@@ -72,8 +74,17 @@ public:return true;}-private:- int m_mask;+ AutocloseSettings getAutocloseSettings() {+ return autoCloseSettings;+ };++ void setAutocloseSettings(int distance, double angle, int opacity,+ bool ignoreAP) {+ autoCloseSettings =+ AutocloseSettings(distance, angle, opacity, ignoreAP);+ }++ private : int m_mask;int m_colorIndex;private:diff --git a/toonz/sources/tnztools/rastertapetool.cpp b/toonz/sources/tnztools/rastertapetool.cppindex aef8319a4..5a1441f60 100644--- a/toonz/sources/tnztools/rastertapetool.cpp+++ b/toonz/sources/tnztools/rastertapetool.cpp@@ -173,6 +173,9 @@ public:m_multi.setId("FrameRange");m_ignoreAP.setId("IgnoreautoPaintInks");m_closeType.setId("Type");+ ToonzCheck::instance()->setAutocloseSettings(+ AutocloseDistance, AutocloseAngle, AutocloseOpacity,+ AutocloseIgnoreAutoPaint);}//------------------------------------------------------------@@ -572,6 +575,10 @@ public:AutocloseIgnoreAutoPaint = (int)(m_ignoreAP.getValue());}+ ToonzCheck::instance()->setAutocloseSettings(+ AutocloseDistance, AutocloseAngle, AutocloseOpacity,+ AutocloseIgnoreAutoPaint);+if (ToonzCheck::instance()->getChecks() & ToonzCheck::eAutoclose)notifyImageChanged();diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cppindex 6d04de744..408768dc2 100644--- a/toonz/sources/toonz/sceneviewer.cpp+++ b/toonz/sources/toonz/sceneviewer.cpp@@ -2274,10 +2274,10 @@ void SceneViewer::drawScene() {assert(glGetError() == 0);if (ToonzCheck::instance()->getChecks() & ToonzCheck::eAutoclose) {TXshSimpleLevel *sl = app->getCurrentLevel()->getSimpleLevel();- if (sl && sl->getType() & TXshLevelType::RASTER_TYPE)- painter.setCurrentImageId(sl->getImageId(- app->getCurrentTool()->getTool()->getCurrentFid(),- 0));+ if (sl && sl->getType() & TXshLevelType::RASTER_TYPE) {+ TFrameId fid = app->getCurrentTool()->getTool()->getCurrentFid();+ painter.setCurrentImageId(sl->getImageId(fid, 0));+ }}painter.flushRasterImages();diff --git a/toonz/sources/toonzlib/autoclose.cpp b/toonz/sources/toonzlib/autoclose.cppindex c57793bf8..8e4b0f5b1 100644--- a/toonz/sources/toonzlib/autoclose.cpp+++ b/toonz/sources/toonzlib/autoclose.cpp@@ -1132,11 +1132,15 @@ std::unordered_map<std::string, std::vector<TAutocloser::Segment>>TAutocloser::m_cache;std::mutex TAutocloser::m_mutex;-TAutocloser::TAutocloser(const TRasterP &r, int distance, double angle,- int index, int opacity, std::set<UINT> autoPaints)- : m_imp(new Imp(r, distance, angle, index, opacity))+TAutocloser::TAutocloser(const TRasterP &r, int distance, double angle, int ink,+ int opacity, std::set<int> autoPaints)+ : m_imp(new Imp(r, distance, angle, ink, opacity)), m_autoPaintStyles(autoPaints) {}+TAutocloser::TAutocloser(const TRasterP &r, int ink, const AutocloseSettings st,+ std::set<int> autoPaints)+ : m_imp(new Imp(r, st.m_closingDistance, st.m_spotAngle, ink, st.m_opacity))+ , m_autoPaintStyles(autoPaints) {}//...............................void TAutocloser::exec() {@@ -1148,10 +1152,22 @@ void TAutocloser::exec() {void TAutocloser::exec(std::string id) {std::vector<TAutocloser::Segment> segments;compute(segments);+ draw(segments);+ setSegmentCache(id, std::move(segments));+}++//...............................++TAutocloser::~TAutocloser() {}++//-------------------------------------------------++void TAutocloser::compute(std::vector<Segment> &closingSegmentArray) {+ m_imp->compute(closingSegmentArray);if (TRasterCM32P raux = (TRasterCM32P)m_imp->m_raster) {if (!m_autoPaintStyles.empty()) {- segments.erase(- std::remove_if(segments.begin(), segments.end(),+ closingSegmentArray.erase(+ std::remove_if(closingSegmentArray.begin(), closingSegmentArray.end(),[&](const std::pair<TPoint, TPoint> &seg) {TPixelCM32 *pix1 =raux->pixels(seg.first.y) + seg.first.x;@@ -1163,24 +1179,12 @@ void TAutocloser::exec(std::string id) {m_autoPaintStyles.find(pix2->getInk()) !=m_autoPaintStyles.end();}),- segments.end());+ closingSegmentArray.end());}}- draw(segments);- setSegmentCache(id, std::move(segments));-}--//...............................--TAutocloser::~TAutocloser() {}--//---------------------------------------------------void TAutocloser::compute(std::vector<Segment> &closingSegmentArray) {- m_imp->compute(closingSegmentArray);}//-------------------------------------------------void TAutocloser::draw(const std::vector<Segment> &closingSegmentArray) {m_imp->draw(closingSegmentArray);-}+}\ No newline at end of filediff --git a/toonz/sources/toonzlib/convert2tlv.cpp b/toonz/sources/toonzlib/convert2tlv.cppindex d62282364..73b4bb7d5 100644--- a/toonz/sources/toonzlib/convert2tlv.cpp+++ b/toonz/sources/toonzlib/convert2tlv.cpp@@ -16,6 +16,7 @@#include "tenv.h"#include "convert2tlv.h"#include "tstream.h"+#include "toonz/stage2.h"#include <map>@@ -24,10 +25,6 @@// gmt, 14/11/2013 removed a commented out blocks of code (void buildInks1(),// void buildPalette() )-extern TEnv::DoubleVar AutocloseDistance;-extern TEnv::DoubleVar AutocloseAngle;-extern TEnv::IntVar AutocloseOpacity;-namespace {//----------------------------------------------@@ -518,9 +515,11 @@ void Convert2Tlv::buildToonzRaster(TRasterCM32P &rout, const TRasterP &rin1,}}- if (m_autoclose)- TAutocloser(r, AutocloseDistance, AutocloseAngle, 1, AutocloseOpacity)+ if (m_autoclose) {+ auto st = ToonzCheck::instance()->getAutocloseSettings();+ TAutocloser(r, st.m_closingDistance, st.m_spotAngle, 1, st.m_opacity).exec();+ }if (rP) {std::cout << " computing paints...\n";diff --git a/toonz/sources/toonzlib/stage.cpp b/toonz/sources/toonzlib/stage.cppindex 56f447c3b..0602a7294 100644--- a/toonz/sources/toonzlib/stage.cpp+++ b/toonz/sources/toonzlib/stage.cpp@@ -977,7 +977,7 @@ void Stage::visit(Visitor &visitor, const VisitArgs &args) {Player::m_isShiftAndTraceEnabled = osm->isShiftTraceEnabled();sb.addFrame(sb.m_players, scene, xsh, row, 0, args.m_onlyVisible,args.m_checkPreviewVisibility);-+updateOnionSkinSize(sb.m_players);sb.visit(sb.m_players, visitor, isPlaying);diff --git a/toonz/sources/toonzlib/stage2.cpp b/toonz/sources/toonzlib/stage2.cppindex 345a9f318..d5cdecc0a 100644--- a/toonz/sources/toonzlib/stage2.cpp+++ b/toonz/sources/toonzlib/stage2.cpp@@ -18,6 +18,7 @@#include "tvectorimage.h"#include "trasterimage.h"#include <QAction>+//=============================================================================namespace Stage {//-----------------------------------------------------------------------------diff --git a/toonz/sources/toonzlib/stagevisitor.cpp b/toonz/sources/toonzlib/stagevisitor.cppindex ba5c54460..0737df78d 100644--- a/toonz/sources/toonzlib/stagevisitor.cpp+++ b/toonz/sources/toonzlib/stagevisitor.cpp@@ -397,18 +397,6 @@ void RasterPainter::disableMask() {TStencilControl::instance()->disableMask();}-//-------------------------------------------------------------------------------//-------------------------------------------------------------------------------TEnv::DoubleVar AutocloseDistance("InknpaintAutocloseDistance", 10.0);-TEnv::DoubleVar AutocloseAngle("InknpaintAutocloseAngle", 60.0);-TEnv::IntVar AutocloseInk("InknpaintAutocloseInk", 1);-TEnv::IntVar AutocloseOpacity("InknpaintAutocloseOpacity", 255);-TEnv::IntVar AutocloseIgnoreAutoPaint("AutocloseIgnoreAutoPaint", 1);--//------------------------------------------------------------------------------int RasterPainter::getNodesCount() { return m_nodes.size(); }//-----------------------------------------------------------------------------@@ -578,15 +566,15 @@ void RasterPainter::flushRasterImages() {if (tc & ToonzCheck::eGap)AreaFiller(srcCm).rectFill(m_nodes[i].m_savebox, 1, true, true,false);- if (tc & ToonzCheck::eAutoclose) {- std::set<UINT> autoPaints;- if (AutocloseIgnoreAutoPaint) {+ if (tc & ToonzCheck::eAutoclose && m_nodes[i].m_onionMode == Node::eOnionSkinNone) {+ auto settings = ToonzCheck::instance()->getAutocloseSettings();+ std::set<int> autoPaints;+ if (settings.m_ignoreAPInks) {for (int i = 0; i < plt->getStyleCount(); i++)- if (plt->getStyle(i)->getFlags() != 0) autoPaints.insert(i);+ if (plt->getStyle(i)->getFlags() != 0)+ autoPaints.insert(i);}- TAutocloser ac(srcCm, AutocloseDistance, AutocloseAngle,- gapCheckIndex, AutocloseOpacity,- std::move(autoPaints));+ TAutocloser ac(srcCm, gapCheckIndex,settings, std::move(autoPaints));if (ac.hasSegmentCache(m_currentImageId))ac.draw(ac.getSegmentCache(m_currentImageId));else