eryn/three-dee
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Renderer] Fiddling with RenderingSurface; added OpenGL and GLKit to the linked frameworks

Browse source
This commit is contained in:
Eryn Wells 2015-11-15 08:53:46 -08:00
parent cb22821fc5
commit eddb49a4a8
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Renderer/OpenGL/OpenGLView.swift
View file

@ -21,11 +21,6 @@ public class OpenGLView: NSOpenGLView {
stopRenderingLoop() stopRenderingLoop()
} }
override public func awakeFromNib() {
setupOpenGL()
startRenderingLoop()
}
override public func prepareOpenGL() { override public func prepareOpenGL() {
super.prepareOpenGL() super.prepareOpenGL()

8
Renderer/Renderer.xcodeproj/project.pbxproj
View file

@ -8,6 +8,8 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
C08379711BF869FD000F4856 /* OpenGLView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C08379701BF869FD000F4856 /* OpenGLView.swift */; }; C08379711BF869FD000F4856 /* OpenGLView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C08379701BF869FD000F4856 /* OpenGLView.swift */; };
C08379791BF8EE97000F4856 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C08379781BF8EE97000F4856 /* GLKit.framework */; };
C083797A1BF8EF18000F4856 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C08379761BF8EE6A000F4856 /* OpenGL.framework */; };
C0B61B971BF70FD200B91C36 /* Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B61B961BF70FD200B91C36 /* Renderer.h */; settings = {ATTRIBUTES = (Public, ); }; }; C0B61B971BF70FD200B91C36 /* Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B61B961BF70FD200B91C36 /* Renderer.h */; settings = {ATTRIBUTES = (Public, ); }; };
C0B61B9E1BF70FD200B91C36 /* Renderer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0B61B931BF70FD200B91C36 /* Renderer.framework */; }; C0B61B9E1BF70FD200B91C36 /* Renderer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0B61B931BF70FD200B91C36 /* Renderer.framework */; };
C0B61BA31BF70FD200B91C36 /* RendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0B61BA21BF70FD200B91C36 /* RendererTests.swift */; }; C0B61BA31BF70FD200B91C36 /* RendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0B61BA21BF70FD200B91C36 /* RendererTests.swift */; };
@ -26,6 +28,8 @@
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
C08379701BF869FD000F4856 /* OpenGLView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenGLView.swift; path = OpenGL/OpenGLView.swift; sourceTree = "<group>"; }; C08379701BF869FD000F4856 /* OpenGLView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenGLView.swift; path = OpenGL/OpenGLView.swift; sourceTree = "<group>"; };
C08379761BF8EE6A000F4856 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
C08379781BF8EE97000F4856 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
C0B61B931BF70FD200B91C36 /* Renderer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Renderer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C0B61B931BF70FD200B91C36 /* Renderer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Renderer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C0B61B961BF70FD200B91C36 /* Renderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Renderer.h; sourceTree = "<group>"; }; C0B61B961BF70FD200B91C36 /* Renderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Renderer.h; sourceTree = "<group>"; };
C0B61B981BF70FD200B91C36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; C0B61B981BF70FD200B91C36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@ -40,6 +44,8 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
C083797A1BF8EF18000F4856 /* OpenGL.framework in Frameworks */,
C08379791BF8EE97000F4856 /* GLKit.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -95,6 +101,8 @@
C0B61BAD1BF70FDC00B91C36 /* OpenGL */ = { C0B61BAD1BF70FDC00B91C36 /* OpenGL */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
C08379781BF8EE97000F4856 /* GLKit.framework */,
C08379761BF8EE6A000F4856 /* OpenGL.framework */,
C08379701BF869FD000F4856 /* OpenGLView.swift */, C08379701BF869FD000F4856 /* OpenGLView.swift */,
); );
name = OpenGL; name = OpenGL;