Updating to 0.4.3 SDK0.4.3-official

1 files changed, 7 insertions, 40 deletions

diff --git a/LibOVR/Src/OVR_Profile.h b/LibOVR/Src/OVR_Profile.h
index cb6a2f5..911ad06 100644
--- a/LibOVR/Src/OVR_Profile.h
+++ b/LibOVR/Src/OVR_Profile.h
@@ -10,16 +10,16 @@ Notes       :
    can be accomplished in game via the Profile API or by the official Oculus Configuration
    Utility.
 
-Copyright   :   Copyright 2014 Oculus VR, Inc. All Rights reserved.
+Copyright   :   Copyright 2014 Oculus VR, LLC All Rights reserved.
 
-Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); 
+Licensed under the Oculus VR Rift SDK License Version 3.2 (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 
+http://www.oculusvr.com/licenses/LICENSE-3.2 
 
 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,
@@ -32,6 +32,8 @@ limitations under the License.
 #ifndef OVR_Profile_h
 #define OVR_Profile_h
 
+#include "OVR_CAPI_Keys.h"
+
 #include "Sensors/OVR_DeviceConstants.h"
 #include "Kernel/OVR_String.h"
 #include "Kernel/OVR_RefCount.h"
@@ -115,6 +117,7 @@ public:
     int                 GetUserCount();
     const char*         GetUser(unsigned int index);
     bool                CreateUser(const char* user, const char* name);
+	bool				HasUser(const char* user);
     bool                RemoveUser(const char* user);
     const char*         GetDefaultUser(const ProfileDeviceKey& deviceKey);
     bool                SetDefaultUser(const ProfileDeviceKey& deviceKey, const char* user);
@@ -154,7 +157,6 @@ protected:
     OVR::Array<JSON*>   Values;  
     OVR::String         TempVal;
     String              BasePath;
-    bool                IsDefault;
 
 public:
     ~Profile();
@@ -211,45 +213,10 @@ protected:
     friend class WProfileManager;
 };
 
-// # defined() check for CAPI compatibility near term that re-defines these
-//   for now. To be unified.
-#if !defined(OVR_KEY_USER)
-
-#define OVR_KEY_USER                        "User"
-#define OVR_KEY_NAME                        "Name"
-#define OVR_KEY_GENDER                      "Gender"
-#define OVR_KEY_PLAYER_HEIGHT               "PlayerHeight"
-#define OVR_KEY_EYE_HEIGHT                  "EyeHeight"
-#define OVR_KEY_IPD                         "IPD"
-#define OVR_KEY_NECK_TO_EYE_DISTANCE        "NeckEyeDistance"
-#define OVR_KEY_EYE_RELIEF_DIAL             "EyeReliefDial"
-#define OVR_KEY_EYE_TO_NOSE_DISTANCE        "EyeToNoseDist"
-#define OVR_KEY_MAX_EYE_TO_PLATE_DISTANCE   "MaxEyeToPlateDist"
-#define OVR_KEY_EYE_CUP                     "EyeCup"
-#define OVR_KEY_CUSTOM_EYE_RENDER           "CustomEyeRender"
-#define OVR_KEY_CAMERA_POSITION				"CenteredFromWorld"
-
-// Default measurements empirically determined at Oculus to make us happy
-// The neck model numbers were derived as an average of the male and female averages from ANSUR-88
-// NECK_TO_EYE_HORIZONTAL = H22 - H43 = INFRAORBITALE_BACK_OF_HEAD - TRAGION_BACK_OF_HEAD
-// NECK_TO_EYE_VERTICAL = H21 - H15 = GONION_TOP_OF_HEAD - ECTOORBITALE_TOP_OF_HEAD
-// These were determined to be the best in a small user study, clearly beating out the previous default values
-#define OVR_DEFAULT_GENDER                  "Unknown"
-#define OVR_DEFAULT_PLAYER_HEIGHT           1.778f
-#define OVR_DEFAULT_EYE_HEIGHT              1.675f
-#define OVR_DEFAULT_IPD                     0.064f
-#define OVR_DEFAULT_NECK_TO_EYE_HORIZONTAL  0.0805f
-#define OVR_DEFAULT_NECK_TO_EYE_VERTICAL    0.075f
-#define OVR_DEFAULT_EYE_RELIEF_DIAL         3
-#define OVR_DEFAULT_CAMERA_POSITION			{0,0,0,1,0,0,0}
-
-#endif // OVR_KEY_USER
-
-
 // This path should be passed into the ProfileManager
 String GetBaseOVRPath(bool create_dir);
 
 
 } // namespace OVR
 
-#endif // OVR_Profile_h
\ No newline at end of file
+#endif // OVR_Profile_h