Merge pull request #1 from jasonrwalters/master

view lock
andreasmuller · Oct 17, 2013 · 75e4536 · 75e4536
2 parents aa3a94f + ff2b52f
commit 75e4536
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/example-OculusRiftRendering/src/testApp.cpp b/example-OculusRiftRendering/src/testApp.cpp
@@ -108,6 +108,10 @@ void testApp::keyPressed(int key)
 	if(key == 's'){
 		oculusRift.reloadShader();
 	}
+
+	if(key == 'l'){
+        	oculusRift.lockView = !oculusRift.lockView;
+    	}
 }
 
 //--------------------------------------------------------------
@@ -156,4 +160,4 @@ void testApp::gotMessage(ofMessage msg)
 void testApp::dragEvent(ofDragInfo dragInfo)
 {
 
-}
+}
diff --git a/src/ofxOculusRift.cpp b/src/ofxOculusRift.cpp
@@ -73,14 +73,15 @@ ofRectangle toOf(const OVR::Util::Render::Viewport vp){
 ofxOculusRift::ofxOculusRift(){
 	baseCamera = NULL;
 	bSetup = false;
+	viewLock = false;
 	bUsePredictedOrientation = true;
 }
 
 ofxOculusRift::~ofxOculusRift(){
 	if(bSetup){
 		pSensor.Clear();
 		pManager.Clear();
-		System::Destroy();
+		//System::Destroy();	// causes the system to crash.
 		bSetup = false;
 	}
 }
@@ -200,7 +201,11 @@ void ofxOculusRift::setupEyeParams(OVR::Util::Render::StereoEye eye){
 	if(baseCamera != NULL){
 		headRotation = headRotation * baseCamera->getGlobalTransformMatrix();
 	}
-	ofLoadMatrix( ofMatrix4x4::getInverseOf( headRotation ));
+
+	// lock the camera when enabled...
+	if (!lockView) {
+        	ofLoadMatrix( ofMatrix4x4::getInverseOf( headRotation ));
+	}
 
 	ofViewport(toOf(VP));
 	ofMatrix4x4 viewAdjust = toOf(eyeRenderParams.ViewAdjust);

diff --git a/src/ofxOculusRift.h b/src/ofxOculusRift.h
@@ -35,6 +35,7 @@ class ofxOculusRift
 
 	bool setup();
 	bool isSetup();
+	bool lockView;
 
 	void beginLeftEye();
 	void endLeftEye();