diff --git a/GoldWars/GoldWars/Actions.sks b/GoldWars/GoldWars/Actions.sks deleted file mode 100644 index 0530520..0000000 Binary files a/GoldWars/GoldWars/Actions.sks and /dev/null differ diff --git a/GoldWars/GoldWars/GameScene.sks b/GoldWars/GoldWars/GameScene.sks index 4fe4d9f..693e11d 100644 Binary files a/GoldWars/GoldWars/GameScene.sks and b/GoldWars/GoldWars/GameScene.sks differ diff --git a/GoldWars/GoldWars/GameScene.swift b/GoldWars/GoldWars/GameScene.swift index fa462af..6cc99d3 100644 --- a/GoldWars/GoldWars/GameScene.swift +++ b/GoldWars/GoldWars/GameScene.swift @@ -15,96 +15,41 @@ class GameScene: SKScene { var graphs = [String : GKGraph]() private var lastUpdateTime : TimeInterval = 0 - private var label : SKLabelNode? - private var spinnyNode : SKShapeNode? override func sceneDidLoad() { - - self.lastUpdateTime = 0 - // Get label node from scene and store it for use later - self.label = self.childNode(withName: "//helloLabel") as? SKLabelNode - if let label = self.label { - label.alpha = 0.0 - label.run(SKAction.fadeIn(withDuration: 2.0)) - } - - // Create shape node to use during mouse interaction - let w = (self.size.width + self.size.height) * 0.05 - self.spinnyNode = SKShapeNode.init(rectOf: CGSize.init(width: w, height: w), cornerRadius: w * 0.3) - - if let spinnyNode = self.spinnyNode { - spinnyNode.lineWidth = 2.5 - - spinnyNode.run(SKAction.repeatForever(SKAction.rotate(byAngle: CGFloat(Double.pi), duration: 1))) - spinnyNode.run(SKAction.sequence([SKAction.wait(forDuration: 0.5), - SKAction.fadeOut(withDuration: 0.5), - SKAction.removeFromParent()])) - } } - func touchDown(atPoint pos : CGPoint) { - if let n = self.spinnyNode?.copy() as! SKShapeNode? { - n.position = pos - n.strokeColor = SKColor.green - self.addChild(n) - } + } func touchMoved(toPoint pos : CGPoint) { - if let n = self.spinnyNode?.copy() as! SKShapeNode? { - n.position = pos - n.strokeColor = SKColor.blue - self.addChild(n) - } + } func touchUp(atPoint pos : CGPoint) { - if let n = self.spinnyNode?.copy() as! SKShapeNode? { - n.position = pos - n.strokeColor = SKColor.red - self.addChild(n) - } + } override func touchesBegan(_ touches: Set, with event: UIEvent?) { - if let label = self.label { - label.run(SKAction.init(named: "Pulse")!, withKey: "fadeInOut") - } - - for t in touches { self.touchDown(atPoint: t.location(in: self)) } + } override func touchesMoved(_ touches: Set, with event: UIEvent?) { - for t in touches { self.touchMoved(toPoint: t.location(in: self)) } + } override func touchesEnded(_ touches: Set, with event: UIEvent?) { - for t in touches { self.touchUp(atPoint: t.location(in: self)) } + } override func touchesCancelled(_ touches: Set, with event: UIEvent?) { - for t in touches { self.touchUp(atPoint: t.location(in: self)) } + } - + override func update(_ currentTime: TimeInterval) { - // Called before each frame is rendered - - // Initialize _lastUpdateTime if it has not already been - if (self.lastUpdateTime == 0) { - self.lastUpdateTime = currentTime - } - - // Calculate time since last update - let dt = currentTime - self.lastUpdateTime - - // Update entities - for entity in self.entities { - entity.update(deltaTime: dt) - } - - self.lastUpdateTime = currentTime + } }