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
3c2010d281269994deefcc86297a79247a9aeb34
UnrealEngineUWP/Engine/Source/Runtime/AugmentedReality/Private/AugmentedRealityModule.h

10 lines
228 B
C
Raw Normal View History

Updating copyright for Engine Runtime. #rnx #rb none #ROBOMERGE-OWNER: ryan.durand #ROBOMERGE-AUTHOR: ryan.durand #ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900 #ROBOMERGE-BOT: (v613-10869866) [CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
// Copyright Epic Games, Inc. All Rights Reserved.
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3636795) #lockdown Nick.Penwarden ============================ MAJOR FEATURES & CHANGES ============================ Change 2932765 by Nick.Whiting Merging updated license files for Oculus libraries Change 3480552 by Dustin.Holmes Added map and gamemode for calibration #jira UEVR-808 Change 3502253 by Nick.Whiting Trying to fix up p4's botch of the merge Change 3513736 by Keli.Hlodversson Move duplicated late update code into a common FLateUpdateManager #jira UEVR-893 Change 3514798 by Mike.Beach #4.17 Exposing a way for Blueprint users to remap the SteamVR controller's d-pad buttons (clashes with the Oculus mappings). #jira UE-42634 Change 3516042 by Dustin.Holmes Runtime handedness changes in Vive controllers are now reflected when a new device is connected. Device mappings are also reset when a device disconnects, so that if it connects again it fully reregisters instead of just assuming the role it previously had. Change 3517781 by Keli.Hlodversson Remove unused local variable bUseCustomPresentTexture Change 3517951 by Mike.Beach #4.17 Guarding against dereferencing a null pointer. Defaulting to the identity when we don't (yet) have a valid head pose to use. #jira UE-43685 Change 3518142 by Mike.Beach #4.17 Resolving fallout from bad merge (CL 3514868) - checking for teminating null in array (which was added to keep ARRAY_COUNT from acting on an empty array). Change 3523183 by Ryan.Vance #jira UE-46493, UEVR-661 Fixes GearVR only displaying a black screen on startup Fixes GearVR rendering incorrectly with mobile multi-view w/o direct mode enabled Adding mobile multi-view direct support to Daydream Change 3523718 by Nick.Whiting Adding core controller recentering delegate, and moving Google over to that system. Change 3527263 by Dan.Oconnor Mirror 3526925 for Nick Donaldson Change 3533596 by Dustin.Holmes Add garbage matte map, gamemode, and blueprints. Change 3533598 by Dustin.Holmes Expose the Set Tint Color and Opacity function for Widget Components as a Blueprint node. Change 3538139 by Mike.Beach Moving Oculus debug shader directly into Oculus plugin. #jira UE-47134 Change 3543185 by Nick.Atamas Address UEVR-891 : Merge in changes to Google Tango plugin. #jira UEVR-891 Change 3543285 by Nick.Atamas Merging using //UE4/Release-4.17/... -> //UE4/Dev-VR/... : Fixed UEVR-852: Adjusted Google Tango Plugins copyright to Copyright Google 2017. Removed Apache 2.0 license. Change 3545505 by Nick.Atamas Fix UEVR-851 : some fix-ups to MeshReconHUD and overlay material now has a material parameter for tinting the reconstructed mesh to help debug visualization. Change 3547549 by Jeff.Fisher Fixing DefaultSpectatorScreenController comment. Change 3551339 by Ryan.Vance #jira UE-44947 Editor primitives we not being handled correctly with ISR. Change 3554169 by Dustin.Holmes Reconcile missed Mixed Reality blueprint Change 3566825 by Mike.Beach Fixing some bad merges from Main (fallout from CL 3566309) Change 3567143 by Mike.Beach Copying //Tasks/UE4/Dev-MixedReality to Dev-VR-Minimal (//UE4/Dev-VR-Minimal) Change 3567572 by Mike.Beach [WIP] Adding some MR plugin dependencies to keep CIS quiet (SteamVR is just temporary, and will be removed). Change 3569116 by Jeff.Fisher Mixed reality build breaks for PS4 -Module is dependent on steamvr, so don't build it for PS4. -Removed unused class that doesn't compile with clang. Change 3569362 by Mike.Beach Organizing MR plugin content, to make way for new calibration modes. Change 3572802 by Jeff.Fisher UEVR-832 Add save/load system for calibrated camera settings -Moved MixedRealityConfigurationSaveGame to c++. #review-3571779 #jira UEVR-832 Change 3573864 by Mike.Beach [WIP] Initial work on MR cam alignment controller - records point/frustum data from user input. Change 3575900 by Jeff.Fisher Vive spectator flat rect expanded to match other platforms. -The vive 'full flat eye' rect was narrower than other platforms. Expanded it to be closer to the other platforms. Change 3578684 by Mike.Beach Static analysis fixes for CIS. #jira UE-48204, UE-48203, UE-48206 Change 3579460 by Mike.Beach [WIP] New calibration mode for camera alignment. #jira UEVR-785 Change 3581232 by Mike.Beach [WIP] Saving off alignment calibration data, and loading it on initialization. We skip alignment calibration if it has been configured. #jira UEVR-832 Change 3588411 by Mike.Beach [WIP] Adding calibration for compositing (chroma color, etc.). #jira UEVR-785 Change 3588541 by Mike.Beach [WIP] Cleaning up some display issues with the MR calibration. #jira UEVR-785 Change 3588680 by Mike.Beach Re-organizing the MR content, now that the alignment controller calibrates more than just alignment (renaming, etc.). Change 3588694 by Mike.Beach Renaming the MR calibration pawn (since it doesn't do any calibrating itself). Change 3591518 by Mike.Beach Copying //Tasks/UE4/Dev-MixedReality to Dev-VR-Minimal (//UE4/Dev-VR-Minimal) Change 3591671 by Ryan.Vance Debug stereo layer support This adds an option to render the debug canvas to a stereo layer which greatly improves console and stat readability in an hmd. Change 3591812 by Ryan.Vance Don't snap motion controllers to the origin when tracking is lost. Change 3594681 by Mike.Beach [WIP] Copying //Tasks/UE4/Dev-MixedReality to Dev-VR-Minimal (//UE4/Dev-VR-Minimal) Change 3596679 by Mike.Beach CIS fix (likely fallout from CL 3591671) - changing the order of initialization to better match the order of declaration. Change 3598191 by Jeff.Fisher UEVR-807 Setup M_MRVidProcessing to use 3D garbage matte data. -Created MixedRealityGarbageMatteCaptureComponent. An instance of this is spawned by and attached to MixedRealityCaptureComponent. Saved config data is loaded into it. It spawns a garbage matte actor. It then captures the garbage matte actor into a render target (which is set on MixedRealityCaptureComponent). #jira UEVR-807 #review-3598179 Change 3598276 by Mike.Beach Copying //Tasks/UE4/Dev-MixedReality to Dev-VR-Minimal (//UE4/Dev-VR-Minimal) Change 3598332 by Mike.Beach Guarding against a blind cast in the SteamVRChaperone component, which can be used cross platform (can't assume SteamVR). Change 3605271 by Mike.Beach Copying //Tasks/UE4/Dev-MixedReality to Dev-VR-Minimal (//UE4/Dev-VR-Minimal) Change 3608490 by Jeff.Fisher UEVR-987 Social Screen PS4 need to go to 'mirroring' for hmd setup dialog because system dialogs are not visible in separate mode. UEVR-988 SpectatorScreen Flickering UE-47234 Spectator screen: need frame delay before assigning dynamically created rendertarget to spectator texture UE-47310 Spectator Screen: crash if you release a render target which is assigned as the spectator texture -Test level content for all of these bugs. Change 3608883 by Jeff.Fisher UEVR-807 Setup M_MRVidProcessing to use 3D garbage matte data. -Set material to use the garbage matte render target. Change 3613292 by Mike.Beach Moving header fcn decl up, under the proper interface section (for organization's sake). Change 3616943 by Nick.Whiting Updating SteamVR libraries to 1.0.9, so we can bring back macOS support Change 3616970 by Nick.Whiting Adding in steamvr visible area mesh support. Can be toggled with vr.SteamVR.UseVisibleAreaMesh Change 3617866 by Mike.Beach Updating the VR template to reflect Oculus HMD device naming that we've keyed off of in these Blueprints (when determining which VR system we're running on). Change 3620108 by Mike.Beach [WIP] Adding an intermediate calibration step to tweak the MR virtual cam's alignment. Change 3620982 by Mike.Beach Tying off some loose ends with the MR calibration map: * Saving after each calibration phase * Fixing blocked input from garbage matte creation * Blocking input handling while exiting/previewing * Adding minimum radius for random screen pt Change 3621551 by Mike.Beach [MR] Leveraging camera support in the new media framework - working for limited cameras in calibration. Change 3621552 by Mike.Beach [MR calibration] - fixing it so when you first switch into compoisiting calibration it updates the property readout. Change 3621660 by Mike.Beach [MR calibration] Cleaning up how we display text (adding a struct to wrap the coresponding properties). Change 3623323 by Dustin.Holmes Fix buffer overflow when using 5+ Vive generic trackers and add more Special hand designations to cover the maximum 11 trackers Vive supports Change 3625900 by Keli.Hlodversson Remove fixed 16:9 aspect ratio for SteamVR and Oculus splash screens. Oculus was already fixed in CL#3413801, but regressed with plugin renaming and unificiation with GearVR in CL#3502152. #jira UE-40220 StereoLayer splash layers are hardcoded to 8 by 4.5 meters (16:9 aspect ratio) Change 3628409 by Mike.Beach Speculative CIS fix. #jira UE-49339 Change 3628440 by Nick.Whiting Fix for SteamVR OSX build issues Change 3628489 by Nick.Whiting Fix for win32 build break Change 3629045 by Mike.Beach Shadowed variable name fix (CIS). Change 3629202 by Arciel.Rekman Copying //UE4/Partner-Valve@3629179 to Dev-VR (//UE4/Dev-VR) Change 3629340 by Nick.Atamas Unshelved and resolved changes from Oculus. Change 3629772 by Ryan.Vance Fixing Oculus Vulkan related compile issues. This will break Oculus Vulkan support, but the code needs to be refactored anyway. Change 3629833 by Mike.Beach Fixing up CIS warning introduced by Oculus 1.17 changes - "unsafe conversion" warning #jira UE-49376 Change 3630696 by Jeff.Fisher UE-49415 //UE4/Dev-VR: Incremental UE4Editor Win64 completed with errors - 5 Errors Switching an include to a forward declaration -Not sure why the previous version didn't compile on the build machine, but fewer dependencies is good. Change 3630783 by Mike.Beach Fixing CIS compiler failures for our vehicle templates. #jira UE-49417 Change 3630802 by Mike.Beach Better fix than 3630783 - updating the vehicle template's stereoscopic check (fixing the VehicleHud.cpp logic as well) #jira UE-49417 Change 3630870 by Mike.Beach Pragma'ing out a function pointer cast warning. Good warning, but I figure we know what we're doing here and there's no other way around it. #jira UE-49376 Change 3630993 by Ryan.Vance Check to ensure we have a valid third camera before trying to use it. We could check >= 3 or if the left and right cameras are left/right stereo etc. decided to go with the simple test for now. Change 3631322 by Jeff.Fisher UEVR-909 PIP in Garbage Matte -Added ExternalGarbageMatteActor to MixedRealityGarbageMatteCaptureComponent and exposed it to blueprint though MixedRealityCaptureComponent. This lets us switch from using the normal mixed reality component save/load garbage matte data and instead use an external actor, in this case the actor we use to setup the garbage matte. Then the mask is able to capture that actor live as it is edited. -Also implemented GetViewOwner() so that we can use SetOwnerOnlySee to prevent other cameras and captures from seeing the garbage matte actor. -Calibration level now uses the external garbage matte actor to let the garbate matte mask live update. It also does a picture-in-picture preview of the mixed reality scene. 'P' can show/hide the garbage matte actor on that PIP preview. -Added SetUnmaskedPixelHighlightColor to MixedRealityCaptureComponent and the material. With this one can make unmasked video pixels more obvious in the output. The calibration level has this mapped to shift-P and makes pixels bright yellow to white. -Added blueprint to calibration level to make the garbage matte actor visible in the mixed reality capture. That is bound to ctrl-g. -GarbageMatteActors spawned by the mixed reality capture component are now attached to the vr origin. The calibration level now saves garbage matte mesh transforms relative to the vr origin. -The garbage matte mesh is now plugin content, and is referenced in the mixedrealitycomponent default object, so it is cooked in any project that includes the plugin. -Fog and AtmosphericFog no longer affect the garbage matte mask capture... there may be other things we need to turn off there. #review-3618345 #jira UEVR-909 Change 3631362 by Keli.Hlodversson #jira UE-49418 Exiting Google Instant Preview displays half of the editor viewport as black. Note convoluted fix: passing bIsStereoScopic3D to IsActiveThisFrame. ISceneViewExtension code cannot rely on StereoRenderingDevice->IsStereoEnabled to know whether to render in stereo, as the current viewport widget may disable it. This was not a problem before the refactoring, as HMD-related viewextensions were only added to the active list after establishing that stereo indeed was enabled and allowed by the current view port widget. Change 3631887 by Jeff.Fisher Fixing IsActiveThisFrame build break. Change 3632206 by Nick.Atamas Fix for UE-49413. Registering FOculusHMD as an extensions the same way as others: now creates an XRCamera that passes all the calls back to the HMD. Change 3632264 by Nick.Whiting Fix for Vive rendering getting cropped off due to invalid subrect values being submitted to the compositor. Change 3632340 by Nick.Atamas Merged in change from Loren; opted for our solution to ViewExtensions instead of the one in the changelist. Original description below. Change 3632214 by Loren.McQuade@Loren.McQuade_Dev-VR on 2017/09/07 19:51:29 *pending* [Dev-VR] Added OculusHMD_SceneViewExtension, PlayerPosition/PlayerOrientation values, FOculusHMD::GetRelativeEyePose cross-eyed madness (CL 3631541, 3631687) Change 3632353 by Ryan.Vance #jira UE-49468 Don't apply xr camera rotation on the player controller when not using xr tracking. Change 3632735 by Keli.Hlodversson Better fix for #jira UE-49413. Revert oculus xr camera code and use that one can have more than one view extension registered instead. Use GetPriority to have the OculusHMD view extension code execute after the default xr camera. The xr camera subclass did not forward the calls to ISceneViewExtension to the parent, breaking various functionality such as late update. Fixes a crash when entering VR pie twice, back to back. Change 3632752 by Keli.Hlodversson Applying change 3632592 by Loren.McQuade@Loren.McQuade_Dev-VR_Branch on 2017/09/08 02:08:22 [Dev-VR] Push //UE4/Partner-Oculus@3632591 #rb merge //UE4/Partner-Oculus to //UE4/Dev-VR/... Reverted OculusHMD_XRCamera changes, as that clas has been removed in the interim. Change 3633211 by Mike.Beach Backing out Oculus MotionController hiding that accidently got submitted - we decided not to adopt this change originally. Change 3633315 by Jeff.Fisher merge from main with dev-platform problem children -expecting SDRBackBuffer stuff to be wrong. Change 3634006 by Mike.Beach Resurecting Oculus clip plane settings which got dropped in the IXR refactor. #jira UE-49520 Change 3634639 by Keli.Hlodversson Avoid include cycle https://ec-01.epicgames.net/commander/link/jobStepDetails/jobSteps/68863219?stepName=UE4Editor%20Static%20Analysis%20Win64%20%28IncludeTool%29&jobId=7995809&jobName=UE4%20Dev-VR%20-%20CL%203632752%20-%20Nightly%20Build&tabGroup=diagnosticHeader&firstPage=1 Change 3634641 by Jeff.Fisher UE-49535 Lighting is blown out when playing in VR Preview on Vive -Need pixel format to be PF_B8G8R8A8 for vr, now the plugins all build their render target and use that format. #review-3634623 Change 3634682 by Jeff.Fisher IHeadMountedDisplay forward declarations needed. Change 3634690 by Ryan.Vance We can't override the screen percentage when rendering for stereo #jira UE-49287 Change 3635970 by Keli.Hlodversson #jira UE-49563 Crash while opening QA-Game Referencing SharedPointer.h Verify that StereoRendering is valid before calling IsStereoEnabled() Change 3635979 by Mike.Beach CIS static analysis fix - checking a ptr for null before we use it. #jira UE-49531 Change 3636059 by Mike.Beach Fixing XR system name aliasing for the -hmd command. [CL 3638830 by Ryan Vance in Main branch]
2017-09-12 11:27:30 -04:00
#pragma once
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 4268149) #lockdown Nick.Penwarden ============================ MAJOR FEATURES & CHANGES ============================ Change 4048227 by Rolando.Caloca VR - vk - Some Vulkan merge conflicts resolved Change 4078631 by Mike.Beach Fixing MR Calibration so it scales the alignment model according the the capture's FOV (so they appear the same size across capture devices - leading to a homogenous experience). Also moved the FOV override config setting to be a console command/setting (mrc.FovOverride) to help in testing this. #jira UE-55499 Change 4080389 by Mike.Beach Speculative fix/guard against live crash - trying to catch malformed model data. Logging helpful information to give us insight in the future. #jira UE-57680 Change 4080792 by Joe.Graf Prep work for moving face ar to its own plugin Change 4080852 by Joe.Graf Prep work for moving face ar support to its own plugin Change 4081735 by Keli.Hlodversson Remove a workaround change from the Lumin branch that should not have been merged over. Change 4081737 by Keli.Hlodversson Fix SteamVR forcing full screen regardless of user settings. #jira UE-51654 Change 4082323 by Joe.Graf Pulled face ar support into its own plugin so that it can be enabled/disabled independently from room ar Change 4082334 by Joe.Graf Changed where face LiveLink was logging to Change 4095529 by Joe.Graf Dramatically simplified the face API isolation to a separate plugin Change 4103356 by Joe.Graf Fixed a threading bug that appeared when migrating the face ar code into its own plugin Change 4109752 by Joe.Graf Added a setting to specify the type of AR world alignment transform type a session should use Deleted some old ARKit configuration code that wasn't really used Fixed the setting of light estimation using the wrong value to determine the setting on ARKit #jira: UE-58544, UE-59371 Change 4110601 by Jason.Bestimt #DEV-VR - Adding spaces to plugin names #JIRA: UE-58642, UE-58643 Change 4110721 by Jason.Bestimt #DEV-VR - Removing question mark from tooltip #JIRA: UE-58641 Change 4111412 by Joe.Graf Fixed a bad merge of BaseEngine.ini Change 4111902 by Nick.Whiting Adding in support for locking HMD tracking to an external tracking environment (e.g. mo cap). This is not meant to drive the position continually in lieu of an HMD's built in system, but is rather to help keep the HMD from generally getting out of alignment with another tracking system. Two functions, CalibrateExternalTrackingToHMD and UpdateExternalTrackingHMDPosition allow for arbitrary rigid offsets between the HMD and the external tracking source, and updating as desired. Change 4116059 by Joe.Graf First pass integration of ARKit 2.0 (very wip, thar be dragons everywhere) Change 4116109 by Jason.Bestimt #DEV-VR - Disable editing of Tegra Debugger setting for installed builds #JIRA: UE-58636 Change 4117821 by Jason.Bestimt #DEV-VR - Fix for crash in DebugCanvas on application termination #JIRA: UE-58865 Change 4118560 by Joe.Conley MagicLeap ImageTrackerComponent: Adding check for PLATFORM_LUMIN to prevent PIE crash running code that was designed to only run on device. Tested PIE in editor and launching to device. Change 4118626 by Jason.Bestimt #DEV-VR - Removing ES2 from bMobileRendering Tooltop #JIRA: UE-58640 Change 4119786 by Joe.Conley Merging CL-4118965 from Release-4.20 using DevVRtoRelease420 Change 4119906 by Joe.Conley Magic Leap settings: Changing comment/tooltip on mobile rendering flag to not mention vulkan and just say "mobile". Still technically possible to use ES2 but it's hidden. #jira UE-59755 "Magic Leap: Project setting to set vulkan or ES2 needs to be removed" Change 4122067 by Jason.Bestimt #DEV-VR - Copying all relevant files for Resonance Audio Change 4122930 by Keli.Hlodversson Use XR ThreadUtils when scheduling GameTrackingThread to Render and RHI thread. #jira UE-58852 Change 4123848 by Nick.Whiting Enabling RHI threading on Lumin Change 4124116 by Nick.Whiting Adding support for DefaultStereoLayers on Lumin Change 4151051 by Joe.Conley Magic Leap: Override IniPlatfromName() for LuminTargetPlatform to report "Lumin" rather than reporting the value from it's parent, AndroidTargetPlatform, "Android". #jira UE-60389 "Lumin - Need to switch the *Phaedra* launch on option "All_Android_On..." to a single "All_Phaedra_On..." with no expandable options" Unsure if this will affect more than just this display name, as IniPlatformName() is used in a few places in the code, but eventually it will need to be "Lumin" anyway so we'll fix fallout as we find it. Change 4160099 by Nick.Whiting Enabling RHI threading on Vulkan by default on Magic Leap Change 4163986 by Joe.Graf Merging using Dev-VR_to_Release-4.20 Change 4164500 by Joe.Graf Merging using Release-4.20_to_Dev-VR Change 4166311 by Jason.Bestimt #DEV-VR - Merge from //UE4/Dev-MagicLeap/... @ CL 4136411 Change 4167085 by Ryan.Vance #integrating 4.20 cl 4132173 to fix mobile vulkan occusion query issues. #jira UE-61051 Change 4167151 by Jason.Bestimt #DEV-VR - Manual merge of Dev-MAIN to resolve conflicts for robomerge Change 4167983 by Joe.Conley For Lumin, only build shaders for OpenGL or Vulkan, not both. Fix a shader compile error in BogMyrtle material (can't use SpeedTree node on mobile). #jira UE-61126 Lumin Sample: Warning: LogMaterial : Failed to compile material for GLSL_ES2 Change 4168244 by Nick.Whiting Fix for stereo layers crashing on exit, where the DebugCanvas was destroyed after the layer manager, causing a nullptr dereference Change 4170213 by Mike.Beach CIS build fix - removing duplicate definition & adding a missing #pragma once to a header fille #mlqdr Change 4170299 by Mike.Beach LNK fix - fixing up more fallout from the recent merge from DevMain. Adding in missing function that was dropped in the merge (matching Main's version). Change 4170962 by Nick.Whiting Back out changelist 4160099: Removing the enabling by default on lumin Change 4171227 by Chance.Ivey Unreal Engine logos for Portal and Model. These need to be set in Project Settings. Change 4171260 by Chance.Ivey Removing ML basic assets for project icons. Change 4171939 by Joe.Conley #jira UE-61124 Lumin Sample: EDL errors during Launch On Change Lumin Sample to use vulkan, like we do for everything by default now. Didn't see this error after this change. Change 4172321 by Mike.Beach Sizing the debug layer properly for the magic leap device (inverting the y when rendering with opengl). #jira UE-60299 #mlqdr Change 4174175 by Jason.Bestimt #DEV-VR - Fix for dragging a "skylight" from lighting menu directly into sequencer. Change 4174237 by Jason.Bestimt #DEV-VR - fixing initializer order #JIRA - UE-61337 Change 4175281 by Joe.Graf Added support to stream a preview image and the accompanying AR world data for shared AR experiences Change 4175656 by Ryan.Vance Copying //Tasks/UE4/Dev-VR-VulkanMedia to Dev-VR (//UE4/Dev-VR) Preliminary vulkan media player support for ML. There are a number of tasks left to do with this feature before committing to main: - Clean up leaked color conversion handles - Texture slot binding is not robust for media textures - Color conversion extension init should be move to a lumin platform function - Mobile renderer's base pass may collapse multiple materials together into the same drawing policy, so the immutable samplers referenced in the pso would bleed into other materials - Fixing above will allow us to remove the immutable samplers from the mobile material rendering proxy to ensure we don't re-introduce the fort bug listed in the related comment Change 4175684 by Ryan.Vance Fix for vk media player crash Change 4175699 by Nick.Whiting Merging CL 4175640 (fix for Audio Capture pausing and resuming) to Dev-VR Change 4176804 by Joe.Conley Rolando originally hacked the RHI for Lumin with the ForceEnableDebugMarkers() function; return false there instead of if PLATFORM_LUMIN. Change 4178261 by Ethan.Geller Back out changelist 4175699 #fyi nick.whiting #rb none Change 4179088 by Mike.Beach Mirroring CL4178961. Removing spammy error log, per consult from ML - apparently, at this time, MLSnapshotGetTransform() can return NaNs (which we handle). It is currently expected from the API. #jira UE-61127 #mlqdr Change 4179629 by Jeff.Fisher UEVR-1209 Update to Magic Leap Hand Tracking API -Switched from the Gestures API to the HandTracking API -There is nothing like the 0 and 1 tracking point that change meaning per gesture in the new API, so I assigned the former Center/Pointer/Secondary special 1/3/5 2/4/6 to Center/IndexFingerTip/ThumbTip. #review-4178177 #jira UEVR-1209 #mlqdr Change 4179705 by Jeff.Fisher MagicLeapHandTracking CIS fix. Change 4181301 by Joe.Graf Moved FaceARSample to Samples/Sandbox/AR/ so we can have all of the AR samples together Change 4181402 by Joe.Graf Fixed a missing #ifdef wrapper in the MagicLeap plugin Change 4181445 by Joe.Graf Fixed another missing #ifdef wrapper in the MagicLeap plugin Change 4181558 by Jeff.Fisher HandTracking LeftGestureButton fix -The reality is Nihav made the fix, and I reviewed it. Change 4185551 by Joe.Graf Added support to query and specify the desired video format for an AR session Change 4185843 by Joe.Graf Merged in absolute scale/location/rotation PR #4760 from Wang Hao Change 4186875 by Joe.Graf Added stats for face ar #jira: UE-53883 Change 4187681 by Joe.Graf Fixed unity build compilation error Change 4188782 by Joe.Graf Work around LiveLink interpreting ARKit timestamps incorrectly causing jitter and animation lag #jira: UE-61540 Change 4189204 by Joe.Graf Merging using Release-4.20_to_Dev-VR Change 4189331 by Joe.Graf Removed all of my merge markers from the lab Change 4189477 by Joe.Graf Added performance tuning options for Face AR to ARSessionConfig Added whether to mirror or be face relative for Face AR to ARSessionConfig #jira: UE-53881 Change 4189835 by Joe.Graf Changed how timestamps for ARKit objects are updated to make them more amenable with the engine #jira: UE-61550 Change 4190085 by Jeff.Fisher Duplicating from Dev-Partner-MagicLeap-4.20 cl 4189995 HandTracking 'failed to load' errors. -Needed a package redirector as well as the various class and enum redirectors. #MLQDR #review-4189613 Files: //UE4/Dev-Partner-MagicLeap-4.20/Engine/Config/BaseEngine.ini#8 Change 4190100 by Jason.Bestimt #DEV-VR - Adding script version string to make sure AutoSDK gets run again [To Fix CIS Builds for UE4 Lumin] Change 4190795 by Joe.Conley #jira UE-61265 Audio Capture Components need to hook Lumin backgrounding notifications to pause capture Shelve 4175638 got committed but didn't compile. Fixed compile errors and changed some checks from Handle != ML_HANDLE_INVALID to MlIsValidHandle(Handle), fixed functions to return false if they error, responded to the errors by not continuing further, etc... Don't know if this fixes all the functionality, but doesn't crash for me anymore. Change 4196211 by Jason.Bestimt #DEV-VR - Fixes for Android platform with new Lumin Vulkan Color Conversion Functions Change 4199020 by Jason.Bestimt Making sure bHaveVulkan is true for Lumin Change 4199506 by Jason.Bestimt #DEV-VR - Merging CL 4199443 from Dev-Magicleap to clear cache on looping media Change 4200139 by Joe.Graf Initial check in of a project to illustrate AR persistent sessions Change 4200299 by Joe.Graf Fixed the plugin setup for ARSaveLoad Change 4200327 by Joe.Graf Fixed adding face ar plugin instead of world ar plugin Change 4200330 by Joe.Graf Added a sample for using ARKit's environment probe feature Change 4200352 by Joe.Graf Changed the ARSessionConfig to use automatic environment probe generation Change 4201607 by Zak.Parrish Moving latest version of FaceARSample to DevVR Change 4203453 by Jason.Bestimt #DEV-VR - Fixing Audio Capture to not re-open stream if it's already open #JIRA: UE-61609 Change 4204527 by Joe.Graf Changed the AR World Save and AR Get Candidate Object latent actions to use the new mechanism to reduce code Change 4204533 by Joe.Graf POC of saving and load an AR world Change 4204806 by Joe.Graf Added more descriptive display names for AR blueprint operations Change 4204870 by Jeff.Fisher HandTracking blueprint access to all keypoints -Duplicating for Dev-VR from Dev-Partner-MagicLeap-4.20 -Created new GetGestureKeypointTransform blueprint function to get a keypoint's transform by hand and keypoint enum. -Deprecated the old GetGestureKeypoint methods -Fixed Special_1 and Special_2 to use hand center instead of wrist center. -Exposed all the keypoints to blueprint, so they can work right away when underlyign support appears in the OS. #MLQDR #review-4200777 Change 4204877 by Jeff.Fisher Updated gesture test content to replace deprecated hand tracking blueprint functions. Change 4204915 by Joe.Graf Hid blueprint internal methods from being callable Change 4205082 by Joe.Graf Split ImportFileAsTexture2D into two functions so you can also import from a buffer Change 4205170 by Joe.Graf Made the proxy create function blueprint internal only Change 4206898 by Joe.Graf Initial ARSharedWorld multiplayer sample check in Change 4207396 by Joe.Graf Removed the FARSharedWorld from ARSharedWorldGameState to make things simpler/cleaner Change 4207406 by Joe.Graf Hooked up the delivery of the AR shared world data to the clients in the MP sample Change 4207444 by Joe.Graf Fixed the shadowing warning Change 4207794 by zak.parrish Checking in first stage of usable Save/Load AR work. Some UI, foundational functionality. Not testable yet. Change 4207832 by Joe.Graf For Zak Change 4207952 by Joe.Graf For Zak part 2 Change 4208268 by zak.parrish Checking in changes to ARSaveLoad's game mode Change 4208316 by zak.parrish Living in shame under JoeG's rough admonishment. And fixing UI bugs. Change 4208404 by zak.parrish Actually saving... maybe? Change 4208407 by Joe.Graf Fixed wrong platform name being used as the whitelist for the AppleImageUtils plugin Change 4209764 by Joe.Graf Added missing module class for AppleImageUtilsBlueprintSupport Change 4210695 by Joe.Graf Added compression and versioning to the AR saved world data Change 4211461 by Joe.Graf Incremented the face live link packet version since the new blendshapes were added Change 4211843 by Joe.Graf Split some of the methods for ARKit conversion into a cpp from being all in the header Added some logging during conversion Change 4212020 by Joe.Graf Added support for telling the AR system whether to reset tracking and tracked objects (useful for generating a play space and then using lower cpu/gpu tracking only) Change 4212878 by Joe.Graf Fixed inline problem and exported FAppleARKitConversion class Change 4214969 by Ryan.Vance #jira UEVR-1257 Adding initialization to all members in the default FAppleARKitFrame ctor Change 4217193 by Jason.Bestimt #DEV-VR - Fix for swapping shader cache formats and using Launch On We now reload the settings each time they are used rather than caching once at startup Change 4217487 by Jason.Bestimt #DEV-VR - Fix for CIS shadowed member variable error Change 4220007 by Jason.Bestimt #DEV-VR - Fix for Dev-VR compile issue for Lumin Target Platform dependencies on Engine Change 4223757 by Jason.Bestimt #DEV-VR - Moving Lumin Audio Platform above Android because Lumin is Android Change 4230863 by Keli.Hlodversson Updating to SteamVR 1.0.15 Change 4235330 by Jason.Bestimt #DEV-VR - Selective Merge from Dev-Partner-MagicLeap-4.20 CL 4117808 SKIP 4166531, 4172433, 4173415, 4174167, 4175152, 4174192 CL 4175448, 4175781, 4176126, 4176135, 4176138, 4176803, 4178961 SKIP - 4179818, 4179864 CL 4179921, 4179956, 4180229, 4180268, 4180298, 4182733, 4183548, 4184684, 4186883, 4187230, 4189420, 4189995, 4190527, 4190721 SKIP - 4191085 CL 4192219 SKIP 4195948 CL 4197287, 4197951, 4197956, 4201351, 4202541, 4202544, 4202547 SKIP 4202774 CL 4203462, 4203484 SKIP 4204670 CL 4206823, 4209729, 4209810, 4211003, 4215367, 4215662, 4215892, 4215898, 4220239, 4220257 SKIP 4220295 CL 4220307 SKIP 4221842 CL 4221866, 4222959, 4223772, 4225943 SKIP 4226329, 4227773 CL 4228213, 4228270 SKIP 422902, 4229054, 4229365, 4230881, 4233277 Change 4235969 by Joe.Conley MagicLeap: Add quotes around the path to the tools (clang etc) in the mlsdk directory, so that it won't fail if the MLSDK directory has a space in the path. Change 4239300 by Nick.Whiting Adding missing uplugin file to GoogleARCoreServices Change 4240183 by Keli.Hlodversson Updating to SteamVR 1.0.16 Change 4241714 by joe.conley #jira UE-62189 - "Various QAARApp/Content/...uassets have been saved with empty engine version" Resaved assets. Change 4242300 by Nick.Whiting Fix for ARCore Tools being in the wrong folder, emitting RuntimeDependency ref to make sure they're properly included #jira UE-62277 Change 4244428 by Mike.Beach Copying //UE4/Partner-Oculus-Staging to Dev-VR (//UE4/Dev-VR) Change 4244671 by Jeff.Fisher Fxing 'Lumi" build break. Change 4247283 by Nick.Whiting Merging fix from CL 4247094 for ARCore external dependency locations Change 4255817 by Ryan.Vance #jira UE-58854 Vulkan Shared Texture Media Framework support cleanup Don't leak vk color conversion handles and only allocate if needed Move color conversion device init to a lumin platform call Add immutable sampler state to mobile base pass policy comparison Remove WITH_VULKAN_COLOR_CONVERSIONS wrappers around color conversion code TODO: FVulkanDescriptorSetsLayoutInfo::AddBindingsForStage still uses the first combined image sampler found when handking materials w/ immutable sampelrs which is not robust. The correct binding needs to be selected from reflection data generated by the compiler. Change 4256021 by Jeff.Fisher UEVR-1261 MagicLeap HandTracking should be exposed to LiveLink -Exposed hand tracking transforms through live link. -Added blueprint function to get the livelink source. -Exposed LiveLikeSourceHandle through ILiveLinkSource.h so that it can be used by the MagicLeapPlugin. -The transforms are in tracking space. They form a hierarchical skeleton with HandCenter as the root. See FMagicLeapHandTracking::SetupLiveLinkData() for details on the hierarchy. With the current magicleap runtime functionality many transforms in the skeleton are always identity. #jira UEVR-1261 #review-4248322 Change 4258366 by Jeff.Fisher UE-62494 Dev-VR Editor fails to build with errors related to MagicLeapHandTrackingLiveLink.cpp -Fixed build break Change 4260114 by Ryan.Vance #jira UE-62509 Moving color conversion vk entry points to lumin platform to avoid failing to find them in android drivers. Change 4263040 by Ryan.Vance Fixing scope issue. Change 4263556 by Jeff.Fisher UE-62507 Fatal error crash opening packaged QAGame UE-62544 //UE4/Dev-VR - Run Automated Tests Cooked Win64 - Unhandled Exception -Updated #define OPENVR_SDK_VER TEXT("OpenVRv1_0_16") #jira UE-62507 Change 4265161 by Jason.Bestimt #DEV-VR - Fix for Lumin BP Projects not using their project specific ini files for compiling/cooking/packaging #JIRA: UE-62568 Change 4265739 by Ryan.Vance Marker API override for ML VK. The current ML driver unofficially supports debug markers, but will report the extension unsupported if queried directly. Once they add official support, we need to add the extension name back into the list. Change 4267320 by Ryan.Vance We need to add the debug marker extension for all platforms but Lumin. Change 4268149 by Michael.Trepka Fix for Lumin Toolchain failing to compile on Mac due to changes to the SDK [CL 4268410 by Jason Bestimt in Main branch]
2018-08-08 10:57:55 -04:00
#include "CoreMinimal.h"
Merging using Dev-VR_to_Release-4.21 #rb: none #jira: merge #ROBOMERGE-SOURCE: CL 4407127 in //UE4/Release-4.21/... #ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21) [CL 4407129 by joe graf in Staging-4.21 branch]
2018-09-28 14:55:17 -04:00
#include "Stats/Stats.h"
Merging //UE4/Release-4.18 @ 3660388 to Release-Staging-4.18 (//UE4/Release-Staging-4.18) #rb none #jira [CL 3662266 by Ben Marsh in Staging-4.18 branch]
2017-09-25 14:08:25 -04:00
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 4268149) #lockdown Nick.Penwarden ============================ MAJOR FEATURES & CHANGES ============================ Change 4048227 by Rolando.Caloca VR - vk - Some Vulkan merge conflicts resolved Change 4078631 by Mike.Beach Fixing MR Calibration so it scales the alignment model according the the capture's FOV (so they appear the same size across capture devices - leading to a homogenous experience). Also moved the FOV override config setting to be a console command/setting (mrc.FovOverride) to help in testing this. #jira UE-55499 Change 4080389 by Mike.Beach Speculative fix/guard against live crash - trying to catch malformed model data. Logging helpful information to give us insight in the future. #jira UE-57680 Change 4080792 by Joe.Graf Prep work for moving face ar to its own plugin Change 4080852 by Joe.Graf Prep work for moving face ar support to its own plugin Change 4081735 by Keli.Hlodversson Remove a workaround change from the Lumin branch that should not have been merged over. Change 4081737 by Keli.Hlodversson Fix SteamVR forcing full screen regardless of user settings. #jira UE-51654 Change 4082323 by Joe.Graf Pulled face ar support into its own plugin so that it can be enabled/disabled independently from room ar Change 4082334 by Joe.Graf Changed where face LiveLink was logging to Change 4095529 by Joe.Graf Dramatically simplified the face API isolation to a separate plugin Change 4103356 by Joe.Graf Fixed a threading bug that appeared when migrating the face ar code into its own plugin Change 4109752 by Joe.Graf Added a setting to specify the type of AR world alignment transform type a session should use Deleted some old ARKit configuration code that wasn't really used Fixed the setting of light estimation using the wrong value to determine the setting on ARKit #jira: UE-58544, UE-59371 Change 4110601 by Jason.Bestimt #DEV-VR - Adding spaces to plugin names #JIRA: UE-58642, UE-58643 Change 4110721 by Jason.Bestimt #DEV-VR - Removing question mark from tooltip #JIRA: UE-58641 Change 4111412 by Joe.Graf Fixed a bad merge of BaseEngine.ini Change 4111902 by Nick.Whiting Adding in support for locking HMD tracking to an external tracking environment (e.g. mo cap). This is not meant to drive the position continually in lieu of an HMD's built in system, but is rather to help keep the HMD from generally getting out of alignment with another tracking system. Two functions, CalibrateExternalTrackingToHMD and UpdateExternalTrackingHMDPosition allow for arbitrary rigid offsets between the HMD and the external tracking source, and updating as desired. Change 4116059 by Joe.Graf First pass integration of ARKit 2.0 (very wip, thar be dragons everywhere) Change 4116109 by Jason.Bestimt #DEV-VR - Disable editing of Tegra Debugger setting for installed builds #JIRA: UE-58636 Change 4117821 by Jason.Bestimt #DEV-VR - Fix for crash in DebugCanvas on application termination #JIRA: UE-58865 Change 4118560 by Joe.Conley MagicLeap ImageTrackerComponent: Adding check for PLATFORM_LUMIN to prevent PIE crash running code that was designed to only run on device. Tested PIE in editor and launching to device. Change 4118626 by Jason.Bestimt #DEV-VR - Removing ES2 from bMobileRendering Tooltop #JIRA: UE-58640 Change 4119786 by Joe.Conley Merging CL-4118965 from Release-4.20 using DevVRtoRelease420 Change 4119906 by Joe.Conley Magic Leap settings: Changing comment/tooltip on mobile rendering flag to not mention vulkan and just say "mobile". Still technically possible to use ES2 but it's hidden. #jira UE-59755 "Magic Leap: Project setting to set vulkan or ES2 needs to be removed" Change 4122067 by Jason.Bestimt #DEV-VR - Copying all relevant files for Resonance Audio Change 4122930 by Keli.Hlodversson Use XR ThreadUtils when scheduling GameTrackingThread to Render and RHI thread. #jira UE-58852 Change 4123848 by Nick.Whiting Enabling RHI threading on Lumin Change 4124116 by Nick.Whiting Adding support for DefaultStereoLayers on Lumin Change 4151051 by Joe.Conley Magic Leap: Override IniPlatfromName() for LuminTargetPlatform to report "Lumin" rather than reporting the value from it's parent, AndroidTargetPlatform, "Android". #jira UE-60389 "Lumin - Need to switch the *Phaedra* launch on option "All_Android_On..." to a single "All_Phaedra_On..." with no expandable options" Unsure if this will affect more than just this display name, as IniPlatformName() is used in a few places in the code, but eventually it will need to be "Lumin" anyway so we'll fix fallout as we find it. Change 4160099 by Nick.Whiting Enabling RHI threading on Vulkan by default on Magic Leap Change 4163986 by Joe.Graf Merging using Dev-VR_to_Release-4.20 Change 4164500 by Joe.Graf Merging using Release-4.20_to_Dev-VR Change 4166311 by Jason.Bestimt #DEV-VR - Merge from //UE4/Dev-MagicLeap/... @ CL 4136411 Change 4167085 by Ryan.Vance #integrating 4.20 cl 4132173 to fix mobile vulkan occusion query issues. #jira UE-61051 Change 4167151 by Jason.Bestimt #DEV-VR - Manual merge of Dev-MAIN to resolve conflicts for robomerge Change 4167983 by Joe.Conley For Lumin, only build shaders for OpenGL or Vulkan, not both. Fix a shader compile error in BogMyrtle material (can't use SpeedTree node on mobile). #jira UE-61126 Lumin Sample: Warning: LogMaterial : Failed to compile material for GLSL_ES2 Change 4168244 by Nick.Whiting Fix for stereo layers crashing on exit, where the DebugCanvas was destroyed after the layer manager, causing a nullptr dereference Change 4170213 by Mike.Beach CIS build fix - removing duplicate definition & adding a missing #pragma once to a header fille #mlqdr Change 4170299 by Mike.Beach LNK fix - fixing up more fallout from the recent merge from DevMain. Adding in missing function that was dropped in the merge (matching Main's version). Change 4170962 by Nick.Whiting Back out changelist 4160099: Removing the enabling by default on lumin Change 4171227 by Chance.Ivey Unreal Engine logos for Portal and Model. These need to be set in Project Settings. Change 4171260 by Chance.Ivey Removing ML basic assets for project icons. Change 4171939 by Joe.Conley #jira UE-61124 Lumin Sample: EDL errors during Launch On Change Lumin Sample to use vulkan, like we do for everything by default now. Didn't see this error after this change. Change 4172321 by Mike.Beach Sizing the debug layer properly for the magic leap device (inverting the y when rendering with opengl). #jira UE-60299 #mlqdr Change 4174175 by Jason.Bestimt #DEV-VR - Fix for dragging a "skylight" from lighting menu directly into sequencer. Change 4174237 by Jason.Bestimt #DEV-VR - fixing initializer order #JIRA - UE-61337 Change 4175281 by Joe.Graf Added support to stream a preview image and the accompanying AR world data for shared AR experiences Change 4175656 by Ryan.Vance Copying //Tasks/UE4/Dev-VR-VulkanMedia to Dev-VR (//UE4/Dev-VR) Preliminary vulkan media player support for ML. There are a number of tasks left to do with this feature before committing to main: - Clean up leaked color conversion handles - Texture slot binding is not robust for media textures - Color conversion extension init should be move to a lumin platform function - Mobile renderer's base pass may collapse multiple materials together into the same drawing policy, so the immutable samplers referenced in the pso would bleed into other materials - Fixing above will allow us to remove the immutable samplers from the mobile material rendering proxy to ensure we don't re-introduce the fort bug listed in the related comment Change 4175684 by Ryan.Vance Fix for vk media player crash Change 4175699 by Nick.Whiting Merging CL 4175640 (fix for Audio Capture pausing and resuming) to Dev-VR Change 4176804 by Joe.Conley Rolando originally hacked the RHI for Lumin with the ForceEnableDebugMarkers() function; return false there instead of if PLATFORM_LUMIN. Change 4178261 by Ethan.Geller Back out changelist 4175699 #fyi nick.whiting #rb none Change 4179088 by Mike.Beach Mirroring CL4178961. Removing spammy error log, per consult from ML - apparently, at this time, MLSnapshotGetTransform() can return NaNs (which we handle). It is currently expected from the API. #jira UE-61127 #mlqdr Change 4179629 by Jeff.Fisher UEVR-1209 Update to Magic Leap Hand Tracking API -Switched from the Gestures API to the HandTracking API -There is nothing like the 0 and 1 tracking point that change meaning per gesture in the new API, so I assigned the former Center/Pointer/Secondary special 1/3/5 2/4/6 to Center/IndexFingerTip/ThumbTip. #review-4178177 #jira UEVR-1209 #mlqdr Change 4179705 by Jeff.Fisher MagicLeapHandTracking CIS fix. Change 4181301 by Joe.Graf Moved FaceARSample to Samples/Sandbox/AR/ so we can have all of the AR samples together Change 4181402 by Joe.Graf Fixed a missing #ifdef wrapper in the MagicLeap plugin Change 4181445 by Joe.Graf Fixed another missing #ifdef wrapper in the MagicLeap plugin Change 4181558 by Jeff.Fisher HandTracking LeftGestureButton fix -The reality is Nihav made the fix, and I reviewed it. Change 4185551 by Joe.Graf Added support to query and specify the desired video format for an AR session Change 4185843 by Joe.Graf Merged in absolute scale/location/rotation PR #4760 from Wang Hao Change 4186875 by Joe.Graf Added stats for face ar #jira: UE-53883 Change 4187681 by Joe.Graf Fixed unity build compilation error Change 4188782 by Joe.Graf Work around LiveLink interpreting ARKit timestamps incorrectly causing jitter and animation lag #jira: UE-61540 Change 4189204 by Joe.Graf Merging using Release-4.20_to_Dev-VR Change 4189331 by Joe.Graf Removed all of my merge markers from the lab Change 4189477 by Joe.Graf Added performance tuning options for Face AR to ARSessionConfig Added whether to mirror or be face relative for Face AR to ARSessionConfig #jira: UE-53881 Change 4189835 by Joe.Graf Changed how timestamps for ARKit objects are updated to make them more amenable with the engine #jira: UE-61550 Change 4190085 by Jeff.Fisher Duplicating from Dev-Partner-MagicLeap-4.20 cl 4189995 HandTracking 'failed to load' errors. -Needed a package redirector as well as the various class and enum redirectors. #MLQDR #review-4189613 Files: //UE4/Dev-Partner-MagicLeap-4.20/Engine/Config/BaseEngine.ini#8 Change 4190100 by Jason.Bestimt #DEV-VR - Adding script version string to make sure AutoSDK gets run again [To Fix CIS Builds for UE4 Lumin] Change 4190795 by Joe.Conley #jira UE-61265 Audio Capture Components need to hook Lumin backgrounding notifications to pause capture Shelve 4175638 got committed but didn't compile. Fixed compile errors and changed some checks from Handle != ML_HANDLE_INVALID to MlIsValidHandle(Handle), fixed functions to return false if they error, responded to the errors by not continuing further, etc... Don't know if this fixes all the functionality, but doesn't crash for me anymore. Change 4196211 by Jason.Bestimt #DEV-VR - Fixes for Android platform with new Lumin Vulkan Color Conversion Functions Change 4199020 by Jason.Bestimt Making sure bHaveVulkan is true for Lumin Change 4199506 by Jason.Bestimt #DEV-VR - Merging CL 4199443 from Dev-Magicleap to clear cache on looping media Change 4200139 by Joe.Graf Initial check in of a project to illustrate AR persistent sessions Change 4200299 by Joe.Graf Fixed the plugin setup for ARSaveLoad Change 4200327 by Joe.Graf Fixed adding face ar plugin instead of world ar plugin Change 4200330 by Joe.Graf Added a sample for using ARKit's environment probe feature Change 4200352 by Joe.Graf Changed the ARSessionConfig to use automatic environment probe generation Change 4201607 by Zak.Parrish Moving latest version of FaceARSample to DevVR Change 4203453 by Jason.Bestimt #DEV-VR - Fixing Audio Capture to not re-open stream if it's already open #JIRA: UE-61609 Change 4204527 by Joe.Graf Changed the AR World Save and AR Get Candidate Object latent actions to use the new mechanism to reduce code Change 4204533 by Joe.Graf POC of saving and load an AR world Change 4204806 by Joe.Graf Added more descriptive display names for AR blueprint operations Change 4204870 by Jeff.Fisher HandTracking blueprint access to all keypoints -Duplicating for Dev-VR from Dev-Partner-MagicLeap-4.20 -Created new GetGestureKeypointTransform blueprint function to get a keypoint's transform by hand and keypoint enum. -Deprecated the old GetGestureKeypoint methods -Fixed Special_1 and Special_2 to use hand center instead of wrist center. -Exposed all the keypoints to blueprint, so they can work right away when underlyign support appears in the OS. #MLQDR #review-4200777 Change 4204877 by Jeff.Fisher Updated gesture test content to replace deprecated hand tracking blueprint functions. Change 4204915 by Joe.Graf Hid blueprint internal methods from being callable Change 4205082 by Joe.Graf Split ImportFileAsTexture2D into two functions so you can also import from a buffer Change 4205170 by Joe.Graf Made the proxy create function blueprint internal only Change 4206898 by Joe.Graf Initial ARSharedWorld multiplayer sample check in Change 4207396 by Joe.Graf Removed the FARSharedWorld from ARSharedWorldGameState to make things simpler/cleaner Change 4207406 by Joe.Graf Hooked up the delivery of the AR shared world data to the clients in the MP sample Change 4207444 by Joe.Graf Fixed the shadowing warning Change 4207794 by zak.parrish Checking in first stage of usable Save/Load AR work. Some UI, foundational functionality. Not testable yet. Change 4207832 by Joe.Graf For Zak Change 4207952 by Joe.Graf For Zak part 2 Change 4208268 by zak.parrish Checking in changes to ARSaveLoad's game mode Change 4208316 by zak.parrish Living in shame under JoeG's rough admonishment. And fixing UI bugs. Change 4208404 by zak.parrish Actually saving... maybe? Change 4208407 by Joe.Graf Fixed wrong platform name being used as the whitelist for the AppleImageUtils plugin Change 4209764 by Joe.Graf Added missing module class for AppleImageUtilsBlueprintSupport Change 4210695 by Joe.Graf Added compression and versioning to the AR saved world data Change 4211461 by Joe.Graf Incremented the face live link packet version since the new blendshapes were added Change 4211843 by Joe.Graf Split some of the methods for ARKit conversion into a cpp from being all in the header Added some logging during conversion Change 4212020 by Joe.Graf Added support for telling the AR system whether to reset tracking and tracked objects (useful for generating a play space and then using lower cpu/gpu tracking only) Change 4212878 by Joe.Graf Fixed inline problem and exported FAppleARKitConversion class Change 4214969 by Ryan.Vance #jira UEVR-1257 Adding initialization to all members in the default FAppleARKitFrame ctor Change 4217193 by Jason.Bestimt #DEV-VR - Fix for swapping shader cache formats and using Launch On We now reload the settings each time they are used rather than caching once at startup Change 4217487 by Jason.Bestimt #DEV-VR - Fix for CIS shadowed member variable error Change 4220007 by Jason.Bestimt #DEV-VR - Fix for Dev-VR compile issue for Lumin Target Platform dependencies on Engine Change 4223757 by Jason.Bestimt #DEV-VR - Moving Lumin Audio Platform above Android because Lumin is Android Change 4230863 by Keli.Hlodversson Updating to SteamVR 1.0.15 Change 4235330 by Jason.Bestimt #DEV-VR - Selective Merge from Dev-Partner-MagicLeap-4.20 CL 4117808 SKIP 4166531, 4172433, 4173415, 4174167, 4175152, 4174192 CL 4175448, 4175781, 4176126, 4176135, 4176138, 4176803, 4178961 SKIP - 4179818, 4179864 CL 4179921, 4179956, 4180229, 4180268, 4180298, 4182733, 4183548, 4184684, 4186883, 4187230, 4189420, 4189995, 4190527, 4190721 SKIP - 4191085 CL 4192219 SKIP 4195948 CL 4197287, 4197951, 4197956, 4201351, 4202541, 4202544, 4202547 SKIP 4202774 CL 4203462, 4203484 SKIP 4204670 CL 4206823, 4209729, 4209810, 4211003, 4215367, 4215662, 4215892, 4215898, 4220239, 4220257 SKIP 4220295 CL 4220307 SKIP 4221842 CL 4221866, 4222959, 4223772, 4225943 SKIP 4226329, 4227773 CL 4228213, 4228270 SKIP 422902, 4229054, 4229365, 4230881, 4233277 Change 4235969 by Joe.Conley MagicLeap: Add quotes around the path to the tools (clang etc) in the mlsdk directory, so that it won't fail if the MLSDK directory has a space in the path. Change 4239300 by Nick.Whiting Adding missing uplugin file to GoogleARCoreServices Change 4240183 by Keli.Hlodversson Updating to SteamVR 1.0.16 Change 4241714 by joe.conley #jira UE-62189 - "Various QAARApp/Content/...uassets have been saved with empty engine version" Resaved assets. Change 4242300 by Nick.Whiting Fix for ARCore Tools being in the wrong folder, emitting RuntimeDependency ref to make sure they're properly included #jira UE-62277 Change 4244428 by Mike.Beach Copying //UE4/Partner-Oculus-Staging to Dev-VR (//UE4/Dev-VR) Change 4244671 by Jeff.Fisher Fxing 'Lumi" build break. Change 4247283 by Nick.Whiting Merging fix from CL 4247094 for ARCore external dependency locations Change 4255817 by Ryan.Vance #jira UE-58854 Vulkan Shared Texture Media Framework support cleanup Don't leak vk color conversion handles and only allocate if needed Move color conversion device init to a lumin platform call Add immutable sampler state to mobile base pass policy comparison Remove WITH_VULKAN_COLOR_CONVERSIONS wrappers around color conversion code TODO: FVulkanDescriptorSetsLayoutInfo::AddBindingsForStage still uses the first combined image sampler found when handking materials w/ immutable sampelrs which is not robust. The correct binding needs to be selected from reflection data generated by the compiler. Change 4256021 by Jeff.Fisher UEVR-1261 MagicLeap HandTracking should be exposed to LiveLink -Exposed hand tracking transforms through live link. -Added blueprint function to get the livelink source. -Exposed LiveLikeSourceHandle through ILiveLinkSource.h so that it can be used by the MagicLeapPlugin. -The transforms are in tracking space. They form a hierarchical skeleton with HandCenter as the root. See FMagicLeapHandTracking::SetupLiveLinkData() for details on the hierarchy. With the current magicleap runtime functionality many transforms in the skeleton are always identity. #jira UEVR-1261 #review-4248322 Change 4258366 by Jeff.Fisher UE-62494 Dev-VR Editor fails to build with errors related to MagicLeapHandTrackingLiveLink.cpp -Fixed build break Change 4260114 by Ryan.Vance #jira UE-62509 Moving color conversion vk entry points to lumin platform to avoid failing to find them in android drivers. Change 4263040 by Ryan.Vance Fixing scope issue. Change 4263556 by Jeff.Fisher UE-62507 Fatal error crash opening packaged QAGame UE-62544 //UE4/Dev-VR - Run Automated Tests Cooked Win64 - Unhandled Exception -Updated #define OPENVR_SDK_VER TEXT("OpenVRv1_0_16") #jira UE-62507 Change 4265161 by Jason.Bestimt #DEV-VR - Fix for Lumin BP Projects not using their project specific ini files for compiling/cooking/packaging #JIRA: UE-62568 Change 4265739 by Ryan.Vance Marker API override for ML VK. The current ML driver unofficially supports debug markers, but will report the extension unsupported if queried directly. Once they add official support, we need to add the extension name back into the list. Change 4267320 by Ryan.Vance We need to add the debug marker extension for all platforms but Lumin. Change 4268149 by Michael.Trepka Fix for Lumin Toolchain failing to compile on Mac due to changes to the SDK [CL 4268410 by Jason Bestimt in Main branch]
2018-08-08 10:57:55 -04:00
DECLARE_LOG_CATEGORY_EXTERN(LogAR, Log, All);
Merging using Dev-VR_to_Release-4.21 #rb: none #jira: merge #ROBOMERGE-SOURCE: CL 4407127 in //UE4/Release-4.21/... #ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21) [CL 4407129 by joe graf in Staging-4.21 branch]
2018-09-28 14:55:17 -04:00
DECLARE_STATS_GROUP(TEXT("AR"), STATGROUP_AR, STATCAT_Advanced);
Reference in New Issue Copy Permalink