From 0f49ce8fc6aa54224e4c0d6fda8c4527ad39cce1 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 24 Jul 2014 16:47:31 -0700 Subject: 0.4 Win-Beta --- LibOVR/Include/OVR.h | 21 +++++---------------- LibOVR/Include/OVRVersion.h | 33 --------------------------------- LibOVR/Include/OVR_Kernel.h | 42 ++++++++++++++++++++++++++++++++++++++++++ LibOVR/Include/OVR_Version.h | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 49 deletions(-) delete mode 100644 LibOVR/Include/OVRVersion.h create mode 100644 LibOVR/Include/OVR_Kernel.h create mode 100644 LibOVR/Include/OVR_Version.h (limited to 'LibOVR/Include') diff --git a/LibOVR/Include/OVR.h b/LibOVR/Include/OVR.h index 6b5d416..abd6b04 100644 --- a/LibOVR/Include/OVR.h +++ b/LibOVR/Include/OVR.h @@ -1,8 +1,8 @@ /************************************************************************************ Filename : OVR.h -Content : This contains references to all OVR-specific headers in Src folder. - Should be generated automatically based on PublicHeader tags. +Content : The main public interface to Oculus for C++ Developers. + Includes C API and helper classes. Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved. @@ -26,22 +26,11 @@ limitations under the License. #ifndef OVR_h #define OVR_h +#include "OVR_Version.h" -#include "../Src/Kernel/OVR_Allocator.h" -#include "../Src/Kernel/OVR_Log.h" #include "../Src/Kernel/OVR_Math.h" -#include "../Src/Kernel/OVR_System.h" -#include "../Src/Kernel/OVR_Types.h" -#include "../Src/OVR_Device.h" -#include "../Src/OVR_DeviceConstants.h" -#include "../Src/OVR_DeviceHandle.h" -#include "../Src/OVR_DeviceMessages.h" -#include "../Src/OVR_SensorFusion.h" -#include "../Src/OVR_Stereo.h" -#include "../Src/OVR_Profile.h" -#include "../Src/Util/Util_LatencyTest.h" -#include "../Src/Util/Util_Render_Stereo.h" -#include "../Src/Util/Util_Interface.h" + +#include "../Src/OVR_CAPI.h" #endif diff --git a/LibOVR/Include/OVRVersion.h b/LibOVR/Include/OVRVersion.h deleted file mode 100644 index 14f83e6..0000000 --- a/LibOVR/Include/OVRVersion.h +++ /dev/null @@ -1,33 +0,0 @@ -/************************************************************************************ - -Filename : OVRVersion.h -Content : - -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. - -*************************************************************************************/ - -#ifndef _OVR_VERSION_H -#define _OVR_VERSION_H - -#define OVR_MAJOR_VERSION 0 -#define OVR_MINOR_VERSION 3 -#define OVR_BUILD_VERSION 2 -#define OVR_VERSION_STRING "0.3.2" - -#endif diff --git a/LibOVR/Include/OVR_Kernel.h b/LibOVR/Include/OVR_Kernel.h new file mode 100644 index 0000000..0ba72db --- /dev/null +++ b/LibOVR/Include/OVR_Kernel.h @@ -0,0 +1,42 @@ +/************************************************************************************ + +Filename : OVRKernel.h +Content : This contains references to all OVR Kernel headers in Src folder. + Should be generated automatically based on PublicHeader tags. + +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. + +*************************************************************************************/ + +#ifndef OVR_h +#define OVR_h + +#include "../Src/Kernel/OVR_Types.h" +#include "../Src/Kernel/OVR_Allocator.h" +#include "../Src/Kernel/OVR_RefCount.h" +#include "../Src/Kernel/OVR_Log.h" +#include "../Src/Kernel/OVR_Math.h" +#include "../Src/Kernel/OVR_System.h" +#include "../Src/Kernel/OVR_Nullptr.h" +#include "../Src/Kernel/OVR_String.h" +#include "../Src/Kernel/OVR_Array.h" +#include "../Src/Kernel/OVR_Timer.h" +#include "../Src/Kernel/OVR_SysFile.h" + +#endif + diff --git a/LibOVR/Include/OVR_Version.h b/LibOVR/Include/OVR_Version.h new file mode 100644 index 0000000..1fb7513 --- /dev/null +++ b/LibOVR/Include/OVR_Version.h @@ -0,0 +1,33 @@ +/************************************************************************************ + +Filename : OVRVersion.h +Content : + +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. + +*************************************************************************************/ + +#ifndef _OVR_VERSION_H +#define _OVR_VERSION_H + +#define OVR_MAJOR_VERSION 0 +#define OVR_MINOR_VERSION 4 +#define OVR_BUILD_VERSION 0 +#define OVR_VERSION_STRING "0.4.0" + +#endif -- cgit v1.2.3