diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5018a85 Binary files /dev/null and b/.DS_Store differ diff --git a/CeedGL.xcodeproj/project.pbxproj b/CeedGL.xcodeproj/project.pbxproj index 4174420..b39f4d4 100644 --- a/CeedGL.xcodeproj/project.pbxproj +++ b/CeedGL.xcodeproj/project.pbxproj @@ -103,6 +103,8 @@ 05E625BC127F20D700B4A69C /* GLObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 05E625BA127F20D700B4A69C /* GLObject.m */; }; 05F693EB1285691700B5082C /* GLValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 05F693E91285691700B5082C /* GLValue.h */; settings = {ATTRIBUTES = (Public, ); }; }; 05F693EC1285691700B5082C /* GLValue.m in Sources */ = {isa = PBXBuildFile; fileRef = 05F693EA1285691700B5082C /* GLValue.m */; }; + A661A6E217A82BDE00057C71 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A661A6E117A82BDE00057C71 /* CoreGraphics.framework */; }; + A661A6E417A82BE800057C71 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A661A6E317A82BE800057C71 /* QuartzCore.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -182,6 +184,8 @@ 05E625BA127F20D700B4A69C /* GLObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLObject.m; sourceTree = ""; }; 05F693E91285691700B5082C /* GLValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLValue.h; sourceTree = ""; }; 05F693EA1285691700B5082C /* GLValue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLValue.m; sourceTree = ""; }; + A661A6E117A82BDE00057C71 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + A661A6E317A82BE800057C71 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -218,6 +222,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A661A6E417A82BE800057C71 /* QuartzCore.framework in Frameworks */, + A661A6E217A82BDE00057C71 /* CoreGraphics.framework in Frameworks */, 05E625AE127EED7B00B4A69C /* Cocoa.framework in Frameworks */, 05E625AC127EED5A00B4A69C /* OpenGL.framework in Frameworks */, ); @@ -362,6 +368,8 @@ 052BD751127ECB10005A3AE9 /* Frameworks */ = { isa = PBXGroup; children = ( + A661A6E317A82BE800057C71 /* QuartzCore.framework */, + A661A6E117A82BDE00057C71 /* CoreGraphics.framework */, 05E625AD127EED7B00B4A69C /* Cocoa.framework */, 05E625AB127EED5A00B4A69C /* OpenGL.framework */, 050DB80814890EE300812267 /* Foundation.framework */, diff --git a/CeedGL.xcodeproj/project.xcworkspace/xcshareddata/CeedGL.xccheckout b/CeedGL.xcodeproj/project.xcworkspace/xcshareddata/CeedGL.xccheckout new file mode 100644 index 0000000..62feee7 --- /dev/null +++ b/CeedGL.xcodeproj/project.xcworkspace/xcshareddata/CeedGL.xccheckout @@ -0,0 +1,39 @@ + + + + + IDESourceControlProjectIdentifier + 96E16DD2-1363-45D7-A364-AA5E49414360 + IDESourceControlProjectName + CeedGL + IDESourceControlProjectOriginsDictionary + + B47E2A2C-302D-44A2-92F8-A1CEDB3E0BFB + https://bitbucket.org/harikaram/scottishpower.git + + IDESourceControlProjectPath + ScottishPower/Vendor/CeedGL/CeedGL.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + B47E2A2C-302D-44A2-92F8-A1CEDB3E0BFB + ../../../../.. + + IDESourceControlProjectURL + https://bitbucket.org/harikaram/scottishpower.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + B47E2A2C-302D-44A2-92F8-A1CEDB3E0BFB + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + B47E2A2C-302D-44A2-92F8-A1CEDB3E0BFB + IDESourceControlWCCName + ScottishPower + + + + diff --git a/CeedGL.xcodeproj/project.xcworkspace/xcuserdata/Club15CC.xcuserdatad/UserInterfaceState.xcuserstate b/CeedGL.xcodeproj/project.xcworkspace/xcuserdata/Club15CC.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..130d8d3 Binary files /dev/null and b/CeedGL.xcodeproj/project.xcworkspace/xcuserdata/Club15CC.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGL Mac Framework.xcscheme b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGL Mac Framework.xcscheme new file mode 100644 index 0000000..f0c6f34 --- /dev/null +++ b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGL Mac Framework.xcscheme @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGL.ios.xcscheme b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGL.ios.xcscheme new file mode 100644 index 0000000..95d08d0 --- /dev/null +++ b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGL.ios.xcscheme @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGL.mac.xcscheme b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGL.mac.xcscheme new file mode 100644 index 0000000..a8cf997 --- /dev/null +++ b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGL.mac.xcscheme @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGLDemo.ios.xcscheme b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGLDemo.ios.xcscheme new file mode 100644 index 0000000..2b4e1b8 --- /dev/null +++ b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGLDemo.ios.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGLDemo.mac.xcscheme b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGLDemo.mac.xcscheme new file mode 100644 index 0000000..47d57a5 --- /dev/null +++ b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/CeedGLDemo.mac.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/xcschememanagement.plist b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..01f5da4 --- /dev/null +++ b/CeedGL.xcodeproj/xcuserdata/Club15CC.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,62 @@ + + + + + SchemeUserState + + CeedGL Mac Framework.xcscheme + + orderHint + 0 + + CeedGL.ios.xcscheme + + orderHint + 2 + + CeedGL.mac.xcscheme + + orderHint + 1 + + CeedGLDemo.ios.xcscheme + + orderHint + 4 + + CeedGLDemo.mac.xcscheme + + orderHint + 3 + + + SuppressBuildableAutocreation + + 050DB7DC148909E300812267 + + primary + + + 050DB80614890EE300812267 + + primary + + + 050DB82D1489145800812267 + + primary + + + 052BD756127ECB10005A3AE9 + + primary + + + 05BE5870128553040054FD91 + + primary + + + + + diff --git a/Sources/CeedGL.h b/Sources/CeedGL.h index 84e67f2..fae2c67 100644 --- a/Sources/CeedGL.h +++ b/Sources/CeedGL.h @@ -1,12 +1,12 @@ -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import \ No newline at end of file +#import "GLPlatform.h" +#import "GLDebug.h" +#import "GLValue.h" +#import "GLBuffer.h" +#import "GLBufferDataSource.h" +#import "GLTexture.h" +#import "GLFramebuffer.h" +#import "GLRenderbuffer.h" +#import "GLShader.h" +#import "GLProgram.h" +#import "GLDrawCommand.h" \ No newline at end of file diff --git a/Sources/GLBuffer.h b/Sources/GLBuffer.h index d417b43..314b86b 100644 --- a/Sources/GLBuffer.h +++ b/Sources/GLBuffer.h @@ -7,8 +7,8 @@ // #import -#import -#import +#import "GLObject.h" +#import "GLBufferDataSource.h" @interface GLBuffer : GLObject { GLenum mUsage; diff --git a/Sources/GLBuffer.m b/Sources/GLBuffer.m index e15a72e..526868d 100644 --- a/Sources/GLBuffer.m +++ b/Sources/GLBuffer.m @@ -7,6 +7,7 @@ // #import "GLBuffer.h" +#import "GLDebug.h" @implementation GLBuffer diff --git a/Sources/GLDrawCommand.h b/Sources/GLDrawCommand.h index 8d48b48..a2636b6 100644 --- a/Sources/GLDrawCommand.h +++ b/Sources/GLDrawCommand.h @@ -7,7 +7,7 @@ // #import -#import +#import "GLPlatform.h" @class GLBuffer, GLProgram, GLTexture, GLValue; diff --git a/Sources/GLDrawCommand.m b/Sources/GLDrawCommand.m index 22bb882..4fe3f38 100644 --- a/Sources/GLDrawCommand.m +++ b/Sources/GLDrawCommand.m @@ -11,6 +11,7 @@ #import "GLValue.h" #import "GLBuffer.h" #import "GLTexture.h" +#import "GLDebug.h" @implementation GLDrawCommand diff --git a/Sources/GLFramebuffer.h b/Sources/GLFramebuffer.h index e2ae2f0..6d7e96b 100644 --- a/Sources/GLFramebuffer.h +++ b/Sources/GLFramebuffer.h @@ -7,7 +7,7 @@ // #import -#import +#import "GLObject.h" @class GLTexture, GLRenderbuffer; diff --git a/Sources/GLFramebuffer.m b/Sources/GLFramebuffer.m index 4605d0e..e2f8719 100644 --- a/Sources/GLFramebuffer.m +++ b/Sources/GLFramebuffer.m @@ -9,6 +9,7 @@ #import "GLFramebuffer.h" #import "GLRenderbuffer.h" #import "GLTexture.h" +#import "GLDebug.h" @implementation GLFramebuffer diff --git a/Sources/GLObject.h b/Sources/GLObject.h index 9dd86ab..605f979 100644 --- a/Sources/GLObject.h +++ b/Sources/GLObject.h @@ -7,7 +7,7 @@ // #import -#import +#import "GLPlatform.h" // Handle based OpenGL object diff --git a/Sources/GLObject.m b/Sources/GLObject.m index 6047263..2675974 100644 --- a/Sources/GLObject.m +++ b/Sources/GLObject.m @@ -7,6 +7,7 @@ // #import "GLObject.h" +#import "GLDebug.h" @implementation GLObject diff --git a/Sources/GLProgram.h b/Sources/GLProgram.h index 31145c4..e0cb180 100644 --- a/Sources/GLProgram.h +++ b/Sources/GLProgram.h @@ -7,7 +7,7 @@ // #import -#import +#import "GLObject.h" @class GLShader; diff --git a/Sources/GLProgram.m b/Sources/GLProgram.m index 966cbe9..d18e586 100644 --- a/Sources/GLProgram.m +++ b/Sources/GLProgram.m @@ -8,6 +8,7 @@ #import "GLProgram.h" #import "GLShader.h" +#import "GLDebug.h" @implementation GLProgram diff --git a/Sources/GLRenderbuffer.h b/Sources/GLRenderbuffer.h index daafde6..918d32b 100644 --- a/Sources/GLRenderbuffer.h +++ b/Sources/GLRenderbuffer.h @@ -7,7 +7,8 @@ // #import -#import +#import "GLObject.h" +#import @interface GLRenderbuffer : GLObject { diff --git a/Sources/GLRenderbuffer.m b/Sources/GLRenderbuffer.m index e47730d..06b1f68 100644 --- a/Sources/GLRenderbuffer.m +++ b/Sources/GLRenderbuffer.m @@ -7,6 +7,7 @@ // #import "GLRenderbuffer.h" +#import "GLDebug.h" @implementation GLRenderbuffer diff --git a/Sources/GLShader.h b/Sources/GLShader.h index 7793ce9..9bbaea6 100644 --- a/Sources/GLShader.h +++ b/Sources/GLShader.h @@ -7,7 +7,7 @@ // #import -#import +#import "GLObject.h" #define GL_STRINGIFY(A) [NSString stringWithCString:#A encoding:NSUTF8StringEncoding] diff --git a/Sources/GLShader.m b/Sources/GLShader.m index 0d37927..d029294 100644 --- a/Sources/GLShader.m +++ b/Sources/GLShader.m @@ -7,6 +7,7 @@ // #import "GLShader.h" +#import "GLDebug.h" @implementation GLShader diff --git a/Sources/GLTexture.h b/Sources/GLTexture.h index 1302e4f..62291fb 100644 --- a/Sources/GLTexture.h +++ b/Sources/GLTexture.h @@ -7,7 +7,9 @@ // #import -#import +#import "GLObject.h" +#import + @interface GLTexture : GLObject { GLsizei mWidth, mHeight; diff --git a/Sources/GLTexture.m b/Sources/GLTexture.m index 7c34ca3..2cdd626 100644 --- a/Sources/GLTexture.m +++ b/Sources/GLTexture.m @@ -7,7 +7,7 @@ // #import "GLTexture.h" - +#import "GLDebug.h" @implementation GLTexture diff --git a/Sources/GLValue.h b/Sources/GLValue.h index d916de6..e673701 100644 --- a/Sources/GLValue.h +++ b/Sources/GLValue.h @@ -7,7 +7,7 @@ // #import -#import +#import "GLPlatform.h" @interface GLValue : NSObject { GLsizei mSize; // 1, 2, 3, or 4; diff --git a/Sources/GLValue.m b/Sources/GLValue.m index e3ebe18..2daa426 100644 --- a/Sources/GLValue.m +++ b/Sources/GLValue.m @@ -7,6 +7,7 @@ // #import "GLValue.h" +#import "GLDebug.h" #define mINT_ARRAY ((GLint*)mValues)