[ModelIO] Add Xcode 13 beta4 support. (#12349)

dotnet · Aug 5, 2021 · 41253c3 · 41253c3 · vs-mobiletools-engineering-service2 · Aug 5, 2021
1 parent 9aef167
commit 41253c3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 26 deletions.
diff --git a/src/ModelIO/MIEnums.cs b/src/ModelIO/MIEnums.cs
@@ -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]
@@ -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]

diff --git a/src/mobilecoreservices.cs b/src/mobilecoreservices.cs
@@ -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]

diff --git a/src/modelio.cs b/src/modelio.cs
@@ -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; }

diff --git a/tests/xtro-sharpie/MacCatalyst-ModelIO.todo b/tests/xtro-sharpie/MacCatalyst-ModelIO.todo
diff --git a/tests/xtro-sharpie/iOS-ModelIO.todo b/tests/xtro-sharpie/iOS-ModelIO.todo
diff --git a/tests/xtro-sharpie/macOS-ModelIO.todo b/tests/xtro-sharpie/macOS-ModelIO.todo
diff --git a/tests/xtro-sharpie/tvOS-ModelIO.todo b/tests/xtro-sharpie/tvOS-ModelIO.todo