summaryrefslogtreecommitdiffstats
path: root/LibOVR/Src/OVR_Win32_SensorDevice.cpp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-03-21 23:01:12 +0100
committerSven Gothel <[email protected]>2015-03-21 23:01:12 +0100
commit0c5c4be020c2d55540058a49b2a879f46d5a1e13 (patch)
tree00f84c2ca18cc233b826014094b9cad0769a3ea5 /LibOVR/Src/OVR_Win32_SensorDevice.cpp
parentcbbd775b6c754927632c333ff01424a0d2048c7c (diff)
parente490c3c7f7bb5461cfa78a214827aa534fb43a3e (diff)
Merge branch 'vanilla_0.4.4' and resolve conflicts
TODO: Validate for removed patches due to relocation Resolved Conflicts: LibOVR/Src/Kernel/OVR_ThreadsWinAPI.cpp LibOVR/Src/OVR_Linux_HMDDevice.cpp LibOVR/Src/OVR_OSX_HMDDevice.cpp LibOVR/Src/OVR_Profile.cpp LibOVR/Src/OVR_Sensor2Impl.cpp LibOVR/Src/OVR_SensorFusion.cpp LibOVR/Src/OVR_SensorImpl.cpp LibOVR/Src/OVR_Win32_DeviceStatus.cpp LibOVR/Src/OVR_Win32_HIDDevice.cpp LibOVR/Src/OVR_Win32_HIDDevice.h LibOVR/Src/OVR_Win32_HMDDevice.cpp
Diffstat (limited to 'LibOVR/Src/OVR_Win32_SensorDevice.cpp')
-rw-r--r--LibOVR/Src/OVR_Win32_SensorDevice.cpp60
1 files changed, 0 insertions, 60 deletions
diff --git a/LibOVR/Src/OVR_Win32_SensorDevice.cpp b/LibOVR/Src/OVR_Win32_SensorDevice.cpp
deleted file mode 100644
index d1a9fdb..0000000
--- a/LibOVR/Src/OVR_Win32_SensorDevice.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/************************************************************************************
-
-Filename : OVR_Win32_SensorDevice.cpp
-Content : Win32 SensorDevice implementation
-Created : March 12, 2013
-Authors : Lee Cooper
-
-Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved.
-
-Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License");
-you may not use the Oculus VR Rift 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-3.1
-
-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"
-
-#include "OVR_Win32_HMDDevice.h"
-#include "OVR_SensorImpl.h"
-#include "OVR_DeviceImpl.h"
-
-namespace OVR { namespace Win32 {
-
-} // namespace Win32
-
-//-------------------------------------------------------------------------------------
-void SensorDeviceImpl::EnumerateHMDFromSensorDisplayInfo
- (const SensorDisplayInfoImpl& displayInfo,
- DeviceFactory::EnumerateVisitor& visitor)
-{
- Win32::HMDDeviceCreateDesc hmdCreateDesc(&Win32::HMDDeviceFactory::GetInstance(), String(), String());
-
- hmdCreateDesc.SetScreenParameters( 0, 0,
- displayInfo.HResolution, displayInfo.VResolution,
- displayInfo.HScreenSize, displayInfo.VScreenSize,
- displayInfo.VCenter, displayInfo.LensSeparation);
-
- if ((displayInfo.DistortionType & SensorDisplayInfoImpl::Mask_BaseFmt) == SensorDisplayInfoImpl::Base_Distortion)
- {
- // TODO: update to spline system.
- hmdCreateDesc.SetDistortion(displayInfo.DistortionK);
- }
-
- visitor.Visit(hmdCreateDesc);
-}
-
-} // namespace OVR
-
-