Skip to content
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.

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

[SceneKit] Update bindings for Xcode13.0 beta 1 & beta 2 #12121

Merged
merged 11 commits into from
Aug 3, 2021
2 changes: 1 addition & 1 deletion src/SceneKit/Defs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public enum SCNAntialiasingMode : ulong {
None,
Multisampling2X,
Multisampling4X,
#if MONOMAC
#if MONOMAC || __MACCATALYST__
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is catalyst support new new in Xcode 13 ?

In that case there should be a [MacCatalyst (15,0)] on each member

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's not new new! I think I only got this because of the xtro - header files don't mention it, and web docs indicate 13.1 https://developer.apple.com/documentation/scenekit/scnantialiasingmode

Multisampling8X,
Multisampling16X,
#endif
Expand Down
17 changes: 17 additions & 0 deletions src/scenekit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,13 @@ interface SCNAnimatable {
[Export ("removeAllAnimations")]
void RemoveAllAnimations ();

#if XAMCORE_4_0
[Abstract]
rolfbjarne marked this conversation as resolved.
Show resolved Hide resolved
#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);
Expand Down Expand Up @@ -3991,6 +3998,11 @@ interface SCNShadable {
[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; }
rolfbjarne marked this conversation as resolved.
Show resolved Hide resolved

[NoWatch]
[NullAllowed] // by default this property is null
[Export ("program", ArgumentSemantic.Retain)]
Expand Down Expand Up @@ -4865,6 +4877,11 @@ interface SCNParticleSystem : NSCopying, NSSecureCoding, SCNAnimatable {
[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; }

Expand Down
5 changes: 5 additions & 0 deletions tests/xtro-sharpie/MacCatalyst-SceneKit.ignore
Original file line number Diff line number Diff line change
@@ -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
12 changes: 0 additions & 12 deletions tests/xtro-sharpie/MacCatalyst-SceneKit.todo

This file was deleted.

1 change: 1 addition & 0 deletions tests/xtro-sharpie/common-SceneKit.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions tests/xtro-sharpie/iOS-SceneKit.todo

This file was deleted.

5 changes: 0 additions & 5 deletions tests/xtro-sharpie/macOS-SceneKit.todo

This file was deleted.

5 changes: 0 additions & 5 deletions tests/xtro-sharpie/tvOS-SceneKit.todo

This file was deleted.

5 changes: 0 additions & 5 deletions tests/xtro-sharpie/watchOS-SceneKit.todo

This file was deleted.