feat: update code in src/examples and src/ui

friction2d · Jan 17, 2025 · 9555b8e · 9555b8e
1 parent 4105e3a
commit 9555b8e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/examples/rasterEffects/eShadow/eshadow.cpp b/src/examples/rasterEffects/eShadow/eshadow.cpp
@@ -71,14 +71,14 @@ eShadow::eShadow() :
     mBlurRadius = enve::make_shared<QrealAnimator>("blur radius");
     mOpacity = enve::make_shared<QrealAnimator>("opacity");
     mColor = enve::make_shared<ColorAnimator>();
-    mTranslation = enve::make_shared<QPointFAnimator>("translation");
+    mTranslation = enve::make_shared<QVector3DAnimator>("translation");
 
     mBlurRadius->setValueRange(0, 300);
     mBlurRadius->setCurrentBaseValue(10);
     ca_addChild(mBlurRadius);
 
     mTranslation->setValuesRange(-1000, 1000);
-    mTranslation->setBaseValue(QPointF(0, 0));
+    mTranslation->setBaseValue(QVector3D(0, 0, 0));
     ca_addChild(mTranslation);
 
     mColor->setColor(Qt::black);

diff --git a/src/examples/rasterEffects/eShadow/eshadow.h b/src/examples/rasterEffects/eShadow/eshadow.h
@@ -29,7 +29,7 @@
 #include "eshadow_global.h"
 #include "enveCore/skia/skqtconversions.h"
 #include "enveCore/Animators/coloranimator.h"
-#include "enveCore/Animators/qpointfanimator.h"
+#include "enveCore/Animators/qvector3danimator.h"
 #include "enveCore/gpurendertools.h"
 
 class eShadowCaller : public RasterEffectCaller {
@@ -73,7 +73,7 @@ class eShadow : public CustomRasterEffect {
     qsptr<QrealAnimator> mBlurRadius;
     qsptr<QrealAnimator> mOpacity;
     qsptr<ColorAnimator> mColor;
-    qsptr<QPointFAnimator> mTranslation;
+    qsptr<QVector3DAnimator> mTranslation;
 };
 
 #endif // ESHADOW_H
diff --git a/src/examples/rasterEffects/oil/oileffect.cpp b/src/examples/rasterEffects/oil/oileffect.cpp
@@ -16,9 +16,9 @@
 OilEffect::OilEffect() :
     RasterEffect("oil painting", HardwareSupport::cpuPreffered,
                  true, RasterEffectType::OIL) {
-    mBrushSize = enve::make_shared<QPointFAnimator>(
-        QPointF{16., 64.}, QPointF{4., 4.},
-        QPointF{999.999, 999.999}, QPointF{1., 1.},
+    mBrushSize = enve::make_shared<QVector3DAnimator>(
+        QVector3D{16., 64., 0.}, QVector3D{4., 4., 4.},
+        QVector3D{999.999, 999.999, 999.999}, QVector3D{1., 1., 1.},
         "min", "max", "brush size");
     ca_addChild(mBrushSize);
     connect(mBrushSize->getYAnimator(),

diff --git a/src/examples/rasterEffects/oil/oileffect.h b/src/examples/rasterEffects/oil/oileffect.h
@@ -3,7 +3,7 @@
 
 #include "rastereffect.h"
 
-#include "Animators/qpointfanimator.h"
+#include "Animators/qvector3danimator.h"
 
 class CORE_EXPORT OilEffect : public RasterEffect {
     e_OBJECT
@@ -18,7 +18,7 @@ class CORE_EXPORT OilEffect : public RasterEffect {
             const qreal relFrame, const qreal resolution,
             const qreal influence, BoxRenderData* const data) const;
 private:
-    qsptr<QPointFAnimator> mBrushSize;
+    qsptr<QVector3DAnimator> mBrushSize;
     qsptr<QrealAnimator> mAccuracy;
     qsptr<QrealAnimator> mStrokeLength;
     qsptr<QrealAnimator> mMaxStrokes;

diff --git a/src/ui/widgets/qrealanimatorvalueslider.cpp b/src/ui/widgets/qrealanimatorvalueslider.cpp
@@ -24,7 +24,7 @@
 // Fork of enve - Copyright (C) 2016-2020 Maurycy Liebner
 
 #include "qrealanimatorvalueslider.h"
-#include "Animators/qpointfanimator.h"
+#include "Animators/qvector3danimator.h"
 #include "themesupport.h"
 #include "canvas.h"
 #include "Private/document.h"
@@ -79,7 +79,7 @@ QrealAnimatorValueSlider::QrealAnimatorValueSlider(QString name,
 QrealAnimator* QrealAnimatorValueSlider::getTransformTargetSibling() {
     if(mTransformTarget) {
         const auto parent = mTransformTarget->getParent();
-        if(const auto qPA = enve_cast<QPointFAnimator*>(parent)) {
+        if(const auto qPA = enve_cast<QVector3DAnimator*>(parent)) {
             const bool thisX = qPA->getXAnimator() == mTransformTarget;
             return thisX ? qPA->getYAnimator() :
                            qPA->getXAnimator();