- Fixed a bug in changing render speed where the sound and countdown timer would not slow down

- Bumped to 0.3

Author: matthijn

Swift8/AppDelegate.swift

@@ -14,16 +14,23 @@ class AppDelegate: NSObject, NSApplicationDelegate
     // Loading the window controller manually
     lazy var windowController = NSStoryboard(name: "Main", bundle: nil).instantiateControllerWithIdentifier("MainWindowController") as! Chip8WindowController
 
+    // Don't show the initial open file screen if we opened through double clicking a file
+    var didOpenWithFile = false
+    
     func applicationDidFinishLaunching(aNotification: NSNotification)
     {
         // Setup theme menu
         self.setupThemes()
 
-        // Show the initial open screen
-        self.onOpenButton(self)
-        
         // Update the menu reflecting the sound state
         self.setSoundState(Settings.sharedSettings.playSound)
+        
+        // Show the initial open screen
+        
+        if !self.didOpenWithFile
+        {
+            self.onOpenButton(self)
+        }
     }
 
     @IBOutlet weak var themeMenu: NSMenu!
@@ -109,6 +116,7 @@ class AppDelegate: NSObject, NSApplicationDelegate
 
         if url.pathExtension == "ch8"
         {
+            self.didOpenWithFile = true
             self.windowController.loadPath(url)
             return true
         }

Swift8/Chip8.swift

@@ -626,7 +626,7 @@ class Chip8
             self.makeNoise()
 
             // And call self recursively after that delay
-            delay(1.0/60.0, closure: self.timerLoop)
+            delay(1.0 / (60.0 * Settings.sharedSettings.renderSpeed), closure: self.timerLoop)
         }
 
     }
@@ -643,7 +643,7 @@ class Chip8
             self.tickInstruction()
 
             // And call self recursively after that delay
-            delay(1.0 / self.speed, closure: self.CPUCycleLoop)
+            delay(1.0 / (1000 * Settings.sharedSettings.renderSpeed), closure: self.CPUCycleLoop)
         }
     }
 

Swift8/Chip8ViewController.swift

@@ -14,12 +14,6 @@ class Chip8ViewController: NSViewController
     // Holds the chip 8 emulator system
     var chip : Chip8?
 
-    // Limiting how fast the emulator can run
-    let minSpeed = 50.0
-    let maxSpeed = 1000.0
-    
-    let speedStep = 50.0
-    
     // Current speed at which the emulator runs
     var currentSpeed : Double {
         get {
@@ -68,12 +62,12 @@ class Chip8ViewController: NSViewController
 
     func increaseSpeed()
     {
-        self.setSpeed(min(self.currentSpeed + self.speedStep, self.maxSpeed))
+        self.setSpeed(min(self.currentSpeed + 0.1, 1))
     }
 
     func decreaseSpeed()
     {
-        self.setSpeed(max(self.currentSpeed - 100, self.minSpeed))
+        self.setSpeed(max(self.currentSpeed - 0.1, 0.1))
     }
 
     func changeTheme(theme: Theme)

Swift8/Info.plist

@@ -34,7 +34,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2</string>
+	<string>0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Swift8/Settings.swift

@@ -85,7 +85,7 @@ class Settings
     private func setDefaultValues()
     {
         self.theme = Themes.defaultTheme
-        self.renderSpeed = 500.0
+        self.renderSpeed = 0.5
         self.playSound = true
     }