3.0 [SceneKit] Explicitly control some renames

apinotes/SceneKit.apinotes

@@ -15,3 +15,98 @@ Protocols:
     SwiftPrivate: true
     MethodKind: Instance
 
+#
+# New wrapper types will be made for these typedefs, and we want to nest them
+#
+Typedefs:
+- Name: SCNGeometrySourceSemantic
+  SwiftName: SCNGeometrySource.Semantic
+- Name: SCNLightType
+  SwiftName: SCNLight.LightType
+- Name: SCNLightingModel
+  SwiftName: SCNMaterial.LightingModel
+- Name: SCNParticleProperty
+  SwiftName: SCNParticleSystem.ParticleProperty
+- Name: SCNPhysicsShapeOption
+  SwiftName: SCNPhysicsShape.Option
+- Name: SCNPhysicsShapeType
+  SwiftName: SCNPhysicsShape.ShapeType
+- Name: SCNPhysicsTestOption
+  SwiftName: SCNPhysicsWorld.TestOption
+- Name: SCNPhysicsTestSearchMode
+  SwiftName: SCNPhysicsWorld.TestSearchMode
+- Name: SCNSceneAttribute
+  SwiftName: SCNScene.Attribute
+- Name: SCNSceneSourceAnimationImportPolicy
+  SwiftName: SCNSceneSource.AnimationImportPolicy
+- Name: SCNSceneSourceLoadingOption
+  SwiftName: SCNSceneSource.LoadingOption
+- Name: SCNViewOption
+  SwiftName: SCNView.Option
+
+#
+# Name overrides for globals that we will be nesting onto our new wrapper types
+#
+Globals:
+- Name: SCNHitTestFirstFoundOnlyKey
+  SwiftName: SCNHitTestOption.firstFoundOnly
+- Name: SCNHitTestSortResultsKey
+  SwiftName: SCNHitTestOption.sortResults
+- Name: SCNHitTestClipToZRangeKey
+  SwiftName: SCNHitTestOption.clipToZRange
+- Name: SCNHitTestBackFaceCullingKey
+  SwiftName: SCNHitTestOption.backFaceCulling
+- Name: SCNHitTestBoundingBoxOnlyKey
+  SwiftName: SCNHitTestOption.boundingBoxOnly
+- Name: SCNHitTestIgnoreChildNodesKey
+  SwiftName: SCNHitTestOption.ignoreChildNodes
+- Name: SCNHitTestRootNodeKey
+  SwiftName: SCNHitTestOption.rootNode
+- Name: SCNHitTestIgnoreHiddenNodesKey
+  SwiftName: SCNHitTestOption.ignoreHiddenNodes
+- Name: SCNPhysicsShapeTypeKey
+  SwiftName: SCNPhysicsShape.Option.type
+- Name: SCNPhysicsShapeKeepAsCompoundKey
+  SwiftName: SCNPhysicsShape.Option.keepAsCompound
+- Name: SCNPhysicsShapeScaleKey
+  SwiftName: SCNPhysicsShape.Option.scale
+- Name: SCNPhysicsTestCollisionBitMaskKey
+  SwiftName: SCNPhysicsWorld.TestOption.collisionBitMask
+- Name: SCNPhysicsTestSearchModeKey
+  SwiftName: SCNPhysicsWorld.TestOption.searchMode
+- Name: SCNPhysicsTestBackfaceCullingKey
+  SwiftName: SCNPhysicsWorld.TestOption.backfaceCulling
+- Name: SCNSceneStartTimeAttributeKey
+  SwiftName: SCNScene.Attribute.startTime
+- Name: SCNSceneEndTimeAttributeKey
+  SwiftName: SCNScene.Attribute.endTime
+- Name: SCNSceneFrameRateAttributeKey
+  SwiftName: SCNScene.Attribute.frameRate
+- Name: SCNSceneUpAxisAttributeKey
+  SwiftName: SCNScene.Attribute.upAxis
+- Name: SCNSceneSourceCreateNormalsIfAbsentKey
+  SwiftName: SCNSceneSource.LoadingOption.createNormalsIfAbsent
+- Name: SCNSceneSourceCheckConsistencyKey
+  SwiftName: SCNSceneSource.LoadingOption.checkConsistency
+- Name: SCNSceneSourceFlattenSceneKey
+  SwiftName: SCNSceneSource.LoadingOption.flattenScene
+- Name: SCNSceneSourceUseSafeModeKey
+  SwiftName: SCNSceneSource.LoadingOption.useSafeMode
+- Name: SCNSceneSourceAssetDirectoryURLsKey
+  SwiftName: SCNSceneSource.LoadingOption.assetDirectoryURLs
+- Name: SCNSceneSourceOverrideAssetURLsKey
+  SwiftName: SCNSceneSource.LoadingOption.overrideAssetURLs
+- Name: SCNSceneSourceStrictConformanceKey
+  SwiftName: SCNSceneSource.LoadingOption.strictConformance
+- Name: SCNSceneSourceConvertUnitsToMetersKey
+  SwiftName: SCNSceneSource.LoadingOption.convertUnitsToMeters
+- Name: SCNSceneSourceConvertToYUpKey
+  SwiftName: SCNSceneSource.LoadingOption.convertToYUp
+- Name: SCNSceneSourceAnimationImportPolicyKey
+  SwiftName: SCNSceneSource.LoadingOption.animationImportPolicy
+- Name: SCNPreferredRenderingAPIKey
+  SwiftName: SCNView.Option.preferredRenderingAPI
+- Name: SCNPreferredDeviceKey
+  SwiftName: SCNView.Option.preferredDevice
+- Name: SCNPreferLowPowerDeviceKey
+  SwiftName: SCNView.Option.preferLowPowerDevice

test/ClangModules/SceneKit_test.swift

@@ -0,0 +1,146 @@
+// RUN: %target-parse-verify-swift
+
+// REQUIRES: objc_interop
+// REQUIRES: OS=macosx
+
+import SceneKit
+import Foundation
+
+// Test out some explicit renames of typedefs and globals, which are now new
+// wrapper types with nestest values.
+@available(macOS 10.11, *)
+func testRenames() {
+  let _ = SCNGeometrySourceSemantic
+    // expected-error@-1{{'SCNGeometrySourceSemantic' has been renamed to 'SCNGeometrySource.Semantic'}}
+  let _ = SCNLightType
+    // expected-error@-1{{'SCNLightType' has been renamed to 'SCNLight.LightType'}}
+  let _ = SCNLightingModel
+    // expected-error@-1{{'SCNLightingModel' has been renamed to 'SCNMaterial.LightingModel'}}
+  let _ = SCNParticleProperty
+    // expected-error@-1{{'SCNParticleProperty' has been renamed to 'SCNParticleSystem.ParticleProperty'}}
+  let _ = SCNPhysicsShapeOption
+    // expected-error@-1{{'SCNPhysicsShapeOption' has been renamed to 'SCNPhysicsShape.Option'}}
+  let _ = SCNPhysicsShapeType
+    // expected-error@-1{{'SCNPhysicsShapeType' has been renamed to 'SCNPhysicsShape.ShapeType'}}
+  let _ = SCNPhysicsTestOption
+    // expected-error@-1{{'SCNPhysicsTestOption' has been renamed to 'SCNPhysicsWorld.TestOption'}}
+  let _ = SCNPhysicsTestSearchMode
+    // expected-error@-1{{'SCNPhysicsTestSearchMode' has been renamed to 'SCNPhysicsWorld.TestSearchMode'}}
+  let _ = SCNSceneAttribute
+    // expected-error@-1{{'SCNSceneAttribute' has been renamed to 'SCNScene.Attribute'}}
+  let _ = SCNSceneSourceAnimationImportPolicy
+    // expected-error@-1{{'SCNSceneSourceAnimationImportPolicy' has been renamed to 'SCNSceneSource.AnimationImportPolicy'}}
+  let _ = SCNSceneSourceLoadingOption
+    // expected-error@-1{{'SCNSceneSourceLoadingOption' has been renamed to 'SCNSceneSource.LoadingOption'}}
+  let _ = SCNViewOption
+    // expected-error@-1{{'SCNViewOption' has been renamed to 'SCNView.Option'}}
+  let _ = SCNHitTestFirstFoundOnlyKey
+    // expected-error@-1{{'SCNHitTestFirstFoundOnlyKey' has been renamed to 'SCNHitTestOption.firstFoundOnly'}}
+  let _ = SCNHitTestSortResultsKey
+    // expected-error@-1{{'SCNHitTestSortResultsKey' has been renamed to 'SCNHitTestOption.sortResults'}}
+  let _ = SCNHitTestClipToZRangeKey
+    // expected-error@-1{{'SCNHitTestClipToZRangeKey' has been renamed to 'SCNHitTestOption.clipToZRange'}}
+  let _ = SCNHitTestBackFaceCullingKey
+    // expected-error@-1{{'SCNHitTestBackFaceCullingKey' has been renamed to 'SCNHitTestOption.backFaceCulling'}}
+  let _ = SCNHitTestBoundingBoxOnlyKey
+    // expected-error@-1{{'SCNHitTestBoundingBoxOnlyKey' has been renamed to 'SCNHitTestOption.boundingBoxOnly'}}
+  let _ = SCNHitTestIgnoreChildNodesKey
+    // expected-error@-1{{'SCNHitTestIgnoreChildNodesKey' has been renamed to 'SCNHitTestOption.ignoreChildNodes'}}
+  let _ = SCNHitTestRootNodeKey
+    // expected-error@-1{{'SCNHitTestRootNodeKey' has been renamed to 'SCNHitTestOption.rootNode'}}
+  let _ = SCNHitTestIgnoreHiddenNodesKey
+    // expected-error@-1{{'SCNHitTestIgnoreHiddenNodesKey' has been renamed to 'SCNHitTestOption.ignoreHiddenNodes'}}
+  let _ = SCNPhysicsShapeTypeKey
+    // expected-error@-1{{'SCNPhysicsShapeTypeKey' has been renamed to 'SCNPhysicsShape.Option.type'}}
+  let _ = SCNPhysicsShapeKeepAsCompoundKey
+    // expected-error@-1{{'SCNPhysicsShapeKeepAsCompoundKey' has been renamed to 'SCNPhysicsShape.Option.keepAsCompound'}}
+  let _ = SCNPhysicsShapeScaleKey
+    // expected-error@-1{{'SCNPhysicsShapeScaleKey' has been renamed to 'SCNPhysicsShape.Option.scale'}}
+  let _ = SCNPhysicsTestCollisionBitMaskKey
+    // expected-error@-1{{'SCNPhysicsTestCollisionBitMaskKey' has been renamed to 'SCNPhysicsWorld.TestOption.collisionBitMask'}}
+  let _ = SCNPhysicsTestSearchModeKey
+    // expected-error@-1{{'SCNPhysicsTestSearchModeKey' has been renamed to 'SCNPhysicsWorld.TestOption.searchMode'}}
+  let _ = SCNPhysicsTestBackfaceCullingKey
+    // expected-error@-1{{'SCNPhysicsTestBackfaceCullingKey' has been renamed to 'SCNPhysicsWorld.TestOption.backfaceCulling'}}
+  let _ = SCNSceneStartTimeAttributeKey
+    // expected-error@-1{{'SCNSceneStartTimeAttributeKey' has been renamed to 'SCNScene.Attribute.startTime'}}
+  let _ = SCNSceneEndTimeAttributeKey
+    // expected-error@-1{{'SCNSceneEndTimeAttributeKey' has been renamed to 'SCNScene.Attribute.endTime'}}
+  let _ = SCNSceneFrameRateAttributeKey
+    // expected-error@-1{{'SCNSceneFrameRateAttributeKey' has been renamed to 'SCNScene.Attribute.frameRate'}}
+  let _ = SCNSceneUpAxisAttributeKey
+    // expected-error@-1{{'SCNSceneUpAxisAttributeKey' has been renamed to 'SCNScene.Attribute.upAxis'}}
+  let _ = SCNSceneSourceCreateNormalsIfAbsentKey
+    // expected-error@-1{{'SCNSceneSourceCreateNormalsIfAbsentKey' has been renamed to 'SCNSceneSource.LoadingOption.createNormalsIfAbsent'}}
+  let _ = SCNSceneSourceCheckConsistencyKey
+    // expected-error@-1{{'SCNSceneSourceCheckConsistencyKey' has been renamed to 'SCNSceneSource.LoadingOption.checkConsistency'}}
+  let _ = SCNSceneSourceFlattenSceneKey
+    // expected-error@-1{{'SCNSceneSourceFlattenSceneKey' has been renamed to 'SCNSceneSource.LoadingOption.flattenScene'}}
+  let _ = SCNSceneSourceUseSafeModeKey
+    // expected-error@-1{{'SCNSceneSourceUseSafeModeKey' has been renamed to 'SCNSceneSource.LoadingOption.useSafeMode'}}
+  let _ = SCNSceneSourceAssetDirectoryURLsKey
+    // expected-error@-1{{'SCNSceneSourceAssetDirectoryURLsKey' has been renamed to 'SCNSceneSource.LoadingOption.assetDirectoryURLs'}}
+  let _ = SCNSceneSourceOverrideAssetURLsKey
+    // expected-error@-1{{'SCNSceneSourceOverrideAssetURLsKey' has been renamed to 'SCNSceneSource.LoadingOption.overrideAssetURLs'}}
+  let _ = SCNSceneSourceStrictConformanceKey
+    // expected-error@-1{{'SCNSceneSourceStrictConformanceKey' has been renamed to 'SCNSceneSource.LoadingOption.strictConformance'}}
+  let _ = SCNSceneSourceConvertUnitsToMetersKey
+    // expected-error@-1{{'SCNSceneSourceConvertUnitsToMetersKey' has been renamed to 'SCNSceneSource.LoadingOption.convertUnitsToMeters'}}
+  let _ = SCNSceneSourceConvertToYUpKey
+    // expected-error@-1{{'SCNSceneSourceConvertToYUpKey' has been renamed to 'SCNSceneSource.LoadingOption.convertToYUp'}}
+  let _ = SCNSceneSourceAnimationImportPolicyKey
+    // expected-error@-1{{'SCNSceneSourceAnimationImportPolicyKey' has been renamed to 'SCNSceneSource.LoadingOption.animationImportPolicy'}}
+  let _ = SCNPreferredRenderingAPIKey
+    // expected-error@-1{{'SCNPreferredRenderingAPIKey' has been renamed to 'SCNView.Option.preferredRenderingAPI'}}
+  let _ = SCNPreferredDeviceKey
+    // expected-error@-1{{'SCNPreferredDeviceKey' has been renamed to 'SCNView.Option.preferredDevice'}}
+  let _ = SCNPreferLowPowerDeviceKey
+    // expected-error@-1{{'SCNPreferLowPowerDeviceKey' has been renamed to 'SCNView.Option.preferLowPowerDevice'}}
+}
+
+@available(macOS 10.11, *)
+func useRenamedValues() {
+  let _ = SCNGeometrySource.Semantic.self
+  let _ = SCNLight.LightType.self
+  let _ = SCNMaterial.LightingModel.self
+  let _ = SCNParticleSystem.ParticleProperty.self
+  let _ = SCNPhysicsShape.Option.self
+  let _ = SCNPhysicsShape.ShapeType.self
+  let _ = SCNPhysicsWorld.TestOption.self
+  let _ = SCNPhysicsWorld.TestSearchMode.self
+  let _ = SCNScene.Attribute.self
+  let _ = SCNSceneSource.AnimationImportPolicy.self
+  let _ = SCNSceneSource.LoadingOption.self
+  let _ = SCNView.Option.self
+  let _ = SCNHitTestOption.firstFoundOnly
+  let _ = SCNHitTestOption.sortResults
+  let _ = SCNHitTestOption.clipToZRange
+  let _ = SCNHitTestOption.backFaceCulling
+  let _ = SCNHitTestOption.boundingBoxOnly
+  let _ = SCNHitTestOption.ignoreChildNodes
+  let _ = SCNHitTestOption.rootNode
+  let _ = SCNHitTestOption.ignoreHiddenNodes
+  let _ = SCNPhysicsShape.Option.type
+  let _ = SCNPhysicsShape.Option.keepAsCompound
+  let _ = SCNPhysicsShape.Option.scale
+  let _ = SCNPhysicsWorld.TestOption.collisionBitMask
+  let _ = SCNPhysicsWorld.TestOption.searchMode
+  let _ = SCNPhysicsWorld.TestOption.backfaceCulling
+  let _ = SCNScene.Attribute.startTime
+  let _ = SCNScene.Attribute.endTime
+  let _ = SCNScene.Attribute.frameRate
+  let _ = SCNScene.Attribute.upAxis
+  let _ = SCNSceneSource.LoadingOption.createNormalsIfAbsent
+  let _ = SCNSceneSource.LoadingOption.checkConsistency
+  let _ = SCNSceneSource.LoadingOption.flattenScene
+  let _ = SCNSceneSource.LoadingOption.useSafeMode
+  let _ = SCNSceneSource.LoadingOption.assetDirectoryURLs
+  let _ = SCNSceneSource.LoadingOption.overrideAssetURLs
+  let _ = SCNSceneSource.LoadingOption.strictConformance
+  let _ = SCNSceneSource.LoadingOption.convertUnitsToMeters
+  let _ = SCNSceneSource.LoadingOption.convertToYUp
+  let _ = SCNSceneSource.LoadingOption.animationImportPolicy
+  let _ = SCNView.Option.preferredRenderingAPI
+  let _ = SCNView.Option.preferredDevice
+  let _ = SCNView.Option.preferLowPowerDevice
+}