Merge pull request #15 from gabrieloc/feature/sktexture

Replace UIImage with SKTexture

Author: gabrieloc

gambatte

@@ -70,6 +70,7 @@ static int const kScreenHeight = 144;
 
 - (void)loadFromSlot:(NSInteger)slot;
 - (void)saveToSlot:(NSInteger)slot;
+- (void)saveSavedata;
 
 @end
 

gambatte_watchOS/GameCore.h

@@ -106,7 +106,11 @@ - (void)runGameLoop
 
 	OESetThreadRealtime(1. / (1. * frameInterval), .007, .03);
 
-	while (!_paused) { @autoreleasepool {
+	while (!gameCoreThread.isCancelled) { @autoreleasepool {
+		if (!gameCoreThread) {
+			return;
+		}
+
 		size_t samples = 2064;
 
 		while (gb.runFor((gambatte::uint_least32_t *)videoBuffer, kScreenWidth,
@@ -140,13 +144,15 @@ - (void)stopEmulation
 	}
 
 	gb.saveSavedata();
-	free(videoBuffer);
-	free(unusedBuffer);
-
-	//	[updateTimer invalidate];
 	_paused = YES;
 	[gameCoreThread cancel];
 	gameCoreThread = nil;
+
+	free(videoBuffer);
+	free(unusedBuffer);
+
+	videoBuffer = nil;
+	unusedBuffer = nil;
 }
 
 - (void)resetEmulation
@@ -156,6 +162,11 @@ - (void)resetEmulation
 	[self startEmulation];
 }
 
+- (void)saveSavedata
+{
+	gb.saveSavedata();
+}
+
 #pragma mark - Input
 
 - (oneway void)updateInput:(GameInput)input selected:(BOOL)selected
@@ -174,6 +185,11 @@ - (uint32_t *)activeInput
 	return activeInput;
 }
 
+- (void)saveData
+{
+	gb.saveSavedata();
+}
+
 - (void)saveToSlot:(NSInteger)slot
 {
 	gb.saveSavedata();

gambatte_watchOS/GameCore.mm

@@ -33,24 +33,24 @@
 
 import CoreGraphics
 import Gambatte_watchOS
+import SpriteKit
 
-extension GameCore {
-
+extension GameplayController {
+	
 	static let colorSpace = CGColorSpaceCreateDeviceRGB()
+	static let screenWidth = Int(kScreenWidth)
+	static let screenHeight = Int(kScreenHeight)
 
 	public func createSnapshot(from buffer: UnsafeMutablePointer<UInt32>) -> UIImage? {
-
-		let width = Int(kScreenWidth)
-		let height = Int(kScreenHeight)
-
+		
 		guard
 			let bitmapContext = CGContext(
 				data: UnsafeMutableRawPointer(buffer),
-				width: width,
-				height: height,
+				width: GameplayController.screenWidth,
+				height: GameplayController.screenHeight,
 				bitsPerComponent: 8,
-				bytesPerRow: 4 * width,
-				space: GameCore.colorSpace,
+				bytesPerRow: MemoryLayout<UInt32>.size * GameplayController.screenWidth,
+				space: GameplayController.colorSpace,
 				bitmapInfo: CGImageByteOrderInfo.order32Little.rawValue | CGImageAlphaInfo.noneSkipFirst.rawValue),
 
 			let cgImage = bitmapContext.makeImage()
@@ -60,4 +60,41 @@ extension GameCore {
 		}
 		return UIImage(cgImage: cgImage)
 	}
+	
+	public func createTexture(from buffer: UnsafeMutablePointer<UInt32>) -> SKTexture {
+		
+		let size = CGSize(width: GameplayController.screenWidth,
+		                  height: GameplayController.screenHeight)
+		let data = createData(from: buffer)
+		let texture = SKTexture(data: data, size: size, flipped: true)
+		texture.filteringMode = .nearest
+		return texture
+	}
+	
+	fileprivate func createData(from buffer: UnsafeMutablePointer<UInt32>) -> Data {
+		
+		let count = Int(kScreenHeight * kScreenWidth) * MemoryLayout<UInt32>.size
+		let bufferPointer =  UnsafeBufferPointer(start: buffer, count: count)
+		return Data(buffer: bufferPointer)
+	}
+
+	// Use this for debugging. Will output a file to the app's documents directory.
+	
+	func logBuffer(_ buffer: UnsafeMutablePointer<UInt32>) {
+		
+		let data = createData(from: buffer)
+		let count = data.count
+		var bytes = [UInt8](repeating: 0, count: count)
+		data.copyBytes(to: &bytes, count: count)
+		
+		let formatter = DateFormatter()
+		formatter.dateStyle = .full
+		let url = GameLoader.shared.cacheURL!.appendingPathComponent(formatter.string(from: Date()))
+		
+		do {
+			try data.write(to: url)
+		} catch {
+		}
+		print("Wrote data to \(url)")
+	}
 }

gambatte_watchOS/GameCoreSnapshots.swift

@@ -32,6 +32,7 @@
 //
 
 import WatchKit
+import SpriteKit
 import Gambatte_watchOS
 
 extension CGPoint {
@@ -41,7 +42,8 @@ extension CGPoint {
 }
 
 class GameplayController: WKInterfaceController {
-	@IBOutlet var image: WKInterfaceImage!
+	@IBOutlet var scene: WKInterfaceSKScene!
+	let spriteNode = SKSpriteNode(imageNamed: "loading")
 
 	var panOrigin: CGPoint?
 	let deadzone: CGFloat = 1
@@ -83,6 +85,22 @@ class GameplayController: WKInterfaceController {
 	@IBAction func selectSelected() { pressInputOnce(.select) }
 	@IBAction func BSelected()		{ pressInputOnce(.B) }
 
+	@IBAction func loadSelected() {
+		guard let core = loader.core else {
+			return
+		}
+		core.resetEmulation()
+		core.load(fromSlot: 0)
+	}
+
+	@IBAction func saveSelected() {
+		guard let core = loader.core else {
+			return
+		}
+		core.resetEmulation()
+		loader.core?.save(toSlot: 0)
+	}
+
 	@IBAction func resetSelected() {
 		loader.core?.resetEmulation()
 	}
@@ -128,7 +146,7 @@ class GameplayController: WKInterfaceController {
 	let loader = GameLoader.shared
 
 	var tick = 0
-	let refreshRate = 20;
+	let refreshRate = 5;
 
 	override func awake(withContext context: Any?) {
 		super.awake(withContext: context)
@@ -138,6 +156,16 @@ class GameplayController: WKInterfaceController {
 			return
 		}
 
+		var size = contentFrame.size
+		size.height *= 0.8
+		let scene = SKScene(size: size)
+
+		spriteNode.size = size
+		spriteNode.position = CGPoint(x: size.width * 0.5,
+		                              y: size.height * 0.5)
+		scene.addChild(spriteNode)
+		self.scene.presentScene(scene)
+		
 		let success: ((GameCore) -> Void) = { [unowned self] (core) in
 			core.didRender = { [weak self] buffer in
 				guard let s = self else {
@@ -169,44 +197,40 @@ class GameplayController: WKInterfaceController {
 		crownSequencer.delegate = self
 		crownSequencer.focus()
 
-		if let core = loader.core {
-			core.load(fromSlot: 0)
-//			core.paused = false
-		}
+		// Too buggy
+//		if let core = loader.core, core.isLoaded {
+//			core.load(fromSlot: 0)
+//		}
 	}
 
 	override func didDeactivate() {
 		super.didDeactivate()
 
 		crownSequencer.delegate = nil
 		crownSequencer.resignFocus()
+
+		loader.core?.saveSavedata()
 
-		if let core = loader.core {
-			core.save(toSlot: 0)
-//			core.paused = true;
-		}
+		// Too buggy
+//		if let core = loader.core, core.isLoaded {
+//			core.save(toSlot: 0)
+//		}
 	}
 
 	var lastSnapshot: UIImage?
 
 	func updateSnapshotIfNeeded(with buffer: UnsafeMutablePointer<UInt32>) {
 
 		tick += 1
-		if tick > refreshRate || loader.core == nil {
+		if tick < refreshRate || loader.core == nil {
 			return
 		}
-		
-		let snapshot = loader.core!.createSnapshot(from: buffer)
-		
-		// compare before updating. Not sure if faster.
-//		if let lhs = lastSnapshot, let rhs = snapshot, lhs.equalPixels(to: rhs) {
-//			return
-//		}
-//		lastSnapshot = snapshot
-		
-		DispatchQueue.main.async {
-			self.image.setImage(snapshot)
+
+		let texture = createTexture(from: buffer)
+		texture.preload {
+			self.spriteNode.texture = texture
 		}
+
 		tick = 0
 	}
 

giovanni_watchOS/Assets.xcassets/loading.imageset/Contents.json giovanni WatchKit Extension/Assets.xcassets/loading.imageset/Contents.json

@@ -55,6 +55,14 @@ class LibraryController: WKInterfaceController {
 
 		reloadGames()
 	}
+
+	override func didAppear() {
+		super.didAppear()
+
+		if GameLoader.shared.core != nil {
+			GameLoader.shared.core = nil
+		}
+	}
 
 	override func willActivate() {
 		super.willActivate()

giovanni_watchOS/Assets.xcassets/loading.imageset/loading.pdf giovanni WatchKit Extension/Assets.xcassets/loading.imageset/loading.pdf

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="12113" systemVersion="16D32" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="7hZ-R3-GZe">
+<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="7hZ-R3-GZe">
     <device id="watch42" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12078"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="12027"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="12029"/>
     </dependencies>
     <scenes>
         <!--GamePlay-->
         <scene sceneID="aou-V4-d1y">
             <objects>
                 <controller identifier="GamePlay" id="AgC-eL-Hgc" customClass="GameplayController" customModule="giovanni_WatchKit_Extension">
                     <items>
-                        <imageView width="1" height="0.80000000000000004" alignment="left" image="loading" contentMode="scaleAspectFill" id="aJl-Oj-bNg">
+                        <spriteKitScene height="0.80000000000000004" alignment="left" id="ELq-fe-WSa">
                             <gestureRecognizers>
-                                <panGestureRecognizer id="0MQ-NG-tvP">
+                                <panGestureRecognizer id="fON-GL-rsc">
                                     <connections>
-                                        <action selector="panUpdated:" destination="AgC-eL-Hgc" id="CA6-VH-l1R"/>
+                                        <action selector="panUpdated:" destination="AgC-eL-Hgc" id="ZVb-df-Eb3"/>
                                     </connections>
                                 </panGestureRecognizer>
-                                <tapGestureRecognizer id="eXU-ai-JEc">
+                                <tapGestureRecognizer id="dCs-LC-B2n">
                                     <connections>
-                                        <action selector="tapUpdated:" destination="AgC-eL-Hgc" id="qqH-hx-H41"/>
+                                        <action selector="tapUpdated:" destination="AgC-eL-Hgc" id="Mdf-ba-AUm"/>
                                     </connections>
                                 </tapGestureRecognizer>
                             </gestureRecognizers>
-                        </imageView>
+                        </spriteKitScene>
                         <group width="1" height="0.20000000000000001" alignment="left" id="OfT-pQ-dwT">
                             <items>
                                 <group width="0.10000000000000001" height="1" alignment="left" layout="vertical" spacing="0.0" id="jHt-DP-AmP">
@@ -67,6 +67,16 @@ SL</string>
                     </items>
                     <menu key="menu" id="nn1-cq-hAR">
                         <items>
+                            <menuItem title="Load" icon="resume" id="BpF-sx-863">
+                                <connections>
+                                    <action selector="loadSelected" destination="AgC-eL-Hgc" id="fsa-bi-ocK"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save" icon="accept" id="pIq-Uh-5hH">
+                                <connections>
+                                    <action selector="saveSelected" destination="AgC-eL-Hgc" id="T4K-MP-SxT"/>
+                                </connections>
+                            </menuItem>
                             <menuItem title="Reset" icon="repeat" id="JZ8-a9-1cp">
                                 <connections>
                                     <action selector="resetSelected" destination="AgC-eL-Hgc" id="ZNK-Kz-hgl"/>
@@ -77,7 +87,7 @@ SL</string>
                     <connections>
                         <outlet property="ALabel" destination="e8e-tB-5Zv" id="gmP-Xj-kCc"/>
                         <outlet property="DPadLabel" destination="cVh-ps-Gkz" id="oed-H8-hIw"/>
-                        <outlet property="image" destination="aJl-Oj-bNg" id="AY5-GI-9Ll"/>
+                        <outlet property="scene" destination="ELq-fe-WSa" id="8Pd-b5-QQL"/>
                     </connections>
                 </controller>
             </objects>