Ability to set custom distortion scale. If not set OculusDevice will …

…use default distortion scale value.
bjornblissing · Aug 28, 2013 · ad6c6e7 · ad6c6e7
1 parent 1896da4
commit ad6c6e7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -47,9 +47,8 @@ int main( int argc, char** argv )
 	}
 
 	// Open the HMD
-	OculusDevice* oculusDevice = new OculusDevice;
-	// Set the scaling of the texture, using the recommend 25% from the SDK
-	oculusDevice->setScaleFactor(1.25f);
+	OculusDevice* oculusDevice = new OculusDevice();
+	oculusDevice->setCustomScaleFactor(1.25f);
 	osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
 
 	if (!wsi) {

diff --git a/src/oculusdevice.cpp b/src/oculusdevice.cpp
@@ -7,8 +7,11 @@
 
 #include "oculusdevice.h"
 
-OculusDevice::OculusDevice() : m_deviceManager(0), m_hmdDevice(0), m_hmdInfo(0), m_sensorFusion(0),
-	m_scaleFactor(1.0f), m_nearClip(0.3f), m_farClip(5000.0f), m_predictionDelta(0.03f)
+
+OculusDevice::OculusDevice() :
+	m_deviceManager(0), m_hmdDevice(0), m_hmdInfo(0), m_sensorFusion(0),
+	m_useCustomScaleFactor(false), m_customScaleFactor(1.0f),
+	m_nearClip(0.3f), m_farClip(5000.0f), m_predictionDelta(0.03f)
 {
 	// Init Oculus HMD
 	OVR::System::Init(OVR::Log::ConfigureDefaultLog(OVR::LogMask_All));
@@ -258,6 +261,11 @@ void OculusDevice::setSensorPredictionEnabled(bool prediction)
 
 float OculusDevice::distortionScale() const
 {
+	// Disable distortion scale calculation and use user suppied value instead
+	if (m_useCustomScaleFactor) {
+		return m_customScaleFactor;
+	}
+
 	float lensShift = hScreenSize() * 0.25f - lensSeparationDistance() * 0.5f;
 	float lensViewportShift = 4.0f * lensShift / hScreenSize();
 	float fitRadius = fabs(-1 - lensViewportShift);

diff --git a/src/oculusdevice.h b/src/oculusdevice.h
@@ -45,8 +45,7 @@ class OculusDevice {
 		osg::Vec2f scale() const;
 		osg::Vec2f scaleIn() const;
 
-		void setScaleFactor(float scaleFactor) { m_scaleFactor = scaleFactor; }
-		float scaleFactor() const { return m_scaleFactor; }
+		float scaleFactor() const { return distortionScale(); }
 
 		float aspectRatio() const {  return float (hScreenResolution()/2) / float (vScreenResolution()); }
 		osg::Quat getOrientation() const;
@@ -56,6 +55,7 @@ class OculusDevice {
 
 		void setSensorPredictionEnabled(bool prediction);
 		void setSensorPredictionDelta(float delta) { m_predictionDelta = delta; }
+		void setCustomScaleFactor(const float& customScaleFactor) { m_useCustomScaleFactor = true; m_customScaleFactor = customScaleFactor; }
 
 	protected:
 		float viewCenter() const { return hScreenSize() * 0.25f; }
@@ -66,7 +66,8 @@ class OculusDevice {
 		OVR::HMDDevice* m_hmdDevice;
 		OVR::HMDInfo* m_hmdInfo;
 		OVR::SensorFusion* m_sensorFusion;
-		float m_scaleFactor;
+		bool m_useCustomScaleFactor;
+		float m_customScaleFactor;
 		float m_nearClip;
 		float m_farClip;
 		float m_predictionDelta;