Merge pull request #129 from JacobDomagala/122-add-option-to-modify-a…

…nimationpoints [#122, #130]: Add option to edit `AnimationPoint's` duration and improve UI in `Editor`
JacobDomagala · Jun 27, 2023 · 13d52ff · 13d52ff
2 parents a9eee77 + 4723531
commit 13d52ff
Show file tree

Hide file tree

Showing 9 changed files with 1,786 additions and 229 deletions.
diff --git a/assets/fonts/fa-regular-400.ttf b/assets/fonts/fa-regular-400.ttf
diff --git a/assets/fonts/fa-solid-900.ttf b/assets/fonts/fa-solid-900.ttf
diff --git a/assets/levels/MediumLevel.dgl b/assets/levels/MediumLevel.dgl
diff --git a/editor/editor.cpp b/editor/editor.cpp
@@ -34,7 +34,7 @@ Editor::Editor(const glm::ivec2& screenSize) : gui_(*this)
                                         renderer::ApplicationType::EDITOR);
    gui_.Init();
 
-   m_deltaTime = Timer::milliseconds(static_cast< long >(TARGET_TIME * 1000.0f));
+   m_deltaTime = Timer::milliseconds(static_cast< long >(TARGET_TIME));
 }
 
 void
@@ -46,8 +46,8 @@ Editor::ShowCursor(bool choice)
 void
 Editor::HandleCamera()
 {
-   m_timer.ToggleTimer();
-   m_deltaTime = m_timer.GetMsDeltaTime();
+   //m_timer.ToggleTimer();
+   //m_deltaTime = m_timer.GetMsDeltaTime();
 
    auto cameraMoveBy = glm::vec2();
 
@@ -332,6 +332,19 @@ Editor::HandleObjectSelected(Object::ID objectID, bool fromGUI)
    }
 }
 
+Object::ID
+Editor::GetSelectedEditorObject() const
+{
+   Object::ID selected = Object::INVALID_ID;
+
+   if (m_currentEditorObjectSelected)
+   {
+      selected = m_currentEditorObjectSelected->GetLinkedObjectID();
+   }
+
+   return selected;
+}
+
 void
 Editor::SelectGameObject()
 {
@@ -473,7 +486,11 @@ Editor::ActionOnObject(Editor::ACTION action)
          if (m_editorObjectSelected && m_currentEditorObjectSelected)
          {
             gui_.ObjectDeleted(m_currentEditorObjectSelected->GetLinkedObjectID());
-            m_editorObjects.erase(stl::find(m_editorObjects, m_currentEditorObjectSelected));
+            if (Object::GetTypeFromID(m_currentEditorObjectSelected->GetLinkedObjectID())
+                == ObjectType::ANIMATION_POINT)
+            {
+               animationPoints_.erase(stl::find(animationPoints_, m_currentEditorObjectSelected));
+            }
             m_currentEditorObjectSelected->DeleteLinkedObject();
             UnselectEditorObject();
          }

diff --git a/editor/editor.hpp b/editor/editor.hpp
@@ -23,6 +23,11 @@ class Animatable;
 class Editor : public Application
 {
  public:
+   enum class ACTION
+   {
+      UNSELECT,
+      REMOVE
+   };
    explicit Editor(const glm::ivec2& screenSize);
 
    // APPLICATION OVERRIDES
@@ -130,26 +135,25 @@ class Editor : public Application
    void
    HandleObjectSelected(Object::ID objectID, bool fromGUI);
 
+   [[nodiscard]] Object::ID
+   GetSelectedEditorObject() const;
+
    void
    HandleEditorObjectSelected(const std::shared_ptr< EditorObject >& newSelectedEditorObject,
                               bool fromGUI = false);
 
+   void
+   ActionOnObject(ACTION action);
+
  private:
-   enum class ACTION
-   {
-      UNSELECT,
-      REMOVE
-   };
+
 
    // [[nodiscard]] std::shared_ptr< EditorObject >
    // GetEditorObjectByID(Object::ID ID);
 
    void
    SetupRendererData();
 
-   void
-   ActionOnObject(ACTION action);
-
    void
    DrawEditorObjects();
 

diff --git a/editor/editor_object.hpp b/editor/editor_object.hpp
@@ -129,7 +129,6 @@ class EditorObject
    Object::ID m_objectID = Object::INVALID_ID;
    bool m_hasLinkedObject = false;
 
-
    bool m_selected = false;
    bool m_isBackground = false;