[glkit] Update (deprecate in favor of Metal) for beta1 (#4245)
This commit is contained in:
Родитель
5784f8daee
Коммит
75d88d44ff
|
@ -123,6 +123,9 @@ namespace GLKit {
|
|||
}
|
||||
|
||||
// glVertexAttribPointer structure values, again, problems with definitions being in different namespaces
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[iOS (9,0)][Mac (10,11)]
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct GLKVertexAttributeParameters {
|
||||
|
|
|
@ -148,6 +148,9 @@ namespace GLKit {
|
|||
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
public class GLKTextureOperations : DictionaryContainer {
|
||||
public GLKTextureOperations () : base (new NSMutableDictionary ()) {}
|
||||
|
||||
|
|
59
src/glkit.cs
59
src/glkit.cs
|
@ -53,6 +53,9 @@ using pfloat = System.Single;
|
|||
|
||||
namespace GLKit {
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[iOS (9,0)][Mac (10,11, onlyOn64 : true)]
|
||||
[Static]
|
||||
interface GLKModelError {
|
||||
|
@ -64,6 +67,9 @@ namespace GLKit {
|
|||
NSString Key { get; }
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (NSObject))]
|
||||
interface GLKBaseEffect : GLKNamedEffect {
|
||||
|
@ -119,11 +125,17 @@ namespace GLKit {
|
|||
bool LightModelTwoSided { get; set; }
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (NSObject))]
|
||||
interface GLKEffectProperty {
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (GLKEffectProperty))]
|
||||
interface GLKEffectPropertyFog {
|
||||
|
@ -146,6 +158,9 @@ namespace GLKit {
|
|||
bool Enabled { get; set; }
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (GLKEffectProperty))]
|
||||
interface GLKEffectPropertyLight {
|
||||
|
@ -188,6 +203,9 @@ namespace GLKit {
|
|||
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (GLKEffectProperty))]
|
||||
interface GLKEffectPropertyMaterial {
|
||||
|
@ -207,6 +225,9 @@ namespace GLKit {
|
|||
Vector4 AmbientColor { [Align (16)] get; set; }
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (GLKEffectProperty))]
|
||||
interface GLKEffectPropertyTexture {
|
||||
|
@ -224,6 +245,9 @@ namespace GLKit {
|
|||
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (GLKEffectProperty))]
|
||||
interface GLKEffectPropertyTransform {
|
||||
|
@ -237,6 +261,9 @@ namespace GLKit {
|
|||
Matrix4 ProjectionMatrix { [Align (16)] get; set; }
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[iOS (9,0)][Mac (10,11, onlyOn64: true)]
|
||||
[BaseType (typeof(NSObject))]
|
||||
[DisableDefaultCtor] // - (nullable instancetype)init NS_UNAVAILABLE;
|
||||
|
@ -268,6 +295,9 @@ namespace GLKit {
|
|||
string Name { get; }
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[iOS (9,0)][Mac (10,11, onlyOn64: true)]
|
||||
[BaseType (typeof(NSObject))]
|
||||
[DisableDefaultCtor]
|
||||
|
@ -280,6 +310,9 @@ namespace GLKit {
|
|||
nuint Offset { get; }
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[iOS (9,0)][Mac (10,11)]
|
||||
[BaseType (typeof(NSObject))]
|
||||
[DisableDefaultCtor]
|
||||
|
@ -287,6 +320,9 @@ namespace GLKit {
|
|||
{
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[BaseType (typeof (NSObject))]
|
||||
[Model]
|
||||
[Protocol]
|
||||
|
@ -296,6 +332,9 @@ namespace GLKit {
|
|||
void PrepareToDraw ();
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (GLKBaseEffect))]
|
||||
interface GLKReflectionMapEffect : GLKNamedEffect {
|
||||
|
@ -306,6 +345,9 @@ namespace GLKit {
|
|||
Matrix3 Matrix { get; set; }
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (NSObject))]
|
||||
interface GLKSkyboxEffect : GLKNamedEffect {
|
||||
|
@ -336,6 +378,9 @@ namespace GLKit {
|
|||
void Draw ();
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[iOS (9,0)][Mac (10,11, onlyOn64: true)]
|
||||
[BaseType (typeof(NSObject))]
|
||||
[DisableDefaultCtor] // (nullable instancetype)init NS_UNAVAILABLE;
|
||||
|
@ -368,6 +413,9 @@ namespace GLKit {
|
|||
string Name { get; }
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10,8, onlyOn64 : true)]
|
||||
[BaseType (typeof (NSObject))]
|
||||
interface GLKTextureInfo : NSCopying {
|
||||
|
@ -410,6 +458,9 @@ namespace GLKit {
|
|||
|
||||
delegate void GLKTextureLoaderCallback (GLKTextureInfo textureInfo, NSError error);
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'Metal' instead.")]
|
||||
[Mac (10, 8, onlyOn64 : true)]
|
||||
[BaseType (typeof (NSObject))]
|
||||
interface GLKTextureLoader {
|
||||
|
@ -520,6 +571,8 @@ namespace GLKit {
|
|||
}
|
||||
|
||||
#if !MONOMAC
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[BaseType (typeof (UIView), Delegates=new string [] { "WeakDelegate" }, Events=new Type [] {typeof (GLKViewDelegate)})]
|
||||
interface GLKView {
|
||||
[Export ("initWithFrame:")]
|
||||
|
@ -573,6 +626,8 @@ namespace GLKit {
|
|||
void DeleteDrawable ();
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[BaseType (typeof (NSObject))]
|
||||
[Model]
|
||||
[Protocol]
|
||||
|
@ -582,6 +637,8 @@ namespace GLKit {
|
|||
void DrawInRect (GLKView view, CGRect rect);
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[BaseType (typeof (UIViewController))]
|
||||
interface GLKViewController : GLKViewDelegate {
|
||||
[Export ("initWithNibName:bundle:")]
|
||||
|
@ -630,6 +687,8 @@ namespace GLKit {
|
|||
void Update ();
|
||||
}
|
||||
|
||||
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
|
||||
[BaseType (typeof (NSObject))]
|
||||
[Model]
|
||||
[Protocol]
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
## framework deprecated in favor of Metal
|
||||
|
||||
!missing-field! GLKMatrix3Identity not bound
|
||||
!missing-field! GLKMatrix4Identity not bound
|
||||
!missing-field! GLKQuaternionIdentity not bound
|
||||
|
|
Загрузка…
Ссылка в новой задаче