Merge pull request #11 from void256/master

fix crash with SDK 0.2.5
38leinaD · Apr 14, 2014 · c0b4263 · c0b4263
2 parents 00e147e + b2605ec
commit c0b4263
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/JRiftLibrary/JRiftLibrary/JRiftLibrary.cpp b/JRiftLibrary/JRiftLibrary/JRiftLibrary.cpp
@@ -24,7 +24,7 @@ using namespace OVR;
 Ptr<DeviceManager>	pManager;
 Ptr<HMDDevice>		pHMD;
 Ptr<SensorDevice>	pSensor;
-SensorFusion		FusionResult;
+SensorFusion*		pFusionResult;
 HMDInfo			Info;
 bool			InfoLoaded;
 bool			Initialized = false;
@@ -41,7 +41,8 @@ JNIEXPORT jboolean JNICALL Java_de_fruitfly_ovr_OculusRift_initSubsystem(JNIEnv
 		printf("Oculus Rift Device Interface created.\n");
 		InfoLoaded = pHMD->GetDeviceInfo(&Info);
 		pSensor = *pHMD->GetSensor();
-		FusionResult.AttachToSensor(pSensor);
+		pFusionResult = new SensorFusion();
+		pFusionResult->AttachToSensor(pSensor);
 		Initialized = InfoLoaded && pSensor;
 		printf("Oculus Rift Device Interface initialized.\n");
 	}
@@ -75,14 +76,16 @@ JNIEXPORT void JNICALL Java_de_fruitfly_ovr_OculusRift_destroySubsystem(JNIEnv *
 	pSensor.Clear();
 	pManager.Clear();
 
+	delete pFusionResult;
+
 	System::Destroy();
 }
 
 JNIEXPORT void JNICALL Java_de_fruitfly_ovr_OculusRift_pollSubsystem(JNIEnv *, jobject) {
 	if (!Initialized) return;
 	if (!pSensor) return;
 
-	quaternion = FusionResult.GetOrientation();
+	quaternion = pFusionResult->GetOrientation();
 	quaternion.GetEulerAngles<Axis_Y, Axis_X, Axis_Z>(&yaw, &pitch, &roll);
 }