Skip to content

Commit

Permalink
Gesture lag and review fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@astojilj
astojilj committed Mar 3, 2021
1 parent 06cdfe7 commit 73f8a45
Showing 1 changed file with 58 additions and 39 deletions.
97 changes: 58 additions & 39 deletions Examples/Examples/All Examples/SceneKitExample.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ public class SceneKitExample: UIViewController, ExampleProtocol, CustomLayerHost

internal var mapView: MapView!
public var peer: MBXPeerWrapper?

let modelOrigin = CLLocationCoordinate2D(latitude: -35.39847, longitude: 148.9819)
var renderer: SCNRenderer!
var scene: SCNScene!
var modelNode: SCNNode!
var cameraNode: SCNNode!
var textNode: SCNNode!
var useCPUOcclusion = false

override public func viewDidLoad() {
super.viewDidLoad()
Expand Down Expand Up @@ -42,18 +43,18 @@ public class SceneKitExample: UIViewController, ExampleProtocol, CustomLayerHost
// The below line is used for internal testing purposes only.
self.finish()
}

func addModelAndTerrain() {
try! mapView.__map.addStyleCustomLayer(forLayerId: "Custom",
layerHost: self,
layerPosition: nil)

var demSource = RasterDemSource()
demSource.url = "mapbox://mapbox.mapbox-terrain-dem-v1"
demSource.tileSize = 512
demSource.maxzoom = 14.0
mapView.style.addSource(source: demSource, identifier: "mapbox-dem")
let terrain = Terrain(sourceId: "mapbox-dem");
let terrain = Terrain(sourceId: "mapbox-dem")
_ = self.mapView.style.setTerrain(terrain)

var skyLayer = SkyLayer(id: "sky-layer")
Expand All @@ -62,45 +63,46 @@ public class SceneKitExample: UIViewController, ExampleProtocol, CustomLayerHost
skyLayer.paint?.skyAtmosphereSunIntensity = .constant(15.0)

_ = self.mapView.style.addLayer(layer: skyLayer)

// Re-use terrain source for hillshade
let map = self.mapView.__map!
let properties = [
"id": "terrain_hillshade",
"type": "hillshade",
"source": "mapbox-dem",
"hillshade-illumination-anchor": "map"
] as [String : Any]
] as [ String: Any ]

let insertHillshadeBelow = try! map.styleLayerExists(forLayerId: "water") ?
LayerPosition(above: nil, below: "water", at: nil) : try! map.styleLayerExists(forLayerId: "hillshade") ?
LayerPosition(above: nil, below: "hillshade", at: nil) : nil;
LayerPosition(above: nil, below: "hillshade", at: nil) : nil
try! map.addStyleLayer(forProperties: properties, layerPosition: insertHillshadeBelow)
}

public func renderingWillStart(_ metalDevice: MTLDevice, colorPixelFormat: UInt, depthStencilPixelFormat: UInt) {
renderer = SCNRenderer(device:metalDevice)
renderer = SCNRenderer(device: metalDevice)
scene = SCNScene()
renderer.scene = scene

modelNode = SCNScene(named:"34M_17")?.rootNode;
modelNode = SCNScene(named: "34M_17")?.rootNode
scene.rootNode.addChildNode(modelNode)
cameraNode = SCNNode();
let camera = SCNCamera();
cameraNode.camera = camera;
camera.usesOrthographicProjection = false;
scene.rootNode.addChildNode(cameraNode);
renderer.pointOfView = cameraNode;

cameraNode = SCNNode()
let camera = SCNCamera()
cameraNode.camera = camera
camera.usesOrthographicProjection = false
scene.rootNode.addChildNode(cameraNode)
renderer.pointOfView = cameraNode
self.setupLight()
// In order to use depth occlusion, align with gl-native Z handling (doesn't use reverse Z).
if #available(iOS 13.0, *) {
renderer.usesReverseZ = false
} else {
// Fallback on earlier versions, disable depth in render()
self.useCPUOcclusion = true
}
}

func setupLight() {
// Ambient light
let ambientLight = SCNNode()
Expand All @@ -114,7 +116,7 @@ public class SceneKitExample: UIViewController, ExampleProtocol, CustomLayerHost
lightNode.light?.type = SCNLight.LightType.directional
lightNode.light?.orthographicScale = 30
lightNode.light?.color = UIColor(white: 0.8, alpha: 1.0)
lightNode.position = SCNVector3Make(-50, 100, 100);
lightNode.position = SCNVector3Make(-50, 100, 100)
lightNode.light?.zNear = 1
lightNode.light?.zFar = 1000
lightNode.light?.intensity = 2000
Expand All @@ -130,27 +132,27 @@ public class SceneKitExample: UIViewController, ExampleProtocol, CustomLayerHost

internal func makeTranslationMatrix(tx: Double, ty: Double, tz: Double) -> simd_double4x4 {
var matrix = matrix_identity_double4x4

matrix[3, 0] = tx
matrix[3, 1] = ty
matrix[3, 2] = tz

return matrix
}

internal func makeScaleMatrix(xScale: Double, yScale: Double, zScale: Double) -> simd_double4x4 {
var matrix = matrix_identity_double4x4

matrix[0, 0] = xScale
matrix[1, 1] = yScale
matrix[2, 2] = zScale

return matrix
}

public func render(_ parameters: CustomLayerRenderParameters, mtlCommandBuffer: MTLCommandBuffer, mtlRenderPassDescriptor: MTLRenderPassDescriptor) {
let m = parameters.projectionMatrix;
let m = parameters.projectionMatrix

// It is essential to use double precision for computation below: using simd instead
// of SceneKit matrix operations.
var transformSimd = matrix_identity_double4x4
Expand All @@ -171,31 +173,35 @@ public class SceneKitExample: UIViewController, ExampleProtocol, CustomLayerHost
transformSimd[3, 2] = m[14].doubleValue
transformSimd[3, 3] = m[15].doubleValue

let origin = try! Projection.project(for: modelOrigin, zoomScale: 1.0 / 512.0);
let meterInMercatorCoordinateUnits = try! 1.0 / (512.0 * Projection.getMetersPerPixelAtLatitude(forLatitude: modelOrigin.latitude, zoom: 0));
let metersPerPixel = try! Projection.getMetersPerPixelAtLatitude(forLatitude: modelOrigin.latitude, zoom: parameters.zoom);
var elevation = 0.0;
// Projection.project(for: modelOrigin, zoomScale: 1.0 / 512.0) corresponds to gl-js's
// mapboxgl.MercatorCoordinate.fromLngLat(). origin is in spherical mercator normalized to
// 0..1 for the width of the world. In other words, (x,y) E [0..1) is used to represent
// coordinates in one world copy, values of x +/- 1 represent wrap.
let origin = try! Projection.project(for: modelOrigin, zoomScale: 1.0 / 512.0)
let meterInMercatorCoordinateUnits = try! 1.0 / (512.0 * Projection.getMetersPerPixelAtLatitude(forLatitude: modelOrigin.latitude, zoom: 0))
let metersPerPixel = try! Projection.getMetersPerPixelAtLatitude(forLatitude: modelOrigin.latitude, zoom: parameters.zoom)
var elevation = 0.0
if let elevationData = parameters.elevationData, let elevationValue = elevationData.getElevationFor(self.modelOrigin) {
elevation = elevationValue.doubleValue
}

// origin is in normalized MercatorCoordinates. Normalized refers to the
// world copy represented with (x, y) values in range [0..1], and corresponds
// to modelAsMercatorCoordinate in https://docs.mapbox.com/mapbox-gl-js/example/add-3d-model/
let transformModel = makeTranslationMatrix(tx: origin.x, ty: origin.y, tz: elevation * meterInMercatorCoordinateUnits)

// the same scale as in gl-js example, scale from meters to mercator.
let modelScale = makeScaleMatrix(xScale: meterInMercatorCoordinateUnits, yScale: -meterInMercatorCoordinateUnits, zScale: meterInMercatorCoordinateUnits)

// mercator scale is specific to gl-native example because gl-js's customLayerMatrix computes this
// internaly: https://github.com/mapbox/mapbox-gl-js/blob/main/src/geo/transform.js#L1316
// The mercatorMatrix can be used to transform points from mercator coordinates
// ([0, 0] nw, [1, 1] se) to GL coordinates.
let worldSize = pow(2, parameters.zoom) * 512.0;
let worldSize = pow(2, parameters.zoom) * 512.0
let mercatorMatrix = transformSimd * makeScaleMatrix(xScale: worldSize, yScale: worldSize, zScale: worldSize * metersPerPixel)

let transform = mercatorMatrix * transformModel * modelScale

var scnMat = SCNMatrix4()
scnMat.m11 = Float(transform[0, 0])
scnMat.m12 = Float(transform[0, 1])
Expand All @@ -213,11 +219,24 @@ public class SceneKitExample: UIViewController, ExampleProtocol, CustomLayerHost
scnMat.m42 = Float(transform[3, 1])
scnMat.m43 = Float(transform[3, 2])
scnMat.m44 = Float(transform[3, 3])

cameraNode.camera!.projectionTransform = scnMat;

cameraNode.camera!.projectionTransform = scnMat

// flush automatic SceneKit transaction as SceneKit animation is not running and
// there's need to use transform matrix in this frame (not to have it used with delay).
SCNTransaction.flush()

if self.useCPUOcclusion {
mtlRenderPassDescriptor.depthAttachment = nil
mtlRenderPassDescriptor.stencilAttachment = nil
// Example uses depth buffer to occlude model when e.g. behind the hill.
// If depth buffer (SCNRenderer.usesReverseZ = false) is not available, or if wished to
// to indicate that model is occluded or e.g. implement fade out / fade in model occlusion,
// the example here needs to provide CPU side occlusion implementation, too.
// TODO: this is blocked on https://github.com/mapbox/mapbox-maps-ios/issues/155
}
if let colorTexture = mtlRenderPassDescriptor.colorAttachments[0].texture {
renderer.render(atTime: CFAbsoluteTimeGetCurrent(), viewport: CGRect(x: 0, y: 0, width: CGFloat(colorTexture.width), height: CGFloat(colorTexture.height)), commandBuffer:mtlCommandBuffer, passDescriptor:mtlRenderPassDescriptor)
renderer.render(withViewport: CGRect(x: 0, y: 0, width: CGFloat(colorTexture.width), height: CGFloat(colorTexture.height)), commandBuffer: mtlCommandBuffer, passDescriptor: mtlRenderPassDescriptor)
}
}

Expand Down

0 comments on commit 73f8a45

Please sign in to comment.