From 81624e3a7a620a8fe213e92b8f6e1c6277bad6a8 Mon Sep 17 00:00:00 2001
From: "J. Neugebauer" <ngb@helmholtz-bi.de>
Date: Wed, 6 Jul 2022 20:36:27 +0200
Subject: [PATCH] =?UTF-8?q?Setter=20f=C3=BCr=20FPS=20verhindert=20das=20se?=
 =?UTF-8?q?tzen=20auf=20weniger=20als=200=20frames?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/schule/ngb/zm/Constants.java       |  5 +++++
 src/schule/ngb/zm/Zeichenmaschine.java | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/schule/ngb/zm/Constants.java b/src/schule/ngb/zm/Constants.java
index 2713fdc..6b76507 100644
--- a/src/schule/ngb/zm/Constants.java
+++ b/src/schule/ngb/zm/Constants.java
@@ -247,6 +247,11 @@ public class Constants {
 	 * Zeichenmaschine selbst vorgenommen werden.
 	 */
 
+	/**
+	 * Aktuell dargestellte Bilder pro Sekunde.
+	 */
+	public static int framesPerSecond = STD_FPS;
+
 	/**
 	 * Anzahl der Ticks (Frames), die das Programm bisher läuft.
 	 */
diff --git a/src/schule/ngb/zm/Zeichenmaschine.java b/src/schule/ngb/zm/Zeichenmaschine.java
index 86317ee..a8e8860 100644
--- a/src/schule/ngb/zm/Zeichenmaschine.java
+++ b/src/schule/ngb/zm/Zeichenmaschine.java
@@ -138,7 +138,7 @@ public class Zeichenmaschine extends Constants {
 	private boolean stop_after_update = false, run_once = true;
 
 	// Aktuelle Frames pro Sekunde der Zeichenmaschine.
-	private int framesPerSecond;
+	private int framesPerSecondInternal;
 
 	// Hauptthread der Zeichenmaschine.
 	private Thread mainThread;
@@ -312,7 +312,7 @@ public class Zeichenmaschine extends Constants {
 		shapes = getShapesLayer();
 
 		// FPS setzen
-		framesPerSecond = STD_FPS;
+		framesPerSecondInternal = STD_FPS;
 		this.run_once = run_once;
 
 		// Settings der Unterklasse aufrufen, falls das Fenster vor dem Öffnen
@@ -799,7 +799,7 @@ public class Zeichenmaschine extends Constants {
 	 * @return Angepeilte Frames pro Sekunde
 	 */
 	public final int getFramesPerSecond() {
-		return framesPerSecond;
+		return framesPerSecondInternal;
 	}
 
 	/**
@@ -808,7 +808,13 @@ public class Zeichenmaschine extends Constants {
 	 * @param pFramesPerSecond Neue FPS.
 	 */
 	public final void setFramesPerSecond( int pFramesPerSecond ) {
-		framesPerSecond = pFramesPerSecond;
+		if( pFramesPerSecond > 0 ) {
+			framesPerSecondInternal = pFramesPerSecond;
+		} else {
+			framesPerSecondInternal = 1;
+			// Logger ...
+		}
+		framesPerSecond = framesPerSecondInternal;
 	}
 
 	/**
@@ -1363,7 +1369,7 @@ public class Zeichenmaschine extends Constants {
 				// delta time in ns
 				long afterTime = System.nanoTime();
 				long dt = afterTime - beforeTime;
-				long sleep = ((1000000000L / framesPerSecond) - dt) - overslept;
+				long sleep = ((1000000000L / framesPerSecondInternal) - dt) - overslept;
 
 
 				if( sleep > 0 ) {
@@ -1382,6 +1388,7 @@ public class Zeichenmaschine extends Constants {
 				_runtime = System.currentTimeMillis() - start;
 				tick = _tick;
 				runtime = _runtime;
+				framesPerSecond = framesPerSecondInternal;
 
 				if( pause_pending ) {
 					state = Options.AppState.PAUSED;
@@ -1391,6 +1398,7 @@ public class Zeichenmaschine extends Constants {
 			state = Options.AppState.STOPPED;
 
 			teardown();
+			cleanup();
 			state = Options.AppState.TERMINATED;
 
 			if( quitAfterTeardown ) {