Text animation #1974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

WileECoder wants to merge 29 commits into olive-editor:master from WileECoder:Text-animation

app/node/factory.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,7 @@ @@
     #include "generator/text/textv1.h"
     #include "generator/text/textv2.h"
     #include "generator/text/textv3.h"
+    #include "generator/animation/textanimationnode.h"
     #include "input/multicam/multicamnode.h"
     #include "input/time/timeinput.h"
     #include "input/value/valuenode.h"
@@ Expand Down Expand Up @@
         return new TextGeneratorV2();
       case kTextGeneratorV3:
         return new TextGeneratorV3();
+      case kTextAnimation:
+        return new TextAnimationNode();
       case kCrossDissolveTransition:
         return new CrossDissolveTransition();
       case kDipToColorTransition:
@@ Expand Down @@

app/node/factory.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ class NodeFactory @@
         kTextGeneratorV1,
         kTextGeneratorV2,
         kTextGeneratorV3,
+        kTextAnimation,
         kCrossDissolveTransition,
         kDipToColorTransition,
         kMosaicFilter,
@@ Expand Down @@

app/node/generator/CMakeLists.txt

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ add_subdirectory(polygon) @@
     add_subdirectory(shape)
     add_subdirectory(solid)
     add_subdirectory(text)
+    add_subdirectory(animation)
     set(OLIVE_SOURCES
       ${OLIVE_SOURCES}
@@ Expand Down @@

app/node/generator/animation/CMakeLists.txt

-Original file line number
+Diff line change
@@ -0,0 +1,31 @@
+    # Olive - Non-Linear Video Editor
+    # Copyright (C) 2022 Olive Team
+    #
+    # 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/>.
+    set(OLIVE_SOURCES
+      ${OLIVE_SOURCES}
+      node/generator/animation/textanimation.h
+      node/generator/animation/textanimationengine.cpp
+      node/generator/animation/textanimationengine.h
+      node/generator/animation/textanimationxmlformatter.cpp
+      node/generator/animation/textanimationxmlformatter.h
+      node/generator/animation/textanimationxmlparser.cpp
+      node/generator/animation/textanimationxmlparser.h
+      node/generator/animation/textanimationnode.cpp
+      node/generator/animation/textanimationnode.h
+      node/generator/animation/textanimationrender.cpp
+      node/generator/animation/textanimationrender.h
+      PARENT_SCOPE
+    )

app/node/generator/animation/textanimation.h

-Original file line number
+Diff line change
@@ -0,0 +1,114 @@
+    #ifndef ANIMATION_H
+    #define ANIMATION_H
+    #include <QMap>
+    namespace olive {
+    namespace TextAnimation {
+    /// The feature of the text that is being animated
+    enum Feature{
+      // invalid value
+      None,
+      // vertical offset for each character
+      PositionVertical,
+      // horizontal offset for each character
+      PositionHorizontal,
+      // rotation of each character around its bottom left corner
+      Rotation,
+      // space between letters
+      SpacingFactor,
+      // vertical stretch of each character
+      StretchVertical,
+      // horizontal stretch of each character
+      StretchHorizontal,
+      // opacity in range 0 - 255
+      Transparency
+    };
+    const QMap< Feature, QString> FEATURE_TABLE = {{None, "NONE"},
+                                                   {PositionVertical, "POSITION_VER"},
+                                                   {PositionHorizontal, "POSITION_HOR"},
+                                                   {Rotation, "ROTATION"},
+                                                   {SpacingFactor,  "SPACING"},
+                                                   {StretchVertical, "STRETCH_VER"},
+                                                   {StretchHorizontal, "STRETCH_HOR"},
+                                                   {Transparency, "TRANSPARENCY"},
+                                                  };
+    const QMap< QString, Feature> FEATURE_TABLE_REV = {{"NONE", None},
+                                                       {"POSITION_VER", PositionVertical},
+                                                       {"POSITION_HOR", PositionHorizontal},
+                                                       {"ROTATION", Rotation},
+                                                       {"SPACING", SpacingFactor},
+                                                       {"STRETCH_VER", StretchVertical},
+                                                       {"STRETCH_HOR", StretchHorizontal},
+                                                       {"TRANSPARENCY", Transparency}
+                                                      };
+    /// shape of animation curve
+    enum Curve {
+      Step,
+      Linear,
+      Ease_Sine,
+      Ease_Quad,
+      Ease_Back,
+      Ease_Elastic,
+      Ease_Bounce
+    };
+    const QMap< Curve, QString> CURVE_TABLE = {{Step, "STEP"},
+                                               {Linear, "LINEAR"},
+                                               {Ease_Sine, "EASE_SINE"},
+                                               {Ease_Quad, "EASE_QUAD"},
+                                               {Ease_Back, "EASE_BACK"},
+                                               {Ease_Elastic, "EASE_ELASTIC"},
+                                               {Ease_Bounce, "EASE_BOUNCE"}
+                                              };
+    const QMap< QString, Curve> CURVE_TABLE_REV = { { "STEP", Step},
+                                                    { "LINEAR", Linear },
+                                                    { "EASE_SINE", Ease_Sine },
+                                                    { "EASE_QUAD", Ease_Quad },
+                                                    { "EASE_BACK", Ease_Back },
+                                                    { "EASE_ELASTIC", Ease_Elastic },
+                                                    { "EASE_BOUNCE", Ease_Bounce}
+                                                  };
+    /// full descriptor of an animation
+    struct Descriptor {
+      TextAnimation::Feature feature;
+      // first character to be animated. Use 0 for the first character
+      int character_from;
+      // last character to be animated. Use -1 to indicate the end of the text
+      int character_to;
+      // When true, the animation starts from 'character_to' and ends to 'character_from'
+      bool last_to_first;
+      // When 0 (or negative), the effect is applied to all characetrs.
+      // When 1 or more, 'stride' items are skipped for evry one that is applied.
+      int stride;
+      // range [0,1]. The lower this value, the more all characters start
+      // their animation together
+      double overlap_in;
+      // range [0,1]. The lower this value, the more all characters end
+      // their animation together
+      double overlap_out;
+      TextAnimation::Curve curve;
+      // coefficient that modifies the curve. May or may not have effect for each curve.
+      // Value 1 should always be a good default.
+      double c1;
+      // coefficient that modifies the curve. May or may not have effect for each curve.
+      // Value 1 should always be a good default.
+      double c2;
+      // value of the feature at the begin of the transition
+      double value;
+      // Evolution of the transition in range [0,1]. When 0, the animated value is equal to 'value';
+      // When 1, the animated value is equal to 0.
+      double progress;
+    };
+    }  // TextAnimation
+    }  // olive
+    #endif // ANIMATION_H

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Text animation #1974

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Text animation #1974

Are you sure you want to change the base?

Uh oh!

Text animation #1974

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!