Skip to content

Fix issue 22 - ARSCNViewDelegate Handling Content Updates #25

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.

Sign up for GitHub

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
farandal wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix issue 22 - ARSCNViewDelegate Handling Content Updates #25

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98eb73d
Fix issue 22 - ARSCNViewDelegate Handling Content Updates
farandal Oct 24, 2017
0084c44
fix typo
farandal Oct 24, 2017
c7dd03b
change implementation approach
farandal Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 39 additions & 5 deletions MapboxARKit/AnnotationManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ import CoreLocation
@objc optional func node(for annotation: Annotation) -> SCNNode?
@objc optional func session(_ session: ARSession, cameraDidChangeTrackingState camera: ARCamera)

@objc optional func renderer(_ renderer: SCNSceneRenderer, time: TimeInterval)

@objc optional func renderer(_ renderer: SCNSceneRenderer, addedNode: SCNNode, mbAnchor anchor: MBARAnchor)
@objc optional func renderer(_ renderer: SCNSceneRenderer, updatedNode: SCNNode, mbAnchor anchor: MBARAnchor)
@objc optional func renderer(_ renderer: SCNSceneRenderer, removedNode: SCNNode, mbAnchor anchor: MBARAnchor)

@objc optional func renderer(_ renderer: SCNSceneRenderer, addedNode: SCNNode, arAnchor anchor: ARAnchor)
@objc optional func renderer(_ renderer: SCNSceneRenderer, updatedNode: SCNNode, arAnchor anchor: ARAnchor)
@objc optional func renderer(_ renderer: SCNSceneRenderer, removedNode: SCNNode, arAnchor anchor: ARAnchor)

}

public class AnnotationManager: NSObject {
Expand Down Expand Up @@ -85,10 +95,32 @@ extension AnnotationManager: ARSCNViewDelegate {
delegate?.session?(session, cameraDidChangeTrackingState: camera)
}


public func renderer(_ renderer: SCNSceneRenderer, updateAtTime time: TimeInterval) {
delegate?.renderer?(renderer, time: time)
}

public func renderer(_ renderer: SCNSceneRenderer, didUpdate node: SCNNode, for anchor: ARAnchor) {
if let anchor = anchor as? MBARAnchor {
delegate?.renderer?(renderer, updatedNode: node, mbAnchor: anchor )
} else {
delegate?.renderer?(renderer, updatedNode: node,arAnchor: anchor )
}
}

public func renderer(_ renderer: SCNSceneRenderer, didRemove node: SCNNode, for anchor: ARAnchor) {
if let anchor = anchor as? MBARAnchor {
delegate?.renderer?(renderer, removedNode: node,mbAnchor: anchor )
} else {
delegate?.renderer?(renderer, removedNode: node,arAnchor: anchor )
}
}

public func renderer(_ renderer: SCNSceneRenderer, didAdd node: SCNNode, for anchor: ARAnchor) {

// Handle MBARAnchor
if let anchor = anchor as? MBARAnchor {

let annotation = annotationsByAnchor[anchor]!

var newNode: SCNNode!
Expand All @@ -99,26 +131,28 @@ extension AnnotationManager: ARSCNViewDelegate {
} else {
newNode = createDefaultNode()
}

if let calloutImage = annotation.calloutImage {
let calloutNode = createCalloutNode(with: calloutImage, node: newNode)
newNode.addChildNode(calloutNode)
}

node.addChildNode(newNode)

annotationsByNode[newNode] = annotation
delegate?.renderer?(renderer, addedNode: node,mbAnchor: anchor )
} else {
delegate?.renderer?(renderer, addedNode: node, arAnchor: anchor )
}

// TODO: let delegate provide a node for a non-MBARAnchor
}

// MARK: - Utility methods for ARSCNViewDelegate

func createDefaultNode() -> SCNNode {

let geometry = SCNSphere(radius: 0.2)
geometry.firstMaterial?.diffuse.contents = UIColor.red
return SCNNode(geometry: geometry)

}

func createCalloutNode(with image: UIImage, node: SCNNode) -> SCNNode {
Expand Down