Made all the nodes public

Author: NathanFlurry

VPL.xcodeproj/project.pbxproj

@@ -9,6 +9,11 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>VPLEditor.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>

VPL.xcodeproj/xcuserdata/nathanflurry.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -26,10 +26,10 @@ public protocol Node: class {
 }
 
 extension Node {
-    var inputTrigger: InputTrigger? { return nil }
-    var inputValues: [InputValue] { return [] }
-    var inputVariables: [InputVariable] { return [] }
-    var output: NodeOutput { return .none }
+    public var inputTrigger: InputTrigger? { return nil }
+    public var inputValues: [InputValue] { return [] }
+    public var inputVariables: [InputVariable] { return [] }
+    public var output: NodeOutput { return .none }
 }
 
 extension Node {

VPL/Data/Node.swift

@@ -0,0 +1,13 @@
+import VPLEditor
+import UIKit
+import PlaygroundSupport
+
+let canvas = CanvasViewController()
+
+// Create and insert the display node
+
+
+baseNode = DisplayNode(node: BaseNode())
+insert(node: baseNode, at: CGPoint(x: contentSize.width / 2, y: contentSize.height / 2))
+
+PlaygroundPage.current.liveView = canvas

VPL/Playground.playground/Contents.swift

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='ios'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>

VPL/Playground.playground/contents.xcplayground

@@ -19,7 +19,7 @@ public class CanvasViewController: UIViewController {
     var outputView: CodeOutputView!
 
     /// Canvas that holds all of the nodes
-    var nodeCanvas: DisplayNodeCanvas!
+    public private(set) var canvas: DisplayNodeCanvas!
 
     /// Canvas for all of the drawing for quick shortcuts
     var drawingCanvas: DrawingCanvas!
@@ -40,21 +40,21 @@ public class CanvasViewController: UIViewController {
         outputView.heightAnchor.constraint(equalToConstant: isInPlayground ? 260 : 180).activate()
 
         // Add the node canvas
-        nodeCanvas = DisplayNodeCanvas(frame: view.bounds)
-        nodeCanvas.updateCallback = {
-            let assembled = self.nodeCanvas.assemble()
+        canvas = DisplayNodeCanvas(frame: view.bounds)
+        canvas.updateCallback = {
+            let assembled = self.canvas.assemble()
             self.outputView.render(code: assembled.trimmingCharacters(in: .whitespacesAndNewlines))
         }
-        view.addSubview(nodeCanvas)
-        nodeCanvas.translatesAutoresizingMaskIntoConstraints = false
-        nodeCanvas.leftAnchor.constraint(equalTo: view.leftAnchor).activate()
-        nodeCanvas.rightAnchor.constraint(equalTo: view.rightAnchor).activate()
-        nodeCanvas.topAnchor.constraint(equalTo: view.topAnchor).activate()
-        nodeCanvas.bottomAnchor.constraint(equalTo: outputView.topAnchor).activate()
+        view.addSubview(canvas)
+        canvas.translatesAutoresizingMaskIntoConstraints = false
+        canvas.leftAnchor.constraint(equalTo: view.leftAnchor).activate()
+        canvas.rightAnchor.constraint(equalTo: view.rightAnchor).activate()
+        canvas.topAnchor.constraint(equalTo: view.topAnchor).activate()
+        canvas.bottomAnchor.constraint(equalTo: outputView.topAnchor).activate()
 
         // Add drawing canvas
-        drawingCanvas = DrawingCanvas(frame: nodeCanvas.bounds)
-        nodeCanvas.backgroundView = drawingCanvas
+        drawingCanvas = DrawingCanvas(frame: canvas.bounds)
+        canvas.backgroundView = drawingCanvas
         drawingCanvas.onInputStart = {
             // Cancel the timer
             self.commitDrawingTimer?.invalidate()
@@ -125,7 +125,7 @@ public class CanvasViewController: UIViewController {
 
         // Create and insert the display node
         let displayNode = DisplayNode(node: node)
-        nodeCanvas.insert(node: displayNode, at: position)
+        canvas.insert(node: displayNode, at: position)
 
         return displayNode
     }

VPL/Rendering/CanvasViewController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class DisplayNode: UIView, UIGestureRecognizerDelegate {
+public class DisplayNode: UIView, UIGestureRecognizerDelegate {
     /// The underlying node data.
     var node: DisplayableNode
 
@@ -19,9 +19,9 @@ class DisplayNode: UIView, UIGestureRecognizerDelegate {
     var sockets: [DisplayNodeSocket] = []
 
     /// The content view for this node.
-    var contentView: DisplayableNodeContentView?
+    public var contentView: DisplayableNodeContentView?
 
-    init(node: DisplayableNode) {
+    public init(node: DisplayableNode) {
         // Save the node and canvas
         self.node = node
 
@@ -129,7 +129,7 @@ class DisplayNode: UIView, UIGestureRecognizerDelegate {
         }
     }
 
-    required init(coder: NSCoder) {
+    public required init(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
@@ -209,7 +209,7 @@ class DisplayNode: UIView, UIGestureRecognizerDelegate {
         canvas?.remove(node: self)
     }
 
-    override func layoutSubviews() {
+    public override func layoutSubviews() {
         // Size to fit content
         frame.size = systemLayoutSizeFitting(UILayoutFittingCompressedSize)
     }
@@ -247,7 +247,7 @@ class DisplayNode: UIView, UIGestureRecognizerDelegate {
         layer.add(groupAnim, forKey: "shadowAnim")
     }
 
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
         // If the content view absorbs touches, make sure the touch isn't inside
         if let contentView = contentView, contentView.absorbsTouches {
             return !contentView.point(inside: touch.location(in: contentView), with: nil)

VPL/Rendering/Node/DisplayNode.swift

@@ -8,9 +8,9 @@
 
 import UIKit
 
-class DisplayNodeCanvas: UIScrollView, UIScrollViewDelegate {
+public class DisplayNodeCanvas: UIScrollView, UIScrollViewDelegate {
     /// List of all nodes in the canvas.
-    var nodes: [DisplayNode]
+    public private(set) var nodes: [DisplayNode]
 
     /// View that is drawn behind all other views.
     var backgroundView: UIView? {
@@ -33,7 +33,7 @@ class DisplayNodeCanvas: UIScrollView, UIScrollViewDelegate {
     var updateCallback: (() -> Void)?
 
     /// The starting node that all other nodes build off of.
-    var baseNode: DisplayNode!
+    public private(set) var baseNode: DisplayNode!
 
     override init(frame: CGRect) {
         // Create new node list
@@ -73,17 +73,17 @@ class DisplayNodeCanvas: UIScrollView, UIScrollViewDelegate {
         contentOffset = CGPoint(x: contentSize.width / 2 - 200, y: contentSize.height / 2 - 200)
     }
 
-    required init?(coder aDecoder: NSCoder) {
+    public required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-    override func layoutSubviews() {
+    public override func layoutSubviews() {
         // Resize all views
         backgroundView?.frame.size = bounds.size
         overlayView.frame.size = bounds.size
     }
 
-    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
         // Move the background and overlay with the view
         backgroundView?.frame.origin = scrollView.contentOffset
         overlayView.frame.origin = scrollView.contentOffset
@@ -93,7 +93,7 @@ class DisplayNodeCanvas: UIScrollView, UIScrollViewDelegate {
     }
 
     /// Assembles all of the code.
-    func assemble() -> String {
+    public func assemble() -> String {
         var output = ""
 
         // Assemble each function
@@ -109,7 +109,7 @@ class DisplayNodeCanvas: UIScrollView, UIScrollViewDelegate {
     }
 
     /// Adds a node to the canvas.
-    func insert(node: DisplayNode, at position: CGPoint, absolutePosition: Bool = false) {
+    public func insert(node: DisplayNode, at position: CGPoint, absolutePosition: Bool = false) {
         assert(!nodes.contains(node))
         assert(node.canvas == nil)
 
@@ -139,7 +139,7 @@ class DisplayNodeCanvas: UIScrollView, UIScrollViewDelegate {
 
     /// Called when any interaction occurs with the node and it needs to be
     /// updated.
-    func updated(node: DisplayNode) {
+    public func updated(node: DisplayNode) {
         // Bring node to front under overlay
         bringSubview(toFront: node)
         bringSubview(toFront: overlayView)
@@ -155,7 +155,7 @@ class DisplayNodeCanvas: UIScrollView, UIScrollViewDelegate {
     }
 
     /// Removes a ndoe from the canvas.
-    func remove(node: DisplayNode) {
+    public func remove(node: DisplayNode) {
         assert(nodes.contains(node))
         assert(node.canvas == self)