-
Notifications
You must be signed in to change notification settings - Fork 226
Contained #224
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ben-e-james
wants to merge
3
commits into
bloominstituteoftechnology:master
Choose a base branch
from
ben-e-james:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Contained #224
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
Contained/Contained.xcodeproj/project.xcworkspace/contents.xcworkspacedata
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
8 changes: 8 additions & 0 deletions
8
Contained/Contained.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>IDEDidComputeMac32BitWarning</key> | ||
| <true/> | ||
| </dict> | ||
| </plist> |
Binary file added
BIN
+49 KB
...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
14 changes: 14 additions & 0 deletions
14
...ained/Contained.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>SchemeUserState</key> | ||
| <dict> | ||
| <key>Contained.xcscheme_^#shared#^_</key> | ||
| <dict> | ||
| <key>orderHint</key> | ||
| <integer>0</integer> | ||
| </dict> | ||
| </dict> | ||
| </dict> | ||
| </plist> |
98 changes: 98 additions & 0 deletions
98
Contained/Contained/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "iphone", | ||
| "scale" : "2x", | ||
| "size" : "20x20" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "scale" : "3x", | ||
| "size" : "20x20" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "scale" : "2x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "scale" : "3x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "scale" : "2x", | ||
| "size" : "40x40" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "scale" : "3x", | ||
| "size" : "40x40" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "scale" : "2x", | ||
| "size" : "60x60" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "scale" : "3x", | ||
| "size" : "60x60" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "20x20" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "20x20" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "40x40" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "40x40" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "76x76" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "76x76" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "83.5x83.5" | ||
| }, | ||
| { | ||
| "idiom" : "ios-marketing", | ||
| "scale" : "1x", | ||
| "size" : "1024x1024" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // | ||
| // AppDelegate.swift | ||
| // Contained | ||
| // | ||
| // Created by Dojo on 6/3/20. | ||
| // Copyright © 2020 Dojo. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| @UIApplicationMain | ||
| class AppDelegate: UIResponder, UIApplicationDelegate { | ||
|
|
||
|
|
||
|
|
||
| func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { | ||
| // Override point for customization after application launch. | ||
| return true | ||
| } | ||
|
|
||
| // MARK: UISceneSession Lifecycle | ||
|
|
||
| func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { | ||
| // Called when a new scene session is being created. | ||
| // Use this method to select a configuration to create the new scene with. | ||
| return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) | ||
| } | ||
|
|
||
| func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) { | ||
| // Called when the user discards a scene session. | ||
| // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. | ||
| // Use this method to release any resources that were specific to the discarded scenes, as they will not return. | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // | ||
| // CustomScene.swift | ||
| // Contained | ||
| // | ||
| // Created by Dojo on 6/3/20. | ||
| // Copyright © 2020 Dojo. All rights reserved. | ||
| // | ||
|
|
||
| import SpriteKit | ||
|
|
||
| class CustomScene: SKScene { | ||
| let crab = SKSpriteNode() | ||
|
|
||
| // Add and center child, initializing animation sequence | ||
| override func sceneDidLoad() { | ||
| super.sceneDidLoad() | ||
| addChild(crab) | ||
| crab.loadTextures(named: "HappyCrab", forKey: SKSpriteNode.textureKey) | ||
| crab.position = CGPoint(x: frame.midX, y: frame.midY) | ||
| } | ||
|
|
||
| // Move to touch | ||
| public override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) { | ||
|
|
||
| // Fetch a touch or leave | ||
| guard !touches.isEmpty, let touch = touches.first else { return } | ||
|
|
||
| // Retrieve position | ||
| let position = touch.location(in: self) | ||
|
|
||
| // Create move action | ||
| let actionDuration = 1.0 | ||
| let moveAction = SKAction.move(to: position, duration: actionDuration) | ||
|
|
||
| let rollAction = SKAction.rotate(byAngle: CGFloat.pi * 2, duration: actionDuration) | ||
| let zoomAction = SKAction.scale(by: 1.3, duration: 0.3) | ||
| let unzoomAction = SKAction.scale(to: 1.0, duration: 0.1) | ||
|
|
||
| switch Settings.shared.shouldZoom { | ||
| case false: | ||
| crab.run(moveAction) | ||
| case true: | ||
| let sequenceAction = SKAction.sequence([zoomAction, moveAction, unzoomAction]) | ||
| crab.run(sequenceAction) | ||
| } | ||
|
|
||
| if Settings.shared.shouldRoll { | ||
| crab.run(rollAction) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // | ||
| // GameViewController.swift | ||
| // Contained | ||
| // | ||
| // Created by Dojo on 6/3/20. | ||
| // Copyright © 2020 Dojo. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
| import SpriteKit | ||
|
|
||
| class GameViewController: UIViewController { | ||
| @IBOutlet weak var skview: SKView! | ||
|
|
||
| var skscene: CustomScene? = nil | ||
|
|
||
| override func viewDidAppear(_ animated: Bool) { | ||
| super.viewDidAppear(animated) | ||
| skscene = CustomScene(size: view.bounds.size) | ||
| skview.presentScene(skscene) | ||
| } | ||
| } | ||
| // Do any additional setup after loading the view. | ||
|
|
||
|
|
||
| /* | ||
| // MARK: - Navigation | ||
|
|
||
| // In a storyboard-based application, you will often want to do a little preparation before navigation | ||
| override func prepare(for segue: UIStoryboardSegue, sender: Any?) { | ||
| // Get the new view controller using segue.destination. | ||
| // Pass the selected object to the new view controller. | ||
| } | ||
| */ | ||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // | ||
| // InfoViewController.swift | ||
| // Contained | ||
| // | ||
| // Created by Dojo on 6/3/20. | ||
| // Copyright © 2020 Dojo. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class InfoViewController: UIViewController { | ||
|
|
||
|
|
||
| @IBAction func done(_ sender: Any) { | ||
| navigationController?.popToRootViewController(animated: true) | ||
| } | ||
|
|
||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
|
|
||
| // Do any additional setup after loading the view. | ||
| } | ||
|
|
||
|
|
||
| /* | ||
| // MARK: - Navigation | ||
|
|
||
| // In a storyboard-based application, you will often want to do a little preparation before navigation | ||
| override func prepare(for segue: UIStoryboardSegue, sender: Any?) { | ||
| // Get the new view controller using segue.destination. | ||
| // Pass the selected object to the new view controller. | ||
| } | ||
| */ | ||
|
|
||
| } |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // | ||
| // SceneDelegate.swift | ||
| // Contained | ||
| // | ||
| // Created by Dojo on 6/3/20. | ||
| // Copyright © 2020 Dojo. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class SceneDelegate: UIResponder, UIWindowSceneDelegate { | ||
|
|
||
| var window: UIWindow? | ||
|
|
||
|
|
||
| func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { | ||
| // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. | ||
| // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. | ||
| // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). | ||
| guard let _ = (scene as? UIWindowScene) else { return } | ||
| } | ||
|
|
||
| func sceneDidDisconnect(_ scene: UIScene) { | ||
| // Called as the scene is being released by the system. | ||
| // This occurs shortly after the scene enters the background, or when its session is discarded. | ||
| // Release any resources associated with this scene that can be re-created the next time the scene connects. | ||
| // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead). | ||
| } | ||
|
|
||
| func sceneDidBecomeActive(_ scene: UIScene) { | ||
| // Called when the scene has moved from an inactive state to an active state. | ||
| // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. | ||
| } | ||
|
|
||
| func sceneWillResignActive(_ scene: UIScene) { | ||
| // Called when the scene will move from an active state to an inactive state. | ||
| // This may occur due to temporary interruptions (ex. an incoming phone call). | ||
| } | ||
|
|
||
| func sceneWillEnterForeground(_ scene: UIScene) { | ||
| // Called as the scene transitions from the background to the foreground. | ||
| // Use this method to undo the changes made on entering the background. | ||
| } | ||
|
|
||
| func sceneDidEnterBackground(_ scene: UIScene) { | ||
| // Called as the scene transitions from the foreground to the background. | ||
| // Use this method to save data, release shared resources, and store enough scene-specific state information | ||
| // to restore the scene back to its current state. | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // | ||
| // SettingsViewController.swift | ||
| // Contained | ||
| // | ||
| // Created by Dojo on 6/3/20. | ||
| // Copyright © 2020 Dojo. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class SettingsViewController: UIViewController { | ||
|
|
||
| @IBAction func toggleZoom(_ sender: UISwitch) { | ||
| Settings.shared.shouldRoll = sender.isOn | ||
| } | ||
|
|
||
| @IBAction func toggleRoll(_ sender: UISwitch) { | ||
| Settings.shared.shouldZoom = sender.isOn | ||
| } | ||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
|
|
||
| // Do any additional setup after loading the view. | ||
| } | ||
|
|
||
|
|
||
| /* | ||
| // MARK: - Navigation | ||
|
|
||
| // In a storyboard-based application, you will often want to do a little preparation before navigation | ||
| override func prepare(for segue: UIStoryboardSegue, sender: Any?) { | ||
| // Get the new view controller using segue.destination. | ||
| // Pass the selected object to the new view controller. | ||
| } | ||
| */ | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These are swapped (oops) and not actually hooked up to the storyboard. Fixing that, it works great!