Commit Graph

52 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
Zousar Shaker
77d13185b7 Copying //UE5/Dev-Cooker@14539516 to Main (//UE5/Main)
[CL 14539954 by Zousar Shaker in ue5-main branch]
2020-10-21 17:56:05 -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
Ola Olsson
ce3e9181a7 Fix ES editor preview
* Rename IsNaniteEnabled to UseNanite and moved to RenderUtils (so it can be used in Components)
* Make proxy creation respect Scene platform level & consistent with renderer using UseNanite function
* Move DoesPlatformSupportNanite to RenderUtils (so it can be used in UseNanite)
* Fix crash in FMobileSceneRenderer::RenderHitProxies from dummy Nanite raster results
* Make ShadowSetup respect UseNanite to avoid creating virtual shadow maps when these are not supported

#rb rune.stubbe
#fyi brian.karis,graham.wihlidal,andrew.lauritzen
#robomerge Release-5.0-M2

[CL 14308401 by Ola Olsson in ue5-main branch]
2020-09-14 07:52:02 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
graham wihlidal
e7baff4df8 Guarded Nanite shader compilation, RHI init, and runtime passes with a data driven platform info bSupportsNanite / DoesPlatformSupportNanite() path, so unsupported platforms don't crash trying to run Nanite. Removed pre-existing Metal hacks in favor of new solution, and also fixed a number of issues around HZB dependencies and some other cases.
#rb rune.stubbe, brian.karis
#fyi marcus.wassmer, michal.valient, josh.adams

[CL 14117046 by graham wihlidal in ue5-main branch]
2020-08-14 16:09:16 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
graham wihlidal
6eecffcc08 Correctly support geometry collection clustering with Nanite. Also fixed proxy recreation when EnableNanite is toggled in the editor.
#rb none
#fyi benn.gallagher, michael.lentine

[CL 13912300 by graham wihlidal in ue5-main branch]
2020-07-21 15:17:07 -04:00
graham wihlidal
c7f641bd37 Enable Nanite scene proxy construction by default for Chaos geometry collections.
#rb none
#fyi benn.gallagher, michael.lentine

[CL 13882255 by graham wihlidal in ue5-main branch]
2020-07-17 04:21:22 -04:00
graham wihlidal
6e9a656633 Initial support for dynamic GPU scene transform updates for Nanite destruction simulation. Many rough edges to file down, but this is fairly promising.
#rb michael.lentine
#fyi benn.gallagher, brian.karis

[CL 13868550 by graham wihlidal in ue5-main branch]
2020-07-15 19:46:08 -04:00
graham wihlidal
be384a7ef5 Added initial custom render scene proxy for geometry collections driven by Nanite.
#rb none
#fyi michael.lentine, benn.gallagher, brian.karis

[CL 13861289 by graham wihlidal in ue5-main branch]
2020-07-15 03:39:13 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
benn gallagher
3d9038cbc9 Re-added navmesh support for geometry collections. This is a naive implementation that periodically triggers nav updates on a timer rather than knowing the state of the object. Also the navigation export will push the render triangles to the navigation system until we
#rb none
#jira
#rnx

#ROBOMERGE-SOURCE: CL 13113651 via CL 13113653 via CL 13113654
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13113657 by benn gallagher in Main branch]
2020-04-30 07:34:59 -04:00
ryan kautzman
d07137a6e8 Reconnect ether drag properties to the simulator for geometry collections. Move linear and angular ether drag properties from the GeometryCollectionComponent to UChaosPhysicalMaterial. Add static (angular) friction propterty to UChaosPhysicalMaterial.
[FYI] Benn.Gallagher, Michael.Lentine
#rb: none
#jira: none

#ROBOMERGE-OWNER: ryan.kautzman
#ROBOMERGE-AUTHOR: ryan.kautzman
#ROBOMERGE-SOURCE: CL 12915012 in //UE4/Release-4.25/... via CL 12915022 via CL 12915954
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12915962 by ryan kautzman in Main branch]
2020-04-20 04:54:20 -04:00
bill henderson
1f1daf0d64 CIS fix
#rb none
#jira nojira

#ROBOMERGE-SOURCE: CL 12720061 in //UE4/Release-4.25/... via CL 12721833 via CL 12781716
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782530 by bill henderson in Main branch]
2020-04-14 13:39:41 -04:00
bill henderson
a6609977e8 Chaos: Fixes to get event demo level working again
#rb none
#jira nojira

#ROBOMERGE-SOURCE: CL 12719657 in //UE4/Release-4.25/... via CL 12721825 via CL 12781713
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782529 by bill henderson in Main branch]
2020-04-14 13:39:39 -04:00
ori cohen
3d3769b711 IWYU changes
#rb none

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12673540 via CL 12673589 via CL 12673595 via CL 12673596
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12673600 by ori cohen in Main branch]
2020-04-08 10:59:25 -04:00
benn gallagher
d5bfd8cb7f Hooked up geometry collections to the component body instance filter data so configuring the filter in the details panel now functions correctly. Also defaulted the body instance for geometry collections into the ECC_Destructible query channel.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12553459 in //UE4/Release-4.25/... via CL 12553609 via CL 12553709
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12554106 by benn gallagher in Main branch]
2020-04-02 11:57:01 -04:00
robert manuszewski
b7568cc694 Fix for UE-90683: You can no longer delete conflicting variables
Refactored FindField into FindUField and FindFProperty to avoid confusion caused by the fact that FindField<UField> will no longer return FProperties.

#jira UE-90683
#rb Steve.Robb
#tests Basic editor functionality test, cooked and ran PC client and server, bot soak tests for two hours

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 12190998 in //UE4/Release-4.25/... via CL 12190999
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12191300 by robert manuszewski in Main branch]
2020-03-15 10:33:45 -04:00
robomerge
25ce51a063 Hooked up geometry collection to new SQ structures. GT dynamic collection now attached a TGeometryParticle array to store external geometry and transform for queries. Rotated Geometry Collection DDC key to fix previous serialization breakage.
#rb none
#jira
[FYI] Ryan.Kautzman, Brice.Criswell

#ROBOMERGE-SOURCE: CL 12063680 in //UE4/Release-4.25/... via CL 12063684
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076570 by robomerge in Main branch]
2020-03-09 13:22:54 -04:00
ryan kautzman
d64c4b88bb Fix CIS.
[FYI] Marc.Audy, Michael.Lentine
#rb: none
#jira: UE-89409

#ROBOMERGE-SOURCE: CL 12026168 in //UE4/Release-4.25/... via CL 12026175
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 12026194 by ryan kautzman in Main branch]
2020-03-06 18:17:16 -05:00
ryan kautzman
f06e7a4943 Remove the DynamicCollection from the geometry collection's FSimulationParameters. Make the GameThreadCollection on the FGeometryCollectionPhysicsProxy a reference to a collection passed to the constructor. So, the game thread dynamic collection is now owned outside of the proxy. Fixes the RigidBodies_SingleFallingUnderGravity test.
[FYI] Brice.Criswell, Michael.Lentine, Benn.Gallagher, Bill.Henderson
#rb: none
#jira: none

#ROBOMERGE-SOURCE: CL 11970038 in //UE4/Release-4.25/... via CL 11970122
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11980319 by ryan kautzman in Main branch]
2020-03-05 21:21:50 -05:00
brice criswell
165219a81a Chaos : Destruction
-Removed cross collection clustering initialization support.
#rb none
#jira nojira

#ROBOMERGE-SOURCE: CL 11847312 in //UE4/Release-4.25/... via CL 11847327
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11847338 by brice criswell in Main branch]
2020-03-02 17:05:51 -05:00
Ryan Kautzman
4e412aabdd Merge 11257801 to Release-4.25.
Get clustering building with handles - preliminary checkin.

[FYI] Michael.Lentine
#rb: none
#jira: none

#ROBOMERGE-OWNER: Ryan.Kautzman
#ROBOMERGE-AUTHOR: ryan.kautzman
#ROBOMERGE-SOURCE: CL 11555717 in //UE4/Release-4.25/... via CL 11555721
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579493 by Ryan Kautzman in Main branch]
2020-02-21 17:40:37 -05:00
devon penney
c5ffda9a7b fix render bounds for geometry collection
from //UE4/Private-Reverb
#rb none


#ROBOMERGE-SOURCE: CL 11555348 via CL 11555351
#ROBOMERGE-BOT: (v654-11333218)

[CL 11555358 by devon penney in Main branch]
2020-02-19 17:10:11 -05:00