Adjustable framerate

resolves #19

src/CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Improvements and Fixes
  * Added an option to change map size. To do that open a new "Settings" menu, available under the cog button in the top-right corner of the opened map pane;
  * It's now possible to interact with the map window without first having to manually tab in. Specifically for: select instance -> change a var -> select another instance;
+ * Added a preference to adjust the application framerate;
  * Minor GUI improvements;
  * Fixed attempting to pick/delete item pixel shifted off map does not work.
 

src/app/preferences.go

@@ -2,20 +2,45 @@ package app
 
 import (
 	"log"
+	"math"
 	"sdmm/app/prefs"
 	"sdmm/app/ui/cpwsarea/wsprefs"
+	"sdmm/app/window"
 )
 
 func (a *app) makePreferences() wsprefs.Prefs {
 	p := wsprefs.MakePrefs()
 	p.Add(wsprefs.GPInterface, a.makePreferenceInterfaceScale())
+	p.Add(wsprefs.GPInterface, a.makePreferenceInterfaceFps())
 	p.Add(wsprefs.GPControls, a.makePreferenceControlsAltScrollBehaviour())
 	p.Add(wsprefs.GPEditor, a.makePreferenceEditorFormat())
 	p.Add(wsprefs.GPEditor, a.makePreferenceEditorSanitizeVariables())
 	p.Add(wsprefs.GPEditor, a.makePreferenceEditorNudgeMode())
 	return p
 }
 
+func (a *app) makePreferenceInterfaceFps() wsprefs.IntPref {
+	p := wsprefs.MakeIntPref()
+	p.Name = "Fps"
+	p.Desc = "Controls the application framerate."
+	p.Label = "##fps"
+	p.Min = 30
+	p.Max = math.MaxInt
+
+	p.FGet = func() int {
+		return a.preferencesConfig().Prefs.Interface.Fps
+	}
+	p.FSet = func(value int) {
+		log.Println("[app] preferences changing, [interface#fps] to:", value)
+		cfg := a.preferencesConfig()
+		cfg.Prefs.Interface.Fps = value
+		a.ConfigSaveV(cfg)
+		window.SetFps(value)
+	}
+
+	return p
+}
+
 func (a *app) makePreferenceInterfaceScale() wsprefs.IntPref {
 	p := wsprefs.MakeIntPref()
 	p.Name = "Scale"

src/app/preferences_config.go

@@ -3,6 +3,7 @@ package app
 import (
 	"log"
 	"sdmm/app/prefs"
+	"sdmm/app/window"
 )
 
 const (
@@ -40,19 +41,24 @@ func (preferencesConfig) TryMigrate(cfg map[string]interface{}) (result map[stri
 }
 
 func (a *app) loadPreferencesConfig() {
-	a.ConfigRegister(&preferencesConfig{
+	cfg := &preferencesConfig{
 		Version: preferencesConfigVersion,
 
 		Prefs: prefs.Prefs{
 			Interface: prefs.Interface{
 				Scale: 100,
+				Fps:   60,
 			},
 			Editor: prefs.Editor{
 				SaveFormat: prefs.SaveFormatInitial,
 				NudgeMode:  prefs.SaveNudgeModePixel,
 			},
 		},
-	})
+	}
+
+	a.ConfigRegister(cfg)
+
+	window.SetFps(cfg.Prefs.Interface.Fps)
 }
 
 func (a *app) preferencesConfig() *preferencesConfig {

src/app/prefs/prefs.go

@@ -8,6 +8,7 @@ type Prefs struct {
 
 type Interface struct {
 	Scale int
+	Fps   int
 }
 
 type Controls struct {

src/app/window/process.go

@@ -9,9 +9,13 @@ import (
 	"sdmm/platform"
 )
 
-func (w *Window) Process() {
-	ticker := time.NewTicker(time.Second / time.Duration(fps))
+var ticker = newTicker(60)
+
+func newTicker(fps int) *time.Ticker {
+	return time.NewTicker(time.Second / time.Duration(fps))
+}
 
+func (w *Window) Process() {
 	for !w.application.IsClosed() {
 		// Override window closing behaviour to enforce our checks.
 		if w.handle.ShouldClose() {

src/app/window/window.go

@@ -12,10 +12,10 @@ import (
 	"sdmm/platform"
 )
 
-const fps int = 60
-
-// AppLogoTexture is a texture pointer to the application logo.
-var AppLogoTexture uint32
+var (
+	// AppLogoTexture is a texture pointer to the application logo.
+	AppLogoTexture uint32
+)
 
 type application interface {
 	Process()
@@ -88,6 +88,11 @@ func SetPointSize(ps float32) {
 	platform.UpdateFontsTexture()
 }
 
+func SetFps(value int) {
+	log.Println("[window] set fps:", value)
+	ticker = newTicker(value)
+}
+
 func (w *Window) setupGlfw() {
 	runtime.LockOSThread()