add basic chapter window #69

Author: OpenFunscripter

localization/localization.csv

@@ -527,4 +527,7 @@ REMOVE_BOOKMARK_MSG,Do you want to remove the bookmark?,Do you want to remove th
 ADD_NEW_CHAPTER,Add chapter,Add chapter
 ADD_NEW_BOOKMARK,Add bookmark,Add bookmark
 SET_CHAPTER_SIZE,Set size,Set size
-SAVE_HEATMAP_WITH_CHAPTERS,Save heatmap with chapters,Save heatmap with chapters
+SAVE_HEATMAP_WITH_CHAPTERS,Save heatmap with chapters,Save heatmap with chapters
+CHAPTERS,Chapters,Chapters
+CHAPTER,Chapter,Chapter
+BEGIN,Begin,Begin

src/OpenFunscripter.cpp

@@ -1575,10 +1575,9 @@ void OpenFunscripter::Step() noexcept
             LoadedProject->ShowProjectWindow(&ShowProjectEditor);
 
             extensions->ShowExtensions();
-
             OFS_FileLogger::DrawLogWindow(&ofsState.showDebugLog);
-
             keys->RenderKeybindingWindow();
+            chapterMgr->ShowWindow(&ofsState.showChapterManager);
 
             if (preferences->ShowPreferenceWindow()) {}
 
@@ -2452,6 +2451,7 @@ void OpenFunscripter::ShowMainMenuBar() noexcept
             if (ImGui::MenuItem(TR(ACTION_EDITOR), NULL, &ofsState.showActionEditor)) {}
             if (ImGui::MenuItem(TR(SPECIAL_FUNCTIONS), NULL, &ofsState.showSpecialFunctions)) {}
             if (ImGui::MenuItem(TR(WEBSOCKET_API), NULL, &ofsState.showWsApi)) {}
+            if (ImGui::MenuItem(TR(CHAPTERS), NULL, &ofsState.showChapterManager)) {}
 
 
             ImGui::Separator();

src/UI/OFS_ChapterManager.cpp

@@ -4,77 +4,77 @@
 #include "OpenFunscripter.h"
 #include "OFS_EventSystem.h"
 #include "OFS_VideoplayerEvents.h"
+#include "OFS_Localization.h"
 
-inline float randf() noexcept
-{
-    return (float)rand() / (float)RAND_MAX;
-}
+#include "imgui.h"
+#include "imgui_stdlib.h"
 
 OFS_ChapterManager::OFS_ChapterManager() noexcept
 {
     stateHandle = OFS_ProjectState<ChapterState>::Register(ChapterState::StateName);
-    EV::Queue().appendListener(DurationChangeEvent::EventType, 
-        DurationChangeEvent::HandleEvent(
-            [this](const DurationChangeEvent* ev) noexcept
-            {
-                auto& state = ChapterState::State(stateHandle);
-                #if 0
-
-                // Generate random chapters
-                float duration = ev->duration;
-                state.chapters.clear();
-                state.bookmarks.clear();
-
-
-                srand(SDL_GetTicks());
-
-                float minChapterLen = duration * 0.01f;
-                float maxChapterLen = duration * 0.05f;
-
-                float currentTime = 0.f;
-
-                while(currentTime < duration)
-                {
-                    float newChapterLen = minChapterLen + ((maxChapterLen - minChapterLen) * randf());
-
-                    if(currentTime + newChapterLen > duration)
-                    {
-                        newChapterLen -=  (currentTime + newChapterLen) - duration;
-                    }
-
-                    Chapter newChapter
-                    {
-                        currentTime,
-                        currentTime + newChapterLen,
-                        FMT("%.1f", newChapterLen)
-                    };
-                    state.chapters.emplace_back(std::move(newChapter));
-                    currentTime += newChapterLen;
-                }
-                
-                for(int i=0; i < 10; i += 1)
-                {
-                    float bookmarkTime = duration * randf();
-                    Bookmark bookmark
-                    {
-                        bookmarkTime,
-                        FMT("%.1f", bookmarkTime)
-                    };
-                    state.bookmarks.emplace_back(std::move(bookmark));
-                }
-
-                LOGF_DEBUG("Generated %lld random chapters", state.chapters.size());
-                #endif
-            }
-        )
-    );
 }
 
 OFS_ChapterManager::~OFS_ChapterManager() noexcept
 {
 
 }
 
+void OFS_ChapterManager::ShowWindow(bool* open) noexcept
+{
+    if(!*open) return;
+    auto& chapterState = ChapterState::State(stateHandle);
+    ImGui::Begin(TR_ID("ChapterManager", Tr::CHAPTERS), open);
+
+    if(ImGui::BeginTable("##chapterTable", 4, ImGuiTableFlags_Resizable))
+    {
+        ImGui::TableSetupColumn(TR(CHAPTER), ImGuiTableColumnFlags_None);
+        ImGui::TableSetupColumn(TR(BEGIN), ImGuiTableColumnFlags_None);
+        ImGui::TableSetupColumn(TR(END), ImGuiTableColumnFlags_None);
+        ImGui::TableSetupColumn("##controls", ImGuiTableColumnFlags_WidthFixed);
+        ImGui::TableHeadersRow();
+
+        int deleteIdx = -1;
+        char timeBuf[16];
+        for(int i=0, size=chapterState.chapters.size(); i < size; i += 1)
+        {
+            auto& chapter = chapterState.chapters[i];
+            ImGui::PushID(i);
+
+            ImGui::TableNextRow();
+            ImGui::TableSetColumnIndex(0);
+            ImGui::ColorEdit3("##chapterColorPicker", &chapter.color.Value.x, ImGuiColorEditFlags_NoInputs);
+            ImGui::SameLine();
+            ImGui::InputText("##chapterName", &chapter.name);
+            ImGui::TableNextColumn();
+
+            Util::FormatTime(timeBuf, sizeof(timeBuf), chapter.startTime, true);
+            ImGui::TextUnformatted(timeBuf);
+
+            ImGui::TableNextColumn();
+            Util::FormatTime(timeBuf, sizeof(timeBuf), chapter.endTime, true);
+            ImGui::TextUnformatted(timeBuf);
+
+            ImGui::TableNextColumn();
+            if (ImGui::Button(TR(DELETE))) 
+            {
+                deleteIdx = i;
+            }
+            ImGui::PopID();
+        }
+
+        if(deleteIdx >= 0 && deleteIdx < chapterState.chapters.size())
+        {
+            auto it = chapterState.chapters.begin() + deleteIdx;
+            chapterState.chapters.erase(it);
+            EV::Enqueue<ChapterStateChanged>();
+        }
+
+        ImGui::EndTable();
+    }
+
+    ImGui::End();
+}
+
 bool OFS_ChapterManager::ExportClip(const Chapter& chapter, const std::string& outputDirStr) noexcept
 {
     auto app = OpenFunscripter::ptr;

src/UI/OFS_ChapterManager.h

@@ -15,4 +15,6 @@ class OFS_ChapterManager
     ~OFS_ChapterManager() noexcept;
 
     static bool ExportClip(const class Chapter& chapter, const std::string& outputDirStr) noexcept;
+
+    void ShowWindow(bool* open) noexcept;
 };

src/state/OpenFunscripterState.h

@@ -40,6 +40,7 @@ struct OpenFunscripterState
     bool showSimulator = true;
     bool showSpecialFunctions = false;
     bool showWsApi = false;
+    bool showChapterManager = false;
 
     inline static OpenFunscripterState& State(uint32_t stateHandle) noexcept
     {
@@ -67,4 +68,5 @@ REFL_TYPE(OpenFunscripterState)
     REFL_FIELD(showSimulator)
     REFL_FIELD(showSpecialFunctions)
     REFL_FIELD(showWsApi)
+    REFL_FIELD(showChapterManager)
 REFL_END