diff --git a/src/SceneKit/Defs.cs b/src/SceneKit/Defs.cs index be0b9438ea..1eb9f8426b 100644 --- a/src/SceneKit/Defs.cs +++ b/src/SceneKit/Defs.cs @@ -283,7 +283,7 @@ namespace SceneKit { None, Multisampling2X, Multisampling4X, -#if MONOMAC +#if MONOMAC || __MACCATALYST__ Multisampling8X, Multisampling16X, #endif diff --git a/src/scenekit.cs b/src/scenekit.cs index 84a6008477..f0229c3fe6 100644 --- a/src/scenekit.cs +++ b/src/scenekit.cs @@ -160,6 +160,13 @@ namespace SceneKit { [Export ("removeAllAnimations")] void RemoveAllAnimations (); +#if XAMCORE_4_0 + [Abstract] +#endif + [Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Export ("removeAllAnimationsWithBlendOutDuration:")] + void RemoveAllAnimationsWithBlendOutDuration (nfloat duration); + [Abstract] [Export ("removeAnimationForKey:")] void RemoveAnimation (NSString key); @@ -3991,6 +3998,11 @@ namespace SceneKit { [Wrap ("WeakShaderModifiers")] SCNShaderModifiers ShaderModifiers { get; set; } + [Mac (12,0), iOS (15,0), TV (15,0), Watch (8,0)] + [NullAllowed] // by default this property is null + [Export ("minimumLanguageVersion", ArgumentSemantic.Retain)] + NSNumber MinimumLanguageVersion { get; set; } + [NoWatch] [NullAllowed] // by default this property is null [Export ("program", ArgumentSemantic.Retain)] @@ -4865,6 +4877,11 @@ namespace SceneKit { [Export ("fresnelExponent")] nfloat FresnelExponent { get; set; } + [Introduced (PlatformName.MacCatalyst, 15, 0)] + [Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0)] + [Export ("writesToDepthBuffer")] + bool WritesToDepthBuffer { get; set; } + [Export ("propertyControllers", ArgumentSemantic.Copy), NullAllowed] NSDictionary WeakPropertyControllers { get; set; } diff --git a/tests/xtro-sharpie/MacCatalyst-SceneKit.ignore b/tests/xtro-sharpie/MacCatalyst-SceneKit.ignore new file mode 100644 index 0000000000..83a196b15f --- /dev/null +++ b/tests/xtro-sharpie/MacCatalyst-SceneKit.ignore @@ -0,0 +1,5 @@ +# deprecated or not used on catalyst +!missing-protocol-member! SCNProgramDelegate::programIsOpaque: not found +!missing-selector! SCNMaterialProperty::borderColor not bound +!missing-selector! SCNMaterialProperty::setBorderColor: not bound +!missing-selector! SCNRenderer::render not bound diff --git a/tests/xtro-sharpie/MacCatalyst-SceneKit.todo b/tests/xtro-sharpie/MacCatalyst-SceneKit.todo deleted file mode 100644 index e4a9902696..0000000000 --- a/tests/xtro-sharpie/MacCatalyst-SceneKit.todo +++ /dev/null @@ -1,12 +0,0 @@ -!missing-enum-value! SCNAntialiasingMode native value SCNAntialiasingModeMultisampling16X = 4 not bound -!missing-enum-value! SCNAntialiasingMode native value SCNAntialiasingModeMultisampling8X = 3 not bound -!missing-protocol-member! SCNProgramDelegate::programIsOpaque: not found -!missing-selector! SCNMaterialProperty::borderColor not bound -!missing-selector! SCNMaterialProperty::setBorderColor: not bound -!missing-selector! SCNRenderer::render not bound -## appended from unclassified file -!missing-protocol-member! SCNAnimatable::removeAllAnimationsWithBlendOutDuration: not found -!missing-selector! SCNParticleSystem::setWritesToDepthBuffer: not bound -!missing-selector! SCNParticleSystem::writesToDepthBuffer not bound -!missing-protocol-member! SCNShadable::minimumLanguageVersion not found -!missing-protocol-member! SCNShadable::setMinimumLanguageVersion: not found diff --git a/tests/xtro-sharpie/common-SceneKit.ignore b/tests/xtro-sharpie/common-SceneKit.ignore index d92ffbb260..65bda8dae9 100644 --- a/tests/xtro-sharpie/common-SceneKit.ignore +++ b/tests/xtro-sharpie/common-SceneKit.ignore @@ -2,6 +2,7 @@ ## we cannot add abstract members to existing SCNSceneRenderer or SCNAnimatable protocols (breaking changes) !incorrect-protocol-member! SCNAnimatable::addAnimationPlayer:forKey: is REQUIRED and should be abstract !incorrect-protocol-member! SCNAnimatable::animationPlayerForKey: is REQUIRED and should be abstract +!incorrect-protocol-member! SCNAnimatable::removeAllAnimationsWithBlendOutDuration: is REQUIRED and should be abstract !incorrect-protocol-member! SCNAnimatable::removeAnimationForKey:blendOutDuration: is REQUIRED and should be abstract !incorrect-protocol-member! SCNAnimatable::setSpeed:forAnimationKey: is REQUIRED and should be abstract !incorrect-protocol-member! SCNSceneRenderer::audioEngine is REQUIRED and should be abstract diff --git a/tests/xtro-sharpie/iOS-SceneKit.todo b/tests/xtro-sharpie/iOS-SceneKit.todo deleted file mode 100644 index 2f0ed4f58f..0000000000 --- a/tests/xtro-sharpie/iOS-SceneKit.todo +++ /dev/null @@ -1,5 +0,0 @@ -!missing-protocol-member! SCNAnimatable::removeAllAnimationsWithBlendOutDuration: not found -!missing-selector! SCNParticleSystem::setWritesToDepthBuffer: not bound -!missing-selector! SCNParticleSystem::writesToDepthBuffer not bound -!missing-protocol-member! SCNShadable::minimumLanguageVersion not found -!missing-protocol-member! SCNShadable::setMinimumLanguageVersion: not found diff --git a/tests/xtro-sharpie/macOS-SceneKit.todo b/tests/xtro-sharpie/macOS-SceneKit.todo deleted file mode 100644 index 2f0ed4f58f..0000000000 --- a/tests/xtro-sharpie/macOS-SceneKit.todo +++ /dev/null @@ -1,5 +0,0 @@ -!missing-protocol-member! SCNAnimatable::removeAllAnimationsWithBlendOutDuration: not found -!missing-selector! SCNParticleSystem::setWritesToDepthBuffer: not bound -!missing-selector! SCNParticleSystem::writesToDepthBuffer not bound -!missing-protocol-member! SCNShadable::minimumLanguageVersion not found -!missing-protocol-member! SCNShadable::setMinimumLanguageVersion: not found diff --git a/tests/xtro-sharpie/tvOS-SceneKit.todo b/tests/xtro-sharpie/tvOS-SceneKit.todo deleted file mode 100644 index 2f0ed4f58f..0000000000 --- a/tests/xtro-sharpie/tvOS-SceneKit.todo +++ /dev/null @@ -1,5 +0,0 @@ -!missing-protocol-member! SCNAnimatable::removeAllAnimationsWithBlendOutDuration: not found -!missing-selector! SCNParticleSystem::setWritesToDepthBuffer: not bound -!missing-selector! SCNParticleSystem::writesToDepthBuffer not bound -!missing-protocol-member! SCNShadable::minimumLanguageVersion not found -!missing-protocol-member! SCNShadable::setMinimumLanguageVersion: not found diff --git a/tests/xtro-sharpie/watchOS-SceneKit.todo b/tests/xtro-sharpie/watchOS-SceneKit.todo deleted file mode 100644 index 2f0ed4f58f..0000000000 --- a/tests/xtro-sharpie/watchOS-SceneKit.todo +++ /dev/null @@ -1,5 +0,0 @@ -!missing-protocol-member! SCNAnimatable::removeAllAnimationsWithBlendOutDuration: not found -!missing-selector! SCNParticleSystem::setWritesToDepthBuffer: not bound -!missing-selector! SCNParticleSystem::writesToDepthBuffer not bound -!missing-protocol-member! SCNShadable::minimumLanguageVersion not found -!missing-protocol-member! SCNShadable::setMinimumLanguageVersion: not found