summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Davis <[email protected]>2014-01-17 14:42:18 -0800
committerBrad Davis <[email protected]>2014-01-17 14:42:18 -0800
commit0d284f51c3545bacd98b8dd9be2b9ab709f3751f (patch)
tree8f7d5f58e2c26fe0f16757d5e759ad51a15fa334
parent6794b1b3816486f7e379b0046556c3a6f48fbbdf (diff)
Removing display id: mac only
-rw-r--r--LibOVR/Src/OVR_Linux_HMDDevice.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/LibOVR/Src/OVR_Linux_HMDDevice.cpp b/LibOVR/Src/OVR_Linux_HMDDevice.cpp
index 035647a..87cd7bf 100644
--- a/LibOVR/Src/OVR_Linux_HMDDevice.cpp
+++ b/LibOVR/Src/OVR_Linux_HMDDevice.cpp
@@ -7,16 +7,16 @@ Authors : Brant Lewis
Copyright : Copyright 2013 Oculus VR, Inc. All Rights reserved.
-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
+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
+http://www.oculusvr.com/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, the Oculus VR SDK
+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
@@ -43,8 +43,7 @@ HMDDeviceCreateDesc::HMDDeviceCreateDesc(
: DeviceCreateDesc(factory, Device_HMD),
DisplayDeviceName(displayDeviceName),
DesktopX(0), DesktopY(0), Contents(0), EyeToScreenDistance(0),
- HResolution(0), VResolution(0), HScreenSize(0), VScreenSize(0),
- DisplayId(dispId)
+ HResolution(0), VResolution(0), HScreenSize(0), VScreenSize(0)
{
DeviceId = DisplayDeviceName;
for (int i=0; i<4; i++)
@@ -57,7 +56,7 @@ HMDDeviceCreateDesc::HMDDeviceCreateDesc(const HMDDeviceCreateDesc& other)
DesktopX(other.DesktopX), DesktopY(other.DesktopY), Contents(other.Contents),
HResolution(other.HResolution), VResolution(other.VResolution),
HScreenSize(other.HScreenSize), VScreenSize(other.VScreenSize),
- DisplayId(other.DisplayId), EyeToScreenDistance(other.EyeToScreenDistance)
+ EyeToScreenDistance(other.EyeToScreenDistance)
{
for (int i=0; i<4; i++)
DistortionK[i] = other.DistortionK[i];