diff options
| author | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
| commit | 450aa6f7df9e67dd256b86f94e65eaf707032aad (patch) | |
| tree | 04aa207d84ddc8ca246d2573aaaf756b3ce8a0b5 /LibOVR/Src/CAPI/CAPI_HMDRenderState.h | |
| parent | 3c7b8a17e907f4ef2afd9f77db566a3f6179cbe4 (diff) | |
| parent | 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c (diff) | |
Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1
Conflicts:
LibOVR/Include/OVR_CAPI_0_5_0.h
LibOVR/Src/CAPI/CAPI_HMDState.cpp
LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
LibOVR/Src/Kernel/OVR_System.cpp
LibOVR/Src/OVR_CAPI.cpp
LibOVR/Src/OVR_Profile.cpp
LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
LibOVRKernel/Src/Kernel/OVR_Types.h
Diffstat (limited to 'LibOVR/Src/CAPI/CAPI_HMDRenderState.h')
| -rw-r--r-- | LibOVR/Src/CAPI/CAPI_HMDRenderState.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/LibOVR/Src/CAPI/CAPI_HMDRenderState.h b/LibOVR/Src/CAPI/CAPI_HMDRenderState.h index 05c4e1b..30f8635 100644 --- a/LibOVR/Src/CAPI/CAPI_HMDRenderState.h +++ b/LibOVR/Src/CAPI/CAPI_HMDRenderState.h @@ -27,10 +27,10 @@ limitations under the License. #ifndef OVR_CAPI_HMDRenderState_h #define OVR_CAPI_HMDRenderState_h -#include "../OVR_CAPI.h" -#include "../Kernel/OVR_Math.h" -#include "../Util/Util_Render_Stereo.h" -#include "../Service/Service_NetSessionCommon.h" +#include "OVR_CAPI.h" +#include "Extras/OVR_Math.h" +#include "Util/Util_Render_Stereo.h" +#include "Service/Service_NetSessionCommon.h" namespace OVR { namespace CAPI { @@ -52,7 +52,7 @@ struct HMDRenderState ovrEyeRenderDesc CalcRenderDesc(ovrEyeType eyeType, const ovrFovPort& fov) const; HMDInfo OurHMDInfo; - + ProfileRenderInfo OurProfileRenderInfo; HmdRenderInfo RenderInfo; DistortionRenderDesc Distortion[2]; ovrEyeRenderDesc EyeRenderDesc[2]; @@ -64,7 +64,7 @@ struct HMDRenderState ovrPosef EyeRenderPoses[2]; // Capabilities passed to Configure. - unsigned EnabledHmdCaps; + unsigned EnabledHmdCaps; // enum ovrHmdCaps unsigned DistortionCaps; // enum ovrDistortionCaps }; |