diff --git a/toonz/sources/colorfx/rasterstyles.h b/toonz/sources/colorfx/rasterstyles.h index bb40427..6bb7490 100644 --- a/toonz/sources/colorfx/rasterstyles.h +++ b/toonz/sources/colorfx/rasterstyles.h @@ -50,7 +50,9 @@ public: int getColorParamCount() const override { return 1; } TPixel32 getColorParamValue(int index) const override { return m_color; } - void setColorParamValue(int index, const TPixel32 &color) override { m_color = color; } + void setColorParamValue(int index, const TPixel32 &color) override { + m_color = color; + } QString getDescription() const override { return QCoreApplication::translate("TAirbrushRasterStyle", "Airbrush"); @@ -103,7 +105,7 @@ protected: void saveData(TOutputStreamInterface &) const override; // per la compatibilita' con il passato - void loadData(int oldId, TInputStreamInterface &) override {}; + void loadData(int oldId, TInputStreamInterface &) override{}; }; //============================================================================= @@ -158,7 +160,9 @@ public: assert(false); return TPixel32(); } - void setColorParamValue(int index, const TPixel32 &color) override { assert(false); } + void setColorParamValue(int index, const TPixel32 &color) override { + assert(false); + } int getTagId() const override { return 1151; } @@ -170,11 +174,11 @@ public: protected: void makeIcon(const TDimension &d) override; - void loadData(TInputStreamInterface &) override {}; - void saveData(TOutputStreamInterface &) const override {}; + void loadData(TInputStreamInterface &) override{}; + void saveData(TOutputStreamInterface &) const override{}; // per la compatibilita' con il passato - void loadData(int oldId, TInputStreamInterface &) override {}; + void loadData(int oldId, TInputStreamInterface &) override{}; }; #endif diff --git a/toonz/sources/colorfx/regionstyles.h b/toonz/sources/colorfx/regionstyles.h index 3463d35..1f1f81d 100644 --- a/toonz/sources/colorfx/regionstyles.h +++ b/toonz/sources/colorfx/regionstyles.h @@ -526,7 +526,9 @@ void setMainColor(const TPixel32 &color){ m_color0=color; } return QCoreApplication::translate("TChalkFillStyle", "Chalk"); } void loadData(int oldId, TInputStreamInterface &) override; - void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(1133); } + void getObsoleteTagIds(std::vector &ids) const override { + ids.push_back(1133); + } int getTagId() const override { return 1143; }; protected: diff --git a/toonz/sources/colorfx/strokestyles.cpp b/toonz/sources/colorfx/strokestyles.cpp index 0914071..09755e6 100644 --- a/toonz/sources/colorfx/strokestyles.cpp +++ b/toonz/sources/colorfx/strokestyles.cpp @@ -44,7 +44,9 @@ public: TStrokeProp *clone(const TStroke *stroke) const override; void draw(const TVectorRenderData &rd) override; - void draw(TFlash &flash) override { getColorStyle()->drawStroke(flash, getStroke()); } + void draw(TFlash &flash) override { + getColorStyle()->drawStroke(flash, getStroke()); + } }; //----------------------------------------------------------------------------- @@ -671,8 +673,8 @@ void TSprayStrokeStyle::drawStroke(const TColorFunction *cf, double length = stroke->getLength(); double step = 4; - double blend = m_blend; // distanza che controlla da dove il gessetto - // comincia il fade out (0, 1) + double blend = m_blend; // distanza che controlla da dove il gessetto + // comincia il fade out (0, 1) double intensity = m_intensity; // quanti punti vengono disegnati ad ogni // step double radius = m_radius; @@ -735,8 +737,8 @@ void TSprayStrokeStyle::drawStroke(TFlash &flash, const TStroke *stroke) const { double length = stroke->getLength(); double step = 4; - double blend = m_blend; // distanza che controlla da dove il gessetto - // comincia il fade out (0, 1) + double blend = m_blend; // distanza che controlla da dove il gessetto + // comincia il fade out (0, 1) double intensity = m_intensity; // quanti punti vengono disegnati ad ogni // step double radius = m_radius; @@ -3507,9 +3509,9 @@ void TBlendStrokeStyle2::computeData(PointsAndDoubles &data, else color = m_color; TPixelD dcolor; - dcolor = toPixelD(color); - bool firstRing = true; - double s = 0; + dcolor = toPixelD(color); + bool firstRing = true; + double s = 0; double maxfactor = 2 * m_blend / step; // max definisce il numero di // intervalli in cui la regione viene // divisa diff --git a/toonz/sources/colorfx/strokestyles.h b/toonz/sources/colorfx/strokestyles.h index 471aeb6..446e957 100644 --- a/toonz/sources/colorfx/strokestyles.h +++ b/toonz/sources/colorfx/strokestyles.h @@ -178,7 +178,8 @@ public: double getParamValue(TColorStyle::double_tag, int index) const override; void setParamValue(int index, double value) override; - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(const TColorFunction *cf, + const TStroke *stroke) const override; void drawStroke(TFlash &flash, const TStroke *stroke) const override; void loadData(TInputStreamInterface &is) override { @@ -226,7 +227,9 @@ public: const TStroke *stroke) const override; void drawStroke(TFlash &flash, const TStroke *s) const override; - void loadData(TInputStreamInterface &is) override { is >> m_color >> m_intensity; } + void loadData(TInputStreamInterface &is) override { + is >> m_color >> m_intensity; + } void saveData(TOutputStreamInterface &os) const override { os << m_color << m_intensity; } @@ -315,7 +318,9 @@ public: void setParamValue(int index, double value) override; void loadData(TInputStreamInterface &is) override { is >> m_color >> m_bend; } - void saveData(TOutputStreamInterface &os) const override { os << m_color << m_bend; } + void saveData(TOutputStreamInterface &os) const override { + os << m_color << m_bend; + } bool isSaveSupported() { return true; } int getTagId() const override { return 108; } @@ -378,7 +383,8 @@ public: TColorStyle *clone() const override; - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(const TColorFunction *cf, + const TStroke *stroke) const override; void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} @@ -413,7 +419,9 @@ public: bool isSaveSupported() { return true; } int getTagId() const override { return 136; }; - void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(112); } + void getObsoleteTagIds(std::vector &ids) const override { + ids.push_back(112); + } }; //------------------------------------------------------------------- @@ -445,10 +453,13 @@ public: double getParamValue(TColorStyle::double_tag, int index) const override; void setParamValue(int index, double value) override; - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(const TColorFunction *cf, + const TStroke *stroke) const override; void drawStroke(TFlash &fl, const TStroke *s) const override; - void loadData(TInputStreamInterface &is) override { is >> m_color >> m_density; } + void loadData(TInputStreamInterface &is) override { + is >> m_color >> m_density; + } void saveData(TOutputStreamInterface &os) const override { os << m_color << m_density; } @@ -488,10 +499,13 @@ public: m_color1 = color; } - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(const TColorFunction *cf, + const TStroke *stroke) const override; void drawStroke(TFlash &flash, const TStroke *stroke) const override; - void loadData(TInputStreamInterface &is) override { is >> m_color0 >> m_color1; } + void loadData(TInputStreamInterface &is) override { + is >> m_color0 >> m_color1; + } void loadData(int oldId, TInputStreamInterface &) override; void saveData(TOutputStreamInterface &os) const override { os << m_color0 << m_color1; @@ -499,7 +513,9 @@ public: bool isSaveSupported() { return true; } int getTagId() const override { return 114; }; - void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(137); } + void getObsoleteTagIds(std::vector &ids) const override { + ids.push_back(137); + } }; //------------------------------------------------------------------- @@ -647,7 +663,9 @@ public: } int getTagId() const override { return 120; }; - void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(121); } + void getObsoleteTagIds(std::vector &ids) const override { + ids.push_back(121); + } }; //------------------------------------------------------------------- @@ -692,7 +710,9 @@ public: os << m_color << m_blend << m_intensity << m_in << m_out << m_noise; } int getTagId() const override { return 123; }; - void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(105); } + void getObsoleteTagIds(std::vector &ids) const override { + ids.push_back(105); + } }; //------------------------------------------------------------------- @@ -740,7 +760,9 @@ public: bool isSaveSupported() { return true; } int getTagId() const override { return 125; }; - void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(110); } + void getObsoleteTagIds(std::vector &ids) const override { + ids.push_back(110); + } }; //------------------------------------------------------------------- @@ -833,7 +855,9 @@ public: void setParamValue(int index, double value) override; int getTagId() const override { return 127; }; - void loadData(TInputStreamInterface &is) override { is >> m_color >> m_parameter; } + void loadData(TInputStreamInterface &is) override { + is >> m_color >> m_parameter; + } void saveData(TOutputStreamInterface &os) const override { os << m_color << m_parameter; } @@ -1049,7 +1073,9 @@ public: os << m_color << m_parameter << m_thick; } int getTagId() const override { return 133; }; - void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(102); } + void getObsoleteTagIds(std::vector &ids) const override { + ids.push_back(102); + } }; //------------------------------------------------------------------- diff --git a/toonz/sources/common/expressions/tgrammar.cpp b/toonz/sources/common/expressions/tgrammar.cpp index d8f582f..0715ff8 100644 --- a/toonz/sources/common/expressions/tgrammar.cpp +++ b/toonz/sources/common/expressions/tgrammar.cpp @@ -220,7 +220,9 @@ class NotNode : public CalculatorNode { public: NotNode(Calculator *calc, CalculatorNode *a) : CalculatorNode(calc), m_a(a) {} - double compute(double vars[3]) const override { return m_a->compute(vars) == 0; } + double compute(double vars[3]) const override { + return m_a->compute(vars) == 0; + } void accept(CalculatorNodeVisitor &visitor) override { m_a->accept(visitor); } }; //------------------------------------------------------------------- @@ -423,7 +425,8 @@ public: : m_opName(opName), m_priority(priority) {} int getPriority() const override { return m_priority; } std::string getFirstKeyword() const override { return m_opName; } - bool expressionExpected(const std::vector &previousTokens) const override { + bool expressionExpected( + const std::vector &previousTokens) const override { return previousTokens.empty() || previousTokens.size() == 2; } bool matchToken(const std::vector &previousTokens, @@ -456,7 +459,8 @@ public: int getPriority() const override { return 50; } std::string getFirstKeyword() const override { return "-"; } - bool expressionExpected(const std::vector &previousTokens) const override { + bool expressionExpected( + const std::vector &previousTokens) const override { return previousTokens.size() == 1; } bool matchToken(const std::vector &previousTokens, @@ -492,7 +496,8 @@ public: int getPriority() const override { return 5; } std::string getFirstKeyword() const override { return m_prefix; } - bool expressionExpected(const std::vector &previousTokens) const override { + bool expressionExpected( + const std::vector &previousTokens) const override { return previousTokens.size() == 1; } bool matchToken(const std::vector &previousTokens, @@ -523,7 +528,8 @@ public: int getPriority() const override { return 5; } std::string getFirstKeyword() const override { return "?"; } - bool expressionExpected(const std::vector &previousTokens) const override { + bool expressionExpected( + const std::vector &previousTokens) const override { int i = (int)previousTokens.size(); return i == 0 || i == 2 || i == 4; } @@ -557,7 +563,8 @@ public: int getPriority() const override { return 5; } std::string getFirstKeyword() const override { return "("; } - bool expressionExpected(const std::vector &previousTokens) const override { + bool expressionExpected( + const std::vector &previousTokens) const override { return previousTokens.size() == 1; } bool matchToken(const std::vector &previousTokens, @@ -604,7 +611,8 @@ public: void addOptionalArg(double value) { m_optionalArgDefaults.push_back(value); } std::string getFirstKeyword() const override { return m_functionName; } - bool expressionExpected(const std::vector &previousTokens) const override { + bool expressionExpected( + const std::vector &previousTokens) const override { int n = (int)previousTokens.size(); return 2 <= n && (n & 1) == 0; } diff --git a/toonz/sources/common/psdlib/psd.cpp b/toonz/sources/common/psdlib/psd.cpp index fb5452f..10db96c 100644 --- a/toonz/sources/common/psdlib/psd.cpp +++ b/toonz/sources/common/psdlib/psd.cpp @@ -1050,7 +1050,7 @@ void readChannel(FILE *f, TPSDLayerInfo *li, count = fread(zipdata, 1, chan->length - 2, f); // if(count < chan->length - 2) // alwayswarn("ZIP data short: wanted %d bytes, got %d", - //chan->length, count); + // chan->length, count); chan->unzipdata = (unsigned char *)mymalloc(chan->rows * chan->rowbytes); diff --git a/toonz/sources/common/tapptools/tcli.cpp b/toonz/sources/common/tapptools/tcli.cpp index 2d4790e..1bef3ca 100644 --- a/toonz/sources/common/tapptools/tcli.cpp +++ b/toonz/sources/common/tapptools/tcli.cpp @@ -40,8 +40,8 @@ void printLibRelease(ostream &out) { out << "Tnzcore 1.0 - " __DATE__ << endl; } class SpecialUsageElement : public UsageElement { public: SpecialUsageElement(std::string name) : UsageElement(name, " "){}; - void dumpValue(ostream &) const override {}; - void resetValue() override {}; + void dumpValue(ostream &) const override{}; + void resetValue() override{}; }; //--------------------------------------------------------- diff --git a/toonz/sources/common/tcache/timagecache.cpp b/toonz/sources/common/tcache/timagecache.cpp index 975eb8e..687f7b6 100644 --- a/toonz/sources/common/tcache/timagecache.cpp +++ b/toonz/sources/common/tcache/timagecache.cpp @@ -773,7 +773,7 @@ inline TINT32 hasExternalReferences(const TImageP &img) { if (timg) refCount = timg->getRaster()->getRefCount() - 1; //!!! the TToonzImage::getRaster method increments raster - //!refCount!(the TRasterImage::getRaster don't) + //! refCount!(the TRasterImage::getRaster don't) } #endif diff --git a/toonz/sources/common/tcore/tmathutil.cpp b/toonz/sources/common/tcore/tmathutil.cpp index 67c3773..4ce50a9 100644 --- a/toonz/sources/common/tcore/tmathutil.cpp +++ b/toonz/sources/common/tcore/tmathutil.cpp @@ -713,7 +713,7 @@ int rootFinding(const std::vector &in_poly, std::vector &sol) { sol.push_back(0.0); p.erase(p.begin()); // se i coefficienti bassi sono zero, ci sono soluzioni // pari a 0.0. le metto, - } // e abbasso il grado del polinomio(piu' veloce) + } // e abbasso il grado del polinomio(piu' veloce) switch (p.size()) { case 0: diff --git a/toonz/sources/common/tfx/binaryFx.cpp b/toonz/sources/common/tfx/binaryFx.cpp index e3d0995..e6f8b37 100644 --- a/toonz/sources/common/tfx/binaryFx.cpp +++ b/toonz/sources/common/tfx/binaryFx.cpp @@ -59,7 +59,9 @@ public: return (g == 0) ? &m_group : 0; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override { @@ -69,10 +71,13 @@ public: return TRasterFx::memorySize(rect, info.m_bpp); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override; void compatibilityTranslatePort(int majorVersion, int minorVersion, std::string &portName) override; @@ -253,7 +258,8 @@ class OverFx : public TImageCombinationFx { public: OverFx() { setName(L"OverFx"); } - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::over(down, up); } }; @@ -268,7 +274,8 @@ class AddFx : public TImageCombinationFx { public: AddFx() : m_value(100.0) { bindParam(this, "value", m_value); } - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { double value = m_value->getValue(frame) / 100.0; if (value != 1.0) @@ -286,7 +293,8 @@ class ColorDodgeFx : public TImageCombinationFx { FX_DECLARATION(AddFx) public: - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::colordodge(up, down, down); } @@ -299,7 +307,8 @@ class ColorBurnFx : public TImageCombinationFx { FX_DECLARATION(AddFx) public: - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::colorburn(up, down, down); } @@ -314,7 +323,8 @@ class ScreenFx : public TImageCombinationFx { public: bool requiresFullRect() override { return true; } - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::screen(up, down, down); } @@ -331,7 +341,8 @@ class SubFx : public TImageCombinationFx { public: SubFx() : m_matte(false) { bindParam(this, "matte", m_matte); } - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::sub(up, down, down, m_matte->getValue()); } @@ -354,7 +365,8 @@ public: bool requiresFullRect() override { return m_matte->getValue(); } - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::mult(up, down, down, m_value->getValue(frame), m_matte->getValue()); } @@ -373,7 +385,8 @@ public: bool requiresFullRect() override { return true; } - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::ropmin(up, down, down, m_matte->getValue()); } @@ -386,7 +399,8 @@ class MaxFx : public TImageCombinationFx { FX_DECLARATION(MaxFx) public: - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::ropmax(up, down, down); } @@ -399,7 +413,8 @@ class LinearBurnFx : public TImageCombinationFx { FX_DECLARATION(LinearBurnFx) public: - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::linearburn(up, down, down); } @@ -416,7 +431,8 @@ public: OverlayFx() {} ~OverlayFx() {} - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { TRop::overlay(up, down, down); } }; @@ -436,7 +452,8 @@ public: bool requiresFullRect() override { return true; } - void process(const TRasterP &up, const TRasterP &down, double frame) override { + void process(const TRasterP &up, const TRasterP &down, + double frame) override { double value = 0.01 * m_value->getValue(frame); UCHAR matteValue = (UCHAR)(value * 255.0 + 0.5); @@ -464,7 +481,8 @@ public: ~InFx() {} - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bbox, + const TRenderSettings &info) override { if (m_matte.isConnected() && m_source.isConnected()) { bool ret = m_matte->doGetBBox(frame, bbox, info); @@ -477,9 +495,12 @@ public: return false; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { // This fx is not visible if either the source or the matte tiles are empty. // It's because only source is visible, and only where matte is opaque. if (!(m_source.isConnected() && m_matte.isConnected())) return; @@ -494,7 +515,8 @@ public: TRop::ropin(srcTile.getRaster(), tile.getRaster(), tile.getRaster()); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { if (!(m_source.isConnected() && m_matte.isConnected())) return; m_source->dryCompute(rect, frame, info); @@ -541,15 +563,19 @@ public: ~OutFx() {} - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bbox, + const TRenderSettings &info) override { if (m_source.isConnected()) return m_source->doGetBBox(frame, bbox, info); return false; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { // If there is no source, do nothing if (!m_source.isConnected()) return; @@ -570,7 +596,8 @@ public: TRop::ropout(srcTile.getRaster(), tile.getRaster(), tile.getRaster()); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { if (!m_source.isConnected()) return; if (!m_matte.isConnected()) { @@ -601,9 +628,12 @@ public: addInputPort("Down", m_dn); } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { bBox = TRectD(); { @@ -625,7 +655,8 @@ public: return (bBox.getLx() >= 0) && (bBox.getLy() >= 0); } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { // Here it's just like matte in, but the matte is visible under up. if (!m_dn.isConnected()) return; @@ -644,7 +675,8 @@ public: TRop::atop(upTile.getRaster(), tile.getRaster(), tile.getRaster()); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { if (!m_dn.isConnected()) return; if (!m_up.isConnected()) { diff --git a/toonz/sources/common/tfx/unaryFx.cpp b/toonz/sources/common/tfx/unaryFx.cpp index c10a31e..afcd10f 100644 --- a/toonz/sources/common/tfx/unaryFx.cpp +++ b/toonz/sources/common/tfx/unaryFx.cpp @@ -191,9 +191,12 @@ public: ~InvertFx(){}; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -203,7 +206,8 @@ public: } }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { if (!m_input.isConnected()) return; m_input->compute(tile, frame, ri); diff --git a/toonz/sources/common/tfx/zeraryFx.cpp b/toonz/sources/common/tfx/zeraryFx.cpp index 958d622..8adaeee 100644 --- a/toonz/sources/common/tfx/zeraryFx.cpp +++ b/toonz/sources/common/tfx/zeraryFx.cpp @@ -28,9 +28,12 @@ public: setName(L"ColorCardFx"); } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; } @@ -71,14 +74,17 @@ public: setName(L"CheckBoardFx"); } - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override { const TPixel32 &c1 = m_color1->getValue(frame); const TPixel32 &c2 = m_color2->getValue(frame); diff --git a/toonz/sources/common/tiio/bmp/filebmp.c b/toonz/sources/common/tiio/bmp/filebmp.c index 7a75cd9..dcffcb8 100644 --- a/toonz/sources/common/tiio/bmp/filebmp.c +++ b/toonz/sources/common/tiio/bmp/filebmp.c @@ -1600,8 +1600,8 @@ int write_bmp_header(FILE *fp, BMP_HEADER *hd) putshort(fp, (int)hd->biPlanes); /* must be '1' */ putshort(fp, (int)hd->biBitCount); /* 1,4,8, or 24 */ putint(fp, - (int)hd->biCompression); /* BMP_BI_RGB, BMP_BI_RLE8 or BMP_BI_RLE4 */ - putint(fp, (int)hd->biSizeImage); /* size of raw image data */ + (int)hd->biCompression); /* BMP_BI_RGB, BMP_BI_RLE8 or BMP_BI_RLE4 */ + putint(fp, (int)hd->biSizeImage); /* size of raw image data */ putint(fp, (int)hd->biXPelsPerMeter); /* dpi * 39" per meter */ putint(fp, (int)hd->biYPelsPerMeter); /* dpi * 39" per meter */ putint(fp, (int)hd->biClrUsed); /* colors used in cmap */ diff --git a/toonz/sources/common/timage_io/timage_io.cpp b/toonz/sources/common/timage_io/timage_io.cpp index f703aa7..4d8c849 100644 --- a/toonz/sources/common/timage_io/timage_io.cpp +++ b/toonz/sources/common/timage_io/timage_io.cpp @@ -106,7 +106,7 @@ void TImageReader::open() { assert(m_file == NULL); std::string type = toLower(m_path.getType()); - m_file = fopen(m_path, "rb"); // Opens for reading. If the file does not + m_file = fopen(m_path, "rb"); // Opens for reading. If the file does not // exist or cannot be found, the fopen_s call // fails diff --git a/toonz/sources/common/trop/borders_extractor.hpp b/toonz/sources/common/trop/borders_extractor.hpp index 74549bc..3fd8d61 100644 --- a/toonz/sources/common/trop/borders_extractor.hpp +++ b/toonz/sources/common/trop/borders_extractor.hpp @@ -64,7 +64,7 @@ void _readBorder(const TRasterPT &rin, const PixelSelector &selector, RasterEdgeIterator it(rin, selector, TPoint(x, y), counter ? TPoint(1, 0) : TPoint(0, 1)); //++it; //As we could be in the middle of a straight edge, increment to get - //a corner + // a corner TPoint start(it.pos()), startDir(it.dir()); reader.openContainer(it); diff --git a/toonz/sources/common/trop/quickput.cpp b/toonz/sources/common/trop/quickput.cpp index e30bd4d..f8900f6 100644 --- a/toonz/sources/common/trop/quickput.cpp +++ b/toonz/sources/common/trop/quickput.cpp @@ -4207,15 +4207,14 @@ void TRop::quickPut(const TRasterP &dn, const TRasterCM32P &upCM32, // //============================================================================= -void TRop::quickPut( - const TRasterP &dn, const TRasterCM32P &upCM32, const TPaletteP &plt, - const TAffine &aff, - const CmappedQuickputSettings &settings) // const TPixel32& - // globalColorScale, bool - // inksOnly, bool - // transparencyCheck, bool - // blackBgCheck, int inkIndex, int - // paintIndex) +void TRop::quickPut(const TRasterP &dn, const TRasterCM32P &upCM32, + const TPaletteP &plt, const TAffine &aff, + const CmappedQuickputSettings &settings) // const TPixel32& +// globalColorScale, bool +// inksOnly, bool +// transparencyCheck, bool +// blackBgCheck, int inkIndex, int +// paintIndex) { TRaster32P dn32 = dn; if (dn32 && upCM32) diff --git a/toonz/sources/common/trop/tdistancetransform.cpp b/toonz/sources/common/trop/tdistancetransform.cpp index 401ca33..6810832 100644 --- a/toonz/sources/common/trop/tdistancetransform.cpp +++ b/toonz/sources/common/trop/tdistancetransform.cpp @@ -9,7 +9,7 @@ #include //#define UNIT_TEST // Enables unit -//testing at program startup +// testing at program startup //************************************************************************ // Rationale diff --git a/toonz/sources/common/trop/tresample.cpp b/toonz/sources/common/trop/tresample.cpp index 5751f02..d79a180 100644 --- a/toonz/sources/common/trop/tresample.cpp +++ b/toonz/sources/common/trop/tresample.cpp @@ -3070,12 +3070,12 @@ void do_resample(TRasterCM32P rout, const TRasterCM32P &rin, *out_tcm++ = tcm[0]; // If they are all equal, it's a copy-op else { // Otherwise, take the bilinear coordinates - fu = u_ - u; - gu = 1. - fu; - fv = v_ - v; - gv = 1. - fv; - w[0] = gu * gv; - w[2] = gu * fv; // And the associated weights + fu = u_ - u; + gu = 1. - fu; + fv = v_ - v; + gv = 1. - fv; + w[0] = gu * gv; + w[2] = gu * fv; // And the associated weights w[1] = fu * gv; w[3] = fu * fv; color_blobs = pencil_blobs = 0; diff --git a/toonz/sources/common/tsound/tsound_l.cpp b/toonz/sources/common/tsound/tsound_l.cpp index 340096f..efda15f 100644 --- a/toonz/sources/common/tsound/tsound_l.cpp +++ b/toonz/sources/common/tsound/tsound_l.cpp @@ -134,7 +134,7 @@ bool TSoundOutputDeviceImp::doOpenDevice() { // le chiamate a questa ioctl sono state commentate perche' pag 36 doc OSS //"this ioctl stop the device immadiately and returns it to a state where - //it + // it // can accept new parameters. It Should not be called after opening the device // as it may cause unwanted side effect in his situation. require to abort // play @@ -2058,8 +2058,9 @@ TSoundTrackFormat TSoundInputDevice::getPreferredFormat( //****************************************************************************** //****************************************************************************** -// funzioni per l'interazione con la libreria -//OSS +// funzioni per l'interazione con la +//libreria +// OSS //****************************************************************************** //****************************************************************************** namespace { diff --git a/toonz/sources/common/tsound/tsound_x.cpp b/toonz/sources/common/tsound/tsound_x.cpp index a1e9f21..fb1b40e 100644 --- a/toonz/sources/common/tsound/tsound_x.cpp +++ b/toonz/sources/common/tsound/tsound_x.cpp @@ -988,8 +988,9 @@ bool TSoundInputDevice::isRecording() { return m_imp->m_isRecording; } //****************************************************************************** //****************************************************************************** -// funzioni per l'interazione con la libreria -//audio +// funzioni per l'interazione con la +//libreria +// audio //****************************************************************************** //****************************************************************************** namespace { diff --git a/toonz/sources/common/tsystem/tfilepath.cpp b/toonz/sources/common/tsystem/tfilepath.cpp index f8d4bf1..215a042 100644 --- a/toonz/sources/common/tsystem/tfilepath.cpp +++ b/toonz/sources/common/tsystem/tfilepath.cpp @@ -528,7 +528,7 @@ std::string TFilePath::getUndottedType() std::wstring TFilePath::getWideName() const // noDot! noSlash! { - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash std::wstring str = m_path.substr(i + 1); i = str.rfind(L"."); if (i == (int)std::wstring::npos) return str; @@ -559,7 +559,7 @@ std::string TFilePath::getLevelName() const { // es. TFilePath("/pippo/pluto.0001.gif").getLevelName() == "pluto..gif" std::wstring TFilePath::getLevelNameW() const { - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash std::wstring str = m_path.substr(i + 1); // str e' m_path senza directory int j = str.rfind(L"."); // str[j..] = ".type" @@ -607,7 +607,7 @@ bool TFilePath::isLevelName() const { } TFrameId TFilePath::getFrame() const { - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash std::wstring str = m_path.substr(i + 1); // str e' il path senza parentdir i = str.rfind(L'.'); if (i == (int)std::wstring::npos || str == L"." || str == L"..") @@ -640,7 +640,7 @@ TFrameId TFilePath::getFrame() const { TFilePath TFilePath::withType(const std::string &type) const { assert(type.length() < 2 || type.substr(0, 2) != ".."); - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash std::wstring str = m_path.substr(i + 1); // str e' il path senza parentdir int j = str.rfind(L'.'); if (j == (int)std::wstring::npos || str == L"..") @@ -673,7 +673,7 @@ TFilePath TFilePath::withName(const std::string &name) const { //----------------------------------------------------------------------------- TFilePath TFilePath::withName(const std::wstring &name) const { - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash std::wstring str = m_path.substr(i + 1); // str e' il path senza parentdir int j; j = str.rfind(L'.'); @@ -712,7 +712,7 @@ TFilePath TFilePath::withParentDir(const TFilePath &dir) const { TFilePath TFilePath::withFrame(const TFrameId &frame, TFrameId::FrameFormat format) const { const std::wstring dot = L".", dotDot = L".."; - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash std::wstring str = m_path.substr(i + 1); // str e' il path senza parentdir assert(str != dot && str != dotDot); int j = str.rfind(L'.'); diff --git a/toonz/sources/common/tsystem/tlogger.cpp b/toonz/sources/common/tsystem/tlogger.cpp index bd4e4a0..48f85fa 100644 --- a/toonz/sources/common/tsystem/tlogger.cpp +++ b/toonz/sources/common/tsystem/tlogger.cpp @@ -30,7 +30,9 @@ public: ++it) (*it)->onLogChanged(); } - TThread::Message *clone() const override { return new ListenerNotifier(*this); } + TThread::Message *clone() const override { + return new ListenerNotifier(*this); + } }; void notify() { diff --git a/toonz/sources/common/tunit/tunit.cpp b/toonz/sources/common/tunit/tunit.cpp index 5c3af67..b6134a7 100644 --- a/toonz/sources/common/tunit/tunit.cpp +++ b/toonz/sources/common/tunit/tunit.cpp @@ -42,7 +42,9 @@ public: static double m_fieldGuideAspectRatio; VerticalFldUnitConverter(double factor) : m_factor(factor) {} - TUnitConverter *clone() const override { return new VerticalFldUnitConverter(*this); } + TUnitConverter *clone() const override { + return new VerticalFldUnitConverter(*this); + } double convertTo(double v) const override { return v * m_fieldGuideAspectRatio * m_factor; } @@ -72,7 +74,9 @@ class TangentConverter : public TUnitConverter { public: TangentConverter() {} TUnitConverter *clone() const override { return new TangentConverter(*this); } - double convertTo(double v) const override { return atan(v) * (M_1_PI * 180.0); } + double convertTo(double v) const override { + return atan(v) * (M_1_PI * 180.0); + } double convertFrom(double v) const override { return tan(v * M_PI_180); } }; @@ -81,7 +85,9 @@ public: class TPixelUnitXConverter : public TUnitConverter { public: TPixelUnitXConverter() {} - TUnitConverter *clone() const override { return new TPixelUnitXConverter(*this); } + TUnitConverter *clone() const override { + return new TPixelUnitXConverter(*this); + } double convertTo(double v) const override { return v * UnitParameters::currentDpiGetter().first; } @@ -93,7 +99,9 @@ public: class TPixelUnitYConverter : public TUnitConverter { public: TPixelUnitYConverter() {} - TUnitConverter *clone() const override { return new TPixelUnitYConverter(*this); } + TUnitConverter *clone() const override { + return new TPixelUnitYConverter(*this); + } double convertTo(double v) const override { return v * UnitParameters::currentDpiGetter().second; } @@ -532,7 +540,9 @@ public: return new ZDepthUnitConverter(m_cameraSizeProvider); } inline double getCameraSize() const { return (*m_cameraSizeProvider)(); } - double convertTo(double v) const override { return (1 - v * 0.001) * getCameraSize(); } + double convertTo(double v) const override { + return (1 - v * 0.001) * getCameraSize(); + } double convertFrom(double v) const override { return (1 - v / getCameraSize()) * 1000.0; } @@ -551,7 +561,9 @@ public: return new CameraZDepthUnitConverter(m_cameraSizeProvider); } inline double getCameraSize() const { return (*m_cameraSizeProvider)(); } - double convertTo(double v) const override { return (1 + v * 0.001) * getCameraSize(); } + double convertTo(double v) const override { + return (1 + v * 0.001) * getCameraSize(); + } double convertFrom(double v) const override { return (v / getCameraSize() - 1) * 1000.0; } @@ -571,8 +583,12 @@ public: return new ZDepthHandleUnitConverter(m_cameraSizeProvider); } inline double getCameraSize() const { return (*m_cameraSizeProvider)(); } - double convertTo(double v) const override { return -v * 0.001 * getCameraSize(); } - double convertFrom(double v) const override { return (-v / getCameraSize()) * 1000.0; } + double convertTo(double v) const override { + return -v * 0.001 * getCameraSize(); + } + double convertFrom(double v) const override { + return (-v / getCameraSize()) * 1000.0; + } }; class CameraZDepthHandleUnitConverter : public TUnitConverter { @@ -587,8 +603,12 @@ public: return new CameraZDepthHandleUnitConverter(m_cameraSizeProvider); } inline double getCameraSize() const { return (*m_cameraSizeProvider)(); } - double convertTo(double v) const override { return v * 0.001 * getCameraSize(); } - double convertFrom(double v) const override { return (v / getCameraSize()) * 1000.0; } + double convertTo(double v) const override { + return v * 0.001 * getCameraSize(); + } + double convertFrom(double v) const override { + return (v / getCameraSize()) * 1000.0; + } }; } // namespace diff --git a/toonz/sources/common/tvectorimage/tcomputeregions.cpp b/toonz/sources/common/tvectorimage/tcomputeregions.cpp index 758dedd..9baa196 100644 --- a/toonz/sources/common/tvectorimage/tcomputeregions.cpp +++ b/toonz/sources/common/tvectorimage/tcomputeregions.cpp @@ -2258,12 +2258,10 @@ void TVectorImage::Imp::findIntersections() { for (i = 0; i < strokeSize; i++) { TStroke *s1 = strokeArray[i]->m_s; if (strokeArray[i]->m_isPoint) continue; - for ( - j = i; - j < - strokeSize /*&& (strokeArray[i]->getBBox().x1>= strokeArray[j]->getBBox().x0)*/ - ; - j++) { + for (j = i; j < strokeSize /*&& (strokeArray[i]->getBBox().x1>= + strokeArray[j]->getBBox().x0)*/ + ; + j++) { TStroke *s2 = strokeArray[j]->m_s; if (strokeArray[j]->m_isPoint || diff --git a/toonz/sources/common/tvectorimage/tregionutil.cpp b/toonz/sources/common/tvectorimage/tregionutil.cpp index 163c4e8..15e6dfd 100644 --- a/toonz/sources/common/tvectorimage/tregionutil.cpp +++ b/toonz/sources/common/tvectorimage/tregionutil.cpp @@ -1689,12 +1689,10 @@ void TVectorImage::Imp::findIntersections() { for (i = 0; i < strokeSize; i++) { TStroke *s1 = strokeArray[i]->m_s; if (strokeArray[i]->m_isPoint) continue; - for ( - j = i; - j < - strokeSize /*&& (strokeArray[i]->getBBox().x1>= strokeArray[j]->getBBox().x0)*/ - ; - j++) { + for (j = i; j < strokeSize /*&& (strokeArray[i]->getBBox().x1>= + strokeArray[j]->getBBox().x0)*/ + ; + j++) { TStroke *s2 = strokeArray[j]->m_s; if (strokeArray[j]->m_isPoint) continue; if (!(strokeArray[i]->m_isNewForFill || strokeArray[j]->m_isNewForFill)) diff --git a/toonz/sources/common/tvectorimage/tsweepboundary.cpp b/toonz/sources/common/tvectorimage/tsweepboundary.cpp index 0d1b41e..138b2d5 100644 --- a/toonz/sources/common/tvectorimage/tsweepboundary.cpp +++ b/toonz/sources/common/tvectorimage/tsweepboundary.cpp @@ -419,7 +419,7 @@ inline bool getOutputOutlines(LinkedQuadraticList &inputBoundaries, } while (current != first && !inputBoundaries.empty()); sweepStrokes.push_back(new TStroke(v)); // sort(outputOutlines[count].begin(), outputOutlines[count].end(), - //CompareQuadratics()); + // CompareQuadratics()); } inputBoundaries.clear(); return true; @@ -539,7 +539,7 @@ inline void computeStrokeBoundary(const TStroke &stroke, if (!(rwdP2 == fwdP0)) { // inputBoundaries.push_front(TQuadratic(rwdP2, (rwdP2+fwdP0)*0.5, - //fwdP0)); + // fwdP0)); vector quadArray; splitCircularArcIntoQuadraticCurves((rwdP2 + fwdP0) * 0.5, rwdP2, fwdP0, quadArray); @@ -777,9 +777,9 @@ inline void computeStrokeBoundary(const TStroke &stroke, rwdP2 = nextRwdP2; } else { // inputBoundaries.push_back(TQuadratic(fwdP0, - //fwdP1, fwdP2)); + // fwdP1, fwdP2)); // inputBoundaries.push_front(TQuadratic(rwdP0, - //rwdP1, rwdP2)); + // rwdP1, rwdP2)); // fwdP0 = nextFwdP0; // rwdP2 = nextRwdP2; ++chunkIndex; @@ -794,7 +794,7 @@ inline void computeStrokeBoundary(const TStroke &stroke, normalizeTThickQuadratic(thickQuadratic, tempThickQuadratic); // if( stroke->getChunk(0)->getP0() == - //stroke->getChunk(chunkCount-1)->getP2() ) + // stroke->getChunk(chunkCount-1)->getP2() ) /* if( norm(stroke->getChunk(0)->getP0() - stroke->getChunk(chunkCount-1)->getP2()) < stroke->getChunk(0)->getThickP0().thick/2) { @@ -1413,7 +1413,7 @@ inline bool deleteUnlinkedLoops(LinkedQuadraticList &inputBoundaries) { int count; if (it->prev == 0) { // if( nonSimpleCrossing.find(it->getP0()) != - //nonSimpleCrossing.end() ) + // nonSimpleCrossing.end() ) // isNonSimpleBranch = true; // else isNonSimpleBranch = false; count = inputBoundaries.size(); @@ -1422,7 +1422,8 @@ inline bool deleteUnlinkedLoops(LinkedQuadraticList &inputBoundaries) { assert(count > 0); if (count == 0) return false; if (nonSimpleCrossing.find(current->getP2()) != nonSimpleCrossing.end()) - // || simpleCrossing.find(current->getP2()) + // || + //simpleCrossing.find(current->getP2()) //!= simpleCrossing.end() ) { if (current->next) current->next->prev = 0; @@ -1446,7 +1447,7 @@ inline bool deleteUnlinkedLoops(LinkedQuadraticList &inputBoundaries) { } } else if (it->next == 0) { // if( nonSimpleCrossing.find(it->getP2()) != - //nonSimpleCrossing.end() ) + // nonSimpleCrossing.end() ) // isNonSimpleBranch = true; // else isNonSimpleBranch = false; count = inputBoundaries.size(); @@ -1455,7 +1456,8 @@ inline bool deleteUnlinkedLoops(LinkedQuadraticList &inputBoundaries) { assert(count > 0); if (count == 0) return false; if (nonSimpleCrossing.find(current->getP0()) != nonSimpleCrossing.end()) - // || simpleCrossing.find(current->getP0()) + // || + //simpleCrossing.find(current->getP0()) //!= simpleCrossing.end() ) { if (current->prev) current->prev->next = 0; diff --git a/toonz/sources/common/tvectorimage/tvectorimageP.h b/toonz/sources/common/tvectorimage/tvectorimageP.h index 6b9b3fe..ebc0ec6 100644 --- a/toonz/sources/common/tvectorimage/tvectorimageP.h +++ b/toonz/sources/common/tvectorimage/tvectorimageP.h @@ -228,7 +228,7 @@ private: // gruppo o il move di strokes //--------------------NUOVO CALCOLO - //REGIONI------------------------------------------------ + // REGIONI------------------------------------------------ public: #ifdef LEVO diff --git a/toonz/sources/common/tvrender/tflash.cpp b/toonz/sources/common/tvrender/tflash.cpp index 999b837..009e09a 100644 --- a/toonz/sources/common/tvrender/tflash.cpp +++ b/toonz/sources/common/tvrender/tflash.cpp @@ -159,10 +159,10 @@ public: //------------------------------------------------------------------- -const int c_soundRate = 5512; // 5512; //11025 -const int c_soundBps = 16; -const bool c_soundIsSigned = false; -const int c_soundChannelNum = 1; +const int c_soundRate = 5512; // 5512; //11025 +const int c_soundBps = 16; +const bool c_soundIsSigned = false; +const int c_soundChannelNum = 1; const int c_soundCompression = 3; // per compatibilita' con MAC!!! //------------------------------------------------------------------- diff --git a/toonz/sources/common/tvrender/tfont_mac.cpp b/toonz/sources/common/tvrender/tfont_mac.cpp index d260058..81d99c9 100644 --- a/toonz/sources/common/tvrender/tfont_mac.cpp +++ b/toonz/sources/common/tvrender/tfont_mac.cpp @@ -38,7 +38,7 @@ typedef struct { } MyGlyphRecord; //----------------------------------------- -//callback--------------------------------------------------------------------- +// callback--------------------------------------------------------------------- OSStatus MyQuadraticLineProc(const Float32Point *pt1, const Float32Point *pt2, void *callBackDataPtr) { diff --git a/toonz/sources/common/tvrender/tinbetween.cpp b/toonz/sources/common/tvrender/tinbetween.cpp index 2849912..a8faa5b 100644 --- a/toonz/sources/common/tvrender/tinbetween.cpp +++ b/toonz/sources/common/tvrender/tinbetween.cpp @@ -1248,7 +1248,7 @@ TDebugMessage::flush(); } ///////////////////////////////////////// compute centre of Rotation and - ///Scaling + /// Scaling std::vector vpOld(cornerSize), vpNew(cornerSize); TPointD pOld, pNew; diff --git a/toonz/sources/common/tvrender/tofflinegl.cpp b/toonz/sources/common/tvrender/tofflinegl.cpp index eebc23f..20e5f62 100644 --- a/toonz/sources/common/tvrender/tofflinegl.cpp +++ b/toonz/sources/common/tvrender/tofflinegl.cpp @@ -346,7 +346,7 @@ public: if (((it != m_glxContext.end()) && (it->second != m_context)) || (it == m_glxContext.end())) { // cout << "calling GLXMakeCurrent " << self << " " << m_context << - //endl; + // endl; Bool ret; if (!isDtor) ret = glXMakeCurrent(m_dpy, m_pixmap, m_context); m_glxContext[self] = m_context; @@ -519,9 +519,13 @@ public: std::shared_ptr shared) : m_ogl(ogl), m_size(size), m_shared(std::move(shared)) {} - void onDeliver() override { m_ogl->m_imp = currentImpGenerator(m_size, m_shared); } + void onDeliver() override { + m_ogl->m_imp = currentImpGenerator(m_size, m_shared); + } - TThread::Message *clone() const override { return new MessageCreateContext(*this); } + TThread::Message *clone() const override { + return new MessageCreateContext(*this); + } }; //} // namespace diff --git a/toonz/sources/common/tvrender/tstrokeprop.cpp b/toonz/sources/common/tvrender/tstrokeprop.cpp index 6e8b6df..e6d399b 100644 --- a/toonz/sources/common/tvrender/tstrokeprop.cpp +++ b/toonz/sources/common/tvrender/tstrokeprop.cpp @@ -111,12 +111,12 @@ TStrokeProp *TRasterImagePatternStrokeProp::clone(const TStroke *stroke) const { //----------------------------------------------------------------------------- -void TRasterImagePatternStrokeProp::draw(const TVectorRenderData & - rd) /*assenza di const non e' una - dimenticanza! Alcune - sottoclassi devono - ridefinire questo metodo e - serbve che non sia const*/ +void TRasterImagePatternStrokeProp::draw( + const TVectorRenderData &rd) /*assenza di const non e' una + dimenticanza! Alcune + sottoclassi devono + ridefinire questo metodo e + serbve che non sia const*/ { if (rd.m_clippingRect != TRect() && !rd.m_is3dView && !convert(rd.m_aff * m_stroke->getBBox()).overlaps(rd.m_clippingRect)) @@ -171,12 +171,12 @@ TStrokeProp *TVectorImagePatternStrokeProp::clone(const TStroke *stroke) const { //----------------------------------------------------------------------------- -void TVectorImagePatternStrokeProp::draw(const TVectorRenderData & - rd) /*assenza di const non e' una - dimenticanza! Alcune - sottoclassi devono - ridefinire questo metodo e - serbve che non sia const*/ +void TVectorImagePatternStrokeProp::draw( + const TVectorRenderData &rd) /*assenza di const non e' una + dimenticanza! Alcune + sottoclassi devono + ridefinire questo metodo e + serbve che non sia const*/ { if (rd.m_clippingRect != TRect() && !rd.m_is3dView && !convert(rd.m_aff * m_stroke->getBBox()).overlaps(rd.m_clippingRect)) diff --git a/toonz/sources/common/tvrender/tvectorbrush.cpp b/toonz/sources/common/tvrender/tvectorbrush.cpp index b525443..709cf64 100644 --- a/toonz/sources/common/tvrender/tvectorbrush.cpp +++ b/toonz/sources/common/tvrender/tvectorbrush.cpp @@ -238,7 +238,7 @@ void StrokeOutlinizationData::buildPoint(const CenterlinePoint &p, bool pNextD, int StrokeOutlinizationData::buildPoints(const CenterlinePoint &p, CenterlinePoint &ref, CenterlinePoint *out) { - out[0] = out[1] = p; + out[0] = out[1] = p; out[0].m_covered = out[1].m_covered = true; // Coverage is rebuilt bool refSymmetric = @@ -381,7 +381,8 @@ public: : ReferenceLinearizator(stroke, path, data) {} void linearize(std::vector &cPoints, int chunk) override; - void linearize(std::vector &cPoints, int chunk, double t1) override; + void linearize(std::vector &cPoints, int chunk, + double t1) override; void addCenterlinePoints(std::vector &cPoints, int brushChunk, double x0, double x1); @@ -516,7 +517,8 @@ public: public: void linearize(std::vector &cPoints, int chunk) override; - void linearize(std::vector &cPoints, int chunk, double t1) override; + void linearize(std::vector &cPoints, int chunk, + double t1) override; void subdivide(std::vector &cPoints, CenterlinePoint &cp0, CenterlinePoint &cp1); diff --git a/toonz/sources/common/twain/ttwain_state.c b/toonz/sources/common/twain/ttwain_state.c index 7f81e6d..6e5ed8e 100644 --- a/toonz/sources/common/twain/ttwain_state.c +++ b/toonz/sources/common/twain/ttwain_state.c @@ -709,7 +709,8 @@ static void myHackFunction(int v) { } } #else -static void myHackFunction(int v) { /*it's empty...*/ } +static void myHackFunction(int v) { /*it's empty...*/ +} #endif /*---------------------------------------------------------------------------*/ int TTWAIN_AcquireMemory(void *hwnd) { diff --git a/toonz/sources/common/twain/twain.h b/toonz/sources/common/twain/twain.h index 28181ef..e51357f 100644 --- a/toonz/sources/common/twain/twain.h +++ b/toonz/sources/common/twain/twain.h @@ -370,7 +370,7 @@ typedef struct { TW_STR255 OutputName; /* The result of an operation or the name of a destination file */ TW_MEMREF - Context; /* Source specific data used to remember state information */ + Context; /* Source specific data used to remember state information */ /* DG_CONTROL / DAT_FILESYSTEM / MSG_DELETE field */ int Recursive; /* recursively delete all sub-directories */ /* DG_CONTROL / DAT_FILESYSTEM / MSG_GETINFO fields */ @@ -407,9 +407,9 @@ typedef struct { TW_UINT32 Id; /* Unique number. In Windows, application hWnd */ TW_VERSION Version; /* Identifies the piece of code */ TW_UINT16 - ProtocolMajor; /* Application and DS must set to TWON_PROTOCOLMAJOR */ + ProtocolMajor; /* Application and DS must set to TWON_PROTOCOLMAJOR */ TW_UINT16 - ProtocolMinor; /* Application and DS must set to TWON_PROTOCOLMINOR */ + ProtocolMinor; /* Application and DS must set to TWON_PROTOCOLMINOR */ TW_UINT32 SupportedGroups; /* Bit field OR combination of DG_ constants */ TW_STR32 Manufacturer; /* Manufacturer name, e.g. "Hewlett-Packard" */ TW_STR32 ProductFamily; /* Product family name, e.g. "ScanJet" */ @@ -555,9 +555,9 @@ typedef struct { terminating NUL byte. This is not the same as the total number of characters in the string. */ TW_HANDLE - UTF8string; /* output TW_HANDLE to a UTF-8 encoded localized string (based - on TW_IDENTITY.Language or CAP_LANGUAGE). The Source - allocates it, the Application frees it. */ + UTF8string; /* output TW_HANDLE to a UTF-8 encoded localized string (based + on TW_IDENTITY.Language or CAP_LANGUAGE). The Source + allocates it, the Application frees it. */ } TW_STATUSUTF8, FAR *pTW_STATUSUTF8; /* DAT_USERINTERFACE. Coordinates UI between application and data source. */ @@ -1434,13 +1434,14 @@ typedef struct { */ #define DF_DSM2 0x10000000L /* added to the identity by the DSM */ #define DF_APP2 \ - 0x20000000L /* Set by the App to indicate it would \ \ + 0x20000000L /* Set by the App to indicate it would \ \ \ prefer to use DSM2 */ #define DF_DS2 \ - 0x40000000L /* Set by the DS to indicate it would \ \ - prefer to use DSM2 */ -#define DG_MASK 0xFFFFL /* all Data Groups limited to 16 bit. Added for 2.1 \ - */ + 0x40000000L /* Set by the DS to indicate it would \ \ \ + prefer to use DSM2 */ +#define DG_MASK \ + 0xFFFFL /* all Data Groups limited to 16 bit. Added for 2.1 \ \ + */ /**************************************************************************** * * @@ -1487,13 +1488,13 @@ typedef struct { /* misplaced */ #define DAT_ICCPROFILE \ - 0x0401 /* TW_MEMORY Added 1.91 This Data Argument is misplaced but \ + 0x0401 /* TW_MEMORY Added 1.91 This Data Argument is misplaced but \ \ belongs to the DG_IMAGE Data Group */ #define DAT_IMAGEMEMFILEXFER \ - 0x0402 /* TW_IMAGEMEMXFER Added 1.91 This Data Argument is misplaced but \ + 0x0402 /* TW_IMAGEMEMXFER Added 1.91 This Data Argument is misplaced but \ \ belongs to the DG_IMAGE Data Group */ #define DAT_ENTRYPOINT \ - 0x0403 /* TW_ENTRYPOINT Added 2.0 This Data Argument is misplaced but \ + 0x0403 /* TW_ENTRYPOINT Added 2.0 This Data Argument is misplaced but \ \ belongs to the DG_CONTROL Data Group */ /**************************************************************************** @@ -1859,9 +1860,10 @@ typedef struct { #define TWCC_CAPUNSUPPORTED \ 13 /* Capability not supported by source */ #define TWCC_CAPBADOPERATION \ - 14 /* Operation not supported by capability */ -#define TWCC_CAPSEQERROR 15 /* Capability has dependancy on other capability \ - */ + 14 /* Operation not supported by capability */ +#define TWCC_CAPSEQERROR \ + 15 /* Capability has dependancy on other capability \ \ + */ #define TWCC_DENIED \ 16 /* File System operation is denied (file is protected) Added 1.8 */ #define TWCC_FILEEXISTS \ @@ -1875,7 +1877,7 @@ typedef struct { #define TWCC_PAPERDOUBLEFEED \ 21 /* The feeder detected multiple pages Added 1.8 */ #define TWCC_FILEWRITEERROR \ - 22 /* Error writing the file (meant for things like disk full \ + 22 /* Error writing the file (meant for things like disk full \ \ conditions)Added 1.8 */ #define TWCC_CHECKDEVICEONLINE \ 23 /* The device went offline prior to or during this operation Added 1.8 */ @@ -1922,10 +1924,10 @@ typedef wchar_t TW_UNI512[512], FAR *pTW_UNI512; #define TWFF_JPN 12 /* 1.91 */ #define DAT_TWUNKIDENTITY \ - 0x000b /* Additional message required for thunker to request the special \ + 0x000b /* Additional message required for thunker to request the special \ \ identity information. */ #define DAT_SETUPFILEXFER2 \ - 0x0301 /* Data transfer via a file. deprecated - use DAT_SETUPFILEXFER \ + 0x0301 /* Data transfer via a file. deprecated - use DAT_SETUPFILEXFER \ \ instead*/ #define CAP_SUPPORTEDCAPSEXT 0x100c diff --git a/toonz/sources/image/3gp/tiio_3gpM.cpp b/toonz/sources/image/3gp/tiio_3gpM.cpp index 1cfe3d6..a3d3b28 100644 --- a/toonz/sources/image/3gp/tiio_3gpM.cpp +++ b/toonz/sources/image/3gp/tiio_3gpM.cpp @@ -982,11 +982,11 @@ void TImageReader3gp::load(const TRasterP &rasP, const TPoint &pos, int shrinkX, //------------------------------------------------ inline void setMatteAndYMirror(const TRaster32P &ras) { ras->lock(); - TPixel32 *upRow = ras->pixels(); - TPixel32 *dwRow = ras->pixels(ras->getLy() - 1); - int hLy = (int)(ras->getLy() / 2. + 0.5); // piccola pessimizzazione... - int wrap = ras->getWrap(); - int lx = ras->getLx(); + TPixel32 *upRow = ras->pixels(); + TPixel32 *dwRow = ras->pixels(ras->getLy() - 1); + int hLy = (int)(ras->getLy() / 2. + 0.5); // piccola pessimizzazione... + int wrap = ras->getWrap(); + int lx = ras->getLx(); TPixel32 *upPix = 0; TPixel32 *lastPix = ras->pixels(hLy); while (upPix < lastPix) { diff --git a/toonz/sources/image/3gp/tiio_3gpW.cpp b/toonz/sources/image/3gp/tiio_3gpW.cpp index 8a94186..85e1410 100644 --- a/toonz/sources/image/3gp/tiio_3gpW.cpp +++ b/toonz/sources/image/3gp/tiio_3gpW.cpp @@ -891,11 +891,11 @@ void TImageReader3gp::load(const TRasterP &rasP, const TPoint &pos, int shrinkX, //------------------------------------------------ inline void setMatteAndYMirror(const TRaster32P &ras) { ras->lock(); - TPixel32 *upRow = ras->pixels(); - TPixel32 *dwRow = ras->pixels(ras->getLy() - 1); - int hLy = (int)(ras->getLy() / 2. + 0.5); // piccola pessimizzazione... - int wrap = ras->getWrap(); - int lx = ras->getLx(); + TPixel32 *upRow = ras->pixels(); + TPixel32 *dwRow = ras->pixels(ras->getLy() - 1); + int hLy = (int)(ras->getLy() / 2. + 0.5); // piccola pessimizzazione... + int wrap = ras->getWrap(); + int lx = ras->getLx(); TPixel32 *upPix = 0; TPixel32 *lastPix = ras->pixels(hLy); while (upPix < lastPix) { diff --git a/toonz/sources/image/avi/tiio_avi.cpp b/toonz/sources/image/avi/tiio_avi.cpp index 2aa9655..97a814e 100644 --- a/toonz/sources/image/avi/tiio_avi.cpp +++ b/toonz/sources/image/avi/tiio_avi.cpp @@ -573,11 +573,11 @@ void TLevelWriterAvi::doSaveSoundTrack() { audioStreamInfo.dwFormatChangeCount = 0; audioStreamInfo.szName[0] = 0; - waveinfo.wFormatTag = WAVE_FORMAT_PCM; // WAVE_FORMAT_DRM - waveinfo.nChannels = m_st->getChannelCount(); - waveinfo.nSamplesPerSec = m_st->getSampleRate(); - waveinfo.wBitsPerSample = m_st->getBitPerSample(); - waveinfo.nBlockAlign = waveinfo.nChannels * waveinfo.wBitsPerSample >> 3; + waveinfo.wFormatTag = WAVE_FORMAT_PCM; // WAVE_FORMAT_DRM + waveinfo.nChannels = m_st->getChannelCount(); + waveinfo.nSamplesPerSec = m_st->getSampleRate(); + waveinfo.wBitsPerSample = m_st->getBitPerSample(); + waveinfo.nBlockAlign = waveinfo.nChannels * waveinfo.wBitsPerSample >> 3; waveinfo.nAvgBytesPerSec = waveinfo.nSamplesPerSec * waveinfo.nBlockAlign; waveinfo.cbSize = sizeof(WAVEFORMATEX); diff --git a/toonz/sources/image/bmp/filebmp.c b/toonz/sources/image/bmp/filebmp.c index 9d78dbf..db9b8c7 100644 --- a/toonz/sources/image/bmp/filebmp.c +++ b/toonz/sources/image/bmp/filebmp.c @@ -1567,8 +1567,8 @@ int write_bmp_header(FILE *fp, BMP_HEADER *hd) putshort(fp, (int)hd->biPlanes); /* must be '1' */ putshort(fp, (int)hd->biBitCount); /* 1,4,8, or 24 */ putint(fp, - (int)hd->biCompression); /* BMP_BI_RGB, BMP_BI_RLE8 or BMP_BI_RLE4 */ - putint(fp, (int)hd->biSizeImage); /* size of raw image data */ + (int)hd->biCompression); /* BMP_BI_RGB, BMP_BI_RLE8 or BMP_BI_RLE4 */ + putint(fp, (int)hd->biSizeImage); /* size of raw image data */ putint(fp, (int)hd->biXPelsPerMeter); /* dpi * 39" per meter */ putint(fp, (int)hd->biYPelsPerMeter); /* dpi * 39" per meter */ putint(fp, (int)hd->biClrUsed); /* colors used in cmap */ diff --git a/toonz/sources/image/mov/tiio_movW.cpp b/toonz/sources/image/mov/tiio_movW.cpp index 0e0dc22..46a91c4 100644 --- a/toonz/sources/image/mov/tiio_movW.cpp +++ b/toonz/sources/image/mov/tiio_movW.cpp @@ -1191,9 +1191,9 @@ inline void setMatteAndYMirror(const TRaster32P &ras) { ras->lock(); TPixel32 *upRow = ras->pixels(); TPixel32 *dwRow = ras->pixels(ras->getLy() - 1); - int hLy = (int)(ras->getLy() / 2. + 0.5); // piccola pessimizzazione... - int wrap = ras->getWrap(); - int lx = ras->getLx(); + int hLy = (int)(ras->getLy() / 2. + 0.5); // piccola pessimizzazione... + int wrap = ras->getWrap(); + int lx = ras->getLx(); TPixel32 *upPix = 0; TPixel32 *lastPix = ras->pixels(hLy); diff --git a/toonz/sources/image/pli/pli_io.cpp b/toonz/sources/image/pli/pli_io.cpp index e76a180..ba10162 100644 --- a/toonz/sources/image/pli/pli_io.cpp +++ b/toonz/sources/image/pli/pli_io.cpp @@ -285,10 +285,10 @@ UINT TStyleParam::getSize() { #else #define CHECK_FOR_READ_ERROR(filePath) \ { \ - /*if (m_iChan.flags()&(ios::failbit|ios::eofbit)) \ \ - { \ \ - m_lastError = PREMATURE_EOF; \ \ - throw TImageException( filePath, "Error on reading file"); \ \ + /*if (m_iChan.flags()&(ios::failbit|ios::eofbit)) \ \ \ + { \ \ \ + m_lastError = PREMATURE_EOF; \ \ \ + throw TImageException( filePath, "Error on reading file"); \ \ \ }*/ \ } #endif diff --git a/toonz/sources/image/tif/tiio_tif.cpp b/toonz/sources/image/tif/tiio_tif.cpp index 4418c38..2e3b223 100644 --- a/toonz/sources/image/tif/tiio_tif.cpp +++ b/toonz/sources/image/tif/tiio_tif.cpp @@ -340,7 +340,8 @@ break;*/ m_stripBuffer = m_tmpRas->getRawData(); } else { m_rowsPerStrip = rps; - // if(m_rowsPerStrip<=0) m_rowsPerStrip = 1; //potrei mettere qualsiasi + // if(m_rowsPerStrip<=0) m_rowsPerStrip = 1; //potrei mettere + // qualsiasi // valore // purchè sia lo stesso in tif_getimage.c linea 2512 // if(m_rowsPerStrip==-1) assert(0); diff --git a/toonz/sources/image/tzl/tiio_tzl.cpp b/toonz/sources/image/tzl/tiio_tzl.cpp index 69de188..af4c64b 100644 --- a/toonz/sources/image/tzl/tiio_tzl.cpp +++ b/toonz/sources/image/tzl/tiio_tzl.cpp @@ -373,7 +373,7 @@ class TImageWriterTzl : public TImageWriter { TDimension m_iconSize; // Dimensioni dell'iconcina salvata all'interno del file tlv // In genere questo parametro viene settato come quello impostato - //dall'utente + // dall'utente // nelle preferenze. public: TImageWriterTzl(TLevelWriterTzl *lw, TFrameId fid) diff --git a/toonz/sources/image/tzp/tiio_plt.cpp b/toonz/sources/image/tzp/tiio_plt.cpp index 33a0f18..45c04db 100644 --- a/toonz/sources/image/tzp/tiio_plt.cpp +++ b/toonz/sources/image/tzp/tiio_plt.cpp @@ -48,7 +48,8 @@ public: void readLine(char *buffer, int x0, int x1, int shrink) override; void getTzpPaletteColorNames( - std::map> &pltColorNames) const override; + std::map> &pltColorNames) + const override; }; //------------------------------------------------------------ diff --git a/toonz/sources/image/zcc/tfile.h b/toonz/sources/image/zcc/tfile.h index 332eb61..a6fcc8c 100644 --- a/toonz/sources/image/zcc/tfile.h +++ b/toonz/sources/image/zcc/tfile.h @@ -58,7 +58,8 @@ public: TFileConsts::kOpenExisting); // false if failed due // to not found or // already exists - // bool open(const wchar_t *pwszFileName, uint32 flags = TFileConsts::kRead + // bool open(const wchar_t *pwszFileName, uint32 flags = + // TFileConsts::kRead // | TFileConsts::kDenyWrite | TFileConsts::kOpenExisting); // false if // failed due to not found or already exists bool close(); diff --git a/toonz/sources/include/ext/LinearPotential.h b/toonz/sources/include/ext/LinearPotential.h index 81651c3..c724205 100644 --- a/toonz/sources/include/ext/LinearPotential.h +++ b/toonz/sources/include/ext/LinearPotential.h @@ -30,7 +30,7 @@ public: double value_(double radiusToTest) const override; void setParameters_(const TStroke *ref, double w, - double actionLength) override; + double actionLength) override; Potential *clone() override; diff --git a/toonz/sources/include/ext/NotSimmetricBezierPotential.h b/toonz/sources/include/ext/NotSimmetricBezierPotential.h index 8e495b8..277c4f1 100644 --- a/toonz/sources/include/ext/NotSimmetricBezierPotential.h +++ b/toonz/sources/include/ext/NotSimmetricBezierPotential.h @@ -31,7 +31,7 @@ public: double value_(double radiusToTest) const override; void setParameters_(const TStroke *ref, double w, - double actionLength) override; + double actionLength) override; Potential *clone() override; diff --git a/toonz/sources/include/ext/SquarePotential.h b/toonz/sources/include/ext/SquarePotential.h index 59af380..9a7a18b 100644 --- a/toonz/sources/include/ext/SquarePotential.h +++ b/toonz/sources/include/ext/SquarePotential.h @@ -32,7 +32,7 @@ public: // chiama compute_value ma effettua un controllo del parametro void setParameters_(const TStroke *ref, double w, - double actionLength) override; + double actionLength) override; private: Potential *clone() override; diff --git a/toonz/sources/include/ext/meshbuilder.h b/toonz/sources/include/ext/meshbuilder.h index 54b2b73..51c82e1 100644 --- a/toonz/sources/include/ext/meshbuilder.h +++ b/toonz/sources/include/ext/meshbuilder.h @@ -27,8 +27,8 @@ struct MeshBuilderOptions { int m_targetMaxVerticesCount; //!< The desired maximum vertices count //!< (the returned mesh could still be larger) TPixel64 m_transparentColor; //!< Color to be used as transparent for - //!boundaries recognition - //!< (for fullcolor images only). + //! boundaries recognition + //!< (for fullcolor images only). //!< \note Transparent colors will be recognized as transparent //!< anyway }; diff --git a/toonz/sources/include/ext/meshtexturizer.h b/toonz/sources/include/ext/meshtexturizer.h index 004842c..89b3aa0 100644 --- a/toonz/sources/include/ext/meshtexturizer.h +++ b/toonz/sources/include/ext/meshtexturizer.h @@ -120,9 +120,9 @@ old one. */ &geometry, //!< Rebinds the image bound to the specified texture PremultMode premultiplyMode = NONPREMULTIPLIED); //! id to a new image. void unbindTexture(int textureId); //!< Deletes the texture associated to the - //!passed id. \param textureId - //!Identifier of the texture to be - //!unbound. + //! passed id. \param textureId + //! Identifier of the texture to be + //! unbound. private: class Imp; diff --git a/toonz/sources/include/ext/meshutils.h b/toonz/sources/include/ext/meshutils.h index 646510f..d2b6c5b 100644 --- a/toonz/sources/include/ext/meshutils.h +++ b/toonz/sources/include/ext/meshutils.h @@ -78,9 +78,9 @@ DVAPI void tglDrawFaces( DVAPI void tglDrawSO( const TMeshImage &image, //!< Input mesh image whose SO will be drawn. double minColor[4], //!< RGBM color quadruple (in [0, 1]) corresponding to - //!the lowest SO value. + //! the lowest SO value. double maxColor[4], //!< RGBM color quadruple corresponding to the highest - //!SO value. + //! SO value. const PlasticDeformerDataGroup *deformerDatas = 0, //!< Deformation data structure containing SO data. bool deformedDomain = @@ -99,9 +99,9 @@ DVAPI void tglDrawRigidity( const TMeshImage &image, //!< Input mesh image whose rigidity will be drawn. double minColor[4], //!< RGBM color quadruple (in [0, 1]) corresponding to - //!the lowest rigidity value. + //! the lowest rigidity value. double maxColor[4], //!< RGBM color quadruple corresponding to the highest - //!rigidity value. + //! rigidity value. const PlasticDeformerDataGroup *deformerDatas = 0, //!< Data structure of an optional deformation of the input image. bool deformedDomain = diff --git a/toonz/sources/include/ext/plasticdeformerstorage.h b/toonz/sources/include/ext/plasticdeformerstorage.h index bc550fe..0d6e4f8 100644 --- a/toonz/sources/include/ext/plasticdeformerstorage.h +++ b/toonz/sources/include/ext/plasticdeformerstorage.h @@ -67,9 +67,9 @@ struct DVAPI PlasticDeformerDataGroup { m_dstHandles; //!< Corresponding destination handle positions int m_compiled; //!< Whether compiled data is present about a certain - //!datatype. + //! datatype. int m_upToDate; //!< Whether updated data is present about a certain - //!datatype. + //! datatype. double m_outputFrame; //!< The frame of current output values. //!< Value numeric_limits::max can be used to invalidate diff --git a/toonz/sources/include/ext/plasticskeleton.h b/toonz/sources/include/ext/plasticskeleton.h index cebd537..56a56ef 100644 --- a/toonz/sources/include/ext/plasticskeleton.h +++ b/toonz/sources/include/ext/plasticskeleton.h @@ -72,13 +72,13 @@ public: // Tool data double m_minAngle, m_maxAngle; //!< Minimum and maximum accepted angles when - //!updating the vertex - //!< position with the mouse. In degrees. + //! updating the vertex + //!< position with the mouse. In degrees. public: // Handle data bool m_interpolate; //!< Whether the vertex needs to be interpolated (see - //!plasticdeformer.h) + //! plasticdeformer.h) public: PlasticSkeletonVertex(); @@ -124,8 +124,8 @@ public: int parentVertex(int v) { return vertex(v).m_parent; } void moveVertex(int v, const TPointD &pos); //!< Moves a vertex to the - //!specified position, informing - //!associated deformers + //! specified position, informing + //! associated deformers int addVertex(const PlasticSkeletonVertex &vx, int parent); //!< Adds a vertex to the skeleton int insertVertex(const PlasticSkeletonVertex &vx, diff --git a/toonz/sources/include/ext/plasticskeletondeformation.h b/toonz/sources/include/ext/plasticskeletondeformation.h index 0c863bf..53dcd9a 100644 --- a/toonz/sources/include/ext/plasticskeletondeformation.h +++ b/toonz/sources/include/ext/plasticskeletondeformation.h @@ -277,8 +277,8 @@ private: PlasticSkeleton *sk, int v); //!< Deals with vertex deformations when v has been added void insertVertex(PlasticSkeleton *sk, int v); //!< Deals with vertex - //!deformations when v has - //!been inserted in an edge + //! deformations when v has + //! been inserted in an edge void deleteVertex( PlasticSkeleton *sk, int v); //!< Removes vertex deformation for v, \a before it is deleted diff --git a/toonz/sources/include/ext/plasticvisualsettings.h b/toonz/sources/include/ext/plasticvisualsettings.h index e0aea99..c3a3b55 100644 --- a/toonz/sources/include/ext/plasticvisualsettings.h +++ b/toonz/sources/include/ext/plasticvisualsettings.h @@ -21,14 +21,14 @@ class TXshColumn; struct PlasticVisualSettings { bool m_applyPlasticDeformation; //!< Whether the deformation must be applied. - //!If false, + //! If false, //!< the original image should be displayed instead. TXshColumn *m_showOriginalColumn; //!< As an exception to the above control, - //!one specific + //! one specific //!< mesh column can be dispensed from deforming. //!< This is typically used in PlasticTool's 'build mode'. bool m_drawMeshesWireframe; //!< Whether any mesh wireframe should be - //!displayed + //! displayed bool m_drawRigidity; //!< Whether mesh rigidities should be displayed bool m_drawSO; //!< Whether mesh vertices' stacking order should //!< be displayed diff --git a/toonz/sources/include/stdfx/shadingcontext.h b/toonz/sources/include/stdfx/shadingcontext.h index 864f249..127f72e 100644 --- a/toonz/sources/include/stdfx/shadingcontext.h +++ b/toonz/sources/include/stdfx/shadingcontext.h @@ -76,9 +76,9 @@ the context's output buffer is destroyed. const QString &shaderName) const; GLuint loadTexture(const TRasterP &src, GLuint texUnit); //!< Loads a texture - //!and binds it to - //!the specified - //!texture unit. + //! and binds it to + //! the specified + //! texture unit. //! \return The OpenGL texture id of the loaded texture. \param src //! Loaded texture. \param texUnit Unit the texture will be bound to. void unloadTexture(GLuint texId); //!< Releases the specified texture id. diff --git a/toonz/sources/include/tcg/base.h b/toonz/sources/include/tcg/base.h index 6790b7b..fd3fdc4 100644 --- a/toonz/sources/include/tcg/base.h +++ b/toonz/sources/include/tcg/base.h @@ -84,9 +84,8 @@ public: */ template // B is used for base class - // chaining, to deal with - class safe_bool - : public B // the empty class optimization +// chaining, to deal with +class safe_bool : public B // the empty class optimization { class dummy {}; struct detail { diff --git a/toonz/sources/include/tcg/hash.h b/toonz/sources/include/tcg/hash.h index 9d98710..c668090 100644 --- a/toonz/sources/include/tcg/hash.h +++ b/toonz/sources/include/tcg/hash.h @@ -201,7 +201,7 @@ public: //-------------------------------------------------------------------------- //!\warning Assignment of the kind hash_map[i1] = hash_map[i2] are DANGEROUS! - //!The + //! The //! reference returned on the right may be INVALIDATED if the first key is //! inserted! T &operator[](const K &key) { return m_items[touchKey(key)].m_val; } diff --git a/toonz/sources/include/tcg/hpp/polyline_ops.hpp b/toonz/sources/include/tcg/hpp/polyline_ops.hpp index a4abbac..62826e3 100644 --- a/toonz/sources/include/tcg/hpp/polyline_ops.hpp +++ b/toonz/sources/include/tcg/hpp/polyline_ops.hpp @@ -27,7 +27,7 @@ StandardDeviationEvaluator::StandardDeviationEvaluator( : m_begin(begin), m_end(end) { // Let m_sum[i] and m_sum2[i] be respectively the sums of vertex coordinates //(relative to begin is sufficient) from 0 to i, and the sums of their - //squares; + // squares; // m_sumsMix contain sums of xy terms. diff_type i, n = m_end - m_begin; diff --git a/toonz/sources/include/tcg/mesh.h b/toonz/sources/include/tcg/mesh.h index 12e7d91..a855039 100644 --- a/toonz/sources/include/tcg/mesh.h +++ b/toonz/sources/include/tcg/mesh.h @@ -81,10 +81,10 @@ public: int addFace(const F &f); void removeVertex(int v); //!< Removes the v-th vertex from the - //!mesh. \warning Any adjacent edge or face will - //!be removed, too. \param v Index of the vertex - //!to be removed. - void removeEdge(int e); //!< Removes the e-th edge from the mesh. + //! mesh. \warning Any adjacent edge or face will + //! be removed, too. \param v Index of the vertex + //! to be removed. + void removeEdge(int e); //!< Removes the e-th edge from the mesh. //!\warning Any adjacent face will be removed, too. //!\param e Index of the edge to be removed. void removeFace(int f); //!< Removes the f-th face from the mesh. @@ -94,19 +94,19 @@ public: V &vertex(int v) { return m_vertices[v]; } //!< Returns the v-th mesh vertex. \param v Index of the vertex - //!to be returned. \return See description. + //! to be returned. \return See description. const E &edge(int e) const { return m_edges[e]; } E &edge(int e) { return m_edges[e]; } //!< Returns the e-th mesh edge. \param e Index of the edge to - //!be returned. \return See description. + //! be returned. \return See description. const F &face(int f) const { return m_faces[f]; } F &face(int f) { return m_faces[f]; } //!< Returns the f-th mesh face. \param f Index of the face to - //!be returned. \return See description. + //! be returned. \return See description. const V &edgeVertex(int e, int i) const { return vertex(edge(e).vertex(i)); } V &edgeVertex(int e, int i) //! \param e Host edge index. \param i Vertex @@ -150,9 +150,9 @@ and \p v2: \code for(int n=0; mesh.edgeInciding(v1, v2, n) > 0; ++n) ... \endcode */ int edgeInciding(int v1, int v2, int n = 0) const; //!< \brief Returns the - //!edge index of the - //!n-th edge - //!inciding + //! edge index of the + //!n-th edge + //! inciding //! \p v1 and \p v2, or \p -1 if the required edge could not be found. //! \param v1 First edge endpoint. \param v2 Second edge endpoint. \param //! n Index in the sequence of all edges inciding \p v1 and \p v2. \return diff --git a/toonz/sources/include/tcg/observer_notifier.h b/toonz/sources/include/tcg/observer_notifier.h index ca01278..80dd9f7 100644 --- a/toonz/sources/include/tcg/observer_notifier.h +++ b/toonz/sources/include/tcg/observer_notifier.h @@ -44,12 +44,12 @@ public: virtual ~observer_base() {} virtual void attach(notifier_base *notifier) = 0; //!< Adds the specified - //!notifier to the internal - //!set of notifiers. + //! notifier to the internal + //! set of notifiers. virtual void detach(notifier_base *notifier) = 0; //!< Removes the specified - //!notifier from the - //!internal set of - //!notifiers. + //! notifier from the + //! internal set of + //! notifiers. }; //------------------------------------------------------------ @@ -59,12 +59,12 @@ public: virtual ~notifier_base() {} virtual void attach(observer_base *observer) = 0; //!< Adds the specified - //!observer to the internal - //!set of observers. + //! observer to the internal + //! set of observers. virtual void detach(observer_base *observer) = 0; //!< Removes the specified - //!observer from the - //!internal set of - //!observers. + //! observer from the + //! internal set of + //! observers. }; //************************************************************************ diff --git a/toonz/sources/include/tcg/poly_ops.h b/toonz/sources/include/tcg/poly_ops.h index 81dfdea..1825837 100644 --- a/toonz/sources/include/tcg/poly_ops.h +++ b/toonz/sources/include/tcg/poly_ops.h @@ -27,7 +27,7 @@ namespace poly_ops { */ template Scalar evaluate(const Scalar poly[], //!< Coefficients of the input polynomial, - //!indexed by degree + //! indexed by degree int deg, //!< Degree of the polynomial function Scalar x) //!< Parameter the polynomial will be evaluated on { @@ -222,7 +222,7 @@ template unsigned int solve_3(Scalar c[4], //!< Polynomial coefficients array Scalar s[3], //!< Solutions array Scalar tol = 0) //!< Leading coefficient tolerance, the - //!equation is reduced to 2nd degree + //! equation is reduced to 2nd degree //! if the leading coefficient is below this threshold { if (std::abs(c[3]) <= tol) diff --git a/toonz/sources/include/tcolorfunctions.h b/toonz/sources/include/tcolorfunctions.h index a05a2a4..7530e2d 100644 --- a/toonz/sources/include/tcolorfunctions.h +++ b/toonz/sources/include/tcolorfunctions.h @@ -51,7 +51,9 @@ class DVAPI TGenericColorFunction : public TColorFunction { public: TGenericColorFunction(const double m[4], const double c[4]); - TColorFunction *clone() const override { return new TGenericColorFunction(m_m, m_c); } + TColorFunction *clone() const override { + return new TGenericColorFunction(m_m, m_c); + } TPixel32 operator()(const TPixel32 &color) const override; bool getParameters(Parameters &p) const override; @@ -68,7 +70,9 @@ public: TColorFader(const TPixel32 &color, double fade) : m_color(color), m_fade(fade) {} - TColorFunction *clone() const override { return new TColorFader(m_color, m_fade); } + TColorFunction *clone() const override { + return new TColorFader(m_color, m_fade); + } TPixel32 operator()(const TPixel32 &color) const override; bool getParameters(Parameters &p) const override; @@ -85,7 +89,9 @@ public: TOnionFader(const TPixel32 &color, double fade) : m_color(color), m_fade(fade) {} - TColorFunction *clone() const override { return new TOnionFader(m_color, m_fade); } + TColorFunction *clone() const override { + return new TOnionFader(m_color, m_fade); + } TPixel32 operator()(const TPixel32 &color) const override; bool getParameters(Parameters &p) const override; diff --git a/toonz/sources/include/tcolorstyles.h b/toonz/sources/include/tcolorstyles.h index f1f2305..1b999e7 100644 --- a/toonz/sources/include/tcolorstyles.h +++ b/toonz/sources/include/tcolorstyles.h @@ -107,7 +107,7 @@ private: std::wstring m_name; //!< User-define style name. std::wstring m_globalName; //!< User-define style \a global name. std::wstring m_originalName; //!< If the style is copied from studio palette, - //!its original name is stored + //! its original name is stored int m_versionNumber; //!< Style's version number. @@ -115,8 +115,8 @@ private: bool m_enabled; //!< Style's \a enabled status. bool m_isEditedFromOriginal; // &) const {}; //!< \deprecated void save(TOutputStreamInterface &) const; //!< Calls the local - //!implementation of saveData() - //!passing it also the name and - //!the tagId of the style. + //! implementation of saveData() + //! passing it also the name and + //! the tagId of the style. static TColorStyle *load(TInputStreamInterface &); //!< Loads the style from - //!disk. Calls the local - //!implementation of - //!loadData(). + //! disk. Calls the local + //! implementation of + //! loadData(). static TColorStyle *create( int tagId); //!< Creates a new style with identifier equal to \a tagId. diff --git a/toonz/sources/include/texternfx.h b/toonz/sources/include/texternfx.h index 9cce758..d202f65 100644 --- a/toonz/sources/include/texternfx.h +++ b/toonz/sources/include/texternfx.h @@ -58,10 +58,13 @@ public: TFx *clone(bool recursive = true) const override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } void setExecutable(TFilePath fp, std::string args) { m_executablePath = fp; diff --git a/toonz/sources/include/tfarmtask.h b/toonz/sources/include/tfarmtask.h index 9c5a231..9e0412e 100644 --- a/toonz/sources/include/tfarmtask.h +++ b/toonz/sources/include/tfarmtask.h @@ -69,7 +69,7 @@ public: Id m_parentId; //!< Task id of the parent task (if any) bool m_isComposerTask; //!< Whether this is a tcomposer task (opposed to - //!tcleanupper task) + //! tcleanupper task) QString m_name; //!< User-readable name TFilePath m_taskFilePath; //!< Path of the input file affected by the task diff --git a/toonz/sources/include/tfx.h b/toonz/sources/include/tfx.h index 9f38810..9757862 100644 --- a/toonz/sources/include/tfx.h +++ b/toonz/sources/include/tfx.h @@ -46,7 +46,7 @@ class DVAPI TFxPort { protected: TFx *m_owner; //!< This is an input port of m_owner int m_groupIdx; //!< Dynamic group index this belongs to in m_owner (-1 if - //!none) + //! none) bool m_isControl; public: @@ -378,17 +378,17 @@ public: TFx *getLinkedFx() const; bool addInputPort(const std::string &name, TFxPort &p); //!< Adds a port with - //!given name, - //!returns false on - //!duplicate names. + //! given name, + //! returns false on + //! duplicate names. //! Ownership of the port belongs to derived implementations of TFx. bool addInputPort(const std::string &name, TFxPort *p, int groupIndex); //!< Adds a port with given name to the - //!specified dynamic group, + //! specified dynamic group, //! returns false on duplicate names. Ownership is transferred to the group. bool removeInputPort(const std::string &name); //!< Removes the port with - //!given name, returns false - //!if not found. + //! given name, returns false + //! if not found. bool renamePort(const std::string &oldName, const std::string &newName); @@ -414,10 +414,10 @@ public: static void listFxs(std::vector &fxInfos); static TFxInfo getFxInfo(const std::string &fxIdentifier); //!< Returns info - //!associated to - //!an fx - //!identifier, or - //!an + //! associated to + //! an fx + //! identifier, or + //! an //! unnamed one if none was found. virtual bool isZerary() const { return getInputPortCount() == 0; } diff --git a/toonz/sources/include/tgeometry.h b/toonz/sources/include/tgeometry.h index 9ed7f04..1166b32 100644 --- a/toonz/sources/include/tgeometry.h +++ b/toonz/sources/include/tgeometry.h @@ -460,7 +460,7 @@ inline std::ostream &operator<<(std::ostream &out, const TThickPoint &p) { //============================================================================= //! This is a template class representing a generic vector in a plane, i.e. -//!a point. +//! a point. /*! It is a data structure with two objects in it representing coordinate of the point and diff --git a/toonz/sources/include/tgldisplaylistsmanager.h b/toonz/sources/include/tgldisplaylistsmanager.h index a1db38d..0054b1d 100644 --- a/toonz/sources/include/tgldisplaylistsmanager.h +++ b/toonz/sources/include/tgldisplaylistsmanager.h @@ -123,23 +123,23 @@ public: static TGLDisplayListsManager *instance(); int storeProxy(TGLDisplayListsProxy *proxy); //!< Stores the specified proxy, - //!returning its associated - //!display + //! returning its associated + //! display //!< lists id. Context attaches should follow. void attachContext(int dlSpaceId, TGlContext context); //!< Attaches the - //!specified context - //!to a display lists - //!space + //! specified context + //! to a display lists + //! space void releaseContext(TGlContext context); //!< Releases a context reference to - //!its display lists space + //! its display lists space int displayListsSpaceId(TGlContext context); //!< Returns the display lists - //!space id of a known context, - //!or + //! space id of a known context, + //! or //!< -1 if it did not attach to any known space. TGLDisplayListsProxy *dlProxy(int dlSpaceId); //!< Returns the display lists - //!space proxy associated to - //!the - //!< specified id. + //! space proxy associated to + //! the + //!< specified id. }; #endif // TGLDISPLAYLISTSMANAGER_H diff --git a/toonz/sources/include/timageinfo.h b/toonz/sources/include/timageinfo.h index df6b87c..933d7fc 100644 --- a/toonz/sources/include/timageinfo.h +++ b/toonz/sources/include/timageinfo.h @@ -39,7 +39,7 @@ public: double m_dpix, //!< Horizontal image dpi. m_dpiy, //!< Vertical image dpi. m_frameRate; //!< Movie frame rate. \deprecated Should not be here. An - //!image has \a no frame rate! + //! image has \a no frame rate! TPropertyGroup *m_properties; //!< Format-specific image data. @@ -52,7 +52,7 @@ public: m_samplePerPixel, //!< Number of samples (channels) per pixel. m_bitsPerSample, //!< Number of bits per sample (channel). m_fileSize; //!< Total size (in bytes) of the image file. \deprecated - //!Possibly useless. + //! Possibly useless. bool m_valid; //!< \a Deprecated. \deprecated Just... wrong. diff --git a/toonz/sources/include/tlin/tlin_sparsemat.h b/toonz/sources/include/tlin/tlin_sparsemat.h index f1cf66d..bcd652a 100644 --- a/toonz/sources/include/tlin/tlin_sparsemat.h +++ b/toonz/sources/include/tlin/tlin_sparsemat.h @@ -73,7 +73,7 @@ public: } //!\warning Assignments of kind: A.at(1,1) = A.at(0,0) are potentially - //!harmful. + //! harmful. //! Use A.get(x,y) on the right side instead. T &at(int row, int col) { return m_hash.touch(std::make_pair(row, col), 0); } const T get(int row, int col) const { diff --git a/toonz/sources/include/tmacrofx.h b/toonz/sources/include/tmacrofx.h index 4cb9a78..5297ed7 100644 --- a/toonz/sources/include/tmacrofx.h +++ b/toonz/sources/include/tmacrofx.h @@ -43,8 +43,10 @@ public: TFx *clone(bool recursive = true) const override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; TFxTimeRegion getTimeRegion() const override; @@ -65,7 +67,8 @@ public: bool canHandle(const TRenderSettings &info, double frame) override; - std::string getAlias(double frame, const TRenderSettings &info) const override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; void loadData(TIStream &is) override; void saveData(TOStream &os) override; diff --git a/toonz/sources/include/tnotanimatableparam.h b/toonz/sources/include/tnotanimatableparam.h index 4a11861..246baed 100644 --- a/toonz/sources/include/tnotanimatableparam.h +++ b/toonz/sources/include/tnotanimatableparam.h @@ -162,14 +162,15 @@ public: bool isKeyframe(double) const override { return false; } void deleteKeyframe(double) override {} void clearKeyframes() override {} - void assignKeyframe(double, const TSmartPointerT &, double, bool) override {} + void assignKeyframe(double, const TSmartPointerT &, double, + bool) override {} std::string getValueAlias(double, int) override { using namespace std; return to_string(getValue()); } bool hasKeyframes() const override { return 0; }; - void getKeyframes(std::set &) const override {}; + void getKeyframes(std::set &) const override{}; int getNextKeyframe(double) const override { return -1; }; int getPrevKeyframe(double) const override { return -1; }; }; diff --git a/toonz/sources/include/tools/levelselection.h b/toonz/sources/include/tools/levelselection.h index eec204c..5c28191 100644 --- a/toonz/sources/include/tools/levelselection.h +++ b/toonz/sources/include/tools/levelselection.h @@ -45,7 +45,7 @@ public: { FRAMES_NONE, //!< No frame is selected. FRAMES_CURRENT, //!< Selects the (context-defined) current frame. FRAMES_SELECTED, //!< Selects the frames specified in \p - //!TTool::getSelectedFrames(). + //! TTool::getSelectedFrames(). FRAMES_ALL, //!< Selects the whole level. }; @@ -54,7 +54,7 @@ public: WHOLE, //!< Selects everything - nothing is filtered out. SELECTED_STYLES, //!< Acts only entities with selected palette styles. BOUNDARY_STROKES, //!< Acts only on boundary strokes (applies only to - //!vector images). + //! vector images). }; typedef std::set @@ -69,8 +69,9 @@ public: to check whether nontrivial selections are empty or not. */ bool isEmpty() const override; //!< Returns whether the selection is empty. - void selectNone() override; //!< Resets the selection to empty. This is functionally - //! equivalent to operator=(LevelSelection()); + void selectNone() + override; //!< Resets the selection to empty. This is functionally + //! equivalent to operator=(LevelSelection()); FramesMode framesMode() const { return m_framesMode; } FramesMode &framesMode() //! Returns current frames selection mode. { @@ -93,7 +94,7 @@ private: Filter m_filter; //!< Selection filter. std::set m_styles; //!< Selected palette styles used with the \p - //!SELECTED_STYLES filter. + //! SELECTED_STYLES filter. }; //******************************************************************************* diff --git a/toonz/sources/include/tools/strokeselection.h b/toonz/sources/include/tools/strokeselection.h index fc8d0eb..45efa74 100644 --- a/toonz/sources/include/tools/strokeselection.h +++ b/toonz/sources/include/tools/strokeselection.h @@ -85,7 +85,7 @@ private: std::unique_ptr m_groupCommand; //!< Groups commands wrapper. TSceneHandle *m_sceneHandle; //!< Global scene handle. \deprecated Use - //!TApplication instead. + //! TApplication instead. /*!Set this boolean to true before call tool->notifyImageChanged() when you want to reset strokes bbox. diff --git a/toonz/sources/include/tools/tool.h b/toonz/sources/include/tools/tool.h index 32ebe44..4ee09ea 100644 --- a/toonz/sources/include/tools/tool.h +++ b/toonz/sources/include/tools/tool.h @@ -87,9 +87,9 @@ public: public: TPoint m_pos; //!< Mouse position in window coordinates, bottom-left origin. int m_pressure; //!< Pressure of the tablet pen, or 255 for pure mouse - //!events. + //! events. ModifierMask m_modifiersMask; //!< Bitmask specifying key modifiers applying - //!on the event. + //! on the event. bool m_leftButtonPressed; @@ -316,7 +316,7 @@ least \deprecated This so much stinks of a bug turned into design choice... */ static void updateToolsPropertiesTranslation(); //!< Updates translation of - //!the bound properties of + //! the bound properties of //! every tool (invoking updateTranslation() for each). public: @@ -436,11 +436,11 @@ return true if the method execution can have changed the current tool getObjectId(); //!< Returns a pointer to the actual stage object. void notifyImageChanged(); //!< Notifies changes on the actual image; used to - //!update - //! images on the level view. + //! update + //! images on the level view. void notifyImageChanged(const TFrameId &fid); //!< Notifies changes on the - //!frame \p fid; used to update - //! images on the level view. + //! frame \p fid; used to update + //! images on the level view. /*! \details It can depend on the actual frame and the actual cell or on the current fid (editing level). In editing scene if @@ -504,13 +504,13 @@ transformation. public: static std::vector m_cellsData; //!< \deprecated brutto brutto. fix - //!quick & dirty del baco #6213 (undo - //!con animation sheet) spiegazioni in - //!tool.cpp + //! quick & dirty del baco #6213 (undo + //! con animation sheet) spiegazioni in + //! tool.cpp static bool m_isLevelCreated; //!< \deprecated Shouldn't expose global - //!static variables. + //! static variables. static bool m_isFrameCreated; //!< \deprecated Shouldn't expose global - //!static variables. + //! static variables. protected: std::string m_name; //!< The tool's name. @@ -567,19 +567,19 @@ public: const = 0; //!< Returns the length of a pixel in current OpenGL //!< coordinates virtual void startForegroundDrawing() = 0; //!< Marks the beginning of an - //!OpenGL drawing block + //! OpenGL drawing block virtual void endForegroundDrawing() = 0; //!< Closes an OpenGL drawing block virtual void invalidateAll() = 0; //!< Redraws the entire viewer, passing - //!through Qt's event system + //! through Qt's event system virtual void GLInvalidateAll() = 0; //!< Redraws the entire viewer, bypassing - //!Qt's event system + //! Qt's event system virtual void GLInvalidateRect(const TRectD &rect) = 0; //!< Same as - //!GLInvalidateAll(), - //!for a specific - //!clipping rect + //! GLInvalidateAll(), + //! for a specific + //! clipping rect virtual void invalidateToolStatus() = 0; //!< Forces the viewer to update the - //!perceived status of tools + //! perceived status of tools virtual TAffine getViewMatrix() const { return TAffine(); } //!< Gets the viewer's current view affine (ie the transform from diff --git a/toonz/sources/include/tools/toolutils.h b/toonz/sources/include/tools/toolutils.h index 4950a15..a86aa0a 100644 --- a/toonz/sources/include/tools/toolutils.h +++ b/toonz/sources/include/tools/toolutils.h @@ -408,7 +408,8 @@ public: int getSize() const override { return sizeof(*this) + - /*(m_oldFillInformation.capacity()+m_newFillInformation.capacity())*sizeof(TFilledRegionInf) +*/ + /*(m_oldFillInformation.capacity()+m_newFillInformation.capacity())*sizeof(TFilledRegionInf) + +*/ 500; } diff --git a/toonz/sources/include/toonz/ikjacobian.h b/toonz/sources/include/toonz/ikjacobian.h index 3b5d63d..3fda54a 100644 --- a/toonz/sources/include/toonz/ikjacobian.h +++ b/toonz/sources/include/toonz/ikjacobian.h @@ -255,7 +255,7 @@ public: // The entries are in column order!!! // Use this with care. You may call GetRowStride and GetColStride to navigate // within the matrix. I do not expect these values to ever - //change. + // change. const double *GetPtr() const; double *GetPtr(); const double *GetPtr(long i, long j) const; diff --git a/toonz/sources/include/toonz/imagepainter.h b/toonz/sources/include/toonz/imagepainter.h index e977247..6bb78d5 100644 --- a/toonz/sources/include/toonz/imagepainter.h +++ b/toonz/sources/include/toonz/imagepainter.h @@ -48,10 +48,10 @@ public: bool m_showBBox; //!< Show the bounding box of current level TSceneProperties *m_sceneProperties; //!< Scene properties reference - which - //!contains further options + //! contains further options PlasticVisualSettings m_plasticVisualSettings; //!< Settings for mesh images - //!and plastic deformations + //! and plastic deformations // Other (misplaced) misc options @@ -62,7 +62,7 @@ public: TPixel32 m_blankColor; //!< The color of blank frames during playback bool m_useTexture; //!< Whether should we use OpenGL textures instead of - //!drawPixels() + //! drawPixels() bool m_recomputeIfNeeded; bool m_drawBlankFrame; bool m_useChecks; //!< whether to consider paint check and ink check diff --git a/toonz/sources/include/toonz/imagestyles.h b/toonz/sources/include/toonz/imagestyles.h index 4528b66..45871c0 100644 --- a/toonz/sources/include/toonz/imagestyles.h +++ b/toonz/sources/include/toonz/imagestyles.h @@ -134,7 +134,9 @@ public: bool hasMainColor() const override { return true; } TPixel32 getMainColor() const override { return m_averageColor; } - void setMainColor(const TPixel32 &color) override { m_params.m_patternColor = color; } + void setMainColor(const TPixel32 &color) override { + m_params.m_patternColor = color; + } // void draw(const TVectorRenderData &rd, TStrokeOutline* outline) const; void drawRegion(const TColorFunction *cf, const bool antiAliasing, diff --git a/toonz/sources/include/toonz/levelproperties.h b/toonz/sources/include/toonz/levelproperties.h index 9a90209..c6c4531 100644 --- a/toonz/sources/include/toonz/levelproperties.h +++ b/toonz/sources/include/toonz/levelproperties.h @@ -45,12 +45,12 @@ public: m_antialias; //!< [default: 0] Antialias amount (\p 0 meaning //! no antialias). DpiPolicy m_dpiPolicy; //!< [default: DP_ImageDpi] Dpi policy to be - //!adpoted. + //! adpoted. bool m_whiteTransp, //!< [default: false] Whether white should be //! visualized as transparent. m_premultiply; //!< [default: false] Whether level images should - //!be + //! be //! premultiplied by Toonz for alpha compositing (because they //! are not). public: diff --git a/toonz/sources/include/toonz/levelupdater.h b/toonz/sources/include/toonz/levelupdater.h index 45c7a7b..aee6a3a 100644 --- a/toonz/sources/include/toonz/levelupdater.h +++ b/toonz/sources/include/toonz/levelupdater.h @@ -118,7 +118,7 @@ class DVAPI LevelUpdater { TXshSimpleLevelP m_sl; //!< XSheet image level the updater may be attached to bool m_usingTemporaryFile; //!< Whether a temporary file is being used to - //!hold additional frames + //! hold additional frames bool m_opened; //!< Wheter the updater is already attached to a level public: diff --git a/toonz/sources/include/toonz/onionskinmask.h b/toonz/sources/include/toonz/onionskinmask.h index 435ecb0..f0b81b5 100644 --- a/toonz/sources/include/toonz/onionskinmask.h +++ b/toonz/sources/include/toonz/onionskinmask.h @@ -69,7 +69,7 @@ public: } void setMos(int drow, bool on); //!< Sets a Mobile OS frame shifted by drow - //!around current xsheet frame + //! around current xsheet frame void setFos(int row, bool on); //!< Sets a Fixed OS frame to the specified xsheet row diff --git a/toonz/sources/include/toonz/palettecontroller.h b/toonz/sources/include/toonz/palettecontroller.h index cc0547e..60007dc 100644 --- a/toonz/sources/include/toonz/palettecontroller.h +++ b/toonz/sources/include/toonz/palettecontroller.h @@ -36,16 +36,16 @@ class DVAPI PaletteController : public QObject { Q_OBJECT TPaletteHandle *m_currentLevelPalette; //!< (\p owned) Handle to the palette - //!of current level. + //! of current level. TPaletteHandle *m_currentCleanupPalette; //!< (\p owned) Handle to the - //!palette of current cleanup - //!settings. + //! palette of current cleanup + //! settings. TPaletteHandle *m_currentPalette; //!< (\p owned) Handle to the palette of - //!currently selected object. + //! currently selected object. TPaletteHandle *m_originalCurrentPalette; //!< Pointer to the \a original - //!current palette handle specified - //!on + //! current palette handle specified + //! on //! the last setCurrentPalette() invocation. TPixel32 m_colorSample; bool m_colorAutoApplyEnabled; diff --git a/toonz/sources/include/toonz/plasticdeformerfx.h b/toonz/sources/include/toonz/plasticdeformerfx.h index 1e0521b..9673257 100644 --- a/toonz/sources/include/toonz/plasticdeformerfx.h +++ b/toonz/sources/include/toonz/plasticdeformerfx.h @@ -42,11 +42,15 @@ public: bool canHandle(const TRenderSettings &info, double frame) override; - std::string getAlias(double frame, const TRenderSettings &info) const override; - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override; - - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; + bool doGetBBox(double frame, TRectD &bbox, + const TRenderSettings &info) override; + + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; std::string getPluginId() const override { return std::string(); } diff --git a/toonz/sources/include/toonz/preferences.h b/toonz/sources/include/toonz/preferences.h index ffe92a0..26c969e 100644 --- a/toonz/sources/include/toonz/preferences.h +++ b/toonz/sources/include/toonz/preferences.h @@ -210,9 +210,9 @@ public: bool isSubsceneFolderEnabled() const { return m_subsceneFolderEnabled; } int addLevelFormat(const LevelFormat &format); //!< Inserts a new level - //!format. \return The - //!associated format index. - void removeLevelFormat(int formatIdx); //!< Removes a level format. + //! format. \return The + //! associated format index. + void removeLevelFormat(int formatIdx); //!< Removes a level format. const LevelFormat &levelFormat( int formatIdx) const; //!< Retrieves a level format. @@ -285,7 +285,7 @@ public: // Xsheet tab void setXsheetStep(int step); //!< Sets the step used for the next/prev - //!step commands. + //! step commands. int getXsheetStep() const { return m_xsheetStep; } //!< Returns the step used for the next/prev step commands. diff --git a/toonz/sources/include/toonz/rasterstrokegenerator.h b/toonz/sources/include/toonz/rasterstrokegenerator.h index d74e2cc..6ba00d7 100644 --- a/toonz/sources/include/toonz/rasterstrokegenerator.h +++ b/toonz/sources/include/toonz/rasterstrokegenerator.h @@ -25,7 +25,7 @@ class DVAPI RasterStrokeGenerator { m_raster; // L'immagine raster sulla quale dobbiamo disegnare lo stroke std::vector m_points; // Il vettore di punti che rappresentano // la spina dorsale dello stroke - int m_styleId; // L'ink-style dello stroke + int m_styleId; // L'ink-style dello stroke bool m_selective; TRect m_boxOfRaster; // Un rettangolo della stessa dimensione di "m_raster" ColorType m_colorType; diff --git a/toonz/sources/include/toonz/sceneresources.h b/toonz/sources/include/toonz/sceneresources.h index 34f15ab..85e9595 100644 --- a/toonz/sources/include/toonz/sceneresources.h +++ b/toonz/sources/include/toonz/sceneresources.h @@ -152,7 +152,9 @@ Set simple level path to old path. */ void rollbackPath() override; - void accept(ResourceProcessor *processor) override { processor->process(m_pl); } + void accept(ResourceProcessor *processor) override { + processor->process(m_pl); + } bool isDirty() override; QString getResourceName() override; @@ -196,7 +198,9 @@ Set simple level path to old path. */ void rollbackPath() override; - void accept(ResourceProcessor *processor) override { processor->process(m_sl); } + void accept(ResourceProcessor *processor) override { + processor->process(m_sl); + } bool isDirty() override; QString getResourceName() override; @@ -238,7 +242,9 @@ Set sound track path to old path. */ void rollbackPath() override; - void accept(ResourceProcessor *processor) override { processor->process(m_sl); } + void accept(ResourceProcessor *processor) override { + processor->process(m_sl); + } bool isDirty() override { return false; } QString getResourceName() override { return QString(); } diff --git a/toonz/sources/include/toonz/stageplayer.h b/toonz/sources/include/toonz/stageplayer.h index 8334a16..1c19bae 100644 --- a/toonz/sources/include/toonz/stageplayer.h +++ b/toonz/sources/include/toonz/stageplayer.h @@ -80,9 +80,9 @@ public: int m_ancestorColumnIndex; //!< Index of this object's hierarchycal root //!(top-most column) bool m_isCurrentColumn; //!< Whether this player emanates from (a descendant - //!of) the current column + //! of) the current column bool m_isCurrentXsheetLevel; //!< Whether the player's xsheet is the \a - //!current one + //! current one TXshSimpleLevel *m_sl; //!< (not owned) The player's simple level TFrameId m_fid; //!< The player's frame in m_sl @@ -90,7 +90,7 @@ public: TXsheet *m_xsh; //!< (not owned) The player's xsheet int m_column; //!< The player's xsheet column int m_frame; //!< The player's xhseet row (could be not the current, due to - //!onion skin?) + //! onion skin?) bool m_isPlaying; //!< Whether this player is in a 'play >' status or rather //!'paused' diff --git a/toonz/sources/include/toonz/stagevisitor.h b/toonz/sources/include/toonz/stagevisitor.h index b01d57d..b0efb4f 100644 --- a/toonz/sources/include/toonz/stagevisitor.h +++ b/toonz/sources/include/toonz/stagevisitor.h @@ -230,7 +230,7 @@ private: struct VisualizationOptions { bool m_singleColumnEnabled; //!< Whether only current column should be - //!rendered + //! rendered bool m_checkFlags; // ... o.o? .... }; diff --git a/toonz/sources/include/toonz/tcenterlinevectorizer.h b/toonz/sources/include/toonz/tcenterlinevectorizer.h index c7aa625..8e933e4 100644 --- a/toonz/sources/include/toonz/tcenterlinevectorizer.h +++ b/toonz/sources/include/toonz/tcenterlinevectorizer.h @@ -59,10 +59,10 @@ Returns the \b TVectorImageP converted image.*/ bool isCanceled() { return m_isCanceled; } //!\b (\b Internal \b use \b only) Sets the maximum number of partial - //!notifications. + //! notifications. void setOverallPartials(int total) { m_totalPartials = total; } //!\b (\b Internal \b use \b only) Emits partial progress signal and updates - //!partial progresses internal count. + //! partial progresses internal count. void emitPartialDone(void); private: diff --git a/toonz/sources/include/toonz/tcolumnfx.h b/toonz/sources/include/toonz/tcolumnfx.h index 9c5f306..e45eef4 100644 --- a/toonz/sources/include/toonz/tcolumnfx.h +++ b/toonz/sources/include/toonz/tcolumnfx.h @@ -90,13 +90,17 @@ public: TAffine getDpiAff(int frame); TFxTimeRegion getTimeRegion() const override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - std::string getAlias(double frame, const TRenderSettings &info) const override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override; void compute(TFlash &flash, int frame) override; void saveData(TOStream &os) override; @@ -149,8 +153,10 @@ public: bool canHandle(const TRenderSettings &info, double frame) override; TFxTimeRegion getTimeRegion() const override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - std::string getAlias(double frame, const TRenderSettings &info) const override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; TAffine getDpiAff(int frame); void doCompute(TTile &tile, double frame, const TRenderSettings &) override; @@ -188,11 +194,15 @@ public: int getColumnIndex() const override; TXshColumn *getXshColumn() const override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } TFxTimeRegion getTimeRegion() const override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - std::string getAlias(double frame, const TRenderSettings &info) const override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; void doCompute(TTile &tile, double frame, const TRenderSettings &) override; @@ -220,12 +230,16 @@ public: FxDag *getFxDag() const { return m_fxDag; } - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } - std::string getAlias(double frame, const TRenderSettings &info) const override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; const TPersistDeclaration *getDeclaration() const override; std::string getPluginId() const override; @@ -249,9 +263,12 @@ class TOutputFx : public TRasterFx { public: TOutputFx(); - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &) override; diff --git a/toonz/sources/include/toonz/toonzscene.h b/toonz/sources/include/toonz/toonzscene.h index 196125b..9c975ee 100644 --- a/toonz/sources/include/toonz/toonzscene.h +++ b/toonz/sources/include/toonz/toonzscene.h @@ -78,7 +78,7 @@ public: TXsheet *getXsheet() const; //!< Returns a pointer to the scene's \a current xsheet. TXsheet *getTopXsheet() const; //!< Returns the \a topmost xsheet in the - //!scene's xsheet hierarchy. + //! scene's xsheet hierarchy. ChildStack *getChildStack() const { return m_childStack; @@ -104,7 +104,7 @@ public: const TFilePath &path); //!< Loads scene data from file, \a excluding the //! associated project and the scene resources. void loadNoResources(const TFilePath &path); //!< Loads a scene \a without - //!loading its resources. + //! loading its resources. void loadResources( bool withProgressDialog = false); //!< Loads the scene resources. void load(const TFilePath &path, @@ -123,8 +123,8 @@ public: the convertion succeeded. */ bool convertLevelIfNeeded(TFilePath &levelPath); //!< Checks if the given - //!levelPath is a file path - //!of an + //! levelPath is a file path + //! of an //! old Toonz level, and converts it if needed. /*! \details The loadLevel() function accepts an optional pointer to the diff --git a/toonz/sources/include/toonz/tstageobject.h b/toonz/sources/include/toonz/tstageobject.h index 4b3e131..c3ae0f6 100644 --- a/toonz/sources/include/toonz/tstageobject.h +++ b/toonz/sources/include/toonz/tstageobject.h @@ -104,14 +104,14 @@ The default value is XY. XY, //!< The object can move freely on a plane PATH = 1, //!< The movement take place on a spline PATH_AIM = 2, //!< The movement take place on a spline with the orientation - //!of the object + //! of the object //!< defined by the user through \b TStageObject::T_Angle and the total - //!angle is + //! angle is //!< the sum of the user angle plus the angle formed by //!< the tangent at the curve in the actual point IK = 3, //!< The object is translated according to inverse kinematics PATH_UPPK = 5, //!< PATH + UPPK (Update Pos Path Keyframe, when the spline - //!is changed; see TStageObjectSpline) + //! is changed; see TStageObjectSpline) PATH_AIM_UPPK = 6, //!< PATH_AIM + UPPK UPPK_MASK = 4, //!< (status&UPPK_MASK)!=0 <==> UPPK enabled STATUS_MASK = 3 //!< (status&STATUS_MASK) => old status @@ -128,7 +128,7 @@ The default value is XY. T_ScaleY, //!< Y-axis scale factor T_Scale, T_Path, //!< point position along the spline, as a percentage of the length - //!of the spline + //! of the spline T_ShearX, //!< Shear along x-axis T_ShearY, //!< Shear along y-axis T_ChannelCount diff --git a/toonz/sources/include/toonz/tstageobjectkeyframe.h b/toonz/sources/include/toonz/tstageobjectkeyframe.h index 31b4fe8..6fdaa76 100644 --- a/toonz/sources/include/toonz/tstageobjectkeyframe.h +++ b/toonz/sources/include/toonz/tstageobjectkeyframe.h @@ -15,7 +15,7 @@ struct TStageObject::Keyframe { TDoubleKeyframe m_channels[T_ChannelCount]; //!< Keyframe per standard stage - //!object channel + //! object channel SkDKey m_skeletonKeyframe; //!< Keyframes for the eventual plastic //!< deformation diff --git a/toonz/sources/include/toonz/tstageobjecttree.h b/toonz/sources/include/toonz/tstageobjecttree.h index 34b4eb5..765da6d 100644 --- a/toonz/sources/include/toonz/tstageobjecttree.h +++ b/toonz/sources/include/toonz/tstageobjecttree.h @@ -149,7 +149,7 @@ TStageObjectId \b \e id. their data. */ void saveData(TOStream &os, int occupiedColumnCount); - void saveData(TOStream &os) override {}; // not used + void saveData(TOStream &os) override{}; // not used /*! Returns the numbers of the objects in the tree. */ @@ -230,7 +230,8 @@ Removes from stage object tree the spline \b spline. */ void removeSpline(TStageObjectSpline *spline); /*! - Returns \e true if \b \e spline is present in the tree, otherwise + Returns \e true if \b \e spline is present in the tree, + otherwise returns \e false. */ bool containsSpline(TStageObjectSpline *) const; diff --git a/toonz/sources/include/toonz/ttileset.h b/toonz/sources/include/toonz/ttileset.h index 4ff70c1..3e2fcbb 100644 --- a/toonz/sources/include/toonz/ttileset.h +++ b/toonz/sources/include/toonz/ttileset.h @@ -88,7 +88,9 @@ public: return "TileCM" + QString::number((unsigned long)this); } #else - QString id() const override { return "TileCM" + QString::number((UINT)this); } + QString id() const override { + return "TileCM" + QString::number((UINT)this); + } #endif Tile *clone() const override; diff --git a/toonz/sources/include/toonz/txshleveltypes.h b/toonz/sources/include/toonz/txshleveltypes.h index 3bddd60..e976c73 100644 --- a/toonz/sources/include/toonz/txshleveltypes.h +++ b/toonz/sources/include/toonz/txshleveltypes.h @@ -17,11 +17,11 @@ enum TXshLevelType { FULLCOLOR_TYPE = TZI_TYPE | OVL_TYPE, RASTER_TYPE = FULLCOLOR_TYPE | TZP_TYPE, - TZI_XSHLEVEL = TZI_TYPE | LEVELCOLUMN_XSHLEVEL, //Scan level - PLI_XSHLEVEL = PLI_TYPE | LEVELCOLUMN_XSHLEVEL, //ToonzVector - TZP_XSHLEVEL = TZP_TYPE | LEVELCOLUMN_XSHLEVEL, //ToonzRaster - OVL_XSHLEVEL = OVL_TYPE | LEVELCOLUMN_XSHLEVEL, //Raster - CHILD_XSHLEVEL = CHILD_TYPE | LEVELCOLUMN_XSHLEVEL, + TZI_XSHLEVEL = TZI_TYPE | LEVELCOLUMN_XSHLEVEL, // Scan level + PLI_XSHLEVEL = PLI_TYPE | LEVELCOLUMN_XSHLEVEL, // ToonzVector + TZP_XSHLEVEL = TZP_TYPE | LEVELCOLUMN_XSHLEVEL, // ToonzRaster + OVL_XSHLEVEL = OVL_TYPE | LEVELCOLUMN_XSHLEVEL, // Raster + CHILD_XSHLEVEL = CHILD_TYPE | LEVELCOLUMN_XSHLEVEL, ZERARYFX_XSHLEVEL = 1 << 7, PLT_XSHLEVEL = 2 << 7, diff --git a/toonz/sources/include/toonz/txshsimplelevel.h b/toonz/sources/include/toonz/txshsimplelevel.h index 75c6c0b..5ab9909 100644 --- a/toonz/sources/include/toonz/txshsimplelevel.h +++ b/toonz/sources/include/toonz/txshsimplelevel.h @@ -81,7 +81,7 @@ public: static bool m_rasterizePli; //!< \internal Not the proper place for this data. static bool m_fillFullColorRaster; //!< \internal Not the proper place for - //!this data. + //! this data. public: TXshSimpleLevel( @@ -131,10 +131,11 @@ public: std::vector getFids() const; //!< Returns a copy of the level's frame ids. - void getFids(std::vector &fids) const override; //!< Copies fids() into - //!fids. \deprecated Use - //!the return valued - //!variation instead. + void getFids( + std::vector &fids) const override; //!< Copies fids() into + //! fids. \deprecated Use + //! the return valued + //! variation instead. TFrameId getFirstFid() const; //!< Returns the first level frame's id; roughly equivalent to @@ -163,12 +164,12 @@ public: guessStep() for further details. */ TFrameId index2fid(int index) const; //!< Returns a frame id corresponding to - //!the specified frame index, or - //! an invalid frame otherwise. + //! the specified frame index, or + //! an invalid frame otherwise. int fid2index(const TFrameId &fid) const; //!< Returns the frame \a index - //!corresponding to the specified - //!frame id, - //! or \p -1 if not found. + //! corresponding to the specified + //! frame id, + //! or \p -1 if not found. /* if the table contains 'fid' it returns fid2index(fid). @@ -238,7 +239,7 @@ Editable range is contained in \b m_editableRange. cleanup process. Should be moved there. */ void makeTlv(const TFilePath &tlvPath); //!< Transforms the level from \a - //!fullcolor to tlv (colormap), + //! fullcolor to tlv (colormap), //! and assigns the specified level path. TImageP createEmptyFrame(); @@ -378,7 +379,7 @@ private: bool m_isSubsequence, m_16BitChannelLevel, m_isReadOnly, m_temporaryHookMerged; //!< Used only during hook merge (and hence during - //!saving) + //! saving) private: //! Save simple level in scene-decoded path \p decodedFp. diff --git a/toonz/sources/include/toonz/txshsoundtextlevel.h b/toonz/sources/include/toonz/txshsoundtextlevel.h index f37f083..2e93f41 100644 --- a/toonz/sources/include/toonz/txshsoundtextlevel.h +++ b/toonz/sources/include/toonz/txshsoundtextlevel.h @@ -45,8 +45,8 @@ public: void loadData(TIStream &is) override; void saveData(TOStream &os) override; - void load() override {}; - void save() override {}; + void load() override{}; + void save() override{}; private: // not implemented diff --git a/toonz/sources/include/toonz/vectorizerparameters.h b/toonz/sources/include/toonz/vectorizerparameters.h index 3b2d455..6b1dadc 100644 --- a/toonz/sources/include/toonz/vectorizerparameters.h +++ b/toonz/sources/include/toonz/vectorizerparameters.h @@ -52,11 +52,11 @@ public: bool m_outline; //!< Vectorization mode between outline and centerline int m_threshold; //!< Cut-out parameter to distinguish paper or painted - //!background + //! background //! from recognizable strokes. A pixel whose tone (for colormaps) //! or HSV value is under \p m_threshold is considered ink-colored. bool m_leaveUnpainted; //!< Whether color recognition for areas should be - //!applied + //! applied TAffine m_affine; //!< Affine transform applied to the vectorization results double m_thickScale; //!< Impose a thickness reduction by this ratio @@ -151,9 +151,9 @@ public: int m_despeckling; //!< Despeckling edge size (size x size gets despeckled) int m_maxColors; //!< Maximum number of palette color from fullcolor - //!quantization + //! quantization TPixel32 m_transparentColor; //!< Color to be recognized as transparent in - //!the fullcolor case + //! the fullcolor case int m_toneTol; //!< Tone threshold to be used in the colormap case diff --git a/toonz/sources/include/toonz4.6/raster.h b/toonz/sources/include/toonz4.6/raster.h index eaeaea8..0078776 100644 --- a/toonz/sources/include/toonz4.6/raster.h +++ b/toonz/sources/include/toonz4.6/raster.h @@ -31,14 +31,13 @@ typedef enum { } RAS_TYPE; #ifdef VECCHIO -' typedef enum { RAS_NONE, RAS_BW, /* 1 bit, B=0, W=1, first pixel in bit 7 */ - RAS_WB, /* " , W=0, B=1, " */ - RAS_GR8, /* grey tones, 8 bits */ - RAS_CM8, /* color-mapped, 8 bits */ - RAS_GR16, /* grey tones, 16 bits */ - RAS_RGB16, /* RGB 5+6+5 bits, red most significant */ - RAS_RLEBW, /* 1 bit compressed(quick casm format) */ - RAS_RGB, /* 1 byte per color channel */ +' typedef enum { RAS_NONE, RAS_BW, /* 1 bit, B=0, W=1, first pixel in bit 7 */ RAS_WB, /* " , W=0, B=1, " */ + RAS_GR8, /* grey tones, 8 bits */ + RAS_CM8, /* color-mapped, 8 bits */ + RAS_GR16, /* grey tones, 16 bits */ + RAS_RGB16, /* RGB 5+6+5 bits, red most significant */ + RAS_RLEBW, /* 1 bit compressed(quick casm format) */ + RAS_RGB, /* 1 byte per color channel */ RAS_RGB_, /* LPIXEL, matte channel ignored, for display */ RAS_RGBM, /* LPIXEL, matte channel considered */ RAS_RGBM64, /* SPIXEL, matte channel considered */ diff --git a/toonz/sources/include/toonzqt/flipconsole.h b/toonz/sources/include/toonzqt/flipconsole.h index 8b2c11b..356d35b 100644 --- a/toonz/sources/include/toonzqt/flipconsole.h +++ b/toonz/sources/include/toonzqt/flipconsole.h @@ -211,10 +211,10 @@ public: eCustomize = 0x800000, eSave = 0x1000000, eDefineSubCamera = 0x2000000, - eFilledRaster = 0x4000000, // Used only in LineTest - eDefineLoadBox = 0x8000000, - eUseLoadBox = 0x10000000, - eEnd = 0x20000000 + eFilledRaster = 0x4000000, // Used only in LineTest + eDefineLoadBox = 0x8000000, + eUseLoadBox = 0x10000000, + eEnd = 0x20000000 }; static const UINT cFullConsole = eEnd - 1; diff --git a/toonz/sources/include/toonzqt/framenavigator.h b/toonz/sources/include/toonzqt/framenavigator.h index d14c09a..2307265 100644 --- a/toonz/sources/include/toonzqt/framenavigator.h +++ b/toonz/sources/include/toonzqt/framenavigator.h @@ -63,7 +63,7 @@ public: int getFrame() const { return m_frame; } void setFrameHandle(TFrameHandle *); //!< Attaches the navigator to the - //!specified frameHandle. + //! specified frameHandle. //! \remark Detaches from any previously attached frame handle. bool anyWidgetHasFocus(); @@ -87,7 +87,7 @@ protected: void hideEvent(QHideEvent *) override; void updateFrame(int frame); //!< Changes frame without emitting any signal - //!and notifying the frameHandle. + //! and notifying the frameHandle. protected slots: @@ -96,7 +96,7 @@ protected slots: current frame value. */ void onEditingFinished(); //!< Slot invoked whenever current frame's text - //!editing is finished. + //! editing is finished. void onFrameSwitched(); }; diff --git a/toonz/sources/include/toonzqt/freelayout.h b/toonz/sources/include/toonzqt/freelayout.h index a3b0c17..94bc6ef 100644 --- a/toonz/sources/include/toonzqt/freelayout.h +++ b/toonz/sources/include/toonzqt/freelayout.h @@ -47,7 +47,9 @@ public: QSize sizeHint() const override; QSize minimumSize() const override { return QSize(0, 0); } - QSize maximumSize() const override { return QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); } + QSize maximumSize() const override { + return QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); + } int count() const override { return m_items.count(); } void addItem(QLayoutItem *item) override { m_items.push_back(item); } diff --git a/toonz/sources/include/toonzqt/functionsegmentviewer.h b/toonz/sources/include/toonzqt/functionsegmentviewer.h index 5523182..e7aabfa 100644 --- a/toonz/sources/include/toonzqt/functionsegmentviewer.h +++ b/toonz/sources/include/toonzqt/functionsegmentviewer.h @@ -148,7 +148,7 @@ class SpeedInOutSegmentPage : public FunctionSegmentPage { public: SpeedInOutSegmentPage(FunctionSegmentViewer *parent = 0); void refresh() override; - void apply() override {}; + void apply() override{}; void getGuiValues(TPointD &speedIn, TPointD &speedOut); void init(int segmentLength) override; diff --git a/toonz/sources/include/toonzqt/functiontreeviewer.h b/toonz/sources/include/toonzqt/functiontreeviewer.h index a16d687..507fbda 100644 --- a/toonz/sources/include/toonzqt/functiontreeviewer.h +++ b/toonz/sources/include/toonzqt/functiontreeviewer.h @@ -290,7 +290,8 @@ private: // Observers notification functions - void onChange(const TParamChange &) override; // Multiple param notifications ... + void onChange( + const TParamChange &) override; // Multiple param notifications ... void onParamChange(bool isDragging); // ... that get compressed into one // Update functions @@ -324,7 +325,9 @@ public: QString getIdName() const override; - void *getInternalPointer() const override { return static_cast(m_fx); } + void *getInternalPointer() const override { + return static_cast(m_fx); + } TFx *getFx() const { return m_fx; } QVariant data(int role) const override; @@ -367,11 +370,14 @@ public: QColor getCurrentTextColor() const { return m_currentTextColor; } protected: - void onClick(TreeModel::Item *item, const QPoint &itemPos, QMouseEvent *e) override; + void onClick(TreeModel::Item *item, const QPoint &itemPos, + QMouseEvent *e) override; - void onMidClick(TreeModel::Item *item, const QPoint &itemPos, QMouseEvent *e) override; + void onMidClick(TreeModel::Item *item, const QPoint &itemPos, + QMouseEvent *e) override; - void onDrag(TreeModel::Item *item, const QPoint &itemPos, QMouseEvent *e) override; + void onDrag(TreeModel::Item *item, const QPoint &itemPos, + QMouseEvent *e) override; void onRelease() override; void openContextMenu(FunctionTreeModel::Channel *channel, diff --git a/toonz/sources/include/toonzqt/functionviewer.h b/toonz/sources/include/toonzqt/functionviewer.h index f2f5b8a..56c81b2 100644 --- a/toonz/sources/include/toonzqt/functionviewer.h +++ b/toonz/sources/include/toonzqt/functionviewer.h @@ -78,18 +78,18 @@ public: ~FunctionViewer(); void setXsheetHandle(TXsheetHandle *xshHandle); //!< Associates an xsheet to - //!the function editor. + //! the function editor. void setFrameHandle(TFrameHandle *frameHandle); //!< Synchronizes an external - //!timeline with the function - //!editor. + //! timeline with the function + //! editor. void setObjectHandle(TObjectHandle *objectHandle); //!< Associates a stage - //!objects selector to the - //!function editor. + //! objects selector to the + //! function editor. void setFxHandle(TFxHandle *fxHandle); //!< Associates an fx selector to the - //!function editor. + //! function editor. void setColumnHandle(TColumnHandle *columnHandle); //!< Associates a column - //!selector to the - //!function editor. + //! selector to the + //! function editor. FunctionSelection *getSelection() const { return m_selection; } @@ -97,20 +97,20 @@ public: void addParameter(TParam *parameter, const TFilePath &folder = TFilePath()); //!< Adds the - //!specified - //!parameter to the - //!function editor. - //!\param parameter - //!Parameter to be - //!added. Ownership - //!remains \a - //!external. \param - //!folder Host - //!folder (created - //!if necessary) - //!the parameter - //!will be added - //!to. + //! specified + //! parameter to the + //! function editor. + //!\param parameter + //! Parameter to be + //! added. Ownership + //! remains \a + //! external. \param + //! folder Host + //! folder (created + //! if necessary) + //! the parameter + //! will be added + //! to. void setFocusColumnsOrGraph(); void clearFocusColumnsAndGraph(); @@ -186,7 +186,7 @@ public: // :( private slots: void propagateExternalSetFrame(); //!< Forwards m_frameHandle's setFrame() - //!invocations to m_localFrame. + //! invocations to m_localFrame. }; #endif // FUNCTIONEDITORVIEWER_H diff --git a/toonz/sources/include/toonzqt/fxhistogramrender.h b/toonz/sources/include/toonzqt/fxhistogramrender.h index 7bd3fc1..b968826 100644 --- a/toonz/sources/include/toonzqt/fxhistogramrender.h +++ b/toonz/sources/include/toonzqt/fxhistogramrender.h @@ -43,7 +43,7 @@ public: ~FxHistogramRenderPort(); void onRenderRasterCompleted(const RenderData &renderData) override; - void onRenderFailure(const RenderData &renderData, TException &e) override {}; + void onRenderFailure(const RenderData &renderData, TException &e) override{}; void onRenderFinished(){}; signals: diff --git a/toonz/sources/include/toonzqt/fxschematicnode.h b/toonz/sources/include/toonzqt/fxschematicnode.h index a06dafa..760426a 100644 --- a/toonz/sources/include/toonzqt/fxschematicnode.h +++ b/toonz/sources/include/toonzqt/fxschematicnode.h @@ -453,7 +453,7 @@ public: QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0) override; + QWidget *widget = 0) override; void resize(bool maximizeNode) override; diff --git a/toonz/sources/include/toonzqt/icongenerator.h b/toonz/sources/include/toonzqt/icongenerator.h index b34a69f..c68d2b1 100644 --- a/toonz/sources/include/toonzqt/icongenerator.h +++ b/toonz/sources/include/toonzqt/icongenerator.h @@ -156,7 +156,7 @@ private: TDimension m_iconSize; QEventLoop m_iconsTerminationLoop; //!< Event loop used to wait for icons - //!termination. + //! termination. Settings m_settings; diff --git a/toonz/sources/include/toonzqt/imageutils.h b/toonz/sources/include/toonzqt/imageutils.h index e6a0195..8aba5d4 100644 --- a/toonz/sources/include/toonzqt/imageutils.h +++ b/toonz/sources/include/toonzqt/imageutils.h @@ -86,7 +86,7 @@ void DVAPI convert( const TFilePath &source, //!< Level path to convert from. const TFilePath &dest, //!< Level path to convert to. const TFrameId &from, //!< First source frame to convert. Supports - //!TFrameId::EMPTY_FRAME + //! TFrameId::EMPTY_FRAME //! to specify conversion from the beginning of level. const TFrameId &to, //!< Last source frame to convert. Supports TFrameId::EMPTY_FRAME diff --git a/toonz/sources/include/toonzqt/paletteviewergui.h b/toonz/sources/include/toonzqt/paletteviewergui.h index 3effbfe..513635c 100644 --- a/toonz/sources/include/toonzqt/paletteviewergui.h +++ b/toonz/sources/include/toonzqt/paletteviewergui.h @@ -89,7 +89,7 @@ public: LargeChips, //!< Large icons with style names. List, //!< Top-down list of all icons. SmallChipsWithName //!< Small icons with overlayed style names (if - //!user-defined). + //! user-defined). }; // for displaying the linked style name from studio palette diff --git a/toonz/sources/include/toonzqt/paramfield.h b/toonz/sources/include/toonzqt/paramfield.h index 390aac2..1d42cc6 100644 --- a/toonz/sources/include/toonzqt/paramfield.h +++ b/toonz/sources/include/toonzqt/paramfield.h @@ -208,7 +208,8 @@ public: virtual void updateField(T value) = 0; - void setParam(const TParamP ¤t, const TParamP &actual, int frame) override { + void setParam(const TParamP ¤t, const TParamP &actual, + int frame) override { m_currentParam = current; m_actualParam = actual; assert(m_currentParam); @@ -433,7 +434,8 @@ class EnumParamField : public ParamField { public: EnumParamField(QWidget *parent, QString name, const TIntEnumParamP ¶m); - void setParam(const TParamP ¤t, const TParamP &actual, int frame) override; + void setParam(const TParamP ¤t, const TParamP &actual, + int frame) override; void update(int frame) override; QSize getPreferedSize() override { return QSize(150, 20); } @@ -455,7 +457,8 @@ class DVAPI BoolParamField : public ParamField { public: BoolParamField(QWidget *parent, QString name, const TBoolParamP ¶m); - void setParam(const TParamP ¤t, const TParamP &actual, int frame) override; + void setParam(const TParamP ¤t, const TParamP &actual, + int frame) override; void update(int frame) override; QSize getPreferedSize() override { return QSize(20, 10); } @@ -483,7 +486,8 @@ public: IntParamField(QWidget *parent = 0, QString name = 0, const TIntParamP ¶m = 0); - void setParam(const TParamP ¤t, const TParamP &actual, int frame) override; + void setParam(const TParamP ¤t, const TParamP &actual, + int frame) override; void update(int frame) override; QSize getPreferedSize() override { return QSize(50, 28); } @@ -505,7 +509,8 @@ class DVAPI StringParamField : public ParamField { public: StringParamField(QWidget *parent, QString name, const TStringParamP ¶m); - void setParam(const TParamP ¤t, const TParamP &actual, int frame) override; + void setParam(const TParamP ¤t, const TParamP &actual, + int frame) override; void update(int frame) override; QSize getPreferedSize() override { return QSize(100, 20); } @@ -556,7 +561,8 @@ class DVAPI LineEdit_double : public ParamField { public: LineEdit_double(QWidget *parent, QString name, TDoubleParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: @@ -574,7 +580,8 @@ class DVAPI Slider_double : public ParamField { public: Slider_double(QWidget *parent, QString name, TDoubleParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: @@ -592,7 +599,8 @@ class DVAPI SpinBox_double : public ParamField { public: SpinBox_double(QWidget *parent, QString name, TDoubleParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: @@ -612,7 +620,8 @@ class DVAPI LineEdit_int : public ParamField { public: LineEdit_int(QWidget *parent, QString name, TIntParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: @@ -630,7 +639,8 @@ class DVAPI Slider_int : public ParamField { public: Slider_int(QWidget *parent, QString name, TIntParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: @@ -648,7 +658,8 @@ class DVAPI SpinBox_int : public ParamField { public: SpinBox_int(QWidget *parent, QString name, TIntParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: @@ -669,7 +680,8 @@ class DVAPI CheckBox_bool : public ParamField { public: CheckBox_bool(QWidget *parent, QString name, TBoolParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: @@ -690,7 +702,8 @@ class DVAPI RadioButton_enum : public ParamField { public: RadioButton_enum(QWidget *parent, QString name, TIntEnumParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: @@ -708,7 +721,8 @@ class DVAPI ComboBox_enum : public ParamField { public: ComboBox_enum(QWidget *parent, QString name, TIntEnumParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: @@ -728,7 +742,8 @@ class DVAPI LineEdit_string : public ParamField { public: LineEdit_string(QWidget *parent, QString name, TStringParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void setParam(TParamP const ¤t, TParamP const &actual, + int frame) override; void update(int frame) override; protected slots: diff --git a/toonz/sources/include/toonzqt/planeviewer.h b/toonz/sources/include/toonzqt/planeviewer.h index cf6ac97..36e113c 100644 --- a/toonz/sources/include/toonzqt/planeviewer.h +++ b/toonz/sources/include/toonzqt/planeviewer.h @@ -122,7 +122,7 @@ protected: double m_chessSize; //!< Size of the chessboard squares (default is 40). TRaster32P m_rasterBuffer; //!< Auxiliary buffer used to draw on the widget - //!directly. + //! directly. double m_zoomRange[2]; //!< Viewport zoom range (default: [-1024, 1024]). diff --git a/toonz/sources/include/toonzqt/rasterimagedata.h b/toonz/sources/include/toonzqt/rasterimagedata.h index 779de5f..ad69f71 100644 --- a/toonz/sources/include/toonzqt/rasterimagedata.h +++ b/toonz/sources/include/toonzqt/rasterimagedata.h @@ -132,7 +132,9 @@ public: StrokesData *toStrokesData(ToonzScene *scene) const override; TPointD getDpi() const override { return TPointD(m_dpiX, m_dpiY); } - FullColorImageData *clone() const override { return new FullColorImageData(*this); } + FullColorImageData *clone() const override { + return new FullColorImageData(*this); + } int getMemorySize() const override; }; diff --git a/toonz/sources/include/toonzqt/schematicnode.h b/toonz/sources/include/toonzqt/schematicnode.h index 5ec8e0c..7e0c771 100644 --- a/toonz/sources/include/toonzqt/schematicnode.h +++ b/toonz/sources/include/toonzqt/schematicnode.h @@ -103,7 +103,7 @@ public: QRectF boundingRect() const override; // reimplemeted in SchematicToggle_SplineOptions void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0) override; + QWidget *widget = 0) override; //! this is used for a 2-state toggle; void setIsActive(bool value) { m_state = value ? 1 : 0; } @@ -312,7 +312,7 @@ public: QRectF boundingRect() const override { return QRectF(0, 0, 1, 1); }; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0) override {}; + QWidget *widget = 0) override{}; //! Add the \b link to the links container. void addLink(SchematicLink *link) { m_links.push_back(link); } @@ -331,7 +331,7 @@ public: //! Returns the link indexed with \b index.\n //!\note A link is indexed with a progressive number when is inserted in the - //!container. + //! container. SchematicLink *getLink(int index) const { return (index < m_links.size() && index >= 0) ? m_links[index] : 0; } diff --git a/toonz/sources/include/toonzqt/stageobjectsdata.h b/toonz/sources/include/toonzqt/stageobjectsdata.h index cc21bba..4e5522c 100644 --- a/toonz/sources/include/toonzqt/stageobjectsdata.h +++ b/toonz/sources/include/toonzqt/stageobjectsdata.h @@ -62,10 +62,10 @@ class DVAPI StageObjectsData : public DvMimeData { std::set m_fxs; //!< Supplied Fx objects (cloned, shared ownership) std::set m_originalColumnFxs; //!< Column Fxs of the supplied column - //!objects (originals, 'owned' due to - //!m_elements) + //! objects (originals, 'owned' due to + //! m_elements) std::set m_terminalFxs; //!< Selection-terminal fxs (from both the - //!above) (cloned, shared ownership) + //! above) (cloned, shared ownership) std::map m_fxTable; //!< Original fxs/Cloned fxs pairings diff --git a/toonz/sources/include/toonzqt/studiopaletteviewer.h b/toonz/sources/include/toonzqt/studiopaletteviewer.h index 0fb1903..87f323b 100644 --- a/toonz/sources/include/toonzqt/studiopaletteviewer.h +++ b/toonz/sources/include/toonzqt/studiopaletteviewer.h @@ -29,7 +29,7 @@ class TXshLevelHandle; //============================================================================= //! The StudioPaletteTreeViewer class provides an object to view and manage -//!palettes files. +//! palettes files. /*! Inherits \b QTreeWidget, \b StudioPalette::Listener and \b ProjectManager::Listener. @@ -80,7 +80,8 @@ public: /*! Overriden from StudioPalette::Listener. */ void onStudioPaletteTreeChange() override { refresh(); } /*! Overriden from StudioPalette::Listener. */ - void onStudioPaletteMove(const TFilePath &dstPath, const TFilePath &srcPath) override { + void onStudioPaletteMove(const TFilePath &dstPath, + const TFilePath &srcPath) override { refresh(); } /*! Overriden from StudioPalette::Listener. */ @@ -189,7 +190,7 @@ protected: //============================================================================= //! The StudioPaletteViewer class provides an object to view and manage -//!studio palettes. +//! studio palettes. /*! Inherits \b QFrame. This object is composed of a splitter \b QSplitter that contain a vertical diff --git a/toonz/sources/include/toonzqt/styleeditor.h b/toonz/sources/include/toonzqt/styleeditor.h index 466ab8f..86a3a15 100644 --- a/toonz/sources/include/toonzqt/styleeditor.h +++ b/toonz/sources/include/toonzqt/styleeditor.h @@ -543,7 +543,7 @@ class SettingsPage : public QScrollArea { QWidget *m_autopaintToggleBox; TColorStyleP m_editedStyle; //!< A copy of the current style being edited by - //!the Style Editor. + //! the Style Editor. bool m_updating; //!< Whether the page is copying style content to its widget, @@ -601,13 +601,13 @@ class DVAPI StyleEditor : public QWidget { QToolBar *m_toolBar; //!< Lower toolbar. ColorParameterSelector *m_colorParameterSelector; //!< Secondary color - //!parameter selector in - //!the lower toolbar. + //! parameter selector in + //! the lower toolbar. TabBarContainter *m_tabBarContainer; //!< Tabs container for style types. QLabel *m_statusLabel; //!< showing the information of the current palette - //!and style. + //! and style. PlainColorPage *m_plainColorPage; StyleChooserPage *m_textureStylePage; @@ -619,7 +619,7 @@ class DVAPI StyleEditor : public QWidget { TColorStyleP m_oldStyle; //!< A copy of current style \a before the last change. TColorStyleP m_editedStyle; //!< The currently edited style. Please observe - //!that this is + //! that this is //! a \b copy of currently selected style, since style edits //! may be not automatically applied. bool m_enabled; @@ -655,13 +655,13 @@ protected: bool setStyle(TColorStyle *currentStyle); void setEditedStyleToStyle(const TColorStyle *style); //!< Clones the - //!supplied style and - //!considers that as - //!the edited one. + //! supplied style and + //! considers that as + //! the edited one. void setOldStyleToStyle(const TColorStyle *style); //!< Clones the supplied - //!style and considers - //!that as the previously - //!current one. + //! style and considers + //! that as the previously + //! current one. //! \todo Why is this not assimilated to setCurrentStyleToStyle()? /*! Return style parameter index selected in \b ColorParameterSelector. */ diff --git a/toonz/sources/include/toonzqt/validatedchoicedialog.h b/toonz/sources/include/toonzqt/validatedchoicedialog.h index a3e1b4e..140b4b5 100644 --- a/toonz/sources/include/toonzqt/validatedchoicedialog.h +++ b/toonz/sources/include/toonzqt/validatedchoicedialog.h @@ -74,12 +74,12 @@ reserves ValidatedChoiceDialog(QWidget *parent, Options opts = NO_OPTIONS); //!< Constructs the dialog - //!with no default - //!resolutions. - //!\param parent Parent - //!top-level widget. - //!\param Opts - //!Construction options. + //! with no default + //! resolutions. + //!\param parent Parent + //! top-level widget. + //!\param Opts + //! Construction options. /*! \param obj The object to resolve. \return The accepted resolution. */ @@ -104,9 +104,9 @@ other virtual QString acceptResolution( void *obj, //!< The type-erased object to be resolved. May be modified. int resolution, //!< The button id associated to the selected - //!resolution. + //! resolution. bool applyToAll //!< Whether user selected the resolution for all - //!successive prompts. + //! successive prompts. ) = 0; //!< Attempts enforcement of the selected resolution. /*! \details This function can be used to initialize the widget as soon as @@ -128,10 +128,10 @@ private: int m_appliedToAllRes; //!< Resolution applied in the \p APPLY_TO_ALL case. bool m_appliedToAll, //!< Whether the \p APPLY_TO_ALL option has previously - //!been selected. + //! been selected. m_applyToAll; //!< Whether the \p APPLY_TO_ALL option has been selected - //!in - //! \a current user interaction. + //! in + //! \a current user interaction. private slots: void onApplyToAll(); diff --git a/toonz/sources/include/tpalette.h b/toonz/sources/include/tpalette.h index fae2568..112c07a 100644 --- a/toonz/sources/include/tpalette.h +++ b/toonz/sources/include/tpalette.h @@ -123,16 +123,16 @@ public: } //!< Returns the number of the styles contained in the page. int getStyleId(int indexInPage) const; //!< Returns the \a index-th style - //!id in the page, or \p -1 if not - //!found. + //! id in the page, or \p -1 if not + //! found. TColorStyle *getStyle(int indexInPage) const; //!< Returns the \a index-th - //!style in the page, or \p 0 - //!if not found. + //! style in the page, or \p 0 + //! if not found. //! \return The insertion index in the page, or \p -1 on failure int addStyle(int styleId); //!< Adds the specified style Id to the page (at - //!the \a back - //! of the page). + //! the \a back + //! of the page). /*! \warning The supplied style must have been allocated with \a new. \warning Style ownership is surrendered to the palette. @@ -140,31 +140,31 @@ public: In case of failure, the supplied style is \a deleted. */ int addStyle(TColorStyle *style); //!< Adds the specified style to the - //!palette, and assigns it - //! to this page. + //! palette, and assigns it + //! to this page. //! \return The insertion index in the page, or \p -1 on failure int addStyle(TPixel32 color); //!< Add a solid color style to the palette, - //!and assigns it - //! to this page. + //! and assigns it + //! to this page. void insertStyle(int indexInPage, int styleId); //!< Inserts the supplied - //!style id at the - //!specified position - //! in the page. + //! style id at the + //! specified position + //! in the page. //! \sa The specifics of addStyle(TColorStyle*) apply here. void insertStyle(int indexInPage, TColorStyle *style); //!< Inserts the - //!supplied style in - //!the palette, and - //!assigns its + //! supplied style in + //! the palette, and + //! assigns its //! id at the specified position in the page. void insertStyle(int indexInPage, TPixel32 color); //!< Inserts a solid - //!color style in the - //!palette, and assigns - //!its + //! color style in the + //! palette, and assigns + //! its //! id at the specified position in the page. void removeStyle(int indexInPage); //!< Removes the style at the specified - //!position from this page. + //! position from this page. int search(int styleId) const; //!< Returns the page position of the specified style id, //! or \p -1 if it cannot be found on the page. @@ -193,7 +193,7 @@ private: m_styleAnimationTable; //!< Table of style animations (per style). int m_currentFrame; //!< Palette's current frame in style animations. bool m_isCleanupPalette; //!< Whether the palette is used for cleanup - //!purposes. + //! purposes. TImageP m_refImg; TFilePath m_refImgPath; @@ -204,7 +204,7 @@ private: bool m_isLocked; //!< Whether the palette is locked. bool m_askOverwriteFlag; //!< This variable is quite unique. This flag is to - //!acheive following beghavior: + //! acheive following beghavior: //! When saving the level with the palette being edited, ask whether the //! palette //! should be overwitten ONLY ONCE AT THE FIRST TIME. @@ -219,8 +219,8 @@ public: const; //!< Allocates a \a new copy of this palette instance. static void setRootDir(const TFilePath &fp); //!< It must be specified to - //!save textures in \e - //!fp/textures. + //! save textures in \e + //! fp/textures. static TFilePath getRootDir(); std::wstring getGlobalName() const { @@ -231,7 +231,7 @@ public: } //!< Assigns the name of the palette. void setDirtyFlag(bool dirtyFlag) //!< Declares the palette \a changed with - //!respect to the last saved state. + //! respect to the last saved state. { m_dirtyFlag = dirtyFlag; // synchronize with the dirty flag @@ -240,7 +240,7 @@ public: bool getDirtyFlag() { return m_dirtyFlag; } //!< Returns whether the palette changed with respect to the last saved - //!state. + //! state. TColorStyle *getStyle(int styleId) const; //!< Returns a pointer to the color style with the specified id, @@ -252,7 +252,7 @@ public: const; //!< Returns the number of styles contained in palette pages. int getFirstUnpagedStyle() const; //!< Returns the styleId of the first style - //!not in a page (\p -1 if none). + //! not in a page (\p -1 if none). /*! \remark Style ownserhip is \a surrendered to the palette @@ -260,9 +260,9 @@ public: failure. */ int addStyle(TColorStyle *style); //!< Adds the specified style to the - //!palette (but in no page). + //! palette (but in no page). int addStyle(const TPixelRGBM32 &color); //!< Adds a solid color style to the - //!palette (but in no page). + //! palette (but in no page). /*! \remark Style ownserhip is \a surrendered to the palette. @@ -272,8 +272,8 @@ public: int styleId, TColorStyle *style); //!< Replaces the style with the specified style id. void setStyle(int styleId, const TPixelRGBM32 &color); //!< Replaces the - //!style with the - //!specified style id. + //! style with the + //! specified style id. int getPageCount() const; //!< Returns the pages count. @@ -289,7 +289,7 @@ public: void erasePage(int index); //!< Deletes the \a index-th page. void movePage(Page *page, int dstPageIndex); //!< Moves the specified page to - //!a different page index. + //! a different page index. Page *getStylePage(int styleId) const; //!< Returns the page containing the specified \a styleId. @@ -314,17 +314,17 @@ between RGBA color components. } //!< Sets the palette's version number void setRefLevelFids(const std::vector fids); //!< Associates the - //!list of frames \e - //!fids to this - //!palette. + //! list of frames \e + //! fids to this + //! palette. std::vector getRefLevelFids(); //!< Returns the list of frames - //!associated to this palette. + //! associated to this palette. //! \deprecated Should be substituted by operator=(const TPalette&). void assign(const TPalette *src, bool isFromStudioPalette = false); //!< Copies src's page, color - //!styles an animation table - //!to the + //! styles an animation table + //! to the //! correspondig features of the palette. //! if the palette is copied from studio palette, this function will modify //! the original names. @@ -351,9 +351,9 @@ between RGBA color components. const TImageP &getRefImg() const { return m_refImg; } //!< Returns an image that represents the frame image associated to this - //!palette. + //! palette. void setRefImg(const TImageP &img); //!< Associates an image to this palette, - //!that is an image in the frame + //! that is an image in the frame //! builded or modified using this palette. const TFilePath getRefImgPath() const { @@ -369,21 +369,21 @@ between RGBA color components. void setFrame(int frame); //!< Sets the index of the current frame. bool isKeyframe(int styleId, int frame) const; //!< Returns whether the - //!specified frame is a \a - //!keyframe in styleId's - //!animation + //! specified frame is a \a + //! keyframe in styleId's + //! animation int getKeyframeCount(int styleId) const; //!< Returns the keyframes count in styleId's animation. int getKeyframe(int styleId, int index) const; //!< Returns the \a index-th frame in styleId's animation, //! or \p -1 if it couldn't be found. - void setKeyframe(int styleId, int frame); //!< Sets a keyframe at the - //!specified frame of styleId's - //!animation. + void setKeyframe(int styleId, int frame); //!< Sets a keyframe at the + //! specified frame of styleId's + //! animation. void clearKeyframe(int styleId, int frame); //!< Deletes the keyframe at the - //!specified frame of styleId's - //!animation. + //! specified frame of styleId's + //! animation. /*! \note Key is an integer between 0 and 9 included. diff --git a/toonz/sources/include/tproperty.h b/toonz/sources/include/tproperty.h index c6a53d1..8395697 100644 --- a/toonz/sources/include/tproperty.h +++ b/toonz/sources/include/tproperty.h @@ -364,7 +364,9 @@ public: std::wstring getValue() const { return (m_index < 0) ? L"" : m_range[m_index]; } - std::string getValueAsString() override { return ::to_string(m_range[m_index]); } + std::string getValueAsString() override { + return ::to_string(m_range[m_index]); + } int getIndex() const { return m_index; } void accept(Visitor &v) override { v.visit(this); } diff --git a/toonz/sources/include/traster.h b/toonz/sources/include/traster.h index 9e01396..07a252a 100644 --- a/toonz/sources/include/traster.h +++ b/toonz/sources/include/traster.h @@ -314,7 +314,9 @@ public: TRasterP create() const override { return TRasterPT(m_lx, m_ly); } - TRasterP create(int lx, int ly) const override { return TRasterPT(lx, ly); } + TRasterP create(int lx, int ly) const override { + return TRasterPT(lx, ly); + } //!\include raster_ex2.cpp TRasterP extract(int x0, int y0, int x1, int y1) override { diff --git a/toonz/sources/include/trasterfx.h b/toonz/sources/include/trasterfx.h index 4606de7..b933d41 100644 --- a/toonz/sources/include/trasterfx.h +++ b/toonz/sources/include/trasterfx.h @@ -95,8 +95,8 @@ public: // Note - fields are sorted by decreasing size. This ensures minimal padding. TAffine m_affine; //!< Affine that \a should be applied \a after the fx has - //!been rendered. - //! \sa TRasterFx::compute(). + //! been rendered. + //! \sa TRasterFx::compute(). std::vector m_data; //!< Fx-specific data inserted by upstream fxs. @@ -104,25 +104,25 @@ public: //! demo versions of Toonz double m_gamma; //!< Gamma modifier for the output frame. \note Should be - //!moved to TOutputProperties. + //! moved to TOutputProperties. double m_timeStretchFrom, //!< Fps source stretch variable. \note Should be - //!moved to TOutputProperties. + //! moved to TOutputProperties. m_timeStretchTo; //!< Fps destination stretch variable. \note Should be - //!moved to TOutputProperties. + //! moved to TOutputProperties. double m_stereoscopicShift; //!< X-axis camera shift for stereoscopy, in - //!inches. \sa m_stereoscopic. \note Should be - //!moved to TOutputProperties. + //! inches. \sa m_stereoscopic. \note Should be + //! moved to TOutputProperties. int m_bpp; //!< Bits-per-pixel required in the output frame. \remark This - //!data - //! must be accompanied by a tile of the suitable type. \sa - //! TRasterFx::compute(). + //! data + //! must be accompanied by a tile of the suitable type. \sa + //! TRasterFx::compute(). int m_maxTileSize; //!< Maximum size (in MegaBytes) of a tile cachable during - //!a render process. + //! a render process. //! Used by the predictive cache manager to subdivide an fx calculation into //! tiles. \sa TRasterFx::compute(). int m_shrinkX, //!< Required horizontal shrink. \warning Obsolete, do not - //!use. \todo Must be removed. + //! use. \todo Must be removed. m_shrinkY; //!< Required vertical shrink. \warning Obsolete, do not use. //!\todo Must be removed. @@ -137,14 +137,14 @@ public: //! This info could be used by computationally intensive fxs to //! implement a simplified render during user interactions. bool m_userCachable; //!< Whether the user can manually cache this render - //!request. \sa TRasterFx::compute() + //! request. \sa TRasterFx::compute() // Toonz-relevant data (used by Toonz, fx writers should *IGNORE* them while // rendering a single fx) // NOTE: The signed options should to be moved in TOutputProperties class. bool m_applyShrinkToViewer; //!< Whether shrink must be considered. \note - //!Should be moved to TOutputProperties. + //! Should be moved to TOutputProperties. /*-- カメラサイズ --*/ TRectD m_cameraBox; @@ -266,7 +266,8 @@ public: // resituisce una stringa che identifica univocamente il sottoalbero // avente come radice l'effetto - std::string getAlias(double frame, const TRenderSettings &info) const override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; virtual void dryCompute(TRectD &rect, double frame, const TRenderSettings &info); @@ -331,14 +332,17 @@ public: virtual TAffine getPlacement(double frame) = 0; virtual TAffine getParentPlacement(double frame) = 0; - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override; void compute(TFlash &flash, int frame) override; - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bbox, + const TRenderSettings &info) override; virtual bool checkTimeRegion() const { return false; } - std::string getAlias(double frame, const TRenderSettings &info) const override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, @@ -390,7 +394,9 @@ public: TFx *clone(bool recursive) const override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } void compute(TFlash &flash, int frame) override; diff --git a/toonz/sources/include/trenderer.h b/toonz/sources/include/trenderer.h index f887b1d..40fcd3d 100644 --- a/toonz/sources/include/trenderer.h +++ b/toonz/sources/include/trenderer.h @@ -92,11 +92,11 @@ struct TRenderPort::RenderData { std::vector m_frames; //!< Frames this output represents TRenderSettings m_info; //!< Output settings description TRasterP m_rasA, m_rasB; //!< The output images; m_rasB is not empty only for - //!interlacacing and stereoscopic. + //! interlacacing and stereoscopic. unsigned long m_renderId; //!< Identifier of the rendering session this - //!output belongs to + //! output belongs to unsigned long m_taskId; //!< Task identifier in the rendering session. Starts - //!at 0, preserves + //! at 0, preserves //!< the original submission order except for cluster equivalence. RenderData() : m_renderId((unsigned long)-1), m_taskId((unsigned long)-1) {} diff --git a/toonz/sources/include/tsimplecolorstyles.h b/toonz/sources/include/tsimplecolorstyles.h index a37b137..90358b3 100644 --- a/toonz/sources/include/tsimplecolorstyles.h +++ b/toonz/sources/include/tsimplecolorstyles.h @@ -202,7 +202,8 @@ public: TPixel32 getColor() const { return m_color; } USHORT getStipple() const { return m_stipple; } - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(const TColorFunction *cf, + const TStroke *stroke) const override; void drawStroke(TFlash &flash, const TStroke *s) const override; bool hasMainColor() const override { return true; } @@ -263,7 +264,9 @@ public: TColorStyle *clone() const override; - QString getDescription() const override { return "TRasterImagePatternStrokeStyle"; } + QString getDescription() const override { + return "TRasterImagePatternStrokeStyle"; + } bool hasMainColor() const override { return false; } TPixel32 getMainColor() const override { return TPixel32::Black; } @@ -338,7 +341,9 @@ public: TColorStyle *clone() const override; - QString getDescription() const override { return "TVectorImagePatternStrokeStyle"; } + QString getDescription() const override { + return "TVectorImagePatternStrokeStyle"; + } bool hasMainColor() const override { return false; } TPixel32 getMainColor() const override { return TPixel32::Black; } diff --git a/toonz/sources/include/tsound_t.h b/toonz/sources/include/tsound_t.h index 6c2af88..435a4e2 100644 --- a/toonz/sources/include/tsound_t.h +++ b/toonz/sources/include/tsound_t.h @@ -203,7 +203,8 @@ from which it's created.It hasn't reference to the object. //! Returns the soundtrack pressure max value in the given sample range and //! channel - double getMaxPressure(TINT32 s0, TINT32 s1, TSound::Channel chan) const override { + double getMaxPressure(TINT32 s0, TINT32 s1, + TSound::Channel chan) const override { TINT32 sampleCount = getSampleCount(); if (sampleCount <= 0) { return -1; @@ -237,7 +238,8 @@ from which it's created.It hasn't reference to the object. //! Returns the soundtrack pressure min value in the given sample range and //! channel - double getMinPressure(TINT32 s0, TINT32 s1, TSound::Channel chan) const override { + double getMinPressure(TINT32 s0, TINT32 s1, + TSound::Channel chan) const override { TINT32 sampleCount = getSampleCount(); if (sampleCount <= 0) { return 0; diff --git a/toonz/sources/include/tstopwatch.h b/toonz/sources/include/tstopwatch.h index fbc9a94..1669c34 100644 --- a/toonz/sources/include/tstopwatch.h +++ b/toonz/sources/include/tstopwatch.h @@ -54,15 +54,15 @@ class DVAPI TStopWatch { std::string m_name; // stopwatch name - TM_TOTAL m_tm; // elapsed total time (in milliseconds) - TM_USER m_tmUser; // elapsed user time (time associated to the process - // calling stop watch)(unit=100-nanosecond) + TM_TOTAL m_tm; // elapsed total time (in milliseconds) + TM_USER m_tmUser; // elapsed user time (time associated to the process + // calling stop watch)(unit=100-nanosecond) TM_SYSTEM m_tmSystem; // elapsed system time (unit=100-nanosecond) START m_start; // total starting reference time in milliseconds START_USER - m_startUser; // process starting reference time (unit=100-nanosecond) + m_startUser; // process starting reference time (unit=100-nanosecond) START_SYSTEM - m_startSystem; // system starting reference time (unit=100-nanosecond) + m_startSystem; // system starting reference time (unit=100-nanosecond) #ifdef _WIN32 LARGE_INTEGER m_hrStart; // high resolution starting reference (total) time diff --git a/toonz/sources/include/tstream.h b/toonz/sources/include/tstream.h index bf6a8b3..146ca50 100644 --- a/toonz/sources/include/tstream.h +++ b/toonz/sources/include/tstream.h @@ -85,8 +85,8 @@ reimplementation of the TPersist::loadData() function. TIStream &operator>>( TPersist &v); //!< Reads a TPersist derived object data from the stream. TIStream &operator>>(TPersist *&v); //!< \a Allocates and reads a TPersist - //!derived object data from the stream. - //! \sa operator>>(TPersist&) + //! derived object data from the stream. + //! \sa operator>>(TPersist&) //! \deprecated std::string @@ -94,8 +94,8 @@ reimplementation of the TPersist::loadData() function. //! \deprecated bool eos(); //!< \brief Returns \e true in case of end of string (a - //!StreamTag::EndTag - //! is encountered or the string is empty). + //! StreamTag::EndTag + //! is encountered or the string is empty). /*! \param tagName Output name of a matched tag. @@ -120,7 +120,7 @@ reimplementation of the TPersist::loadData() function. int &value); //!< \sa getTagParam(string, string&) bool isBeginEndTag(); //!< Returns whether current tag is of type - //!StreamTag::BeginEndTag. + //! StreamTag::BeginEndTag. bool openChild( std::string &tagName); //!< \deprecated Use matchTag(string&) instead. @@ -133,7 +133,7 @@ reimplementation of the TPersist::loadData() function. //! TOStream::openChild(string, const map&). TFilePath getFilePath(); //!< Returns the stream's path (i.e. the opened - //!filename associated to the input stream). + //! filename associated to the input stream). TFilePath getRepositoryPath(); //!< \deprecated int getLine() @@ -145,15 +145,15 @@ reimplementation of the TPersist::loadData() function. //! \sa setVersion() void setVersion(const VersionNumber &version); //!< Returns the currently - //!stored version of the - //!opened document. - //! \sa setVersion() + //! stored version of the + //! opened document. + //! \sa setVersion() /*! \note After skipping the tag content, the stream is positioned immediately after the end tag. */ void skipCurrentTag(); //!< Silently ignores the content of currently opened - //!tag up to its end. + //! tag up to its end. private: // Not copyable @@ -234,7 +234,7 @@ public: TOStream child(std::string tagName); void openChild(std::string tagName); //!< Writes a to the stream, - //!opening a tag. + //! opening a tag. void openChild( std::string tagName, const std::map @@ -243,19 +243,19 @@ public: void openCloseChild(std::string tagName, const std::map &attributes); //!< \brief Writes a tag + //! attribute1="value1" ../> //! to the stream, opening a tag with embedded attributes //! which is immediately closed. void closeChild(); //!< Closes current tag, writing to the - //!stream. + //! stream. void cr(); //!< Writes carriage return to the stream. \deprecated void tab(int dt); //!< \deprecated TFilePath getFilePath(); //!< Returns the file path of the file associated to - //!this output stream. + //! this output stream. TFilePath getRepositoryPath(); //!< \deprecated /*! \detail diff --git a/toonz/sources/include/tstrokedeformations.h b/toonz/sources/include/tstrokedeformations.h index 60b2e67..869913b 100644 --- a/toonz/sources/include/tstrokedeformations.h +++ b/toonz/sources/include/tstrokedeformations.h @@ -101,7 +101,8 @@ Use this constructor with modifyControlPoints. virtual ~TStrokePointDeformation(); TThickPoint getDisplacement(const TStroke &stroke, double s) const override; - TThickPoint getDisplacementForControlPoint(const TStroke &s, UINT n) const override; + TThickPoint getDisplacementForControlPoint(const TStroke &s, + UINT n) const override; TThickPoint getDisplacementForControlPointLen(const TStroke &stroke, double cpLen) const override; @@ -235,7 +236,8 @@ Use this constructor with movePoints. virtual ~TStrokeBenderDeformation(); TThickPoint getDisplacement(const TStroke &, double s) const override; - TThickPoint getDisplacementForControlPoint(const TStroke &, UINT n) const override; + TThickPoint getDisplacementForControlPoint(const TStroke &, + UINT n) const override; TThickPoint getDisplacementForControlPointLen(const TStroke &stroke, double cpLen) const override; diff --git a/toonz/sources/include/tsweepboundary.h b/toonz/sources/include/tsweepboundary.h index 3c2bb7c..01f1879 100644 --- a/toonz/sources/include/tsweepboundary.h +++ b/toonz/sources/include/tsweepboundary.h @@ -10,7 +10,7 @@ // bool computeSweepBoundary( const std::vector &strokes, // std::vector< -//std::vector > &outlines ); +// std::vector > &outlines ); #undef DVAPI #undef DVVAR diff --git a/toonz/sources/include/tthread.h b/toonz/sources/include/tthread.h index 4a0c745..32ca580 100644 --- a/toonz/sources/include/tthread.h +++ b/toonz/sources/include/tthread.h @@ -125,7 +125,7 @@ class DVAPI Runnable : public QObject, public TSmartObject { friend class Executor; // Needed to confront Executor's and Runnable's ids friend class ExecutorImp; // The internal task manager needs full control // over the task - friend class Worker; // Workers force tasks to emit state signals + friend class Worker; // Workers force tasks to emit state signals public: Runnable(); diff --git a/toonz/sources/include/tunit.h b/toonz/sources/include/tunit.h index f23ff8f..be80d5e 100644 --- a/toonz/sources/include/tunit.h +++ b/toonz/sources/include/tunit.h @@ -38,9 +38,13 @@ class DVAPI TSimpleUnitConverter : public TUnitConverter { public: TSimpleUnitConverter(double factor = 1, double offset = 0) : m_factor(factor), m_offset(offset) {} - TUnitConverter *clone() const override { return new TSimpleUnitConverter(*this); } + TUnitConverter *clone() const override { + return new TSimpleUnitConverter(*this); + } double convertTo(double v) const override { return v * m_factor + m_offset; } - double convertFrom(double v) const override { return (v - m_offset) / m_factor; } + double convertFrom(double v) const override { + return (v - m_offset) / m_factor; + } }; //--------------------------- diff --git a/toonz/sources/include/tvectorrenderdata.h b/toonz/sources/include/tvectorrenderdata.h index 7a2c227..885879c 100644 --- a/toonz/sources/include/tvectorrenderdata.h +++ b/toonz/sources/include/tvectorrenderdata.h @@ -50,24 +50,24 @@ public: const TColorFunction *m_cf; //!< [\p not-owned] Transform to be used for drawing RGBM colors. const TPalette *m_palette; //!< [\p not-owned] Palette to be used for - //!translating color indexes to - //! RGBM colors. + //! translating color indexes to + //! RGBM colors. TAffine m_aff; //!< Geometric transform to be applied on image rendering. TRect m_clippingRect; //!< Integral rect where the image drawing will be - //!restricted on; - //! if empty, clipping is assumed to be disabled. - //! \internal Coordinates reference? + //! restricted on; + //! if empty, clipping is assumed to be disabled. + //! \internal Coordinates reference? TPixel m_tCheckInk; //!< Color to be used for ink check mode. TPixel m_tCheckPaint; //!< Color to be used for paint check mode. int m_colorCheckIndex; //!< Color index to be highlighted in color - //!check mode. + //! check mode. bool m_alphaChannel, //!< Whether alpha channel is enabled. m_antiAliasing, //!< Whether antialiasing must be applied. m_isImagePattern, //!< \internal Seems like a bad bug-patch - inquire - //!further... + //! further... m_drawRegions, //!< Inks only mode. m_tcheckEnabled, //!< Transparency check mode. m_inkCheckEnabled, //!< Ink check mode. @@ -76,11 +76,11 @@ public: m_isIcon, //!< Whether image rendering is for an icon. m_is3dView, //!< Whether image rendering is in 3D mode. m_show0ThickStrokes, //!< Whether strokes with 0 thickness should be - //!rendered anyway. + //! rendered anyway. m_regionAntialias, //!< Whether regions should be rendered with - //!antialiasing at boundaries. + //! antialiasing at boundaries. m_isOfflineRender; //!< Whether image rendering is in render or - //!camera-stand (preview) mode. + //! camera-stand (preview) mode. //! \deprecated Use the above individual options instead. //! \todo Remove it ASAP. public: diff --git a/toonz/sources/stdfx/adjustlevelsfx.cpp b/toonz/sources/stdfx/adjustlevelsfx.cpp index 35e6751..ec90e2b 100644 --- a/toonz/sources/stdfx/adjustlevelsfx.cpp +++ b/toonz/sources/stdfx/adjustlevelsfx.cpp @@ -93,9 +93,12 @@ public: ~AdjustLevelsFx(){}; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { diff --git a/toonz/sources/stdfx/artcontourfx.cpp b/toonz/sources/stdfx/artcontourfx.cpp index 047a20c..4837fc2 100644 --- a/toonz/sources/stdfx/artcontourfx.cpp +++ b/toonz/sources/stdfx/artcontourfx.cpp @@ -91,7 +91,8 @@ public: //---------------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &ri) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &ri) override { if (m_input.isConnected() && m_controller.isConnected()) { TRectD controlBox, inputBox; @@ -119,7 +120,9 @@ public: //----------------------------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } //----------------------------------------------------------------------------- @@ -127,7 +130,8 @@ public: //----------------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &ri) override; //----------------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/backlitfx.cpp b/toonz/sources/stdfx/backlitfx.cpp index 492c86d..ea85c7c 100644 --- a/toonz/sources/stdfx/backlitfx.cpp +++ b/toonz/sources/stdfx/backlitfx.cpp @@ -197,7 +197,8 @@ public: addInputPort("Source", m_lighted); } ~BacklitFx() {} - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bbox, + const TRenderSettings &info) override { if (getActiveTimeRegion().contains(frame)) if (m_light.isConnected()) { if (m_lighted.isConnected()) { @@ -213,7 +214,8 @@ public: return false; } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { if (!m_light.isConnected()) return; if (!m_lighted.isConnected()) { m_light->dryCompute(rect, frame, info); @@ -232,7 +234,8 @@ public: m_light->dryCompute(inRect, frame, info); } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { if (!m_light.isConnected()) return; if (!m_lighted.isConnected()) { @@ -272,7 +275,9 @@ public: tile.getRaster()->copy(ctrTile.getRaster(), TPoint(-brad, -brad)); } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override { diff --git a/toonz/sources/stdfx/blendtzfx.cpp b/toonz/sources/stdfx/blendtzfx.cpp index 2dc40eb..53d1623 100644 --- a/toonz/sources/stdfx/blendtzfx.cpp +++ b/toonz/sources/stdfx/blendtzfx.cpp @@ -43,7 +43,8 @@ public: TRenderSettings &infoOnInput) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { // Build the render data TRenderSettings info2(info); @@ -58,7 +59,9 @@ public: //----------------------------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } //----------------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/blurfx.cpp b/toonz/sources/stdfx/blurfx.cpp index 961a1e6..2dfd499 100644 --- a/toonz/sources/stdfx/blurfx.cpp +++ b/toonz/sources/stdfx/blurfx.cpp @@ -25,7 +25,8 @@ public: ~BlurFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); diff --git a/toonz/sources/stdfx/bodyhighlightfx.cpp b/toonz/sources/stdfx/bodyhighlightfx.cpp index 446c17b..c779a14 100644 --- a/toonz/sources/stdfx/bodyhighlightfx.cpp +++ b/toonz/sources/stdfx/bodyhighlightfx.cpp @@ -373,7 +373,8 @@ public: ~BodyHighLightFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -382,8 +383,11 @@ public: } } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &) override; int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; diff --git a/toonz/sources/stdfx/bright_contfx.cpp b/toonz/sources/stdfx/bright_contfx.cpp index adf1dd0..0e12fd3 100644 --- a/toonz/sources/stdfx/bright_contfx.cpp +++ b/toonz/sources/stdfx/bright_contfx.cpp @@ -22,9 +22,12 @@ public: ~Bright_ContFx(){}; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (!m_input.isConnected()) { bBox = TRectD(); return false; diff --git a/toonz/sources/stdfx/calligraphicfx.cpp b/toonz/sources/stdfx/calligraphicfx.cpp index 5f71da7..d4f0334 100644 --- a/toonz/sources/stdfx/calligraphicfx.cpp +++ b/toonz/sources/stdfx/calligraphicfx.cpp @@ -65,7 +65,8 @@ public: ~CalligraphicFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { TRenderSettings info2(info); @@ -94,7 +95,9 @@ public: } } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } bool allowUserCacheOnPort(int port) override { return false; } @@ -129,7 +132,8 @@ private: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { if (!m_input.isConnected()) return; int shrink = tround((ri.m_shrinkX + ri.m_shrinkY) / 2.0); @@ -225,7 +229,8 @@ public: ~OutBorderFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { TRenderSettings info2(info); @@ -254,7 +259,9 @@ public: } } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } private: void getValues(const char *argv[], int argc, double frame) { @@ -287,7 +294,8 @@ private: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { if (!m_input.isConnected()) return; int shrink = tround((ri.m_shrinkX + ri.m_shrinkY) / 2.0); diff --git a/toonz/sources/stdfx/changecolorfx.cpp b/toonz/sources/stdfx/changecolorfx.cpp index 2578603..1e61bde 100644 --- a/toonz/sources/stdfx/changecolorfx.cpp +++ b/toonz/sources/stdfx/changecolorfx.cpp @@ -123,7 +123,8 @@ public: } ~ChangeColorFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); { bBox = TRectD(); diff --git a/toonz/sources/stdfx/channelmixerfx.cpp b/toonz/sources/stdfx/channelmixerfx.cpp index 22ce156..16f880a 100644 --- a/toonz/sources/stdfx/channelmixerfx.cpp +++ b/toonz/sources/stdfx/channelmixerfx.cpp @@ -85,7 +85,8 @@ public: } ~ChannelMixerFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -94,7 +95,9 @@ public: } }; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; namespace { @@ -135,7 +138,7 @@ void doChannelMixer(TRasterPT ras, double r_r, double r_g, double r_b, pix->g = (CHANNEL_TYPE)green; pix->b = (CHANNEL_TYPE)blue; pix->m = (CHANNEL_TYPE)matte; - *pix = premultiply(*pix); // if removed, a white edged line appears in + *pix = premultiply(*pix); // if removed, a white edged line appears in // the edge of a level (if m>r, g, b) pix++; } diff --git a/toonz/sources/stdfx/cloudsfx.cpp b/toonz/sources/stdfx/cloudsfx.cpp index eaebc4d..e34af48 100644 --- a/toonz/sources/stdfx/cloudsfx.cpp +++ b/toonz/sources/stdfx/cloudsfx.cpp @@ -47,7 +47,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } // TAffine handledAffine(const TRenderSettings& info, double frame) {return // TAffine();} }; diff --git a/toonz/sources/stdfx/cornerpinfx.cpp b/toonz/sources/stdfx/cornerpinfx.cpp index 8d51afa..354d92e 100644 --- a/toonz/sources/stdfx/cornerpinfx.cpp +++ b/toonz/sources/stdfx/cornerpinfx.cpp @@ -27,15 +27,19 @@ public: CornerPinFx(); ~CornerPinFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; void onPortConnected(TFxPort *port); - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } bool allowUserCacheOnPort(int port) override { return port != 0; } diff --git a/toonz/sources/stdfx/despecklefx.cpp b/toonz/sources/stdfx/despecklefx.cpp index 75830ab..dee3772 100644 --- a/toonz/sources/stdfx/despecklefx.cpp +++ b/toonz/sources/stdfx/despecklefx.cpp @@ -30,12 +30,16 @@ public: m_size->setValueRange(1, 1000); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/diamondgradientfx.cpp b/toonz/sources/stdfx/diamondgradientfx.cpp index fbc7e3c..dd40637 100644 --- a/toonz/sources/stdfx/diamondgradientfx.cpp +++ b/toonz/sources/stdfx/diamondgradientfx.cpp @@ -31,7 +31,9 @@ public: return true; }; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; diff --git a/toonz/sources/stdfx/dissolvefx.cpp b/toonz/sources/stdfx/dissolvefx.cpp index 0e865ad..e98ed67 100644 --- a/toonz/sources/stdfx/dissolvefx.cpp +++ b/toonz/sources/stdfx/dissolvefx.cpp @@ -23,7 +23,8 @@ public: ~DissolveFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -35,7 +36,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; template diff --git a/toonz/sources/stdfx/embossfx.cpp b/toonz/sources/stdfx/embossfx.cpp index 8f26353..e7329e5 100644 --- a/toonz/sources/stdfx/embossfx.cpp +++ b/toonz/sources/stdfx/embossfx.cpp @@ -31,7 +31,8 @@ public: ~EmbossFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; diff --git a/toonz/sources/stdfx/erodilatefx.cpp b/toonz/sources/stdfx/erodilatefx.cpp index f056075..c4025ae 100644 --- a/toonz/sources/stdfx/erodilatefx.cpp +++ b/toonz/sources/stdfx/erodilatefx.cpp @@ -33,9 +33,11 @@ public: bindParam(this, "radius", m_radius); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &ri) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; diff --git a/toonz/sources/stdfx/externalpalettefx.cpp b/toonz/sources/stdfx/externalpalettefx.cpp index 98477a1..28dd2b9 100644 --- a/toonz/sources/stdfx/externalpalettefx.cpp +++ b/toonz/sources/stdfx/externalpalettefx.cpp @@ -27,7 +27,8 @@ public: ~ExternalPaletteFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -37,14 +38,18 @@ public: } } - std::string getAlias(double frame, const TRenderSettings &info) const override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; bool allowUserCacheOnPort(int port) override { return false; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/fourpointsgradientfx.cpp b/toonz/sources/stdfx/fourpointsgradientfx.cpp index 1fc9bae..374bf59 100644 --- a/toonz/sources/stdfx/fourpointsgradientfx.cpp +++ b/toonz/sources/stdfx/fourpointsgradientfx.cpp @@ -72,7 +72,9 @@ bindParam(this,"color_4", m_color4); return true; }; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 4]; diff --git a/toonz/sources/stdfx/freedistortfx.cpp b/toonz/sources/stdfx/freedistortfx.cpp index 9603262..ef5272d 100644 --- a/toonz/sources/stdfx/freedistortfx.cpp +++ b/toonz/sources/stdfx/freedistortfx.cpp @@ -30,10 +30,12 @@ public: FreeDistortBaseFx(bool isCastShadow); ~FreeDistortBaseFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &ri) override; void onPortConnected(TFxPort *port); bool canHandle(const TRenderSettings &info, double frame) override; int getMemoryRequirement(const TRectD &rect, double frame, diff --git a/toonz/sources/stdfx/gammafx.cpp b/toonz/sources/stdfx/gammafx.cpp index ede3dc6..29b2820 100644 --- a/toonz/sources/stdfx/gammafx.cpp +++ b/toonz/sources/stdfx/gammafx.cpp @@ -20,7 +20,8 @@ public: ~GammaFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -31,7 +32,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/glowfx.cpp b/toonz/sources/stdfx/glowfx.cpp index 7087aff..ef59397 100644 --- a/toonz/sources/stdfx/glowfx.cpp +++ b/toonz/sources/stdfx/glowfx.cpp @@ -145,7 +145,8 @@ public: //--------------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bbox, + const TRenderSettings &info) override { if (getActiveTimeRegion().contains(frame)) if (m_light.isConnected()) { TRectD b0, b1; @@ -184,7 +185,8 @@ public: //--------------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { Status status = getFxStatus(m_light, m_lighted); if (status & NoPortsConnected) @@ -294,7 +296,7 @@ public: //--------------------------------------------------------------------------- void doDryCompute(TRectD &rect, double frame, - const TRenderSettings &info) override { + const TRenderSettings &info) override { Status status = getFxStatus(m_light, m_lighted); if (status & NoPortsConnected) return; diff --git a/toonz/sources/stdfx/hsvkeyfx.cpp b/toonz/sources/stdfx/hsvkeyfx.cpp index 5998e99..cf5d0d0 100644 --- a/toonz/sources/stdfx/hsvkeyfx.cpp +++ b/toonz/sources/stdfx/hsvkeyfx.cpp @@ -45,7 +45,8 @@ public: ~HSVKeyFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); return true; @@ -56,7 +57,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/hsvscalefx.cpp b/toonz/sources/stdfx/hsvscalefx.cpp index 67b2da8..b78e09f 100644 --- a/toonz/sources/stdfx/hsvscalefx.cpp +++ b/toonz/sources/stdfx/hsvscalefx.cpp @@ -44,7 +44,8 @@ public: ~HSVScaleFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); return true; @@ -55,7 +56,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; template diff --git a/toonz/sources/stdfx/ino_blend_add.cpp b/toonz/sources/stdfx/ino_blend_add.cpp index 00d3060..00f134d 100644 --- a/toonz/sources/stdfx/ino_blend_add.cpp +++ b/toonz/sources/stdfx/ino_blend_add.cpp @@ -20,8 +20,11 @@ public: this->m_opacity->setValueRange(0, 10.0 * ino::param_range()); } ~ino_blend_add() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -49,7 +52,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_color_burn.cpp b/toonz/sources/stdfx/ino_blend_color_burn.cpp index 4677f87..cda5c95 100644 --- a/toonz/sources/stdfx/ino_blend_color_burn.cpp +++ b/toonz/sources/stdfx/ino_blend_color_burn.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_color_burn() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_color_dodge.cpp b/toonz/sources/stdfx/ino_blend_color_dodge.cpp index a55f008..92c3dc7 100644 --- a/toonz/sources/stdfx/ino_blend_color_dodge.cpp +++ b/toonz/sources/stdfx/ino_blend_color_dodge.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_color_dodge() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp b/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp index 0543be0..06c6bff 100644 --- a/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp +++ b/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_cross_dissolve() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_darken.cpp b/toonz/sources/stdfx/ino_blend_darken.cpp index fbabe27..20173d6 100644 --- a/toonz/sources/stdfx/ino_blend_darken.cpp +++ b/toonz/sources/stdfx/ino_blend_darken.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_darken() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_darker_color.cpp b/toonz/sources/stdfx/ino_blend_darker_color.cpp index 3ea0d93..ac7b7bc 100644 --- a/toonz/sources/stdfx/ino_blend_darker_color.cpp +++ b/toonz/sources/stdfx/ino_blend_darker_color.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_darker_color() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_divide.cpp b/toonz/sources/stdfx/ino_blend_divide.cpp index bdeb34a..4bc0aae 100644 --- a/toonz/sources/stdfx/ino_blend_divide.cpp +++ b/toonz/sources/stdfx/ino_blend_divide.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_divide() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_hard_light.cpp b/toonz/sources/stdfx/ino_blend_hard_light.cpp index e8c1034..209cb21 100644 --- a/toonz/sources/stdfx/ino_blend_hard_light.cpp +++ b/toonz/sources/stdfx/ino_blend_hard_light.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_hard_light() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_hard_mix.cpp b/toonz/sources/stdfx/ino_blend_hard_mix.cpp index 3f41a37..5909c69 100644 --- a/toonz/sources/stdfx/ino_blend_hard_mix.cpp +++ b/toonz/sources/stdfx/ino_blend_hard_mix.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_hard_mix() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_lighten.cpp b/toonz/sources/stdfx/ino_blend_lighten.cpp index d986c32..202a6c9 100644 --- a/toonz/sources/stdfx/ino_blend_lighten.cpp +++ b/toonz/sources/stdfx/ino_blend_lighten.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_lighten() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_lighter_color.cpp b/toonz/sources/stdfx/ino_blend_lighter_color.cpp index bd5e780..7d8ecdf 100644 --- a/toonz/sources/stdfx/ino_blend_lighter_color.cpp +++ b/toonz/sources/stdfx/ino_blend_lighter_color.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_lighter_color() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_linear_burn.cpp b/toonz/sources/stdfx/ino_blend_linear_burn.cpp index 79c2a8c..0ba5e86 100644 --- a/toonz/sources/stdfx/ino_blend_linear_burn.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_burn.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_linear_burn() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_linear_dodge.cpp b/toonz/sources/stdfx/ino_blend_linear_dodge.cpp index ee57d23..1fef84c 100644 --- a/toonz/sources/stdfx/ino_blend_linear_dodge.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_dodge.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_linear_dodge() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_linear_light.cpp b/toonz/sources/stdfx/ino_blend_linear_light.cpp index 7cb6f98..d5fb8fe 100644 --- a/toonz/sources/stdfx/ino_blend_linear_light.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_light.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_linear_light() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_multiply.cpp b/toonz/sources/stdfx/ino_blend_multiply.cpp index fcd11b4..91c6e20 100644 --- a/toonz/sources/stdfx/ino_blend_multiply.cpp +++ b/toonz/sources/stdfx/ino_blend_multiply.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_multiply() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_over.cpp b/toonz/sources/stdfx/ino_blend_over.cpp index 0f1523c..63f1c9e 100644 --- a/toonz/sources/stdfx/ino_blend_over.cpp +++ b/toonz/sources/stdfx/ino_blend_over.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_over() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_overlay.cpp b/toonz/sources/stdfx/ino_blend_overlay.cpp index 23f35dd..0dbfc20 100644 --- a/toonz/sources/stdfx/ino_blend_overlay.cpp +++ b/toonz/sources/stdfx/ino_blend_overlay.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_overlay() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_pin_light.cpp b/toonz/sources/stdfx/ino_blend_pin_light.cpp index d153e5a..01e7db6 100644 --- a/toonz/sources/stdfx/ino_blend_pin_light.cpp +++ b/toonz/sources/stdfx/ino_blend_pin_light.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_pin_light() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_screen.cpp b/toonz/sources/stdfx/ino_blend_screen.cpp index 3329855..84b002e 100644 --- a/toonz/sources/stdfx/ino_blend_screen.cpp +++ b/toonz/sources/stdfx/ino_blend_screen.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_screen() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_soft_light.cpp b/toonz/sources/stdfx/ino_blend_soft_light.cpp index bc86157..01f2edc 100644 --- a/toonz/sources/stdfx/ino_blend_soft_light.cpp +++ b/toonz/sources/stdfx/ino_blend_soft_light.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_soft_light() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_subtract.cpp b/toonz/sources/stdfx/ino_blend_subtract.cpp index 9258f14..f6674bc 100644 --- a/toonz/sources/stdfx/ino_blend_subtract.cpp +++ b/toonz/sources/stdfx/ino_blend_subtract.cpp @@ -25,8 +25,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_subtract() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -54,7 +57,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blend_vivid_light.cpp b/toonz/sources/stdfx/ino_blend_vivid_light.cpp index deded4c..1c1fac1 100644 --- a/toonz/sources/stdfx/ino_blend_vivid_light.cpp +++ b/toonz/sources/stdfx/ino_blend_vivid_light.cpp @@ -21,8 +21,11 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_vivid_light() {} - bool canHandle(const TRenderSettings &rs, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { + bool canHandle(const TRenderSettings &rs, double frame) override { + return true; + } + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,7 +53,8 @@ public: return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; diff --git a/toonz/sources/stdfx/ino_blur.cpp b/toonz/sources/stdfx/ino_blur.cpp index 53f0429..ba4552f 100644 --- a/toonz/sources/stdfx/ino_blur.cpp +++ b/toonz/sources/stdfx/ino_blur.cpp @@ -60,7 +60,8 @@ toonz/main/sources/stdfx/motionblurfx.cpp } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (false == this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -89,7 +90,8 @@ toonz/main/sources/stdfx/motionblurfx.cpp return isAlmostIsotropic(info.m_affine); } } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_blur, "inoBlurFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_channel_selector.cpp b/toonz/sources/stdfx/ino_channel_selector.cpp index 56aac12..3c23122 100644 --- a/toonz/sources/stdfx/ino_channel_selector.cpp +++ b/toonz/sources/stdfx/ino_channel_selector.cpp @@ -66,7 +66,8 @@ public: this->m_alp_channel->addItem(1, "Green"); this->m_alp_channel->addItem(2, "Blue"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { for (int ii = 0; ii < this->getInputPortCount(); ++ii) { std::string nm = this->getInputPortName(ii); TRasterFxPort *tmp_port = (TRasterFxPort *)this->getInputPort(nm); @@ -77,7 +78,9 @@ public: bBox = TRectD(); return false; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; }; FX_PLUGIN_IDENTIFIER(ino_channel_selector, "inoChannelSelectorFx"); diff --git a/toonz/sources/stdfx/ino_density.cpp b/toonz/sources/stdfx/ino_density.cpp index d99452d..b5f7a79 100644 --- a/toonz/sources/stdfx/ino_density.cpp +++ b/toonz/sources/stdfx/ino_density.cpp @@ -32,7 +32,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -43,7 +44,8 @@ public: bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_density, "inoDensityFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_fog.cpp b/toonz/sources/stdfx/ino_fog.cpp index ad4aee2..385932b 100644 --- a/toonz/sources/stdfx/ino_fog.cpp +++ b/toonz/sources/stdfx/ino_fog.cpp @@ -60,7 +60,8 @@ public: } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (false == this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -82,8 +83,11 @@ public: infoOnInput = infoOnOutput; this->get_render_enlarge(frame, infoOnOutput.m_affine, rectOnInput); } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_fog, "inoFogFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hls_add.cpp b/toonz/sources/stdfx/ino_hls_add.cpp index 0c8406e..0966fe0 100644 --- a/toonz/sources/stdfx/ino_hls_add.cpp +++ b/toonz/sources/stdfx/ino_hls_add.cpp @@ -66,7 +66,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -77,7 +78,8 @@ public: bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hls_add, "inohlsAddFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hls_adjust.cpp b/toonz/sources/stdfx/ino_hls_adjust.cpp index a59b67e..82a67e6 100644 --- a/toonz/sources/stdfx/ino_hls_adjust.cpp +++ b/toonz/sources/stdfx/ino_hls_adjust.cpp @@ -70,7 +70,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -81,7 +82,8 @@ public: bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hls_adjust, "inohlsAdjustFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hls_noise.cpp b/toonz/sources/stdfx/ino_hls_noise.cpp index cd76825..65c63d3 100644 --- a/toonz/sources/stdfx/ino_hls_noise.cpp +++ b/toonz/sources/stdfx/ino_hls_noise.cpp @@ -77,7 +77,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -101,7 +102,8 @@ public: 2013-11-08 */ return false; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hls_noise, "inohlsNoiseFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hsv_add.cpp b/toonz/sources/stdfx/ino_hsv_add.cpp index 05beaf5..f9791c2 100644 --- a/toonz/sources/stdfx/ino_hsv_add.cpp +++ b/toonz/sources/stdfx/ino_hsv_add.cpp @@ -66,7 +66,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -77,7 +78,8 @@ public: bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hsv_add, "inohsvAddFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hsv_adjust.cpp b/toonz/sources/stdfx/ino_hsv_adjust.cpp index a8d656b..21a863d 100644 --- a/toonz/sources/stdfx/ino_hsv_adjust.cpp +++ b/toonz/sources/stdfx/ino_hsv_adjust.cpp @@ -70,7 +70,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -81,7 +82,8 @@ public: bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hsv_adjust, "inohsvAdjustFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hsv_noise.cpp b/toonz/sources/stdfx/ino_hsv_noise.cpp index 9758a82..63eb436 100644 --- a/toonz/sources/stdfx/ino_hsv_noise.cpp +++ b/toonz/sources/stdfx/ino_hsv_noise.cpp @@ -77,7 +77,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -101,7 +102,8 @@ public: 2013-11-08 */ return false; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hsv_noise, "inohsvNoiseFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_level_auto.cpp b/toonz/sources/stdfx/ino_level_auto.cpp index da9bb79..38b6381 100644 --- a/toonz/sources/stdfx/ino_level_auto.cpp +++ b/toonz/sources/stdfx/ino_level_auto.cpp @@ -39,7 +39,8 @@ public: this->m_gamma->setValueRange(0.1 * ino::param_range(), 10.0 * ino::param_range()); /* gamma値 */ } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -47,8 +48,11 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_level_auto, "inoLevelAutoFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_level_master.cpp b/toonz/sources/stdfx/ino_level_master.cpp index 91d8750..f028f61 100644 --- a/toonz/sources/stdfx/ino_level_master.cpp +++ b/toonz/sources/stdfx/ino_level_master.cpp @@ -55,7 +55,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -63,8 +64,11 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_level_master, "inoLevelMasterFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_level_rgba.cpp b/toonz/sources/stdfx/ino_level_rgba.cpp index d9c67a5..76460d5 100644 --- a/toonz/sources/stdfx/ino_level_rgba.cpp +++ b/toonz/sources/stdfx/ino_level_rgba.cpp @@ -113,7 +113,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -121,8 +122,11 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_level_rgba, "inoLevelrgbaFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_maxmin.cpp b/toonz/sources/stdfx/ino_maxmin.cpp index 86d42c1..1fac6e4 100644 --- a/toonz/sources/stdfx/ino_maxmin.cpp +++ b/toonz/sources/stdfx/ino_maxmin.cpp @@ -61,7 +61,8 @@ public: this->m_ref_mode->setDefaultValue(0); this->m_ref_mode->setValue(0); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { const bool ret = this->m_input->doGetBBox(frame, bBox, info); const double margin = @@ -76,7 +77,9 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override { const double radius = (this->m_radius->getValue(frame) + smoothing_edge_) * @@ -85,7 +88,8 @@ public: ((info.m_shrinkX + info.m_shrinkY) / 2.0); return TRasterFx::memorySize(rect.enlarge(ceil(radius) + 0.5), info.m_bpp); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_maxmin, "inoMaxMinFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_median.cpp b/toonz/sources/stdfx/ino_median.cpp index 33dc6a9..8fd19bc 100644 --- a/toonz/sources/stdfx/ino_median.cpp +++ b/toonz/sources/stdfx/ino_median.cpp @@ -53,7 +53,8 @@ public: this->m_ref_mode->setDefaultValue(0); this->m_ref_mode->setValue(0); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { const bool ret = this->m_input->doGetBBox(frame, bBox, info); const double margin = ceil(this->m_radius->getValue(frame)); @@ -74,7 +75,8 @@ public: const double radius = this->m_radius->getValue(frame); return TRasterFx::memorySize(rect.enlarge(ceil(radius) + 0.5), info.m_bpp); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_median, "inoMedianFx") //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_median_filter.cpp b/toonz/sources/stdfx/ino_median_filter.cpp index 897e259..cc7d5e7 100644 --- a/toonz/sources/stdfx/ino_median_filter.cpp +++ b/toonz/sources/stdfx/ino_median_filter.cpp @@ -38,7 +38,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { const bool ret = this->m_input->doGetBBox(frame, bBox, info); const double margin = ceil(this->m_radius->getValue(frame)); @@ -59,7 +60,8 @@ public: const double radius = this->m_radius->getValue(frame); return TRasterFx::memorySize(rect.enlarge(ceil(radius) + 0.5), info.m_bpp); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_median_filter, "inoMedianFilterFx") //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_motion_blur.cpp b/toonz/sources/stdfx/ino_motion_blur.cpp index 460ffcf..9c856f6 100644 --- a/toonz/sources/stdfx/ino_motion_blur.cpp +++ b/toonz/sources/stdfx/ino_motion_blur.cpp @@ -111,7 +111,8 @@ public: } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (false == this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -140,7 +141,8 @@ public: return isAlmostIsotropic(info.m_affine) || m_scale->getValue(frame) == 0; } } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_motion_blur, "inoMotionBlurFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_motion_wind.cpp b/toonz/sources/stdfx/ino_motion_wind.cpp index ccb3e28..f577dd9 100644 --- a/toonz/sources/stdfx/ino_motion_wind.cpp +++ b/toonz/sources/stdfx/ino_motion_wind.cpp @@ -126,7 +126,8 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { const bool ret = this->m_input->doGetBBox(frame, bBox, info); // if ( this->m_spread->getValue() ) { @@ -161,7 +162,8 @@ public: (int)(ceil((length_min < length_max) ? length_max : length_min) + 0.5); return TRasterFx::memorySize(rect.enlarge(enlarge_pixel), info.m_bpp); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_motion_wind, "inoMotionWindFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_negate.cpp b/toonz/sources/stdfx/ino_negate.cpp index 6514ff0..df10bc5 100644 --- a/toonz/sources/stdfx/ino_negate.cpp +++ b/toonz/sources/stdfx/ino_negate.cpp @@ -20,7 +20,8 @@ public: bindParam(this, "blue", this->m_blue); bindParam(this, "alpha", this->m_alpha); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -28,8 +29,11 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_negate, "inoNegateFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_pn_clouds.cpp b/toonz/sources/stdfx/ino_pn_clouds.cpp index 7f8aa9c..cb7576a 100644 --- a/toonz/sources/stdfx/ino_pn_clouds.cpp +++ b/toonz/sources/stdfx/ino_pn_clouds.cpp @@ -47,12 +47,16 @@ public: this->m_persistance->setValueRange(0.1 * ino::param_range(), 2.0 * ino::param_range()); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; } - bool canHandle(const TRenderSettings &info, double frame) override { return false; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_pn_clouds, "inopnCloudsFx"); // ------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_radial_blur.cpp b/toonz/sources/stdfx/ino_radial_blur.cpp index 1fd39d1..c6754a8 100644 --- a/toonz/sources/stdfx/ino_radial_blur.cpp +++ b/toonz/sources/stdfx/ino_radial_blur.cpp @@ -108,7 +108,8 @@ public: } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (!this->m_input.isConnected()) { bBox = TRectD(); return false; diff --git a/toonz/sources/stdfx/ino_spin_blur.cpp b/toonz/sources/stdfx/ino_spin_blur.cpp index 1956e5f..917e847 100644 --- a/toonz/sources/stdfx/ino_spin_blur.cpp +++ b/toonz/sources/stdfx/ino_spin_blur.cpp @@ -92,7 +92,8 @@ public: } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (!this->m_input.isConnected()) { bBox = TRectD(); return false; diff --git a/toonz/sources/stdfx/ino_warp_hv.cpp b/toonz/sources/stdfx/ino_warp_hv.cpp index d15d1f5..abdc4a2 100644 --- a/toonz/sources/stdfx/ino_warp_hv.cpp +++ b/toonz/sources/stdfx/ino_warp_hv.cpp @@ -77,7 +77,8 @@ public: bBox = bBox.enlarge(static_cast(margin)); } } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (false == this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -103,7 +104,8 @@ public: // return true; return false; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_warp_hv, "inoWarphvFx"); //-------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/iwa_adjustexposurefx.h b/toonz/sources/stdfx/iwa_adjustexposurefx.h index 2a4ed15..cc8a312 100644 --- a/toonz/sources/stdfx/iwa_adjustexposurefx.h +++ b/toonz/sources/stdfx/iwa_adjustexposurefx.h @@ -34,12 +34,14 @@ protected: public: Iwa_AdjustExposureFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &settings) override; void doCompute_CPU(TTile &tile, double frame, const TRenderSettings &settings, TDimensionI &dim, float4 *tile_host); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; }; diff --git a/toonz/sources/stdfx/iwa_directionalblurfx.h b/toonz/sources/stdfx/iwa_directionalblurfx.h index 1a25fea..a6a7354 100644 --- a/toonz/sources/stdfx/iwa_directionalblurfx.h +++ b/toonz/sources/stdfx/iwa_directionalblurfx.h @@ -61,9 +61,11 @@ class Iwa_DirectionalBlurFx : public TStandardRasterFx { public: Iwa_DirectionalBlurFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &settings) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; diff --git a/toonz/sources/stdfx/iwa_gradientwarpfx.h b/toonz/sources/stdfx/iwa_gradientwarpfx.h index cb01332..5589142 100644 --- a/toonz/sources/stdfx/iwa_gradientwarpfx.h +++ b/toonz/sources/stdfx/iwa_gradientwarpfx.h @@ -67,9 +67,11 @@ protected: public: Iwa_GradientWarpFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &settings) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; }; diff --git a/toonz/sources/stdfx/iwa_motionblurfx.h b/toonz/sources/stdfx/iwa_motionblurfx.h index 4fda0c6..23fdc62 100644 --- a/toonz/sources/stdfx/iwa_motionblurfx.h +++ b/toonz/sources/stdfx/iwa_motionblurfx.h @@ -112,7 +112,8 @@ protected: public: Iwa_MotionBlurCompFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &settings) override; void doCompute_CPU(TTile &tile, double frame, const TRenderSettings &settings, float4 *pointsTable, int pointAmount, double hardness, @@ -124,12 +125,14 @@ public: TDimensionI &dimOut, TDimensionI &filterDim, TTile &back_tile); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; /*- 参考にしているオブジェクトが動いている可能性があるので、 エイリアスは毎フレーム変える -*/ - std::string getAlias(double frame, const TRenderSettings &info) const override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; }; #endif \ No newline at end of file diff --git a/toonz/sources/stdfx/iwa_particlesengine.cpp b/toonz/sources/stdfx/iwa_particlesengine.cpp index 9e8ab1f..a0d771b 100644 --- a/toonz/sources/stdfx/iwa_particlesengine.cpp +++ b/toonz/sources/stdfx/iwa_particlesengine.cpp @@ -507,8 +507,8 @@ void Iwa_Particles_Engine::render_particles( TTile *tile, /*- 結果を格納するTile -*/ std::vector part_ports, /*- テクスチャ素材画像のポート -*/ const TRenderSettings &ri, - TDimension & - p_size, /*- テクスチャ素材のバウンディングボックスの足し合わさったもの + TDimension + &p_size, /*- テクスチャ素材のバウンディングボックスの足し合わさったもの -*/ TPointD &p_offset, /*- バウンディングボックス左下の座標 -*/ std::map diff --git a/toonz/sources/stdfx/iwa_particlesfx.h b/toonz/sources/stdfx/iwa_particlesfx.h index 929ba24..73fef92 100644 --- a/toonz/sources/stdfx/iwa_particlesfx.h +++ b/toonz/sources/stdfx/iwa_particlesfx.h @@ -147,16 +147,21 @@ public: return (g == 0) ? &m_source : (g == 1) ? &m_control : 0; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } bool allowUserCacheOnPort(int port) override; - std::string getAlias(double frame, const TRenderSettings &info) const override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; TFxTimeRegion getTimeRegion() const override { return TFxTimeRegion::createUnlimited(); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; void compute(TFlash &flash, int frame) override; diff --git a/toonz/sources/stdfx/iwa_particlesmanager.cpp b/toonz/sources/stdfx/iwa_particlesmanager.cpp index 55ec934..84c2cd5 100644 --- a/toonz/sources/stdfx/iwa_particlesmanager.cpp +++ b/toonz/sources/stdfx/iwa_particlesmanager.cpp @@ -39,7 +39,9 @@ class Iwa_ParticlesManagerGenerator : public TRenderResourceManagerGenerator { public: Iwa_ParticlesManagerGenerator() : TRenderResourceManagerGenerator(true) {} - TRenderResourceManager *operator()(void) override { return new Iwa_ParticlesManager; } + TRenderResourceManager *operator()(void) override { + return new Iwa_ParticlesManager; + } }; MANAGER_FILESCOPE_DECLARATION(Iwa_ParticlesManager, diff --git a/toonz/sources/stdfx/iwa_perspectivedistortfx.h b/toonz/sources/stdfx/iwa_perspectivedistortfx.h index da7f168..09ba151 100644 --- a/toonz/sources/stdfx/iwa_perspectivedistortfx.h +++ b/toonz/sources/stdfx/iwa_perspectivedistortfx.h @@ -39,11 +39,13 @@ protected: public: Iwa_PerspectiveDistortFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; void doCompute_CPU(TTile &tile, const double frame, const TRenderSettings &settings, TPointD &vanishingPoint, diff --git a/toonz/sources/stdfx/iwa_pnperspectivefx.h b/toonz/sources/stdfx/iwa_pnperspectivefx.h index 05b9f83..c95461d 100644 --- a/toonz/sources/stdfx/iwa_pnperspectivefx.h +++ b/toonz/sources/stdfx/iwa_pnperspectivefx.h @@ -106,11 +106,13 @@ class Iwa_PNPerspectiveFx : public TStandardZeraryFx { public: Iwa_PNPerspectiveFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &rend_sets) override; void doCompute_CPU(TTile &tile, double frame, const TRenderSettings &settings, float4 *out_host, TDimensionI &dimOut, diff --git a/toonz/sources/stdfx/iwa_spectrumfx.h b/toonz/sources/stdfx/iwa_spectrumfx.h index aa9a64b..78a3ba4 100644 --- a/toonz/sources/stdfx/iwa_spectrumfx.h +++ b/toonz/sources/stdfx/iwa_spectrumfx.h @@ -61,12 +61,14 @@ protected: public: Iwa_SpectrumFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &settings) override; void doCompute_CUDA(TTile &tile, double frame, const TRenderSettings &settings); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; }; diff --git a/toonz/sources/stdfx/iwa_tilefx.cpp b/toonz/sources/stdfx/iwa_tilefx.cpp index 861ddc2..e56e5dd 100644 --- a/toonz/sources/stdfx/iwa_tilefx.cpp +++ b/toonz/sources/stdfx/iwa_tilefx.cpp @@ -33,7 +33,8 @@ public: Iwa_TileFx(); ~Iwa_TileFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; TRect getInvalidRect(const TRect &max) { return max; } void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; diff --git a/toonz/sources/stdfx/kaleido.cpp b/toonz/sources/stdfx/kaleido.cpp index 4bb706e..a7c7304 100644 --- a/toonz/sources/stdfx/kaleido.cpp +++ b/toonz/sources/stdfx/kaleido.cpp @@ -88,9 +88,11 @@ public: ~KaleidoFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &ri) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; diff --git a/toonz/sources/stdfx/linearwavefx.cpp b/toonz/sources/stdfx/linearwavefx.cpp index 85b1590..e7c3c72 100644 --- a/toonz/sources/stdfx/linearwavefx.cpp +++ b/toonz/sources/stdfx/linearwavefx.cpp @@ -67,7 +67,8 @@ public: //------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_warped.isConnected()) { int ret = m_warped->doGetBBox(frame, bBox, info); @@ -88,7 +89,8 @@ public: //------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; if (fabs(m_intensity->getValue(frame)) < 0.01) { @@ -119,7 +121,8 @@ public: //------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; diff --git a/toonz/sources/stdfx/localblurfx.cpp b/toonz/sources/stdfx/localblurfx.cpp index 72f7646..ca8c716 100644 --- a/toonz/sources/stdfx/localblurfx.cpp +++ b/toonz/sources/stdfx/localblurfx.cpp @@ -255,7 +255,8 @@ public: return (isAlmostIsotropic(info.m_affine) || m_value->getValue(frame) == 0); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_up.isConnected()) { bool ret = m_up->doGetBBox(frame, bBox, info); @@ -272,8 +273,10 @@ public: void enlarge(const TRectD &bbox, TRectD &requestedRect, int blur); - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override; int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; diff --git a/toonz/sources/stdfx/localtransparencyfx.cpp b/toonz/sources/stdfx/localtransparencyfx.cpp index 08eb95c..27db1ec 100644 --- a/toonz/sources/stdfx/localtransparencyfx.cpp +++ b/toonz/sources/stdfx/localtransparencyfx.cpp @@ -128,7 +128,8 @@ public: } virtual ~LocalTransparencyFx() {} - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_src.isConnected()) return m_src->doGetBBox(frame, bBox, info); else { @@ -137,7 +138,8 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { if (!checkBeforeCompute(tile, frame, ri)) return; TTile srcTile; m_src->allocateAndCompute(srcTile, tile.m_pos, tile.getRaster()->getSize(), @@ -177,7 +179,9 @@ public: return true; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override { diff --git a/toonz/sources/stdfx/magicwandfx.cpp b/toonz/sources/stdfx/magicwandfx.cpp index cf91076..bf37cb6 100644 --- a/toonz/sources/stdfx/magicwandfx.cpp +++ b/toonz/sources/stdfx/magicwandfx.cpp @@ -172,7 +172,7 @@ bool MagicWandFx::pixelProcessor(TPixel32 *testPix, TPixelGR8 *maskPix) { } // gia' trattato //* DECIDERE SE VOGLIO CHE LA SELEZIONE INTERESSI AREE GIA' SELEZIONATE IN - //PRECEDENZA + // PRECEDENZA // if (maskPix->value == EmptyPixel) { //pixel c-compatibile, non // gia' mascherato testPix->m = maskValue; // set(mV)m diff --git a/toonz/sources/stdfx/mosaicfx.cpp b/toonz/sources/stdfx/mosaicfx.cpp index 0e6238a..d2a176a 100644 --- a/toonz/sources/stdfx/mosaicfx.cpp +++ b/toonz/sources/stdfx/mosaicfx.cpp @@ -201,9 +201,11 @@ public: ~MosaicFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &ri) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; diff --git a/toonz/sources/stdfx/motionblurfx.cpp b/toonz/sources/stdfx/motionblurfx.cpp index 6c74385..f70c199 100644 --- a/toonz/sources/stdfx/motionblurfx.cpp +++ b/toonz/sources/stdfx/motionblurfx.cpp @@ -377,7 +377,8 @@ protected: // TBoolParamP m_useSSE; public: - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; DirectionalBlurBaseFx(bool isMotionBLur) : m_isMotionBlur(isMotionBLur) @@ -443,7 +444,8 @@ class MotionBlurFx : public DirectionalBlurBaseFx public: MotionBlurFx() : DirectionalBlurBaseFx(true) {} - std::string getAlias(double frame, const TRenderSettings &info) const override { + std::string getAlias(double frame, + const TRenderSettings &info) const override { unsigned long id = getIdentifier(); double value = m_intensity->getValue(frame); return getFxType() + "[" + std::to_string(id) + "," + diff --git a/toonz/sources/stdfx/multitonefx.cpp b/toonz/sources/stdfx/multitonefx.cpp index b8957ba..1f80b44 100644 --- a/toonz/sources/stdfx/multitonefx.cpp +++ b/toonz/sources/stdfx/multitonefx.cpp @@ -25,7 +25,8 @@ public: ~MultiToneFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -36,7 +37,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; template diff --git a/toonz/sources/stdfx/noisefx.cpp b/toonz/sources/stdfx/noisefx.cpp index 7ad8a52..e05915b 100644 --- a/toonz/sources/stdfx/noisefx.cpp +++ b/toonz/sources/stdfx/noisefx.cpp @@ -35,7 +35,8 @@ public: ~NoiseFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -45,9 +46,12 @@ public: } void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - std::string getAlias(double frame, const TRenderSettings &info) const override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/palettefilterfx.cpp b/toonz/sources/stdfx/palettefilterfx.cpp index c4e5612..3ff42ee 100644 --- a/toonz/sources/stdfx/palettefilterfx.cpp +++ b/toonz/sources/stdfx/palettefilterfx.cpp @@ -36,7 +36,8 @@ public: ~PaletteFilterFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -46,10 +47,13 @@ public: } } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } bool allowUserCacheOnPort(int port) override { return false; } }; diff --git a/toonz/sources/stdfx/particlesfx.h b/toonz/sources/stdfx/particlesfx.h index ed37bcf..57d9d82 100644 --- a/toonz/sources/stdfx/particlesfx.h +++ b/toonz/sources/stdfx/particlesfx.h @@ -117,16 +117,21 @@ public: return (g == 0) ? &m_source : (g == 1) ? &m_control : 0; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } bool allowUserCacheOnPort(int port) override; - std::string getAlias(double frame, const TRenderSettings &info) const override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; TFxTimeRegion getTimeRegion() const override { return TFxTimeRegion::createUnlimited(); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; void compute(TFlash &flash, int frame) override; diff --git a/toonz/sources/stdfx/particlesmanager.cpp b/toonz/sources/stdfx/particlesmanager.cpp index 30400d7..0353053 100644 --- a/toonz/sources/stdfx/particlesmanager.cpp +++ b/toonz/sources/stdfx/particlesmanager.cpp @@ -35,7 +35,9 @@ class ParticlesManagerGenerator : public TRenderResourceManagerGenerator { public: ParticlesManagerGenerator() : TRenderResourceManagerGenerator(true) {} - TRenderResourceManager *operator()(void) override { return new ParticlesManager; } + TRenderResourceManager *operator()(void) override { + return new ParticlesManager; + } }; MANAGER_FILESCOPE_DECLARATION(ParticlesManager, ParticlesManagerGenerator); diff --git a/toonz/sources/stdfx/perlinnoisefx.cpp b/toonz/sources/stdfx/perlinnoisefx.cpp index 4668a3e..2fc0de1 100644 --- a/toonz/sources/stdfx/perlinnoisefx.cpp +++ b/toonz/sources/stdfx/perlinnoisefx.cpp @@ -52,7 +52,8 @@ public: } ~PerlinNoiseFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); bBox = bBox.enlarge(m_intensity->getValue(frame)); @@ -70,7 +71,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; diff --git a/toonz/sources/stdfx/posterizefx.cpp b/toonz/sources/stdfx/posterizefx.cpp index 7055244..a90b4a8 100644 --- a/toonz/sources/stdfx/posterizefx.cpp +++ b/toonz/sources/stdfx/posterizefx.cpp @@ -31,7 +31,8 @@ public: ~PosterizeFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -43,7 +44,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/premultiplyfx.cpp b/toonz/sources/stdfx/premultiplyfx.cpp index afb9214..aba74fe 100644 --- a/toonz/sources/stdfx/premultiplyfx.cpp +++ b/toonz/sources/stdfx/premultiplyfx.cpp @@ -13,7 +13,8 @@ public: PremultiplyFx() { addInputPort("Source", m_input); } ~PremultiplyFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -23,7 +24,9 @@ public: } void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/radialblurfx.cpp b/toonz/sources/stdfx/radialblurfx.cpp index d0a0c08..eec9173 100644 --- a/toonz/sources/stdfx/radialblurfx.cpp +++ b/toonz/sources/stdfx/radialblurfx.cpp @@ -53,7 +53,8 @@ public: void enlarge(const TRectD &bbox, TRectD &requestedGeom, const TRenderSettings &ri, double frame); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); bBox = bBox.enlarge(getMaxBraid(bBox, frame)); diff --git a/toonz/sources/stdfx/randomwavefx.cpp b/toonz/sources/stdfx/randomwavefx.cpp index 0de77bc..4123bc0 100644 --- a/toonz/sources/stdfx/randomwavefx.cpp +++ b/toonz/sources/stdfx/randomwavefx.cpp @@ -69,7 +69,8 @@ public: //------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_warped.isConnected()) { int ret = m_warped->doGetBBox(frame, bBox, info); @@ -90,7 +91,8 @@ public: //------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; if (fabs(m_intensity->getValue(frame)) < 0.01) { @@ -121,7 +123,8 @@ public: //------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; diff --git a/toonz/sources/stdfx/raylitfx.cpp b/toonz/sources/stdfx/raylitfx.cpp index 6ee1111..de90977 100644 --- a/toonz/sources/stdfx/raylitfx.cpp +++ b/toonz/sources/stdfx/raylitfx.cpp @@ -43,13 +43,17 @@ public: ~BaseRaylitFx() {} - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; diff --git a/toonz/sources/stdfx/rgbkeyfx.cpp b/toonz/sources/stdfx/rgbkeyfx.cpp index 660dd97..5a85597 100644 --- a/toonz/sources/stdfx/rgbkeyfx.cpp +++ b/toonz/sources/stdfx/rgbkeyfx.cpp @@ -37,7 +37,8 @@ public: ~RGBKeyFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); return true; @@ -48,7 +49,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; namespace { diff --git a/toonz/sources/stdfx/rgbmcutfx.cpp b/toonz/sources/stdfx/rgbmcutfx.cpp index 7f90b06..f060dbc 100644 --- a/toonz/sources/stdfx/rgbmcutfx.cpp +++ b/toonz/sources/stdfx/rgbmcutfx.cpp @@ -39,13 +39,16 @@ public: ~RGBMCutFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { return m_input.getFx() && m_input->doGetBBox(frame, bBox, info); }; void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; namespace { diff --git a/toonz/sources/stdfx/rgbmfadefx.cpp b/toonz/sources/stdfx/rgbmfadefx.cpp index ee178bb..71fe5bf 100644 --- a/toonz/sources/stdfx/rgbmfadefx.cpp +++ b/toonz/sources/stdfx/rgbmfadefx.cpp @@ -24,7 +24,8 @@ public: } ~RGBMFadeFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -34,7 +35,9 @@ public: } void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; template diff --git a/toonz/sources/stdfx/rgbmscalefx.cpp b/toonz/sources/stdfx/rgbmscalefx.cpp index fc41742..5cf8b8a 100644 --- a/toonz/sources/stdfx/rgbmscalefx.cpp +++ b/toonz/sources/stdfx/rgbmscalefx.cpp @@ -29,7 +29,8 @@ public: } ~RGBMScaleFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -39,7 +40,9 @@ public: } void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ripplefx.cpp b/toonz/sources/stdfx/ripplefx.cpp index 6ecdbed..dd4d50a 100644 --- a/toonz/sources/stdfx/ripplefx.cpp +++ b/toonz/sources/stdfx/ripplefx.cpp @@ -71,7 +71,8 @@ public: //------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_warped.isConnected()) { int ret = m_warped->doGetBBox(frame, bBox, info); @@ -92,7 +93,8 @@ public: //------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; if (fabs(m_intensity->getValue(frame)) < 0.01) { @@ -123,7 +125,8 @@ public: //------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; diff --git a/toonz/sources/stdfx/rotationalblurfx.cpp b/toonz/sources/stdfx/rotationalblurfx.cpp index c377095..92922a6 100644 --- a/toonz/sources/stdfx/rotationalblurfx.cpp +++ b/toonz/sources/stdfx/rotationalblurfx.cpp @@ -60,7 +60,8 @@ public: void enlarge(const TRectD &bbox, TRectD &requestedGeom, const TRenderSettings &ri, double frame); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); bBox = bBox.enlarge(getMaxBraid(bBox, frame)); diff --git a/toonz/sources/stdfx/saltpeppernoisefx.cpp b/toonz/sources/stdfx/saltpeppernoisefx.cpp index e00b81e..e51e0f0 100644 --- a/toonz/sources/stdfx/saltpeppernoisefx.cpp +++ b/toonz/sources/stdfx/saltpeppernoisefx.cpp @@ -25,7 +25,8 @@ public: ~SaltPepperNoiseFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -36,9 +37,12 @@ public: } void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - std::string getAlias(double frame, const TRenderSettings &info) const override; + std::string getAlias(double frame, + const TRenderSettings &info) const override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; template diff --git a/toonz/sources/stdfx/shaderfx.cpp b/toonz/sources/stdfx/shaderfx.cpp index 01547cb..e67c7d1 100644 --- a/toonz/sources/stdfx/shaderfx.cpp +++ b/toonz/sources/stdfx/shaderfx.cpp @@ -182,10 +182,12 @@ public: void initialize(); void getParamUIs(TParamUIConcept *¶ms, int &length) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &ri) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; private: @@ -329,7 +331,9 @@ public: void onDeliver() override { man->onRenderInstanceEnd(); } - TThread::Message *clone() const override { return new MessageCreateContext(*this); } + TThread::Message *clone() const override { + return new MessageCreateContext(*this); + } }; class SCMDelegate : public TRenderResourceManager { diff --git a/toonz/sources/stdfx/sharpenfx.cpp b/toonz/sources/stdfx/sharpenfx.cpp index c491a38..22e23ef 100644 --- a/toonz/sources/stdfx/sharpenfx.cpp +++ b/toonz/sources/stdfx/sharpenfx.cpp @@ -252,7 +252,8 @@ public: ~SharpenFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -264,7 +265,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/solarizefx.cpp b/toonz/sources/stdfx/solarizefx.cpp index 1f4fd73..26ceb80 100644 --- a/toonz/sources/stdfx/solarizefx.cpp +++ b/toonz/sources/stdfx/solarizefx.cpp @@ -40,7 +40,8 @@ public: ~SolarizeFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -52,7 +53,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; namespace { template diff --git a/toonz/sources/stdfx/squaregradientfx.cpp b/toonz/sources/stdfx/squaregradientfx.cpp index cc9404d..368e1c0 100644 --- a/toonz/sources/stdfx/squaregradientfx.cpp +++ b/toonz/sources/stdfx/squaregradientfx.cpp @@ -33,7 +33,9 @@ public: return true; }; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; diff --git a/toonz/sources/stdfx/stdfx.cpp b/toonz/sources/stdfx/stdfx.cpp index 5eff944..e6cdc67 100644 --- a/toonz/sources/stdfx/stdfx.cpp +++ b/toonz/sources/stdfx/stdfx.cpp @@ -38,7 +38,8 @@ public: ~FadeFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); // devo scurire bgColor @@ -49,7 +50,8 @@ public: } }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { if (!m_input.isConnected()) return; m_input->compute(tile, frame, ri); @@ -58,7 +60,9 @@ public: TRop::rgbmScale(tile.getRaster(), tile.getRaster(), 1, 1, 1, v); } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //================================================================== @@ -108,7 +112,9 @@ TPixel32 colors[] = { void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------ @@ -208,7 +214,9 @@ public: }; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; @@ -260,7 +268,9 @@ public: }; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; @@ -421,7 +431,9 @@ public: }; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 2]; @@ -477,7 +489,9 @@ public: }; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; @@ -567,7 +581,9 @@ m_color->setDefaultValue(TPixel::Magenta); }; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; diff --git a/toonz/sources/stdfx/targetspotfx.cpp b/toonz/sources/stdfx/targetspotfx.cpp index 38faff1..4732ec1 100644 --- a/toonz/sources/stdfx/targetspotfx.cpp +++ b/toonz/sources/stdfx/targetspotfx.cpp @@ -49,7 +49,9 @@ public: void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { + return false; + } }; template diff --git a/toonz/sources/stdfx/texturefx.cpp b/toonz/sources/stdfx/texturefx.cpp index 7249483..e8eaab8 100644 --- a/toonz/sources/stdfx/texturefx.cpp +++ b/toonz/sources/stdfx/texturefx.cpp @@ -47,7 +47,8 @@ public: ~TextureFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -58,13 +59,16 @@ public: } void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override; bool allowUserCacheOnPort(int port) override { return port != 0; } int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/tilefx.cpp b/toonz/sources/stdfx/tilefx.cpp index 8b34ea4..624dda4 100644 --- a/toonz/sources/stdfx/tilefx.cpp +++ b/toonz/sources/stdfx/tilefx.cpp @@ -23,7 +23,8 @@ public: TileFx(); ~TileFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, diff --git a/toonz/sources/stdfx/tonecurvefx.cpp b/toonz/sources/stdfx/tonecurvefx.cpp index 33bc2af..60a92a6 100644 --- a/toonz/sources/stdfx/tonecurvefx.cpp +++ b/toonz/sources/stdfx/tonecurvefx.cpp @@ -99,9 +99,12 @@ public: ~ToneCurveFx(){}; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { diff --git a/toonz/sources/stdfx/unmultiplyfx.cpp b/toonz/sources/stdfx/unmultiplyfx.cpp index 5242d60..ed5f81c 100644 --- a/toonz/sources/stdfx/unmultiplyfx.cpp +++ b/toonz/sources/stdfx/unmultiplyfx.cpp @@ -23,7 +23,8 @@ public: UnmultiplyFx() { addInputPort("Source", m_input); } ~UnmultiplyFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -33,7 +34,9 @@ public: } void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/warp.cpp b/toonz/sources/stdfx/warp.cpp index 230d825..1f41079 100644 --- a/toonz/sources/stdfx/warp.cpp +++ b/toonz/sources/stdfx/warp.cpp @@ -288,7 +288,7 @@ void getWarpComputeRects(TRectD &outputComputeRect, TRectD &warpedComputeRect, //! Deals with raster tiles and invokes warper functions. //!\b NOTE: \b tileRas's size should be \b warper's one multiplied by -//!params.m_scale. +//! params.m_scale. void warp(TRasterP &tileRas, const TRasterP &rasIn, TRasterP &warper, TPointD rasInPos, TPointD warperPos, const WarpParams ¶ms) { TRaster32P rasIn32 = rasIn; diff --git a/toonz/sources/stdfx/warpfx.cpp b/toonz/sources/stdfx/warpfx.cpp index 9b519b4..4edd805 100644 --- a/toonz/sources/stdfx/warpfx.cpp +++ b/toonz/sources/stdfx/warpfx.cpp @@ -39,7 +39,8 @@ public: //------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_warped.isConnected()) { int ret = m_warped->doGetBBox(frame, bBox, info); @@ -60,7 +61,8 @@ public: //------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); bool isWarper = m_warper.isConnected(); if (!isWarped) return; @@ -108,7 +110,8 @@ public: //------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); bool isWarper = m_warper.isConnected(); diff --git a/toonz/sources/tnzbase/trasterfx.cpp b/toonz/sources/tnzbase/trasterfx.cpp index 6a74ac0..0a23640 100644 --- a/toonz/sources/tnzbase/trasterfx.cpp +++ b/toonz/sources/tnzbase/trasterfx.cpp @@ -233,11 +233,14 @@ public: //----------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } //----------------------------------------------------------- - std::string getAlias(double frame, const TRenderSettings &info) const override { + std::string getAlias(double frame, + const TRenderSettings &info) const override { // NOTE: TrFx are not present at this recursive level. Affines dealing is // currently handled by inserting the // rendering affine AFTER a getAlias call. Ever. @@ -247,7 +250,8 @@ public: //----------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { // NOTE: TrFx are not present at this recursive level. Affines dealing is // still handled by TGeometryFxs here.... return m_fx->doGetBBox(frame, bBox, info); @@ -255,7 +259,8 @@ public: //----------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override { const TRectD &rectOut = myConvert(tile.getRaster()->getBounds()) + tile.m_pos; @@ -280,7 +285,8 @@ public: //----------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { TRectD rectIn; TRenderSettings infoIn(info); TAffine appliedAff; diff --git a/toonz/sources/tnzext/plasticdeformer.cpp b/toonz/sources/tnzext/plasticdeformer.cpp index 4a4cfcf..e36b412 100644 --- a/toonz/sources/tnzext/plasticdeformer.cpp +++ b/toonz/sources/tnzext/plasticdeformer.cpp @@ -51,7 +51,7 @@ */ //#define GL_DEBUG // Debug using OpenGL. -//Must deform while drawing. +// Must deform while drawing. #ifdef GL_DEBUG // NOTE: You should force deformations, #include "tgl.h" // see plasticdeformersstorage.cpp #endif @@ -297,7 +297,7 @@ public: m_invF; //!< Each of step 2's systems factorizations TPointDPtr m_relativeCoords; //!< Faces' p2 coordinates in (p0, p1)'s - //!orthogonal reference + //! orthogonal reference double m_v[4], m_c[4]; //!< Known term and output coordinates TPointDPtr m_fitTriangles; //!< Output face coordinates diff --git a/toonz/sources/tnzext/plasticdeformerstorage.cpp b/toonz/sources/tnzext/plasticdeformerstorage.cpp index 4369ba2..afcf9d4 100644 --- a/toonz/sources/tnzext/plasticdeformerstorage.cpp +++ b/toonz/sources/tnzext/plasticdeformerstorage.cpp @@ -412,7 +412,7 @@ class PlasticDeformerStorage::Imp { public: QMutex m_mutex; //!< Access mutex - needed for thread-safety DeformersSet m_deformers; //!< Set of deformers, ordered by mesh image, - //!deformation, and affine. + //! deformation, and affine. public: Imp() : m_mutex(QMutex::Recursive) {} diff --git a/toonz/sources/tnzext/plasticskeleton.cpp b/toonz/sources/tnzext/plasticskeleton.cpp index 3a272fa..682dd0d 100644 --- a/toonz/sources/tnzext/plasticskeleton.cpp +++ b/toonz/sources/tnzext/plasticskeleton.cpp @@ -98,9 +98,9 @@ void PlasticSkeletonVertex::loadData(TIStream &is) { class PlasticSkeleton::Imp { public: std::set m_deformations; //!< Registered - //!deformations for - //!this skeleton (not - //!owned) + //! deformations for + //! this skeleton (not + //! owned) tcg::indices_pool m_numbersPool; //!< Vertex numbers pool (used for naming vertices only) diff --git a/toonz/sources/tnzext/plasticskeletondeformation.cpp b/toonz/sources/tnzext/plasticskeletondeformation.cpp index a4fb34a..5060025 100644 --- a/toonz/sources/tnzext/plasticskeletondeformation.cpp +++ b/toonz/sources/tnzext/plasticskeletondeformation.cpp @@ -259,8 +259,9 @@ public: PlasticSkeleton &deformedSkeleton, double frame, int v); - void onChange(const TParamChange &change) override; // Passes param notifications to - // external observers + void onChange( + const TParamChange &change) override; // Passes param notifications to + // external observers private: // Not directly copy-constructible diff --git a/toonz/sources/tnztools/brushtool.cpp b/toonz/sources/tnztools/brushtool.cpp index 74757fd..de843be 100644 --- a/toonz/sources/tnztools/brushtool.cpp +++ b/toonz/sources/tnztools/brushtool.cpp @@ -439,7 +439,9 @@ public: notifyImageChanged(); } - int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { + return sizeof(*this) + TRasterUndo::getSize(); + } QString getToolName() override { return QString("Brush Tool"); } int getHistoryType() override { return HistoryType::BrushTool; } }; @@ -506,7 +508,9 @@ public: notifyImageChanged(); } - int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { + return sizeof(*this) + TRasterUndo::getSize(); + } QString getToolName() override { return QString("Brush Tool"); } int getHistoryType() override { return HistoryType::BrushTool; } diff --git a/toonz/sources/tnztools/brushtool.h b/toonz/sources/tnztools/brushtool.h index 33f0a8b..e87642d 100644 --- a/toonz/sources/tnztools/brushtool.h +++ b/toonz/sources/tnztools/brushtool.h @@ -163,7 +163,7 @@ protected: bool m_active, m_enabled, m_isPrompting, //!< Whether the tool is prompting for spline - //!substitution. + //! substitution. m_firstTime, m_isPath, m_presetsLoaded; /*--- diff --git a/toonz/sources/tnztools/filltool.cpp b/toonz/sources/tnztools/filltool.cpp index 6c9818f..2e05847 100644 --- a/toonz/sources/tnztools/filltool.cpp +++ b/toonz/sources/tnztools/filltool.cpp @@ -312,7 +312,9 @@ public: } } - int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { + return sizeof(*this) + TRasterUndo::getSize(); + } QString getToolName() override { return QString("Fill Tool : %1") @@ -433,7 +435,9 @@ public: } } - int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { + return sizeof(*this) + TRasterUndo::getSize(); + } }; //============================================================================= @@ -1491,7 +1495,7 @@ public: m_firstFrameSelected = false; // nel caso sono passato allo stato 1 e // torno all'immagine iniziale, torno allo // stato iniziale - else { // cambio stato. + else { // cambio stato. m_firstFrameSelected = true; if (m_type != FREEHAND && m_type != POLYLINE) { assert(!m_selectingRect.isEmpty()); diff --git a/toonz/sources/tnztools/fingertool.cpp b/toonz/sources/tnztools/fingertool.cpp index 1567ea4..daf9dcd 100644 --- a/toonz/sources/tnztools/fingertool.cpp +++ b/toonz/sources/tnztools/fingertool.cpp @@ -87,7 +87,9 @@ public: notifyImageChanged(); } - int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { + return sizeof(*this) + TRasterUndo::getSize(); + } QString getToolName() override { return QString("Finger Tool"); } int getHistoryType() override { return HistoryType::FingerTool; } diff --git a/toonz/sources/tnztools/fullcolorerasertool.cpp b/toonz/sources/tnztools/fullcolorerasertool.cpp index ef84116..10ea81d 100644 --- a/toonz/sources/tnztools/fullcolorerasertool.cpp +++ b/toonz/sources/tnztools/fullcolorerasertool.cpp @@ -171,7 +171,9 @@ public: sizeof(this); } - QString getToolName() override { return QString("Raster Eraser Tool (Rect)"); } + QString getToolName() override { + return QString("Raster Eraser Tool (Rect)"); + } int getHistoryType() override { return HistoryType::EraserTool; } }; @@ -1022,7 +1024,7 @@ void FullColorEraserTool::onImageChanged() { m_firstFrameSelected = false; // nel caso sono passato allo stato 1 e torno // all'immagine iniziale, torno allo stato // iniziale - else { // cambio stato. + else { // cambio stato. m_firstFrameSelected = true; if (m_eraseType.getValue() != FREEHANDERASE && m_eraseType.getValue() != POLYLINEERASE) { diff --git a/toonz/sources/tnztools/geometrictool.cpp b/toonz/sources/tnztools/geometrictool.cpp index d989e9c..854e500 100644 --- a/toonz/sources/tnztools/geometrictool.cpp +++ b/toonz/sources/tnztools/geometrictool.cpp @@ -236,7 +236,9 @@ public: notifyImageChanged(); } - int getSize() const override { return UndoFullColorPencil::getSize() + sizeof(this); } + int getSize() const override { + return UndoFullColorPencil::getSize() + sizeof(this); + } }; //----------------------------------------------------------------------------- @@ -276,7 +278,9 @@ public: notifyImageChanged(); } - int getSize() const override { return UndoRasterPencil::getSize() + sizeof(this); } + int getSize() const override { + return UndoRasterPencil::getSize() + sizeof(this); + } }; //----------------------------------------------------------------------------- @@ -823,7 +827,9 @@ public: int getColorClass() const { return 1; } - TPropertyGroup *getProperties(int idx) override { return &m_param.m_prop[idx]; } + TPropertyGroup *getProperties(int idx) override { + return &m_param.m_prop[idx]; + } bool onPropertyChanged(std::string propertyName) override { /*--- 変更されたPropertyごとに処理を分ける。 diff --git a/toonz/sources/tnztools/paintbrushtool.cpp b/toonz/sources/tnztools/paintbrushtool.cpp index d071930..9d6f2fa 100644 --- a/toonz/sources/tnztools/paintbrushtool.cpp +++ b/toonz/sources/tnztools/paintbrushtool.cpp @@ -91,7 +91,9 @@ public: notifyImageChanged(); } - int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { + return sizeof(*this) + TRasterUndo::getSize(); + } QString getToolName() override { return QString("Paint Brush Tool"); } int getHistoryType() override { return HistoryType::PaintBrushTool; } diff --git a/toonz/sources/tnztools/plastictool.cpp b/toonz/sources/tnztools/plastictool.cpp index 8fbb2c0..ea07900 100644 --- a/toonz/sources/tnztools/plastictool.cpp +++ b/toonz/sources/tnztools/plastictool.cpp @@ -251,7 +251,9 @@ public: m_oldName = vx.name(); } - int getSize() const override { return sizeof(*this); } // sizeof this is roughly ok + int getSize() const override { + return sizeof(*this); + } // sizeof this is roughly ok void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); diff --git a/toonz/sources/tnztools/plastictool.h b/toonz/sources/tnztools/plastictool.h index 0663671..1b11677 100644 --- a/toonz/sources/tnztools/plastictool.h +++ b/toonz/sources/tnztools/plastictool.h @@ -95,7 +95,7 @@ private: int m_skelId; //!< Current m_sd's skeleton id tcg::invalidable m_deformedSkeleton; //!< The interactively-deformed \a animation-mode - //!skeleton + //! skeleton TMeshImageP m_mi; //!< Current mesh image @@ -161,14 +161,14 @@ private: // Editing-related vars std::auto_ptr m_rigidityPainter; //!< Delegate class to - //!deal with (undoable) - //!rigidity painting + //! deal with (undoable) + //! rigidity painting bool m_showSkeletonOS; //!< Whether onion-skinned skeletons must be shown // Deformation-related vars bool m_recompileOnMouseRelease; //!< Whether skeleton recompilation should - //!happen on mouse release + //! happen on mouse release public: enum Modes { @@ -247,9 +247,9 @@ public: void touchDeformation(); void storeDeformation(); //!< Stores deformation of current column (copying - //!its reference) + //! its reference) void storeSkeletonId(); //!< Stores current skeleton id associated to current - //!deformation + //! deformation void onChange(); //!< Updates the tool after a deformation parameter change. //!< It can be used to refresh the tool in ANIMATION mode. @@ -439,7 +439,7 @@ namespace PlasticToolLocals { extern PlasticTool l_plasticTool; //!< Tool instance. extern bool l_suspendParamsObservation; //!< Used to join multiple param change - //!notifications. + //! notifications. //------------------------------------------------------------------------------ diff --git a/toonz/sources/tnztools/plastictool_build.cpp b/toonz/sources/tnztools/plastictool_build.cpp index d3c9ebf..f6056a9 100644 --- a/toonz/sources/tnztools/plastictool_build.cpp +++ b/toonz/sources/tnztools/plastictool_build.cpp @@ -105,7 +105,9 @@ protected: public: VertexUndo() : m_row(::row()), m_col(::column()), m_v(-1), m_vParent(-1) {} - int getSize() const override { return sizeof(*this); } // sizeof this is roughly ok + int getSize() const override { + return sizeof(*this); + } // sizeof this is roughly ok void storeChildren(const PlasticSkeleton &skeleton, const PlasticSkeletonVertex &vx) { @@ -356,7 +358,7 @@ class SetSkeletonIdUndo : public TUndo { mutable TDoubleKeyframe m_oldKf; //!< Old keyframe values for skelIds parameter mutable bool m_added1stKeyframe; //!< Whether the redo() added the first - //!skelIds keyframe + //! skelIds keyframe public: SetSkeletonIdUndo(int skelId) diff --git a/toonz/sources/tnztools/plastictool_meshedit.cpp b/toonz/sources/tnztools/plastictool_meshedit.cpp index 8c8e7db..0b6d117 100644 --- a/toonz/sources/tnztools/plastictool_meshedit.cpp +++ b/toonz/sources/tnztools/plastictool_meshedit.cpp @@ -721,7 +721,7 @@ public: } void undo() const override { redo(); } // Operation is idempotent (indices - // are perfectly restored, too) + // are perfectly restored, too) }; //============================================================================== diff --git a/toonz/sources/tnztools/rastererasertool.cpp b/toonz/sources/tnztools/rastererasertool.cpp index aa64d7b..97ebaf9 100644 --- a/toonz/sources/tnztools/rastererasertool.cpp +++ b/toonz/sources/tnztools/rastererasertool.cpp @@ -187,7 +187,9 @@ public: notifyImageChanged(); } - int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { + return sizeof(*this) + TRasterUndo::getSize(); + } QString getToolName() override { return QString("Eraser Tool"); } int getHistoryType() override { return HistoryType::EraserTool; } @@ -256,7 +258,9 @@ public: notifyImageChanged(); } - int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { + return sizeof(*this) + TRasterUndo::getSize(); + } QString getToolName() override { return QString("Eraser Tool"); } int getHistoryType() override { return HistoryType::EraserTool; } @@ -1073,7 +1077,7 @@ void EraserTool::onImageChanged() { m_firstFrameSelected = false; // nel caso sono passato allo stato 1 e torno // all'immagine iniziale, torno allo stato // iniziale - else { // cambio stato. + else { // cambio stato. m_firstFrameSelected = true; if (m_eraseType.getValue() != FREEHANDERASE && m_eraseType.getValue() != POLYLINEERASE) { diff --git a/toonz/sources/tnztools/rasterselectiontool.h b/toonz/sources/tnztools/rasterselectiontool.h index 1519708..c17af3a 100644 --- a/toonz/sources/tnztools/rasterselectiontool.h +++ b/toonz/sources/tnztools/rasterselectiontool.h @@ -90,7 +90,9 @@ public: int getSize() const override { return sizeof(*this); } - QString getHistoryString() override { return QObject::tr("Transform Raster"); } + QString getHistoryString() override { + return QObject::tr("Transform Raster"); + } }; //============================================================================= @@ -110,8 +112,8 @@ protected: void applyTransform(TAffine aff, bool modifyCenter); void addTransformUndo() override; - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override {}; - void draw() override {}; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override{}; + void draw() override{}; public: RasterDeformTool(RasterSelectionTool *tool, bool freeDeformer); @@ -201,7 +203,8 @@ class RasterSelectionTool : public SelectionTool { public: RasterSelectionTool(int targetType); - void setBBox(const DragSelectionTool::FourPoints &points, int index = 0) override; + void setBBox(const DragSelectionTool::FourPoints &points, + int index = 0) override; void setNewFreeDeformer() override; VectorFreeDeformer *getSelectionFreeDeformer() const; diff --git a/toonz/sources/tnztools/rastertapetool.cpp b/toonz/sources/tnztools/rastertapetool.cpp index d119fb1..dda9322 100644 --- a/toonz/sources/tnztools/rastertapetool.cpp +++ b/toonz/sources/tnztools/rastertapetool.cpp @@ -88,7 +88,9 @@ public: //------------------------------------------------------------------- - int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { + return sizeof(*this) + TRasterUndo::getSize(); + } QString getToolName() override { return QString("Autoclose Tool"); } int getHistoryType() override { return HistoryType::AutocloseTool; } @@ -540,7 +542,7 @@ public: m_firstFrameSelected = false; // nel caso sono passato allo stato 1 e // torno all'immagine iniziale, torno allo // stato iniziale - else { // cambio stato. + else { // cambio stato. m_firstFrameSelected = true; if (m_closeType.getValue() == RECT_CLOSE) { assert(!m_selectingRect.isEmpty()); @@ -600,7 +602,8 @@ public: //---------------------------------------------------------------------- - void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e) override { + void leftButtonDoubleClick(const TPointD &pos, + const TMouseEvent &e) override { TToonzImageP ti = TToonzImageP(getImage(true)); if (m_closeType.getValue() == POLYLINE_CLOSE && ti) { closePolyline(pos); diff --git a/toonz/sources/tnztools/rgbpickertool.cpp b/toonz/sources/tnztools/rgbpickertool.cpp index 5886b53..627c175 100644 --- a/toonz/sources/tnztools/rgbpickertool.cpp +++ b/toonz/sources/tnztools/rgbpickertool.cpp @@ -261,7 +261,7 @@ void RGBPickerTool::draw() { // Il pick in modalita' polyline e rectangular deve essere fatto soltanto // dopo aver cancellato il //"disegno" della polyline altrimenti alcuni pixels neri delle spezzate - //che la + // che la // compongono vengono presi in considerazione nel calcolo del "colore // medio" if (m_pickType.getValue() == POLYLINE_PICK && m_drawingPolyline.empty()) diff --git a/toonz/sources/tnztools/selectiontool.h b/toonz/sources/tnztools/selectiontool.h index eced7fa..1907dc1 100644 --- a/toonz/sources/tnztools/selectiontool.h +++ b/toonz/sources/tnztools/selectiontool.h @@ -430,9 +430,10 @@ public: void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override = 0; - void leftButtonUp(const TPointD &pos, const TMouseEvent &) override = 0; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override = 0; void mouseMove(const TPointD &pos, const TMouseEvent &e) override; - void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e) override = 0; + void leftButtonDoubleClick(const TPointD &, + const TMouseEvent &e) override = 0; bool keyDown(int key, TUINT32 flags, const TPoint &pos) override; int getCursorId() const override; @@ -440,7 +441,7 @@ public: void draw() override = 0; TSelection *getSelection() override = 0; - virtual bool isSelectionEmpty() = 0; + virtual bool isSelectionEmpty() = 0; virtual void computeBBox() = 0; diff --git a/toonz/sources/tnztools/setsaveboxtool.cpp b/toonz/sources/tnztools/setsaveboxtool.cpp index 5fda5c7..72cff66 100644 --- a/toonz/sources/tnztools/setsaveboxtool.cpp +++ b/toonz/sources/tnztools/setsaveboxtool.cpp @@ -47,7 +47,9 @@ public: ti->setSavebox(m_originalSavebox); } - int getSize() const override { return TRasterUndo::getSize() + sizeof(this) + 100; } + int getSize() const override { + return TRasterUndo::getSize() + sizeof(this) + 100; + } ~SetSaveboxUndo() {} diff --git a/toonz/sources/tnztools/vectorerasertool.cpp b/toonz/sources/tnztools/vectorerasertool.cpp index f14eff0..c56035c 100644 --- a/toonz/sources/tnztools/vectorerasertool.cpp +++ b/toonz/sources/tnztools/vectorerasertool.cpp @@ -300,8 +300,8 @@ private: m_oldMousePos, //!< Previous mouse position. m_brushPos, //!< Position the brush will be painted at. m_firstPos; //!< Either The first point inserted either in m_track or - //!m_polyline - //! (depending on selected erase mode). + //! m_polyline + //! (depending on selected erase mode). UndoEraser *m_undo; std::vector m_indexes; @@ -657,7 +657,7 @@ intersect( *oldStroke, pos, m_pointSize, intersections ); } //---------- piu' - //intersezioni-------------------------------------------------------- + // intersezioni-------------------------------------------------------- if (intersections.size() & 1 && oldStroke->isSelfLoop()) { // non dovrebbe mai accadere @@ -892,7 +892,7 @@ void EraserTool::onImageChanged() { m_firstFrameSelected = false; // nel caso sono passato allo stato 1 e torno // all'immagine iniziale, torno allo stato // iniziale - else { // cambio stato. + else { // cambio stato. m_firstFrameSelected = true; if (m_eraseType.getValue() == RECT_ERASE) { assert(!m_selectingRect.isEmpty()); @@ -1185,7 +1185,7 @@ void EraserTool::addPointPolyline(const TPointD &pos) { #if defined(MACOSX) // m_viewer->enableRedraw(m_eraseType.getValue() == -//POLYLINE_ERASE); +// POLYLINE_ERASE); #endif glPushMatrix(); diff --git a/toonz/sources/tnztools/vectorselectiontool.h b/toonz/sources/tnztools/vectorselectiontool.h index 15960f4..60ee74e 100644 --- a/toonz/sources/tnztools/vectorselectiontool.h +++ b/toonz/sources/tnztools/vectorselectiontool.h @@ -38,7 +38,7 @@ enum SelectionTarget //! Possible selection targets in a SelectionTool. SAME_STYLE_TYPE_IDX, //!< Selected styles at current frame. STYLE_SELECTED_FRAMES_TYPE_IDX, //!< Selected styles at selected frames. STYLE_LEVEL_TYPE_IDX, //!< Selected styles at current frame on the whole - //!level. + //! level. BOUNDARY_TYPE_IDX, //!< Boundary strokes on current frame. BOUNDARY_SELECTED_FRAMES_TYPE_IDX, //!< Boundary strokes on selected frames. BOUNDARY_LEVEL_TYPE_IDX, //!< Boundary strokes on the whole level. @@ -227,7 +227,8 @@ class VectorScaleTool : public VectorDeformTool { public: VectorScaleTool(VectorSelectionTool *tool, int type); - TPointD transform(int index, TPointD newPos) override; //!< Returns scale value. + TPointD transform(int index, + TPointD newPos) override; //!< Returns scale value. void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; @@ -280,7 +281,9 @@ public: void setCanEnterGroup(bool value) { m_canEnterGroup = value; } - bool isConstantThickness() const override { return m_constantThickness.getValue(); } + bool isConstantThickness() const override { + return m_constantThickness.getValue(); + } bool isLevelType() const override; bool isSelectedFramesType() const override; bool isSameStyleType() const override; @@ -326,7 +329,7 @@ protected: private: class AttachedLevelSelection : public LevelSelection { StrokeSelection &m_strokeSelection; //!< Selection of strokes to be seen at - //!current frame. + //! current frame. public: AttachedLevelSelection(StrokeSelection &strokeSelection) @@ -339,13 +342,13 @@ private: private: TEnumProperty m_selectionTarget; //!< Selected target content (strokes, whole - //!image, styles...). + //! image, styles...). TBoolProperty m_constantThickness; StrokeSelection m_strokeSelection; //!< Standard selection of a set of - //!strokes in current image. + //! strokes in current image. AttachedLevelSelection m_levelSelection; //!< Selection across multiple - //!frames and specific styles. + //! frames and specific styles. TEnumProperty m_capStyle; //!< Style of stroke caps. TEnumProperty m_joinStyle; //!< Style of stroke joins. @@ -354,7 +357,7 @@ private: TPropertyGroup m_outlineProps; int m_selectionCount; //!< \deprecated This is \a not related to stroke - //!selections; + //! selections; //! but rather to bboxes count - and even that is deprecated. bool m_canEnterGroup; //!< \deprecated Used in Manga and Kids @@ -379,12 +382,12 @@ private: as a result of a change in target. */ void updateSelectionTarget(); //!< Reads widget fields and updates the - //!selection target accordingly. + //! selection target accordingly. void clearSelectedStrokes(); //!< Clears strokes visible in current selection. void finalizeSelection(); //!< Makes selection consistent, and invokes all - //!related cached data - //! updates needed for visualization. + //! related cached data + //! updates needed for visualization. void drawInLevelType(const TVectorImage &vi); void drawSelectedStrokes(const TVectorImage &vi); void drawGroup(const TVectorImage &vi); diff --git a/toonz/sources/toonz/ObjectTracker.h b/toonz/sources/toonz/ObjectTracker.h index f4355a0..2bc4236 100644 --- a/toonz/sources/toonz/ObjectTracker.h +++ b/toonz/sources/toonz/ObjectTracker.h @@ -38,7 +38,7 @@ private: short dim_temp; // dimension searce template area (real area = // (2*dim_temp+1)*(2*dim_temp+1)) - short var_dim; // variation dimension window (dimension in pixel) + short var_dim; // variation dimension window (dimension in pixel) float threshold_distance; // threshold of lose object float threshold_distance_B; // threshold of lose object diff --git a/toonz/sources/toonz/adjustthicknesspopup.h b/toonz/sources/toonz/adjustthicknesspopup.h index c6eaefc..f064a02 100644 --- a/toonz/sources/toonz/adjustthicknesspopup.h +++ b/toonz/sources/toonz/adjustthicknesspopup.h @@ -114,7 +114,7 @@ private: // Widgets QComboBox *m_thicknessMode; //!< Thickness mode (scale thickness, add - //!thickness, constant). + //! thickness, constant). DVGui::MeasuredDoubleField *m_fromScale, //!< Starting thickness scale. *m_fromDisplacement, //!< Starting thickness displacement. *m_toScale, //!< Ending thickness scale. diff --git a/toonz/sources/toonz/batches.cpp b/toonz/sources/toonz/batches.cpp index aa9c65e..a12154f 100644 --- a/toonz/sources/toonz/batches.cpp +++ b/toonz/sources/toonz/batches.cpp @@ -961,7 +961,9 @@ public: // throw m_e; } - TThread::Message *clone() const override { return new ControllerFailureMsg(m_e); } + TThread::Message *clone() const override { + return new ControllerFailureMsg(m_e); + } TException m_e; }; @@ -1039,18 +1041,21 @@ public: void getTasks(vector &tasks) override; void getTasks(const QString &parentId, std::vector &tasks) override; - void getTasks(const QString &parentId, std::vector &tasks) override; + void getTasks(const QString &parentId, + std::vector &tasks) override; void queryTaskInfo(const QString &id, TFarmTask &task) override; void queryTaskShortInfo(const QString &id, QString &parentId, QString &name, TaskState &status) override; - void attachServer(const QString &name, const QString &addr, int port) override { + void attachServer(const QString &name, const QString &addr, + int port) override { assert(false); } - void detachServer(const QString &name, const QString &addr, int port) override { + void detachServer(const QString &name, const QString &addr, + int port) override { assert(false); } @@ -1070,7 +1075,9 @@ public: return ServerUnknown; } - void queryServerInfo(const QString &id, ServerInfo &info) override { assert(false); } + void queryServerInfo(const QString &id, ServerInfo &info) override { + assert(false); + } void activateServer(const QString &id) override { assert(false); } diff --git a/toonz/sources/toonz/castviewer.h b/toonz/sources/toonz/castviewer.h index 499fb31..f5496ff 100644 --- a/toonz/sources/toonz/castviewer.h +++ b/toonz/sources/toonz/castviewer.h @@ -91,7 +91,8 @@ public: int getItemCount() const override; void refreshData() override; - QVariant getItemData(int index, DataType dataType, bool isSelected = false) override; + QVariant getItemData(int index, DataType dataType, + bool isSelected = false) override; QMenu *getContextMenu(QWidget *parent, int index) override; void startDragDrop() override; bool acceptDrop(const QMimeData *data) const override; diff --git a/toonz/sources/toonz/cellkeyframedata.h b/toonz/sources/toonz/cellkeyframedata.h index 59f7d3b..f0ca1dd 100644 --- a/toonz/sources/toonz/cellkeyframedata.h +++ b/toonz/sources/toonz/cellkeyframedata.h @@ -29,7 +29,9 @@ public: void setKeyframeData(TKeyframeData *data) { m_keyframeData = data; } TKeyframeData *getKeyframeData() const { return m_keyframeData; } - TCellKeyframeData *clone() const override { return new TCellKeyframeData(this); } + TCellKeyframeData *clone() const override { + return new TCellKeyframeData(this); + } }; #endif diff --git a/toonz/sources/toonz/cellselection.cpp b/toonz/sources/toonz/cellselection.cpp index 3cfc059..3f1b752 100644 --- a/toonz/sources/toonz/cellselection.cpp +++ b/toonz/sources/toonz/cellselection.cpp @@ -459,7 +459,9 @@ public: void undo() const override { renumber(m_undoTable); } void redo() const override { renumber(m_redoTable); } - int getSize() const override { return (m_redoTable.size() << 2) * sizeof(TXshCell); } + int getSize() const override { + return (m_redoTable.size() << 2) * sizeof(TXshCell); + } }; class RenumberUndo::RedoNotifier : public TUndo { @@ -1020,7 +1022,9 @@ public: int getSize() const override { return sizeof(*this); } - QString getHistoryString() override { return QObject::tr("Overwrite Paste Cells"); } + QString getHistoryString() override { + return QObject::tr("Overwrite Paste Cells"); + } int getHistoryType() override { return HistoryType::Xsheet; } }; diff --git a/toonz/sources/toonz/cleanuppopup.cpp b/toonz/sources/toonz/cleanuppopup.cpp index 690a5b4..f413059 100644 --- a/toonz/sources/toonz/cleanuppopup.cpp +++ b/toonz/sources/toonz/cleanuppopup.cpp @@ -69,9 +69,9 @@ enum Resolution { NO_RESOLUTION, //!< No required resolution. CANCEL, //!< Validation was canceled. OVERWRITE, //!< Does not delete old cleanupped levels, but overwrites found - //!frames. + //! frames. WRITE_NEW, //!< Like above, but does not overwrite. Just adds not cleanupped - //!frames. + //! frames. REPLACE, //!< Destroy the old level and build one anew. ADD_SUFFIX, //!< Add a suffix to the output path. NOPAINT_ONLY //!< overwrite the result only in "nopaint" folder diff --git a/toonz/sources/toonz/cleanuppopup.h b/toonz/sources/toonz/cleanuppopup.h index dfc88ed..c767e67 100644 --- a/toonz/sources/toonz/cleanuppopup.h +++ b/toonz/sources/toonz/cleanuppopup.h @@ -82,7 +82,7 @@ private: //! current level. Used in some autoadjust cases. std::vector m_cleanuppedLevelFrames; //!< Current level's list of - //!cleanupped frames. Used + //! cleanupped frames. Used //! to selectively build the level's unpainted backup. std::unique_ptr m_params; //!< Cleanup params used to cleanup. @@ -115,7 +115,7 @@ private: TImageP currentImage() const; QString setupLevel(); //!< Prepares level for cleanup. \return An eventual - //!failure message. + //! failure message. QString resetLevel(); //!< Erases existing output for the cleanup operation. //!\return An eventual failure message. void closeLevel(); diff --git a/toonz/sources/toonz/cleanuppreview.cpp b/toonz/sources/toonz/cleanuppreview.cpp index d910194..1cfbf2e 100644 --- a/toonz/sources/toonz/cleanuppreview.cpp +++ b/toonz/sources/toonz/cleanuppreview.cpp @@ -428,7 +428,9 @@ public: } int getSize() const override { return sizeof(*this); } - QString getHistoryString() override { return QObject::tr("Move Cleanup Camera"); } + QString getHistoryString() override { + return QObject::tr("Move Cleanup Camera"); + } int getHistoryType() override { return HistoryType::EditTool_Move; } }; @@ -480,7 +482,9 @@ public: } int getSize() const override { return sizeof(*this); } - QString getHistoryString() override { return QObject::tr("Scale Cleanup Camera"); } + QString getHistoryString() override { + return QObject::tr("Scale Cleanup Camera"); + } int getHistoryType() override { return HistoryType::EditTool_Move; } }; diff --git a/toonz/sources/toonz/cleanupsettingsmodel.h b/toonz/sources/toonz/cleanupsettingsmodel.h index c6428b5..96451ba 100644 --- a/toonz/sources/toonz/cleanupsettingsmodel.h +++ b/toonz/sources/toonz/cleanupsettingsmodel.h @@ -155,23 +155,23 @@ public: // NOTE: These should be moved to TCleanupper as soon as I get the chance static TFilePath getInputPath(TXshSimpleLevel *sl); //!< Returns the \b - //!encoded input cleanup - //!path for the specified - //!level. + //! encoded input cleanup + //! path for the specified + //! level. static TFilePath getOutputPath(TXshSimpleLevel *sl, const CleanupParameters *params); //!< Returns - //!the \b - //!encoded - //!output - //!cleanup - //!path for - //!the - //!specified - //!level. + //! the \b + //! encoded + //! output + //! cleanup + //! path for + //! the + //! specified + //! level. static TFilePath getClnPath(TXshSimpleLevel *sl); //!< Returns the \b decoded - //!path for the level's \a - //!cln file. + //! path for the level's \a + //! cln file. static void saveSettings(CleanupParameters *params, const TFilePath &clnPath); static bool loadSettings(CleanupParameters *params, const TFilePath &clnPath); @@ -186,7 +186,7 @@ public slots: void promptLoad(); //!< Prompts to load settings void restoreGlobalSettings(); //!< Reloads the project's cleanup settings (no - //!prompts) + //! prompts) signals: diff --git a/toonz/sources/toonz/colormodelviewer.h b/toonz/sources/toonz/colormodelviewer.h index c4ec7bb..ded1fdc 100644 --- a/toonz/sources/toonz/colormodelviewer.h +++ b/toonz/sources/toonz/colormodelviewer.h @@ -40,8 +40,8 @@ protected: void mousePressEvent(QMouseEvent *) override; void mouseMoveEvent(QMouseEvent *) override; void pick(const QPoint &p); - void hideEvent( - QHideEvent *e) override; // to avoid calling the hideEvent of class Flipbook! + void hideEvent(QHideEvent *e) + override; // to avoid calling the hideEvent of class Flipbook! void showEvent(QShowEvent *e) override; /*- diff --git a/toonz/sources/toonz/comboviewerpane.h b/toonz/sources/toonz/comboviewerpane.h index 306e5c5..8644b6e 100644 --- a/toonz/sources/toonz/comboviewerpane.h +++ b/toonz/sources/toonz/comboviewerpane.h @@ -72,9 +72,12 @@ public: } bool getShowHideFlag(CV_Parts parts) { return m_visibleFlag[parts]; } // reimplementation of TPanel::widgetInThisPanelIsFocused - bool widgetInThisPanelIsFocused() override { return m_sceneViewer->hasFocus(); } + bool widgetInThisPanelIsFocused() override { + return m_sceneViewer->hasFocus(); + } - void onDrawFrame(int frame, const ImagePainter::VisualSettings &settings) override; + void onDrawFrame(int frame, + const ImagePainter::VisualSettings &settings) override; // reimplementation of FlipConsoleOwner::isFrameAlreadyCached bool isFrameAlreadyCached(int frame) override; diff --git a/toonz/sources/toonz/curveio.cpp b/toonz/sources/toonz/curveio.cpp index a37a5f8..e9c2e29 100644 --- a/toonz/sources/toonz/curveio.cpp +++ b/toonz/sources/toonz/curveio.cpp @@ -20,7 +20,9 @@ public: LoadCurveUndo(TDoubleParam *curve) : m_curve(curve) { m_oldCurve = static_cast(curve->clone()); } - void onAdd() override { m_newCurve = static_cast(m_curve->clone()); } + void onAdd() override { + m_newCurve = static_cast(m_curve->clone()); + } void undo() const override { m_curve->copy(m_oldCurve.getPointer()); } void redo() const override { m_curve->copy(m_newCurve.getPointer()); } diff --git a/toonz/sources/toonz/dvdirtreeview.h b/toonz/sources/toonz/dvdirtreeview.h index 1856294..1e00133 100644 --- a/toonz/sources/toonz/dvdirtreeview.h +++ b/toonz/sources/toonz/dvdirtreeview.h @@ -159,7 +159,8 @@ public slots: protected: QSize sizeHint() const override; - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; + void currentChanged(const QModelIndex ¤t, + const QModelIndex &previous) override; bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *ev) override; void resizeEvent(QResizeEvent *) override; diff --git a/toonz/sources/toonz/dvitemview.cpp b/toonz/sources/toonz/dvitemview.cpp index ddc3fd0..3ad0ac4 100644 --- a/toonz/sources/toonz/dvitemview.cpp +++ b/toonz/sources/toonz/dvitemview.cpp @@ -1878,9 +1878,9 @@ DvItemViewerButtonBar::DvItemViewerButtonBar(DvItemViewer *itemViewer, connect(listView, SIGNAL(triggered()), itemViewer->getPanel(), SLOT(setTableView())); // connect(listView , SIGNAL(triggered()), itemViewer->getPanel(), - //SLOT(setListView())); + // SLOT(setListView())); // connect(tableView , SIGNAL(triggered()), itemViewer->getPanel(), - //SLOT(setTableView())); + // SLOT(setTableView())); connect(m_folderBack, SIGNAL(triggered()), SIGNAL(folderBack())); connect(m_folderFwd, SIGNAL(triggered()), SIGNAL(folderFwd())); diff --git a/toonz/sources/toonz/dvitemview.h b/toonz/sources/toonz/dvitemview.h index c9f526f..7db1f0a 100644 --- a/toonz/sources/toonz/dvitemview.h +++ b/toonz/sources/toonz/dvitemview.h @@ -219,8 +219,8 @@ signals: class DvItemViewerPanel : public QFrame, public TSelection::View { Q_OBJECT - QColor m_alternateBackground; // alaternate bg color for teble view - // (170,170,170) + QColor m_alternateBackground; // alaternate bg color for teble view + // (170,170,170) QColor m_textColor; // text color (black) QColor m_selectedTextColor; // selected item text color (white) QColor m_folderTextColor; // folder item text color (blue) diff --git a/toonz/sources/toonz/exportlevelcommand.cpp b/toonz/sources/toonz/exportlevelcommand.cpp index ff7988e..7feeb20 100644 --- a/toonz/sources/toonz/exportlevelcommand.cpp +++ b/toonz/sources/toonz/exportlevelcommand.cpp @@ -82,7 +82,9 @@ public: return QObject::tr("Exporting level of %1 frames in %2"); } - void setProcessedName(const QString &name) override { m_processedName = name; } + void setProcessedName(const QString &name) override { + m_processedName = name; + } void setRange(int min, int max) override { m_pb.setMaximum(max); buildString(); @@ -405,7 +407,7 @@ TImageP IoCmd::exportedImage(const std::string &ext, const TXshSimpleLevel &sl, // in modo adatto ad essere usato in Retas, e cioe': //- messo il bianco al posto del transparente //- se c'e' bianco nell'immagine, viene "sporcato"(altrimenti poi viene letto -//come trasparente da retas) +// come trasparente da retas) //- l'output e' solo tga a 24bit compressed nel formato pippo0001.tga bool IoCmd::exportLevel(const TFilePath &path, TXshSimpleLevel *sl, diff --git a/toonz/sources/toonz/exportlevelcommand.h b/toonz/sources/toonz/exportlevelcommand.h index ea933a2..3987c16 100644 --- a/toonz/sources/toonz/exportlevelcommand.h +++ b/toonz/sources/toonz/exportlevelcommand.h @@ -68,7 +68,7 @@ struct ExportLevelOptions { //! \remark In single frame exports, the transform applied to the frame is //! the first. double m_thicknessTransform[2][2]; //!< Vector images' thickness - //!transformation at the start and + //! transformation at the start and //! end of the level export. Each transform is represented as //! first order polynomial through its coefficients. diff --git a/toonz/sources/toonz/exportlevelpopup.cpp b/toonz/sources/toonz/exportlevelpopup.cpp index 18fc49c..58e683d 100644 --- a/toonz/sources/toonz/exportlevelpopup.cpp +++ b/toonz/sources/toonz/exportlevelpopup.cpp @@ -93,7 +93,9 @@ public: return QObject::tr("Exporting level of %1 frames in %2"); } - void setProcessedName(const QString &name) override { m_processedName = name; } + void setProcessedName(const QString &name) override { + m_processedName = name; + } void setRange(int min, int max) override { m_pb.setMaximum(max); buildString(); diff --git a/toonz/sources/toonz/exportpanel.h b/toonz/sources/toonz/exportpanel.h index b1dfae0..eb62460 100644 --- a/toonz/sources/toonz/exportpanel.h +++ b/toonz/sources/toonz/exportpanel.h @@ -57,7 +57,8 @@ public: // da DvItemListModel int getItemCount() const override; - QVariant getItemData(int index, DataType dataType, bool isSelected = false) override; + QVariant getItemData(int index, DataType dataType, + bool isSelected = false) override; bool isSceneItem(int index) const override { return true; } QMenu *getContextMenu(QWidget *parent, int index) override; void enableSelectionCommands(TSelection *) override; diff --git a/toonz/sources/toonz/exportscenepopup.h b/toonz/sources/toonz/exportscenepopup.h index 5e366cd..59f33df 100644 --- a/toonz/sources/toonz/exportscenepopup.h +++ b/toonz/sources/toonz/exportscenepopup.h @@ -88,12 +88,14 @@ public: ~ExportSceneDvDirModel(); DvDirModelNode *getNode(const QModelIndex &index) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex index(int row, int column, + const QModelIndex &parent) const override; QModelIndex parent(const QModelIndex &index) const override; QModelIndex childByName(const QModelIndex &parent, const std::wstring &name) const; int columnCount(const QModelIndex &parent) const override { return 1; } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, + int role = Qt::DisplayRole) const override; Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; diff --git a/toonz/sources/toonz/filebrowser.h b/toonz/sources/toonz/filebrowser.h index 0a7c7ac..90c9aeb 100644 --- a/toonz/sources/toonz/filebrowser.h +++ b/toonz/sources/toonz/filebrowser.h @@ -73,7 +73,8 @@ public: void refreshData() override; int getItemCount() const override; - QVariant getItemData(int index, DataType dataType, bool isSelected = false) override; + QVariant getItemData(int index, DataType dataType, + bool isSelected = false) override; bool canRenameItem(int index) const override; void renameItem(int index, const QString &newName) override; diff --git a/toonz/sources/toonz/filebrowsermodel.h b/toonz/sources/toonz/filebrowsermodel.h index 34d7962..4da6ef3 100644 --- a/toonz/sources/toonz/filebrowsermodel.h +++ b/toonz/sources/toonz/filebrowsermodel.h @@ -82,7 +82,7 @@ protected: TFilePath m_path; //!< The folder path bool m_isProjectFolder; //!< Whether this is a project folder bool m_existsChecked, m_exists; //!< Whether the folder exists on the file - //!system (a node could exist + //! system (a node could exist //!< on a remote version control repository, without an actual copy on disk). bool m_hasChildren; //!< Cached info about sub-folders existence bool m_peeks; //!< Whether this folder allows peeking (typically @@ -234,7 +234,9 @@ public: void setPassword(const std::wstring &password) { m_password = password; } std::wstring getPassword() const { return m_password; } - DvDirVersionControlRootNode *getVersionControlRootNode() override { return this; } + DvDirVersionControlRootNode *getVersionControlRootNode() override { + return this; + } }; //----------------------------------------------------------------------------- @@ -343,7 +345,8 @@ public: DvDirModelNode *getNode(const QModelIndex &index) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex index(int row, int column, + const QModelIndex &parent) const override; QModelIndex parent(const QModelIndex &index) const override; QModelIndex getIndexByPath(const TFilePath &path) const; @@ -353,7 +356,8 @@ public: const std::wstring &name) const; int columnCount(const QModelIndex &parent) const override { return 1; } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, + int role = Qt::DisplayRole) const override; Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; diff --git a/toonz/sources/toonz/filebrowserpopup.cpp b/toonz/sources/toonz/filebrowserpopup.cpp index 23a8a9e..4578968 100644 --- a/toonz/sources/toonz/filebrowserpopup.cpp +++ b/toonz/sources/toonz/filebrowserpopup.cpp @@ -903,7 +903,7 @@ void LoadLevelPopup::updatePosTo() { } else { std::vector fIds = getCurrentFIds(); //--- If loading the level with sequencial files, reuse the list of - //TFrameId + // TFrameId if (fIds.size() != 0) { if (m_stepCombo->currentIndex() == 0) // Step = Auto { diff --git a/toonz/sources/toonz/filebrowserpopup.h b/toonz/sources/toonz/filebrowserpopup.h index 4671347..a043d59 100644 --- a/toonz/sources/toonz/filebrowserpopup.h +++ b/toonz/sources/toonz/filebrowserpopup.h @@ -49,11 +49,11 @@ public: enum Options //! Various options used to customize the popup's behavior. { STANDARD = 0x0, //!< Standard options. CUSTOM_LAYOUT = 0x1, //!< Prevents standard layout organization at - //!construction, surrendering it + //! construction, surrendering it //! to the user. Observe that sub-widgets creation is still enforced. MULTISELECTION = 0x2, //!< Enable multiple selection in the browser widget. WITH_APPLY_BUTTON = 0x4 //!< Enable if the filebrowser has an apply button - //!next to the OK button + //! next to the OK button }; public: @@ -279,8 +279,9 @@ protected: void hideEvent(QHideEvent *) override; public slots: - void onFilePathsSelected(const std::set &paths, - const std::list> &fIds) override; + void onFilePathsSelected( + const std::set &paths, + const std::list> &fIds) override; // if the frame switched, then move m_posFrom void onFrameSwitched(); // if the from/to values in the subsequent box are changed, then reflect them diff --git a/toonz/sources/toonz/filmstrip.h b/toonz/sources/toonz/filmstrip.h index f0a16bf..970e850 100644 --- a/toonz/sources/toonz/filmstrip.h +++ b/toonz/sources/toonz/filmstrip.h @@ -176,7 +176,7 @@ private: int m_scrollSpeed, m_dragSelectionStartIndex, //!< Starting level index during drag - //!selections. + //! selections. m_dragSelectionEndIndex, //!< Ending level index during drag selections. m_timerId; // per l'autoscroll diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cpp index 4e1fd8f..089df7e 100644 --- a/toonz/sources/toonz/flipbook.cpp +++ b/toonz/sources/toonz/flipbook.cpp @@ -340,7 +340,9 @@ public: } } - TThread::Message *clone() const override { return new ProgressBarMessager(*this); } + TThread::Message *clone() const override { + return new ProgressBarMessager(*this); + } }; } // namespace @@ -735,7 +737,7 @@ void FlipBook::saveImage() { } savedFrames++; // if (!m_pb->changeFraction(m_currentFrameToSave, - //TApp::instance()->getCurrentXsheet()->getXsheet()->getFrameCount())) + // TApp::instance()->getCurrentXsheet()->getXsheet()->getFrameCount())) // break; m_currentFrameToSave++; diff --git a/toonz/sources/toonz/frameheadgadget.cpp b/toonz/sources/toonz/frameheadgadget.cpp index bebd07d..6c553cd 100644 --- a/toonz/sources/toonz/frameheadgadget.cpp +++ b/toonz/sources/toonz/frameheadgadget.cpp @@ -452,7 +452,7 @@ bool FilmstripFrameHeadGadget::eventFilter(QObject *obj, QEvent *e) { // オニオンスキンの●エリア //をクリックで各フレームのON/OFF切り替え→ドラッグで伸ばせる // Fixedオニオンスキンの●エリアをクリックで - //Fixedオニオンスキンの位置の指定 + // Fixedオニオンスキンの位置の指定 //----- //それぞれのパーツの位置Rectの指定。各フレームの右上座標からのオフセットも含む。 diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp index 6063c19..ae71d85 100644 --- a/toonz/sources/toonz/iocommand.cpp +++ b/toonz/sources/toonz/iocommand.cpp @@ -1224,7 +1224,7 @@ bool IoCmd::saveSceneIfNeeded(QString msg) { } //--- If both the level and scene is clean, then open the quit confirmation - //dialog + // dialog if (!isLevelOrSceneIsDirty && msg == "Quit") { QString question("Are you sure ?"); int ret = diff --git a/toonz/sources/toonz/iocommand.h b/toonz/sources/toonz/iocommand.h index 794842f..4ce3886 100644 --- a/toonz/sources/toonz/iocommand.h +++ b/toonz/sources/toonz/iocommand.h @@ -67,8 +67,8 @@ struct LoadResourceArguments { public: ScopedBlock(); ~ScopedBlock(); //!< Invokes all necessary Toonz updates before control is - //!returned, - //! included posting of the embedded undo block. + //! returned, + //! included posting of the embedded undo block. DVGui::ProgressDialog &progressDialog() const; //!< Progress dialog shown on multiple resource loads. @@ -107,25 +107,25 @@ public: std::vector> frameIdsSet; TFilePath castFolder; //!< [\p In] Cast panel folder where the resources - //!will be inserted. + //! will be inserted. int row0, //!< [\p In/Out] Starting xsheet row where resources have been - //!inserted. + //! inserted. col0, //!< [\p In/Out] Starting xsheet column where resources have been - //!inserted. + //! inserted. row1, //!< [\p Out] Ending xsheet row where resources have been - //!inserted (included). + //! inserted (included). col1; //!< [\p Out] Ending xsheet column where resources have been - //!inserted (included). + //! inserted (included). ImportPolicy importPolicy; //!< [\p In] Policy adopted for resources - //!external to current scene. + //! external to current scene. bool expose; //!< [\p In] Whether resources must be exposed in the - //!xsheet. + //! xsheet. std::vector loadedLevels; //!< [\p Out] Levels loaded by - //!resource loading procedures. - //!Multiple + //! resource loading procedures. + //! Multiple //! levels \a may be loaded for a single resource data. public: /*- diff --git a/toonz/sources/toonz/keyframeselection.cpp b/toonz/sources/toonz/keyframeselection.cpp index bd1217e..f33f29a 100644 --- a/toonz/sources/toonz/keyframeselection.cpp +++ b/toonz/sources/toonz/keyframeselection.cpp @@ -164,7 +164,9 @@ public: } int getSize() const override { return sizeof(*this); } - QString getHistoryString() override { return QObject::tr("Paste Key Frames"); } + QString getHistoryString() override { + return QObject::tr("Paste Key Frames"); + } }; //============================================================================= @@ -209,7 +211,9 @@ public: int getSize() const override { return sizeof(*this); } - QString getHistoryString() override { return QObject::tr("Delete Key Frames"); } + QString getHistoryString() override { + return QObject::tr("Delete Key Frames"); + } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/levelcreatepopup.cpp b/toonz/sources/toonz/levelcreatepopup.cpp index d310921..d37ef0f 100644 --- a/toonz/sources/toonz/levelcreatepopup.cpp +++ b/toonz/sources/toonz/levelcreatepopup.cpp @@ -286,8 +286,7 @@ LevelCreatePopup::LevelCreatePopup() //----------------------------------------------------------------------------- -void LevelCreatePopup::updatePath() -{ +void LevelCreatePopup::updatePath() { ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene(); TFilePath defaultPath; defaultPath = scene->getDefaultLevelPath(getLevelType()).getParentDir(); @@ -299,20 +298,21 @@ void LevelCreatePopup::updatePath() void LevelCreatePopup::nextName() { const std::auto_ptr nameBuilder(NameBuilder::getBuilder(L"")); - TLevelSet* levelSet = TApp::instance()->getCurrentScene()->getScene()->getLevelSet(); - ToonzScene* scene = TApp::instance()->getCurrentScene()->getScene(); + TLevelSet *levelSet = + TApp::instance()->getCurrentScene()->getScene()->getLevelSet(); + ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene(); std::wstring levelName = L""; - // Select a different unique level name in case it already exists (either in scene or on disk) + // Select a different unique level name in case it already exists (either in + // scene or on disk) TFilePath fp; TFilePath actualFp; for (;;) { levelName = nameBuilder->getNext(); - if (levelSet->getLevel(levelName) != 0) - continue; + if (levelSet->getLevel(levelName) != 0) continue; - fp = scene->getDefaultLevelPath(getLevelType(), levelName); + fp = scene->getDefaultLevelPath(getLevelType(), levelName); actualFp = scene->decodeFilePath(fp); if (TSystem::doesExistFileOrLevel(actualFp)) { @@ -325,8 +325,6 @@ void LevelCreatePopup::nextName() { m_nameFld->setText(QString::fromStdWString(levelName)); } - - void LevelCreatePopup::showEvent(QShowEvent *) { nextName(); update(); @@ -361,8 +359,7 @@ int LevelCreatePopup::getLevelType() const { //----------------------------------------------------------------------------- -void LevelCreatePopup::onLevelTypeChanged(const QString &text) -{ +void LevelCreatePopup::onLevelTypeChanged(const QString &text) { if (text == "Raster Level" || text == "Toonz Raster Level") setSizeWidgetEnable(true); else @@ -374,9 +371,8 @@ void LevelCreatePopup::onLevelTypeChanged(const QString &text) //----------------------------------------------------------------------------- -void LevelCreatePopup::onOkBtn() -{ - if(apply()) +void LevelCreatePopup::onOkBtn() { + if (apply()) close(); else m_nameFld->setFocus(); @@ -384,8 +380,7 @@ void LevelCreatePopup::onOkBtn() //----------------------------------------------------------------------------- -void LevelCreatePopup::onApplyButton() -{ +void LevelCreatePopup::onApplyButton() { if (apply()) { nextName(); } diff --git a/toonz/sources/toonz/linetestviewer.cpp b/toonz/sources/toonz/linetestviewer.cpp index 4084e72..2c8fa85 100644 --- a/toonz/sources/toonz/linetestviewer.cpp +++ b/toonz/sources/toonz/linetestviewer.cpp @@ -350,8 +350,9 @@ dare seri problemi!!!! // { // ras->lock(); // memcpy( ptr, ras->getRawData(), dataSize); - // glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB); // release pointer to - //mapping buffer + // glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB); // release pointer + //to + // mapping buffer // ras->unlock(); // } @@ -492,7 +493,7 @@ void LineTestViewer::paintGL() { // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); // glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, cameraWidth, cameraHeight, 0, - //GL_BGRA, GL_UNSIGNED_BYTE, (GLvoid*)0); + // GL_BGRA, GL_UNSIGNED_BYTE, (GLvoid*)0); // glBindTexture(GL_TEXTURE_2D, m_textureId); // glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, m_pboId); @@ -513,9 +514,9 @@ void LineTestViewer::paintGL() { // // glMapBufferARB() returns a new allocated pointer immediately // // even if GPU is still working with the previous data. // glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, cameraWidth * cameraHeight * - //4, 0, GL_STREAM_DRAW_ARB); + // 4, 0, GL_STREAM_DRAW_ARB); // pbo = (GLubyte*)glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, - //GL_WRITE_ONLY_ARB); + // GL_WRITE_ONLY_ARB); // pboRaster = TRaster32P(cameraWidth, cameraHeight,cameraWidth, //(TPixelRGBM32*) pbo, false); diff --git a/toonz/sources/toonz/loadfolderpopup.h b/toonz/sources/toonz/loadfolderpopup.h index 7c97358..08b6ca3 100644 --- a/toonz/sources/toonz/loadfolderpopup.h +++ b/toonz/sources/toonz/loadfolderpopup.h @@ -28,7 +28,7 @@ class LoadFolderPopup : public DVGui::Dialog { public: LoadFolderPopup(QWidget *parent = 0); //!< Constructs the popup as child of - //!an optional parent widget. + //! an optional parent widget. /*! \details The path returned by getFolder() could be empty in case there is no selected folder, or the selection is not a diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index f168545..63bd555 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -265,7 +265,7 @@ int main(int argc, char *argv[]) { #ifdef Q_OS_WIN // Since currently OpenToonz does not work with OpenGL of software or - //angle, + // angle, // force Qt to use desktop OpenGL a.setAttribute(Qt::AA_UseDesktopOpenGL, true); #endif diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 04fee41..43d33e0 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1727,11 +1727,14 @@ void MainWindow::defineActions() { createMenuCellsAction(MI_Duplicate, tr("&Duplicate Drawing "), "D"); createMenuCellsAction(MI_Autorenumber, tr("&Autorenumber"), ""); createMenuCellsAction(MI_CloneLevel, tr("&Clone"), ""); - createMenuCellsAction(MI_DrawingSubForward, tr("Drawing Substitution Forward"), "."); - createMenuCellsAction(MI_DrawingSubBackward, tr("Drawing Substitution Backward"), ","); - createMenuCellsAction(MI_DrawingSubGroupForward, tr("Similar Drawing Substitution Forward"), "Ctrl+."); - createMenuCellsAction(MI_DrawingSubGroupBackward, tr("Similar Drawing Substitution Backward"), "Ctrl+,"); - + createMenuCellsAction(MI_DrawingSubForward, + tr("Drawing Substitution Forward"), "."); + createMenuCellsAction(MI_DrawingSubBackward, + tr("Drawing Substitution Backward"), ","); + createMenuCellsAction(MI_DrawingSubGroupForward, + tr("Similar Drawing Substitution Forward"), "Ctrl+."); + createMenuCellsAction(MI_DrawingSubGroupBackward, + tr("Similar Drawing Substitution Backward"), "Ctrl+,"); createMenuCellsAction(MI_Reframe1, tr("1's"), ""); createMenuCellsAction(MI_Reframe2, tr("2's"), ""); diff --git a/toonz/sources/toonz/matchlinecommand.cpp b/toonz/sources/toonz/matchlinecommand.cpp index 6144269..73d38e6 100644 --- a/toonz/sources/toonz/matchlinecommand.cpp +++ b/toonz/sources/toonz/matchlinecommand.cpp @@ -258,7 +258,9 @@ public: } app->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const override { doCloneLevelNoSave(m_range, m_levelname, false); } + void redo() const override { + doCloneLevelNoSave(m_range, m_levelname, false); + } int getSize() const override { return sizeof *this + diff --git a/toonz/sources/toonz/menubar.cpp b/toonz/sources/toonz/menubar.cpp index a73afef..9efd565 100644 --- a/toonz/sources/toonz/menubar.cpp +++ b/toonz/sources/toonz/menubar.cpp @@ -1253,7 +1253,7 @@ QMenuBar *StackedMenuBar::createFullMenuBar() { addMenuItem(cellsMenu, MI_Rolldown); addMenuItem(cellsMenu, MI_TimeStretch); addMenuItem(xsheetMenu, MI_DrawingSubForward); - addMenuItem(xsheetMenu, MI_DrawingSubBackward); + addMenuItem(xsheetMenu, MI_DrawingSubBackward); cellsMenu->addSeparator(); addMenuItem(cellsMenu, MI_Autorenumber); addMenuItem(cellsMenu, MI_Duplicate); diff --git a/toonz/sources/toonz/mergecolumns.cpp b/toonz/sources/toonz/mergecolumns.cpp index a4af378..dd55f16 100644 --- a/toonz/sources/toonz/mergecolumns.cpp +++ b/toonz/sources/toonz/mergecolumns.cpp @@ -242,7 +242,9 @@ public: } } - QString getHistoryString() override { return QObject::tr("Merge Raster Levels"); } + QString getHistoryString() override { + return QObject::tr("Merge Raster Levels"); + } int getHistoryType() override { return HistoryType::FilmStrip; } }; diff --git a/toonz/sources/toonz/meshifypopup.cpp b/toonz/sources/toonz/meshifypopup.cpp index ba4b479..5f3261c 100644 --- a/toonz/sources/toonz/meshifypopup.cpp +++ b/toonz/sources/toonz/meshifypopup.cpp @@ -78,7 +78,7 @@ namespace { struct MeshifyOptions //! Available options for the meshification process. { double m_edgesLength; //!< The desired mesh edges length, in standard world - //!coordinates + //! coordinates double m_rasterizationDpi; //!< Dpi value used to render PLIs and sub-xsheets int m_margin; //!< Margin to the original shape (in pixels) }; diff --git a/toonz/sources/toonz/pltgizmopopup.cpp b/toonz/sources/toonz/pltgizmopopup.cpp index 9e3a5ec..d150b17 100644 --- a/toonz/sources/toonz/pltgizmopopup.cpp +++ b/toonz/sources/toonz/pltgizmopopup.cpp @@ -504,7 +504,7 @@ ValueShifter::ValueShifter(bool isHue, QWidget *parent, Qt::WFlags flags) QPushButton *plusBut = new QPushButton(QString("+"), this); QPushButton *minusBut = new QPushButton(QString("-"), this); int maxValue = (isHue) ? 360 : 100; - m_valueLineEdit = new DoubleLineEdit(this, 10.00); // parent - value + m_valueLineEdit = new DoubleLineEdit(this, 10.00); // parent - value plusBut->setFixedSize(21, 21); minusBut->setFixedSize(21, 21); plusBut->setObjectName("GizmoButton"); diff --git a/toonz/sources/toonz/previewer.cpp b/toonz/sources/toonz/previewer.cpp index 99f9800..79482ec 100644 --- a/toonz/sources/toonz/previewer.cpp +++ b/toonz/sources/toonz/previewer.cpp @@ -805,7 +805,9 @@ public: } } - TThread::Message *clone() const override { return new ProgressBarMessager(*this); } + TThread::Message *clone() const override { + return new ProgressBarMessager(*this); + } }; } // namespace diff --git a/toonz/sources/toonz/previewfxmanager.cpp b/toonz/sources/toonz/previewfxmanager.cpp index 019a114..0e07189 100644 --- a/toonz/sources/toonz/previewfxmanager.cpp +++ b/toonz/sources/toonz/previewfxmanager.cpp @@ -149,7 +149,8 @@ public: PreviewFxRenderPort(PreviewFxInstance *owner); ~PreviewFxRenderPort(); - void onRenderRasterStarted(const TRenderPort::RenderData &renderData) override; + void onRenderRasterStarted( + const TRenderPort::RenderData &renderData) override; void onRenderRasterCompleted(const RenderData &renderData) override; void onRenderFailure(const RenderData &renderData, TException &e) override; void onRenderFinished(bool inCanceled = false) override; diff --git a/toonz/sources/toonz/projectpopup.h b/toonz/sources/toonz/projectpopup.h index 55188dc..2484c96 100644 --- a/toonz/sources/toonz/projectpopup.h +++ b/toonz/sources/toonz/projectpopup.h @@ -80,12 +80,14 @@ public: ~ProjectDirModel(); DvDirModelNode *getNode(const QModelIndex &index) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex index(int row, int column, + const QModelIndex &parent) const override; QModelIndex parent(const QModelIndex &index) const override; QModelIndex childByName(const QModelIndex &parent, const std::wstring &name) const; int columnCount(const QModelIndex &parent) const override { return 1; } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, + int role = Qt::DisplayRole) const override; Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; diff --git a/toonz/sources/toonz/psdsettingspopup.h b/toonz/sources/toonz/psdsettingspopup.h index 665ff53..02afbec 100644 --- a/toonz/sources/toonz/psdsettingspopup.h +++ b/toonz/sources/toonz/psdsettingspopup.h @@ -30,8 +30,9 @@ class PsdSettingsPopup : public DVGui::Dialog { // FRAMES: all psd layers are frames of a single Tlevel // COLUMNS: each psd layer is a TLevel with only one frame. // FOLDER: each psd layer is a TLevel and - // each psd folder is a TLevel where each psd layer contained - //into folder is a frame of TLevel + // each psd folder is a TLevel where each psd layer + //contained + // into folder is a frame of TLevel enum Mode { FLAT, FRAMES, COLUMNS, FOLDER }; diff --git a/toonz/sources/toonz/rendercommand.cpp b/toonz/sources/toonz/rendercommand.cpp index e558b0c..72e047c 100644 --- a/toonz/sources/toonz/rendercommand.cpp +++ b/toonz/sources/toonz/rendercommand.cpp @@ -107,7 +107,9 @@ public: OnRenderCompleted(const TFilePath &fp, bool error) : m_fp(fp), m_error(error) {} - TThread::Message *clone() const override { return new OnRenderCompleted(*this); } + TThread::Message *clone() const override { + return new OnRenderCompleted(*this); + } void onDeliver() override { if (m_error) { @@ -183,16 +185,15 @@ public: //========================================================= -class RenderCommand -{ - int m_r0, m_r1, m_step; - TFilePath m_fp; - int m_numFrames; - TPixel32 m_oldBgColor; - static TPixel32 m_priorBgColor; - TDimension m_oldCameraRes; - double m_r, m_stepd; - double m_timeStretchFactor; +class RenderCommand { + int m_r0, m_r1, m_step; + TFilePath m_fp; + int m_numFrames; + TPixel32 m_oldBgColor; + static TPixel32 m_priorBgColor; + TDimension m_oldCameraRes; + double m_r, m_stepd; + double m_timeStretchFactor; int m_multimediaRender; @@ -489,13 +490,12 @@ void RenderCommand::rasterRender(bool isPreview) { #endif TPixel32 currBgColor = scene->getProperties()->getBgColor(); - m_priorBgColor = currBgColor; - if (ext == "jpg" || ext == "avi" || ext == "bmp") - { - currBgColor.m = 255; - scene->getProperties()->setBgColor(currBgColor); - } - + m_priorBgColor = currBgColor; + if (ext == "jpg" || ext == "avi" || ext == "bmp") { + currBgColor.m = 255; + scene->getProperties()->setBgColor(currBgColor); + } + // Extract output properties TOutputProperties *prop = isPreview ? scene->getProperties()->getPreviewProperties() @@ -586,13 +586,11 @@ void RenderCommand::rasterRender(bool isPreview) { movieRenderer.start(); } - TPixel32 RenderCommand::m_priorBgColor; -void RenderCommand::resetBgColor() -{ - ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene(); - scene->getProperties()->setBgColor(m_priorBgColor); +void RenderCommand::resetBgColor() { + ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene(); + scene->getProperties()->setBgColor(m_priorBgColor); } //=================================================================== diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp index dcaaae7..7e0b9e9 100644 --- a/toonz/sources/toonz/sceneviewer.cpp +++ b/toonz/sources/toonz/sceneviewer.cpp @@ -1449,7 +1449,7 @@ void SceneViewer::paintGL() { // iwsw commented out temporarily // if (!m_isPicking && // Preferences::instance()->isDoColorCorrectionByUsing3DLutEnabled() && - //m_ghibli3DLutUtil) + // m_ghibli3DLutUtil) // m_ghibli3DLutUtil->startDraw(); if (m_hRuler && m_vRuler) { @@ -1483,7 +1483,7 @@ void SceneViewer::paintGL() { // iwsw commented out temporarily // if (!m_isPicking && // Preferences::instance()->isDoColorCorrectionByUsing3DLutEnabled() && - //m_ghibli3DLutUtil) + // m_ghibli3DLutUtil) // m_ghibli3DLutUtil->endDraw(); return; @@ -1495,7 +1495,7 @@ void SceneViewer::paintGL() { // iwsw commented out temporarily // if (!m_isPicking && // !Preferences::instance()->isDoColorCorrectionByUsing3DLutEnabled() || - //!m_ghibli3DLutUtil) + //! m_ghibli3DLutUtil) copyFrontBufferToBackBuffer(); check_framebuffer_status(); drawEnableScissor(); @@ -1533,7 +1533,7 @@ void SceneViewer::paintGL() { // iwsw commented out temporarily // if (!m_isPicking && // Preferences::instance()->isDoColorCorrectionByUsing3DLutEnabled() && - //m_ghibli3DLutUtil) + // m_ghibli3DLutUtil) // m_ghibli3DLutUtil->endDraw(); } diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.h index 6f477a5..c1c34f9 100644 --- a/toonz/sources/toonz/sceneviewer.h +++ b/toonz/sources/toonz/sceneviewer.h @@ -78,7 +78,8 @@ class SceneViewer : public QGLWidget, /*! FreezedStatus: * \li NO_FREEZED freezed is not active; * \li NORMAL_FREEZED freezed is active: show grab image; -* \li UPDATE_FREEZED freezed is active: draw last unfreezed image and grab view; +* \li UPDATE_FREEZED freezed is active: draw last unfreezed image and grab +* view; */ enum FreezedStatus { NO_FREEZED = 0, @@ -310,7 +311,8 @@ protected: int posToColumnIndex(const TPoint &p, double distance, bool includeInvisible = true) const override; void posToColumnIndexes(const TPoint &p, std::vector &indexes, - double distance, bool includeInvisible = true) const override; + double distance, + bool includeInvisible = true) const override; //! return the row of the drawings intersecting point \b p (used with onion //! skins) diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp index 6cf15ba..22cd34d 100644 --- a/toonz/sources/toonz/sceneviewerevents.cpp +++ b/toonz/sources/toonz/sceneviewerevents.cpp @@ -562,12 +562,12 @@ void SceneViewer::wheelEvent(QWheelEvent *event) { default: // Qt::MouseEventSynthesizedByQt, // Qt::MouseEventSynthesizedByApplication - { - std::cout << "not supported event: Qt::MouseEventSynthesizedByQt, " - "Qt::MouseEventSynthesizedByApplication" - << std::endl; - break; - } + { + std::cout << "not supported event: Qt::MouseEventSynthesizedByQt, " + "Qt::MouseEventSynthesizedByApplication" + << std::endl; + break; + } } // end switch diff --git a/toonz/sources/toonz/studiopaletteviewer.cpp b/toonz/sources/toonz/studiopaletteviewer.cpp index 2282bfa..c9e687f 100644 --- a/toonz/sources/toonz/studiopaletteviewer.cpp +++ b/toonz/sources/toonz/studiopaletteviewer.cpp @@ -60,12 +60,12 @@ bool isInStudioPalette(TFilePath path) { return true; if (isInStudioPaletteFolder(path, studioPlt->getCleanupPalettesRoot())) return true; - if (isInStudioPaletteFolder(path, - TFilePath( - "C:\\Toonz 6.0 stuff\\projects\\Project " - "Palettes"))) // DAFARE - // studioPlt->getProjectPalettesRoot(); - // Per ora lo fisso)) + if (isInStudioPaletteFolder( + path, + TFilePath("C:\\Toonz 6.0 stuff\\projects\\Project " + "Palettes"))) // DAFARE + // studioPlt->getProjectPalettesRoot(); + // Per ora lo fisso)) return true; return false; } diff --git a/toonz/sources/toonz/tapp.h b/toonz/sources/toonz/tapp.h index 3055c19..e742a1d 100644 --- a/toonz/sources/toonz/tapp.h +++ b/toonz/sources/toonz/tapp.h @@ -130,7 +130,9 @@ public: /*! Returns a pointer to the current selection. */ - TSelectionHandle *getCurrentSelection() const override { return m_currentSelection; } + TSelectionHandle *getCurrentSelection() const override { + return m_currentSelection; + } /*! Returns a pointer to the current layer's mask. */ diff --git a/toonz/sources/toonz/tasksviewer.h b/toonz/sources/toonz/tasksviewer.h index 12c8994..ae83cfc 100644 --- a/toonz/sources/toonz/tasksviewer.h +++ b/toonz/sources/toonz/tasksviewer.h @@ -79,7 +79,8 @@ public: QModelIndexList getSelectedIndexes() const { return selectedIndexes(); } protected: - void onClick(TreeModel::Item *item, const QPoint &pos, QMouseEvent *e) override; + void onClick(TreeModel::Item *item, const QPoint &pos, + QMouseEvent *e) override; void openContextMenu(TreeModel::Item *item, const QPoint &globalPos) override; }; diff --git a/toonz/sources/toonz/tfarmstuff.h b/toonz/sources/toonz/tfarmstuff.h index a6e4790..3f75132 100644 --- a/toonz/sources/toonz/tfarmstuff.h +++ b/toonz/sources/toonz/tfarmstuff.h @@ -130,7 +130,8 @@ public: TDimension getPreferredSize() const override; void configureNotify(const TDimension &d) override; - bool onNcPaint(bool is_active, const TDimension &size, const TRect &titlebar) override; + bool onNcPaint(bool is_active, const TDimension &size, + const TRect &titlebar) override; void popup(const TPoint &p, const TFilePath &fp); void onIntFieldChange(const TNumField::Event &e); @@ -153,7 +154,8 @@ public: TDimension getPreferredSize() const override; void configureNotify(const TDimension &d) override; - bool onNcPaint(bool is_active, const TDimension &size, const TRect &titlebar) override; + bool onNcPaint(bool is_active, const TDimension &size, + const TRect &titlebar) override; void popup(const TPoint &p, const TFilePath &fp); void onIntFieldChange(const TNumField::Event &e); diff --git a/toonz/sources/toonz/toolbar.cpp b/toonz/sources/toonz/toolbar.cpp index be25276..50431bd 100755 --- a/toonz/sources/toonz/toolbar.cpp +++ b/toonz/sources/toonz/toolbar.cpp @@ -25,8 +25,7 @@ TEnv::IntVar ShowAllToolsToggle("ShowAllToolsToggle", 0); //----------------------------------------------------------------------------- Toolbar::Toolbar(QWidget *parent, bool isVertical) - : QToolBar(parent) - , m_isExpanded(ShowAllToolsToggle !=0) { + : QToolBar(parent), m_isExpanded(ShowAllToolsToggle != 0) { // Fondamentale per lo style sheet setObjectName("toolBar"); @@ -117,7 +116,7 @@ Toolbar::Toolbar(QWidget *parent, bool isVertical) // toolbar is expanded or shrinked according to env at the beginning updateToolbar(); - + connect(m_expandButton, SIGNAL(toggled(bool)), this, SLOT(setIsExpanded(bool))); } @@ -177,7 +176,7 @@ void Toolbar::updateToolbar() { //---------------------------------------------------------------------------- void Toolbar::setIsExpanded(bool expand) { - m_isExpanded = expand; + m_isExpanded = expand; ShowAllToolsToggle = (expand) ? 1 : 0; updateToolbar(); } diff --git a/toonz/sources/toonz/toolbar.h b/toonz/sources/toonz/toolbar.h index 80e2d09..9f435c7 100755 --- a/toonz/sources/toonz/toolbar.h +++ b/toonz/sources/toonz/toolbar.h @@ -15,10 +15,11 @@ class Toolbar : public QToolBar { bool m_isExpanded; void updateToolbar(); + public: Toolbar(QWidget *parent, bool isVertical = true); ~Toolbar(); - + protected: bool addAction(QAction *act); diff --git a/toonz/sources/toonz/vectorizerpopup.h b/toonz/sources/toonz/vectorizerpopup.h index 31c1950..5140a7b 100644 --- a/toonz/sources/toonz/vectorizerpopup.h +++ b/toonz/sources/toonz/vectorizerpopup.h @@ -97,8 +97,8 @@ public: bool apply(); //!< The main vectorization method - prepares input //! configuration and runs the vectorization thread. bool isLevelToConvert(TXshSimpleLevel *level); //!< Verifies if specified - //!level supports - //!vectorization. + //! level supports + //! vectorization. signals: @@ -209,14 +209,14 @@ private: private slots: void onTypeChange(int type); //!< Stores the active vectorization \p type - //!name, and calls \p setType(). + //! name, and calls \p setType(). void onFrameName(QString frameName); void onFrameDone(int frameCount); void onPartialDone(int partial, int total); //!< Partial progress \p partial - //!of \p total was done for - //!current frame. + //! of \p total was done for + //! current frame. void onFinished(); void updateSceneSettings(); @@ -272,7 +272,7 @@ public: TXshSimpleLevel *getVectorizedLevel() const { return m_vLevel.getPointer(); } void setLevel(const TXshSimpleLevelP &level); //!< Stores current level and - //!creates a new vector level. + //! creates a new vector level. void setParameters( const VectorizerParameters ¶ms) //! Stores vectorizer parameters. @@ -313,11 +313,12 @@ protected: /*! \details Remember that \b each of the above \a set methods \b must be called before invoking run(). */ - void run() override; //!< Starts the vectorization thread (see QThread documentation). + void run() override; //!< Starts the vectorization thread (see QThread + //!documentation). private: TXshSimpleLevelP m_level; //!< Input level to vectorize (only one level at a - //!time is dealt here). + //! time is dealt here). VectorizerParameters m_params; //!< Vectorizer options to be applied TXshSimpleLevelP m_vLevel; //!< Output vectorized level @@ -328,7 +329,7 @@ private: bool m_isCanceled, //!< User cancels set this flag to true m_dialogShown; //!< Whether \p m_dialog was shown for current - //!vectorization. + //! vectorization. private: int doVectorize(); //!< Start vectorization of input frames. diff --git a/toonz/sources/toonz/viewerpane.h b/toonz/sources/toonz/viewerpane.h index 43e9213..4604436 100644 --- a/toonz/sources/toonz/viewerpane.h +++ b/toonz/sources/toonz/viewerpane.h @@ -45,7 +45,8 @@ public: #endif ~SceneViewerPanel(); - void onDrawFrame(int frame, const ImagePainter::VisualSettings &settings) override; + void onDrawFrame(int frame, + const ImagePainter::VisualSettings &settings) override; protected: void showEvent(QShowEvent *) override; diff --git a/toonz/sources/toonz/xsheetcmd.cpp b/toonz/sources/toonz/xsheetcmd.cpp index 9185bbe..a73895f 100644 --- a/toonz/sources/toonz/xsheetcmd.cpp +++ b/toonz/sources/toonz/xsheetcmd.cpp @@ -324,7 +324,9 @@ class GlobalKeyframeUndo : public TUndo { public: GlobalKeyframeUndo(int frame) : m_frame(frame) {} - int getSize() const override { return sizeof(*this) + m_columns.size() * sizeof(int); } + int getSize() const override { + return sizeof(*this) + m_columns.size() * sizeof(int); + } int getHistoryType() override { return HistoryType::Xsheet; } @@ -561,16 +563,20 @@ public: // Drawing Substitution //============================================================ class DrawingSubtitutionUndo : public TUndo { - private: int m_direction, m_row, m_col; TCellSelection::Range m_range; bool m_selected; public: - DrawingSubtitutionUndo(int dir, TCellSelection::Range range, int row, int col, bool selected) - : m_direction(dir), m_range(range), m_row(row), m_col(col), m_selected(selected){} - + DrawingSubtitutionUndo(int dir, TCellSelection::Range range, int row, int col, + bool selected) + : m_direction(dir) + , m_range(range) + , m_row(row) + , m_col(col) + , m_selected(selected) {} + void undo() const override { if (!m_selected) { changeDrawing(-m_direction, m_row, m_col); @@ -579,9 +585,9 @@ public: int col, row; int c = m_range.m_c0; int r = m_range.m_r0; - while (c <= m_range.m_c1) { + while (c <= m_range.m_c1) { col = c; - while (r <= m_range.m_r1) { + while (r <= m_range.m_r1) { row = r; changeDrawing(-m_direction, row, col); r++; @@ -589,7 +595,6 @@ public: r = m_range.m_r0; c++; } - } void redo() const override { @@ -597,13 +602,13 @@ public: changeDrawing(m_direction, m_row, m_col); return; } - + int col, row; int c = m_range.m_c0; int r = m_range.m_r0; - while (c <= m_range.m_c1) { + while (c <= m_range.m_c1) { col = c; - while (r <= m_range.m_r1) { + while (r <= m_range.m_r1) { row = r; changeDrawing(m_direction, row, col); r++; @@ -613,19 +618,16 @@ public: } } - int getSize() const override { - return sizeof(*this); - } + int getSize() const override { return sizeof(*this); } QString getHistoryString() override { - return QObject::tr("Change current drawing %1").arg(QString::number(m_direction)); + return QObject::tr("Change current drawing %1") + .arg(QString::number(m_direction)); } - int getHistoryType() override { - return HistoryType::Xsheet; - } -protected: + int getHistoryType() override { return HistoryType::Xsheet; } +protected: static bool changeDrawing(int delta, int row, int col); static void setDrawing(const TFrameId &fid, int row, int col, TXshCell cell); friend class DrawingSubtitutionGroupUndo; @@ -634,7 +636,6 @@ protected: //============================================================ class DrawingSubtitutionGroupUndo : public TUndo { - private: int m_direction; int m_row; @@ -642,22 +643,34 @@ private: int m_count; public: - DrawingSubtitutionGroupUndo(int dir, int row, int col) : m_direction(dir), m_col(col), m_row(row) - { - m_count = 1; - TXshCell cell = TTool::getApplication()->getCurrentScene()->getScene()->getXsheet()->getCell(m_row, m_col); - if (!cell.m_level || !cell.m_level->getSimpleLevel()) return; + DrawingSubtitutionGroupUndo(int dir, int row, int col) + : m_direction(dir), m_col(col), m_row(row) { + m_count = 1; + TXshCell cell = TTool::getApplication() + ->getCurrentScene() + ->getScene() + ->getXsheet() + ->getCell(m_row, m_col); + if (!cell.m_level || !cell.m_level->getSimpleLevel()) return; TFrameId id = cell.m_frameId; - TXshCell nextCell = TTool::getApplication()->getCurrentScene()->getScene()->getXsheet()->getCell(m_row + m_count, m_col); - if (!nextCell.m_level || !nextCell.m_level->getSimpleLevel()) return; + TXshCell nextCell = TTool::getApplication() + ->getCurrentScene() + ->getScene() + ->getXsheet() + ->getCell(m_row + m_count, m_col); + if (!nextCell.m_level || !nextCell.m_level->getSimpleLevel()) return; TFrameId nextId = nextCell.m_frameId; while (id == nextId) { m_count++; - nextCell = TTool::getApplication()->getCurrentScene()->getScene()->getXsheet()->getCell(m_row + m_count, m_col); + nextCell = TTool::getApplication() + ->getCurrentScene() + ->getScene() + ->getXsheet() + ->getCell(m_row + m_count, m_col); nextId = nextCell.m_frameId; } } @@ -665,92 +678,90 @@ public: void undo() const override { int n = 1; DrawingSubtitutionUndo::changeDrawing(-m_direction, m_row, m_col); - while (n < m_count) { + while (n < m_count) { DrawingSubtitutionUndo::changeDrawing(-m_direction, m_row + n, m_col); - n++; + n++; } } void redo() const override { int n = 1; DrawingSubtitutionUndo::changeDrawing(m_direction, m_row, m_col); - while (n < m_count) { + while (n < m_count) { DrawingSubtitutionUndo::changeDrawing(m_direction, m_row + n, m_col); n++; } } - int getSize() const override { - return sizeof(*this); - } + int getSize() const override { return sizeof(*this); } QString getHistoryString() override { - return QObject::tr("Change current drawing %1").arg(QString::number(m_direction)); - } - - int getHistoryType() override { - return HistoryType::Xsheet; + return QObject::tr("Change current drawing %1") + .arg(QString::number(m_direction)); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================ bool DrawingSubtitutionUndo::changeDrawing(int delta, int row, int col) { - TTool::Application *app = TTool::getApplication(); - TXsheet *xsh = app->getCurrentScene()->getScene()->getXsheet(); - TXshCell cell = xsh->getCell(row, col); - - if (!cell.m_level || !cell.m_level->getSimpleLevel()) return false; - - std::vector fids; - cell.m_level->getSimpleLevel()->getFids(fids); - int n = fids.size(); - - if (n < 2) return false; - - std::vector::iterator it; - it = std::find(fids.begin(), fids.end(), cell.m_frameId); - - if (it == fids.end()) return false; - - int index = std::distance(fids.begin(), it); - while (delta < 0) delta += n; - index = (index + delta) % n; - - setDrawing(fids[index], row, col, cell); + TTool::Application *app = TTool::getApplication(); + TXsheet *xsh = app->getCurrentScene()->getScene()->getXsheet(); + TXshCell cell = xsh->getCell(row, col); -} + if (!cell.m_level || !cell.m_level->getSimpleLevel()) return false; -void DrawingSubtitutionUndo::setDrawing(const TFrameId &fid, int row, int col, TXshCell cell) { - TTool::Application *app = TTool::getApplication(); - TXsheet *xsh = app->getCurrentScene()->getScene()->getXsheet(); - cell.m_frameId = fid; - xsh->setCell(row, col, cell); - TStageObject *pegbar = xsh->getStageObject(TStageObjectId::ColumnId(col)); - pegbar->setOffset(pegbar->getOffset()); + std::vector fids; + cell.m_level->getSimpleLevel()->getFids(fids); + int n = fids.size(); - app->getCurrentXsheet()->notifyXsheetChanged(); - TApp::instance()->getCurrentScene()->setDirtyFlag(true); + if (n < 2) return false; + + std::vector::iterator it; + it = std::find(fids.begin(), fids.end(), cell.m_frameId); + + if (it == fids.end()) return false; + + int index = std::distance(fids.begin(), it); + while (delta < 0) delta += n; + index = (index + delta) % n; + + setDrawing(fids[index], row, col, cell); +} + +void DrawingSubtitutionUndo::setDrawing(const TFrameId &fid, int row, int col, + TXshCell cell) { + TTool::Application *app = TTool::getApplication(); + TXsheet *xsh = app->getCurrentScene()->getScene()->getXsheet(); + cell.m_frameId = fid; + xsh->setCell(row, col, cell); + TStageObject *pegbar = xsh->getStageObject(TStageObjectId::ColumnId(col)); + pegbar->setOffset(pegbar->getOffset()); + + app->getCurrentXsheet()->notifyXsheetChanged(); + TApp::instance()->getCurrentScene()->setDirtyFlag(true); } //----------------------------------------------------------------------------- void drawingSubstituion(int dir) { - //TTool::Application *app = TTool::getApplication(); - //TCellSelection *selection = dynamic_cast(app->getCurrentSelection()->getSelection()); - TCellSelection *selection = dynamic_cast(TTool::getApplication()->getCurrentSelection()->getSelection()); + // TTool::Application *app = TTool::getApplication(); + // TCellSelection *selection = dynamic_cast(app->getCurrentSelection()->getSelection()); + TCellSelection *selection = dynamic_cast( + TTool::getApplication()->getCurrentSelection()->getSelection()); TCellSelection::Range range; bool selected = false; if (selection) { - range = selection->getSelectedCells(); - if (!(range.isEmpty())) - selected = true; + range = selection->getSelectedCells(); + if (!(range.isEmpty())) selected = true; } int row = TTool::getApplication()->getCurrentFrame()->getFrame(); int col = TTool::getApplication()->getCurrentColumn()->getColumnIndex(); - - DrawingSubtitutionUndo *undo = new DrawingSubtitutionUndo(dir, range, row, col, selected); + + DrawingSubtitutionUndo *undo = + new DrawingSubtitutionUndo(dir, range, row, col, selected); TUndoManager::manager()->add(undo); undo->redo(); @@ -759,7 +770,8 @@ void drawingSubstituion(int dir) { void drawingSubstituionGroup(int dir) { int row = TTool::getApplication()->getCurrentFrame()->getFrame(); int col = TTool::getApplication()->getCurrentColumn()->getColumnIndex(); - DrawingSubtitutionGroupUndo *undo = new DrawingSubtitutionGroupUndo(dir, row, col); + DrawingSubtitutionGroupUndo *undo = + new DrawingSubtitutionGroupUndo(dir, row, col); TUndoManager::manager()->add(undo); undo->redo(); } @@ -769,47 +781,39 @@ void drawingSubstituionGroup(int dir) { class DrawingSubstitutionForwardCommand : public MenuItemHandler { public: DrawingSubstitutionForwardCommand() : MenuItemHandler(MI_DrawingSubForward) {} - void execute() override { - XshCmd::drawingSubstituion(1); - } + void execute() override { XshCmd::drawingSubstituion(1); } } DrawingSubstitutionForwardCommand; - //============================================================ class DrawingSubstitutionBackwardCommand : public MenuItemHandler { public: - DrawingSubstitutionBackwardCommand() : MenuItemHandler(MI_DrawingSubBackward) {} - void execute() override { - XshCmd::drawingSubstituion(-1); - } + DrawingSubstitutionBackwardCommand() + : MenuItemHandler(MI_DrawingSubBackward) {} + void execute() override { XshCmd::drawingSubstituion(-1); } } DrawingSubstitutionBackwardCommand; //============================================================================= class DrawingSubstitutionGroupForwardCommand : public MenuItemHandler { public: - DrawingSubstitutionGroupForwardCommand() : MenuItemHandler(MI_DrawingSubGroupForward) {} - void execute() override { - XshCmd::drawingSubstituionGroup(1); - } + DrawingSubstitutionGroupForwardCommand() + : MenuItemHandler(MI_DrawingSubGroupForward) {} + void execute() override { XshCmd::drawingSubstituionGroup(1); } } DrawingSubstitutionGroupForwardCommand; - //============================================================ class DrawingSubstitutionGroupBackwardCommand : public MenuItemHandler { public: - DrawingSubstitutionGroupBackwardCommand() : MenuItemHandler(MI_DrawingSubGroupBackward) {} - void execute() override { - XshCmd::drawingSubstituionGroup(-1); - } + DrawingSubstitutionGroupBackwardCommand() + : MenuItemHandler(MI_DrawingSubGroupBackward) {} + void execute() override { XshCmd::drawingSubstituionGroup(-1); } } DrawingSubstitutionGroupBackwardCommand; - //============================================================ -} // namespace XshCmd +} // namespace XshCmd //***************************************************************************** // Selection commands @@ -1254,8 +1258,12 @@ public: TApp::instance()->getCurrentObject()->notifyObjectIdChanged(false); } - void redo() const override { setKeyframes(m_newKeyframeFirst, m_newKeyframeSecond); } - void undo() const override { setKeyframes(m_oldKeyframeFirst, m_oldKeyframeSecond); } + void redo() const override { + setKeyframes(m_newKeyframeFirst, m_newKeyframeSecond); + } + void undo() const override { + setKeyframes(m_oldKeyframeFirst, m_oldKeyframeSecond); + } int getSize() const override { return sizeof *this; } diff --git a/toonz/sources/toonz/xsheetdragtool.cpp b/toonz/sources/toonz/xsheetdragtool.cpp index 776bf1e..ef2c462 100644 --- a/toonz/sources/toonz/xsheetdragtool.cpp +++ b/toonz/sources/toonz/xsheetdragtool.cpp @@ -441,7 +441,9 @@ public: return sizeof(*this) + sizeof(TXshCell) * m_cells.size(); } - QString getHistoryString() override { return QObject::tr("Use Level Extender"); } + QString getHistoryString() override { + return QObject::tr("Use Level Extender"); + } int getHistoryType() override { return HistoryType::Xsheet; } }; @@ -820,7 +822,9 @@ public: int getSize() const override { return sizeof(*this); } - QString getHistoryString() override { return QObject::tr("Modify Sound Level"); } + QString getHistoryString() override { + return QObject::tr("Modify Sound Level"); + } int getHistoryType() override { return HistoryType::Xsheet; } }; @@ -1318,7 +1322,9 @@ public: app->getCurrentFrame()->scrubXsheet(row, row, getViewer()->getXsheet()); } - void onRelease(int row, int col) override { getViewer()->getXsheet()->stopScrub(); } + void onRelease(int row, int col) override { + getViewer()->getXsheet()->stopScrub(); + } }; //----------------------------------------------------------------------------- @@ -1533,7 +1539,9 @@ public: if (selection) selection->selectNone(); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const override { return sizeof(*this) + m_indices.size() * sizeof(int); } + int getSize() const override { + return sizeof(*this) + m_indices.size() * sizeof(int); + } QString getHistoryString() override { return QObject::tr("Move Columns"); } int getHistoryType() override { return HistoryType::Xsheet; } diff --git a/toonz/sources/toonz/xsheetviewer.cpp b/toonz/sources/toonz/xsheetviewer.cpp index d1fbcc9..24332c5 100644 --- a/toonz/sources/toonz/xsheetviewer.cpp +++ b/toonz/sources/toonz/xsheetviewer.cpp @@ -746,12 +746,12 @@ void XsheetViewer::wheelEvent(QWheelEvent *event) { default: // Qt::MouseEventSynthesizedByQt, // Qt::MouseEventSynthesizedByApplication - { - std::cout << "not supported event: Qt::MouseEventSynthesizedByQt, " - "Qt::MouseEventSynthesizedByApplication" - << std::endl; - break; - } + { + std::cout << "not supported event: Qt::MouseEventSynthesizedByQt, " + "Qt::MouseEventSynthesizedByApplication" + << std::endl; + break; + } } // end switch } diff --git a/toonz/sources/toonz/xshrowviewer.cpp b/toonz/sources/toonz/xshrowviewer.cpp index eec21fa..9c922e9 100644 --- a/toonz/sources/toonz/xshrowviewer.cpp +++ b/toonz/sources/toonz/xshrowviewer.cpp @@ -707,8 +707,8 @@ void RowArea::contextMenuEvent(QContextMenuEvent *event) { menu->addAction(cmdManager->getAction(MI_RemoveSceneFrame)); menu->addAction(cmdManager->getAction(MI_InsertGlobalKeyframe)); menu->addAction(cmdManager->getAction(MI_RemoveGlobalKeyframe)); - menu->addAction(cmdManager->getAction(MI_DrawingSubForward)); - menu->addAction(cmdManager->getAction(MI_DrawingSubBackward)); + menu->addAction(cmdManager->getAction(MI_DrawingSubForward)); + menu->addAction(cmdManager->getAction(MI_DrawingSubBackward)); menu->addSeparator(); menu->addAction(cmdManager->getAction(MI_ShiftTrace)); menu->addAction(cmdManager->getAction(MI_EditShift)); diff --git a/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp b/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp index 953832b..e0b7a3b 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp @@ -37,9 +37,11 @@ public: void queryTaskShortInfo(const QString &id, QString &parentId, QString &name, TaskState &status) override; - void attachServer(const QString &name, const QString &addr, int port) override; + void attachServer(const QString &name, const QString &addr, + int port) override; - void detachServer(const QString &name, const QString &addr, int port) override; + void detachServer(const QString &name, const QString &addr, + int port) override; void taskSubmissionError(const QString &taskId, int errCode) override; @@ -62,7 +64,8 @@ public: // deactivates the server whose id has been specified // once deactivated, a server is not available for task rendering - void deactivateServer(const QString &id, bool completeRunningTasks = true) override; + void deactivateServer(const QString &id, + bool completeRunningTasks = true) override; }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp b/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp index 1ed7633..b836272 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp @@ -21,8 +21,10 @@ public: void queryHwInfo(HwInfo &hwInfo) override; - void attachController(const QString &name, const QString &addr, int port) override; - void detachController(const QString &name, const QString &addr, int port) override; + void attachController(const QString &name, const QString &addr, + int port) override; + void detachController(const QString &name, const QString &addr, + int port) override; }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp index b24f169..3f0c56a 100644 --- a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp +++ b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp @@ -587,10 +587,12 @@ public: TaskState &status) override; // used (by a server) to notify a server start - void attachServer(const QString &name, const QString &addr, int port) override; + void attachServer(const QString &name, const QString &addr, + int port) override; // used (by a server) to notify a server stop - void detachServer(const QString &name, const QString &addr, int port) override; + void detachServer(const QString &name, const QString &addr, + int port) override; // used (by a server) to notify a task submission error void taskSubmissionError(const QString &taskId, int errCode) override; diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp index 20c9e93..d55d361 100644 --- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp @@ -284,12 +284,14 @@ public: void queryHwInfo(HwInfo &hwInfo) override; void attachController(const ControllerData &data); - void attachController(const QString &name, const QString &addr, int port) override { + void attachController(const QString &name, const QString &addr, + int port) override { attachController(ControllerData(name, addr, port)); } void detachController(const ControllerData &data); - void detachController(const QString &name, const QString &addr, int port) override { + void detachController(const QString &name, const QString &addr, + int port) override { detachController(ControllerData(name, addr, port)); } diff --git a/toonz/sources/toonzfarm/tnzcore_stuff/tfilepath.cpp b/toonz/sources/toonzfarm/tnzcore_stuff/tfilepath.cpp index 21292ce..7b17dc1 100644 --- a/toonz/sources/toonzfarm/tnzcore_stuff/tfilepath.cpp +++ b/toonz/sources/toonzfarm/tnzcore_stuff/tfilepath.cpp @@ -292,7 +292,7 @@ string TFilePath::getUndottedType() const // ritorna l'estensione senza PUNTO string TFilePath::getName() const // noDot! noSlash! { - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash string str = m_path.substr(i + 1); i = str.rfind("."); if (i == string::npos) return str; @@ -304,7 +304,7 @@ string TFilePath::getName() const // noDot! noSlash! //----------------------------------------------------------------------------- // es. TFilePath("/pippo/pluto.0001.gif").getLevelName() == "pluto..gif" string TFilePath::getLevelName() const { - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash string str = m_path.substr(i + 1); // str e' m_path senza directory i = str.find("."); // posizione del primo punto di str if (i == string::npos) return str; // no frame; no type @@ -336,7 +336,7 @@ TFilePath TFilePath::getParentDir() const // noSlash! //----------------------------------------------------------------------------- TFrameId TFilePath::getFrame() const { - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash string str = m_path.substr(i + 1); // str e' il path senza parentdir i = str.rfind('.'); if (i == string::npos || str == "." || str == "..") @@ -359,7 +359,7 @@ TFrameId TFilePath::getFrame() const { TFilePath TFilePath::withType(const string &type) const { const string dotDot = ".."; assert(type.length() < 2 || type.substr(0, 2) != dotDot); - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash string str = m_path.substr(i + 1); // str e' il path senza parentdir int j = str.rfind('.'); if (j == string::npos || str == dotDot) @@ -386,7 +386,7 @@ TFilePath TFilePath::withType(const string &type) const { //----------------------------------------------------------------------------- TFilePath TFilePath::withName(const string &name) const { - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash string str = m_path.substr(i + 1); // str e' il path senza parentdir int j = str.rfind('.'); if (j == string::npos) return TFilePath(m_path.substr(0, i + 1) + name); @@ -407,7 +407,7 @@ TFilePath TFilePath::withParentDir(const TFilePath &dir) const { TFilePath TFilePath::withFrame(const TFrameId &frame, TFrameId::FrameFormat format) const { const string dot = ".", dotDot = ".."; - int i = getLastSlash(m_path); // cerco l'ultimo slash + int i = getLastSlash(m_path); // cerco l'ultimo slash string str = m_path.substr(i + 1); // str e' il path senza parentdir assert(str != dot && str != dotDot); int j = str.rfind('.'); diff --git a/toonz/sources/toonzfarm/tnzcore_stuff/tsystem.cpp b/toonz/sources/toonzfarm/tnzcore_stuff/tsystem.cpp index 480152e..e3bb197 100644 --- a/toonz/sources/toonzfarm/tnzcore_stuff/tsystem.cpp +++ b/toonz/sources/toonzfarm/tnzcore_stuff/tsystem.cpp @@ -573,7 +573,7 @@ TFilePath TSystem::getHomeDirectory() { TFilePath TSystem::getTempDir() { #ifdef WIN32 // gestire eccezioni se dw==0 - DWORD dw = GetTempPath(0, 0); // non include il terminatore + DWORD dw = GetTempPath(0, 0); // non include il terminatore char *path = new char[dw + 1]; GetTempPath(dw, path); TFilePath tempDir(path); diff --git a/toonz/sources/toonzlib/convert2tlv.cpp b/toonz/sources/toonzlib/convert2tlv.cpp index 1c16932..8e9c529 100644 --- a/toonz/sources/toonzlib/convert2tlv.cpp +++ b/toonz/sources/toonzlib/convert2tlv.cpp @@ -231,7 +231,7 @@ void Convert2Tlv::buildInks(TRasterCM32P &rout, const TRaster32P &rin) { if (m_colorTolerance > 0) it = findNearestColor(curColor); // if (it==colorMap.end() && (int)colorMap.size()>origColorCount) // it = findNearestColor(curColor, colorMap, colorTolerance, - //origColorCount, colorMap.size()-1); + // origColorCount, colorMap.size()-1); if (it == m_colorMap.end() && m_lastIndex < 4095) { m_colorMap[curColor] = ++m_lastIndex; curIndex = m_lastIndex; @@ -369,7 +369,7 @@ void Convert2Tlv::doFill(TRasterCM32P &rout, const TRaster32P &rin) { // non l'ho trovato tra i colori origari, lo cerco in quelli nuovi, ma // in questo caso deve essere esattamente uguale(tolerance = 0) // it = findNearestColor(*pixin, colorMap, colorTolerance, - //origColorCount, colorMap.size()-1); + // origColorCount, colorMap.size()-1); if (it == m_colorMap.end() && m_lastIndex < 4096) { m_colorMap[*pixin] = ++m_lastIndex; @@ -670,7 +670,8 @@ Convert2Tlv::Convert2Tlv(const TFilePath &filepath1, const TFilePath &filepath2, int Convert2Tlv::getFramesToConvertCount() { if (m_level1 && m_level1->getFrameCount() > 0) - return getFramesCount(m_level1, m_from, m_to); // m_level1->getFrameCount(); + return getFramesCount(m_level1, m_from, + m_to); // m_level1->getFrameCount(); else { try { TLevelReaderP lr = TLevelReaderP(m_levelIn1); diff --git a/toonz/sources/toonzlib/doubleparamcmd.cpp b/toonz/sources/toonzlib/doubleparamcmd.cpp index a2ffdd0..16ebef0 100644 --- a/toonz/sources/toonzlib/doubleparamcmd.cpp +++ b/toonz/sources/toonzlib/doubleparamcmd.cpp @@ -161,7 +161,7 @@ int KeyframeSetter::createKeyframe(double frame) { TDoubleKeyframe kb = m_param->getKeyframe(m_kIndex + 1); TDoubleKeyframe::Type segmentType = ka.m_type; m_keyframe.m_type = ka.m_type; - m_keyframe.m_step = ka.m_step; // An existing segment step should prevail + m_keyframe.m_step = ka.m_step; // An existing segment step should prevail // over the preference /*---Segment内にKeyを打った場合は、Step値も元のSegmentの値を引き継ぐようにする---*/ diff --git a/toonz/sources/toonzlib/fill.cpp b/toonz/sources/toonzlib/fill.cpp index 7a91e10..620a108 100644 --- a/toonz/sources/toonzlib/fill.cpp +++ b/toonz/sources/toonzlib/fill.cpp @@ -53,7 +53,7 @@ void fillRow(const TRasterCM32P &r, const TPoint &p, int &xa, int &xb, oldtone = tone; } if (tone == 0) { - tmp_limit = pix + 10; // edge stop fill == 10 per default + tmp_limit = pix + 10; // edge stop fill == 10 per default if (limit > tmp_limit) limit = tmp_limit; for (; pix <= limit; pix++) { if (pix->getPaint() == paint) break; @@ -130,7 +130,7 @@ void findSegment(const TRaster32P &r, const TPoint &p, int &xa, int &xb, oldmatte = matte; } if (matte == 0) { - tmp_limit = pix + 10; // edge stop fill == 10 per default + tmp_limit = pix + 10; // edge stop fill == 10 per default if (limit > tmp_limit) limit = tmp_limit; for (; pix <= limit; pix++) { if (*pix == color) break; diff --git a/toonz/sources/toonzlib/fxcommand.cpp b/toonz/sources/toonzlib/fxcommand.cpp index 3b902ca..1f91c7a 100644 --- a/toonz/sources/toonzlib/fxcommand.cpp +++ b/toonz/sources/toonzlib/fxcommand.cpp @@ -1584,7 +1584,9 @@ public: int getSize() const override { return sizeof(*this); } - QString getHistoryString() override { return QObject::tr("Create Output Fx"); } + QString getHistoryString() override { + return QObject::tr("Create Output Fx"); + } private: void initialize(TFx *fx) { @@ -1792,7 +1794,7 @@ private: std::list m_normalLinks; //!< Actual *common* links from m_links std::list m_terminalFxs; //!< Fxs connected to the xsheet (represents - //!xsheet input links) + //! xsheet input links) // Why SMART pointers? No fx is deleted with this command... hmm... std::map m_dynamicLinks; //!< Complete dynamic links configuration, per fx. @@ -2438,7 +2440,9 @@ public: initialize(zeraryFxColumnSize, pos, addOffset); } - bool isConsistent() const override { return !(m_fxs.empty() && m_columns.empty()); } + bool isConsistent() const override { + return !(m_fxs.empty() && m_columns.empty()); + } void redo() const override; void undo() const override; diff --git a/toonz/sources/toonzlib/ikjacobian.cpp b/toonz/sources/toonzlib/ikjacobian.cpp index 6f0eb52..61316aa 100644 --- a/toonz/sources/toonzlib/ikjacobian.cpp +++ b/toonz/sources/toonzlib/ikjacobian.cpp @@ -169,7 +169,7 @@ void MatrixRmn::SetSequence(const VectorRn &d, long startRow, long startCol, // The matrix A is loaded, in into "this" matrix, based at (0,0). // The size of "this" matrix must be large enough to accomodate A. // The rest of "this" matrix is left unchanged. It is not filled with -//zeroes! +// zeroes! void MatrixRmn::LoadAsSubmatrix(const MatrixRmn &A) { assert(A.NumRows <= NumRows && A.NumCols <= NumCols); @@ -190,7 +190,7 @@ void MatrixRmn::LoadAsSubmatrix(const MatrixRmn &A) { // (0,0). // The size of "this" matrix must be large enough to accomodate A. // The rest of "this" matrix is left unchanged. It is not filled with -//zeroes! +// zeroes! void MatrixRmn::LoadAsSubmatrixTranspose(const MatrixRmn &A) { assert(A.NumRows <= NumCols && A.NumCols <= NumRows); double *rowPtr = x; @@ -532,8 +532,9 @@ void MatrixRmn::PostApplyGivens(double c, double s, long idx1, long idx2) { // (this) = U * Diag(w) * V^T (V^T is V-transpose.) // Diagonal entries have all non-zero entries before all zero entries, but are // not -// necessarily sorted. (Someday, I will write ComputedSortedSVD that -//handles +// necessarily sorted. (Someday, I will write ComputedSortedSVD +//that +// handles // sorting the eigenvalues by magnitude.) // ******************************************************************************************** void MatrixRmn::ComputeSVD(MatrixRmn &U, VectorRn &w, MatrixRmn &V) const { @@ -710,13 +711,14 @@ void MatrixRmn::SvdHouseholder(double *basePt, long colLength, long numCols, // numXforms = number of Householder transformations to concatenate // Each Householder transformation is represented by a unit vector // Each successive Householder transformation starts one position -//later +// later // and has one more implied leading zero // basePt = beginning of the first Householder transform // colStride, rowStride: Householder xforms are stored in "columns" // numZerosSkipped is the number of implicit zeros on the front each -// Householder transformation vector (only values supported are -//0 and 1). +// Householder transformation vector (only values supported +//are +// 0 and 1). void MatrixRmn::ExpandHouseholders(long numXforms, int numZerosSkipped, const double *basePt, long colStride, long rowStride) { diff --git a/toonz/sources/toonzlib/imagebuilders.h b/toonz/sources/toonzlib/imagebuilders.h index cce6018..1e6a0b3 100644 --- a/toonz/sources/toonzlib/imagebuilders.h +++ b/toonz/sources/toonzlib/imagebuilders.h @@ -32,7 +32,7 @@ class ImageLoader : public ImageBuilder { public: struct BuildExtData { const TXshSimpleLevel *m_sl; //!< TXshSimpleLevel instance associated to an - //!image loading request + //! image loading request TFrameId m_fid; //!< m_sl's fid at which the image will be loaded int m_subs; //!< The subsampling factor for image loading (0 meaning either diff --git a/toonz/sources/toonzlib/multimediarenderer.cpp b/toonz/sources/toonzlib/multimediarenderer.cpp index 292292f..888b08f 100644 --- a/toonz/sources/toonzlib/multimediarenderer.cpp +++ b/toonz/sources/toonzlib/multimediarenderer.cpp @@ -516,7 +516,7 @@ void MultimediaRenderer::enablePrecomputing(bool on) { //--------------------------------------------------------- //!\b NOTE: Such render may vary from time to time, and even be 0 if no renderer -//!is currently +//! is currently //! active, for example due to preprocessing states. TRenderer *MultimediaRenderer::getTRenderer() { return m_imp->m_currentTRenderer; diff --git a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp index 5cc7584..632b0ec 100644 --- a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp +++ b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp @@ -167,7 +167,7 @@ CYOMBInputParam::CYOMBInputParam(const int argc, const char *argv[], // m_nbSample= //(int)((double)m_nbSample*sqrt(m_scale)+0.5); // m_nbSample= m_nbSample<3 ? 3 : - //m_nbSample; + // m_nbSample; // } } else m_nbSample = m_nbSample < 1 ? 1 : m_nbSample; diff --git a/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h b/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h index bc8309f..9125bb5 100644 --- a/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h +++ b/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h @@ -84,11 +84,12 @@ public: static void adjustToMatte(I_PIXEL &p); // void blurPixel(CSTColSelPic& pic, const int xx, const int yy, - // const CBlurMatrix& bm, UC_PIXEL& col,const UCHAR - //osel); + // const CBlurMatrix& bm, UC_PIXEL& col,const + //UCHAR + // osel); // bool isContourOnPath(const int xx, const int yy, // std::vector::const_iterator - //pBS, + // pBS, // CSTColSelPic& pic); // void addPixel(I_PIXEL& p, const UC_PIXEL* pic); // void addPixel(I_PIXEL& p, const CSTColSelPic& pic, diff --git a/toonz/sources/toonzlib/sandor_fxs/calligraph.cpp b/toonz/sources/toonzlib/sandor_fxs/calligraph.cpp index 97d8733..195a55b 100644 --- a/toonz/sources/toonzlib/sandor_fxs/calligraph.cpp +++ b/toonz/sources/toonzlib/sandor_fxs/calligraph.cpp @@ -57,7 +57,7 @@ void calligraphUC(const RASTER *inr, RASTER *outr, CCallParam &par, double fSize = par.m_accuracy / 5.0; fSize = D_CUT(fSize, 1.0, 20.0); // CSDirection - //dir(ipUC.m_lX,ipUC.m_lY,ipUC.m_sel,I_ROUND(fSize)); + // dir(ipUC.m_lX,ipUC.m_lY,ipUC.m_sel,I_ROUND(fSize)); // Only on border (thickness of border is 3 ) CSDirection dir(ipUC.m_lX, ipUC.m_lY, ipUC.m_sel.get(), I_ROUND(fSize), 3); @@ -108,7 +108,7 @@ void calligraphUS(const RASTER *inr, RASTER *outr, CCallParam &par, double fSize = par.m_accuracy / 5.0; fSize = D_CUT(fSize, 1.0, 20.0); // CSDirection - //dir(ipUS.m_lX,ipUS.m_lY,ipUS.m_sel,I_ROUND(fSize)); + // dir(ipUS.m_lX,ipUS.m_lY,ipUS.m_sel,I_ROUND(fSize)); // Only on border (thickness of border is 3 ) CSDirection dir(ipUS.m_lX, ipUS.m_lY, ipUS.m_sel.get(), I_ROUND(fSize), 3); diff --git a/toonz/sources/toonzlib/scenefx.cpp b/toonz/sources/toonzlib/scenefx.cpp index 967fb6f..c838aac 100644 --- a/toonz/sources/toonzlib/scenefx.cpp +++ b/toonz/sources/toonzlib/scenefx.cpp @@ -90,7 +90,9 @@ public: } TFxTimeRegion getTimeRegion() const override { return m_timeRegion; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } std::string getPluginId() const override { return std::string(); } @@ -100,7 +102,8 @@ public: TRasterFxP(m_port.getFx())->compute(flash, m_frame); } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { + void doCompute(TTile &tile, double frame, + const TRenderSettings &ri) override { if (!m_port.isConnected()) { tile.getRaster()->clear(); return; @@ -110,17 +113,20 @@ public: TRasterFxP(m_port.getFx())->compute(tile, m_frame, ri); } - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bbox, + const TRenderSettings &info) override { if (!m_port.isConnected()) return false; return TRasterFxP(m_port.getFx())->doGetBBox(m_frame, bbox, info); } - std::string getAlias(double frame, const TRenderSettings &info) const override { + std::string getAlias(double frame, + const TRenderSettings &info) const override { return TRasterFx::getAlias(m_frame, info); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { if (m_port.isConnected()) TRasterFxP(m_port.getFx())->dryCompute(rect, m_frame, info); } @@ -173,7 +179,9 @@ public: return fx; } - bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { + return true; + } TAffine getPlacement(double frame) override { TAffine objAff = m_stageObject->getPlacement(frame); diff --git a/toonz/sources/toonzlib/scriptbinding_renderer.cpp b/toonz/sources/toonzlib/scriptbinding_renderer.cpp index bd72ceb..3556c0c 100644 --- a/toonz/sources/toonzlib/scriptbinding_renderer.cpp +++ b/toonz/sources/toonzlib/scriptbinding_renderer.cpp @@ -155,7 +155,9 @@ public: render(makeRenderData(scene, rows)); } - void onRenderRasterStarted(const RenderData &renderData) override { int a = 1; } + void onRenderRasterStarted(const RenderData &renderData) override { + int a = 1; + } void onRenderRasterCompleted(const RenderData &renderData) override { TRasterP outputRaster = renderData.m_rasA; TRasterImageP img(outputRaster->clone()); diff --git a/toonz/sources/toonzlib/studiopalettecmd.cpp b/toonz/sources/toonzlib/studiopalettecmd.cpp index 31d119c..232b675 100644 --- a/toonz/sources/toonzlib/studiopalettecmd.cpp +++ b/toonz/sources/toonzlib/studiopalettecmd.cpp @@ -129,7 +129,9 @@ public: StudioPalette::instance()->setPalette(m_palettePath, m_palette->clone(), true); } - void redo() const override { StudioPalette::instance()->deletePalette(m_palettePath); } + void redo() const override { + StudioPalette::instance()->deletePalette(m_palettePath); + } int getSize() const override { return sizeof(*this) + sizeof(TPalette); } QString getHistoryString() override { return QObject::tr("Delete Studio Palette : %1") @@ -150,7 +152,9 @@ public: m_palette = StudioPalette::instance()->getPalette(m_palettePath); } - void undo() const override { StudioPalette::instance()->deletePalette(m_palettePath); } + void undo() const override { + StudioPalette::instance()->deletePalette(m_palettePath); + } void redo() const override { StudioPalette::instance()->setPalette(m_palettePath, m_palette->clone(), true); @@ -197,7 +201,9 @@ public: path.getWideName()); } } - void redo() const override { StudioPalette::instance()->deleteFolder(m_path); } + void redo() const override { + StudioPalette::instance()->deleteFolder(m_path); + } int getSize() const override { return sizeof(*this) + sizeof(TPalette); } QString getHistoryString() override { return QObject::tr("Delete Studio Palette Folder : %1") @@ -215,7 +221,9 @@ class CreateFolderUndo : public TUndo { public: CreateFolderUndo(const TFilePath &folderPath) : m_folderPath(folderPath) {} - void undo() const override { StudioPalette::instance()->deleteFolder(m_folderPath); } + void undo() const override { + StudioPalette::instance()->deleteFolder(m_folderPath); + } void redo() const override { StudioPalette::instance()->createFolder(m_folderPath.getParentDir(), m_folderPath.getWideName()); diff --git a/toonz/sources/toonzlib/tcenterlineskeletonizer.cpp b/toonz/sources/toonzlib/tcenterlineskeletonizer.cpp index 21d3b9b..4b06e4a 100644 --- a/toonz/sources/toonzlib/tcenterlineskeletonizer.cpp +++ b/toonz/sources/toonzlib/tcenterlineskeletonizer.cpp @@ -3,9 +3,9 @@ #include "tcenterlinevectP.h" //#define _SSDEBUG // Uncomment to -//enable the debug viewer +// enable the debug viewer //#define _UPDATE // Shows borders -//updated to current time +// updated to current time //==================================================== @@ -144,7 +144,7 @@ public: edge, //!< An edge shrinks to 0 length. vertex, //!< Two contour nodes clash. split_regenerate, //!< Placeholder type for split events that must be - //!regenerated. + //! regenerated. split, //!< An edge is split by a clashing contour node. failure }; @@ -365,7 +365,7 @@ inline void VectorizationContext::prepareGlobals() { // On the n+k-3(k-m+2) nodes remaining for pure edge events, as many // non-original nodes are inserted. //=> This yields 2k + n-2k+3m-6= n+3m-6 non-original nodes. Contemporaneous - //events such as + // events such as // vertex and special events can only decrease the number of non-original // nodes requested. diff --git a/toonz/sources/toonzlib/tcenterlinevectP.h b/toonz/sources/toonzlib/tcenterlinevectP.h index 7fe848c..eda5f7c 100644 --- a/toonz/sources/toonzlib/tcenterlinevectP.h +++ b/toonz/sources/toonzlib/tcenterlinevectP.h @@ -291,9 +291,9 @@ public: m_updateTime, //!< \a Algoritmic time in which the node was updated. m_ancestor, //!< Index of the original node from which this one evolved. m_ancestorContour; //!< Contour index of the original node from which - //!this one evolved. + //! this one evolved. std::vector m_notOpposites; //!< List of edges \a not to be - //!used as possible opposites. + //! used as possible opposites. int m_outputNode; //!< Skeleton node produced by this ContourNode. // Connective data diff --git a/toonz/sources/toonzlib/tcenterlinevectorizerOld.cpp b/toonz/sources/toonzlib/tcenterlinevectorizerOld.cpp index c1fe1a9..9387d02 100644 --- a/toonz/sources/toonzlib/tcenterlinevectorizerOld.cpp +++ b/toonz/sources/toonzlib/tcenterlinevectorizerOld.cpp @@ -1158,7 +1158,7 @@ void CenterLineVectorizer::traceLine(DataPixel *pix) { TPointD p1; if (na1->m_junction && nb1->m_junction) { // assert(na1->m_junction == - //nb1->m_junction); + // nb1->m_junction); } else { if (na1->m_junction) { p1 = convert(nb1->m_pixel->m_pos); @@ -1559,8 +1559,8 @@ Junction *CenterLineVectorizer::mergeJunctions( } } else { // if( - //isContained(it_junction->m_junction->m_center, newJunction->m_nodes) ) - //continue; + // isContained(it_junction->m_junction->m_center, newJunction->m_nodes) ) + // continue; /* if( it_junction->m_junction->m_nodes.size() < 3) { @@ -1571,7 +1571,8 @@ Junction *CenterLineVectorizer::mergeJunctions( it_protoStroke!=it_junction->m_junction->m_protoStrokes.end(); ++it_protoStroke) { - if( (*it_protoStroke)->m_startJunction == newJunction + if( (*it_protoStroke)->m_startJunction == + newJunction || (*it_protoStroke)->m_endJunction == newJunction ) { @@ -1691,7 +1692,7 @@ void CenterLineVectorizer::joinJunctions() { joinJunctions.push_back(JunctionMerge(currJunction)); // std::sort(currJunction->m_nodes.begin(), - //currJunction->m_nodes.end()); + // currJunction->m_nodes.end()); std::deque::iterator it; for (it = currJunction->m_nodes.begin(); it != currJunction->m_nodes.end(); it++) { @@ -1767,13 +1768,13 @@ junctionMaxDist ) // erase duplicate junctions // joinJunctions.sort(); // std::sort(joinJunctions.begin(), - //joinJunctions.end()); + // joinJunctions.end()); // std::list::iterator it_newEnd; // it_newEnd = std::unique(joinJunctions.begin(), - //joinJunctions.end()); + // joinJunctions.end()); // assert(it_newEnd == joinJunctions.end()); // joinJunctions.erase(it_newEnd, - //joinJunctions.end()); + // joinJunctions.end()); Junction *newJunction = mergeJunctions(joinJunctions); assert(newJunction); @@ -1851,9 +1852,9 @@ link.m_first) ) == m_links.end() ) void CenterLineVectorizer::createJunctionPolygon(Junction *junction) { // int size = junction->m_nodes.size(); // std::sort(junction->m_nodes.begin(), junction->m_nodes.end(), - //CompareJunctionNodes(junction->m_center)); + // CompareJunctionNodes(junction->m_center)); // std::reverse(junction->m_nodes.begin(), junction->m_nodes.end()); - //std::deque::iterator it, it_temp; + // std::deque::iterator it, it_temp; std::deque::iterator it, it_temp; for (it = junction->m_nodes.begin(); it != junction->m_nodes.end(); it++) { int step = 0; @@ -1920,17 +1921,19 @@ currNode); } else { // assert(*(it+1) == otherNode || (it+1 == - //junction->m_nodes.end() && *junction->m_nodes.begin() == otherNode) ); + // junction->m_nodes.end() && *junction->m_nodes.begin() == otherNode) + // ); if (currNode != otherNode) { Node tempNode = *otherNode; *otherNode = *currNode; *currNode = tempNode; - // it_temp = std::find(junction->m_nodes.begin(), - //junction->m_nodes.end(), currNode); + // it_temp = + //std::find(junction->m_nodes.begin(), + // junction->m_nodes.end(), currNode); // assert(it_temp != - //junction->m_nodes.end()); + // junction->m_nodes.end()); // if(it+1 == - //junction->m_nodes.end()) + // junction->m_nodes.end()) // std::swap(*junction->m_nodes.begin(), //*it_temp); // else @@ -2630,10 +2633,10 @@ void OutlineVectorizer::createOutlineStrokes() { stroke->setSelfLoop(); m_vimage->addStroke(stroke); // TStroke *stroke = TStroke::interpolate(points, - //m_configuration.interpolationError); + // m_configuration.interpolationError); // stroke->setStyle(strokeStyleId); // m_vimage->addStroke(stroke);//, - //TPalette::DefaultStrokeStyle, TPalette::DefaultFillStyle); + // TPalette::DefaultStrokeStyle, TPalette::DefaultFillStyle); // internalPoints.push_back(internalPoint); // m_vimage->fill(externalPoint, TPalette::DefaultFillStyle); } diff --git a/toonz/sources/toonzlib/tcleanupper.cpp b/toonz/sources/toonzlib/tcleanupper.cpp index 2dbbfd2..7647548 100644 --- a/toonz/sources/toonzlib/tcleanupper.cpp +++ b/toonz/sources/toonzlib/tcleanupper.cpp @@ -174,9 +174,9 @@ struct TargetColorData { int m_idx; //!< Palette color index HSVColor m_hsv; //!< HSV coordinates of the color double m_saturationLower; //!< Pixel colors associated with this color must - //!be above this + //! be above this double m_hueLower, m_hueUpper; //!< Pixel colors associated with this color - //!must in this range + //! must in this range public: TargetColorData(const TargetColor &color) @@ -1122,7 +1122,7 @@ void TCleanupper::preprocessColors(const TRasterCM32P &outRas, 255) // sometimes the resampling produces semitransparent pixels // on the border of the raster; I discards those pixels. //(which otherwise creates a black border in the final cleanupped image) - //vinz + // vinz *outPix = TPixelCM32(); else preprocessColor(*pix, blackData, pencilsHSV, pencilsHSV.size(), diff --git a/toonz/sources/toonzlib/tstageobjectcmd.cpp b/toonz/sources/toonzlib/tstageobjectcmd.cpp index 3aa2a2f..a1e8f52 100644 --- a/toonz/sources/toonzlib/tstageobjectcmd.cpp +++ b/toonz/sources/toonzlib/tstageobjectcmd.cpp @@ -283,7 +283,9 @@ public: pegbar->setSpline(m_spline); m_xshHandle->notifyXsheetChanged(); } - int getSize() const override { return sizeof *this + sizeof(TStageObjectSpline); } + int getSize() const override { + return sizeof *this + sizeof(TStageObjectSpline); + } QString getHistoryString() override { return QObject::tr("New Motion Path %1") @@ -324,7 +326,9 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const override { return sizeof *this + sizeof(TStageObjectSpline); } + int getSize() const override { + return sizeof *this + sizeof(TStageObjectSpline); + } QString getHistoryString() override { return QObject::tr("Link Motion Path %1 > %2") @@ -378,7 +382,9 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const override { return sizeof *this + sizeof(TStageObjectSpline); } + int getSize() const override { + return sizeof *this + sizeof(TStageObjectSpline); + } }; //=================================================================== @@ -1107,7 +1113,8 @@ public: : SetAttributeUndo( id, xshHandle, ParentIdAndHandle(oldParentId, oldParentHandle), ParentIdAndHandle(newParentId, newParentHandle)) {} - void setAttribute(TStageObject *pegbar, ParentIdAndHandle parent) const override { + void setAttribute(TStageObject *pegbar, + ParentIdAndHandle parent) const override { pegbar->setParent(parent.first); pegbar->setParentHandle(parent.second); } diff --git a/toonz/sources/toonzlib/txshcolumn.cpp b/toonz/sources/toonzlib/txshcolumn.cpp index 2ed3119..e1f2890 100644 --- a/toonz/sources/toonzlib/txshcolumn.cpp +++ b/toonz/sources/toonzlib/txshcolumn.cpp @@ -237,7 +237,7 @@ bool TXshCellColumn::setCells(int row, int rowCount, const TXshCell cells[]) { if (row > c_rb) // sono oltre l'ultima riga { if (oldCellCount == 0) m_first = row; // row 'e la nuova firstrow - int newCellCount = row - m_first + rowCount; + int newCellCount = row - m_first + rowCount; m_cells.resize(newCellCount); } else if (row < m_first) { int delta = m_first - row; diff --git a/toonz/sources/toonzlib/txsheet.cpp b/toonz/sources/toonzlib/txsheet.cpp index eefe013..114ed3e 100644 --- a/toonz/sources/toonzlib/txsheet.cpp +++ b/toonz/sources/toonzlib/txsheet.cpp @@ -808,7 +808,7 @@ void TXsheet::eachCells(int r0, int c0, int r1, int c1, int type) { for (i = r0, k = 0; i < r0 + newRows && k < size; i++) for (j = c0; j <= c1; j++) { //----110523 iwasawa - //Eachでできた空きセルに、操作前のセルの中身が残ってしまう不具合を修正 + // Eachでできた空きセルに、操作前のセルの中身が残ってしまう不具合を修正 if (cells[k].isEmpty()) clearCells(i, j); else diff --git a/toonz/sources/toonzlib/txsheetexpr.cpp b/toonz/sources/toonzlib/txsheetexpr.cpp index 592e46a..c3e5661 100644 --- a/toonz/sources/toonzlib/txsheetexpr.cpp +++ b/toonz/sources/toonzlib/txsheetexpr.cpp @@ -219,7 +219,8 @@ public: return TStageObject::T_ChannelCount; } - bool expressionExpected(const std::vector &previousTokens) const override { + bool expressionExpected( + const std::vector &previousTokens) const override { return previousTokens.size() == 4; } bool matchToken(const std::vector &previousTokens, @@ -253,7 +254,8 @@ public: return TSyntax::Operator; } - void getAcceptableKeywords(std::vector &keywords) const override { + void getAcceptableKeywords( + std::vector &keywords) const override { const std::string ks[] = {"table", "tab", "col", "cam", "camera", "peg", "pegbar"}; for (int i = 0; i < tArrayCount(ks); i++) keywords.push_back(ks[i]); @@ -332,7 +334,8 @@ public: return 0; } std::string getFirstKeyword() const override { return "fx"; } - bool expressionExpected(const std::vector &previousTokens) const override { + bool expressionExpected( + const std::vector &previousTokens) const override { return !previousTokens.empty() && previousTokens.back().getText() == "("; } bool matchToken(const std::vector &previousTokens, @@ -452,7 +455,8 @@ public: std::string getFirstKeyword() const override { return "vertex"; } - bool expressionExpected(const std::vector &previousTokens) const override { + bool expressionExpected( + const std::vector &previousTokens) const override { return (previousTokens.size() == EXPR); } diff --git a/toonz/sources/toonzlib/txshsimplelevel.cpp b/toonz/sources/toonzlib/txshsimplelevel.cpp index 1d73bb0..490450e 100644 --- a/toonz/sources/toonzlib/txshsimplelevel.cpp +++ b/toonz/sources/toonzlib/txshsimplelevel.cpp @@ -76,7 +76,7 @@ CompatibilityStruct compatibility = { // Note: this mask is currently not used. 0x000E // forbidden mask: loaded levels MUST NOT have a mask with these // bits set - // + // }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonzqt/colorfield.cpp b/toonz/sources/toonzqt/colorfield.cpp index 182984b..b35a391 100644 --- a/toonz/sources/toonzqt/colorfield.cpp +++ b/toonz/sources/toonzqt/colorfield.cpp @@ -293,7 +293,7 @@ void ChannelField::onSliderReleased() { ColorField::ColorFieldEditorController *ColorField::m_editorController = 0; // new -//ColorField::ColorFieldEditorController(); +// ColorField::ColorFieldEditorController(); //============================================================================= /*! \class DVGui::ColorField diff --git a/toonz/sources/toonzqt/docklayout.cpp b/toonz/sources/toonzqt/docklayout.cpp index ef1c61a..d505ece 100644 --- a/toonz/sources/toonzqt/docklayout.cpp +++ b/toonz/sources/toonzqt/docklayout.cpp @@ -806,7 +806,7 @@ inline void Region::removeItem(DockWidget *item) { //! Undocks \b item and updates geometry. //!\b NOTE: Window flags are resetted to floating appearance (thus hiding the -//!widget). Since the geometry +//! widget). Since the geometry //! reference changes a geometry() update may be needed - so item's show() is //! not forced here. You should //! eventually remember to call it manually after this. diff --git a/toonz/sources/toonzqt/docklayout.h b/toonz/sources/toonzqt/docklayout.h index e15402d..acb3270 100644 --- a/toonz/sources/toonzqt/docklayout.h +++ b/toonz/sources/toonzqt/docklayout.h @@ -323,8 +323,8 @@ protected: class DockSeparator : public QWidget { friend class DockLayout; // Layout updates each DockSeparator during // DockLayout::applyGeometry() - friend class Region; // Region may update a DockSeparator's parent during - // removeItem() + friend class Region; // Region may update a DockSeparator's parent during + // removeItem() DockLayout *m_owner; @@ -471,8 +471,8 @@ private: */ class Region { - friend class DockLayout; // Layout is the main operating class over - // rectangular regions - need full access + friend class DockLayout; // Layout is the main operating class over + // rectangular regions - need full access friend class DockSeparator; // Separators need access to extremal sizes // methods when moving themselves diff --git a/toonz/sources/toonzqt/dockwidget.cpp b/toonz/sources/toonzqt/dockwidget.cpp index b8f1e03..74510c9 100644 --- a/toonz/sources/toonzqt/dockwidget.cpp +++ b/toonz/sources/toonzqt/dockwidget.cpp @@ -259,7 +259,7 @@ void DockWidget::mousePressEvent(QMouseEvent *me) { // this ensures // that mouse cursor changes are always consistent with resize events. - m_resizing = true; + m_resizing = true; m_dragMouseInitialPos = me->globalPos(); // Re-used as old position } else if (isDragGrip(me->pos())) { // Dragging begins @@ -411,7 +411,7 @@ void DockWidget::wheelEvent(QWheelEvent *we) { //! Convenience function combining parentLayout() and containerOf(\b point). //!\b NOTE: Observe that, in any case, the use of QEnterEvents is discouraged -//!for this purpose: +//! for this purpose: //! remember that we forcedly remain within its boundaries when dragging a dock //! widget; //! instead, we are rather interested about entering the dock widgets *below*. @@ -525,7 +525,7 @@ inline void DockPlaceholder::buildGeometry() { DockLayout *layout = m_owner->parentLayout(); QRect mainRect = layout->contentsRect(); int sepWidth = layout->spacing(); - int margin = 6; // layout->margin(); //Purtroppo questa info e' assegnata + int margin = 6; // layout->margin(); //Purtroppo questa info e' assegnata // prima delle Room... if (isRoot()) { diff --git a/toonz/sources/toonzqt/expressionfield.cpp b/toonz/sources/toonzqt/expressionfield.cpp index bb9c590..b60141f 100644 --- a/toonz/sources/toonzqt/expressionfield.cpp +++ b/toonz/sources/toonzqt/expressionfield.cpp @@ -116,7 +116,8 @@ public: } void showEvent(QShowEvent *) override { showToolTip(currentIndex()); } void hideEvent(QHideEvent *) override { m_tooltip->hide(); } - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override { + void currentChanged(const QModelIndex ¤t, + const QModelIndex &previous) override { showToolTip(current); QListView::currentChanged(current, previous); } diff --git a/toonz/sources/toonzqt/functionsheet.cpp b/toonz/sources/toonzqt/functionsheet.cpp index b49917a..94634e6 100644 --- a/toonz/sources/toonzqt/functionsheet.cpp +++ b/toonz/sources/toonzqt/functionsheet.cpp @@ -36,7 +36,7 @@ const int cGroupShortNameY = 0; //!< Column header's y pos for channel groups' short name tabs const int cGroupLongNameY = 27; //!< Same for its long name tabs const int cChannelNameY = 50; //!< Column header's y pos of channel name tabs, - //!up to the widget's height + //! up to the widget's height const int cColHeadersEndY = 87; //!< End of column headers y pos } // namespace diff --git a/toonz/sources/toonzqt/functiontreeviewer.cpp b/toonz/sources/toonzqt/functiontreeviewer.cpp index 8e6ca66..68a9e02 100644 --- a/toonz/sources/toonzqt/functiontreeviewer.cpp +++ b/toonz/sources/toonzqt/functiontreeviewer.cpp @@ -100,7 +100,9 @@ public: , m_stageObjectGroup(stageGroup) , m_vxName(vxName) {} - QString getShortName() const override { return m_stageObjectGroup->getShortName(); } + QString getShortName() const override { + return m_stageObjectGroup->getShortName(); + } QString getLongName() const override { return *m_vxName; } void *getInternalPointer() const override { return (void *)m_vxName; } diff --git a/toonz/sources/toonzqt/fxschematicnode.cpp b/toonz/sources/toonzqt/fxschematicnode.cpp index 2f6fd73..d253ee8 100644 --- a/toonz/sources/toonzqt/fxschematicnode.cpp +++ b/toonz/sources/toonzqt/fxschematicnode.cpp @@ -2890,7 +2890,7 @@ FxSchematicColumnNode::FxSchematicColumnNode(FxSchematicScene *scene, m_resizeItem = new SchematicThumbnailToggle( this, fx->getAttributes()->isOpened()); //サムネイル矢印 m_nameItem = new SchematicName(this, 54, 20); //リネーム部分 - m_outDock = new FxSchematicDock(this, "", 0, eFxOutputPort); // Outポート + m_outDock = new FxSchematicDock(this, "", 0, eFxOutputPort); // Outポート m_renderToggle = new SchematicToggle(this, QPixmap(":Resources/schematic_prev_eye.png"), SchematicToggle::eIsParentColumn, m_isLargeScaled); diff --git a/toonz/sources/toonzqt/plugin_param_traits.h b/toonz/sources/toonzqt/plugin_param_traits.h index d5eaea4..beb1387 100644 --- a/toonz/sources/toonzqt/plugin_param_traits.h +++ b/toonz/sources/toonzqt/plugin_param_traits.h @@ -652,9 +652,8 @@ inline bool param_read_value_(TParam *p, std::size_t len = str.length() + 1; /* get_type() の返す大きさも文字列長+1 を含んでいる */ if (isize < len) - len = - isize; /* 要求サイズが実際の長さより短くても良いが切り詰める(ただし 1 - 以上であること) */ + len = isize; /* 要求サイズが実際の長さより短くても良いが切り詰める(ただし 1 + 以上であること) */ if (len > 0) { auto dst = reinterpret_cast(ptr); diff --git a/toonz/sources/toonzqt/pluginhost.cpp b/toonz/sources/toonzqt/pluginhost.cpp index 3cf7934..42215da 100644 --- a/toonz/sources/toonzqt/pluginhost.cpp +++ b/toonz/sources/toonzqt/pluginhost.cpp @@ -121,7 +121,9 @@ public: delete fx; } - TThread::Message *clone() const override { return new PluginSetupMessage(*this); } + TThread::Message *clone() const override { + return new PluginSetupMessage(*this); + } }; PluginInformation::~PluginInformation() { diff --git a/toonz/sources/toonzqt/pluginhost.h b/toonz/sources/toonzqt/pluginhost.h index 0c551b7..e0fe77d 100644 --- a/toonz/sources/toonzqt/pluginhost.h +++ b/toonz/sources/toonzqt/pluginhost.h @@ -170,8 +170,10 @@ public: const TPersistDeclaration *getDeclaration() const override; std::string getPluginId() const override; - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; + bool doGetBBox(double frame, TRectD &bbox, + const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, + const TRenderSettings &info) override; int getMemoryRequirement(const TRectD &rect, double frame, const TRenderSettings &info) override; bool canHandle(const TRenderSettings &info, double frame) override; @@ -201,8 +203,10 @@ public: bool isZerary() const override { return isPluginZerary(); }; void callStartRenderHandler() override; void callEndRenderHandler() override; - void callStartRenderFrameHandler(const TRenderSettings *rs, double frame) override; - void callEndRenderFrameHandler(const TRenderSettings *rs, double frame) override; + void callStartRenderFrameHandler(const TRenderSettings *rs, + double frame) override; + void callEndRenderFrameHandler(const TRenderSettings *rs, + double frame) override; void *getUserData(); void setUserData(void *user_data); diff --git a/toonz/sources/toonzqt/scriptconsole.cpp b/toonz/sources/toonzqt/scriptconsole.cpp index a778e7e..7a44d52 100644 --- a/toonz/sources/toonzqt/scriptconsole.cpp +++ b/toonz/sources/toonzqt/scriptconsole.cpp @@ -9,7 +9,6 @@ ScriptConsole::ScriptConsole(QWidget *parent) : QTextEdit(parent), m_commandIndex(0) { - setObjectName("ScriptConsole"); m_prompt = ">> "; diff --git a/toonz/sources/toonzqt/spreadsheetviewer.cpp b/toonz/sources/toonzqt/spreadsheetviewer.cpp index 345f45e..b99a83f 100644 --- a/toonz/sources/toonzqt/spreadsheetviewer.cpp +++ b/toonz/sources/toonzqt/spreadsheetviewer.cpp @@ -698,13 +698,13 @@ void SpreadsheetViewer::wheelEvent(QWheelEvent *event) { default: // Qt::MouseEventSynthesizedByQt, // Qt::MouseEventSynthesizedByApplication - { - std::cout << "not supported wheelEvent.source(): " - "Qt::MouseEventSynthesizedByQt, " - "Qt::MouseEventSynthesizedByApplication" - << std::endl; - break; - } + { + std::cout << "not supported wheelEvent.source(): " + "Qt::MouseEventSynthesizedByQt, " + "Qt::MouseEventSynthesizedByApplication" + << std::endl; + break; + } } // end switch } diff --git a/toonz/sources/toonzqt/stageobjectselection.cpp b/toonz/sources/toonzqt/stageobjectselection.cpp index b286139..2a30315 100644 --- a/toonz/sources/toonzqt/stageobjectselection.cpp +++ b/toonz/sources/toonzqt/stageobjectselection.cpp @@ -92,7 +92,9 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const override { return sizeof(*this) + sizeof(StageObjectsData); } + int getSize() const override { + return sizeof(*this) + sizeof(StageObjectsData); + } QString getHistoryString() override { QString str = QObject::tr("Paste Object "); diff --git a/toonz/sources/toonzqt/styleeditor.cpp b/toonz/sources/toonzqt/styleeditor.cpp index 7ce1d68..809a6d6 100644 --- a/toonz/sources/toonzqt/styleeditor.cpp +++ b/toonz/sources/toonzqt/styleeditor.cpp @@ -115,7 +115,9 @@ public: } // imprecise - depends on the style - int getSize() const override { return sizeof(*this) + 2 * sizeof(TColorStyle *); } + int getSize() const override { + return sizeof(*this) + 2 * sizeof(TColorStyle *); + } QString getHistoryString() override { return QObject::tr( @@ -1877,7 +1879,9 @@ else return false; } */ - int getChipCount() const override { return styleManager()->getPatternCount(); } + int getChipCount() const override { + return styleManager()->getPatternCount(); + } void drawChip(QPainter &p, QRect rect, int index) override { assert(0 <= index && index < getChipCount()); @@ -1959,7 +1963,9 @@ public: } bool loadIfNeeded() override { return false; } - int getChipCount() const override { return styleManager()->getPatternCount() + 1; } + int getChipCount() const override { + return styleManager()->getPatternCount() + 1; + } void drawChip(QPainter &p, QRect rect, int index) override; void onSelect(int index) override; diff --git a/toonz/sources/toonzqt/styleselection.cpp b/toonz/sources/toonzqt/styleselection.cpp index 8f0fada..d029f13 100644 --- a/toonz/sources/toonzqt/styleselection.cpp +++ b/toonz/sources/toonzqt/styleselection.cpp @@ -948,7 +948,8 @@ public: pastedStyle->setGlobalName(dstGlobalName); pastedStyle->setOriginalName(L""); pastedStyle->setIsEditedFlag(false); - } else // dstStyle == LINKEDSTYLE //9. From linked to linked. + } else // dstStyle == LINKEDSTYLE //9. From linked to + // linked. // Do nothing (bring all information from the original). { } @@ -1122,7 +1123,8 @@ void TStyleSelection::pasteStylesValues(bool pasteName, bool pasteColor) { pastedStyle->setGlobalName(dstGlobalName); pastedStyle->setOriginalName(L""); pastedStyle->setIsEditedFlag(false); - } else // dstStyle == LINKEDSTYLE //9. From linked to linked. + } else // dstStyle == LINKEDSTYLE //9. From linked to + // linked. // Do nothing (bring all information from the original). { } diff --git a/toonz/sources/toonzqt/tmessageviewer.cpp b/toonz/sources/toonzqt/tmessageviewer.cpp index 53361d7..1e7bbb9 100644 --- a/toonz/sources/toonzqt/tmessageviewer.cpp +++ b/toonz/sources/toonzqt/tmessageviewer.cpp @@ -37,7 +37,8 @@ class MySortFilterProxyModel : public QSortFilterProxyModel { public: MySortFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {} - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override { + bool filterAcceptsRow(int sourceRow, + const QModelIndex &sourceParent) const override { TMessageViewer *v = dynamic_cast(parent()); assert(v); diff --git a/toonz/sources/toonzqt/tonecurvefield.cpp b/toonz/sources/toonzqt/tonecurvefield.cpp index 84ae095..5c93fa5 100644 --- a/toonz/sources/toonzqt/tonecurvefield.cpp +++ b/toonz/sources/toonzqt/tonecurvefield.cpp @@ -353,8 +353,9 @@ void ChennelCurveEditor::moveCentralControlPoint(int index, double precDistance = (p.x() + d.x()) - precP.x(); // Caso particolare: Punto di controllo corrente == primo visibile, - // Punto di controllo successivo == l'ultimo - //visibile + // Punto di controllo successivo == + //l'ultimo + // visibile if (index == 3 && index + 3 == pointCount - 4) { setPoint(index + 1, getNewFirstHandlePoint(p, nextP, m_points.at(index + 1))); @@ -363,8 +364,9 @@ void ChennelCurveEditor::moveCentralControlPoint(int index, if (nextDistance < 0) d = QPointF(nextP.x() - p.x(), d.y()); } // Caso particolare: Punto di controllo corrente == ultimo visibile, - // Punto di controllo precedente == primo - //visibile + // Punto di controllo precedente == + //primo + // visibile else if (index - 3 == 3 && index == pointCount - 4) { setPoint(index - 2, getNewFirstHandlePoint(precP, p, m_points.at(index - 2)));