Updated to use definitions in latest <OpenGL/gl3.h> header file provided with OS X 10.9.x.

Author: erikbuck

COLLADAViewer2/AGLK/AGLKMesh+viewAdditions.m

@@ -263,13 +263,11 @@ - (void)drawNormalsCommandsInRange:(NSRange)aRange
       AGLKMeshVertex *vertexAttributes = (AGLKMeshVertex *)
          [self.vertexData bytes];
 
-      glDisable(GL_LIGHTING);
       glDisable(GL_TEXTURE_2D);
-      glColor4f(1.0f, 1.0f, 0.0f, 1.0f);
 
-      glDisableClientState(GL_VERTEX_ARRAY);                 
-      glDisableClientState(GL_NORMAL_ARRAY); 
-      glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+      glDisableVertexAttribArray(GLKVertexAttribPosition);
+      glDisableVertexAttribArray(GLKVertexAttribNormal);
+      glDisableVertexAttribArray(GLKVertexAttribTexCoord0);
 
       for(NSUInteger i = aRange.location; 
          i <= lastCommandIndex; i++)
@@ -299,8 +297,9 @@ - (void)drawNormalsCommandsInRange:(NSRange)aRange
             vertexBuffer[5] = vertexBuffer[2] + 
                (lineLength * currentVertex.normal.z);
 
-            glEnableClientState(GL_VERTEX_ARRAY);                 
-            glVertexPointer(3, 
+            glEnableVertexAttribArray(GLKVertexAttribPosition);
+            glVertexAttribIPointer(GLKVertexAttribPosition,
+               3 * sizeof(GLfloat),
                GL_FLOAT, 
                3 * sizeof(GLfloat), 
                vertexBuffer);

COLLADAViewer2/AGLK/AGLKMesh.m

@@ -679,8 +679,8 @@ - (void)normalizeAllTextureCoords;
 
          // Copy vertices back in original order within vertices array
          const GLsizei numberOfTriangles =
-            [noShareTrianglesData length] /
-               sizeof(ANoShareTriangle);
+            (GLsizei)([noShareTrianglesData length] /
+               sizeof(ANoShareTriangle));
          const ANoShareTriangle *triangles =
             (ANoShareTriangle *)[noShareTrianglesData bytes];
 

COLLADAViewer2/AGLK/AGLKView.m

@@ -7,6 +7,8 @@
 //
 
 #import "AGLKView.h"
+#import <OpenGL/gl.h>
+
 
 @implementation AGLKView
 

COLLADAViewer2/COLLADA/COLLADAParser+geometry.m

@@ -10,6 +10,7 @@
 #import "COLLADAMeshGeometry.h"
 #import "COLLADARoot.h"
 #import "AGLKMesh.h"
+#import <OpenGL/gl3.h>
 
 
 /////////////////////////////////////////////////////////////////
@@ -681,7 +682,7 @@ - (void)appendTriangles:(COLLADATrianglesInfo *)trianglesInfo
    }
 
    // Add command to draw the triangles just added 
-   [self.mesh appendCommand:GL_TRIANGLES 
+   [self.mesh appendCommand:GL_TRIANGLES
       firstIndex:firstIndex
       numberOfIndices:(mesh.numberOfIndices - firstIndex)
       materialName:trianglesInfo.materialID];

COLLADAViewer2/COLLADA/COLLADAParser.m

@@ -213,7 +213,7 @@ - (void)extractPathFromLibraryImagesElement:(NSXMLElement *)element
          }
       }
 
-
+      NSAssert(nil != imageID, @"Invalid imageID");
       [self.root.imagePaths
          setObject:imagePath forKey:imageID];
    }

COLLADAViewer2/COLLADA/COLLADARoot+viewAdditions.m

@@ -436,11 +436,11 @@ - (void)useTextureAtlasImage:(NSImage *)anImage;
       glTexParameteri(
          GL_TEXTURE_2D, 
          GL_TEXTURE_WRAP_S, 
-         GL_CLAMP);
+         GL_CLAMP_TO_EDGE);
       glTexParameteri(
          GL_TEXTURE_2D, 
          GL_TEXTURE_WRAP_T, 
-         GL_CLAMP);
+         GL_CLAMP_TO_EDGE);
 
       for(COLLADAImagePath *imagePath in self.imagePaths.allValues)
       {