izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
Files
d64cd6df6dec21250f77d6e024111f88a02fd44f
UnrealEngineUWP/Engine/Plugins/Runtime/OculusInput/Source/Private/OculusInputCAPI.cpp

22 lines
520 B
C++
Raw Normal View History

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update #lockdown Nick.Penwarden [CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
Copying Dev-VR to Dev-Main #lockdown nick.penwarden [CL 2791734 by Nick Whiting in Main branch]
2015-12-05 02:42:09 -05:00
#include "OculusInput.h"
Copying //UE4/Dev-VR to //UE4/Main (Source: //UE4/Dev-VR @ 2940090) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2897367 on 2016/03/07 by Chad.Taylor@Chad.Taylor_Z3299_Tango PS4Tracker Submit call now assigning the appropriate memory type read mode Change 2920696 on 2016/03/23 by Nick.Whiting@nick.whiting_T7326_DevVRStream Fixed analytics event for VRPIE to have a description #jira UE-28562 Change 2925395 on 2016/03/28 by Chad.Taylor@Chad.Taylor_Z3299_Tango Aspect ratio and buffer clearing fixed up to properly handle non-standard viewport configurations. #jira UE-28816 Change 2932703 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Merging CL 2922134, fix for culling because of stale view matrices Change 2932761 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Oculus 1.3 Engine support, merged from 4.11 stream Change 2932762 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Removing redundant libraries for Oculus LibOVRMobile Change 2932765 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Merging updated license files for Oculus libraries Change 2938342 on 2016/04/08 by Ryan.Vance@ryan.vance_devvr Fixing bloom offset in stereo. Change 2938427 on 2016/04/08 by Ryan.Vance@ryan.vance_devvr Adding PSVR support for changing the screen percentage dynamically. Previously it could only be changed with ini settings and a relaunch. Reworked mutex use in reprojection thread. Some things weren't locked that should have been and removed a redundant mutex. Change 2938736 on 2016/04/08 by Ryan.Vance@ryan.vance_devvr #jira UE-26722 Updating ISR related code for debug view to fix tesselation. Change 2939709 on 2016/04/11 by Chad.Taylor@Chad.Taylor_Z3299_Tango Explicit order prioritization for ISceneViewExtensions for proper sampling order Change 2939717 on 2016/04/11 by Chad.Taylor@Chad.Taylor_Z3299_Tango Initial stereo layer implementation sans editor wireframe visualization Change 2939816 on 2016/04/11 by Chad.Taylor@Chad.Taylor_Z3299_Tango Stereo layer compionent visualizer [CL 2940449 by Nick Whiting in Main branch]
2016-04-11 23:01:18 -04:00
#if OCULUS_INPUT_SUPPORTED_PLATFORMS
Copying Dev-VR to Dev-Main #lockdown nick.penwarden [CL 2791734 by Nick Whiting in Main branch]
2015-12-05 02:42:09 -05:00
#if PLATFORM_WINDOWS
// Required for OVR_CAPIShim.c
#include "AllowWindowsPlatformTypes.h"
#endif
#if !IS_MONOLITHIC // otherwise it will clash with OculusRift
#include <OVR_CAPIShim.c>
Copying //UE4/Dev-VR to //UE4/Main (Source: //UE4/Dev-VR @ 2940090) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2897367 on 2016/03/07 by Chad.Taylor@Chad.Taylor_Z3299_Tango PS4Tracker Submit call now assigning the appropriate memory type read mode Change 2920696 on 2016/03/23 by Nick.Whiting@nick.whiting_T7326_DevVRStream Fixed analytics event for VRPIE to have a description #jira UE-28562 Change 2925395 on 2016/03/28 by Chad.Taylor@Chad.Taylor_Z3299_Tango Aspect ratio and buffer clearing fixed up to properly handle non-standard viewport configurations. #jira UE-28816 Change 2932703 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Merging CL 2922134, fix for culling because of stale view matrices Change 2932761 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Oculus 1.3 Engine support, merged from 4.11 stream Change 2932762 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Removing redundant libraries for Oculus LibOVRMobile Change 2932765 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Merging updated license files for Oculus libraries Change 2938342 on 2016/04/08 by Ryan.Vance@ryan.vance_devvr Fixing bloom offset in stereo. Change 2938427 on 2016/04/08 by Ryan.Vance@ryan.vance_devvr Adding PSVR support for changing the screen percentage dynamically. Previously it could only be changed with ini settings and a relaunch. Reworked mutex use in reprojection thread. Some things weren't locked that should have been and removed a redundant mutex. Change 2938736 on 2016/04/08 by Ryan.Vance@ryan.vance_devvr #jira UE-26722 Updating ISR related code for debug view to fix tesselation. Change 2939709 on 2016/04/11 by Chad.Taylor@Chad.Taylor_Z3299_Tango Explicit order prioritization for ISceneViewExtensions for proper sampling order Change 2939717 on 2016/04/11 by Chad.Taylor@Chad.Taylor_Z3299_Tango Initial stereo layer implementation sans editor wireframe visualization Change 2939816 on 2016/04/11 by Chad.Taylor@Chad.Taylor_Z3299_Tango Stereo layer compionent visualizer [CL 2940449 by Nick Whiting in Main branch]
2016-04-11 23:01:18 -04:00
#include <OVR_CAPI_Util.cpp>
#include <OVR_StereoProjection.cpp>
Copying Dev-VR to Dev-Main #lockdown nick.penwarden [CL 2791734 by Nick Whiting in Main branch]
2015-12-05 02:42:09 -05:00
#endif // #if !IS_MONOLITHIC
#if PLATFORM_WINDOWS
#include "HideWindowsPlatformTypes.h"
#endif
Copying //UE4/Dev-VR to //UE4/Main (Source: //UE4/Dev-VR @ 2940090) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2897367 on 2016/03/07 by Chad.Taylor@Chad.Taylor_Z3299_Tango PS4Tracker Submit call now assigning the appropriate memory type read mode Change 2920696 on 2016/03/23 by Nick.Whiting@nick.whiting_T7326_DevVRStream Fixed analytics event for VRPIE to have a description #jira UE-28562 Change 2925395 on 2016/03/28 by Chad.Taylor@Chad.Taylor_Z3299_Tango Aspect ratio and buffer clearing fixed up to properly handle non-standard viewport configurations. #jira UE-28816 Change 2932703 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Merging CL 2922134, fix for culling because of stale view matrices Change 2932761 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Oculus 1.3 Engine support, merged from 4.11 stream Change 2932762 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Removing redundant libraries for Oculus LibOVRMobile Change 2932765 on 2016/04/04 by Nick.Whiting@nick.whiting_T7326_DevVRStream Merging updated license files for Oculus libraries Change 2938342 on 2016/04/08 by Ryan.Vance@ryan.vance_devvr Fixing bloom offset in stereo. Change 2938427 on 2016/04/08 by Ryan.Vance@ryan.vance_devvr Adding PSVR support for changing the screen percentage dynamically. Previously it could only be changed with ini settings and a relaunch. Reworked mutex use in reprojection thread. Some things weren't locked that should have been and removed a redundant mutex. Change 2938736 on 2016/04/08 by Ryan.Vance@ryan.vance_devvr #jira UE-26722 Updating ISR related code for debug view to fix tesselation. Change 2939709 on 2016/04/11 by Chad.Taylor@Chad.Taylor_Z3299_Tango Explicit order prioritization for ISceneViewExtensions for proper sampling order Change 2939717 on 2016/04/11 by Chad.Taylor@Chad.Taylor_Z3299_Tango Initial stereo layer implementation sans editor wireframe visualization Change 2939816 on 2016/04/11 by Chad.Taylor@Chad.Taylor_Z3299_Tango Stereo layer compionent visualizer [CL 2940449 by Nick Whiting in Main branch]
2016-04-11 23:01:18 -04:00
#endif // OCULUS_INPUT_SUPPORTED_PLATFORMS
Reference in New Issue Copy Permalink