Merging in updates from 0.2.5c

1 files changed, 17 insertions, 3 deletions

diff --git a/LibOVR/Src/OVR_Linux_HMDDevice.h b/LibOVR/Src/OVR_Linux_HMDDevice.h
index f3191a9..406c857 100644
--- a/LibOVR/Src/OVR_Linux_HMDDevice.h
+++ b/LibOVR/Src/OVR_Linux_HMDDevice.h
@@ -7,10 +7,21 @@ Authors     :   Brant Lewis
 
 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_Linux_HMDDevice_h
@@ -60,6 +71,7 @@ protected:
     unsigned    HResolution, VResolution;
     float       HScreenSize, VScreenSize;
     float       DistortionK[4];
+    float       EyeToScreenDistance;
 
 public:
     HMDDeviceCreateDesc(
@@ -105,8 +117,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;