Update to SDK 0.5.0.1

example-OculusRiftRendering/OculusRenderingBasic.xcodeproj/project.pbxproj → example-ProgrammableRendering/OculusProgrammableRendering.xcodeproj/project.pbxproj

@@ -11,6 +11,7 @@
 		647F8CA1199A793F006A51EB /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 647F8CA0199A793F006A51EB /* CoreVideo.framework */; };
 		647F8DDF199AA4F1006A51EB /* ofxOculusDK2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 647F8D96199AA4F1006A51EB /* ofxOculusDK2.cpp */; };
 		BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
+		C9D106231B00E2BC00CA8511 /* LibOVR.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9D106221B00E2BC00CA8511 /* LibOVR.framework */; };
 		E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; };
 		E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; };
 		E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */; };
@@ -65,6 +66,7 @@
 		647F8D96199AA4F1006A51EB /* ofxOculusDK2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxOculusDK2.cpp; sourceTree = "<group>"; };
 		647F8D97199AA4F1006A51EB /* ofxOculusDK2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxOculusDK2.h; sourceTree = "<group>"; };
 		BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = "<group>"; };
+		C9D106221B00E2BC00CA8511 /* LibOVR.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LibOVR.framework; path = ../libs/LibOVR/Lib/Mac/Release/LibOVR.framework; sourceTree = "<group>"; };
 		E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; };
 		E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
 		E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
@@ -75,7 +77,7 @@
 		E45BE9770E8CC7DD009D7055 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
 		E45BE9790E8CC7DD009D7055 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
-		E4B69B5B0A3A1756003C02F2 /* OculusRenderingBasicDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OculusRenderingBasicDebug.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		E4B69B5B0A3A1756003C02F2 /* OculusProgrammableRenderingDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OculusProgrammableRenderingDebug.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; };
 		E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; };
 		E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; };
@@ -97,6 +99,7 @@
 				E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */,
 				E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */,
 				E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */,
+				C9D106231B00E2BC00CA8511 /* LibOVR.framework in Frameworks */,
 				E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */,
 				E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */,
 				E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */,
@@ -164,6 +167,7 @@
 		BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				C9D106221B00E2BC00CA8511 /* LibOVR.framework */,
 				BBAB23BE13894E4700AA2426 /* GLUT.framework */,
 			);
 			name = "3rd party frameworks";
@@ -194,7 +198,7 @@
 				E4EEC9E9138DF44700A80321 /* openFrameworks */,
 				BB4B014C10F69532006C3DED /* addons */,
 				E45BE5980E8CC70C009D7055 /* frameworks */,
-				E4B69B5B0A3A1756003C02F2 /* OculusRenderingBasicDebug.app */,
+				E4B69B5B0A3A1756003C02F2 /* OculusProgrammableRenderingDebug.app */,
 			);
 			sourceTree = "<group>";
 		};
@@ -221,9 +225,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		E4B69B5A0A3A1756003C02F2 /* OculusRenderingBasic */ = {
+		E4B69B5A0A3A1756003C02F2 /* OculusProgrammableRendering */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "OculusRenderingBasic" */;
+			buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "OculusProgrammableRendering" */;
 			buildPhases = (
 				E4B69B580A3A1756003C02F2 /* Sources */,
 				E4B69B590A3A1756003C02F2 /* Frameworks */,
@@ -235,9 +239,9 @@
 			dependencies = (
 				E4EEB9AC138B136A00A80321 /* PBXTargetDependency */,
 			);
-			name = OculusRenderingBasic;
+			name = OculusProgrammableRendering;
 			productName = myOFApp;
-			productReference = E4B69B5B0A3A1756003C02F2 /* OculusRenderingBasicDebug.app */;
+			productReference = E4B69B5B0A3A1756003C02F2 /* OculusProgrammableRenderingDebug.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -248,7 +252,7 @@
 			attributes = {
 				LastUpgradeCheck = 0420;
 			};
-			buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "OculusRenderingBasic" */;
+			buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "OculusProgrammableRendering" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -269,7 +273,7 @@
 			);
 			projectRoot = "";
 			targets = (
-				E4B69B5A0A3A1756003C02F2 /* OculusRenderingBasic */,
+				E4B69B5A0A3A1756003C02F2 /* OculusProgrammableRendering */,
 			);
 		};
 /* End PBXProject section */
@@ -383,17 +387,22 @@
 		E4B69B600A3A1757003C02F2 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					/Users/matt/Documents/Code/of_v0.8.4_osx_release/addons/ofxOculusDK2/libs/LibOVR/Lib/Mac/Release,
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\"";
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_CPP_RTTI = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G4;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				GCC_STRICT_ALIASING = NO;
 				INFOPLIST_FILE = "openFrameworks-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = (
@@ -462,24 +471,30 @@
 					/Users/elias/Development/openFrameworks/addons/ofxOculusDK2/libs/LibOVR/Lib/MacOS/Debug,
 					/Users/elias/Development/openFrameworks/addons/ofxOculusDK2/libs/LibOVR/Lib/MacOS/Release,
 				);
-				PRODUCT_NAME = OculusRenderingBasicDebug;
+				PRODUCT_NAME = OculusProgrammableRenderingDebug;
+				SDKROOT = macosx10.9;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
 		};
 		E4B69B610A3A1757003C02F2 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				COPY_PHASE_STRIP = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					/Users/matt/Documents/Code/of_v0.8.4_osx_release/addons/ofxOculusDK2/libs/LibOVR/Lib/Mac/Release,
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\"";
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
+				GCC_ENABLE_CPP_RTTI = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				GCC_STRICT_ALIASING = NO;
 				INFOPLIST_FILE = "openFrameworks-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = (
@@ -548,15 +563,16 @@
 					/Users/elias/Development/openFrameworks/addons/ofxOculusDK2/libs/LibOVR/Lib/MacOS/Debug,
 					/Users/elias/Development/openFrameworks/addons/ofxOculusDK2/libs/LibOVR/Lib/MacOS/Release,
 				);
-				PRODUCT_NAME = OculusRenderingBasic;
+				PRODUCT_NAME = OculusProgrammableRendering;
+				SDKROOT = macosx10.9;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "OculusRenderingBasic" */ = {
+		E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "OculusProgrammableRendering" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				E4B69B4E0A3A1720003C02F2 /* Debug */,
@@ -565,7 +581,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "OculusRenderingBasic" */ = {
+		E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "OculusProgrammableRendering" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				E4B69B600A3A1757003C02F2 /* Debug */,

example-OculusRiftRendering/Project.xcconfig → example-ProgrammableRendering/Project.xcconfig

@@ -12,9 +12,7 @@ OF_PATH = ../../..
 ADDONS_PATH = $(OF_PATH)/addons
 
 // ofxOculusRift
-OFX_OCULUSRIFT_HEADERS = $(ADDONS_PATH)/ofxOculusDK2/src $(ADDONS_PATH)/ofxOculusDK2/libs/LibOVR/Include $(ADDONS_PATH)/ofxOculusDK2/libs/LibOVR/Src
-
-OFX_OCULUSRIFT_LIBS = "$(ADDONS_PATH)/ofxOculusDK2/libs/LibOVR/Lib/MacOS/Release/libovr.a"
+OFX_OCULUSRIFT_HEADERS = $(ADDONS_PATH)/ofxOculusDK2/libs/LibOVR/include/ $(ADDONS_PATH)/ofxOculusDK2/src
 
 
 // all addons

example-ProgrammableRendering/bin/data/Shaders/simple.frag

@@ -0,0 +1,24 @@
+#version 330
+
+uniform mat4 modelViewProjectionMatrix; // automatically imported by OF
+uniform mat4 modelViewMatrix; // automatically imported by OF
+uniform mat4 normalMatrix; // the normal matrix (the inversed-then-transposed modelView matrix)
+uniform int lightsNumber;
+
+in vec4 eyeSpaceVertexPos, ambientGlobal;
+in vec3 vertex_normal, interp_eyePos;
+
+out vec4 fragColor;
+
+void main()
+{
+  vec3 n;
+
+  fragColor = ambientGlobal;
+  /* a fragment shader can't write an in variable, hence we need
+     a new variable to store the normalized interpolated normal */
+  n = normalize(vertex_normal);
+
+  fragColor += dot(n, normalize(vec3(0,100,0)- eyeSpaceVertexPos)) * vec3(.8,.8,0);
+  fragColor.w = 1.0;
+}

example-ProgrammableRendering/bin/data/Shaders/simple.vert

@@ -0,0 +1,20 @@
+#version 330
+
+uniform mat4 modelViewProjectionMatrix; // automatically imported by OF
+uniform mat4 modelViewMatrix; // automatically imported by OF
+uniform mat4 normalMatrix; // the normal matrix (the inversed-then-transposed modelView matrix)
+
+in vec4 position; // in local space
+in vec3 normal; // in local space
+
+out vec4 eyeSpaceVertexPos, ambientGlobal;
+out vec3 vertex_normal, interp_eyePos;
+
+
+void main() {
+  ambientGlobal = material.emission; // no global lighting for the moment
+  eyeSpaceVertexPos = modelViewMatrix * position;
+  vertex_normal = normalize((normalMatrix * vec4(normal, 0.0)).xyz);
+  interp_eyePos = vec3(-eyeSpaceVertexPos);
+  gl_Position = modelViewProjectionMatrix * position;
+}

example-ProgrammableRendering/bin/data/Shaders_GL3/HmdWarpDK2.frag

@@ -0,0 +1,20 @@
+#version 150
+
+uniform sampler2D Texture;
+uniform vec2 TextureScale;
+
+in vec4 oColor;
+in vec2 oTexCoord0;
+in vec2 oTexCoord1;
+in vec2 oTexCoord2;
+
+out vec4 fragColor;
+
+void main()
+{
+   fragColor.r = oColor.r * texture(Texture, oTexCoord0).r;
+   fragColor.g = oColor.g * texture(Texture, oTexCoord1).g;
+   fragColor.b = oColor.b * texture(Texture, oTexCoord2).b;
+
+   fragColor.a = 1.0;
+}

example-ProgrammableRendering/bin/data/Shaders_GL3/HmdWarpDK2.vert

@@ -0,0 +1,86 @@
+#version 150
+
+// #extension GL_ARB_texture_rectangle : enable
+
+uniform vec2 EyeToSourceUVScale;
+uniform vec2 EyeToSourceUVOffset;
+uniform mat4 EyeRotationStart;
+uniform mat4 EyeRotationEnd;
+
+in vec4 position;
+in vec4 color;
+in vec3 normal;
+// in vec2 TexCoord0;
+// in vec2 TexCoord1;
+// in vec2 TexCoord2;
+
+out vec4 oColor;
+out vec2 oTexCoord0;
+out vec2 oTexCoord1;
+out vec2 oTexCoord2;
+
+// varying vec4 oColor;
+// varying vec2 oTexCoord0;
+// varying vec2 oTexCoord1;
+// varying vec2 oTexCoord2;
+
+void main()
+{
+	// gl_Position.x = gl_Vertex.x;
+	// gl_Position.y = gl_Vertex.y;
+	gl_Position.x = position.x;
+    gl_Position.y = position.y;
+	gl_Position.z = .0;
+	gl_Position.w = 1.0;
+
+	// Vertex inputs are in TanEyeAngle space for the R,G,B channels (i.e. after chromatic aberration and distortion).
+	// These are now "real world" vectors in direction (x,y,1) relative to the eye of the HMD.
+	vec3 TanEyeAngleR = vec3 ( normal.x, normal.y, 1.0 );
+	vec3 TanEyeAngleG = vec3 ( color.r, color.g, 1.0 );
+	vec3 TanEyeAngleB = vec3 ( color.b, color.a, 1.0 );
+	// vec3 TanEyeAngleR = vec3 ( TexCoord0.x, TexCoord0.y, 1.0 );
+	// vec3 TanEyeAngleG = vec3 ( TexCoord1.x, TexCoord1.y, 1.0 );
+	// vec3 TanEyeAngleB = vec3 ( TexCoord2.x, TexCoord2.y, 1.0 );
+
+	mat3 EyeRotation;
+	EyeRotation[0] = mix ( EyeRotationStart[0], EyeRotationEnd[0], position.z ).xyz;
+	EyeRotation[1] = mix ( EyeRotationStart[1], EyeRotationEnd[1], position.z ).xyz;
+	EyeRotation[2] = mix ( EyeRotationStart[2], EyeRotationEnd[2], position.z ).xyz;
+
+    // EyeRotation[0] = mix ( EyeRotationStart[0], EyeRotationEnd[0], Color.a ).xyz;
+    // EyeRotation[1] = mix ( EyeRotationStart[1], EyeRotationEnd[1], Color.a ).xyz;
+    // EyeRotation[2] = mix ( EyeRotationStart[2], EyeRotationEnd[2], Color.a ).xyz;
+
+	vec3 TransformedR = EyeRotation * TanEyeAngleR;
+	vec3 TransformedG = EyeRotation * TanEyeAngleG;
+	vec3 TransformedB = EyeRotation * TanEyeAngleB;
+
+	// Project them back onto the Z=1 plane of the rendered images.
+	float RecipZR = 1.0 / TransformedR.z;
+	float RecipZG = 1.0 / TransformedG.z;
+	float RecipZB = 1.0 / TransformedB.z;
+	vec2 FlattenedR = vec2 ( TransformedR.x * RecipZR, TransformedR.y * RecipZR );
+	vec2 FlattenedG = vec2 ( TransformedG.x * RecipZG, TransformedG.y * RecipZG );
+	vec2 FlattenedB = vec2 ( TransformedB.x * RecipZB, TransformedB.y * RecipZB );
+
+	// These are now still in TanEyeAngle space.
+	// Scale them into the correct [0-1],[0-1] UV lookup space (depending on eye)
+	vec2 SrcCoordR = FlattenedR * EyeToSourceUVScale + EyeToSourceUVOffset;
+	vec2 SrcCoordG = FlattenedG * EyeToSourceUVScale + EyeToSourceUVOffset;
+	vec2 SrcCoordB = FlattenedB * EyeToSourceUVScale + EyeToSourceUVOffset;
+
+	oTexCoord0 = SrcCoordR;
+	oTexCoord0.y = 1.0-oTexCoord0.y;
+	oTexCoord1 = SrcCoordG;
+	oTexCoord1.y = 1.0-oTexCoord1.y;
+	oTexCoord2 = SrcCoordB;
+	oTexCoord2.y = 1.0-oTexCoord2.y;
+
+	// oTexCoord0 = SrcCoordR;
+ //    oTexCoord1 = SrcCoordG;
+ //    oTexCoord2 = SrcCoordB;
+
+ 	oColor = vec4(normal.z, normal.z, normal.z, normal.z);
+    //oColor = vec4(Color.r, Color.r, Color.r, Color.r);              // Used for vignette fade.
+
+}