Merge pull request #1 from eighteight/stereoscopic-sample

Stereoscopic sample
notlion · Dec 5, 2014 · b5a572b · b5a572b
2 parents 5329e00 + 20729e2
commit b5a572b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/samples/StereoscopicRendering/src/StereoscopicRenderingApp.cpp b/samples/StereoscopicRendering/src/StereoscopicRenderingApp.cpp
@@ -117,8 +117,8 @@ class StereoscopicRenderingApp : public AppBasic {
 	gl::BatchRef			mBatchNote;
 	gl::VertBatchRef		mGrid;
 
-	static const int		kGridSize = 100;
-	static const int		kNumNotes = 2 * kGridSize + 1;
+	int		kGridSize;
+	int		kNumNotes;
 	gl::VboRef				mInstanceDataVbo;
 
 	gl::FboRef				mFbo;
@@ -140,6 +140,9 @@ void StereoscopicRenderingApp::prepareSettings( Settings *settings )
 
 void StereoscopicRenderingApp::setup()
 {
+    kGridSize = 100;
+    kNumNotes = 2 * kGridSize + 1;
+
 	// Enable stereoscopic rendering by default.
 	mRenderMethod = SIDE_BY_SIDE;
 

diff --git a/samples/StereoscopicRendering/xcode/CinderApp.icns b/samples/StereoscopicRendering/xcode/CinderApp.icns
diff --git a/samples/StereoscopicRendering/xcode/StereoscopicRendering.xcodeproj/project.pbxproj b/samples/StereoscopicRendering/xcode/StereoscopicRendering.xcodeproj/project.pbxproj
@@ -19,6 +19,9 @@
 		5323E6B60EAFCA7E003A9687 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B50EAFCA7E003A9687 /* QTKit.framework */; };
 		53E3CDFC0E86099300238D2B /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53E3CDFB0E86099300238D2B /* Carbon.framework */; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+		AF3836B71A31478B00C63636 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF3836B61A31478B00C63636 /* CoreMedia.framework */; };
+		AF3836B91A3147B000C63636 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF3836B81A3147B000C63636 /* AVFoundation.framework */; };
+		AF3836BB1A314A2B00C63636 /* StereoAutoFocuser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF3836BA1A314A2B00C63636 /* StereoAutoFocuser.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -40,6 +43,10 @@
 		53E3CDFB0E86099300238D2B /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* StereoscopicRendering.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StereoscopicRendering.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		AF3836B61A31478B00C63636 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = ../../../../../../../System/Library/Frameworks/CoreMedia.framework; sourceTree = "<group>"; };
+		AF3836B81A3147B000C63636 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = ../../../../../../../System/Library/Frameworks/AVFoundation.framework; sourceTree = "<group>"; };
+		AF3836BA1A314A2B00C63636 /* StereoAutoFocuser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StereoAutoFocuser.cpp; path = ../src/StereoAutoFocuser.cpp; sourceTree = "<group>"; };
+		AF3836BC1A314A3700C63636 /* StereoAutoFocuser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StereoAutoFocuser.h; path = ../include/StereoAutoFocuser.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -48,12 +55,14 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+				AF3836B71A31478B00C63636 /* CoreMedia.framework in Frameworks */,
 				0091D8F90E81B9330029341E /* OpenGL.framework in Frameworks */,
 				53E3CDFC0E86099300238D2B /* Carbon.framework in Frameworks */,
 				5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */,
 				5323E6B60EAFCA7E003A9687 /* QTKit.framework in Frameworks */,
 				0097E3E50F3E9819005A4392 /* QuickTime.framework in Frameworks */,
 				00B784B30FF439BC000DE1D7 /* Accelerate.framework in Frameworks */,
+				AF3836B91A3147B000C63636 /* AVFoundation.framework in Frameworks */,
 				00B784B40FF439BC000DE1D7 /* AudioToolbox.framework in Frameworks */,
 				00B784B50FF439BC000DE1D7 /* AudioUnit.framework in Frameworks */,
 				00B784B60FF439BC000DE1D7 /* CoreAudio.framework in Frameworks */,
@@ -66,6 +75,7 @@
 		080E96DDFE201D6D7F000001 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				AF3836BA1A314A2B00C63636 /* StereoAutoFocuser.cpp */,
 				00BAE6590E7ED9C10018A608 /* StereoscopicRenderingApp.cpp */,
 			);
 			name = Source;
@@ -74,6 +84,8 @@
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				AF3836B81A3147B000C63636 /* AVFoundation.framework */,
+				AF3836B61A31478B00C63636 /* CoreMedia.framework */,
 				00B784AF0FF439BC000DE1D7 /* Accelerate.framework */,
 				00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */,
 				00B784B10FF439BC000DE1D7 /* AudioUnit.framework */,
@@ -121,6 +133,7 @@
 		29B97315FDCFA39411CA2CEA /* Headers */ = {
 			isa = PBXGroup;
 			children = (
+				AF3836BC1A314A3700C63636 /* StereoAutoFocuser.h */,
 				32CA4F630368D1EE00C91783 /* StereoscopicRendering_Prefix.pch */,
 			);
 			name = Headers;
@@ -205,6 +218,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AF3836BB1A314A2B00C63636 /* StereoAutoFocuser.cpp in Sources */,
 				00BAE65A0E7ED9C10018A608 /* StereoscopicRenderingApp.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -215,6 +229,7 @@
 		C01FCF4B08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CINDER_PATH = ../../..;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -240,6 +255,7 @@
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CINDER_PATH = ../../..;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -270,7 +286,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = x86_64;
-				CINDER_PATH = ../../../;
+				CINDER_PATH = ../../..;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -286,7 +302,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = x86_64;
-				CINDER_PATH = ../../../;
+				CINDER_PATH = ../../..;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;