xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[modelio] Add missing MDLMesh constructors and fix xtro (#1826) 

Fixes bug #52575: Missing ModelIO API
(https://bugzilla.xamarin.com/show_bug.cgi?id=52575)

We turn the MDLMesh constructors into static ones because we don't want to lose the shape name.
Also, the signatures of these constructors differ so it would not be possible to use an enum to differentiate the shapes.
This commit is contained in:
Vincent Dondain 2017-03-06 17:17:12 -05:00 коммит произвёл Sebastien Pouliot
Родитель efceb473f6
Коммит d819d25bff
7 изменённых файлов: 258 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

64
runtime/bindings-generator.cs
Просмотреть файл

@ -464,6 +464,22 @@ namespace Xamarin.BindingMethods.Generator
}
);
data.Add (
new FunctionData {
Comment = " // IntPtr func (Vector3, Vector3i, bool, nint, IntPtr)",
Prefix = "simd__",
Variants = Variants.NonStret,
ReturnType = Types.IntPtr,
Parameters = new ParameterData[] {
new ParameterData { TypeData = Types.Vector3 },
new ParameterData { TypeData = Types.Vector3i },
new ParameterData { TypeData = Types.Bool },
new ParameterData { TypeData = Types.NInt },
new ParameterData { TypeData = Types.IntPtr },
},
}
);
data.Add (
new FunctionData {
Comment = " // void func (Vector3, Vector3)",
@ -1428,6 +1444,21 @@ namespace Xamarin.BindingMethods.Generator
);
// Required for ModelIO
data.Add (
new FunctionData {
Comment = " // IntPtr func (Vector3, bool, nint, IntPtr)",
Prefix = "simd__",
Variants = Variants.NonStret,
ReturnType = Types.IntPtr,
Parameters = new ParameterData[] {
new ParameterData { TypeData = Types.Vector3 },
new ParameterData { TypeData = Types.Bool },
new ParameterData { TypeData = Types.NInt },
new ParameterData { TypeData = Types.IntPtr },
},
}
);
data.Add (
new FunctionData {
Comment = " // IntPtr func (Vector3, Vector2i, bool, IntPtr, IntPtr)",
@ -1505,6 +1536,24 @@ namespace Xamarin.BindingMethods.Generator
}
);
data.Add (
new FunctionData {
Comment = " // IntPtr func (Vector3, Vector2i, bool, bool, bool, nint, IntPtr)",
Prefix = "simd__",
Variants = Variants.NonStret,
ReturnType = Types.IntPtr,
Parameters = new ParameterData[] {
new ParameterData { TypeData = Types.Vector3 },
new ParameterData { TypeData = Types.Vector2i },
new ParameterData { TypeData = Types.Bool },
new ParameterData { TypeData = Types.Bool },
new ParameterData { TypeData = Types.Bool },
new ParameterData { TypeData = Types.NInt },
new ParameterData { TypeData = Types.IntPtr },
},
}
);
data.Add (
new FunctionData {
Comment = " // IntPtr func (Vector3, Vector2i, int, bool, nint, IntPtr)",
@ -1522,6 +1571,21 @@ namespace Xamarin.BindingMethods.Generator
}
);
data.Add (
new FunctionData {
Comment = " // IntPtr func (Vector3, Vector2i, nint, IntPtr)",
Prefix = "simd__",
Variants = Variants.NonStret,
ReturnType = Types.IntPtr,
Parameters = new ParameterData[] {
new ParameterData { TypeData = Types.Vector3 },
new ParameterData { TypeData = Types.Vector2i },
new ParameterData { TypeData = Types.NInt },
new ParameterData { TypeData = Types.IntPtr },
},
}
);
data.Add (
new FunctionData {
Comment = " // IntPtr func (IntPtr, Vector2d, Vector2d, Vector2i, bool)",

60
src/ModelIO/MDLMesh.cs
Просмотреть файл

@ -17,6 +17,7 @@ using XamCore.ObjCRuntime;
using Vector2i = global::OpenTK.Vector2i;
using Vector2 = global::OpenTK.Vector2;
using Vector3 = global::OpenTK.Vector3;
using Vector3i = global::OpenTK.Vector3i;
using Vector4 = global::OpenTK.Vector4;
using Matrix2 = global::OpenTK.Matrix2;
using Matrix3 = global::OpenTK.Matrix3;
@ -27,6 +28,12 @@ using MathHelper = global::OpenTK.MathHelper;
namespace XamCore.ModelIO {
partial class MDLMesh {
public enum MDLMeshVectorType {
Dimensions,
Extent,
}
internal MDLMesh (Vector3 extent, Vector2i segments, bool inwardNormals, MDLGeometryType geometryType, IMDLMeshBufferAllocator allocator, int? hemisphereSegments, bool? cap, bool? isCone)
{
if (hemisphereSegments.HasValue) {
@ -44,11 +51,46 @@ namespace XamCore.ModelIO {
}
}
internal MDLMesh (Vector3 extent, Vector3i segments, bool inwardNormals, MDLGeometryType geometryType, IMDLMeshBufferAllocator allocator)
{
InitializeHandle (InitBox (extent, segments, inwardNormals, geometryType, allocator), "initBoxWithExtent:segments:inwardNormals:geometryType:allocator:");
}
internal MDLMesh (Vector3 extent, Vector2i segments, bool inwardNormals, bool topCap, bool bottomCap, MDLGeometryType geometryType, IMDLMeshBufferAllocator allocator)
{
InitializeHandle (InitCylinder (extent, segments, inwardNormals, topCap, bottomCap, geometryType, allocator), "initCylinderWithExtent:segments:inwardNormals:topCap:bottomCap:geometryType:allocator:");
}
internal MDLMesh (Vector3 extent, Vector2i segments, MDLGeometryType geometryType, IMDLMeshBufferAllocator allocator)
{
InitializeHandle (InitPlane (extent, segments, geometryType, allocator), "initPlaneWithExtent:segments:geometryType:allocator:");
}
internal MDLMesh (Vector3 extent, bool inwardNormals, MDLGeometryType geometryType, IMDLMeshBufferAllocator allocator)
{
InitializeHandle (InitIcosahedron (extent, inwardNormals, geometryType, allocator), "initIcosahedronWithExtent:inwardNormals:geometryType:allocator:");
}
internal MDLMesh (MDLMesh mesh, int submeshIndex, uint subdivisionLevels, IMDLMeshBufferAllocator allocator)
{
InitializeHandle (InitMesh (mesh, submeshIndex, subdivisionLevels, allocator), "initMeshBySubdividingMesh:submeshIndex:subdivisionLevels:allocator:");
}
// Note: we turn these constructors into static constructors because we don't want to lose the shape name. Also, the signatures of these constructors differ so it would not be possible to use an enum to differentiate the shapes.
[iOS (10,0)][TV (10,0)][Mac (10,12)]
public static MDLMesh CreateBox (Vector3 vector, Vector3i segments, MDLGeometryType geometryType, bool inwardNormals, IMDLMeshBufferAllocator allocator, MDLMeshVectorType type = MDLMeshVectorType.Dimensions)
{
switch (type) {
case MDLMeshVectorType.Dimensions:
return NewBoxWithDimensions (vector, segments, geometryType, inwardNormals, allocator);
case MDLMeshVectorType.Extent:
return new MDLMesh (vector, segments, inwardNormals, geometryType, allocator);
default:
throw new ArgumentException ("The 'MDLMeshVectorType type' argument needs a value.");
}
}
[iOS (10,0)][TV (10,0)][Mac (10,12)]
public static MDLMesh CreateSphere (Vector3 dimensions, Vector2i segments, MDLGeometryType geometryType, bool inwardNormals, IMDLMeshBufferAllocator allocator)
{
@ -61,6 +103,12 @@ namespace XamCore.ModelIO {
return new MDLMesh (dimensions, segments, inwardNormals, geometryType, allocator, null, cap, false);
}
[iOS (10,0)][TV (10,0)][Mac (10,12)]
public static MDLMesh CreateCylinder (Vector3 extent, Vector2i segments, bool inwardNormals, bool topCap, bool bottomCap, MDLGeometryType geometryType, IMDLMeshBufferAllocator allocator)
{
return new MDLMesh (extent, segments, inwardNormals, topCap, bottomCap, geometryType, allocator);
}
[iOS (10,0)][TV (10,0)][Mac (10,12)]
public static MDLMesh CreateCapsule (Vector3 dimensions, Vector2i segments, MDLGeometryType geometryType, bool inwardNormals, int hemisphereSegments, IMDLMeshBufferAllocator allocator)
{
@ -73,6 +121,18 @@ namespace XamCore.ModelIO {
return new MDLMesh (dimensions, segments, inwardNormals, geometryType, allocator, null, cap, true);
}
[iOS (10,0)][TV (10,0)][Mac (10,12)]
public static MDLMesh CreatePlane (Vector3 extent, Vector2i segments, MDLGeometryType geometryType, IMDLMeshBufferAllocator allocator)
{
return new MDLMesh (extent, segments, geometryType, allocator);
}
[iOS (10,0)][TV (10,0)][Mac (10,12)]
public static MDLMesh CreateIcosahedron (Vector3 extent, bool inwardNormals, MDLGeometryType geometryType, IMDLMeshBufferAllocator allocator)
{
return new MDLMesh (extent, inwardNormals, geometryType, allocator);
}
public static MDLMesh CreateSubdividedMesh (MDLMesh mesh, int submeshIndex, uint subdivisionLevels, IMDLMeshBufferAllocator allocator)
{
return new MDLMesh (mesh, submeshIndex, subdivisionLevels, allocator);

37
src/modelio.cs
Просмотреть файл

@ -176,6 +176,12 @@ namespace XamCore.ModelIO {
[Static]
[Export ("assetWithSCNScene:bufferAllocator:")]
MDLAsset FromScene (SCNScene scene, [NullAllowed] IMDLMeshBufferAllocator bufferAllocator);
// MDLAsset_MDLLightBaking (category)
[Static]
[Export ("placeLightProbesWithDensity:heuristic:usingIrradianceDataSource:")]
MDLLightProbe[] PlaceLightProbes (float density, MDLProbePlacement type, MDLLightProbeIrradianceDataSource dataSource);
}
// Added in iOS 10 SDK but it is supposed to be present in iOS 9.
@ -751,6 +757,13 @@ namespace XamCore.ModelIO {
// MDLMesh_Generators (category)
// Note: we turn these constructors into static constructors because we don't want to lose the shape name. Also, the signatures of these constructors differ so it would not be possible to use an enum to differentiate the shapes.
[Internal]
[Export ("initBoxWithExtent:segments:inwardNormals:geometryType:allocator:")]
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
IntPtr InitBox (Vector3 extent, Vector3i segments, bool inwardNormals, MDLGeometryType geometryType, [NullAllowed] IMDLMeshBufferAllocator allocator);
[Internal]
[Export ("initSphereWithExtent:segments:inwardNormals:geometryType:allocator:")]
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
@ -761,6 +774,11 @@ namespace XamCore.ModelIO {
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
IntPtr InitHemisphere (Vector3 extent, Vector2i segments, bool inwardNormals, bool cap, MDLGeometryType geometryType, [NullAllowed] IMDLMeshBufferAllocator allocator);
[Internal]
[Export ("initCylinderWithExtent:segments:inwardNormals:topCap:bottomCap:geometryType:allocator:")]
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
IntPtr InitCylinder (Vector3 extent, Vector2i segments, bool inwardNormals, bool topCap, bool bottomCap, MDLGeometryType geometryType, [NullAllowed] IMDLMeshBufferAllocator allocator);
[Internal]
[Export ("initCapsuleWithExtent:cylinderSegments:hemisphereSegments:inwardNormals:geometryType:allocator:")]
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
@ -771,15 +789,26 @@ namespace XamCore.ModelIO {
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
IntPtr InitCone (Vector3 extent, Vector2i segments, bool inwardNormals, bool cap, MDLGeometryType geometryType, [NullAllowed] IMDLMeshBufferAllocator allocator);
[Internal]
[Export ("initPlaneWithExtent:segments:geometryType:allocator:")]
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
IntPtr InitPlane (Vector3 extent, Vector2i segments, MDLGeometryType geometryType, [NullAllowed] IMDLMeshBufferAllocator allocator);
[Internal]
[Export ("initIcosahedronWithExtent:inwardNormals:geometryType:allocator:")]
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
IntPtr InitIcosahedron (Vector3 extent, bool inwardNormals, MDLGeometryType geometryType, [NullAllowed] IMDLMeshBufferAllocator allocator);
[Internal]
[Export ("initMeshBySubdividingMesh:submeshIndex:subdivisionLevels:allocator:")]
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
IntPtr InitMesh (MDLMesh mesh, int submeshIndex, uint subdivisionLevels, [NullAllowed] IMDLMeshBufferAllocator allocator);
[Internal]
[Static]
[Export ("newBoxWithDimensions:segments:geometryType:inwardNormals:allocator:")]
[MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
MDLMesh CreateBox (Vector3 dimensions, Vector3i segments, MDLGeometryType geometryType, bool inwardNormals, [NullAllowed] IMDLMeshBufferAllocator allocator);
MDLMesh NewBoxWithDimensions (Vector3 dimensions, Vector3i segments, MDLGeometryType geometryType, bool inwardNormals, [NullAllowed] IMDLMeshBufferAllocator allocator);
[Static]
[Export ("newPlaneWithDimensions:segments:geometryType:allocator:")]
@ -1109,10 +1138,16 @@ namespace XamCore.ModelIO {
[Export ("removeObject:")]
void RemoveObject (MDLObject @object);
#if XAMCORE_4_0
[Abstract]
#endif
[iOS (10,3), TV (10,2), Mac (10,12,4)]
[Export ("objectAtIndexedSubscript:")]
MDLObject GetObject (nuint index);
#if XAMCORE_4_0
[Abstract]
#endif
[iOS (10,3), TV (10,2), Mac (10,12,4)]
[Export ("count")]
nuint Count { get; }

4
tests/introspection/ApiSelectorTest.cs
Просмотреть файл

@ -180,6 +180,10 @@ namespace Introspection {
case "initHemisphereWithExtent:segments:inwardNormals:cap:geometryType:allocator:":
case "initMeshBySubdividingMesh:submeshIndex:subdivisionLevels:allocator:":
case "initSphereWithExtent:segments:inwardNormals:geometryType:allocator:":
case "initBoxWithExtent:segments:inwardNormals:geometryType:allocator:":
case "initCylinderWithExtent:segments:inwardNormals:topCap:bottomCap:geometryType:allocator:":
case "initIcosahedronWithExtent:inwardNormals:geometryType:allocator:":
case "initPlaneWithExtent:segments:geometryType:allocator:":
return true;
}
break;

79
tests/monotouch-test/ModelIO/MDLMesh.cs
Просмотреть файл

@ -90,7 +90,7 @@ namespace MonoTouchFixtures.ModelIO {
}
[Test]
public void CreateBoxTest ()
public void CreateBoxWithDimensonTest ()
{
Vector3 V3 = new Vector3 (1, 2, 3);
Vector3i V3i = new Vector3i (4, 5, 6);
@ -106,6 +106,23 @@ namespace MonoTouchFixtures.ModelIO {
}
}
[Test]
public void CreateBoxWithExtentTest ()
{
Vector3 V3 = new Vector3 (1, 2, 3);
Vector3i V3i = new Vector3i (4, 5, 6);
using (var obj = MDLMesh.CreateBox (V3, V3i, MDLGeometryType.Triangles, true, null, MDLMesh.MDLMeshVectorType.Extent)) {
Assert.IsNotNull (obj, "obj");
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.5f, 1, 1.5f), MinBounds = new Vector3 (-0.5f, -1, -1.5f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (1, obj.Submeshes.Count, "Submeshes Count");
Assert.AreEqual (1, obj.VertexBuffers.Length, "VertexBuffers Count");
Assert.AreEqual (TestRuntime.CheckXcodeVersion (7, 3) ? 214 : 24, obj.VertexCount, "VertexCount");
Assert.AreEqual (31, obj.VertexDescriptor.Attributes.Count, "VertexDescriptor Attributes Count");
Assert.AreEqual (31, obj.VertexDescriptor.Layouts.Count, "VertexDescriptor Layouts Count");
}
}
[Test]
public void CreatePlaneTest ()
{
@ -177,6 +194,31 @@ namespace MonoTouchFixtures.ModelIO {
}
}
[Test]
public void CreateCylinderTest ()
{
var V3 = new Vector3 (1, 1, 1);
var V2i = new Vector2i (3, 3);
using (var obj = MDLMesh.CreateCylinder (V3, V2i, true, true, true, MDLGeometryType.Triangles, null)) {
Assert.IsNotNull (obj, "obj");
if (TestRuntime.CheckXcodeVersion (8, 2)) {
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.866025448f, 0.5f, 1f), MinBounds = new Vector3 (-0.866025388f, -0.5f, -0.5f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (31, obj.VertexBuffers.Length, "VertexBuffers Count");
} else if (TestRuntime.CheckXcodeVersion (8, 0)) {
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.866025448f, 1.0f, 1f), MinBounds = new Vector3 (-0.866025388f, -1.0f, -0.5f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (3, obj.VertexBuffers.Length, "VertexBuffers Count");
} else {
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (1f, 0.5f, 1f), MinBounds = new Vector3 (-0.866025388f, -0.5f, -0.866025388f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (1, obj.VertexBuffers.Length, "VertexBuffers Count");
}
Assert.AreEqual (1, obj.Submeshes.Count, "Submeshes Count");
Assert.AreEqual (26, obj.VertexCount, "VertexCount");
Assert.AreEqual (31, obj.VertexDescriptor.Attributes.Count, "VertexDescriptor Attributes Count");
Assert.AreEqual (31, obj.VertexDescriptor.Layouts.Count, "VertexDescriptor Layouts Count");
}
}
[Test]
public void CreateEllipticalConeTest ()
{
@ -266,6 +308,41 @@ namespace MonoTouchFixtures.ModelIO {
}
}
[Test]
public void CreatePaneTest ()
{
TestRuntime.AssertXcodeVersion (8, 0);
Vector3 V3 = new Vector3 (1, 2, 3);
Vector2i V2i = new Vector2i (4, 5);
using (var obj = MDLMesh.CreatePlane (V3, V2i, MDLGeometryType.Triangles, null)) {
Assert.IsNotNull (obj, "obj");
Assert.AreEqual (1, obj.Submeshes.Count, "Submeshes Count");
Assert.That (obj.VertexBuffers.Length, Is.GreaterThanOrEqualTo (3), "VertexBuffers Count");
Assert.AreEqual (30, obj.VertexCount, "VertexCount");
Assert.AreEqual (31, obj.VertexDescriptor.Attributes.Count, "VertexDescriptor Attributes Count");
Assert.AreEqual (31, obj.VertexDescriptor.Layouts.Count, "VertexDescriptor Layouts Count");
}
}
[Test]
public void CreateIcosahedronTest ()
{
TestRuntime.AssertXcodeVersion (8, 0);
Vector3 V3 = new Vector3 (1, 2, 3);
using (var obj = MDLMesh.CreateIcosahedron (V3, true, MDLGeometryType.Triangles, null)) {
Assert.IsNotNull (obj, "obj");
Assert.AreEqual (1, obj.Submeshes.Count, "Submeshes Count");
Assert.That (obj.VertexBuffers.Length, Is.GreaterThanOrEqualTo (1), "VertexBuffers Count");
Assert.AreEqual (12, obj.VertexCount, "VertexCount");
Assert.AreEqual (31, obj.VertexDescriptor.Attributes.Count, "VertexDescriptor Attributes Count");
Assert.AreEqual (31, obj.VertexDescriptor.Layouts.Count, "VertexDescriptor Layouts Count");
}
}
// FIXME: figure out valid input arguments for GenerateAmbientOcclusionTexture
// [Test]
// public void GenerateAmbientOcclusionTextureTest ()

10
tests/xtro-sharpie/common.ignore
Просмотреть файл

@ -160,9 +160,13 @@
!missing-selector! MDLObject::objectForKeyedSubscript: not bound
!missing-selector! MDLObject::setObject:forKeyedSubscript: not bound
## New @required (abstract) methods in existing types (breaking changes)
!incorrect-protocol-member! MDLObjectContainerComponent::count is REQUIRED and should be abstract
!incorrect-protocol-member! MDLObjectContainerComponent::objectAtIndexedSubscript: is REQUIRED and should be abstract
## old @optional methods that became @required (abstract) in existing types (breaking changes)
!incorrect-protocol-member! MDLMeshBuffer::allocator is REQUIRED and should be abstract
!incorrect-protocol-member! MDLMeshBuffer::length is REQUIRED and should be abstract
!incorrect-protocol-member! MDLMeshBuffer::type is REQUIRED and should be abstract
!incorrect-protocol-member! MDLMeshBuffer::zone is REQUIRED and should be abstract
!incorrect-protocol-member! MDLMeshBufferZone::allocator is REQUIRED and should be abstract
!incorrect-protocol-member! MDLMeshBufferZone::capacity is REQUIRED and should be abstract
# Security

9
tests/xtro-sharpie/common.pending
Просмотреть файл

@ -640,3 +640,12 @@
## Fixed in XAMCORE_4_0
!incorrect-protocol-member! GKGameModelPlayer::playerId is REQUIRED and should be abstract
# ModelIO
# fixed in XAMCORE_4_0 - API break
!incorrect-protocol-member! MDLObjectContainerComponent::count is REQUIRED and should be abstract
!incorrect-protocol-member! MDLObjectContainerComponent::objectAtIndexedSubscript: is REQUIRED and should be abstract
!incorrect-protocol-member! MDLTransformComponent::keyTimes is REQUIRED and should be abstract
!incorrect-protocol-member! MDLTransformComponent::resetsTransform is REQUIRED and should be abstract
!incorrect-protocol-member! MDLTransformComponent::setResetsTransform: is REQUIRED and should be abstract