Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

smoother fx iwa

shun-iwasawa7301e459b9e5
diff --git a/stuff/config/current.txt b/stuff/config/current.txt
index 4e034bd4c..bc933c2c2 100644
--- a/stuff/config/current.txt
+++ b/stuff/config/current.txt
@@ -1628,6 +1628,10 @@
<item>"STD_iwa_MotionFlowFx.normalizeType" "Normalize" </item>
<item>"STD_iwa_MotionFlowFx.normalizeRange" "Maximum Length" </item>
+ <item>"STD_iwa_SmootherFx" "Smoother Iwa" </item>
+ <item>"STD_iwa_SmootherFx.threshold" "Threshold" </item>
+ <item>"STD_iwa_SmootherFx.softness" "Softness" </item>
+
<!------------------------------ Tiled Particles Iwa ------------------------------------------->
<item>STD_iwa_TiledParticlesFx "Tiled Particles Iwa" </item>
diff --git a/stuff/profiles/layouts/fxs/STD_iwa_SmootherFx.xml b/stuff/profiles/layouts/fxs/STD_iwa_SmootherFx.xml
new file mode 100644
index 000000000..228645990
--- /dev/null
+++ b/stuff/profiles/layouts/fxs/STD_iwa_SmootherFx.xml
@@ -0,0 +1,6 @@
+<fxlayout>
+ <page name="Smoother Iwa">
+ <control>threshold</control>
+ <control>softness</control>
+ </page>
+</fxlayout>
diff --git a/stuff/profiles/layouts/fxs/fxs.lst b/stuff/profiles/layouts/fxs/fxs.lst
index bf424b093..1f8420c53 100644
--- a/stuff/profiles/layouts/fxs/fxs.lst
+++ b/stuff/profiles/layouts/fxs/fxs.lst
@@ -75,6 +75,7 @@
STD_rgbmFadeFx
STD_rgbmScaleFx
STD_sharpenFx
+ STD_iwa_SmootherFx
</Image_Adjust>
<Layer_Blending>
addFx
diff --git a/toonz/sources/common/tfx/trenderer.cpp b/toonz/sources/common/tfx/trenderer.cpp
index 7ecb260bf..f9894e912 100644
--- a/toonz/sources/common/tfx/trenderer.cpp
+++ b/toonz/sources/common/tfx/trenderer.cpp
@@ -1155,7 +1155,7 @@ void RenderTask::onFinished(TThread::RunnableP) {
rendererImp->m_rasterPool
.clear(); // Isn't this misplaced? Should be in the block
- } // below...
+ } // below...
// If no rendering task (of this or other render instances) is found...
if (rendererImp->m_undoneTasks == 0) {
@@ -1394,6 +1394,8 @@ void TRendererImp::startRendering(
std::vector<TRenderer::RenderData>::const_iterator it;
std::map<std::string, RenderTask *>::iterator jt;
+ bool forcePreComputation = false;
+
for (it = renderDatas.begin(); it != renderDatas.end(); ++it) {
// Check for user cancels
if (hasToDie(renderId)) return;
@@ -1427,6 +1429,11 @@ void TRendererImp::startRendering(
rs.m_offScreenSurface->setFormat(QSurfaceFormat::defaultFormat());
rs.m_offScreenSurface->create();
}
+ // (dirty fix) If the render contains smootherFx, then force precomputation
+ // even when the viewer preview, so that the level column affine can be
+ // retrieved in NaAffineFx::doDryCompute
+ if (alias.find("iwa_SmootherFx") != std::string::npos)
+ forcePreComputation = true;
// Search the alias among stored clusters - and store the frame
jt = clusters.find(alias);
@@ -1460,7 +1467,7 @@ void TRendererImp::startRendering(
// Precomputing
//----------------------------------------------------------------------
- if (m_precomputingEnabled) {
+ if (m_precomputingEnabled || forcePreComputation) {
// Set current maxTileSize for cache manager precomputation
const TRenderSettings &rs = renderDatas[0].m_info;
TPredictiveCacheManager::instance()->setMaxTileSize(rs.m_maxTileSize);
diff --git a/toonz/sources/common/tfx/unaryFx.cpp b/toonz/sources/common/tfx/unaryFx.cpp
index ad4deabf3..65eb1a2cb 100644
--- a/toonz/sources/common/tfx/unaryFx.cpp
+++ b/toonz/sources/common/tfx/unaryFx.cpp
@@ -142,8 +142,38 @@ TFx *NaAffineFx::clone(bool recursive) const {
//--------------------------------------------------
+void NaAffineFx::doDryCompute(TRectD &rect, double frame,
+ const TRenderSettings &info) {
+ // keep the level column dpi affine for an fx which need to be applied to the
+ // full sampled image (see Iwa_SmootherFx)
+ if (getName() == L"LevelColumn AffineFx") {
+ for (auto data : info.m_data) {
+ LevelColumnAffineFxRenderData *levelColumnData =
+ dynamic_cast<LevelColumnAffineFxRenderData *>(data.getPointer());
+ if (levelColumnData && levelColumnData->m_isSet == false) {
+ levelColumnData->m_aff = getPlacement(frame);
+ levelColumnData->m_isSet = true;
+ }
+ }
+ }
+ TRasterFx::doDryCompute(rect, frame, info);
+}
+
+//--------------------------------------------------
+
FX_IDENTIFIER_IS_HIDDEN(NaAffineFx, "naAffineFx")
+//==================================================================
+// LevelColumnAffineFxRenderData implementation
+//==================================================================
+
+bool LevelColumnAffineFxRenderData::operator==(
+ const TRasterFxRenderData &data) const {
+ const LevelColumnAffineFxRenderData *theData =
+ dynamic_cast<const LevelColumnAffineFxRenderData *>(&data);
+ return theData->m_aff == m_aff && theData->m_isSet == m_isSet;
+}
+
//==================================================================
// ColumnColorFilterFx
//==================================================================
@@ -226,7 +256,7 @@ public:
enableComputeInFloat(true);
};
- ~InvertFx(){};
+ ~InvertFx() {};
bool canHandle(const TRenderSettings &info, double frame) override {
return true;
diff --git a/toonz/sources/include/trasterfx.h b/toonz/sources/include/trasterfx.h
index 2a6125a4e..da379f3a5 100644
--- a/toonz/sources/include/trasterfx.h
+++ b/toonz/sources/include/trasterfx.h
@@ -432,6 +432,9 @@ public:
bool isDpiAffine() const { return m_isDpiAffine; }
std::string getPluginId() const override { return std::string(); }
+ void doDryCompute(TRectD &rect, double frame,
+ const TRenderSettings &info) override;
+
protected:
TRasterFxPort m_port;
@@ -444,6 +447,25 @@ private:
NaAffineFx &operator=(const NaAffineFx &);
};
+//**********************************************************************************************
+// LevelColumnAffineFxRenderData declaration
+// this data will keep the level column dpi affine for an fx which need to be
+// applied to the full sampled image (see Iwa_SmootherFx)
+//**********************************************************************************************
+
+class DVAPI LevelColumnAffineFxRenderData final : public TRasterFxRenderData {
+public:
+ TAffine m_aff;
+ bool m_isSet;
+
+public:
+ LevelColumnAffineFxRenderData() : m_isSet(false) {}
+
+ bool operator==(const TRasterFxRenderData &data) const override;
+ std::string toString() const override { return ""; }
+ float typeIndex() const override { return 1.f; }
+};
+
//******************************************************************************
// Global functions
//******************************************************************************
diff --git a/toonz/sources/stdfx/CMakeLists.txt b/toonz/sources/stdfx/CMakeLists.txt
index 4de06ec84..4abf1cd95 100644
--- a/toonz/sources/stdfx/CMakeLists.txt
+++ b/toonz/sources/stdfx/CMakeLists.txt
@@ -290,6 +290,7 @@ set(SOURCES
iwa_flowblurfx.cpp
iwa_flowpaintbrushfx.cpp
iwa_motionflowfx.cpp
+ iwa_smootherfx.cpp
)
if(OpenCV_FOUND)
diff --git a/toonz/sources/stdfx/iwa_smootherfx.cpp b/toonz/sources/stdfx/iwa_smootherfx.cpp
new file mode 100644
index 000000000..6b0c3062a
--- /dev/null
+++ b/toonz/sources/stdfx/iwa_smootherfx.cpp
@@ -0,0 +1,125 @@
+/*-----------------------------------------------------------------------------
+ Iwa_SmootherFx
+ 二値画像にスムージングをかける
+ -------------------------------------------------------------------------------*/
+
+#include "stdfx.h"
+#include "tfxparam.h"
+
+#include "timage_io.h"
+#include "trop.h"
+
+//=============================================================================
+
+class Iwa_SmootherFx final : public TStandardRasterFx {
+ FX_PLUGIN_DECLARATION(Iwa_SmootherFx)
+
+ TRasterFxPort m_input;
+ TIntParamP m_threshold;
+ TDoubleParamP m_softness;
+
+ TAffine m_levelColumnAff;
+
+public:
+ Iwa_SmootherFx() : m_threshold(10), m_softness(50) {
+ bindParam(this, "threshold", m_threshold);
+ bindParam(this, "softness", m_softness);
+ addInputPort("Source", m_input);
+ m_threshold->setValueRange(0, 256);
+ m_softness->setValueRange(0., 100.);
+ }
+
+ ~Iwa_SmootherFx() {};
+
+ bool doGetBBox(double frame, TRectD& bBox,
+ const TRenderSettings& info) override {
+ if (m_input.isConnected())
+ return m_input->doGetBBox(frame, bBox, info);
+ else {
+ bBox = TRectD();
+ return false;
+ }
+ }
+
+ void doCompute(TTile& tile, double frame, const TRenderSettings& ri) override;
+ bool canHandle(const TRenderSettings& info, double frame) override {
+ return false;
+ }
+ void doDryCompute(TRectD& rect, double frame,
+ const TRenderSettings& info) override;
+};
+
+//------------------------------------------------------------------------------
+
+void Iwa_SmootherFx::doCompute(TTile& tile, double frame,
+ const TRenderSettings& ri) {
+ if (!m_input.isConnected()) return;
+
+ int threshold = m_threshold->getValue();
+ double softness = m_softness->getValue(frame);
+
+ TTile tileIn;
+ TRenderSettings new_sets(ri);
+
+ new_sets.m_affine = m_levelColumnAff.inv();
+
+ TAffine rev_aff = ri.m_affine * new_sets.m_affine.inv();
+ TAffine rev_aff_inv = rev_aff.inv();
+ TRasterP tileRas(tile.getRaster());
+ TRectD tileRect(convert(tileRas->getBounds()) + tile.m_pos);
+
+ TPointD p00 = rev_aff_inv * tileRect.getP00();
+ TPointD p01 = rev_aff_inv * tileRect.getP01();
+ TPointD p10 = rev_aff_inv * tileRect.getP10();
+ TPointD p11 = rev_aff_inv * tileRect.getP11();
+ TRect in_rect;
+ in_rect.x0 = tfloor(std::min({p00.x, p10.x, p01.x, p11.x}));
+ in_rect.y0 = tfloor(std::min({p00.y, p10.y, p01.y, p11.y}));
+ in_rect.x1 = tceil(std::max({p00.x, p10.x, p01.x, p11.x}));
+ in_rect.y1 = tceil(std::max({p00.y, p10.y, p01.y, p11.y}));
+
+ m_input->allocateAndCompute(
+ tileIn, TPointD(in_rect.getP00().x, in_rect.getP00().y),
+ in_rect.getSize(), tile.getRaster(), frame, new_sets);
+
+ TRasterP inRas = tileIn.getRaster();
+ TRasterP aaRas = inRas->clone();
+ //! Inserts antialias around jaggy lines. Threshold is a pixel distance
+ //! intended from 0 to 256. Softness may vary from 0 to 100.
+ TRop::antialias(aaRas, inRas, threshold, softness);
+
+ TRenderSettings rev_sets(ri);
+ rev_sets.m_affine = rev_aff;
+ TRasterFx::applyAffine(tile, tileIn, rev_sets);
+}
+
+//------------------------------------------------------------------------------
+
+void Iwa_SmootherFx::doDryCompute(TRectD& rect, double frame,
+ const TRenderSettings& info) {
+ TRenderSettings ri(info);
+
+ LevelColumnAffineFxRenderData* levelColumnData;
+ bool found = false;
+ for (auto data : ri.m_data) {
+ levelColumnData =
+ dynamic_cast<LevelColumnAffineFxRenderData*>(data.getPointer());
+ if (levelColumnData) {
+ levelColumnData->m_isSet = false;
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ levelColumnData = new LevelColumnAffineFxRenderData();
+ ri.m_data.push_back(levelColumnData);
+ }
+
+ TRasterFx::doDryCompute(rect, frame, ri);
+
+ if (levelColumnData->m_isSet) m_levelColumnAff = levelColumnData->m_aff;
+}
+
+//------------------------------------------------------------------------------
+
+FX_PLUGIN_IDENTIFIER(Iwa_SmootherFx, "iwa_SmootherFx");
\ No newline at end of file