Build fixes on Windows

friction2d · Aug 2, 2024 · 895bfe1 · 895bfe1
1 parent 185c2d5
commit 895bfe1
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 63 deletions.
diff --git a/src/core/BlendEffects/blendeffectmenucreator.cpp b/src/core/BlendEffects/blendeffectmenucreator.cpp
@@ -0,0 +1,35 @@
+/*
+#
+# Friction - https://friction.graphics
+#
+# Copyright (c) Friction contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# See 'README.md' for more information.
+#
+*/
+
+#include "BlendEffects/blendeffectmenucreator.h"
+
+#include "BlendEffects/moveblendeffect.h"
+#include "BlendEffects/targetedblendeffect.h"
+
+void BlendEffectMenuCreator::forEveryEffect(const EffectAdder &add)
+{
+    add(QObject::tr("Move"),
+        []() { return enve::make_shared<MoveBlendEffect>(); });
+    add(QObject::tr("Targeted"),
+        []() { return enve::make_shared<TargetedBlendEffect>(); });
+}
diff --git a/src/core/BlendEffects/blendeffectmenucreator.h b/src/core/BlendEffects/blendeffectmenucreator.h
@@ -26,10 +26,7 @@
 
 #include "core_global.h"
 
-#include <QString>
 #include <functional>
-#include "BlendEffects/moveblendeffect.h"
-#include "BlendEffects/targetedblendeffect.h"
 #include "smartPointers/selfref.h"
 
 class BlendEffect;
@@ -41,13 +38,7 @@ struct CORE_EXPORT BlendEffectMenuCreator
     using EffectCreator = Creator<BlendEffect>;
     using EffectAdder = Func<void(const QString&,
                                   const EffectCreator&)>;
-    static void forEveryEffect(const EffectAdder& add)
-    {
-        add(QObject::tr("Move"),
-            []() { return enve::make_shared<MoveBlendEffect>(); });
-        add(QObject::tr("Targeted"),
-            []() { return enve::make_shared<TargetedBlendEffect>(); });
-    }
+    static void forEveryEffect(const EffectAdder& add);
 };
 
 #endif // BLENDEFFECTMENUCREATOR_H
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -79,6 +79,7 @@ set(
     BlendEffects/blendeffectcollection.cpp
     BlendEffects/moveblendeffect.cpp
     BlendEffects/targetedblendeffect.cpp
+    BlendEffects/blendeffectmenucreator.cpp
     Boxes/animationbox.cpp
     Boxes/boundingbox.cpp
     Boxes/boxrendercontainer.cpp
@@ -168,6 +169,7 @@ set(
     PathEffects/subpatheffect.cpp
     PathEffects/sumpatheffect.cpp
     PathEffects/zigzagpatheffect.cpp
+    PathEffects/patheffectmenucreator.cpp
     Private/Tasks/complextask.cpp
     Private/Tasks/execcontroller.cpp
     Private/Tasks/gputaskexecutor.cpp
@@ -234,6 +236,7 @@ set(
     TransformEffects/trackeffect.cpp
     TransformEffects/transformeffect.cpp
     TransformEffects/transformeffectcollection.cpp
+    TransformEffects/transformeffectmenucreator.cpp
     XML/xevexporter.cpp
     XML/xevimporter.cpp
     XML/xevzipfilesaver.cpp

diff --git a/src/core/PathEffects/patheffectmenucreator.cpp b/src/core/PathEffects/patheffectmenucreator.cpp
@@ -0,0 +1,59 @@
+/*
+#
+# Friction - https://friction.graphics
+#
+# Copyright (c) Friction contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# See 'README.md' for more information.
+#
+*/
+
+#include "PathEffects/patheffectmenucreator.h"
+
+#include "PathEffects/dashpatheffect.h"
+#include "PathEffects/displacepatheffect.h"
+#include "PathEffects/duplicatepatheffect.h"
+#include "PathEffects/linespatheffect.h"
+#include "PathEffects/solidifypatheffect.h"
+#include "PathEffects/spatialdisplacepatheffect.h"
+#include "PathEffects/subdividepatheffect.h"
+#include "PathEffects/subpatheffect.h"
+#include "PathEffects/sumpatheffect.h"
+#include "PathEffects/zigzagpatheffect.h"
+
+void PathEffectMenuCreator::forEveryEffect(const EffectAdder &add)
+{
+    add(QObject::tr("Displace"),
+        []() { return enve::make_shared<DisplacePathEffect>(); });
+    add(QObject::tr("Spatial Displace"),
+        []() { return enve::make_shared<SpatialDisplacePathEffect>(); });
+    add(QObject::tr("Dash"),
+        []() { return enve::make_shared<DashPathEffect>(); });
+    add(QObject::tr("Duplicate"),
+        []() { return enve::make_shared<DuplicatePathEffect>(); });
+    add(QObject::tr("Sub-Path"),
+        []() { return enve::make_shared<SubPathEffect>(); });
+    add(QObject::tr("Solidify"),
+        []() { return enve::make_shared<SolidifyPathEffect>(); });
+    add(QObject::tr("Sum"),
+        []() { return enve::make_shared<SumPathEffect>(); });
+    add(QObject::tr("Lines"),
+        []() { return enve::make_shared<LinesPathEffect>(); });
+    add(QObject::tr("ZigZag"),
+        []() { return enve::make_shared<ZigZagPathEffect>(); });
+    add(QObject::tr("Subdivide"),
+        []() { return enve::make_shared<SubdividePathEffect>(); });
+}
diff --git a/src/core/PathEffects/patheffectmenucreator.h b/src/core/PathEffects/patheffectmenucreator.h
@@ -26,17 +26,6 @@
 
 #include "core_global.h"
 
-#include <QString>
-#include "PathEffects/dashpatheffect.h"
-#include "PathEffects/displacepatheffect.h"
-#include "PathEffects/duplicatepatheffect.h"
-#include "PathEffects/linespatheffect.h"
-#include "PathEffects/solidifypatheffect.h"
-#include "PathEffects/spatialdisplacepatheffect.h"
-#include "PathEffects/subdividepatheffect.h"
-#include "PathEffects/subpatheffect.h"
-#include "PathEffects/sumpatheffect.h"
-#include "PathEffects/zigzagpatheffect.h"
 #include <functional>
 #include "smartPointers/selfref.h"
 
@@ -49,29 +38,7 @@ struct CORE_EXPORT PathEffectMenuCreator
     using EffectCreator = Creator<PathEffect>;
     using EffectAdder = Func<void(const QString&,
                                   const EffectCreator&)>;
-    static void forEveryEffect(const EffectAdder& add)
-    {
-        add(QObject::tr("Displace"),
-            []() { return enve::make_shared<DisplacePathEffect>(); });
-        add(QObject::tr("Spatial Displace"),
-            []() { return enve::make_shared<SpatialDisplacePathEffect>(); });
-        add(QObject::tr("Dash"),
-            []() { return enve::make_shared<DashPathEffect>(); });
-        add(QObject::tr("Duplicate"),
-            []() { return enve::make_shared<DuplicatePathEffect>(); });
-        add(QObject::tr("Sub-Path"),
-            []() { return enve::make_shared<SubPathEffect>(); });
-        add(QObject::tr("Solidify"),
-            []() { return enve::make_shared<SolidifyPathEffect>(); });
-        add(QObject::tr("Sum"),
-            []() { return enve::make_shared<SumPathEffect>(); });
-        add(QObject::tr("Lines"),
-            []() { return enve::make_shared<LinesPathEffect>(); });
-        add(QObject::tr("ZigZag"),
-            []() { return enve::make_shared<ZigZagPathEffect>(); });
-        add(QObject::tr("Subdivide"),
-            []() { return enve::make_shared<SubdividePathEffect>(); });
-    }
+    static void forEveryEffect(const EffectAdder& add);
 };
 
 #endif // PATHEFFECTMENUCREATOR_H
diff --git a/src/core/TransformEffects/transformeffectmenucreator.cpp b/src/core/TransformEffects/transformeffectmenucreator.cpp
@@ -0,0 +1,44 @@
+/*
+#
+# Friction - https://friction.graphics
+#
+# Copyright (c) Friction contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# See 'README.md' for more information.
+#
+*/
+
+#include "TransformEffects/transformeffectmenucreator.h"
+
+#include "TransformEffects/followobjecteffect.h"
+#include "TransformEffects/followobjectrelativeeffect.h"
+#include "TransformEffects/followpatheffect.h"
+#include "TransformEffects/parenteffect.h"
+#include "TransformEffects/trackeffect.h"
+
+void TransformEffectMenuCreator::forEveryEffect(const EffectAdder &add)
+{
+    add(QObject::tr("Track"),
+        []() { return enve::make_shared<TrackEffect>(); });
+    add(QObject::tr("Follow Path"),
+        []() { return enve::make_shared<FollowPathEffect>(); });
+    add(QObject::tr("Follow Object"),
+        []() { return enve::make_shared<FollowObjectEffect>(); });
+    add(QObject::tr("Follow Object Relative"),
+        []() { return enve::make_shared<FollowObjectRelativeEffect>(); });
+    add(QObject::tr("Parent"),
+        []() { return enve::make_shared<ParentEffect>(); });
+}
diff --git a/src/core/TransformEffects/transformeffectmenucreator.h b/src/core/TransformEffects/transformeffectmenucreator.h
@@ -26,13 +26,7 @@
 
 #include "core_global.h"
 
-#include <QString>
 #include <functional>
-#include "TransformEffects/followobjecteffect.h"
-#include "TransformEffects/followobjectrelativeeffect.h"
-#include "TransformEffects/followpatheffect.h"
-#include "TransformEffects/parenteffect.h"
-#include "TransformEffects/trackeffect.h"
 #include "smartPointers/selfref.h"
 
 class TransformEffect;
@@ -44,19 +38,7 @@ struct CORE_EXPORT TransformEffectMenuCreator
     using EffectCreator = Creator<TransformEffect>;
     using EffectAdder = Func<void(const QString&,
                                   const EffectCreator&)>;
-    static void forEveryEffect(const EffectAdder& add)
-    {
-        add(QObject::tr("Track"),
-            []() { return enve::make_shared<TrackEffect>(); });
-        add(QObject::tr("Follow Path"),
-            []() { return enve::make_shared<FollowPathEffect>(); });
-        add(QObject::tr("Follow Object"),
-            []() { return enve::make_shared<FollowObjectEffect>(); });
-        add(QObject::tr("Follow Object Relative"),
-            []() { return enve::make_shared<FollowObjectRelativeEffect>(); });
-        add(QObject::tr("Parent"),
-            []() { return enve::make_shared<ParentEffect>(); });
-    }
+    static void forEveryEffect(const EffectAdder& add);
 };
 
 #endif // TRANSFORMEFFECTMENUCREATOR_H