Documentation Archive Developer
Search

GLKit Changes for Objective-C

GLKit

GLKBaseEffect.h

Modified GLKBaseEffect.fog
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyFog *fog
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyFog *fog

Modified GLKBaseEffect.label
Declaration
From
@property(nonatomic, copy) NSString *label
To
@property(nonatomic, copy, nullable) NSString *label

Modified GLKBaseEffect.light0
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyLight *light0
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyLight *light0

Modified GLKBaseEffect.light1
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyLight *light1
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyLight *light1

Modified GLKBaseEffect.light2
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyLight *light2
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyLight *light2

Modified GLKBaseEffect.material
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyMaterial *material
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyMaterial *material

Modified GLKBaseEffect.texture2d0
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyTexture *texture2d0
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyTexture *texture2d0

Modified GLKBaseEffect.texture2d1
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyTexture *texture2d1
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyTexture *texture2d1

Modified GLKBaseEffect.textureOrder
Declaration
From
@property(nonatomic, copy) NSArray *textureOrder
To
@property(nonatomic, copy, nullable) NSArray<GLKEffectPropertyTexture *> *textureOrder

Modified GLKBaseEffect.transform
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyTransform *transform
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyTransform *transform

GLKEffectPropertyLight.h

Modified GLKEffectPropertyLight.transform
Declaration
From
@property(nonatomic, retain) GLKEffectPropertyTransform *transform
To
@property(nonatomic, retain, nonnull) GLKEffectPropertyTransform *transform

GLKMathUtils.h

Modified GLKMathProject()
Declaration
From
GLKVector3 GLKMathProject (
    GLKVector3 object,
    GLKMatrix4 model,
    GLKMatrix4 projection,
    int *viewport
);
To
GLKVector3 GLKMathProject (
    GLKVector3 object,
    GLKMatrix4 model,
    GLKMatrix4 projection,
    int * _Nonnull viewport
);

Modified GLKMathUnproject()
Declaration
From
GLKVector3 GLKMathUnproject (
    GLKVector3 window,
    GLKMatrix4 model,
    GLKMatrix4 projection,
    int *viewport,
    bool *success
);
To
GLKVector3 GLKMathUnproject (
    GLKVector3 window,
    GLKMatrix4 model,
    GLKMatrix4 projection,
    int * _Nonnull viewport,
    bool * _Nonnull success
);

Modified NSStringFromGLKMatrix2()
Declaration
From
NSString * NSStringFromGLKMatrix2 (
    GLKMatrix2 matrix
);
To
NSString * _Nonnull NSStringFromGLKMatrix2 (
    GLKMatrix2 matrix
);

Modified NSStringFromGLKMatrix3()
Declaration
From
NSString * NSStringFromGLKMatrix3 (
    GLKMatrix3 matrix
);
To
NSString * _Nonnull NSStringFromGLKMatrix3 (
    GLKMatrix3 matrix
);

Modified NSStringFromGLKMatrix4()
Declaration
From
NSString * NSStringFromGLKMatrix4 (
    GLKMatrix4 matrix
);
To
NSString * _Nonnull NSStringFromGLKMatrix4 (
    GLKMatrix4 matrix
);

Modified NSStringFromGLKQuaternion()
Declaration
From
NSString * NSStringFromGLKQuaternion (
    GLKQuaternion quaternion
);
To
NSString * _Nonnull NSStringFromGLKQuaternion (
    GLKQuaternion quaternion
);

Modified NSStringFromGLKVector2()
Declaration
From
NSString * NSStringFromGLKVector2 (
    GLKVector2 vector
);
To
NSString * _Nonnull NSStringFromGLKVector2 (
    GLKVector2 vector
);

Modified NSStringFromGLKVector3()
Declaration
From
NSString * NSStringFromGLKVector3 (
    GLKVector3 vector
);
To
NSString * _Nonnull NSStringFromGLKVector3 (
    GLKVector3 vector
);

Modified NSStringFromGLKVector4()
Declaration
From
NSString * NSStringFromGLKVector4 (
    GLKVector4 vector
);
To
NSString * _Nonnull NSStringFromGLKVector4 (
    GLKVector4 vector
);

GLKMatrixStack.h

Modified GLKMatrixStackCreate()
Declaration
From
GLKMatrixStackRef GLKMatrixStackCreate (
    CFAllocatorRef alloc
);
To
GLKMatrixStackRef _Nullable GLKMatrixStackCreate (
    CFAllocatorRef _Nullable alloc
);

Modified GLKMatrixStackGetMatrix2()
Declaration
From
GLKMatrix2 GLKMatrixStackGetMatrix2 (
    GLKMatrixStackRef stack
);
To
GLKMatrix2 GLKMatrixStackGetMatrix2 (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackGetMatrix3()
Declaration
From
GLKMatrix3 GLKMatrixStackGetMatrix3 (
    GLKMatrixStackRef stack
);
To
GLKMatrix3 GLKMatrixStackGetMatrix3 (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackGetMatrix3Inverse()
Declaration
From
GLKMatrix3 GLKMatrixStackGetMatrix3Inverse (
    GLKMatrixStackRef stack
);
To
GLKMatrix3 GLKMatrixStackGetMatrix3Inverse (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackGetMatrix3InverseTranspose()
Declaration
From
GLKMatrix3 GLKMatrixStackGetMatrix3InverseTranspose (
    GLKMatrixStackRef stack
);
To
GLKMatrix3 GLKMatrixStackGetMatrix3InverseTranspose (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackGetMatrix4()
Declaration
From
GLKMatrix4 GLKMatrixStackGetMatrix4 (
    GLKMatrixStackRef stack
);
To
GLKMatrix4 GLKMatrixStackGetMatrix4 (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackGetMatrix4Inverse()
Declaration
From
GLKMatrix4 GLKMatrixStackGetMatrix4Inverse (
    GLKMatrixStackRef stack
);
To
GLKMatrix4 GLKMatrixStackGetMatrix4Inverse (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackGetMatrix4InverseTranspose()
Declaration
From
GLKMatrix4 GLKMatrixStackGetMatrix4InverseTranspose (
    GLKMatrixStackRef stack
);
To
GLKMatrix4 GLKMatrixStackGetMatrix4InverseTranspose (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackLoadMatrix4()
Declaration
From
void GLKMatrixStackLoadMatrix4 (
    GLKMatrixStackRef stack,
    GLKMatrix4 matrix
);
To
void GLKMatrixStackLoadMatrix4 (
    GLKMatrixStackRef _Nonnull stack,
    GLKMatrix4 matrix
);

Modified GLKMatrixStackMultiplyMatrix4()
Declaration
From
void GLKMatrixStackMultiplyMatrix4 (
    GLKMatrixStackRef stack,
    GLKMatrix4 matrix
);
To
void GLKMatrixStackMultiplyMatrix4 (
    GLKMatrixStackRef _Nonnull stack,
    GLKMatrix4 matrix
);

Modified GLKMatrixStackMultiplyMatrixStack()
Declaration
From
void GLKMatrixStackMultiplyMatrixStack (
    GLKMatrixStackRef stackLeft,
    GLKMatrixStackRef stackRight
);
To
void GLKMatrixStackMultiplyMatrixStack (
    GLKMatrixStackRef _Nonnull stackLeft,
    GLKMatrixStackRef _Nonnull stackRight
);

Modified GLKMatrixStackPop()
Declaration
From
void GLKMatrixStackPop (
    GLKMatrixStackRef stack
);
To
void GLKMatrixStackPop (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackPush()
Declaration
From
void GLKMatrixStackPush (
    GLKMatrixStackRef stack
);
To
void GLKMatrixStackPush (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackRotate()
Declaration
From
void GLKMatrixStackRotate (
    GLKMatrixStackRef stack,
    float radians,
    float x,
    float y,
    float z
);
To
void GLKMatrixStackRotate (
    GLKMatrixStackRef _Nonnull stack,
    float radians,
    float x,
    float y,
    float z
);

Modified GLKMatrixStackRotateWithVector3()
Declaration
From
void GLKMatrixStackRotateWithVector3 (
    GLKMatrixStackRef stack,
    float radians,
    GLKVector3 axisVector
);
To
void GLKMatrixStackRotateWithVector3 (
    GLKMatrixStackRef _Nonnull stack,
    float radians,
    GLKVector3 axisVector
);

Modified GLKMatrixStackRotateWithVector4()
Declaration
From
void GLKMatrixStackRotateWithVector4 (
    GLKMatrixStackRef stack,
    float radians,
    GLKVector4 axisVector
);
To
void GLKMatrixStackRotateWithVector4 (
    GLKMatrixStackRef _Nonnull stack,
    float radians,
    GLKVector4 axisVector
);

Modified GLKMatrixStackRotateX()
Declaration
From
void GLKMatrixStackRotateX (
    GLKMatrixStackRef stack,
    float radians
);
To
void GLKMatrixStackRotateX (
    GLKMatrixStackRef _Nonnull stack,
    float radians
);

Modified GLKMatrixStackRotateY()
Declaration
From
void GLKMatrixStackRotateY (
    GLKMatrixStackRef stack,
    float radians
);
To
void GLKMatrixStackRotateY (
    GLKMatrixStackRef _Nonnull stack,
    float radians
);

Modified GLKMatrixStackRotateZ()
Declaration
From
void GLKMatrixStackRotateZ (
    GLKMatrixStackRef stack,
    float radians
);
To
void GLKMatrixStackRotateZ (
    GLKMatrixStackRef _Nonnull stack,
    float radians
);

Modified GLKMatrixStackScale()
Declaration
From
void GLKMatrixStackScale (
    GLKMatrixStackRef stack,
    float sx,
    float sy,
    float sz
);
To
void GLKMatrixStackScale (
    GLKMatrixStackRef _Nonnull stack,
    float sx,
    float sy,
    float sz
);

Modified GLKMatrixStackScaleWithVector3()
Declaration
From
void GLKMatrixStackScaleWithVector3 (
    GLKMatrixStackRef stack,
    GLKVector3 scaleVector
);
To
void GLKMatrixStackScaleWithVector3 (
    GLKMatrixStackRef _Nonnull stack,
    GLKVector3 scaleVector
);

Modified GLKMatrixStackScaleWithVector4()
Declaration
From
void GLKMatrixStackScaleWithVector4 (
    GLKMatrixStackRef stack,
    GLKVector4 scaleVector
);
To
void GLKMatrixStackScaleWithVector4 (
    GLKMatrixStackRef _Nonnull stack,
    GLKVector4 scaleVector
);

Modified GLKMatrixStackSize()
Declaration
From
int GLKMatrixStackSize (
    GLKMatrixStackRef stack
);
To
int GLKMatrixStackSize (
    GLKMatrixStackRef _Nonnull stack
);

Modified GLKMatrixStackTranslate()
Declaration
From
void GLKMatrixStackTranslate (
    GLKMatrixStackRef stack,
    float tx,
    float ty,
    float tz
);
To
void GLKMatrixStackTranslate (
    GLKMatrixStackRef _Nonnull stack,
    float tx,
    float ty,
    float tz
);

Modified GLKMatrixStackTranslateWithVector3()
Declaration
From
void GLKMatrixStackTranslateWithVector3 (
    GLKMatrixStackRef stack,
    GLKVector3 translationVector
);
To
void GLKMatrixStackTranslateWithVector3 (
    GLKMatrixStackRef _Nonnull stack,
    GLKVector3 translationVector
);

Modified GLKMatrixStackTranslateWithVector4()
Declaration
From
void GLKMatrixStackTranslateWithVector4 (
    GLKMatrixStackRef stack,
    GLKVector4 translationVector
);
To
void GLKMatrixStackTranslateWithVector4 (
    GLKMatrixStackRef _Nonnull stack,
    GLKVector4 translationVector
);

GLKModel.h (Added)

Added GLKMesh
Added -[GLKMesh initWithMesh:error:]
Added GLKMesh.name
Added +[GLKMesh newMeshesFromAsset:sourceMeshes:error:]
Added GLKMesh.submeshes
Added GLKMesh.vertexBuffers
Added GLKMesh.vertexCount
Added GLKMesh.vertexDescriptor
Added GLKMeshBuffer
Added GLKMeshBuffer.allocator
Added GLKMeshBuffer.glBufferName
Added GLKMeshBuffer.length
Added GLKMeshBuffer.offset
Added GLKMeshBuffer.type
Added GLKMeshBuffer.zone
Added GLKMeshBufferAllocator
Added GLKSubmesh
Added GLKSubmesh.elementBuffer
Added GLKSubmesh.elementCount
Added GLKSubmesh.mesh
Added GLKSubmesh.mode
Added GLKSubmesh.name
Added GLKSubmesh.type
Added GLKVertexAttributeParameters
Added GLKVertexAttributeParametersFromModelIO()
Added kGLKModelErrorDomain
Added kGLKModelErrorKey

GLKReflectionMapEffect.h

Modified GLKReflectionMapEffect.textureCubeMap
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyTexture *textureCubeMap
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyTexture *textureCubeMap

GLKSkyboxEffect.h

Modified GLKSkyboxEffect.label
Declaration
From
@property(nonatomic, copy) NSString *label
To
@property(nonatomic, copy, nullable) NSString *label

Modified GLKSkyboxEffect.textureCubeMap
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyTexture *textureCubeMap
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyTexture *textureCubeMap

Modified GLKSkyboxEffect.transform
Declaration
From
@property(nonatomic, readonly) GLKEffectPropertyTransform *transform
To
@property(nonatomic, readonly, nonnull) GLKEffectPropertyTransform *transform

GLKTextureLoader.h

Modified +[GLKTextureLoader cubeMapWithContentsOfFile:options:error:]
Declaration
From
+ (GLKTextureInfo *)cubeMapWithContentsOfFile:(NSString *)path options:(NSDictionary *)options error:(NSError **)outError
To
+ (GLKTextureInfo * _Nullable)cubeMapWithContentsOfFile:(NSString * _Nonnull)path options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options error:(NSError * _Nullable * _Nullable)outError

Modified -[GLKTextureLoader cubeMapWithContentsOfFile:options:queue:completionHandler:]
Declaration
From
- (void)cubeMapWithContentsOfFile:(NSString *)path options:(NSDictionary *)options queue:(dispatch_queue_t)queue completionHandler:(GLKTextureLoaderCallback)block
To
- (void)cubeMapWithContentsOfFile:(NSString * _Nonnull)path options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options queue:(dispatch_queue_t _Nullable)queue completionHandler:(GLKTextureLoaderCallback _Nonnull)block

Modified +[GLKTextureLoader cubeMapWithContentsOfFiles:options:error:]
Declaration
From
+ (GLKTextureInfo *)cubeMapWithContentsOfFiles:(NSArray *)paths options:(NSDictionary *)options error:(NSError **)outError
To
+ (GLKTextureInfo * _Nullable)cubeMapWithContentsOfFiles:(NSArray<id> * _Nonnull)paths options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options error:(NSError * _Nullable * _Nullable)outError

Modified -[GLKTextureLoader cubeMapWithContentsOfFiles:options:queue:completionHandler:]
Declaration
From
- (void)cubeMapWithContentsOfFiles:(NSArray *)paths options:(NSDictionary *)options queue:(dispatch_queue_t)queue completionHandler:(GLKTextureLoaderCallback)block
To
- (void)cubeMapWithContentsOfFiles:(NSArray<id> * _Nonnull)paths options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options queue:(dispatch_queue_t _Nullable)queue completionHandler:(GLKTextureLoaderCallback _Nonnull)block

Modified +[GLKTextureLoader cubeMapWithContentsOfURL:options:error:]
Declaration
From
+ (GLKTextureInfo *)cubeMapWithContentsOfURL:(NSURL *)url options:(NSDictionary *)options error:(NSError **)outError
To
+ (GLKTextureInfo * _Nullable)cubeMapWithContentsOfURL:(NSURL * _Nonnull)url options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options error:(NSError * _Nullable * _Nullable)outError

Modified -[GLKTextureLoader cubeMapWithContentsOfURL:options:queue:completionHandler:]
Declaration
From
- (void)cubeMapWithContentsOfURL:(NSURL *)url options:(NSDictionary *)options queue:(dispatch_queue_t)queue completionHandler:(GLKTextureLoaderCallback)block
To
- (void)cubeMapWithContentsOfURL:(NSURL * _Nonnull)url options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options queue:(dispatch_queue_t _Nullable)queue completionHandler:(GLKTextureLoaderCallback _Nonnull)block

Modified -[GLKTextureLoader initWithShareContext:]
Declaration
From
- (id)initWithShareContext:(NSOpenGLContext *)context
To
- (instancetype _Nonnull)initWithShareContext:(NSOpenGLContext * _Nonnull)context

Modified +[GLKTextureLoader textureWithCGImage:options:error:]
Declaration
From
+ (GLKTextureInfo *)textureWithCGImage:(CGImageRef)cgImage options:(NSDictionary *)options error:(NSError **)outError
To
+ (GLKTextureInfo * _Nullable)textureWithCGImage:(CGImageRef _Nonnull)cgImage options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options error:(NSError * _Nullable * _Nullable)outError

Modified -[GLKTextureLoader textureWithCGImage:options:queue:completionHandler:]
Declaration
From
- (void)textureWithCGImage:(CGImageRef)cgImage options:(NSDictionary *)options queue:(dispatch_queue_t)queue completionHandler:(GLKTextureLoaderCallback)block
To
- (void)textureWithCGImage:(CGImageRef _Nonnull)cgImage options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options queue:(dispatch_queue_t _Nullable)queue completionHandler:(GLKTextureLoaderCallback _Nonnull)block

Modified +[GLKTextureLoader textureWithContentsOfData:options:error:]
Declaration
From
+ (GLKTextureInfo *)textureWithContentsOfData:(NSData *)data options:(NSDictionary *)options error:(NSError **)outError
To
+ (GLKTextureInfo * _Nullable)textureWithContentsOfData:(NSData * _Nonnull)data options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options error:(NSError * _Nullable * _Nullable)outError

Modified -[GLKTextureLoader textureWithContentsOfData:options:queue:completionHandler:]
Declaration
From
- (void)textureWithContentsOfData:(NSData *)data options:(NSDictionary *)options queue:(dispatch_queue_t)queue completionHandler:(GLKTextureLoaderCallback)block
To
- (void)textureWithContentsOfData:(NSData * _Nonnull)data options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options queue:(dispatch_queue_t _Nullable)queue completionHandler:(GLKTextureLoaderCallback _Nonnull)block

Modified +[GLKTextureLoader textureWithContentsOfFile:options:error:]
Declaration
From
+ (GLKTextureInfo *)textureWithContentsOfFile:(NSString *)path options:(NSDictionary *)options error:(NSError **)outError
To
+ (GLKTextureInfo * _Nullable)textureWithContentsOfFile:(NSString * _Nonnull)path options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options error:(NSError * _Nullable * _Nullable)outError

Modified -[GLKTextureLoader textureWithContentsOfFile:options:queue:completionHandler:]
Declaration
From
- (void)textureWithContentsOfFile:(NSString *)path options:(NSDictionary *)options queue:(dispatch_queue_t)queue completionHandler:(GLKTextureLoaderCallback)block
To
- (void)textureWithContentsOfFile:(NSString * _Nonnull)path options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options queue:(dispatch_queue_t _Nullable)queue completionHandler:(GLKTextureLoaderCallback _Nonnull)block

Modified +[GLKTextureLoader textureWithContentsOfURL:options:error:]
Declaration
From
+ (GLKTextureInfo *)textureWithContentsOfURL:(NSURL *)url options:(NSDictionary *)options error:(NSError **)outError
To
+ (GLKTextureInfo * _Nullable)textureWithContentsOfURL:(NSURL * _Nonnull)url options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options error:(NSError * _Nullable * _Nullable)outError

Modified -[GLKTextureLoader textureWithContentsOfURL:options:queue:completionHandler:]
Declaration
From
- (void)textureWithContentsOfURL:(NSURL *)url options:(NSDictionary *)options queue:(dispatch_queue_t)queue completionHandler:(GLKTextureLoaderCallback)block
To
- (void)textureWithContentsOfURL:(NSURL * _Nonnull)url options:(NSDictionary<NSString *,NSNumber *> * _Nullable)options queue:(dispatch_queue_t _Nullable)queue completionHandler:(GLKTextureLoaderCallback _Nonnull)block