Cleanup Timeline UI and link to keyframes ;

Author: hoshiryu

cmake/filelistGuiBase.cmake

@@ -1,16 +1,11 @@
 set( guibase_sources
     BaseApplication.cpp
     SelectionManager/SelectionManager.cpp
-    Timeline/qdoublespinboxsmart.cpp
-    Timeline/qframebuttons.cpp
-    Timeline/qframeselector.cpp
-    Timeline/qframetimescale.cpp
-    Timeline/qlabelslider.cpp
-    Timeline/qscrollarearuler.cpp
-    Timeline/qspinboxsmart.cpp
-    Timeline/qtoolbuttonplaypause.cpp
-    Timeline/qwidgetruler.cpp
-    Timeline/Session.cpp
+    Timeline/HelpDialog.cpp
+    Timeline/TimelineFrameSelector.cpp
+    Timeline/TimelineTimeScale.cpp
+    Timeline/TimelineSlider.cpp
+    Timeline/TimelineScrollArea.cpp
     Timeline/Timeline.cpp
     TimerData/FrameTimerData.cpp
     TransformEditor/TransformEditor.cpp
@@ -36,17 +31,12 @@ set( guibase_headers
     MainWindowInterface.hpp
     RaGuiBase.hpp
     SelectionManager/SelectionManager.hpp
+    Timeline/HelpDialog.hpp
     Timeline/Configurations.h
-    Timeline/qdoublespinboxsmart.h
-    Timeline/qframebuttons.h
-    Timeline/qframeselector.h
-    Timeline/qframetimescale.h
-    Timeline/qlabelslider.h
-    Timeline/qscrollarearuler.h
-    Timeline/qspinboxsmart.h
-    Timeline/qtoolbuttonplaypause.h
-    Timeline/qwidgetruler.h
-    Timeline/Session.h
+    Timeline/TimelineFrameSelector.h
+    Timeline/TimelineTimeScale.h
+    Timeline/TimelineSlider.h
+    Timeline/TimelineScrollArea.h
     Timeline/Timeline.h
     TimerData/FrameTimerData.hpp
     TransformEditor/TransformEditor.hpp
@@ -73,6 +63,7 @@ set( guibase_inlines
 )
 
 set( guibase_uis
+    Timeline/HelpDialog.ui
     Timeline/Timeline.ui
     )
 

doc/timeline.md

@@ -0,0 +1,206 @@
+# Timeline And Keyframes
+
+The `Ra::GuiBase::Timeline` class provides display and management of `Ra::Core::Animation::KeyFramedValue`s.
+
+`Ra::Core::Animation::KeyFramedValue`s must be registered into the `Ra::GuiBase::Timeline`, which can be done using the
+`Ra::GuiBase::Timeline::registerKeyFramedValue` methods.
+
+We here consider two types of `Ra::Core::Animation::KeyFramedValue`:
+
+## Static KeyFramedValue:
+Those are `Ra::Core::Animation::KeyFramedValue`s that are an explicit part of a `Ra::Engine::Entity`, `Ra::Engine::Component` or
+`Ra::Engine::RenderObject` data, either filled upon construction or through the `Ra::GuiBase::Timeline`.
+Static `Ra::Core::Animation::KeyFramedValue`s must be registered in the `Ra::GuiBase::Timeline` after the object's
+construction.
+They usually are not bound to an *UpdateCallback* function since the object they
+belong to usually calls `Ra::Core::Animation::KeyFramedValue::at` to query the current value.
+
+Example Usage:
+```c++
+using KeyFramedValue = Ra::Core::Animation::KeyFramedValue<Scalar>;
+
+struct MyComponentWithKeyFrame : public Ra::Engine::Component
+{
+   MyComponentWithKeyFrame( const std::string& name, Ra::Engine::Entity* entity, Scalar value = 0_ra )
+       : Ra::Engine::Component( name, entity )
+       , m_keyframes( value, 0_ra )
+       , m_currentValue( value )
+   {
+       // use the linear interpolator instead of the default one
+       m_keyframes.setInterpolator( Ra::Core::Animation::interpolate<Scalar> );
+   }
+
+   void initialize() override {}
+   void goTo( Scalar t ) {
+       // Here we use the value at time t.
+       m_currentValue = m_keyframes.at( t );
+   }
+   void update() {
+       // Here we can update other data that depend on the value.
+       // Note: update is called after goTo, so we can use what was stored in m_currentValue.
+   }
+
+   KeyFramedValue m_keyframes;
+   Scalar m_currentValue;
+};
+
+struct MyTimeDependantSystem : public Ra::Engine::AbstractTimedSystem
+{
+   MyTimeDependantSystem( Ra::GuiBase::Timeline* timeline )
+       : Ra::Engine::AbstractTimedSystem()
+       , m_timeline( timeline )
+   {}
+
+   void generateTasks( Ra::Core::TaskQueue* taskQueue, const Ra::Engine::FrameInfo& ) override {
+       // Update all Components data.
+       for ( auto compEntry : m_components )
+       {
+           auto comp = static_cast<MyComponentWithKeyFrame*>( compEntry.second );
+           auto func = std::bind( &MyComponentWithKeyFrame::update, comp );
+           auto task = new Ra::Core::FunctionTask( func, "MyUpdateTask" );
+           taskQueue->registerTask( task );
+       }
+   }
+   void AnimationSystem::handleAssetLoading( Ra::Engine::Entity* entity, const Ra::Core::Asset::FileData* fileData ) {
+       // Add a Component whenever a file is loaded
+       auto comp = new MyComponentWithKeyFrame( "MyComponentWithKeyFrame_", entity );
+       registerComponent( entity, comp );
+       if ( m_timeline )
+       {
+           // on insertion we may want to get the frame value from elsewhere
+           auto inserter = [comp]( const Scalar& t ) {
+               // for example value(t) + 1
+               comp->m_keyframes.insertKeyFrame( t, comp->m_keyframes.at( t ) + 1_ra );
+           };
+           // No need for an update callback since the component owns the KeyFramedValue.
+           m_timeline->registerKeyFramedValue( comp, "KeyFrame", &comp->m_keyframes, inserter );
+       }
+   }
+   void goTo( Scalar t ) override {
+       // Update all Components' KeyFramedValue.
+       for ( auto compEntry : m_components )
+       {
+           compEntry.second->goTo( t );
+       }
+   }
+   void cacheFrame( const std::string& dir, uint frameID ) const override {}
+   bool restoreFrame( const std::string& dir, uint frameID ) override {}
+
+   Ra::GuiBase::Timeline* m_timeline{nullptr};
+};
+```
+
+## Dynamic KeyFramedValues:
+Those are `Ra::Core::Animation::KeyFramedValue`s that are not part of an `Ra::Engine::Entity`, `Ra::Engine::Component` or
+`Ra::Engine::RenderObject` data, but are used to keyframe some of its data.
+Dynamic `Ra::Core::Animation::KeyFramedValue`s must be created from and owned by the UI, and registered in the
+`Ra::GuiBase::Timeline`.
+They are usually bound to an UpdateCallback function since they have to update the
+object's data they are linked to.
+
+Example Usage:
+```c++
+/// Let's say there is a Component class defined as:
+struct MyComponent : public Component {
+    MyComponent( const std::string& name, Ra::Engine::Entity* entity, Scalar value = 0_ra )
+        : Ra::Engine::Component( name, entity )
+        , m_currentValue( value )
+    {}
+
+    void initialize() override {}
+    void update() { std::cout << m_currentValue << std::endl; }
+
+    Scalar m_currentValue;
+};
+
+/// We here create a plugin that will keyframe the MyComponent::m_currentValue
+/// attribute of selected MyComponents in the scene:
+
+// Let's start with some simple UI:
+struct MyWidget : public QWidget {
+    Q_OBJECT
+
+    MyWidget( QWigdet* parent = nulltpr ) : QWidget( parent ) {
+        m_keyFrameValueCheckbox = new QCheckBox( "Keyframe current Value", this );
+    }
+
+    QCheckBox* m_keyFrameValueCheckbox;
+};
+
+// Then the plugin:
+struct MyPlugin : public QObject, Ra::Plugins::RadiumPluginInterface {
+    Q_OBJECT
+    Q_RADIUM_PLUGIN_METADATA
+    Q_INTERFACES( Ra::Plugins::RadiumPluginInterface )
+
+    MyPlugin() = default;
+
+    void registerPlugin( const Ra::Plugins::Context& context ) override {
+        // get timeline
+        m_timeline = context.m_timeline;
+        // connect to selection manager
+        m_selectionManager = context.m_selectionManager;
+        if ( m_selectionManager )
+        {
+            connect( m_selectionManager, &Ra::GuiBase::SelectionManager::currentChanged, this, &MyPlugin::onCurrentChanged );
+        }
+    }
+    bool doAddWidget( QString& name ) override {
+        return true;
+    }
+    QWidget* getWidget() override {
+        m_widget = new MyWidget;
+        connect( m_widget->m_keyFrameValueCheckbox, &QCheckBox::toggled, this, &MyPlugin::keyFrameValue );
+        return m_widget;
+    }
+    bool doAddMenu() override { return false; }
+    QMenu* getMenu() override { return nullptr; }
+    bool doAddAction( int& nb ) override { return false; }
+    QAction* getAction( int id ) override { return nullptr; }
+    void onCurrentChanged( const QModelIndex& current, const QModelIndex& prev ) {
+        // deal with selection
+        if ( m_selectionManager->hasSelection() )
+        {
+            const Ra::Engine::ItemEntry& ent = m_selectionManager->currentItem();
+            m_current = dynamic_cast<MyComponent*>( ent.m_component );
+        }
+        else
+        {
+            m_current = nullptr;
+        }
+        m_widget->m_keyFrameValueCheckbox->setChecked( m_keyframes.find( m_current ) != m_keyframes.end() );
+    }
+    void keyFrameValue( bool on ) {
+        // deal with keyframing
+        if ( m_current == nullptr ) { return; }
+        if ( on )
+        {
+            // keyframe m_current->m_currentValue
+            auto keyframes = new KeyFramedValue( m_current->m_currentValue, 0, interpolate );
+            // on insertion we may want to get the frame value from elsewhere
+            auto inserter = [keyframes]( const Scalar& t ) {
+                // for example value(t) + 1
+                keyframes->insertKeyFrame( t, keyframes->at( t ) + 1_ra );
+            };
+            // on update we here want to modify the value since the MyComponent cannot do it by itself
+            Scalar& value = &m_current->m_currentValue;
+            auto updater = [keyframes, &value]( const Scalar& t ) {
+                value = keyframes->at( t );
+            };
+            // register the new KeyFramedValue
+            m_keyframes.push_back( keyframes );
+            m_timeline->registerKeyFramedValue( m_current, "KeyFrame", keyframes, inserter, updater );
+        }
+        else
+        {
+            // release m_current->m_currentValue from the keyframe
+            m_timeline->unregisterKeyFramedValue( m_current, "KeyFrame" );
+        }
+    };
+
+    MyWidget* m_widget{nullptr};
+    Ra::GuiBase::Timeline* m_timeline{nullptr};
+    MyComponent* m_current;
+    std::map<MyComponent*,KeyFramedValue*> m_keyframes;
+};
+```

src/GuiBase/Timeline/Configurations.h

@@ -38,7 +38,7 @@
 //          ^                      ^ <--
 //          |                      |
 //        cursor                 cursor
-// on ruler clicking, automove to nearest keyPose or ruler scale
+// on ruler clicking, automove to nearest keyFrame or ruler scale
 // if the distance with cursor is below this constant
 #define TIMELINE_AUTO_SUGGEST_CURSOR_RADIUS 4 // unit : pixel
 
@@ -50,11 +50,12 @@
 
 // todo : maybe set global static var
 // frame per second to draw position of each frame in ruler
-#define TIMELINE_FPS 24
+#define TIMELINE_FPS 60
 
-#define TIMELINE_BUFFER_SESSION_MAX_SIZE \
-    500000000 // 500M bytes in RAM, max bytes for saving user anim for undo/redo stack
+// 500M bytes in RAM, max bytes for saving user anim for undo/redo stack
+#define TIMELINE_BUFFER_SESSION_MAX_SIZE 500000000
 
-#define TIMELINE_DELAY_AUTO_SAVE 100 // millisecond, auto save environment after delay
+// millisecond, auto save environment after delay
+#define TIMELINE_DELAY_AUTO_SAVE 100
 
 #endif // RADIUMENGINE_TIMELINE_CONFIG_HPP_

src/GuiBase/Timeline/HelpDialog.cpp

@@ -0,0 +1,19 @@
+#include "ui_HelpDialog.h"
+#include <GuiBase/Timeline/HelpDialog.hpp>
+
+namespace Ra::GuiBase {
+
+HelpDialog::HelpDialog( QWidget* parent ) : QDialog( parent ), ui( new Ui::HelpDialog ) {
+    ui->setupUi( this );
+}
+
+HelpDialog::~HelpDialog() {
+    delete ui;
+}
+
+void HelpDialog::reject() {
+    emit closed();
+    QDialog::reject();
+}
+
+} // namespace Ra::GuiBase

src/GuiBase/Timeline/HelpDialog.hpp

@@ -0,0 +1,33 @@
+#ifndef RADIUMENGINE_TIMELINE_HELP_HPP__
+#define RADIUMENGINE_TIMELINE_HELP_HPP__
+
+#include <QDialog>
+
+namespace Ui {
+class HelpDialog;
+} // namespace Ui
+
+namespace Ra::GuiBase {
+
+/// Dialog to display navigation/interaction controls.
+class HelpDialog : public QDialog
+{
+    Q_OBJECT
+
+  public:
+    explicit HelpDialog( QWidget* parent = nullptr );
+    ~HelpDialog();
+
+  signals:
+    void closed();
+
+  public slots:
+    void reject() override;
+
+  private:
+    Ui::HelpDialog* ui;
+};
+
+} // namespace Ra::GuiBase
+
+#endif // RADIUMENGINE_TIMELINE_HELP_HPP__