2019-12-26 15:33:43 -05:00
|
|
|
// Copyright Epic Games, Inc. All Rights Reserved.
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3764848)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3640098 by Mike.Beach
Switching the MR capture processing material to use a external sampler now (since that's what media textures are marked as now).
Change 3642021 by Mike.Beach
Moving so MediaBlueprint header to Public so FMediaCaptureDevice can be used in other BP APIs (in other modules).
#jira UEVR-910
Change 3642030 by Mike.Beach
[WIP] Refactoring the MR capture component (along with the calibration level) so we can save off a reference to the video stream/format users select (adding a device selection step to calibration).
#jira UEVR-910
Change 3645768 by Mike.Beach
[WIP] Refining device selection/calibration so it reports which feeds error.
#jira UEVR-910
Change 3646047 by Mike.Beach
CIS linux fix.
Change 3646350 by Mike.Beach
[WIP] Provide an ini setting which you can explicitly prioritize a format selection for MR calibration (reflects the list in editor).
Change 3664526 by Keli.Hlodversson
#jira UE-50100
Updated library revision for GoogleVR
Unshelved from pending changelists '3646524', '3646526', '3646528'':
Change 3666500 by Keli.Hlodversson
Fix -Wreorder compiler warnings
Change 3678564 by Douglas.Copeland
Updating TM-HMDNodes LEvel BP to replace deprecated Tracking Sensor node
Change 3678919 by Mike.Beach
Extending and renaming the XRSystemAssets interface. Plus fixing a few bugs found in the SteamVR implementation.
Change 3678920 by Mike.Beach
Stubbing in Oculus support for a IXRSystemAssets implementation (currently using our own 'unofficial' models from the VREditor).
Change 3678922 by Mike.Beach
Adding XR Blueprint library functions for accessing specific device information (tracking, modeling, etc.).
Change 3678941 by Mike.Beach
CIS fixes for Dev-VR (fallout from CL 3678919)
Change 3679930 by Mike.Beach
Adding native support to MotionController components, for rendering the associated device.
Change 3681153 by Mike.Beach
Speculative fix for android CIS errors.
#jira UE-50776
Change 3697385 by Keli.Hlodversson
Fix broken OSVR build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3697516 by Keli.Hlodversson
Fix broken SimpleHMD build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3698318 by Ryan.Vance
Inverse can fail if we don't normalize the player's rotation.
Change 3698371 by Keli.Hlodversson
GoogleVR projects fail to build: GoogleVRHMD.cpp(1175,110) : error: no member named 'ES2' in 'EShadingPath'
#jira UE-51334
Change 3701479 by Mike.Beach
Adding the ability to delay motion controller tracking for MR capture views (to better sync with camera feeds).
#jira UEVR-908
Change 3703264 by Mike.Beach
CIS fixes for linux (fallout from CL 3701479).
Change 3703792 by Ryan.Vance
Disable mobile multi-view for Daydream if the gvr query for support fails.
Change 3704273 by Mike.Beach
[WIP] The MRPlugin now auto spawns a MR capture actor if you have a MR config save file.
Change 3704524 by Mike.Beach
MR Calibration - Enter key can now progress you through some of the prompts.
Change 3706679 by Mike.Beach
Fixing issue with MotionController display models where the model component wouldn't be destroyed along with the MotionControllerComponent
Change 3707538 by Mike.Beach
Hiding child actors along with the player in the MR capture.
Change 3714120 by Mike.Beach
Adding new library function to transform tracking space positions/orientations into world space. And fixing EnumerateTrackedDevices/GetDevicePose, which weren't finding the appropriate tracking system.
Change 3716143 by Mike.Beach
Speculative fix for XboxOne CIS issues.
Change 3719006 by Mike.Beach
Removing some debug log spam that I accidently left in CL 3714120.
Change 3719774 by Mike.Beach
Adding a scoped event name for the rift eye padding draw (so it shows up named in captures like from RenderDoc).
Change 3719778 by Mike.Beach
Mirroring CL 3671849 from 4.18.
Removing Oculus call to reset tracking origin on initialization (so we respect the play space that was calibrated in oculus setup) - ensuring parity w/ Vive (fixing regression).
#jira UE-48260
Change 3736279 by Jeff.Fisher
Touching a couple files to see if it helps the build machine by making it sync them again.
Change 3736296 by Jeff.Fisher
Touching another file to kick the build machine into syncing it.
Change 3740060 by Ryan.Vance
Removing PostInitViewFamily_RenderThread and PostInitView_RenderThread view extension callbacks.
Change 3744913 by Mike.Beach
Fixing up the MotionDelayBuffer for MixedReality
- CIS fix when building for XboxOne
- Now works if late updating is disabled
- Switched to setting delay in millisecs and interpolating between samples
- Better handling for thread managment (was getting out of sync when focus was lost, etc.)
- Decoupled more from MotionControllerComponents (now polls separately, and uses its own LateUpdateManager to cache/apply)
#jira UEVR-908
Change 3747168 by Jeff.Fisher
UEVR-1018 MotionControllerComponent cleanup should be in beginDestroy, not Destructor
-Moved ViewExtension cleanup to BeginDestory from destructor.
-https://udn.unrealengine.com/questions/395504/strange-crash-in-umotioncontrollercomponent.html
#review-3724080
#jira UEVR-1018
Change 3753326 by Douglas.Copeland
Resaving qagame content to resolve Empty Engine Version Warning
Change 3753336 by Douglas.Copeland
Resolving more empty engine version content issues
Change 3754252 by Mike.Beach
Mirroring CL 3723722 from 4.18.1
Hotfix update from Oculus.
- Introduce dash support by adding an Oculus config setting (that is off by default)
- Move submission of the near plane╞s depth from a fixed one at texture allocation time to an every-frame one, which is needed for correct depth support in games that have a ⌠god mode÷ with a smaller worldtometersscale
#jira UE-51728
Change 3754262 by Mike.Beach
Mirroring 3726121 from 4.18.1
Correcting a cpu perf regression from 4.17 - no longer calling FOculusHMDModule::Get() in what should be a cheap query function.
#jira UE-51766
Change 3754278 by Mike.Beach
Mirroring CL 3741384 from 4.18.1
Fix from Oculus for GearVR crashing/freezing when quit menu is invoked - making sure JNI is attached to the render thread (after losing focus).
#jira UE-52098
Change 3754300 by Mike.Beach
Mirroring CL 3742608 from 4.18.1
Fix from Oculus - improving perf on GearVR; keeping the window surface from scaling up to a size not required for Gear.
#jira UE-52127
Change 3754319 by Mike.Beach
Build fix - fallout from blindly adopting CL 3726121 from 4.18.1 w/out fixup (CL 3754262)
Change 3755546 by Keli.Hlodversson
Marking a zombie header file for delete. Seems to get resurrected from the dead on every merge from main.
File is no longer relevant as the OculusAudio plugin has been moved to the Plugins/Runtime/Oculus parent directory.
Change 3759716 by Mike.Beach
Adopted chenges from Oculus (SI1.20)
Manually modified files:
- DefaultXRCamera.cpp
Rejected changes:
- SceneRenderTargets.cpp
#jira UE-50855, UE-50883, UE-50950, UE-50974, UE-52427
Change 3760918 by Keli.Hlodversson
Disable an ensure that had some false positives during the first few frames.
#jira UE-52448
Change 3760946 by Keli.Hlodversson
Missing SteamVR changes after deprecating RefreshPoses()
#jira UEVR-1037
Change 3762015 by Mike.Beach
CIS fix for android - fallout from Oculus 1.20 changes. Lib function was removed, with calls remaining on android (double checking with Oculus that this is the proper fix).
Change 3762236 by Ryan.Vance
Fixing up integration issues.
Change 3763437 by Keli.Hlodversson
Fix deprecation warning in SimpleHMD caused by removing RefreshPoses()
Change 3764713 by Ryan.Vance
#jira UE-52516
PSVR screen percentage was being disabled by default stereo layers on accident.
Change 3652413 by Mike.Beach
In editor, only utilizing the HMD orientation when we're in a VR related mode (VR preview, VR editor, etc.). Not normalizing view pitch rotation unless we're in one of those modes.
#jira UE-46724
Change 3690170 by Keli.Hlodversson
Postprocessing now uses only the HMDDistortion flag to see whether a postprocessing pass is required for the current plugin instead of the older clutch that checks the plugin HMD type
Added EShaderPath argument to GetHMDDistorionEnabled method so that the edge cases solved by the postprocessor and HMD type now can be handled by the plugins themselves.
#jira UEVR-996
Change 3690625 by Keli.Hlodversson
Remove IHeadMountedDisplay::GetHMDDeviceType() as it was added as a part of a clutch in postprocessing, but was later getting misused as a poor man's RTI even though a better alternative in IXRTrackingSystem::GetSystemName is already available.
#jira UEVR-996
Change 3760773 by Keli.Hlodversson
Update interfaces related to late update and begin rendering:
* Deprecate RefreshPoses
Note: Existing and non-empty RefreshPoses implementations have been made private and non-virtual, and renamed to UpdatePoses in order not to conflict with the still-existing deprecated method in the base interface.
* Rename BeginRendering_GameThread/RenderThread to OnBeginRendering_* and move them to IXRTrackingSystem instead of IHeadMountedDisplay.
* Add bool DoesSupportLateUpdate() const to IXRTrackingSystem. IXRCamera implementations can use the method to see whether the underlying tracking system implementation supports late update. Note it is up to the IXRTrackingSystem implementations inside each plugin to actually make sure poses are updated somewhere before the late update is applied by the IXRCamera. (eg. in OnBeginRendering_RenderThread or ..._GameThread)
* Move call to OnBeginRedering_RenderThread to happen before GetCurrentPose in FXRDefaultCamera so the plugin has a chance to refresh the poses inside its implementation of it.
* Add IXRTrackingSystem::OnLateUpdateApplied_RenderThread, a method for notifying the tracking system that late update has been applied, passing in the current relative pose. Used by FXRTrackingSystemBase to pass the updated transform to the stereo layers implementation.
#jira UEVR-1037
Change 3761781 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Manually resolved files:
- OculusHMD.cpp
- OculusHMD_Settings.h/cpp
- SteamVRHMD.cpp
- PostProcessing.cpp
- OrionGame/Plugins/.../OnlineSessionInterface.h/cpp
[CL 3766571 by Mike Beach in Main branch]
2017-11-20 12:50:04 -05:00
|
|
|
|
|
|
|
|
#include "MotionControllerDetails.h"
|
|
|
|
|
#include "MotionControllerComponent.h"
|
|
|
|
|
#include "DetailLayoutBuilder.h"
|
|
|
|
|
#include "DetailCategoryBuilder.h"
|
|
|
|
|
#include "IDetailPropertyRow.h"
|
|
|
|
|
#include "DetailWidgetRow.h"
|
|
|
|
|
#include "Widgets/Input/SComboButton.h"
|
|
|
|
|
#include "Widgets/Layout/SBorder.h"
|
|
|
|
|
#include "Widgets/Input/SEditableTextBox.h"
|
|
|
|
|
#include "Widgets/Views/SListView.h"
|
|
|
|
|
#include "IXRSystemAssets.h"
|
|
|
|
|
#include "Features/IModularFeatures.h" // for GetModularFeatureImplementations()
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3794640)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3767306 by Mike.Beach
Adopting a set of video capture fixes from Darren Pegg:
"Windows 7 : fix capture problems by reinitializing tracks, only active on windows < 8.0."
+ mirroring CL 3741444 ("Add windows 10 support to the application manifest"), which was needed for this
#jira UE-49870, UE-50217, UE-50227, UE-50224
Change 3767317 by Mike.Beach
[MR] Fixing up the mixed reality framework's async BP nodes (handling MediaPlayer assets set to not play-on-open - preventing a crash and keeping the stream playing), so they work with the changes to the WMF media player introduced in CL 3767306.
#jira UEVR-910
Change 3767484 by Mike.Beach
Correcting user facing messages/tooltips to use the proper trademarked "Gear VR" name (not "GearVR" without a space).
Change 3767489 by Mike.Beach
Correcting source comment to use the proper trademarked "Gear VR" name (not "GearVR" without a space).
Change 3768155 by Ryan.Vance
#jira UE-52089
Fixing cardboard only rendering in one eye.
Change 3769011 by Douglas.Copeland
Removing Clipping Planes from TM-HMDNodes (Level and LevelBP. Feature removed). Rebuilding Map.
Change 3769195 by Douglas.Copeland
Removing AA PostProcessing Volumes in TM-VRSmoke. AA does not change via PP Volumes since 4.14
Change 3769256 by Douglas.Copeland
Removing TM-VRLandscapeFoliage Map. Never used in suite/bloat.
Change 3769453 by Douglas.Copeland
Resaving content to resolve engine content warning
Change 3771076 by Keli.Hlodversson
Add missing const to a ref parameter.
Change 3771141 by Keli.Hlodversson
Fix world locked stereo layer positions on SteamVR when there is a camera component representing the HMD.
#jira UE-52353
Change 3771602 by Mike.Beach
Replacing temp Rift controller models with official ones from Oculus.
#jira UEVR-830
Change 3774877 by Mike.Beach
Refining MR calibration (WIP)...
- New alignment process [WIP]
- More modular calibration steps (for easier refactoring)
- Stubbed in phase for lens calibration
- Centralized interface for debug (dev) settings
Change 3774880 by Mike.Beach
Adopted changes from Oculus (SI1.21); stubbing in functionality for:
- Lens matched shading
- Dynamic screen refresh rate switching
- Added BP API calls: GetGPUUtilization, GetTiledMultiresLevel , SetTiledMultiresLevel, GetDeviceName, GetAvailableDisplayFrequencies, GetCurrentDisplayFrequency, SetDisplayFrequency
Change 3774922 by Mike.Beach
Attempting CIS fix.
Change 3774972 by Mike.Beach
Making it so you can override the material on model components from the various XR systems (via MotionController component).
Change 3774974 by Mike.Beach
Missing assets from CL 3774877.
Change 3775128 by Nick.Atamas
Merging //UE4/Partner-Google-VR @ CL 3770408 to Dev-VR (//UE4/Dev-VR)
Change 3776135 by Mike.Beach
MR [WIP] - Updating the calibration save process .
- Now save after each calibration step
- Stubbed in save data for lens distortion
- Track progress and load you to the first incomplete calibration step
Change 3777110 by Mike.Beach
[WIP] MR - Adding ability to easily mirror monitor screen.
Change 3777146 by Mike.Beach
Removing superflous ensure that some of us were hitting.
Change 3777417 by Mike.Beach
[WIP] MR - Fixing alignment adjustment controls to match mirrored monitor.
Change 3777436 by Nick.Atamas
Initial check in of AugmentedReality module and ARKit support for it.
Also adding QAARApp to test the use of these systems.
Change 3778009 by Nick.Atamas
Missing file
Change 3778067 by Nick.Atamas
Fixing CIS
Change 3778155 by Nick.Atamas
Spot merging CL 3777463 //UE4/Partner-Google-VR to //UE4/Dev-VR
Change 3778209 by Nick.Atamas
More CIS fixing.
Change 3778821 by Mike.Beach
[WIP] MR - Moving the alignment point system to pull from an easily modifiable DataTable (so we can change easily).
Change 3779431 by Joe.Graf
Merging using //UE4/Dev-Editor/_to_//UE4/Dev-VR/
Change 3780822 by Keli.Hlodversson
Adding OpenCV binaries plus build script to automatically fetch and rebuild it
#jira UE-52725
Change 3781037 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781046 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781049 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781129 by Joe.Graf
Fixed the warning generated by OpenCV.Build.cs
Change 3783476 by Mike.Beach
Attempt at fixing Win32 CIS errors.
Change 3783845 by Martin.Wilson
Allow deprecated properties to still be accessed in blueprints so long as they have Blueprint Getters and Setters. Allows us to have a clean deprecation path for blueprint accessed properties
Change 3784397 by Jeff.Fisher
UE-51390 GitHub 4141 : Allow VR plugins to have multiple viewports and rotated eye orientations
PR #4141: Allow VR plugins to have multiple viewports and rotated eye orientations (Contributed by AustinPuk-Conffx)
-This loosens some assumptions in the api about how many stereo render passes there are to allow plugins to implement more than we currently use for any of our plugins.
-It also starts to replace some comparison test logic with the stereo pass enum values with IStereoRendering helper functions, do avoid duplicating the expressions all over.
#jira UE-51390
#review-3779148
Change 3784545 by Jeff.Fisher
Build fix for cl 3784397, made a local variable name unique.
Change 3784553 by Chance.Ivey
Stubbing Mobile AR Template files. Needs logic, icons and copy.
Change 3784570 by Jeff.Fisher
fix for cl 3784397
-Reverted monoscopicfarfield default change, accidentaly submit
Change 3785134 by Mike.Beach
[WIP] MR - Correcting some of the alignment algorithms & adding a preview key for the new alignment.
Change 3787180 by Mike.Beach
Fixing up CIS
#jira UE-52998, UE-52996
Change 3787272 by Mike.Beach
Adopted changes from the anim team - Followup to CL 3787240.
The LiveLink framework is now implementing the new IMotionController interface, and supplying tracking+ data through the engine's MotionController components.
#jira UE-52783
Change 3787454 by Jeff.Fisher
Adding brackets after if as specific in code review.
Change 3787591 by Keli.Hlodversson
Add tps files for OpenCV
Change 3788478 by Mike.Beach
Switching over the MR calibration process to use the new MotionController source ID (rather than the deprecated Hand enum). Also, adding device attachment selection to the first calibration step and switching it to use the new modular interface system.
#jira UEVR-1042, UEVR-1045, UEVR-1046
Change 3789836 by Jeff.Fisher
UE-53069 Editor crashes on open without SteamVR attached
-needed to check we are in stereo and device exists.
-Note just having the morpheus plugin enabled creates a device, so you need to have that disabled to reproduce this bug
#jira UE-53069
Change 3789841 by Mike.Beach
CIS fix - fallout from CL 3787272.
Change 3790102 by Jeff.Fisher
UE-53079 Packaging for android results in a critical error referencing global shader FHdrCustomResolveFMask4xPS
-Android shader compiler is a bit pickier on parameter matching, fixed the parameter.
#jira UE-53079
Change 3790174 by Jeff.Fisher
UE-53084 Mac editor crashes on open, Failed to compile global shader FWideCustomResolve8_2x_truePS
-Another shader parameter match.
#jira UE-53084
Change 3791727 by Mike.Beach
Fallout from CL 3787272 - missed use of now deprecated Hand property on MotionController components.
#jira UE-53080
Change 3766717 by Mike.Beach
Adding a TrackingToWorld transform to IXRTrackingSystem - default impl updates the cached transform once per frame (at the begining) and determines it from the project's camera setup (making the assumption the camera's root is the XR origin).
Change 3771327 by Ryan.Vance
#jira UE-52513
Fixing console rendering. The ortho projections were taking screen percentage of the panel into account for size instead of pixeldensity * ideal size.
Change 3773348 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Change 3787240 by Mike.Beach
Adopting IMotionController changes from anim team (in support of LiveLink)...
- MotionControllerComponent EControllerHand Hand is deprecated, replaced by FName MotionSource
- Blueprint get set nodes for the Hand property will still function but will warn as deprecated, this is achieved via using deprecated BlueprintGetter and BlueprintSetter on the property (plus a change to UHT to allow that to compile)
- MotionSource Setter node has pin customization to show choice box instead of standard FName text box.
- New base class for motion controllers XRMotionControllerBase.h/cpp
- Provides default implementations for new functions (Enumerate Source, Custom Parameter etc)
- Provides wrapper functions that take EControllerHand so that the controllers themselves dont have to change.
- Motion Source custom choice box. Polls MotionControllers for sources via EnumerateSources interface. Also allows custom text type in. Is Exposed to details panel and setter pin (as above).
- Added a Dev-VR custom version for reading the Hand property and moving it to MotionSource
#jira UE-52783
Change 3787975 by Ryan.Vance
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
[CL 3794679 by Mike Beach in Main branch]
2017-12-07 13:42:10 -05:00
|
|
|
#include "MotionControllerSourceCustomization.h"
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3764848)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3640098 by Mike.Beach
Switching the MR capture processing material to use a external sampler now (since that's what media textures are marked as now).
Change 3642021 by Mike.Beach
Moving so MediaBlueprint header to Public so FMediaCaptureDevice can be used in other BP APIs (in other modules).
#jira UEVR-910
Change 3642030 by Mike.Beach
[WIP] Refactoring the MR capture component (along with the calibration level) so we can save off a reference to the video stream/format users select (adding a device selection step to calibration).
#jira UEVR-910
Change 3645768 by Mike.Beach
[WIP] Refining device selection/calibration so it reports which feeds error.
#jira UEVR-910
Change 3646047 by Mike.Beach
CIS linux fix.
Change 3646350 by Mike.Beach
[WIP] Provide an ini setting which you can explicitly prioritize a format selection for MR calibration (reflects the list in editor).
Change 3664526 by Keli.Hlodversson
#jira UE-50100
Updated library revision for GoogleVR
Unshelved from pending changelists '3646524', '3646526', '3646528'':
Change 3666500 by Keli.Hlodversson
Fix -Wreorder compiler warnings
Change 3678564 by Douglas.Copeland
Updating TM-HMDNodes LEvel BP to replace deprecated Tracking Sensor node
Change 3678919 by Mike.Beach
Extending and renaming the XRSystemAssets interface. Plus fixing a few bugs found in the SteamVR implementation.
Change 3678920 by Mike.Beach
Stubbing in Oculus support for a IXRSystemAssets implementation (currently using our own 'unofficial' models from the VREditor).
Change 3678922 by Mike.Beach
Adding XR Blueprint library functions for accessing specific device information (tracking, modeling, etc.).
Change 3678941 by Mike.Beach
CIS fixes for Dev-VR (fallout from CL 3678919)
Change 3679930 by Mike.Beach
Adding native support to MotionController components, for rendering the associated device.
Change 3681153 by Mike.Beach
Speculative fix for android CIS errors.
#jira UE-50776
Change 3697385 by Keli.Hlodversson
Fix broken OSVR build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3697516 by Keli.Hlodversson
Fix broken SimpleHMD build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3698318 by Ryan.Vance
Inverse can fail if we don't normalize the player's rotation.
Change 3698371 by Keli.Hlodversson
GoogleVR projects fail to build: GoogleVRHMD.cpp(1175,110) : error: no member named 'ES2' in 'EShadingPath'
#jira UE-51334
Change 3701479 by Mike.Beach
Adding the ability to delay motion controller tracking for MR capture views (to better sync with camera feeds).
#jira UEVR-908
Change 3703264 by Mike.Beach
CIS fixes for linux (fallout from CL 3701479).
Change 3703792 by Ryan.Vance
Disable mobile multi-view for Daydream if the gvr query for support fails.
Change 3704273 by Mike.Beach
[WIP] The MRPlugin now auto spawns a MR capture actor if you have a MR config save file.
Change 3704524 by Mike.Beach
MR Calibration - Enter key can now progress you through some of the prompts.
Change 3706679 by Mike.Beach
Fixing issue with MotionController display models where the model component wouldn't be destroyed along with the MotionControllerComponent
Change 3707538 by Mike.Beach
Hiding child actors along with the player in the MR capture.
Change 3714120 by Mike.Beach
Adding new library function to transform tracking space positions/orientations into world space. And fixing EnumerateTrackedDevices/GetDevicePose, which weren't finding the appropriate tracking system.
Change 3716143 by Mike.Beach
Speculative fix for XboxOne CIS issues.
Change 3719006 by Mike.Beach
Removing some debug log spam that I accidently left in CL 3714120.
Change 3719774 by Mike.Beach
Adding a scoped event name for the rift eye padding draw (so it shows up named in captures like from RenderDoc).
Change 3719778 by Mike.Beach
Mirroring CL 3671849 from 4.18.
Removing Oculus call to reset tracking origin on initialization (so we respect the play space that was calibrated in oculus setup) - ensuring parity w/ Vive (fixing regression).
#jira UE-48260
Change 3736279 by Jeff.Fisher
Touching a couple files to see if it helps the build machine by making it sync them again.
Change 3736296 by Jeff.Fisher
Touching another file to kick the build machine into syncing it.
Change 3740060 by Ryan.Vance
Removing PostInitViewFamily_RenderThread and PostInitView_RenderThread view extension callbacks.
Change 3744913 by Mike.Beach
Fixing up the MotionDelayBuffer for MixedReality
- CIS fix when building for XboxOne
- Now works if late updating is disabled
- Switched to setting delay in millisecs and interpolating between samples
- Better handling for thread managment (was getting out of sync when focus was lost, etc.)
- Decoupled more from MotionControllerComponents (now polls separately, and uses its own LateUpdateManager to cache/apply)
#jira UEVR-908
Change 3747168 by Jeff.Fisher
UEVR-1018 MotionControllerComponent cleanup should be in beginDestroy, not Destructor
-Moved ViewExtension cleanup to BeginDestory from destructor.
-https://udn.unrealengine.com/questions/395504/strange-crash-in-umotioncontrollercomponent.html
#review-3724080
#jira UEVR-1018
Change 3753326 by Douglas.Copeland
Resaving qagame content to resolve Empty Engine Version Warning
Change 3753336 by Douglas.Copeland
Resolving more empty engine version content issues
Change 3754252 by Mike.Beach
Mirroring CL 3723722 from 4.18.1
Hotfix update from Oculus.
- Introduce dash support by adding an Oculus config setting (that is off by default)
- Move submission of the near plane╞s depth from a fixed one at texture allocation time to an every-frame one, which is needed for correct depth support in games that have a ⌠god mode÷ with a smaller worldtometersscale
#jira UE-51728
Change 3754262 by Mike.Beach
Mirroring 3726121 from 4.18.1
Correcting a cpu perf regression from 4.17 - no longer calling FOculusHMDModule::Get() in what should be a cheap query function.
#jira UE-51766
Change 3754278 by Mike.Beach
Mirroring CL 3741384 from 4.18.1
Fix from Oculus for GearVR crashing/freezing when quit menu is invoked - making sure JNI is attached to the render thread (after losing focus).
#jira UE-52098
Change 3754300 by Mike.Beach
Mirroring CL 3742608 from 4.18.1
Fix from Oculus - improving perf on GearVR; keeping the window surface from scaling up to a size not required for Gear.
#jira UE-52127
Change 3754319 by Mike.Beach
Build fix - fallout from blindly adopting CL 3726121 from 4.18.1 w/out fixup (CL 3754262)
Change 3755546 by Keli.Hlodversson
Marking a zombie header file for delete. Seems to get resurrected from the dead on every merge from main.
File is no longer relevant as the OculusAudio plugin has been moved to the Plugins/Runtime/Oculus parent directory.
Change 3759716 by Mike.Beach
Adopted chenges from Oculus (SI1.20)
Manually modified files:
- DefaultXRCamera.cpp
Rejected changes:
- SceneRenderTargets.cpp
#jira UE-50855, UE-50883, UE-50950, UE-50974, UE-52427
Change 3760918 by Keli.Hlodversson
Disable an ensure that had some false positives during the first few frames.
#jira UE-52448
Change 3760946 by Keli.Hlodversson
Missing SteamVR changes after deprecating RefreshPoses()
#jira UEVR-1037
Change 3762015 by Mike.Beach
CIS fix for android - fallout from Oculus 1.20 changes. Lib function was removed, with calls remaining on android (double checking with Oculus that this is the proper fix).
Change 3762236 by Ryan.Vance
Fixing up integration issues.
Change 3763437 by Keli.Hlodversson
Fix deprecation warning in SimpleHMD caused by removing RefreshPoses()
Change 3764713 by Ryan.Vance
#jira UE-52516
PSVR screen percentage was being disabled by default stereo layers on accident.
Change 3652413 by Mike.Beach
In editor, only utilizing the HMD orientation when we're in a VR related mode (VR preview, VR editor, etc.). Not normalizing view pitch rotation unless we're in one of those modes.
#jira UE-46724
Change 3690170 by Keli.Hlodversson
Postprocessing now uses only the HMDDistortion flag to see whether a postprocessing pass is required for the current plugin instead of the older clutch that checks the plugin HMD type
Added EShaderPath argument to GetHMDDistorionEnabled method so that the edge cases solved by the postprocessor and HMD type now can be handled by the plugins themselves.
#jira UEVR-996
Change 3690625 by Keli.Hlodversson
Remove IHeadMountedDisplay::GetHMDDeviceType() as it was added as a part of a clutch in postprocessing, but was later getting misused as a poor man's RTI even though a better alternative in IXRTrackingSystem::GetSystemName is already available.
#jira UEVR-996
Change 3760773 by Keli.Hlodversson
Update interfaces related to late update and begin rendering:
* Deprecate RefreshPoses
Note: Existing and non-empty RefreshPoses implementations have been made private and non-virtual, and renamed to UpdatePoses in order not to conflict with the still-existing deprecated method in the base interface.
* Rename BeginRendering_GameThread/RenderThread to OnBeginRendering_* and move them to IXRTrackingSystem instead of IHeadMountedDisplay.
* Add bool DoesSupportLateUpdate() const to IXRTrackingSystem. IXRCamera implementations can use the method to see whether the underlying tracking system implementation supports late update. Note it is up to the IXRTrackingSystem implementations inside each plugin to actually make sure poses are updated somewhere before the late update is applied by the IXRCamera. (eg. in OnBeginRendering_RenderThread or ..._GameThread)
* Move call to OnBeginRedering_RenderThread to happen before GetCurrentPose in FXRDefaultCamera so the plugin has a chance to refresh the poses inside its implementation of it.
* Add IXRTrackingSystem::OnLateUpdateApplied_RenderThread, a method for notifying the tracking system that late update has been applied, passing in the current relative pose. Used by FXRTrackingSystemBase to pass the updated transform to the stereo layers implementation.
#jira UEVR-1037
Change 3761781 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Manually resolved files:
- OculusHMD.cpp
- OculusHMD_Settings.h/cpp
- SteamVRHMD.cpp
- PostProcessing.cpp
- OrionGame/Plugins/.../OnlineSessionInterface.h/cpp
[CL 3766571 by Mike Beach in Main branch]
2017-11-20 12:50:04 -05:00
|
|
|
|
|
|
|
|
#define LOCTEXT_NAMESPACE "MotionControllerDetails"
|
|
|
|
|
|
|
|
|
|
TMap< FName, TSharedPtr<FName> > FMotionControllerDetails::CustomSourceNames;
|
|
|
|
|
|
|
|
|
|
TSharedRef<IDetailCustomization> FMotionControllerDetails::MakeInstance()
|
|
|
|
|
{
|
|
|
|
|
return MakeShareable(new FMotionControllerDetails);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::CustomizeDetails(IDetailLayoutBuilder& DetailLayout)
|
|
|
|
|
{
|
|
|
|
|
DetailLayout.GetObjectsBeingCustomized(SelectedObjects);
|
|
|
|
|
IDetailCategoryBuilder& VisualizationDetails = DetailLayout.EditCategory("Visualization");
|
|
|
|
|
|
|
|
|
|
TSharedRef<IPropertyHandle> ModelSrcProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UMotionControllerComponent, DisplayModelSource));
|
|
|
|
|
if (ensure(ModelSrcProperty->IsValidHandle()))
|
|
|
|
|
{
|
|
|
|
|
XRSourceProperty = ModelSrcProperty;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DisplayModelProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UMotionControllerComponent, bDisplayDeviceModel));
|
|
|
|
|
TSharedRef<IPropertyHandle> CustomMeshProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UMotionControllerComponent, CustomDisplayMesh));
|
|
|
|
|
TSharedRef<IPropertyHandle> CustomMaterialsProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UMotionControllerComponent, DisplayMeshMaterialOverrides));
|
|
|
|
|
|
|
|
|
|
TArray<TSharedRef<IPropertyHandle>> VisualizationProperties;
|
|
|
|
|
VisualizationDetails.GetDefaultProperties(VisualizationProperties);
|
|
|
|
|
|
|
|
|
|
for (TSharedRef<IPropertyHandle> VisProp : VisualizationProperties)
|
|
|
|
|
{
|
|
|
|
|
IDetailPropertyRow& PropertyRow = VisualizationDetails.AddProperty(VisProp);
|
|
|
|
|
|
2019-12-13 11:07:03 -05:00
|
|
|
FProperty* RawProperty = VisProp->GetProperty();
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3764848)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3640098 by Mike.Beach
Switching the MR capture processing material to use a external sampler now (since that's what media textures are marked as now).
Change 3642021 by Mike.Beach
Moving so MediaBlueprint header to Public so FMediaCaptureDevice can be used in other BP APIs (in other modules).
#jira UEVR-910
Change 3642030 by Mike.Beach
[WIP] Refactoring the MR capture component (along with the calibration level) so we can save off a reference to the video stream/format users select (adding a device selection step to calibration).
#jira UEVR-910
Change 3645768 by Mike.Beach
[WIP] Refining device selection/calibration so it reports which feeds error.
#jira UEVR-910
Change 3646047 by Mike.Beach
CIS linux fix.
Change 3646350 by Mike.Beach
[WIP] Provide an ini setting which you can explicitly prioritize a format selection for MR calibration (reflects the list in editor).
Change 3664526 by Keli.Hlodversson
#jira UE-50100
Updated library revision for GoogleVR
Unshelved from pending changelists '3646524', '3646526', '3646528'':
Change 3666500 by Keli.Hlodversson
Fix -Wreorder compiler warnings
Change 3678564 by Douglas.Copeland
Updating TM-HMDNodes LEvel BP to replace deprecated Tracking Sensor node
Change 3678919 by Mike.Beach
Extending and renaming the XRSystemAssets interface. Plus fixing a few bugs found in the SteamVR implementation.
Change 3678920 by Mike.Beach
Stubbing in Oculus support for a IXRSystemAssets implementation (currently using our own 'unofficial' models from the VREditor).
Change 3678922 by Mike.Beach
Adding XR Blueprint library functions for accessing specific device information (tracking, modeling, etc.).
Change 3678941 by Mike.Beach
CIS fixes for Dev-VR (fallout from CL 3678919)
Change 3679930 by Mike.Beach
Adding native support to MotionController components, for rendering the associated device.
Change 3681153 by Mike.Beach
Speculative fix for android CIS errors.
#jira UE-50776
Change 3697385 by Keli.Hlodversson
Fix broken OSVR build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3697516 by Keli.Hlodversson
Fix broken SimpleHMD build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3698318 by Ryan.Vance
Inverse can fail if we don't normalize the player's rotation.
Change 3698371 by Keli.Hlodversson
GoogleVR projects fail to build: GoogleVRHMD.cpp(1175,110) : error: no member named 'ES2' in 'EShadingPath'
#jira UE-51334
Change 3701479 by Mike.Beach
Adding the ability to delay motion controller tracking for MR capture views (to better sync with camera feeds).
#jira UEVR-908
Change 3703264 by Mike.Beach
CIS fixes for linux (fallout from CL 3701479).
Change 3703792 by Ryan.Vance
Disable mobile multi-view for Daydream if the gvr query for support fails.
Change 3704273 by Mike.Beach
[WIP] The MRPlugin now auto spawns a MR capture actor if you have a MR config save file.
Change 3704524 by Mike.Beach
MR Calibration - Enter key can now progress you through some of the prompts.
Change 3706679 by Mike.Beach
Fixing issue with MotionController display models where the model component wouldn't be destroyed along with the MotionControllerComponent
Change 3707538 by Mike.Beach
Hiding child actors along with the player in the MR capture.
Change 3714120 by Mike.Beach
Adding new library function to transform tracking space positions/orientations into world space. And fixing EnumerateTrackedDevices/GetDevicePose, which weren't finding the appropriate tracking system.
Change 3716143 by Mike.Beach
Speculative fix for XboxOne CIS issues.
Change 3719006 by Mike.Beach
Removing some debug log spam that I accidently left in CL 3714120.
Change 3719774 by Mike.Beach
Adding a scoped event name for the rift eye padding draw (so it shows up named in captures like from RenderDoc).
Change 3719778 by Mike.Beach
Mirroring CL 3671849 from 4.18.
Removing Oculus call to reset tracking origin on initialization (so we respect the play space that was calibrated in oculus setup) - ensuring parity w/ Vive (fixing regression).
#jira UE-48260
Change 3736279 by Jeff.Fisher
Touching a couple files to see if it helps the build machine by making it sync them again.
Change 3736296 by Jeff.Fisher
Touching another file to kick the build machine into syncing it.
Change 3740060 by Ryan.Vance
Removing PostInitViewFamily_RenderThread and PostInitView_RenderThread view extension callbacks.
Change 3744913 by Mike.Beach
Fixing up the MotionDelayBuffer for MixedReality
- CIS fix when building for XboxOne
- Now works if late updating is disabled
- Switched to setting delay in millisecs and interpolating between samples
- Better handling for thread managment (was getting out of sync when focus was lost, etc.)
- Decoupled more from MotionControllerComponents (now polls separately, and uses its own LateUpdateManager to cache/apply)
#jira UEVR-908
Change 3747168 by Jeff.Fisher
UEVR-1018 MotionControllerComponent cleanup should be in beginDestroy, not Destructor
-Moved ViewExtension cleanup to BeginDestory from destructor.
-https://udn.unrealengine.com/questions/395504/strange-crash-in-umotioncontrollercomponent.html
#review-3724080
#jira UEVR-1018
Change 3753326 by Douglas.Copeland
Resaving qagame content to resolve Empty Engine Version Warning
Change 3753336 by Douglas.Copeland
Resolving more empty engine version content issues
Change 3754252 by Mike.Beach
Mirroring CL 3723722 from 4.18.1
Hotfix update from Oculus.
- Introduce dash support by adding an Oculus config setting (that is off by default)
- Move submission of the near plane╞s depth from a fixed one at texture allocation time to an every-frame one, which is needed for correct depth support in games that have a ⌠god mode÷ with a smaller worldtometersscale
#jira UE-51728
Change 3754262 by Mike.Beach
Mirroring 3726121 from 4.18.1
Correcting a cpu perf regression from 4.17 - no longer calling FOculusHMDModule::Get() in what should be a cheap query function.
#jira UE-51766
Change 3754278 by Mike.Beach
Mirroring CL 3741384 from 4.18.1
Fix from Oculus for GearVR crashing/freezing when quit menu is invoked - making sure JNI is attached to the render thread (after losing focus).
#jira UE-52098
Change 3754300 by Mike.Beach
Mirroring CL 3742608 from 4.18.1
Fix from Oculus - improving perf on GearVR; keeping the window surface from scaling up to a size not required for Gear.
#jira UE-52127
Change 3754319 by Mike.Beach
Build fix - fallout from blindly adopting CL 3726121 from 4.18.1 w/out fixup (CL 3754262)
Change 3755546 by Keli.Hlodversson
Marking a zombie header file for delete. Seems to get resurrected from the dead on every merge from main.
File is no longer relevant as the OculusAudio plugin has been moved to the Plugins/Runtime/Oculus parent directory.
Change 3759716 by Mike.Beach
Adopted chenges from Oculus (SI1.20)
Manually modified files:
- DefaultXRCamera.cpp
Rejected changes:
- SceneRenderTargets.cpp
#jira UE-50855, UE-50883, UE-50950, UE-50974, UE-52427
Change 3760918 by Keli.Hlodversson
Disable an ensure that had some false positives during the first few frames.
#jira UE-52448
Change 3760946 by Keli.Hlodversson
Missing SteamVR changes after deprecating RefreshPoses()
#jira UEVR-1037
Change 3762015 by Mike.Beach
CIS fix for android - fallout from Oculus 1.20 changes. Lib function was removed, with calls remaining on android (double checking with Oculus that this is the proper fix).
Change 3762236 by Ryan.Vance
Fixing up integration issues.
Change 3763437 by Keli.Hlodversson
Fix deprecation warning in SimpleHMD caused by removing RefreshPoses()
Change 3764713 by Ryan.Vance
#jira UE-52516
PSVR screen percentage was being disabled by default stereo layers on accident.
Change 3652413 by Mike.Beach
In editor, only utilizing the HMD orientation when we're in a VR related mode (VR preview, VR editor, etc.). Not normalizing view pitch rotation unless we're in one of those modes.
#jira UE-46724
Change 3690170 by Keli.Hlodversson
Postprocessing now uses only the HMDDistortion flag to see whether a postprocessing pass is required for the current plugin instead of the older clutch that checks the plugin HMD type
Added EShaderPath argument to GetHMDDistorionEnabled method so that the edge cases solved by the postprocessor and HMD type now can be handled by the plugins themselves.
#jira UEVR-996
Change 3690625 by Keli.Hlodversson
Remove IHeadMountedDisplay::GetHMDDeviceType() as it was added as a part of a clutch in postprocessing, but was later getting misused as a poor man's RTI even though a better alternative in IXRTrackingSystem::GetSystemName is already available.
#jira UEVR-996
Change 3760773 by Keli.Hlodversson
Update interfaces related to late update and begin rendering:
* Deprecate RefreshPoses
Note: Existing and non-empty RefreshPoses implementations have been made private and non-virtual, and renamed to UpdatePoses in order not to conflict with the still-existing deprecated method in the base interface.
* Rename BeginRendering_GameThread/RenderThread to OnBeginRendering_* and move them to IXRTrackingSystem instead of IHeadMountedDisplay.
* Add bool DoesSupportLateUpdate() const to IXRTrackingSystem. IXRCamera implementations can use the method to see whether the underlying tracking system implementation supports late update. Note it is up to the IXRTrackingSystem implementations inside each plugin to actually make sure poses are updated somewhere before the late update is applied by the IXRCamera. (eg. in OnBeginRendering_RenderThread or ..._GameThread)
* Move call to OnBeginRedering_RenderThread to happen before GetCurrentPose in FXRDefaultCamera so the plugin has a chance to refresh the poses inside its implementation of it.
* Add IXRTrackingSystem::OnLateUpdateApplied_RenderThread, a method for notifying the tracking system that late update has been applied, passing in the current relative pose. Used by FXRTrackingSystemBase to pass the updated transform to the stereo layers implementation.
#jira UEVR-1037
Change 3761781 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Manually resolved files:
- OculusHMD.cpp
- OculusHMD_Settings.h/cpp
- SteamVRHMD.cpp
- PostProcessing.cpp
- OrionGame/Plugins/.../OnlineSessionInterface.h/cpp
[CL 3766571 by Mike Beach in Main branch]
2017-11-20 12:50:04 -05:00
|
|
|
if (RawProperty == ModelSrcProperty->GetProperty())
|
|
|
|
|
{
|
|
|
|
|
CustomizeModelSourceRow(ModelSrcProperty, PropertyRow);
|
|
|
|
|
}
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3794640)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3767306 by Mike.Beach
Adopting a set of video capture fixes from Darren Pegg:
"Windows 7 : fix capture problems by reinitializing tracks, only active on windows < 8.0."
+ mirroring CL 3741444 ("Add windows 10 support to the application manifest"), which was needed for this
#jira UE-49870, UE-50217, UE-50227, UE-50224
Change 3767317 by Mike.Beach
[MR] Fixing up the mixed reality framework's async BP nodes (handling MediaPlayer assets set to not play-on-open - preventing a crash and keeping the stream playing), so they work with the changes to the WMF media player introduced in CL 3767306.
#jira UEVR-910
Change 3767484 by Mike.Beach
Correcting user facing messages/tooltips to use the proper trademarked "Gear VR" name (not "GearVR" without a space).
Change 3767489 by Mike.Beach
Correcting source comment to use the proper trademarked "Gear VR" name (not "GearVR" without a space).
Change 3768155 by Ryan.Vance
#jira UE-52089
Fixing cardboard only rendering in one eye.
Change 3769011 by Douglas.Copeland
Removing Clipping Planes from TM-HMDNodes (Level and LevelBP. Feature removed). Rebuilding Map.
Change 3769195 by Douglas.Copeland
Removing AA PostProcessing Volumes in TM-VRSmoke. AA does not change via PP Volumes since 4.14
Change 3769256 by Douglas.Copeland
Removing TM-VRLandscapeFoliage Map. Never used in suite/bloat.
Change 3769453 by Douglas.Copeland
Resaving content to resolve engine content warning
Change 3771076 by Keli.Hlodversson
Add missing const to a ref parameter.
Change 3771141 by Keli.Hlodversson
Fix world locked stereo layer positions on SteamVR when there is a camera component representing the HMD.
#jira UE-52353
Change 3771602 by Mike.Beach
Replacing temp Rift controller models with official ones from Oculus.
#jira UEVR-830
Change 3774877 by Mike.Beach
Refining MR calibration (WIP)...
- New alignment process [WIP]
- More modular calibration steps (for easier refactoring)
- Stubbed in phase for lens calibration
- Centralized interface for debug (dev) settings
Change 3774880 by Mike.Beach
Adopted changes from Oculus (SI1.21); stubbing in functionality for:
- Lens matched shading
- Dynamic screen refresh rate switching
- Added BP API calls: GetGPUUtilization, GetTiledMultiresLevel , SetTiledMultiresLevel, GetDeviceName, GetAvailableDisplayFrequencies, GetCurrentDisplayFrequency, SetDisplayFrequency
Change 3774922 by Mike.Beach
Attempting CIS fix.
Change 3774972 by Mike.Beach
Making it so you can override the material on model components from the various XR systems (via MotionController component).
Change 3774974 by Mike.Beach
Missing assets from CL 3774877.
Change 3775128 by Nick.Atamas
Merging //UE4/Partner-Google-VR @ CL 3770408 to Dev-VR (//UE4/Dev-VR)
Change 3776135 by Mike.Beach
MR [WIP] - Updating the calibration save process .
- Now save after each calibration step
- Stubbed in save data for lens distortion
- Track progress and load you to the first incomplete calibration step
Change 3777110 by Mike.Beach
[WIP] MR - Adding ability to easily mirror monitor screen.
Change 3777146 by Mike.Beach
Removing superflous ensure that some of us were hitting.
Change 3777417 by Mike.Beach
[WIP] MR - Fixing alignment adjustment controls to match mirrored monitor.
Change 3777436 by Nick.Atamas
Initial check in of AugmentedReality module and ARKit support for it.
Also adding QAARApp to test the use of these systems.
Change 3778009 by Nick.Atamas
Missing file
Change 3778067 by Nick.Atamas
Fixing CIS
Change 3778155 by Nick.Atamas
Spot merging CL 3777463 //UE4/Partner-Google-VR to //UE4/Dev-VR
Change 3778209 by Nick.Atamas
More CIS fixing.
Change 3778821 by Mike.Beach
[WIP] MR - Moving the alignment point system to pull from an easily modifiable DataTable (so we can change easily).
Change 3779431 by Joe.Graf
Merging using //UE4/Dev-Editor/_to_//UE4/Dev-VR/
Change 3780822 by Keli.Hlodversson
Adding OpenCV binaries plus build script to automatically fetch and rebuild it
#jira UE-52725
Change 3781037 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781046 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781049 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781129 by Joe.Graf
Fixed the warning generated by OpenCV.Build.cs
Change 3783476 by Mike.Beach
Attempt at fixing Win32 CIS errors.
Change 3783845 by Martin.Wilson
Allow deprecated properties to still be accessed in blueprints so long as they have Blueprint Getters and Setters. Allows us to have a clean deprecation path for blueprint accessed properties
Change 3784397 by Jeff.Fisher
UE-51390 GitHub 4141 : Allow VR plugins to have multiple viewports and rotated eye orientations
PR #4141: Allow VR plugins to have multiple viewports and rotated eye orientations (Contributed by AustinPuk-Conffx)
-This loosens some assumptions in the api about how many stereo render passes there are to allow plugins to implement more than we currently use for any of our plugins.
-It also starts to replace some comparison test logic with the stereo pass enum values with IStereoRendering helper functions, do avoid duplicating the expressions all over.
#jira UE-51390
#review-3779148
Change 3784545 by Jeff.Fisher
Build fix for cl 3784397, made a local variable name unique.
Change 3784553 by Chance.Ivey
Stubbing Mobile AR Template files. Needs logic, icons and copy.
Change 3784570 by Jeff.Fisher
fix for cl 3784397
-Reverted monoscopicfarfield default change, accidentaly submit
Change 3785134 by Mike.Beach
[WIP] MR - Correcting some of the alignment algorithms & adding a preview key for the new alignment.
Change 3787180 by Mike.Beach
Fixing up CIS
#jira UE-52998, UE-52996
Change 3787272 by Mike.Beach
Adopted changes from the anim team - Followup to CL 3787240.
The LiveLink framework is now implementing the new IMotionController interface, and supplying tracking+ data through the engine's MotionController components.
#jira UE-52783
Change 3787454 by Jeff.Fisher
Adding brackets after if as specific in code review.
Change 3787591 by Keli.Hlodversson
Add tps files for OpenCV
Change 3788478 by Mike.Beach
Switching over the MR calibration process to use the new MotionController source ID (rather than the deprecated Hand enum). Also, adding device attachment selection to the first calibration step and switching it to use the new modular interface system.
#jira UEVR-1042, UEVR-1045, UEVR-1046
Change 3789836 by Jeff.Fisher
UE-53069 Editor crashes on open without SteamVR attached
-needed to check we are in stereo and device exists.
-Note just having the morpheus plugin enabled creates a device, so you need to have that disabled to reproduce this bug
#jira UE-53069
Change 3789841 by Mike.Beach
CIS fix - fallout from CL 3787272.
Change 3790102 by Jeff.Fisher
UE-53079 Packaging for android results in a critical error referencing global shader FHdrCustomResolveFMask4xPS
-Android shader compiler is a bit pickier on parameter matching, fixed the parameter.
#jira UE-53079
Change 3790174 by Jeff.Fisher
UE-53084 Mac editor crashes on open, Failed to compile global shader FWideCustomResolve8_2x_truePS
-Another shader parameter match.
#jira UE-53084
Change 3791727 by Mike.Beach
Fallout from CL 3787272 - missed use of now deprecated Hand property on MotionController components.
#jira UE-53080
Change 3766717 by Mike.Beach
Adding a TrackingToWorld transform to IXRTrackingSystem - default impl updates the cached transform once per frame (at the begining) and determines it from the project's camera setup (making the assumption the camera's root is the XR origin).
Change 3771327 by Ryan.Vance
#jira UE-52513
Fixing console rendering. The ortho projections were taking screen percentage of the panel into account for size instead of pixeldensity * ideal size.
Change 3773348 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Change 3787240 by Mike.Beach
Adopting IMotionController changes from anim team (in support of LiveLink)...
- MotionControllerComponent EControllerHand Hand is deprecated, replaced by FName MotionSource
- Blueprint get set nodes for the Hand property will still function but will warn as deprecated, this is achieved via using deprecated BlueprintGetter and BlueprintSetter on the property (plus a change to UHT to allow that to compile)
- MotionSource Setter node has pin customization to show choice box instead of standard FName text box.
- New base class for motion controllers XRMotionControllerBase.h/cpp
- Provides default implementations for new functions (Enumerate Source, Custom Parameter etc)
- Provides wrapper functions that take EControllerHand so that the controllers themselves dont have to change.
- Motion Source custom choice box. Polls MotionControllers for sources via EnumerateSources interface. Also allows custom text type in. Is Exposed to details panel and setter pin (as above).
- Added a Dev-VR custom version for reading the Hand property and moving it to MotionSource
#jira UE-52783
Change 3787975 by Ryan.Vance
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
[CL 3794679 by Mike Beach in Main branch]
2017-12-07 13:42:10 -05:00
|
|
|
else if (RawProperty == CustomMeshProperty->GetProperty())
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3764848)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3640098 by Mike.Beach
Switching the MR capture processing material to use a external sampler now (since that's what media textures are marked as now).
Change 3642021 by Mike.Beach
Moving so MediaBlueprint header to Public so FMediaCaptureDevice can be used in other BP APIs (in other modules).
#jira UEVR-910
Change 3642030 by Mike.Beach
[WIP] Refactoring the MR capture component (along with the calibration level) so we can save off a reference to the video stream/format users select (adding a device selection step to calibration).
#jira UEVR-910
Change 3645768 by Mike.Beach
[WIP] Refining device selection/calibration so it reports which feeds error.
#jira UEVR-910
Change 3646047 by Mike.Beach
CIS linux fix.
Change 3646350 by Mike.Beach
[WIP] Provide an ini setting which you can explicitly prioritize a format selection for MR calibration (reflects the list in editor).
Change 3664526 by Keli.Hlodversson
#jira UE-50100
Updated library revision for GoogleVR
Unshelved from pending changelists '3646524', '3646526', '3646528'':
Change 3666500 by Keli.Hlodversson
Fix -Wreorder compiler warnings
Change 3678564 by Douglas.Copeland
Updating TM-HMDNodes LEvel BP to replace deprecated Tracking Sensor node
Change 3678919 by Mike.Beach
Extending and renaming the XRSystemAssets interface. Plus fixing a few bugs found in the SteamVR implementation.
Change 3678920 by Mike.Beach
Stubbing in Oculus support for a IXRSystemAssets implementation (currently using our own 'unofficial' models from the VREditor).
Change 3678922 by Mike.Beach
Adding XR Blueprint library functions for accessing specific device information (tracking, modeling, etc.).
Change 3678941 by Mike.Beach
CIS fixes for Dev-VR (fallout from CL 3678919)
Change 3679930 by Mike.Beach
Adding native support to MotionController components, for rendering the associated device.
Change 3681153 by Mike.Beach
Speculative fix for android CIS errors.
#jira UE-50776
Change 3697385 by Keli.Hlodversson
Fix broken OSVR build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3697516 by Keli.Hlodversson
Fix broken SimpleHMD build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3698318 by Ryan.Vance
Inverse can fail if we don't normalize the player's rotation.
Change 3698371 by Keli.Hlodversson
GoogleVR projects fail to build: GoogleVRHMD.cpp(1175,110) : error: no member named 'ES2' in 'EShadingPath'
#jira UE-51334
Change 3701479 by Mike.Beach
Adding the ability to delay motion controller tracking for MR capture views (to better sync with camera feeds).
#jira UEVR-908
Change 3703264 by Mike.Beach
CIS fixes for linux (fallout from CL 3701479).
Change 3703792 by Ryan.Vance
Disable mobile multi-view for Daydream if the gvr query for support fails.
Change 3704273 by Mike.Beach
[WIP] The MRPlugin now auto spawns a MR capture actor if you have a MR config save file.
Change 3704524 by Mike.Beach
MR Calibration - Enter key can now progress you through some of the prompts.
Change 3706679 by Mike.Beach
Fixing issue with MotionController display models where the model component wouldn't be destroyed along with the MotionControllerComponent
Change 3707538 by Mike.Beach
Hiding child actors along with the player in the MR capture.
Change 3714120 by Mike.Beach
Adding new library function to transform tracking space positions/orientations into world space. And fixing EnumerateTrackedDevices/GetDevicePose, which weren't finding the appropriate tracking system.
Change 3716143 by Mike.Beach
Speculative fix for XboxOne CIS issues.
Change 3719006 by Mike.Beach
Removing some debug log spam that I accidently left in CL 3714120.
Change 3719774 by Mike.Beach
Adding a scoped event name for the rift eye padding draw (so it shows up named in captures like from RenderDoc).
Change 3719778 by Mike.Beach
Mirroring CL 3671849 from 4.18.
Removing Oculus call to reset tracking origin on initialization (so we respect the play space that was calibrated in oculus setup) - ensuring parity w/ Vive (fixing regression).
#jira UE-48260
Change 3736279 by Jeff.Fisher
Touching a couple files to see if it helps the build machine by making it sync them again.
Change 3736296 by Jeff.Fisher
Touching another file to kick the build machine into syncing it.
Change 3740060 by Ryan.Vance
Removing PostInitViewFamily_RenderThread and PostInitView_RenderThread view extension callbacks.
Change 3744913 by Mike.Beach
Fixing up the MotionDelayBuffer for MixedReality
- CIS fix when building for XboxOne
- Now works if late updating is disabled
- Switched to setting delay in millisecs and interpolating between samples
- Better handling for thread managment (was getting out of sync when focus was lost, etc.)
- Decoupled more from MotionControllerComponents (now polls separately, and uses its own LateUpdateManager to cache/apply)
#jira UEVR-908
Change 3747168 by Jeff.Fisher
UEVR-1018 MotionControllerComponent cleanup should be in beginDestroy, not Destructor
-Moved ViewExtension cleanup to BeginDestory from destructor.
-https://udn.unrealengine.com/questions/395504/strange-crash-in-umotioncontrollercomponent.html
#review-3724080
#jira UEVR-1018
Change 3753326 by Douglas.Copeland
Resaving qagame content to resolve Empty Engine Version Warning
Change 3753336 by Douglas.Copeland
Resolving more empty engine version content issues
Change 3754252 by Mike.Beach
Mirroring CL 3723722 from 4.18.1
Hotfix update from Oculus.
- Introduce dash support by adding an Oculus config setting (that is off by default)
- Move submission of the near plane╞s depth from a fixed one at texture allocation time to an every-frame one, which is needed for correct depth support in games that have a ⌠god mode÷ with a smaller worldtometersscale
#jira UE-51728
Change 3754262 by Mike.Beach
Mirroring 3726121 from 4.18.1
Correcting a cpu perf regression from 4.17 - no longer calling FOculusHMDModule::Get() in what should be a cheap query function.
#jira UE-51766
Change 3754278 by Mike.Beach
Mirroring CL 3741384 from 4.18.1
Fix from Oculus for GearVR crashing/freezing when quit menu is invoked - making sure JNI is attached to the render thread (after losing focus).
#jira UE-52098
Change 3754300 by Mike.Beach
Mirroring CL 3742608 from 4.18.1
Fix from Oculus - improving perf on GearVR; keeping the window surface from scaling up to a size not required for Gear.
#jira UE-52127
Change 3754319 by Mike.Beach
Build fix - fallout from blindly adopting CL 3726121 from 4.18.1 w/out fixup (CL 3754262)
Change 3755546 by Keli.Hlodversson
Marking a zombie header file for delete. Seems to get resurrected from the dead on every merge from main.
File is no longer relevant as the OculusAudio plugin has been moved to the Plugins/Runtime/Oculus parent directory.
Change 3759716 by Mike.Beach
Adopted chenges from Oculus (SI1.20)
Manually modified files:
- DefaultXRCamera.cpp
Rejected changes:
- SceneRenderTargets.cpp
#jira UE-50855, UE-50883, UE-50950, UE-50974, UE-52427
Change 3760918 by Keli.Hlodversson
Disable an ensure that had some false positives during the first few frames.
#jira UE-52448
Change 3760946 by Keli.Hlodversson
Missing SteamVR changes after deprecating RefreshPoses()
#jira UEVR-1037
Change 3762015 by Mike.Beach
CIS fix for android - fallout from Oculus 1.20 changes. Lib function was removed, with calls remaining on android (double checking with Oculus that this is the proper fix).
Change 3762236 by Ryan.Vance
Fixing up integration issues.
Change 3763437 by Keli.Hlodversson
Fix deprecation warning in SimpleHMD caused by removing RefreshPoses()
Change 3764713 by Ryan.Vance
#jira UE-52516
PSVR screen percentage was being disabled by default stereo layers on accident.
Change 3652413 by Mike.Beach
In editor, only utilizing the HMD orientation when we're in a VR related mode (VR preview, VR editor, etc.). Not normalizing view pitch rotation unless we're in one of those modes.
#jira UE-46724
Change 3690170 by Keli.Hlodversson
Postprocessing now uses only the HMDDistortion flag to see whether a postprocessing pass is required for the current plugin instead of the older clutch that checks the plugin HMD type
Added EShaderPath argument to GetHMDDistorionEnabled method so that the edge cases solved by the postprocessor and HMD type now can be handled by the plugins themselves.
#jira UEVR-996
Change 3690625 by Keli.Hlodversson
Remove IHeadMountedDisplay::GetHMDDeviceType() as it was added as a part of a clutch in postprocessing, but was later getting misused as a poor man's RTI even though a better alternative in IXRTrackingSystem::GetSystemName is already available.
#jira UEVR-996
Change 3760773 by Keli.Hlodversson
Update interfaces related to late update and begin rendering:
* Deprecate RefreshPoses
Note: Existing and non-empty RefreshPoses implementations have been made private and non-virtual, and renamed to UpdatePoses in order not to conflict with the still-existing deprecated method in the base interface.
* Rename BeginRendering_GameThread/RenderThread to OnBeginRendering_* and move them to IXRTrackingSystem instead of IHeadMountedDisplay.
* Add bool DoesSupportLateUpdate() const to IXRTrackingSystem. IXRCamera implementations can use the method to see whether the underlying tracking system implementation supports late update. Note it is up to the IXRTrackingSystem implementations inside each plugin to actually make sure poses are updated somewhere before the late update is applied by the IXRCamera. (eg. in OnBeginRendering_RenderThread or ..._GameThread)
* Move call to OnBeginRedering_RenderThread to happen before GetCurrentPose in FXRDefaultCamera so the plugin has a chance to refresh the poses inside its implementation of it.
* Add IXRTrackingSystem::OnLateUpdateApplied_RenderThread, a method for notifying the tracking system that late update has been applied, passing in the current relative pose. Used by FXRTrackingSystemBase to pass the updated transform to the stereo layers implementation.
#jira UEVR-1037
Change 3761781 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Manually resolved files:
- OculusHMD.cpp
- OculusHMD_Settings.h/cpp
- SteamVRHMD.cpp
- PostProcessing.cpp
- OrionGame/Plugins/.../OnlineSessionInterface.h/cpp
[CL 3766571 by Mike Beach in Main branch]
2017-11-20 12:50:04 -05:00
|
|
|
{
|
|
|
|
|
CustomizeCustomMeshRow(PropertyRow);
|
|
|
|
|
}
|
|
|
|
|
}
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3794640)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3767306 by Mike.Beach
Adopting a set of video capture fixes from Darren Pegg:
"Windows 7 : fix capture problems by reinitializing tracks, only active on windows < 8.0."
+ mirroring CL 3741444 ("Add windows 10 support to the application manifest"), which was needed for this
#jira UE-49870, UE-50217, UE-50227, UE-50224
Change 3767317 by Mike.Beach
[MR] Fixing up the mixed reality framework's async BP nodes (handling MediaPlayer assets set to not play-on-open - preventing a crash and keeping the stream playing), so they work with the changes to the WMF media player introduced in CL 3767306.
#jira UEVR-910
Change 3767484 by Mike.Beach
Correcting user facing messages/tooltips to use the proper trademarked "Gear VR" name (not "GearVR" without a space).
Change 3767489 by Mike.Beach
Correcting source comment to use the proper trademarked "Gear VR" name (not "GearVR" without a space).
Change 3768155 by Ryan.Vance
#jira UE-52089
Fixing cardboard only rendering in one eye.
Change 3769011 by Douglas.Copeland
Removing Clipping Planes from TM-HMDNodes (Level and LevelBP. Feature removed). Rebuilding Map.
Change 3769195 by Douglas.Copeland
Removing AA PostProcessing Volumes in TM-VRSmoke. AA does not change via PP Volumes since 4.14
Change 3769256 by Douglas.Copeland
Removing TM-VRLandscapeFoliage Map. Never used in suite/bloat.
Change 3769453 by Douglas.Copeland
Resaving content to resolve engine content warning
Change 3771076 by Keli.Hlodversson
Add missing const to a ref parameter.
Change 3771141 by Keli.Hlodversson
Fix world locked stereo layer positions on SteamVR when there is a camera component representing the HMD.
#jira UE-52353
Change 3771602 by Mike.Beach
Replacing temp Rift controller models with official ones from Oculus.
#jira UEVR-830
Change 3774877 by Mike.Beach
Refining MR calibration (WIP)...
- New alignment process [WIP]
- More modular calibration steps (for easier refactoring)
- Stubbed in phase for lens calibration
- Centralized interface for debug (dev) settings
Change 3774880 by Mike.Beach
Adopted changes from Oculus (SI1.21); stubbing in functionality for:
- Lens matched shading
- Dynamic screen refresh rate switching
- Added BP API calls: GetGPUUtilization, GetTiledMultiresLevel , SetTiledMultiresLevel, GetDeviceName, GetAvailableDisplayFrequencies, GetCurrentDisplayFrequency, SetDisplayFrequency
Change 3774922 by Mike.Beach
Attempting CIS fix.
Change 3774972 by Mike.Beach
Making it so you can override the material on model components from the various XR systems (via MotionController component).
Change 3774974 by Mike.Beach
Missing assets from CL 3774877.
Change 3775128 by Nick.Atamas
Merging //UE4/Partner-Google-VR @ CL 3770408 to Dev-VR (//UE4/Dev-VR)
Change 3776135 by Mike.Beach
MR [WIP] - Updating the calibration save process .
- Now save after each calibration step
- Stubbed in save data for lens distortion
- Track progress and load you to the first incomplete calibration step
Change 3777110 by Mike.Beach
[WIP] MR - Adding ability to easily mirror monitor screen.
Change 3777146 by Mike.Beach
Removing superflous ensure that some of us were hitting.
Change 3777417 by Mike.Beach
[WIP] MR - Fixing alignment adjustment controls to match mirrored monitor.
Change 3777436 by Nick.Atamas
Initial check in of AugmentedReality module and ARKit support for it.
Also adding QAARApp to test the use of these systems.
Change 3778009 by Nick.Atamas
Missing file
Change 3778067 by Nick.Atamas
Fixing CIS
Change 3778155 by Nick.Atamas
Spot merging CL 3777463 //UE4/Partner-Google-VR to //UE4/Dev-VR
Change 3778209 by Nick.Atamas
More CIS fixing.
Change 3778821 by Mike.Beach
[WIP] MR - Moving the alignment point system to pull from an easily modifiable DataTable (so we can change easily).
Change 3779431 by Joe.Graf
Merging using //UE4/Dev-Editor/_to_//UE4/Dev-VR/
Change 3780822 by Keli.Hlodversson
Adding OpenCV binaries plus build script to automatically fetch and rebuild it
#jira UE-52725
Change 3781037 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781046 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781049 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781129 by Joe.Graf
Fixed the warning generated by OpenCV.Build.cs
Change 3783476 by Mike.Beach
Attempt at fixing Win32 CIS errors.
Change 3783845 by Martin.Wilson
Allow deprecated properties to still be accessed in blueprints so long as they have Blueprint Getters and Setters. Allows us to have a clean deprecation path for blueprint accessed properties
Change 3784397 by Jeff.Fisher
UE-51390 GitHub 4141 : Allow VR plugins to have multiple viewports and rotated eye orientations
PR #4141: Allow VR plugins to have multiple viewports and rotated eye orientations (Contributed by AustinPuk-Conffx)
-This loosens some assumptions in the api about how many stereo render passes there are to allow plugins to implement more than we currently use for any of our plugins.
-It also starts to replace some comparison test logic with the stereo pass enum values with IStereoRendering helper functions, do avoid duplicating the expressions all over.
#jira UE-51390
#review-3779148
Change 3784545 by Jeff.Fisher
Build fix for cl 3784397, made a local variable name unique.
Change 3784553 by Chance.Ivey
Stubbing Mobile AR Template files. Needs logic, icons and copy.
Change 3784570 by Jeff.Fisher
fix for cl 3784397
-Reverted monoscopicfarfield default change, accidentaly submit
Change 3785134 by Mike.Beach
[WIP] MR - Correcting some of the alignment algorithms & adding a preview key for the new alignment.
Change 3787180 by Mike.Beach
Fixing up CIS
#jira UE-52998, UE-52996
Change 3787272 by Mike.Beach
Adopted changes from the anim team - Followup to CL 3787240.
The LiveLink framework is now implementing the new IMotionController interface, and supplying tracking+ data through the engine's MotionController components.
#jira UE-52783
Change 3787454 by Jeff.Fisher
Adding brackets after if as specific in code review.
Change 3787591 by Keli.Hlodversson
Add tps files for OpenCV
Change 3788478 by Mike.Beach
Switching over the MR calibration process to use the new MotionController source ID (rather than the deprecated Hand enum). Also, adding device attachment selection to the first calibration step and switching it to use the new modular interface system.
#jira UEVR-1042, UEVR-1045, UEVR-1046
Change 3789836 by Jeff.Fisher
UE-53069 Editor crashes on open without SteamVR attached
-needed to check we are in stereo and device exists.
-Note just having the morpheus plugin enabled creates a device, so you need to have that disabled to reproduce this bug
#jira UE-53069
Change 3789841 by Mike.Beach
CIS fix - fallout from CL 3787272.
Change 3790102 by Jeff.Fisher
UE-53079 Packaging for android results in a critical error referencing global shader FHdrCustomResolveFMask4xPS
-Android shader compiler is a bit pickier on parameter matching, fixed the parameter.
#jira UE-53079
Change 3790174 by Jeff.Fisher
UE-53084 Mac editor crashes on open, Failed to compile global shader FWideCustomResolve8_2x_truePS
-Another shader parameter match.
#jira UE-53084
Change 3791727 by Mike.Beach
Fallout from CL 3787272 - missed use of now deprecated Hand property on MotionController components.
#jira UE-53080
Change 3766717 by Mike.Beach
Adding a TrackingToWorld transform to IXRTrackingSystem - default impl updates the cached transform once per frame (at the begining) and determines it from the project's camera setup (making the assumption the camera's root is the XR origin).
Change 3771327 by Ryan.Vance
#jira UE-52513
Fixing console rendering. The ortho projections were taking screen percentage of the panel into account for size instead of pixeldensity * ideal size.
Change 3773348 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Change 3787240 by Mike.Beach
Adopting IMotionController changes from anim team (in support of LiveLink)...
- MotionControllerComponent EControllerHand Hand is deprecated, replaced by FName MotionSource
- Blueprint get set nodes for the Hand property will still function but will warn as deprecated, this is achieved via using deprecated BlueprintGetter and BlueprintSetter on the property (plus a change to UHT to allow that to compile)
- MotionSource Setter node has pin customization to show choice box instead of standard FName text box.
- New base class for motion controllers XRMotionControllerBase.h/cpp
- Provides default implementations for new functions (Enumerate Source, Custom Parameter etc)
- Provides wrapper functions that take EControllerHand so that the controllers themselves dont have to change.
- Motion Source custom choice box. Polls MotionControllers for sources via EnumerateSources interface. Also allows custom text type in. Is Exposed to details panel and setter pin (as above).
- Added a Dev-VR custom version for reading the Hand property and moving it to MotionSource
#jira UE-52783
Change 3787975 by Ryan.Vance
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
[CL 3794679 by Mike Beach in Main branch]
2017-12-07 13:42:10 -05:00
|
|
|
|
|
|
|
|
MotionSourceProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UMotionControllerComponent, MotionSource));
|
|
|
|
|
MotionSourceProperty->MarkHiddenByCustomization();
|
|
|
|
|
|
|
|
|
|
IDetailCategoryBuilder& MotionSourcePropertyGroup = DetailLayout.EditCategory(*MotionSourceProperty->GetMetaData(TEXT("Category")));
|
|
|
|
|
MotionSourcePropertyGroup.AddCustomRow(LOCTEXT("MotionSourceLabel", "Motion Source"))
|
|
|
|
|
.NameContent()
|
|
|
|
|
[
|
|
|
|
|
MotionSourceProperty->CreatePropertyNameWidget()
|
|
|
|
|
]
|
|
|
|
|
.ValueContent()
|
|
|
|
|
[
|
|
|
|
|
SNew(SMotionSourceWidget)
|
|
|
|
|
.OnGetMotionSourceText(this, &FMotionControllerDetails::GetMotionSourceValueText)
|
|
|
|
|
.OnMotionSourceChanged(this, &FMotionControllerDetails::OnMotionSourceChanged)
|
|
|
|
|
];
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3764848)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3640098 by Mike.Beach
Switching the MR capture processing material to use a external sampler now (since that's what media textures are marked as now).
Change 3642021 by Mike.Beach
Moving so MediaBlueprint header to Public so FMediaCaptureDevice can be used in other BP APIs (in other modules).
#jira UEVR-910
Change 3642030 by Mike.Beach
[WIP] Refactoring the MR capture component (along with the calibration level) so we can save off a reference to the video stream/format users select (adding a device selection step to calibration).
#jira UEVR-910
Change 3645768 by Mike.Beach
[WIP] Refining device selection/calibration so it reports which feeds error.
#jira UEVR-910
Change 3646047 by Mike.Beach
CIS linux fix.
Change 3646350 by Mike.Beach
[WIP] Provide an ini setting which you can explicitly prioritize a format selection for MR calibration (reflects the list in editor).
Change 3664526 by Keli.Hlodversson
#jira UE-50100
Updated library revision for GoogleVR
Unshelved from pending changelists '3646524', '3646526', '3646528'':
Change 3666500 by Keli.Hlodversson
Fix -Wreorder compiler warnings
Change 3678564 by Douglas.Copeland
Updating TM-HMDNodes LEvel BP to replace deprecated Tracking Sensor node
Change 3678919 by Mike.Beach
Extending and renaming the XRSystemAssets interface. Plus fixing a few bugs found in the SteamVR implementation.
Change 3678920 by Mike.Beach
Stubbing in Oculus support for a IXRSystemAssets implementation (currently using our own 'unofficial' models from the VREditor).
Change 3678922 by Mike.Beach
Adding XR Blueprint library functions for accessing specific device information (tracking, modeling, etc.).
Change 3678941 by Mike.Beach
CIS fixes for Dev-VR (fallout from CL 3678919)
Change 3679930 by Mike.Beach
Adding native support to MotionController components, for rendering the associated device.
Change 3681153 by Mike.Beach
Speculative fix for android CIS errors.
#jira UE-50776
Change 3697385 by Keli.Hlodversson
Fix broken OSVR build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3697516 by Keli.Hlodversson
Fix broken SimpleHMD build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3698318 by Ryan.Vance
Inverse can fail if we don't normalize the player's rotation.
Change 3698371 by Keli.Hlodversson
GoogleVR projects fail to build: GoogleVRHMD.cpp(1175,110) : error: no member named 'ES2' in 'EShadingPath'
#jira UE-51334
Change 3701479 by Mike.Beach
Adding the ability to delay motion controller tracking for MR capture views (to better sync with camera feeds).
#jira UEVR-908
Change 3703264 by Mike.Beach
CIS fixes for linux (fallout from CL 3701479).
Change 3703792 by Ryan.Vance
Disable mobile multi-view for Daydream if the gvr query for support fails.
Change 3704273 by Mike.Beach
[WIP] The MRPlugin now auto spawns a MR capture actor if you have a MR config save file.
Change 3704524 by Mike.Beach
MR Calibration - Enter key can now progress you through some of the prompts.
Change 3706679 by Mike.Beach
Fixing issue with MotionController display models where the model component wouldn't be destroyed along with the MotionControllerComponent
Change 3707538 by Mike.Beach
Hiding child actors along with the player in the MR capture.
Change 3714120 by Mike.Beach
Adding new library function to transform tracking space positions/orientations into world space. And fixing EnumerateTrackedDevices/GetDevicePose, which weren't finding the appropriate tracking system.
Change 3716143 by Mike.Beach
Speculative fix for XboxOne CIS issues.
Change 3719006 by Mike.Beach
Removing some debug log spam that I accidently left in CL 3714120.
Change 3719774 by Mike.Beach
Adding a scoped event name for the rift eye padding draw (so it shows up named in captures like from RenderDoc).
Change 3719778 by Mike.Beach
Mirroring CL 3671849 from 4.18.
Removing Oculus call to reset tracking origin on initialization (so we respect the play space that was calibrated in oculus setup) - ensuring parity w/ Vive (fixing regression).
#jira UE-48260
Change 3736279 by Jeff.Fisher
Touching a couple files to see if it helps the build machine by making it sync them again.
Change 3736296 by Jeff.Fisher
Touching another file to kick the build machine into syncing it.
Change 3740060 by Ryan.Vance
Removing PostInitViewFamily_RenderThread and PostInitView_RenderThread view extension callbacks.
Change 3744913 by Mike.Beach
Fixing up the MotionDelayBuffer for MixedReality
- CIS fix when building for XboxOne
- Now works if late updating is disabled
- Switched to setting delay in millisecs and interpolating between samples
- Better handling for thread managment (was getting out of sync when focus was lost, etc.)
- Decoupled more from MotionControllerComponents (now polls separately, and uses its own LateUpdateManager to cache/apply)
#jira UEVR-908
Change 3747168 by Jeff.Fisher
UEVR-1018 MotionControllerComponent cleanup should be in beginDestroy, not Destructor
-Moved ViewExtension cleanup to BeginDestory from destructor.
-https://udn.unrealengine.com/questions/395504/strange-crash-in-umotioncontrollercomponent.html
#review-3724080
#jira UEVR-1018
Change 3753326 by Douglas.Copeland
Resaving qagame content to resolve Empty Engine Version Warning
Change 3753336 by Douglas.Copeland
Resolving more empty engine version content issues
Change 3754252 by Mike.Beach
Mirroring CL 3723722 from 4.18.1
Hotfix update from Oculus.
- Introduce dash support by adding an Oculus config setting (that is off by default)
- Move submission of the near plane╞s depth from a fixed one at texture allocation time to an every-frame one, which is needed for correct depth support in games that have a ⌠god mode÷ with a smaller worldtometersscale
#jira UE-51728
Change 3754262 by Mike.Beach
Mirroring 3726121 from 4.18.1
Correcting a cpu perf regression from 4.17 - no longer calling FOculusHMDModule::Get() in what should be a cheap query function.
#jira UE-51766
Change 3754278 by Mike.Beach
Mirroring CL 3741384 from 4.18.1
Fix from Oculus for GearVR crashing/freezing when quit menu is invoked - making sure JNI is attached to the render thread (after losing focus).
#jira UE-52098
Change 3754300 by Mike.Beach
Mirroring CL 3742608 from 4.18.1
Fix from Oculus - improving perf on GearVR; keeping the window surface from scaling up to a size not required for Gear.
#jira UE-52127
Change 3754319 by Mike.Beach
Build fix - fallout from blindly adopting CL 3726121 from 4.18.1 w/out fixup (CL 3754262)
Change 3755546 by Keli.Hlodversson
Marking a zombie header file for delete. Seems to get resurrected from the dead on every merge from main.
File is no longer relevant as the OculusAudio plugin has been moved to the Plugins/Runtime/Oculus parent directory.
Change 3759716 by Mike.Beach
Adopted chenges from Oculus (SI1.20)
Manually modified files:
- DefaultXRCamera.cpp
Rejected changes:
- SceneRenderTargets.cpp
#jira UE-50855, UE-50883, UE-50950, UE-50974, UE-52427
Change 3760918 by Keli.Hlodversson
Disable an ensure that had some false positives during the first few frames.
#jira UE-52448
Change 3760946 by Keli.Hlodversson
Missing SteamVR changes after deprecating RefreshPoses()
#jira UEVR-1037
Change 3762015 by Mike.Beach
CIS fix for android - fallout from Oculus 1.20 changes. Lib function was removed, with calls remaining on android (double checking with Oculus that this is the proper fix).
Change 3762236 by Ryan.Vance
Fixing up integration issues.
Change 3763437 by Keli.Hlodversson
Fix deprecation warning in SimpleHMD caused by removing RefreshPoses()
Change 3764713 by Ryan.Vance
#jira UE-52516
PSVR screen percentage was being disabled by default stereo layers on accident.
Change 3652413 by Mike.Beach
In editor, only utilizing the HMD orientation when we're in a VR related mode (VR preview, VR editor, etc.). Not normalizing view pitch rotation unless we're in one of those modes.
#jira UE-46724
Change 3690170 by Keli.Hlodversson
Postprocessing now uses only the HMDDistortion flag to see whether a postprocessing pass is required for the current plugin instead of the older clutch that checks the plugin HMD type
Added EShaderPath argument to GetHMDDistorionEnabled method so that the edge cases solved by the postprocessor and HMD type now can be handled by the plugins themselves.
#jira UEVR-996
Change 3690625 by Keli.Hlodversson
Remove IHeadMountedDisplay::GetHMDDeviceType() as it was added as a part of a clutch in postprocessing, but was later getting misused as a poor man's RTI even though a better alternative in IXRTrackingSystem::GetSystemName is already available.
#jira UEVR-996
Change 3760773 by Keli.Hlodversson
Update interfaces related to late update and begin rendering:
* Deprecate RefreshPoses
Note: Existing and non-empty RefreshPoses implementations have been made private and non-virtual, and renamed to UpdatePoses in order not to conflict with the still-existing deprecated method in the base interface.
* Rename BeginRendering_GameThread/RenderThread to OnBeginRendering_* and move them to IXRTrackingSystem instead of IHeadMountedDisplay.
* Add bool DoesSupportLateUpdate() const to IXRTrackingSystem. IXRCamera implementations can use the method to see whether the underlying tracking system implementation supports late update. Note it is up to the IXRTrackingSystem implementations inside each plugin to actually make sure poses are updated somewhere before the late update is applied by the IXRCamera. (eg. in OnBeginRendering_RenderThread or ..._GameThread)
* Move call to OnBeginRedering_RenderThread to happen before GetCurrentPose in FXRDefaultCamera so the plugin has a chance to refresh the poses inside its implementation of it.
* Add IXRTrackingSystem::OnLateUpdateApplied_RenderThread, a method for notifying the tracking system that late update has been applied, passing in the current relative pose. Used by FXRTrackingSystemBase to pass the updated transform to the stereo layers implementation.
#jira UEVR-1037
Change 3761781 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Manually resolved files:
- OculusHMD.cpp
- OculusHMD_Settings.h/cpp
- SteamVRHMD.cpp
- PostProcessing.cpp
- OrionGame/Plugins/.../OnlineSessionInterface.h/cpp
[CL 3766571 by Mike Beach in Main branch]
2017-11-20 12:50:04 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::RefreshXRSourceList()
|
|
|
|
|
{
|
|
|
|
|
TSharedPtr<FName> DefaultOption;
|
|
|
|
|
TSharedPtr<FName> CustomOption;
|
|
|
|
|
if (XRSourceNames.Num() > 0)
|
|
|
|
|
{
|
|
|
|
|
DefaultOption = XRSourceNames[0];
|
|
|
|
|
CustomOption = XRSourceNames.Last();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TArray<IXRSystemAssets*> XRAssetSystems = IModularFeatures::Get().GetModularFeatureImplementations<IXRSystemAssets>(IXRSystemAssets::GetModularFeatureName());
|
|
|
|
|
XRSourceNames.Empty(XRAssetSystems.Num() + CustomSourceNames.Num() + 2);
|
|
|
|
|
|
|
|
|
|
if (!DefaultOption.IsValid())
|
|
|
|
|
{
|
|
|
|
|
DefaultOption = MakeShareable(new FName());
|
|
|
|
|
}
|
|
|
|
|
XRSourceNames.Add(DefaultOption);
|
|
|
|
|
|
|
|
|
|
TArray<FName> ListedNames;
|
|
|
|
|
TArray<FName> StaleCustomNames;
|
|
|
|
|
|
|
|
|
|
for (auto& CustomNameIt : CustomSourceNames)
|
|
|
|
|
{
|
|
|
|
|
UObject* CustomizedController = FindObject<UMotionControllerComponent>(/*Outer =*/nullptr, *CustomNameIt.Key.ToString());
|
|
|
|
|
if (CustomizedController)
|
|
|
|
|
{
|
|
|
|
|
if (!CustomNameIt.Value->IsNone() && *CustomNameIt.Value != UMotionControllerComponent::CustomModelSourceId)
|
|
|
|
|
{
|
|
|
|
|
ListedNames.AddUnique(*CustomNameIt.Value);
|
|
|
|
|
XRSourceNames.AddUnique(CustomNameIt.Value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
StaleCustomNames.Add(CustomNameIt.Key);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (FName& DeadEntry : StaleCustomNames)
|
|
|
|
|
{
|
|
|
|
|
CustomSourceNames.Remove(DeadEntry);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (IXRSystemAssets* AssetSys : XRAssetSystems)
|
|
|
|
|
{
|
|
|
|
|
FName SystemName = AssetSys->GetSystemName();
|
|
|
|
|
if (!ListedNames.Contains(SystemName))
|
|
|
|
|
{
|
|
|
|
|
ListedNames.Add(SystemName);
|
|
|
|
|
|
|
|
|
|
// @TODO: shouldn't be continuously creating these
|
|
|
|
|
TSharedPtr<FName> SystemNamePtr = MakeShareable(new FName(SystemName));
|
|
|
|
|
XRSourceNames.AddUnique(SystemNamePtr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!CustomOption.IsValid())
|
|
|
|
|
{
|
|
|
|
|
CustomOption = MakeShareable(new FName(UMotionControllerComponent::CustomModelSourceId));
|
|
|
|
|
}
|
|
|
|
|
XRSourceNames.AddUnique(CustomOption);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::SetSourcePropertyValue(const FName NewSystemName)
|
|
|
|
|
{
|
|
|
|
|
if (XRSourceProperty.IsValid())
|
|
|
|
|
{
|
|
|
|
|
XRSourceProperty->SetValue(NewSystemName);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::UpdateSourceSelection(TSharedPtr<FName> NewSelection)
|
|
|
|
|
{
|
|
|
|
|
for (TWeakObjectPtr<UObject> SelectedObj : SelectedObjects)
|
|
|
|
|
{
|
|
|
|
|
if (SelectedObj.IsValid())
|
|
|
|
|
{
|
|
|
|
|
CustomSourceNames.Add(*SelectedObj->GetPathName(), NewSelection);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
SetSourcePropertyValue(*NewSelection);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::CustomizeModelSourceRow(TSharedRef<IPropertyHandle>& Property, IDetailPropertyRow& PropertyRow)
|
|
|
|
|
{
|
|
|
|
|
const FText ToolTip = Property->GetToolTipText();
|
|
|
|
|
|
|
|
|
|
FResetToDefaultOverride ResetOverride = FResetToDefaultOverride::Create(
|
|
|
|
|
FIsResetToDefaultVisible::CreateSP(this, &FMotionControllerDetails::IsSourceValueModified),
|
|
|
|
|
FResetToDefaultHandler::CreateSP(this, &FMotionControllerDetails::OnResetSourceValue)
|
|
|
|
|
);
|
|
|
|
|
PropertyRow.OverrideResetToDefault(ResetOverride);
|
|
|
|
|
|
|
|
|
|
PropertyRow.CustomWidget()
|
|
|
|
|
.NameContent()
|
|
|
|
|
[
|
|
|
|
|
Property->CreatePropertyNameWidget()
|
|
|
|
|
]
|
|
|
|
|
.ValueContent()
|
|
|
|
|
[
|
|
|
|
|
SNew(SComboButton)
|
|
|
|
|
.ContentPadding(FMargin(0,0,5,0))
|
|
|
|
|
.OnComboBoxOpened(this, &FMotionControllerDetails::OnSourceMenuOpened)
|
|
|
|
|
.ButtonContent()
|
|
|
|
|
[
|
|
|
|
|
SNew(SBorder)
|
2022-05-09 13:12:28 -04:00
|
|
|
.BorderImage(FAppStyle::GetBrush("NoBorder"))
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3764848)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3640098 by Mike.Beach
Switching the MR capture processing material to use a external sampler now (since that's what media textures are marked as now).
Change 3642021 by Mike.Beach
Moving so MediaBlueprint header to Public so FMediaCaptureDevice can be used in other BP APIs (in other modules).
#jira UEVR-910
Change 3642030 by Mike.Beach
[WIP] Refactoring the MR capture component (along with the calibration level) so we can save off a reference to the video stream/format users select (adding a device selection step to calibration).
#jira UEVR-910
Change 3645768 by Mike.Beach
[WIP] Refining device selection/calibration so it reports which feeds error.
#jira UEVR-910
Change 3646047 by Mike.Beach
CIS linux fix.
Change 3646350 by Mike.Beach
[WIP] Provide an ini setting which you can explicitly prioritize a format selection for MR calibration (reflects the list in editor).
Change 3664526 by Keli.Hlodversson
#jira UE-50100
Updated library revision for GoogleVR
Unshelved from pending changelists '3646524', '3646526', '3646528'':
Change 3666500 by Keli.Hlodversson
Fix -Wreorder compiler warnings
Change 3678564 by Douglas.Copeland
Updating TM-HMDNodes LEvel BP to replace deprecated Tracking Sensor node
Change 3678919 by Mike.Beach
Extending and renaming the XRSystemAssets interface. Plus fixing a few bugs found in the SteamVR implementation.
Change 3678920 by Mike.Beach
Stubbing in Oculus support for a IXRSystemAssets implementation (currently using our own 'unofficial' models from the VREditor).
Change 3678922 by Mike.Beach
Adding XR Blueprint library functions for accessing specific device information (tracking, modeling, etc.).
Change 3678941 by Mike.Beach
CIS fixes for Dev-VR (fallout from CL 3678919)
Change 3679930 by Mike.Beach
Adding native support to MotionController components, for rendering the associated device.
Change 3681153 by Mike.Beach
Speculative fix for android CIS errors.
#jira UE-50776
Change 3697385 by Keli.Hlodversson
Fix broken OSVR build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3697516 by Keli.Hlodversson
Fix broken SimpleHMD build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3698318 by Ryan.Vance
Inverse can fail if we don't normalize the player's rotation.
Change 3698371 by Keli.Hlodversson
GoogleVR projects fail to build: GoogleVRHMD.cpp(1175,110) : error: no member named 'ES2' in 'EShadingPath'
#jira UE-51334
Change 3701479 by Mike.Beach
Adding the ability to delay motion controller tracking for MR capture views (to better sync with camera feeds).
#jira UEVR-908
Change 3703264 by Mike.Beach
CIS fixes for linux (fallout from CL 3701479).
Change 3703792 by Ryan.Vance
Disable mobile multi-view for Daydream if the gvr query for support fails.
Change 3704273 by Mike.Beach
[WIP] The MRPlugin now auto spawns a MR capture actor if you have a MR config save file.
Change 3704524 by Mike.Beach
MR Calibration - Enter key can now progress you through some of the prompts.
Change 3706679 by Mike.Beach
Fixing issue with MotionController display models where the model component wouldn't be destroyed along with the MotionControllerComponent
Change 3707538 by Mike.Beach
Hiding child actors along with the player in the MR capture.
Change 3714120 by Mike.Beach
Adding new library function to transform tracking space positions/orientations into world space. And fixing EnumerateTrackedDevices/GetDevicePose, which weren't finding the appropriate tracking system.
Change 3716143 by Mike.Beach
Speculative fix for XboxOne CIS issues.
Change 3719006 by Mike.Beach
Removing some debug log spam that I accidently left in CL 3714120.
Change 3719774 by Mike.Beach
Adding a scoped event name for the rift eye padding draw (so it shows up named in captures like from RenderDoc).
Change 3719778 by Mike.Beach
Mirroring CL 3671849 from 4.18.
Removing Oculus call to reset tracking origin on initialization (so we respect the play space that was calibrated in oculus setup) - ensuring parity w/ Vive (fixing regression).
#jira UE-48260
Change 3736279 by Jeff.Fisher
Touching a couple files to see if it helps the build machine by making it sync them again.
Change 3736296 by Jeff.Fisher
Touching another file to kick the build machine into syncing it.
Change 3740060 by Ryan.Vance
Removing PostInitViewFamily_RenderThread and PostInitView_RenderThread view extension callbacks.
Change 3744913 by Mike.Beach
Fixing up the MotionDelayBuffer for MixedReality
- CIS fix when building for XboxOne
- Now works if late updating is disabled
- Switched to setting delay in millisecs and interpolating between samples
- Better handling for thread managment (was getting out of sync when focus was lost, etc.)
- Decoupled more from MotionControllerComponents (now polls separately, and uses its own LateUpdateManager to cache/apply)
#jira UEVR-908
Change 3747168 by Jeff.Fisher
UEVR-1018 MotionControllerComponent cleanup should be in beginDestroy, not Destructor
-Moved ViewExtension cleanup to BeginDestory from destructor.
-https://udn.unrealengine.com/questions/395504/strange-crash-in-umotioncontrollercomponent.html
#review-3724080
#jira UEVR-1018
Change 3753326 by Douglas.Copeland
Resaving qagame content to resolve Empty Engine Version Warning
Change 3753336 by Douglas.Copeland
Resolving more empty engine version content issues
Change 3754252 by Mike.Beach
Mirroring CL 3723722 from 4.18.1
Hotfix update from Oculus.
- Introduce dash support by adding an Oculus config setting (that is off by default)
- Move submission of the near plane╞s depth from a fixed one at texture allocation time to an every-frame one, which is needed for correct depth support in games that have a ⌠god mode÷ with a smaller worldtometersscale
#jira UE-51728
Change 3754262 by Mike.Beach
Mirroring 3726121 from 4.18.1
Correcting a cpu perf regression from 4.17 - no longer calling FOculusHMDModule::Get() in what should be a cheap query function.
#jira UE-51766
Change 3754278 by Mike.Beach
Mirroring CL 3741384 from 4.18.1
Fix from Oculus for GearVR crashing/freezing when quit menu is invoked - making sure JNI is attached to the render thread (after losing focus).
#jira UE-52098
Change 3754300 by Mike.Beach
Mirroring CL 3742608 from 4.18.1
Fix from Oculus - improving perf on GearVR; keeping the window surface from scaling up to a size not required for Gear.
#jira UE-52127
Change 3754319 by Mike.Beach
Build fix - fallout from blindly adopting CL 3726121 from 4.18.1 w/out fixup (CL 3754262)
Change 3755546 by Keli.Hlodversson
Marking a zombie header file for delete. Seems to get resurrected from the dead on every merge from main.
File is no longer relevant as the OculusAudio plugin has been moved to the Plugins/Runtime/Oculus parent directory.
Change 3759716 by Mike.Beach
Adopted chenges from Oculus (SI1.20)
Manually modified files:
- DefaultXRCamera.cpp
Rejected changes:
- SceneRenderTargets.cpp
#jira UE-50855, UE-50883, UE-50950, UE-50974, UE-52427
Change 3760918 by Keli.Hlodversson
Disable an ensure that had some false positives during the first few frames.
#jira UE-52448
Change 3760946 by Keli.Hlodversson
Missing SteamVR changes after deprecating RefreshPoses()
#jira UEVR-1037
Change 3762015 by Mike.Beach
CIS fix for android - fallout from Oculus 1.20 changes. Lib function was removed, with calls remaining on android (double checking with Oculus that this is the proper fix).
Change 3762236 by Ryan.Vance
Fixing up integration issues.
Change 3763437 by Keli.Hlodversson
Fix deprecation warning in SimpleHMD caused by removing RefreshPoses()
Change 3764713 by Ryan.Vance
#jira UE-52516
PSVR screen percentage was being disabled by default stereo layers on accident.
Change 3652413 by Mike.Beach
In editor, only utilizing the HMD orientation when we're in a VR related mode (VR preview, VR editor, etc.). Not normalizing view pitch rotation unless we're in one of those modes.
#jira UE-46724
Change 3690170 by Keli.Hlodversson
Postprocessing now uses only the HMDDistortion flag to see whether a postprocessing pass is required for the current plugin instead of the older clutch that checks the plugin HMD type
Added EShaderPath argument to GetHMDDistorionEnabled method so that the edge cases solved by the postprocessor and HMD type now can be handled by the plugins themselves.
#jira UEVR-996
Change 3690625 by Keli.Hlodversson
Remove IHeadMountedDisplay::GetHMDDeviceType() as it was added as a part of a clutch in postprocessing, but was later getting misused as a poor man's RTI even though a better alternative in IXRTrackingSystem::GetSystemName is already available.
#jira UEVR-996
Change 3760773 by Keli.Hlodversson
Update interfaces related to late update and begin rendering:
* Deprecate RefreshPoses
Note: Existing and non-empty RefreshPoses implementations have been made private and non-virtual, and renamed to UpdatePoses in order not to conflict with the still-existing deprecated method in the base interface.
* Rename BeginRendering_GameThread/RenderThread to OnBeginRendering_* and move them to IXRTrackingSystem instead of IHeadMountedDisplay.
* Add bool DoesSupportLateUpdate() const to IXRTrackingSystem. IXRCamera implementations can use the method to see whether the underlying tracking system implementation supports late update. Note it is up to the IXRTrackingSystem implementations inside each plugin to actually make sure poses are updated somewhere before the late update is applied by the IXRCamera. (eg. in OnBeginRendering_RenderThread or ..._GameThread)
* Move call to OnBeginRedering_RenderThread to happen before GetCurrentPose in FXRDefaultCamera so the plugin has a chance to refresh the poses inside its implementation of it.
* Add IXRTrackingSystem::OnLateUpdateApplied_RenderThread, a method for notifying the tracking system that late update has been applied, passing in the current relative pose. Used by FXRTrackingSystemBase to pass the updated transform to the stereo layers implementation.
#jira UEVR-1037
Change 3761781 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Manually resolved files:
- OculusHMD.cpp
- OculusHMD_Settings.h/cpp
- SteamVRHMD.cpp
- PostProcessing.cpp
- OrionGame/Plugins/.../OnlineSessionInterface.h/cpp
[CL 3766571 by Mike Beach in Main branch]
2017-11-20 12:50:04 -05:00
|
|
|
.Padding(FMargin(0, 0, 5, 0))
|
|
|
|
|
[
|
|
|
|
|
SNew(SEditableTextBox)
|
|
|
|
|
.Text(this, &FMotionControllerDetails::OnGetSelectedSourceText)
|
|
|
|
|
.OnTextCommitted(this, &FMotionControllerDetails::OnSourceNameCommited)
|
|
|
|
|
.ToolTipText(ToolTip)
|
|
|
|
|
.SelectAllTextWhenFocused(true)
|
|
|
|
|
.RevertTextOnEscape(true)
|
|
|
|
|
.Font(IDetailLayoutBuilder::GetDetailFont())
|
|
|
|
|
]
|
|
|
|
|
]
|
|
|
|
|
.MenuContent()
|
|
|
|
|
[
|
|
|
|
|
SNew(SVerticalBox)
|
|
|
|
|
+SVerticalBox::Slot()
|
|
|
|
|
.AutoHeight()
|
|
|
|
|
.MaxHeight(400.0f)
|
|
|
|
|
[
|
|
|
|
|
SNew(SListView< TSharedPtr<FName> >)
|
|
|
|
|
.ListItemsSource(&XRSourceNames)
|
|
|
|
|
.OnGenerateRow(this, &FMotionControllerDetails::MakeSourceSelectionWidget)
|
|
|
|
|
.OnSelectionChanged(this, &FMotionControllerDetails::OnSourceSelectionChanged)
|
|
|
|
|
]
|
|
|
|
|
]
|
|
|
|
|
];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::OnResetSourceValue(TSharedPtr<IPropertyHandle> /*PropertyHandle*/)
|
|
|
|
|
{
|
|
|
|
|
TSharedPtr<FName> DefaultOption;
|
|
|
|
|
if (XRSourceNames.Num() > 0)
|
|
|
|
|
{
|
|
|
|
|
DefaultOption = XRSourceNames[0];
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
DefaultOption = MakeShareable(new FName());
|
|
|
|
|
XRSourceNames.Add(DefaultOption);
|
|
|
|
|
}
|
|
|
|
|
UpdateSourceSelection(DefaultOption);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool FMotionControllerDetails::IsSourceValueModified(TSharedPtr<IPropertyHandle> PropertyHandle)
|
|
|
|
|
{
|
|
|
|
|
FName CurrentValue;
|
|
|
|
|
PropertyHandle->GetValue(CurrentValue);
|
|
|
|
|
|
|
|
|
|
return !CurrentValue.IsNone();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::OnSourceMenuOpened()
|
|
|
|
|
{
|
|
|
|
|
RefreshXRSourceList();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FText FMotionControllerDetails::OnGetSelectedSourceText() const
|
|
|
|
|
{
|
|
|
|
|
FText DisplayText = LOCTEXT("DefaultModelSrc", "Default");
|
|
|
|
|
if (XRSourceProperty.IsValid())
|
|
|
|
|
{
|
|
|
|
|
FName PropertyValue;
|
|
|
|
|
XRSourceProperty->GetValue(PropertyValue);
|
|
|
|
|
|
|
|
|
|
if (PropertyValue == UMotionControllerComponent::CustomModelSourceId)
|
|
|
|
|
{
|
|
|
|
|
DisplayText = LOCTEXT("CustomModelSrc", "Custom...");
|
|
|
|
|
}
|
|
|
|
|
else if (!PropertyValue.IsNone())
|
|
|
|
|
{
|
|
|
|
|
DisplayText = FText::FromName(PropertyValue);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return DisplayText;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::OnSourceNameCommited(const FText& NewText, ETextCommit::Type InTextCommit)
|
|
|
|
|
{
|
|
|
|
|
if (InTextCommit == ETextCommit::OnEnter || InTextCommit == ETextCommit::OnUserMovedFocus)
|
|
|
|
|
{
|
|
|
|
|
const FName NewName = *NewText.ToString();
|
|
|
|
|
RefreshXRSourceList();
|
|
|
|
|
|
|
|
|
|
if (NewText.IsEmpty())
|
|
|
|
|
{
|
|
|
|
|
UpdateSourceSelection(XRSourceNames[0]);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else if (NewName == UMotionControllerComponent::CustomModelSourceId)
|
|
|
|
|
{
|
|
|
|
|
UpdateSourceSelection(XRSourceNames.Last());
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TSharedPtr<FName> SelectedName;
|
|
|
|
|
for (const TSharedPtr<FName>& SystemName : XRSourceNames)
|
|
|
|
|
{
|
|
|
|
|
if (*SystemName == NewName)
|
|
|
|
|
{
|
|
|
|
|
SelectedName = SystemName;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!SelectedName.IsValid())
|
|
|
|
|
{
|
|
|
|
|
SelectedName = MakeShareable(new FName(NewName));
|
|
|
|
|
}
|
|
|
|
|
UpdateSourceSelection(SelectedName);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TSharedRef<ITableRow> FMotionControllerDetails::MakeSourceSelectionWidget(TSharedPtr<FName> Item, const TSharedRef<STableViewBase>& OwnerTable)
|
|
|
|
|
{
|
|
|
|
|
FText DisplayText;
|
|
|
|
|
if (Item.IsValid() && !Item->IsNone())
|
|
|
|
|
{
|
|
|
|
|
DisplayText = FText::FromName(*Item);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return SNew(STableRow<TSharedPtr<FString>>, OwnerTable)
|
|
|
|
|
[
|
|
|
|
|
SNew(STextBlock)
|
|
|
|
|
.Text(DisplayText)
|
|
|
|
|
];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::OnSourceSelectionChanged(TSharedPtr<FName> NewSelection, ESelectInfo::Type /*SelectInfo*/)
|
|
|
|
|
{
|
|
|
|
|
UpdateSourceSelection(NewSelection);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FMotionControllerDetails::CustomizeCustomMeshRow(IDetailPropertyRow& PropertyRow)
|
|
|
|
|
{
|
|
|
|
|
if (!UseCustomMeshAttr.IsBound())
|
|
|
|
|
{
|
|
|
|
|
UseCustomMeshAttr.Bind(this, &FMotionControllerDetails::IsCustomMeshPropertyEnabled);
|
|
|
|
|
}
|
|
|
|
|
PropertyRow.EditCondition(UseCustomMeshAttr, nullptr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool FMotionControllerDetails::IsCustomMeshPropertyEnabled() const
|
|
|
|
|
{
|
|
|
|
|
FName SourceSetting;
|
|
|
|
|
if (XRSourceProperty.IsValid())
|
|
|
|
|
{
|
|
|
|
|
XRSourceProperty->GetValue(SourceSetting);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool bDisplayModelChecked = false;
|
|
|
|
|
if (DisplayModelProperty.IsValid())
|
|
|
|
|
{
|
|
|
|
|
DisplayModelProperty->GetValue(bDisplayModelChecked);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return bDisplayModelChecked && (SourceSetting == UMotionControllerComponent::CustomModelSourceId);
|
|
|
|
|
}
|
|
|
|
|
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3794640)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3767306 by Mike.Beach
Adopting a set of video capture fixes from Darren Pegg:
"Windows 7 : fix capture problems by reinitializing tracks, only active on windows < 8.0."
+ mirroring CL 3741444 ("Add windows 10 support to the application manifest"), which was needed for this
#jira UE-49870, UE-50217, UE-50227, UE-50224
Change 3767317 by Mike.Beach
[MR] Fixing up the mixed reality framework's async BP nodes (handling MediaPlayer assets set to not play-on-open - preventing a crash and keeping the stream playing), so they work with the changes to the WMF media player introduced in CL 3767306.
#jira UEVR-910
Change 3767484 by Mike.Beach
Correcting user facing messages/tooltips to use the proper trademarked "Gear VR" name (not "GearVR" without a space).
Change 3767489 by Mike.Beach
Correcting source comment to use the proper trademarked "Gear VR" name (not "GearVR" without a space).
Change 3768155 by Ryan.Vance
#jira UE-52089
Fixing cardboard only rendering in one eye.
Change 3769011 by Douglas.Copeland
Removing Clipping Planes from TM-HMDNodes (Level and LevelBP. Feature removed). Rebuilding Map.
Change 3769195 by Douglas.Copeland
Removing AA PostProcessing Volumes in TM-VRSmoke. AA does not change via PP Volumes since 4.14
Change 3769256 by Douglas.Copeland
Removing TM-VRLandscapeFoliage Map. Never used in suite/bloat.
Change 3769453 by Douglas.Copeland
Resaving content to resolve engine content warning
Change 3771076 by Keli.Hlodversson
Add missing const to a ref parameter.
Change 3771141 by Keli.Hlodversson
Fix world locked stereo layer positions on SteamVR when there is a camera component representing the HMD.
#jira UE-52353
Change 3771602 by Mike.Beach
Replacing temp Rift controller models with official ones from Oculus.
#jira UEVR-830
Change 3774877 by Mike.Beach
Refining MR calibration (WIP)...
- New alignment process [WIP]
- More modular calibration steps (for easier refactoring)
- Stubbed in phase for lens calibration
- Centralized interface for debug (dev) settings
Change 3774880 by Mike.Beach
Adopted changes from Oculus (SI1.21); stubbing in functionality for:
- Lens matched shading
- Dynamic screen refresh rate switching
- Added BP API calls: GetGPUUtilization, GetTiledMultiresLevel , SetTiledMultiresLevel, GetDeviceName, GetAvailableDisplayFrequencies, GetCurrentDisplayFrequency, SetDisplayFrequency
Change 3774922 by Mike.Beach
Attempting CIS fix.
Change 3774972 by Mike.Beach
Making it so you can override the material on model components from the various XR systems (via MotionController component).
Change 3774974 by Mike.Beach
Missing assets from CL 3774877.
Change 3775128 by Nick.Atamas
Merging //UE4/Partner-Google-VR @ CL 3770408 to Dev-VR (//UE4/Dev-VR)
Change 3776135 by Mike.Beach
MR [WIP] - Updating the calibration save process .
- Now save after each calibration step
- Stubbed in save data for lens distortion
- Track progress and load you to the first incomplete calibration step
Change 3777110 by Mike.Beach
[WIP] MR - Adding ability to easily mirror monitor screen.
Change 3777146 by Mike.Beach
Removing superflous ensure that some of us were hitting.
Change 3777417 by Mike.Beach
[WIP] MR - Fixing alignment adjustment controls to match mirrored monitor.
Change 3777436 by Nick.Atamas
Initial check in of AugmentedReality module and ARKit support for it.
Also adding QAARApp to test the use of these systems.
Change 3778009 by Nick.Atamas
Missing file
Change 3778067 by Nick.Atamas
Fixing CIS
Change 3778155 by Nick.Atamas
Spot merging CL 3777463 //UE4/Partner-Google-VR to //UE4/Dev-VR
Change 3778209 by Nick.Atamas
More CIS fixing.
Change 3778821 by Mike.Beach
[WIP] MR - Moving the alignment point system to pull from an easily modifiable DataTable (so we can change easily).
Change 3779431 by Joe.Graf
Merging using //UE4/Dev-Editor/_to_//UE4/Dev-VR/
Change 3780822 by Keli.Hlodversson
Adding OpenCV binaries plus build script to automatically fetch and rebuild it
#jira UE-52725
Change 3781037 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781046 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781049 by Joe.Graf
Merging hlslcc changes using //UE4/Dev-Rendering/__to__//UE4/Dev-VR/
Change 3781129 by Joe.Graf
Fixed the warning generated by OpenCV.Build.cs
Change 3783476 by Mike.Beach
Attempt at fixing Win32 CIS errors.
Change 3783845 by Martin.Wilson
Allow deprecated properties to still be accessed in blueprints so long as they have Blueprint Getters and Setters. Allows us to have a clean deprecation path for blueprint accessed properties
Change 3784397 by Jeff.Fisher
UE-51390 GitHub 4141 : Allow VR plugins to have multiple viewports and rotated eye orientations
PR #4141: Allow VR plugins to have multiple viewports and rotated eye orientations (Contributed by AustinPuk-Conffx)
-This loosens some assumptions in the api about how many stereo render passes there are to allow plugins to implement more than we currently use for any of our plugins.
-It also starts to replace some comparison test logic with the stereo pass enum values with IStereoRendering helper functions, do avoid duplicating the expressions all over.
#jira UE-51390
#review-3779148
Change 3784545 by Jeff.Fisher
Build fix for cl 3784397, made a local variable name unique.
Change 3784553 by Chance.Ivey
Stubbing Mobile AR Template files. Needs logic, icons and copy.
Change 3784570 by Jeff.Fisher
fix for cl 3784397
-Reverted monoscopicfarfield default change, accidentaly submit
Change 3785134 by Mike.Beach
[WIP] MR - Correcting some of the alignment algorithms & adding a preview key for the new alignment.
Change 3787180 by Mike.Beach
Fixing up CIS
#jira UE-52998, UE-52996
Change 3787272 by Mike.Beach
Adopted changes from the anim team - Followup to CL 3787240.
The LiveLink framework is now implementing the new IMotionController interface, and supplying tracking+ data through the engine's MotionController components.
#jira UE-52783
Change 3787454 by Jeff.Fisher
Adding brackets after if as specific in code review.
Change 3787591 by Keli.Hlodversson
Add tps files for OpenCV
Change 3788478 by Mike.Beach
Switching over the MR calibration process to use the new MotionController source ID (rather than the deprecated Hand enum). Also, adding device attachment selection to the first calibration step and switching it to use the new modular interface system.
#jira UEVR-1042, UEVR-1045, UEVR-1046
Change 3789836 by Jeff.Fisher
UE-53069 Editor crashes on open without SteamVR attached
-needed to check we are in stereo and device exists.
-Note just having the morpheus plugin enabled creates a device, so you need to have that disabled to reproduce this bug
#jira UE-53069
Change 3789841 by Mike.Beach
CIS fix - fallout from CL 3787272.
Change 3790102 by Jeff.Fisher
UE-53079 Packaging for android results in a critical error referencing global shader FHdrCustomResolveFMask4xPS
-Android shader compiler is a bit pickier on parameter matching, fixed the parameter.
#jira UE-53079
Change 3790174 by Jeff.Fisher
UE-53084 Mac editor crashes on open, Failed to compile global shader FWideCustomResolve8_2x_truePS
-Another shader parameter match.
#jira UE-53084
Change 3791727 by Mike.Beach
Fallout from CL 3787272 - missed use of now deprecated Hand property on MotionController components.
#jira UE-53080
Change 3766717 by Mike.Beach
Adding a TrackingToWorld transform to IXRTrackingSystem - default impl updates the cached transform once per frame (at the begining) and determines it from the project's camera setup (making the assumption the camera's root is the XR origin).
Change 3771327 by Ryan.Vance
#jira UE-52513
Fixing console rendering. The ortho projections were taking screen percentage of the panel into account for size instead of pixeldensity * ideal size.
Change 3773348 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Change 3787240 by Mike.Beach
Adopting IMotionController changes from anim team (in support of LiveLink)...
- MotionControllerComponent EControllerHand Hand is deprecated, replaced by FName MotionSource
- Blueprint get set nodes for the Hand property will still function but will warn as deprecated, this is achieved via using deprecated BlueprintGetter and BlueprintSetter on the property (plus a change to UHT to allow that to compile)
- MotionSource Setter node has pin customization to show choice box instead of standard FName text box.
- New base class for motion controllers XRMotionControllerBase.h/cpp
- Provides default implementations for new functions (Enumerate Source, Custom Parameter etc)
- Provides wrapper functions that take EControllerHand so that the controllers themselves dont have to change.
- Motion Source custom choice box. Polls MotionControllers for sources via EnumerateSources interface. Also allows custom text type in. Is Exposed to details panel and setter pin (as above).
- Added a Dev-VR custom version for reading the Hand property and moving it to MotionSource
#jira UE-52783
Change 3787975 by Ryan.Vance
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
[CL 3794679 by Mike Beach in Main branch]
2017-12-07 13:42:10 -05:00
|
|
|
void FMotionControllerDetails::OnMotionSourceChanged(FName NewMotionSource)
|
|
|
|
|
{
|
|
|
|
|
MotionSourceProperty->SetValue(NewMotionSource);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FText FMotionControllerDetails::GetMotionSourceValueText() const
|
|
|
|
|
{
|
|
|
|
|
FName MotionSource;
|
|
|
|
|
MotionSourceProperty->GetValue(MotionSource);
|
|
|
|
|
return FText::FromName(MotionSource);
|
|
|
|
|
}
|
|
|
|
|
|
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 3764848)
#lockdown Nick.Penwarden
#rb no.one
============================
MAJOR FEATURES & CHANGES
============================
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 3640098 by Mike.Beach
Switching the MR capture processing material to use a external sampler now (since that's what media textures are marked as now).
Change 3642021 by Mike.Beach
Moving so MediaBlueprint header to Public so FMediaCaptureDevice can be used in other BP APIs (in other modules).
#jira UEVR-910
Change 3642030 by Mike.Beach
[WIP] Refactoring the MR capture component (along with the calibration level) so we can save off a reference to the video stream/format users select (adding a device selection step to calibration).
#jira UEVR-910
Change 3645768 by Mike.Beach
[WIP] Refining device selection/calibration so it reports which feeds error.
#jira UEVR-910
Change 3646047 by Mike.Beach
CIS linux fix.
Change 3646350 by Mike.Beach
[WIP] Provide an ini setting which you can explicitly prioritize a format selection for MR calibration (reflects the list in editor).
Change 3664526 by Keli.Hlodversson
#jira UE-50100
Updated library revision for GoogleVR
Unshelved from pending changelists '3646524', '3646526', '3646528'':
Change 3666500 by Keli.Hlodversson
Fix -Wreorder compiler warnings
Change 3678564 by Douglas.Copeland
Updating TM-HMDNodes LEvel BP to replace deprecated Tracking Sensor node
Change 3678919 by Mike.Beach
Extending and renaming the XRSystemAssets interface. Plus fixing a few bugs found in the SteamVR implementation.
Change 3678920 by Mike.Beach
Stubbing in Oculus support for a IXRSystemAssets implementation (currently using our own 'unofficial' models from the VREditor).
Change 3678922 by Mike.Beach
Adding XR Blueprint library functions for accessing specific device information (tracking, modeling, etc.).
Change 3678941 by Mike.Beach
CIS fixes for Dev-VR (fallout from CL 3678919)
Change 3679930 by Mike.Beach
Adding native support to MotionController components, for rendering the associated device.
Change 3681153 by Mike.Beach
Speculative fix for android CIS errors.
#jira UE-50776
Change 3697385 by Keli.Hlodversson
Fix broken OSVR build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3697516 by Keli.Hlodversson
Fix broken SimpleHMD build after removing IHeadMountedDisplay::GetHMDDeviceType()
Change 3698318 by Ryan.Vance
Inverse can fail if we don't normalize the player's rotation.
Change 3698371 by Keli.Hlodversson
GoogleVR projects fail to build: GoogleVRHMD.cpp(1175,110) : error: no member named 'ES2' in 'EShadingPath'
#jira UE-51334
Change 3701479 by Mike.Beach
Adding the ability to delay motion controller tracking for MR capture views (to better sync with camera feeds).
#jira UEVR-908
Change 3703264 by Mike.Beach
CIS fixes for linux (fallout from CL 3701479).
Change 3703792 by Ryan.Vance
Disable mobile multi-view for Daydream if the gvr query for support fails.
Change 3704273 by Mike.Beach
[WIP] The MRPlugin now auto spawns a MR capture actor if you have a MR config save file.
Change 3704524 by Mike.Beach
MR Calibration - Enter key can now progress you through some of the prompts.
Change 3706679 by Mike.Beach
Fixing issue with MotionController display models where the model component wouldn't be destroyed along with the MotionControllerComponent
Change 3707538 by Mike.Beach
Hiding child actors along with the player in the MR capture.
Change 3714120 by Mike.Beach
Adding new library function to transform tracking space positions/orientations into world space. And fixing EnumerateTrackedDevices/GetDevicePose, which weren't finding the appropriate tracking system.
Change 3716143 by Mike.Beach
Speculative fix for XboxOne CIS issues.
Change 3719006 by Mike.Beach
Removing some debug log spam that I accidently left in CL 3714120.
Change 3719774 by Mike.Beach
Adding a scoped event name for the rift eye padding draw (so it shows up named in captures like from RenderDoc).
Change 3719778 by Mike.Beach
Mirroring CL 3671849 from 4.18.
Removing Oculus call to reset tracking origin on initialization (so we respect the play space that was calibrated in oculus setup) - ensuring parity w/ Vive (fixing regression).
#jira UE-48260
Change 3736279 by Jeff.Fisher
Touching a couple files to see if it helps the build machine by making it sync them again.
Change 3736296 by Jeff.Fisher
Touching another file to kick the build machine into syncing it.
Change 3740060 by Ryan.Vance
Removing PostInitViewFamily_RenderThread and PostInitView_RenderThread view extension callbacks.
Change 3744913 by Mike.Beach
Fixing up the MotionDelayBuffer for MixedReality
- CIS fix when building for XboxOne
- Now works if late updating is disabled
- Switched to setting delay in millisecs and interpolating between samples
- Better handling for thread managment (was getting out of sync when focus was lost, etc.)
- Decoupled more from MotionControllerComponents (now polls separately, and uses its own LateUpdateManager to cache/apply)
#jira UEVR-908
Change 3747168 by Jeff.Fisher
UEVR-1018 MotionControllerComponent cleanup should be in beginDestroy, not Destructor
-Moved ViewExtension cleanup to BeginDestory from destructor.
-https://udn.unrealengine.com/questions/395504/strange-crash-in-umotioncontrollercomponent.html
#review-3724080
#jira UEVR-1018
Change 3753326 by Douglas.Copeland
Resaving qagame content to resolve Empty Engine Version Warning
Change 3753336 by Douglas.Copeland
Resolving more empty engine version content issues
Change 3754252 by Mike.Beach
Mirroring CL 3723722 from 4.18.1
Hotfix update from Oculus.
- Introduce dash support by adding an Oculus config setting (that is off by default)
- Move submission of the near plane╞s depth from a fixed one at texture allocation time to an every-frame one, which is needed for correct depth support in games that have a ⌠god mode÷ with a smaller worldtometersscale
#jira UE-51728
Change 3754262 by Mike.Beach
Mirroring 3726121 from 4.18.1
Correcting a cpu perf regression from 4.17 - no longer calling FOculusHMDModule::Get() in what should be a cheap query function.
#jira UE-51766
Change 3754278 by Mike.Beach
Mirroring CL 3741384 from 4.18.1
Fix from Oculus for GearVR crashing/freezing when quit menu is invoked - making sure JNI is attached to the render thread (after losing focus).
#jira UE-52098
Change 3754300 by Mike.Beach
Mirroring CL 3742608 from 4.18.1
Fix from Oculus - improving perf on GearVR; keeping the window surface from scaling up to a size not required for Gear.
#jira UE-52127
Change 3754319 by Mike.Beach
Build fix - fallout from blindly adopting CL 3726121 from 4.18.1 w/out fixup (CL 3754262)
Change 3755546 by Keli.Hlodversson
Marking a zombie header file for delete. Seems to get resurrected from the dead on every merge from main.
File is no longer relevant as the OculusAudio plugin has been moved to the Plugins/Runtime/Oculus parent directory.
Change 3759716 by Mike.Beach
Adopted chenges from Oculus (SI1.20)
Manually modified files:
- DefaultXRCamera.cpp
Rejected changes:
- SceneRenderTargets.cpp
#jira UE-50855, UE-50883, UE-50950, UE-50974, UE-52427
Change 3760918 by Keli.Hlodversson
Disable an ensure that had some false positives during the first few frames.
#jira UE-52448
Change 3760946 by Keli.Hlodversson
Missing SteamVR changes after deprecating RefreshPoses()
#jira UEVR-1037
Change 3762015 by Mike.Beach
CIS fix for android - fallout from Oculus 1.20 changes. Lib function was removed, with calls remaining on android (double checking with Oculus that this is the proper fix).
Change 3762236 by Ryan.Vance
Fixing up integration issues.
Change 3763437 by Keli.Hlodversson
Fix deprecation warning in SimpleHMD caused by removing RefreshPoses()
Change 3764713 by Ryan.Vance
#jira UE-52516
PSVR screen percentage was being disabled by default stereo layers on accident.
Change 3652413 by Mike.Beach
In editor, only utilizing the HMD orientation when we're in a VR related mode (VR preview, VR editor, etc.). Not normalizing view pitch rotation unless we're in one of those modes.
#jira UE-46724
Change 3690170 by Keli.Hlodversson
Postprocessing now uses only the HMDDistortion flag to see whether a postprocessing pass is required for the current plugin instead of the older clutch that checks the plugin HMD type
Added EShaderPath argument to GetHMDDistorionEnabled method so that the edge cases solved by the postprocessor and HMD type now can be handled by the plugins themselves.
#jira UEVR-996
Change 3690625 by Keli.Hlodversson
Remove IHeadMountedDisplay::GetHMDDeviceType() as it was added as a part of a clutch in postprocessing, but was later getting misused as a poor man's RTI even though a better alternative in IXRTrackingSystem::GetSystemName is already available.
#jira UEVR-996
Change 3760773 by Keli.Hlodversson
Update interfaces related to late update and begin rendering:
* Deprecate RefreshPoses
Note: Existing and non-empty RefreshPoses implementations have been made private and non-virtual, and renamed to UpdatePoses in order not to conflict with the still-existing deprecated method in the base interface.
* Rename BeginRendering_GameThread/RenderThread to OnBeginRendering_* and move them to IXRTrackingSystem instead of IHeadMountedDisplay.
* Add bool DoesSupportLateUpdate() const to IXRTrackingSystem. IXRCamera implementations can use the method to see whether the underlying tracking system implementation supports late update. Note it is up to the IXRTrackingSystem implementations inside each plugin to actually make sure poses are updated somewhere before the late update is applied by the IXRCamera. (eg. in OnBeginRendering_RenderThread or ..._GameThread)
* Move call to OnBeginRedering_RenderThread to happen before GetCurrentPose in FXRDefaultCamera so the plugin has a chance to refresh the poses inside its implementation of it.
* Add IXRTrackingSystem::OnLateUpdateApplied_RenderThread, a method for notifying the tracking system that late update has been applied, passing in the current relative pose. Used by FXRTrackingSystemBase to pass the updated transform to the stereo layers implementation.
#jira UEVR-1037
Change 3761781 by Mike.Beach
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
Manually resolved files:
- OculusHMD.cpp
- OculusHMD_Settings.h/cpp
- SteamVRHMD.cpp
- PostProcessing.cpp
- OrionGame/Plugins/.../OnlineSessionInterface.h/cpp
[CL 3766571 by Mike Beach in Main branch]
2017-11-20 12:50:04 -05:00
|
|
|
#undef LOCTEXT_NAMESPACE
|