clean up

Author: Guillaume Sabran

Diff for: HelloOpenGL_Swift.xcodeproj/project.pbxproj

@@ -21,7 +21,6 @@
 		21D0C3DD1B8CDEA300E51C72 /* CC3Kazmath.c in Sources */ = {isa = PBXBuildFile; fileRef = 21D0C3D51B8CDEA300E51C72 /* CC3Kazmath.c */; };
 		21D0C3DE1B8CDEA300E51C72 /* CC3Math.m in Sources */ = {isa = PBXBuildFile; fileRef = 21D0C3D91B8CDEA300E51C72 /* CC3Math.m */; };
 		21D0C3E01B8CDEC700E51C72 /* OpenGLView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21D0C3DF1B8CDEC700E51C72 /* OpenGLView.swift */; };
-		6FB8CAF71D2EEBA3005B634B /* mountain.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 6FB8CAF61D2EEBA3005B634B /* mountain.jpg */; };
 		6FB8CAFA1D2F0FFD005B634B /* item_powerup_fish.png in Resources */ = {isa = PBXBuildFile; fileRef = 6FB8CAF81D2F0FFD005B634B /* item_powerup_fish.png */; };
 		6FB8CAFB1D2F0FFD005B634B /* tile_floor.png in Resources */ = {isa = PBXBuildFile; fileRef = 6FB8CAF91D2F0FFD005B634B /* tile_floor.png */; };
 /* End PBXBuildFile section */
@@ -71,7 +70,6 @@
 		21D0C3D91B8CDEA300E51C72 /* CC3Math.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CC3Math.m; sourceTree = "<group>"; };
 		21D0C3DA1B8CDEA300E51C72 /* ccTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccTypes.h; sourceTree = "<group>"; };
 		21D0C3DF1B8CDEC700E51C72 /* OpenGLView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenGLView.swift; sourceTree = "<group>"; };
-		6FB8CAF61D2EEBA3005B634B /* mountain.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = mountain.jpg; sourceTree = "<group>"; };
 		6FB8CAF81D2F0FFD005B634B /* item_powerup_fish.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = item_powerup_fish.png; sourceTree = "<group>"; };
 		6FB8CAF91D2F0FFD005B634B /* tile_floor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tile_floor.png; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -130,7 +128,6 @@
 				21D0C3DF1B8CDEC700E51C72 /* OpenGLView.swift */,
 				21D0C3A01B8CDE4000E51C72 /* Main.storyboard */,
 				21D0C3A31B8CDE4000E51C72 /* Assets.xcassets */,
-				6FB8CAF61D2EEBA3005B634B /* mountain.jpg */,
 				6FB8CAF81D2F0FFD005B634B /* item_powerup_fish.png */,
 				6FB8CAF91D2F0FFD005B634B /* tile_floor.png */,
 				21D0C3A51B8CDE4000E51C72 /* LaunchScreen.storyboard */,
@@ -295,7 +292,6 @@
 				6FB8CAFA1D2F0FFD005B634B /* item_powerup_fish.png in Resources */,
 				21D0C3A71B8CDE4000E51C72 /* LaunchScreen.storyboard in Resources */,
 				21D0C3CE1B8CDE9100E51C72 /* SimpleVertex.glsl in Resources */,
-				6FB8CAF71D2EEBA3005B634B /* mountain.jpg in Resources */,
 				21D0C3A41B8CDE4000E51C72 /* Assets.xcassets in Resources */,
 				21D0C3A21B8CDE4000E51C72 /* Main.storyboard in Resources */,
 				21D0C3CF1B8CDE9100E51C72 /* SimpleFragment.glsl in Resources */,

Diff for: HelloOpenGL_Swift.xcodeproj/project.xcworkspace/xcuserdata/guigou.xcuserdatad/UserInterfaceState.xcuserstate

@@ -303,7 +303,7 @@ class OpenGLView: UIView {
         glUniform1i(GLint(_textureUniform), 0);
 
 
-        let vertexBufferOffset = UnsafeMutablePointer<Void>(bitPattern: 0)
+        let vertexBufferOffset = UnsafePointer<Void>(bitPattern: 0)
         glDrawElements(GLenum(GL_TRIANGLES), GLsizei((_indices.count * sizeof(GLubyte))/sizeof(GLubyte)),
                        GLenum(GL_UNSIGNED_BYTE), vertexBufferOffset)
 
@@ -325,6 +325,7 @@ class OpenGLView: UIView {
 
 
         _context!.presentRenderbuffer(Int(GL_RENDERBUFFER))
+        
         return 0
     }
 
@@ -400,36 +401,6 @@ class OpenGLView: UIView {
 
     }
 
-    //    func getTextureFromImageWithName(fileName: String) -> GLuint {
-    //
-    //        let spriteImage: CGImage? = UIImage(named: fileName)!.cgImage
-    //
-    //        if (spriteImage == nil) {
-    //            print("Failed to load image!")
-    //            exit(1)
-    //        }
-    //
-    //        let width: Int = spriteImage!.width
-    //        let height: Int = spriteImage!.height
-    //        let spriteData = UnsafeMutablePointer<GLubyte>(calloc(Int(UInt(CGFloat(width) * CGFloat(height) * 4)), sizeof(GLubyte)))
-    //
-    //        let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue)
-    //        let spriteContext: CGContext = CGContext(data: spriteData, width: width, height: height, bitsPerComponent: 8, bytesPerRow: width*4, space: spriteImage!.colorSpace!, bitmapInfo: bitmapInfo.rawValue)!
-    //
-    //        spriteContext.draw(in: CGRect(x: 0, y: 0, width: CGFloat(width) , height: CGFloat(height)), image: spriteImage!)
-    ////        CGContextRelease(spriteContext)
-    //
-    //        var texName: GLuint = GLuint()
-    //        glGenTextures(1, &texName)
-    //        glBindTexture(GLenum(GL_TEXTURE_2D), texName)
-    //
-    //        glTexParameteri(GLenum(GL_TEXTURE_2D), GLenum(GL_TEXTURE_MIN_FILTER), GL_NEAREST)
-    //        glTexImage2D(GLenum(GL_TEXTURE_2D), 0, GL_RGBA, GLsizei(width), GLsizei(height), 0, GLenum(GL_RGBA), UInt32(GL_UNSIGNED_BYTE), spriteData)
-    //
-    //        free(spriteData)
-    //        return texName
-    //    }
-    
     func setupRenderBuffer() -> Int {
         glGenRenderbuffers(1, &_colorRenderBuffer)
         glBindRenderbuffer(GLenum(GL_RENDERBUFFER), _colorRenderBuffer)

Diff for: HelloOpenGL_Swift/OpenGLView.swift

@@ -4,5 +4,4 @@ varying lowp vec4 DestinationColor;
 
 void main(void) {
     gl_FragColor = DestinationColor * texture2D(Texture, TexCoordOut);
-//    gl_FragColor = vec4(DestinationColor.x * TexCoordOut.x, DestinationColor.y * TexCoordOut.y, DestinationColor.z, DestinationColor.w);
 }