diff --git a/src/examples/rasterEffects/eShadow/eshadow.cpp b/src/examples/rasterEffects/eShadow/eshadow.cpp index 085e6c7e8..8de0763d0 100755 --- a/src/examples/rasterEffects/eShadow/eshadow.cpp +++ b/src/examples/rasterEffects/eShadow/eshadow.cpp @@ -71,14 +71,14 @@ eShadow::eShadow() : mBlurRadius = enve::make_shared("blur radius"); mOpacity = enve::make_shared("opacity"); mColor = enve::make_shared(); - mTranslation = enve::make_shared("translation"); + mTranslation = enve::make_shared("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 index ac6cdea66..7d4f8d2fe 100755 --- 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 mBlurRadius; qsptr mOpacity; qsptr mColor; - qsptr mTranslation; + qsptr mTranslation; }; #endif // ESHADOW_H diff --git a/src/examples/rasterEffects/oil/oileffect.cpp b/src/examples/rasterEffects/oil/oileffect.cpp index 01714e9e0..7a62ab813 100644 --- 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( - QPointF{16., 64.}, QPointF{4., 4.}, - QPointF{999.999, 999.999}, QPointF{1., 1.}, + mBrushSize = enve::make_shared( + 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 index 96d652ba7..447756958 100644 --- 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 mBrushSize; + qsptr mBrushSize; qsptr mAccuracy; qsptr mStrokeLength; qsptr mMaxStrokes; diff --git a/src/ui/widgets/qrealanimatorvalueslider.cpp b/src/ui/widgets/qrealanimatorvalueslider.cpp index 0c612eac0..cadca5601 100644 --- 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(parent)) { + if(const auto qPA = enve_cast(parent)) { const bool thisX = qPA->getXAnimator() == mTransformTarget; return thisX ? qPA->getYAnimator() : qPA->getXAnimator();