[spline] Fix some issues in spline3d and 2d due to exprtk api changes

ossia · Feb 21, 2024 · 2a16ee1 · 2a16ee1
1 parent d66c5df
commit 2a16ee1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 27 deletions.
diff --git a/src/plugins/score-plugin-spline/Spline/GeneratorDialog.hpp b/src/plugins/score-plugin-spline/Spline/GeneratorDialog.hpp
@@ -40,8 +40,8 @@ class GeneratorDialog : public Process::ScriptDialog
     expr.add_constants();
     expr.register_symbol_table();
 
-    setText(R"_(x := cos(2 * PI * t);
-y := sin(2 * PI * t);
+    setText(R"_(x := cos(2 * pi * t);
+y := sin(2 * pi * t);
 )_");
   }
 

diff --git a/src/plugins/score-plugin-spline3d/Spline3D/GeneratorDialog.hpp b/src/plugins/score-plugin-spline3d/Spline3D/GeneratorDialog.hpp
@@ -41,9 +41,9 @@ class GeneratorDialog : public Process::ScriptDialog
     expr.add_constants();
     expr.register_symbol_table();
 
-    setText(R"_(x := cos(2 * PI * t);
-y := sin(2 * PI * t);
-z := sin(7 * PI * t);
+    setText(R"_(x := cos(2 * pi * t);
+y := sin(2 * pi * t);
+z := sin(7 * pi * t);
 )_");
   }
 

diff --git a/src/plugins/score-plugin-spline3d/Spline3D/Metadata.hpp b/src/plugins/score-plugin-spline3d/Spline3D/Metadata.hpp
@@ -16,4 +16,4 @@ PROCESS_METADATA(
     "Automation following a 3D curve", "ossia score",
     (QStringList{"Curve", "Automation", "3D"}), {},
     {std::vector<Process::PortType>{Process::PortType::Message}},
-    Process::ProcessFlags::SupportsTemporal)
+    Process::ProcessFlags::SupportsLasting)
diff --git a/src/plugins/score-plugin-spline3d/Spline3D/Model.cpp b/src/plugins/score-plugin-spline3d/Spline3D/Model.cpp
@@ -60,22 +60,6 @@ QString ProcessModel::prettyName() const noexcept
   return QStringLiteral("Spline 3D");
 }
 
-void ProcessModel::setDurationAndScale(const TimeVal& newDuration) noexcept
-{
-  // We only need to change the duration.
-  setDuration(newDuration);
-}
-
-void ProcessModel::setDurationAndGrow(const TimeVal& newDuration) noexcept
-{
-  setDuration(newDuration);
-}
-
-void ProcessModel::setDurationAndShrink(const TimeVal& newDuration) noexcept
-{
-  setDuration(newDuration);
-}
-
 TimeVal ProcessModel::contentDuration() const noexcept
 {
   return duration();

diff --git a/src/plugins/score-plugin-spline3d/Spline3D/Model.hpp b/src/plugins/score-plugin-spline3d/Spline3D/Model.hpp
@@ -73,11 +73,6 @@ class ProcessModel final : public Process::ProcessModel
   void splineChanged() W_SIGNAL(splineChanged);
 
 private:
-  //// ProcessModel ////
-  void setDurationAndScale(const TimeVal& newDuration) noexcept override;
-  void setDurationAndGrow(const TimeVal& newDuration) noexcept override;
-  void setDurationAndShrink(const TimeVal& newDuration) noexcept override;
-
   TimeVal contentDuration() const noexcept override;
   void loadPreset(const Process::Preset& preset) override;
   Process::Preset savePreset() const noexcept override;