diff options
author | Brad Davis <[email protected]> | 2014-01-10 18:02:40 -0800 |
---|---|---|
committer | Brad Davis <[email protected]> | 2014-01-10 18:02:40 -0800 |
commit | f28388ff2af14b56ef2d973b2f4f9da021716d4c (patch) | |
tree | dcfcb263eb87741878b6b323bfa50e1dcdc0ba1b /LibOVR/Src/OVR_Win32_SensorDevice.cpp | |
parent | cdc395e194dcc287ec3749908b8e77b2499dd675 (diff) |
Updating to 0.2.5c
Diffstat (limited to 'LibOVR/Src/OVR_Win32_SensorDevice.cpp')
-rw-r--r-- | LibOVR/Src/OVR_Win32_SensorDevice.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/LibOVR/Src/OVR_Win32_SensorDevice.cpp b/LibOVR/Src/OVR_Win32_SensorDevice.cpp index c69e618..88beb7a 100644 --- a/LibOVR/Src/OVR_Win32_SensorDevice.cpp +++ b/LibOVR/Src/OVR_Win32_SensorDevice.cpp @@ -7,10 +7,21 @@ Authors : Lee Cooper 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. + *************************************************************************************/ #include "OVR_Win32_SensorDevice.h" @@ -34,8 +45,8 @@ void SensorDeviceImpl::EnumerateHMDFromSensorDisplayInfo displayInfo.HResolution, displayInfo.VResolution, displayInfo.HScreenSize, displayInfo.VScreenSize); - if ((displayInfo.DistortionType & SensorDisplayInfoImpl::Mask_BaseFmt) == SensorDisplayInfoImpl::Base_Distortion) - hmdCreateDesc.SetDistortion(displayInfo.DistortionK); + if ((displayInfo.DistortionType & SensorDisplayInfoImpl::Mask_BaseFmt) & SensorDisplayInfoImpl::Base_Distortion) + hmdCreateDesc.SetDistortion(displayInfo.EyeToScreenDistance[0], displayInfo.DistortionK); if (displayInfo.HScreenSize > 0.14f) hmdCreateDesc.Set7Inch(); |