Refactor board assets
This commit is contained in:
parent
91d5322795
commit
2090698fc4
4 changed files with 33 additions and 12 deletions
|
|
@ -6,11 +6,12 @@
|
|||
// Copyright © 2020 Adafruit. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
import SceneKit
|
||||
|
||||
extension AdafruitBoard {
|
||||
|
||||
var asset3DFileName: String? {
|
||||
var assetScene: SCNScene? {
|
||||
var filename: String?
|
||||
if let model = self.model {
|
||||
switch model {
|
||||
|
|
@ -23,6 +24,31 @@ extension AdafruitBoard {
|
|||
}
|
||||
}
|
||||
|
||||
return filename
|
||||
let scene: SCNScene?
|
||||
if let filename = filename {
|
||||
scene = SCNScene(named: filename)
|
||||
scene?.background.contents = UIColor.clear
|
||||
}
|
||||
else {
|
||||
scene = nil
|
||||
}
|
||||
|
||||
return scene
|
||||
}
|
||||
|
||||
var assetFrontImage: UIImage? {
|
||||
var name: String?
|
||||
if let model = self.model {
|
||||
switch model {
|
||||
case .circuitPlaygroundBluefruit:
|
||||
name = "board_cpb"
|
||||
case .clue_nRF52840:
|
||||
name = "board_clue_front"
|
||||
default:
|
||||
name = nil
|
||||
}
|
||||
}
|
||||
|
||||
return name == nil ? nil : UIImage(named: name!)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ https://github.com/mindsnacks/MSWeakTimer";
|
|||
"scanner_errordiscoveringservices" = "Error discovering peripheral services";
|
||||
"scanner_peripheraldisconnected" = "Peripheral disconnected";
|
||||
|
||||
"scanner_searching" = "Finding devices...";
|
||||
"scanner_searching" = "Finding Adafruit devices...";
|
||||
"scanner_subtitle" = "Select a Bluefruit device to connect to:";
|
||||
"scanner_unnamed" = "<Unknown>";
|
||||
|
||||
|
|
|
|||
|
|
@ -29,10 +29,8 @@ class AccelerometerViewController: ModuleViewController {
|
|||
valuesPanelViewController = (addPanelViewController(storyboardIdentifier: AccelerometerPanelViewController.kIdentifier) as! AccelerometerPanelViewController)
|
||||
|
||||
// Load scene
|
||||
if let asset3DFileName = AdafruitBoardsManager.shared.currentBoard?.asset3DFileName {
|
||||
let scene = SCNScene(named: asset3DFileName)!
|
||||
scene.background.contents = UIColor.clear
|
||||
|
||||
if let scene = AdafruitBoardsManager.shared.currentBoard?.assetScene {
|
||||
|
||||
circuitNode = scene.rootNode.childNode(withName: "root", recursively: false)!
|
||||
|
||||
// Setup scene
|
||||
|
|
|
|||
|
|
@ -29,10 +29,7 @@ class QuaternionViewController: ModuleViewController {
|
|||
valuesPanelViewController = (addPanelViewController(storyboardIdentifier: QuaternionPanelViewController.kIdentifier) as! QuaternionPanelViewController)
|
||||
|
||||
// Load scene
|
||||
if let asset3DFileName = AdafruitBoardsManager.shared.currentBoard?.asset3DFileName {
|
||||
let scene = SCNScene(named: asset3DFileName)!
|
||||
scene.background.contents = UIColor.clear
|
||||
|
||||
if let scene = AdafruitBoardsManager.shared.currentBoard?.assetScene {
|
||||
circuitNode = scene.rootNode.childNode(withName: "root", recursively: false)!
|
||||
|
||||
// Setup scene
|
||||
|
|
|
|||
Loading…
Reference in a new issue