From c1fbf7bf9502b6782a3582c139c8b574c8578ea6 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 14 Nov 2015 23:47:57 -0800 Subject: [PATCH] [TheGreatCube] Implement a FrameRenderer It doesn't really do anything yet... --- .../TheGreatCube.xcodeproj/project.pbxproj | 7 +------ .../TheGreatCube/Base.lproj/Main.storyboard | 4 ++++ .../TheGreatCube/ViewController.swift | 20 +++++++++---------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/TheGreatCube/TheGreatCube.xcodeproj/project.pbxproj b/TheGreatCube/TheGreatCube.xcodeproj/project.pbxproj index dcbd6ce..4181fcf 100644 --- a/TheGreatCube/TheGreatCube.xcodeproj/project.pbxproj +++ b/TheGreatCube/TheGreatCube.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ C0B61BC11BF85AB800B91C36 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0B61BC01BF85AB800B91C36 /* ViewController.swift */; }; C0B61BC31BF85AB800B91C36 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C0B61BC21BF85AB800B91C36 /* Assets.xcassets */; }; C0B61BC61BF85AB800B91C36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C0B61BC41BF85AB800B91C36 /* Main.storyboard */; }; - C0B61BCF1BF85AD000B91C36 /* Renderer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0B61BCE1BF85AD000B91C36 /* Renderer.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -21,8 +20,6 @@ C0B61BC21BF85AB800B91C36 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; C0B61BC51BF85AB800B91C36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; C0B61BC71BF85AB800B91C36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C0B61BCE1BF85AD000B91C36 /* Renderer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Renderer.framework; path = "../../../../Library/Developer/Xcode/DerivedData/ThreeDee-gsfupkmqirobwqdscegzoiqzjodu/Build/Products/Debug/Renderer.framework"; sourceTree = ""; }; - C0B61BD01BF85AD400B91C36 /* Math.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Math.framework; path = "../../../../Library/Developer/Xcode/DerivedData/ThreeDee-gsfupkmqirobwqdscegzoiqzjodu/Build/Products/Debug/Math.framework"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -30,7 +27,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C0B61BCF1BF85AD000B91C36 /* Renderer.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -40,8 +36,6 @@ C0B61BB21BF85AB800B91C36 = { isa = PBXGroup; children = ( - C0B61BD01BF85AD400B91C36 /* Math.framework */, - C0B61BCE1BF85AD000B91C36 /* Renderer.framework */, C0B61BBD1BF85AB800B91C36 /* TheGreatCube */, C0B61BBC1BF85AB800B91C36 /* Products */, ); @@ -279,6 +273,7 @@ C0B61BCC1BF85AB800B91C36 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/TheGreatCube/TheGreatCube/Base.lproj/Main.storyboard b/TheGreatCube/TheGreatCube/Base.lproj/Main.storyboard index 894bf46..1b21c52 100644 --- a/TheGreatCube/TheGreatCube/Base.lproj/Main.storyboard +++ b/TheGreatCube/TheGreatCube/Base.lproj/Main.storyboard @@ -686,6 +686,10 @@ + + + + diff --git a/TheGreatCube/TheGreatCube/ViewController.swift b/TheGreatCube/TheGreatCube/ViewController.swift index 3ccce9e..e524089 100644 --- a/TheGreatCube/TheGreatCube/ViewController.swift +++ b/TheGreatCube/TheGreatCube/ViewController.swift @@ -7,21 +7,21 @@ // import Cocoa +import Renderer class ViewController: NSViewController { + @IBOutlet var glView: OpenGLView! + let renderer = FrameRenderer() override func viewDidLoad() { super.viewDidLoad() - - // Do any additional setup after loading the view. + glView.renderer = renderer } - - override var representedObject: AnyObject? { - didSet { - // Update the view, if already loaded. - } - } - - } + +class FrameRenderer: Renderer.FrameRenderer { + func renderAtTime(time: FrameTimeStamp) { + glClear(GLbitfield(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)) + } +} \ No newline at end of file