aboutsummaryrefslogtreecommitdiffstats
path: root/LibOVR/Src/OVR_Win32_HMDDevice.h
diff options
context:
space:
mode:
authorBrad Davis <[email protected]>2014-01-10 18:02:40 -0800
committerBrad Davis <[email protected]>2014-01-10 18:02:40 -0800
commitf28388ff2af14b56ef2d973b2f4f9da021716d4c (patch)
treedcfcb263eb87741878b6b323bfa50e1dcdc0ba1b /LibOVR/Src/OVR_Win32_HMDDevice.h
parentcdc395e194dcc287ec3749908b8e77b2499dd675 (diff)
Updating to 0.2.5c
Diffstat (limited to 'LibOVR/Src/OVR_Win32_HMDDevice.h')
-rw-r--r--LibOVR/Src/OVR_Win32_HMDDevice.h22
1 files changed, 18 insertions, 4 deletions
diff --git a/LibOVR/Src/OVR_Win32_HMDDevice.h b/LibOVR/Src/OVR_Win32_HMDDevice.h
index e4b6657..44e5a97 100644
--- a/LibOVR/Src/OVR_Win32_HMDDevice.h
+++ b/LibOVR/Src/OVR_Win32_HMDDevice.h
@@ -5,12 +5,23 @@ Content : Win32 HMDDevice implementation
Created : September 21, 2012
Authors : Michael Antonov
-Copyright : Copyright 2012 Oculus VR, Inc. All Rights reserved.
+Copyright : Copyright 2013 Oculus VR, Inc. All Rights reserved.
-Use of this software is subject to the terms of the Oculus license
-agreement provided at the time of installation or download, or which
+Licensed under the Oculus VR SDK License Version 2.0 (the "License");
+you may not use the Oculus VR SDK except in compliance with the License,
+which is provided at the time of installation or download, or which
otherwise accompanies this software in either electronic or hard copy form.
+You may obtain a copy of the License at
+
+http://www.oculusvr.com/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, the Oculus VR SDK
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
*************************************************************************************/
#ifndef OVR_Win32_HMDDevice_h
@@ -61,6 +72,7 @@ protected:
unsigned HResolution, VResolution;
float HScreenSize, VScreenSize;
float DistortionK[4];
+ float EyeToScreenDistance;
public:
HMDDeviceCreateDesc(DeviceFactory* factory,
@@ -104,8 +116,10 @@ public:
VScreenSize = vsize;
Contents |= Contents_Screen;
}
- void SetDistortion(const float* dks)
+ void SetDistortion(float eye2screen, const float* dks)
{
+ EyeToScreenDistance = eye2screen;
+
for (int i = 0; i < 4; i++)
DistortionK[i] = dks[i];
Contents |= Contents_Distortion;