Adding windows 0.3.1 SDK

1 files changed, 11 insertions, 11 deletions

diff --git a/LibOVR/Src/OVR_Win32_DeviceManager.cpp b/LibOVR/Src/OVR_Win32_DeviceManager.cpp
index b9dc238..6327d58 100644
--- a/LibOVR/Src/OVR_Win32_DeviceManager.cpp
+++ b/LibOVR/Src/OVR_Win32_DeviceManager.cpp
@@ -5,16 +5,16 @@ Content     :   Win32 implementation of DeviceManager.
 Created     :   September 21, 2012
 Authors     :   Michael Antonov
 
-Copyright   :   Copyright 2013 Oculus VR, Inc. All Rights reserved.
+Copyright   :   Copyright 2014 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, 
+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-2.0 
+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,
@@ -107,8 +107,8 @@ bool DeviceManager::GetDeviceInfo(DeviceInfo* info) const
     
     info->Type    = Device_Manager;
     info->Version = 0;
-    OVR_strcpy(info->ProductName, DeviceInfo::MaxNameLength, "DeviceManager");
-    OVR_strcpy(info->Manufacturer,DeviceInfo::MaxNameLength, "Oculus VR, Inc.");        
+    info->ProductName = "DeviceManager";
+    info->Manufacturer = "Oculus VR, Inc.";        
     return true;
 }
 
@@ -200,12 +200,12 @@ int DeviceManagerThread::Run()
                 // allowed based on current ticks.
                 if (!TicksNotifiers.IsEmpty())
                 {
-                    UInt64 ticksMks = Timer::GetTicks();
-                    DWORD  waitAllowed;
-                    
+                    double  timeSeconds = Timer::GetSeconds();
+                    DWORD   waitAllowed;
+
                     for (UPInt j = 0; j < TicksNotifiers.GetSize(); j++)
                     {
-                        waitAllowed = (DWORD)(TicksNotifiers[j]->OnTicks(ticksMks) / Timer::MksPerMs);
+                        waitAllowed = (DWORD)(TicksNotifiers[j]->OnTicks(timeSeconds) * Timer::MsPerSecond);
                         if (waitAllowed < waitMs)
                             waitMs = waitAllowed;
                     }
@@ -416,7 +416,7 @@ DeviceManager* DeviceManager::Create()
             manager->AddFactory(&SensorDeviceFactory::Instance);
             manager->AddFactory(&LatencyTestDeviceFactory::Instance);
             manager->AddFactory(&Win32::HMDDeviceFactory::Instance);
-
+			
             manager->AddRef();
         }
         else