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.

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

Jump to bottom

[ModelIO] Add Xcode 13 beta4 support. #12349

Merged
merged 2 commits into from
Aug 5, 2021
Merged

[ModelIO] Add Xcode 13 beta4 support. #12349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de43db7
[ModelIO] Add Xcode 13 beta4 support.
mandel-macaque Aug 4, 2021
8710682
Better msg.
mandel-macaque Aug 4, 2021
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
8 changes: 6 additions & 2 deletions src/ModelIO/MIEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ public enum MDLVertexFormat : ulong {
public enum MDLMeshBufferType : ulong
{
Vertex = 1,
Index = 2
Index = 2,
[iOS (15,0), TV (15,0), Mac (12,0), MacCatalyst (15,0)]
Custom = 3,
}

[Native]
Expand Down Expand Up @@ -177,7 +179,9 @@ public enum MDLMaterialPropertyType : ulong {
Float2,
Float3,
Float4,
Matrix44
Matrix44,
[iOS (15,0), TV (15,0), Mac (12,0), MacCatalyst (15,0)]
Buffer,
}

[Native]
Expand Down
5 changes: 5 additions & 0 deletions src/mobilecoreservices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,11 @@ interface UTType {
[Field ("kUTTypeUniversalSceneDescription", "ModelIO")]
NSString UniversalSceneDescription { get; }

[NoWatch]
[iOS (15,0), Mac(12,0), TV (15,0), MacCatalyst (15,0)]
[Field ("kUTTypeUniversalSceneDescriptionMobile", "ModelIO")]
NSString UniversalSceneDescriptionMobile { get; }

[Watch (2,2)]
[iOS (9,1)][TV (9,0)]
[NoMac]
Expand Down
8 changes: 8 additions & 0 deletions src/modelio.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,20 @@ NVector3 UpAxis {
[Export ("objectAtIndex:")]
MDLObject GetObject (nuint index);

[Deprecated (PlatformName.iOS, 15, 0, message: "Use the 'Originals' property instead.")]
[Deprecated (PlatformName.TvOS, 15, 0, message: "Use the 'Originals' property instead.")]
[Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the 'Originals' property instead.")]
[Deprecated (PlatformName.MacCatalyst, 15, 0, message: "Use the 'Originals' property instead.")]
[iOS (10,0)]
[Mac (10,12)]
[TV (10,0)]
[Export ("masters", ArgumentSemantic.Retain)]
IMDLObjectContainerComponent Masters { get; set; }

[iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)]
[Export ("originals", ArgumentSemantic.Retain)]
IMDLObjectContainerComponent Originals { get; set; }

[TV (11,0), Mac (10,13), iOS (11,0)]
[Export ("animations", ArgumentSemantic.Retain)]
IMDLObjectContainerComponent Animations { get; set; }
Expand Down
5 changes: 0 additions & 5 deletions tests/xtro-sharpie/MacCatalyst-ModelIO.todo
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions tests/xtro-sharpie/iOS-ModelIO.todo
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions tests/xtro-sharpie/macOS-ModelIO.todo
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions tests/xtro-sharpie/tvOS-ModelIO.todo
View file
Open in desktop

This file was deleted.