Merge pull request #338 from friction2d/sub-path-effect_offset

Sub path effect offset
friction2d · Nov 22, 2024 · cc994d1 · cc994d1
2 parents d28f819 + 6e81b66
commit cc994d1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/core/Animators/staticcomplexanimator.cpp b/src/core/Animators/staticcomplexanimator.cpp
@@ -39,9 +39,13 @@ void StaticComplexAnimator::prp_readProperty_impl(eReadStream &src)
 {
     const auto& children = ca_getChildren();
     const auto SVGProperties = QStringList() << "begin event" << "end event";
+    const bool isSubPathEffect = prp_getName() == "sub-path effect";
+
     for (const auto& prop : children) {
         if (src.evFileVersion() < EvFormat::svgBeginEnd &&
             SVGProperties.contains(prop->prp_getName())) { continue; }
+        if (src.evFileVersion() < EvFormat::subPathOffset &&
+            isSubPathEffect && prop->prp_getName() == "offset") { continue; }
         prop->prp_readProperty(src);
     }
 }

diff --git a/src/core/PathEffects/subpatheffect.cpp b/src/core/PathEffects/subpatheffect.cpp
@@ -41,9 +41,14 @@ SubPathEffect::SubPathEffect() :
     mMax->setValueRange(-999, 999);
     mMax->setCurrentBaseValue(100);
 
+    mOffset = enve::make_shared<QrealAnimator>("offset");
+    mOffset->setValueRange(-999, 999);
+    mOffset->setCurrentBaseValue(0);
+
     ca_addChild(mPathWise);
     ca_addChild(mMin);
     ca_addChild(mMax);
+    ca_addChild(mOffset);
 }
 
 class SubPathEffectCaller : public PathEffectCaller {
@@ -121,7 +126,9 @@ void SubPathEffectCaller::apply(SkPath &path) {
 stdsptr<PathEffectCaller> SubPathEffect::getEffectCaller(
         const qreal relFrame, const qreal influence) const {
     const bool pathWise = mPathWise->getValue();
-    const qreal minFrac = mMin->getEffectiveValue(relFrame)*0.01*influence;
-    const qreal maxFrac = mMax->getEffectiveValue(relFrame)*0.01*influence + 1 - influence;
+    const qreal offset = mOffset->getEffectiveValue(relFrame);
+    const qreal minFrac = (mMin->getEffectiveValue(relFrame) + offset) * 0.01 * influence;
+    const qreal maxFrac = (mMax->getEffectiveValue(relFrame) + offset) * 0.01 * influence + 1 - influence;
+
     return enve::make_shared<SubPathEffectCaller>(pathWise, minFrac, maxFrac);
 }
diff --git a/src/core/PathEffects/subpatheffect.h b/src/core/PathEffects/subpatheffect.h
@@ -38,6 +38,7 @@ class CORE_EXPORT SubPathEffect : public PathEffect {
     qsptr<BoolProperty> mPathWise;
     qsptr<QrealAnimator> mMin;
     qsptr<QrealAnimator> mMax;
+    qsptr<QrealAnimator> mOffset;
 };
 
 #endif // SUBPATHEFFECT_H
diff --git a/src/core/ReadWrite/evformat.h b/src/core/ReadWrite/evformat.h
@@ -44,6 +44,7 @@ namespace EvFormat {
         svgBeginEnd = 29,
         formatOptions = 30,
         formatOptions2 = 31,
+        subPathOffset = 32,
 
         nextVersion
     };