Commit Graph

33 Commits

Author SHA1 Message Date
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
Rolando Caloca
7632478918 Merging //UE4/Main@9388041 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9389881 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-03 09:26:00 -04:00
ben marsh
9e00890197 Integrating bug fixes from the arkit stream
#rb integration
#jira 0
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 9386082 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v456-9359915)

[CL 9386095 by ben marsh in Main branch]
2019-10-02 17:32:29 -04:00
andrew grant
9555b3ce47 Header changes required for ARKit 3 support.
#jira na
#rb ryan.vance
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 8063861 in //UE4/Release-4.23/... via CL 8063864
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) (v400-8057353)

[CL 8074516 by andrew grant in Dev-VR branch]
2019-08-16 01:58:17 -04:00
andrew grant
4a0e605510 Header changes required for ARKit 3 support.
#jira na
#rb ryan.vance
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8063861 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v400-8057353)

[CL 8063864 by andrew grant in Main branch]
2019-08-15 14:34:11 -04:00
joe conley
bde259bf5d #jira UE-77069 - UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness ignored for BoundaryPolygons
UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness were ignored for BoundaryPolygons, pass them through.

#rb Jules.Blok

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 7266014 in //UE4/Release-4.23/... via CL 7266020
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) (v371-7306989)

[CL 7367917 by joe conley in Dev-VR branch]
2019-07-17 03:19:58 -04:00
joe conley
d46d4bdf01 #jira UE-77069 - UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness ignored for BoundaryPolygons
UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness were ignored for BoundaryPolygons, pass them through.

#rb Jules.Blok

#ROBOMERGE-SOURCE: CL 7266014 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7266020 by joe conley in Main branch]
2019-07-10 15:44:15 -04:00
Joe Graf
b4d851d903 Added UARTrackedQRCode to unblock Vicuna
Updated the HoloLens AR plugin to use the data from the interop to populate UARTrackedQRCode objects
Fixed some coding standard conflicts in the QRCode callbacks

MixedRealityInterop
- Updated the QR code to use the shared conversion routines
- Removed some redundant initialization

#rb: none
#fyi: chris.norden, david.hibbitts

[CL 7010557 by Joe Graf in Dev-VR branch]
2019-06-14 16:15:44 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
Jason Bestimt
7110a06cbb Integration from Dev-Microsoft-HoloLens2-Preview @ CL 6600757
#CodeReview: ryan.vance
#RB: CIS

[CL 6654056 by Jason Bestimt in Dev-VR branch]
2019-05-28 12:50:48 -04:00
Ryan Vance
d6649e31bb Updating ARCore to 1.7
#rb integration

[CL 6620572 by Ryan Vance in Dev-VR branch]
2019-05-23 15:22:07 -04:00
Joe Graf
fac0b05ba7 Additional scene understanding updates for AR
#rb: none

[CL 6607843 by Joe Graf in Dev-VR branch]
2019-05-22 13:14:38 -04:00
Joe Graf
892d7dcf7a First pass at adding some scene understanding support to our AR layer
#rb: none

[CL 6547055 by Joe Graf in Dev-VR branch]
2019-05-17 15:00:14 -04:00
Joe Graf
5ca0d012bb MERGE: Added support for an underlying mesh to be part of UARTrackedGeometry
#rb: merge

[CL 6375179 by Joe Graf in Dev-VR branch]
2019-05-08 14:52:55 -04:00
Ryan Vance
d5aa052fe5 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
#lockdown: Nick.Penwarden
#rb Integration

[CL 4824851 by Ryan Vance in Main branch]
2019-01-28 16:31:25 -05:00
Ryan Vance
7c51ff94af Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
CL 1 of 8
#rb integration

[CL 4748712 by Ryan Vance in Dev-VR branch]
2019-01-17 18:54:05 -05:00
Ryan Vance
9f94206f97 Update GoogleARCore plugin and GoogleARCoreServices plugin to ARCore 1.6 release. Full release note can be founded here: https://github.com/google-ar/arcore-unreal-sdk/releases/tag/v1.6.0
#rb integration

Added an IARSessionConfigCookSupport, which allows plugins to provide custom cooking for ARSessionConfig. ARCore uses this to generate its augmented image database file.
Updated some of the API in ARTrackedImages to better serve the ARCore useage.
Added a function to let developesr add ARCandidateImage at runtime for both ARCore and ARKit.
Enabled pixel depth offset for GL ES 3.1.
Correction for bad 1.130/4.20 merge.

[CL 4706946 by Ryan Vance in Dev-VR branch]
2019-01-10 20:34:00 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Jason Bestimt
e788227033 Conversion of ARCore and ARKit to not use FARSystemBase, allowing for other HMDs to use that functionality through composition rather than inheritance
#CodeReview: ryan.vance, joe.graf, juliet.talcott
#RB: nick.atamas

[CL 4510981 by Jason Bestimt in Dev-VR branch]
2018-10-26 07:55:40 -04:00
joe graf
ae4e9882b0 Merging using Dev-VR_to_Release-4.21
#rb: none
#jira: merge

#ROBOMERGE-SOURCE: CL 4407174 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4407177 by joe graf in Staging-4.21 branch]
2018-09-28 15:01:07 -04:00
Joe Graf
de5bb204dd Improved the detected image debug drawing code
#rb: none

[CL 4400018 by Joe Graf in Dev-VR branch]
2018-09-26 19:20:01 -04:00
Jason Bestimt
d3658c6d29 Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 4296730)
#lockdown Nick.Penwarden

============================
  MAJOR FEATURES & CHANGES
============================

Change 3775128 by Nick.Atamas

	Merging //UE4/Partner-Google-VR @ CL 3770408 to Dev-VR (//UE4/Dev-VR)

Change 4166311 by Jason.Bestimt

	#DEV-VR - Merge from //UE4/Dev-MagicLeap/... @ CL 4136411

Change 4185551 by Joe.Graf

	Added support to query and specify the desired video format for an AR session

Change 4269190 by Ethan.Geller

	[Dev-VR] #jira UE-62644 Deescalate resampling logs to display, and make sure that Lumin does not get Resampling settings from Android runtime settings.

Change 4269386 by Ryan.Vance

	#jira UE-62274

	We need to recompute the view frustum and related distances if the projection matrix is changed.

Change 4269401 by Ryan.Vance

	#jira UE-62155

	Debug canvas layer fixes

Change 4270710 by Chance.Ivey

	Merging //UE4/Dev-Partner-MagicLeap-4.20 to Dev-VR (//UE4/Dev-VR)
	 - 4262963
	 - 4261100
	 - 4261103
	 - 4265565

Change 4270822 by Ryan.Vance

	#jira UE-61462

	Work around for csm shadow culling bug on Lumiun

Change 4271396 by Jason.Bestimt

	#DEV-VR - Saving off original MLSDK variable for future editor "restarts" within the same process

	#JIRA: UE-58634

Change 4271402 by Jason.Bestimt

	#DEV-VR - Making bUseMobileRendering non-editable for binary builds

	#JIRA: UE-60956

Change 4271454 by Jason.Bestimt

	#DEV-VR - Integrating CL 4239939, 4236178 and 4269702 from Partners-Google-VR

Change 4272387 by Ryan.Vance

	#jira UEVR-1281

	Oculus 1.28 Plugin changes

Change 4273410 by Jason.Bestimt

	#DEV-VR - Fixing MagicLeapSDK Settings to be globaluserconfig (by removing the defaultconfig).

	#JIRA: UE-62092

Change 4273929 by Ryan.Vance

	#jira UE-62744

	Fixing missing includes..

Change 4274147 by Kyle.Fung

	Round-robin occlusion queries for stereoscopic rendering
	With the vr.RoundRobinOcclusion flag turned on, each frame will only render occlusion queries for one eye with an alternating scheme (ie odd frames only left eye, even frames only right eye).
	Additionally, the interface for class FPrimitiveOcclusionHistory has been changed along with a slight modification in its implementation. With round-robin occlusion, when extracing history entries we perform a search through the entire history to look for the oldest entry in a primitive's occlusion history.

	#jira UEVR-1289

Change 4274206 by Kyle.Fung

	Fixed some compiler warnings
	#jira UEVR-1289

Change 4275212 by Jason.Bestimt

	#DEV-VR - Fixing CIS error (forcing value to bool)

Change 4275973 by Jason.Bestimt

	#DEV-VR - Merging CL 4275879 from Partner-Google-VR

	GoogleVR 1.170 Release Update.
	- Removed reference to GetHMDDeviceType.
	- Updated to final version of SDK libraries.

Change 4276154 by Jason.Bestimt

	#DEV-VR - fix for CIS warning about PngPtr being used before it is checked

Change 4277171 by Jeff.Fisher

	UE-62399 Graphical corruption when opening the debug console
	-Switched from the fast hardware clear to the slower shader clear because the slower one works.  Perhaps a better fix exists that would make the faster clear work?  Costs 60us when debug ui is up, but only when rendering debug to a stereo layer (vr/ar).
	#jira UE-62399
	#review-4277026

Change 4277633 by Joe.Conley

	#jira UE-54565 - "Packaged game/Editor with Stereo Layers crashes when exiting game through steam VR overlay"

	Don't call GetStereoLayers if stereo is not enabled.

Change 4277723 by Ryan.Vance

	#jira UE-62776

	Cleaning up questionable partner code found by SA.
	I'm pretty confident the SA warning is a false positive, but there was a lot to fix here regardless.

Change 4280289 by Joe.Graf

	Added some "Ignored by ARCore" comments Google requested

Change 4280479 by Joe.Graf

	Fixed a member copy step in AppleARKitFrame::operator= that Wanghao reported

Change 4280824 by Jason.Bestimt

	#DEV-VR - removing stale comment about ML SDK Settings using defaultengine.ini

Change 4281117 by Jason.Bestimt

	#DEV-VR - Removing warnings on LUMIN from trying to load missing modules

	#JIRA: UE-62748

Change 4281514 by Jason.Bestimt

	#DEV-VR - Moving FunctionalTesting dependency under bCompileAgainstEngine

Change 4281847 by Joe.Graf

	Added a UPL file to AppleARKit that modifies the plist to include the requirement of ARKit and request for camera access

	#jira: UE-60050, UE-62837

Change 4281945 by Joe.Graf

	Removed the ensures from the ARBlueprintLibrary code since the code handles the failure cases properly

	#jira: UE-61845, UE-61846

Change 4282098 by Ethan.Geller

	#jira UE-62863 fix audio on lumin #rb none

Change 4283974 by Joe.Graf

	Deprecated bIsTracked on tracked images and face geo per Google API reunification feedback

Change 4284118 by Jason.Bestimt

	#DEV-VR - Moving FunctionalTest dependency to be both non-shipping and CompileAgainstEngine.  Allowing FunctionalTesting to be compiled in binary build

Change 4285339 by Ethan.Geller

	#jira UE-62087 Whitelist AudioCapture module for mac while not whitelisting the AudioCaptureEditor module, which should only work on Windows.

Change 4286024 by Ryan.Vance

	Copying //UE4/Partner-Microsoft-XR to Dev-VR (//UE4/Dev-VR)
	Windows mixed reality integration.
	Disabled by default

Change 4289812 by Jason.Bestimt

	#DEV-VR - Fix for non-unity build issue with windows header

Change 4296399 by Jason.Bestimt

	RSync fixes for xml files

	#JIRA: UE-62994

Change 4296679 by Jason.Bestimt

	#DEV-VR - Fixing remote iOS compile issue with BP projects that require plugins

	#JIRA: UE-62967

[CL 4299100 by Jason Bestimt in Main branch]
2018-08-17 19:56:07 -04:00
Joe Graf
8d266cd41b Deprecated bIsTracked on tracked images and face geo per Google API reunification feedback
#rb: none
#fyi: nick.whiting, jason.bestimt

[CL 4283974 by Joe Graf in Dev-VR branch]
2018-08-14 12:44:31 -04:00