fix core extension

Author: OpenFunscripter

OFS-lib/UI/KeybindingSystem.cpp

@@ -662,7 +662,7 @@ bool KeybindingSystem::PassiveModifier(const char* name) noexcept
     return false;
 }
 
-void KeybindingSystem::changeModals() noexcept
+void KeybindingSystem::changeModals(bool& save) noexcept
 {
     if (ImGui::BeginPopupModal(TR_ID("CHANGE_KEY", Tr::CHANGE_KEY), 0, ImGuiWindowFlags_AlwaysAutoResize))
     {
@@ -673,7 +673,7 @@ void KeybindingSystem::changeModals() noexcept
             ImGui::Text(changeModalText.c_str());
         }
         if (!currentlyChanging) {
-            //save = true; // autosave
+            save = true; // autosave
             ImGui::CloseCurrentPopup();
         }
         ImGui::EndPopup();
@@ -682,7 +682,7 @@ void KeybindingSystem::changeModals() noexcept
     if (ImGui::BeginPopupModal(TR_ID("CHANGE_BUTTON", Tr::CHANGE_BUTTON))) {
         ImGui::TextUnformatted(TR(CHANGE_BUTTON_MSG));
         if (!currentlyChanging) {
-            //save = true; // autosave
+            save = true; // autosave
             ImGui::CloseCurrentPopup();
         }
         ImGui::EndPopup();
@@ -744,7 +744,7 @@ void KeybindingSystem::addBindingsGroup(KeybindingGroup& group, bool& save, bool
                 }
             }
             ImGui::NextColumn();
-            changeModals();
+            changeModals(save);
             ImGui::PopID();
         }
 

OFS-lib/UI/KeybindingSystem.h

@@ -227,7 +227,7 @@ class KeybindingSystem
 	void addPassiveBindingGroup(PassiveBindingGroup& group, bool& save) noexcept;
 	void passiveBindingTab(bool& save) noexcept;
 
-	void changeModals() noexcept;
+	void changeModals(bool& save) noexcept;
 public:
 	bool ShowWindow = false;
 

OFS-lib/UI/OFS_ScriptTimeline.cpp

@@ -250,7 +250,7 @@ inline static float easeOutExpo(float x) noexcept {
 
 void ScriptTimeline::Update() noexcept
 {
-	auto timePassed = Util::Clamp((SDL_GetTicks() - visibleTimeUpdate) / 200.f, 0.f, 1.f);
+	auto timePassed = Util::Clamp((SDL_GetTicks() - visibleTimeUpdate) / 150.f, 0.f, 1.f);
 	timePassed = easeOutExpo(timePassed);
 	visibleTime = Util::Lerp(previousVisibleTime, nextVisisbleTime, timePassed);
 }

src/OpenFunscripter.cpp

@@ -131,6 +131,8 @@ OpenFunscripter::~OpenFunscripter()
     LoadedProject.reset();
 
     settings->saveSettings();
+    keybinds.save();
+    
     player.reset();
     events.reset();
 }

src/UI/OFS_Settings.cpp

@@ -177,7 +177,7 @@ bool OFS_Settings::ShowPreferenceWindow() noexcept
 						OFS_Translator::ptr->LoadDefaults();
 					}
 					ImGui::SameLine();
-					if(ImGui::Button(TR_ID("OPEN_DIR_LANG", Tr::DIRECTORY)))
+					if(ImGui::Button(FMT("%s###DIRECTORY_TRANSLATION", ICON_FOLDER_OPEN)))
 					{
 						Util::OpenFileExplorer(Util::Prefpath(OFS_Translator::TranslationDir));
 					}

src/lua/OFS_LuaCoreExtension.cpp

@@ -21,9 +21,6 @@ Spline.PointEveryMs = 100
 
 function init()
     -- this runs once at when loading the extension
-    ofs.Bind("jitter", "Adds jitter to selection.")
-    ofs.Bind("random_noise", "Generates a random script.")
-    ofs.Bind("spline_smooth", "Adds spline smoothing to selection.")
     print("initialized")
 end
 
@@ -53,7 +50,7 @@ function gui()
     Random.MinStrokeDuration = ofs.Input("Min duration", Random.MinStrokeDuration)
     Random.MaxStrokeDuration = ofs.Input("Max duration", Random.MaxStrokeDuration)
     if ofs.Button("Add random noise") then
-        random_noise()
+        binding.random_noise()
     end
 
     if ofs.Button("Select all") then
@@ -69,11 +66,11 @@ function gui()
     Spline.PointEveryMs, splineChanged = ofs.Slider("Point per ms", Spline.PointEveryMs, 20, 500)
     if splineChanged then
         ofs.Undo()
-        spline_smooth()
+        binding.spline_smooth()
     end
 end
 
-function spline_smooth()
+function binding.spline_smooth()
     local catmullRom = function(v1, v2, v3, v4, s)
         s2 = s*s
         s3 = s*s*s
@@ -88,7 +85,7 @@ function spline_smooth()
     local script = ofs.Script(ofs.ActiveIdx())
     local actionCount = #script.actions
 
-    if not ofs.HasSelection(script) then
+    if not script:hasSelection() then
         return
     end
 
@@ -109,41 +106,43 @@ function spline_smooth()
         -- since lua doesn't have a continue,
         -- we use a goto + a label at the bottom of the loop
         if not action2.selected or not action3.selected then goto continue end
-    
+
+
         local startTime = action2.at
         local endTime = action3.at
         local duration = endTime - startTime;
     
-        pointCount = duration/Spline.PointEveryMs;
-    
-        for i=1, pointCount, 1 do
-            s = (i*Spline.PointEveryMs) / duration
-            time_ms = math.floor(action2.at + (i*Spline.PointEveryMs))
+        local pointEverySecond = Spline.PointEveryMs / 1000.0
+
+        pointCount = duration/pointEverySecond
+   
+        for i=1, pointCount-1, 1 do
+            s = (i*pointEverySecond) / duration
+            time_ms = action2.at + (i*pointEverySecond)
             spline_pos = catmullRom(action1.pos, action2.pos, action3.pos, action4.pos, s)
             spline_pos = clamp(spline_pos, 0, 100)
-            --ofs.AddAction(script, time_ms, spline_pos)
             table.insert( smoothedActions, {at=time_ms, pos=spline_pos} )
         end
         ::continue::
     end
 
     for idx, action in ipairs(smoothedActions) do
-        ofs.AddAction(script, action.at, action.pos)
+        script.actions:add(Action.new(action.at, action.pos))
     end
-    ofs.Commit(script)
+    script:commit()
 end
 
-function random_noise()
+function binding.random_noise()
     local script = ofs.Script(ofs.ActiveIdx())
-    ofs.ClearScript(script)
+    script.actions:clear()
 
     local LastTimeMs = 0
     local LastPos = 0
     local TotalTimeMs = player.Duration() * 1000.0
 
     local goingUp = true
     while LastTimeMs < TotalTimeMs do
-        ofs.AddAction(script, LastTimeMs, LastPos)
+        script.actions:add(Action.new(LastTimeMs/1000.0, LastPos))
        
         if goingUp then
             LastPos = LastPos + math.random(Random.MinStrokeLen, Random.MaxStrokeLen)
@@ -155,29 +154,29 @@ function random_noise()
         LastTimeMs = LastTimeMs + math.random(Random.MinStrokeDuration, Random.MaxStrokeDuration)
     end
 
-    ofs.Commit(script)
+    script:commit()
 end
 
 function select_all() 
     local script = ofs.Script(ofs.ActiveIdx())
     for idx, action in ipairs(script.actions) do
         action.selected = true
     end
-    ofs.Commit(script)
+    script:commit()
 end
 
 function select_none()
     local script = ofs.Script(ofs.ActiveIdx())
     for idx, action in ipairs(script.actions) do
         action.selected = false
     end
-    ofs.Commit(script)
+    script:commit()
 end
 
-function jitter()
+function binding.jitter()
     local script = ofs.Script(ofs.ActiveIdx())
 
-    if not ofs.HasSelection(script) then
+    if not script:hasSelection() then
         return
     end
     
@@ -198,7 +197,7 @@ function jitter()
             action.pos = action.pos + pos_jitter_value
         end
     end
-    ofs.Commit(script)
+    script:commit()
 end
 )";