Commit Graph

25 Commits

Author SHA1 Message Date
philippe deseve
ed0f48629d DataLayer API to go through DataLayerSubsystem instead of AWorlDataLayers
Move DataLayers' EditorWorldSetting logic from DataLayerEditorSubsystem & WorldDataLayers to DataLayerSubsystem
Use DataLayerInstance::GetOuterWorldDataLayers instead of retrieving the WorldDataLayers from UWorld::GetWorldDataLayers instead
Rename UDataLayerSubsystem::GetDataLayerFromAsset to GetDataLayerInstanceFromAsset to be inline with the rest of the API
Preparation for multiple AWorldDataLayers existing in the same world

#rb richard.malo
#test PIE, SIE, -game, Editing flow, cooked game, Hlods generation
#preflight 627402a0ca0ad32a968422af

#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 20060072 via CL 20060595 via CL 20060607
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20062765 by philippe deseve in ue5-main branch]
2022-05-05 15:15:33 -04:00
philippe deseve
d05121f9b1 Undo 19721428
Access to WorldSubsystems at cook time are causing crashes

#rb richard.malo
#jira UE-148953 UE-148946
#preflight 62572be3d606fd159e9e67e0

#ROBOMERGE-OWNER: zousar.shaker
#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-COMMAND: _robomerge[bot4] UE5-MAIN
#ROBOMERGE-SOURCE: CL 19745482 via CL 19747379 via CL 19747391
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19751374 by philippe deseve in ue5-main branch]
2022-04-14 00:26:55 -04:00
philippe deseve
83be8e37a1 DataLayer API to go through DataLayerSubsystem instead of AWorlDataLayers
Move DataLayers' EditorWorldSetting logic from DataLayerEditorSubsystem & WorldDataLayers to DataLayerSubsystem
Use DataLayerInstance::GetOuterWorldDataLayers instead of retrieving the WorldDataLayers from UWorld::GetWorldDataLayers instead
Rename UDataLayerSubsystem::GetDataLayerFromAsset to GetDataLayerInstanceFromAsset to be inline with the rest of the API
Preparation for multiple AWorldDataLayers existing in the same world

#rb richard.malo
#preflight 6255924fcd5ed4dd0916d8e5

#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 19721428 via CL 19721841 via CL 19722491
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19725557 by philippe deseve in ue5-main branch]
2022-04-12 14:08:25 -04:00
philippe deseve
8218e80ef1 UDataLayer deprecated in favor of UDataLayerInstance & UDataLayerAsset
UDeprecatedDataLayerInstance allows to boot level using deprecated UDataLayers
Worlds using DataLayer can run the DataLayerToAssetCommandlet to transition their existing DataLayers
FActorDataLayer interface is deprecated.
DataLayers Blueprint referencers should now use DataLayerAsset to retrieve DataLayerInstances.
DataLayer Code referencers should now use DataLayerAssets or DataLayerInstance FName to retrieve DataLayerInstances.
DataLayerLabels now only used for display/UI purpose
Relabeling DataLayers is not permitted anymore on new DataLayerInstances (allowed on UDeprecatedDataLayerInstance)
Added Changelist Validation for DataLayers
Added a column to the datalayer outliner showing any data layer errors.

#rb richard.mal jeanfrancois.dube
#preflight 623098c2050dc69468b6a297 (errors only related to lyra, which do not exist in this stream)

#ROBOMERGE-OWNER: philippe.deseve
#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 19385808 via CL 19387392
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19389077 by philippe deseve in ue5-main branch]
2022-03-15 13:52:28 -04:00
Andrew Rodham
d90e9cfbff Sequencer: Root instance handles are now type-enforced
- This prevents passing an FInstanceHandle to something that specifically wants a root instance handle.
  - FRootInstanceHandle is implicitly castable to an FInstanceHandle, but not visa-versa.

#rb Max.Chen
#jira none
#preflight 62226eac2f7d78332e198dd3

[CL 19273332 by Andrew Rodham in ue5-main branch]
2022-03-04 15:09:42 -05:00
max chen
a20dc348ee Sequencer: Pre-Animated state changes to support track instance inputs
- Track Instance Inputs can now be used as capture sources to capture pre-animated state
  - PreAnimatedState extension now simply exists as a member of UMovieSceneEntitySystem. Previously the existence of the extension was used to determine whether any pre-animated state logic was required, but in practice this created more problems than it solved and led to some convoluted lifetime management code.
  - Added a templated group manager type from which the object group manager can inherit. This simplifies the introduction of new group managers
  - Removed the requirement that all pre-animated state must exist as part of a valid group. This forced state from 'master' tracks to be arbitrarily grouped together which put an unnecessary burden on the storage classes.

#jira UE-132512
#rb max.chen, matt.hoffman
[FYI] andrew.rodham
#preflight 61f2ca893765218cf01f290e

#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 18754810 in //UE5/Release-5.0/... via CL 18754825 via CL 18757520
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18758489 by max chen in ue5-main branch]
2022-01-27 14:35:51 -05:00
aurel cordonnier
54f9a674f8 No unity fixes
#jira none
#rb trivial
#preflight 61ad3ae29c77d61007cfb850

#ROBOMERGE-AUTHOR: aurel.cordonnier
#ROBOMERGE-SOURCE: CL 18379553 in //UE5/Release-5.0/... via CL 18379555
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18379556 by aurel cordonnier in ue5-release-engine-test branch]
2021-12-05 17:40:05 -05:00
jon nabozny
4c311b3cd1 Fix some build issues from previous merge
#ROBOMERGE-OWNER: jon.nabozny
#ROBOMERGE-AUTHOR: jon.nabozny
#ROBOMERGE-SOURCE: CL 18066409 via CL 18371394 via CL 18371398
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18371408 by jon nabozny in ue5-release-engine-test branch]
2021-12-03 14:35:05 -05:00
jon nabozny
9a0f62bf5b Merge //UE5/Release-5.0 into //UE5/Private-Frosty-To-5.0-Staging
#ROBOMERGE-OWNER: jon.nabozny
#ROBOMERGE-AUTHOR: jon.nabozny
#ROBOMERGE-SOURCE: CL 18065367 via CL 18371198 via CL 18371203
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18371221 by jon nabozny in ue5-release-engine-test branch]
2021-12-03 14:24:33 -05:00
jeanfrancois dube
120a4475f5 [Backout] - CL18367907
[FYI] Patrick.Enfedaque
Original CL Desc
-----------------------------------------------------------------
Build Fix: DataLayer API changes related errors

[FYI] jeanfrancois.dube, richard.malo

#ROBOMERGE-AUTHOR: jeanfrancois.dube
#ROBOMERGE-SOURCE: CL 18369384 in //UE5/Release-5.0/... via CL 18369403
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18369419 by jeanfrancois dube in ue5-release-engine-test branch]
2021-12-03 12:42:17 -05:00
patrick enfedaque
dc8979afd2 Build Fix: DataLayer API changes related errors
[FYI] jeanfrancois.dube, richard.malo

#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 18367907 in //UE5/Release-5.0/... via CL 18367936
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18367940 by patrick enfedaque in ue5-release-engine-test branch]
2021-12-03 09:10:05 -05:00
aurel cordonnier
166b47b5b3 Sequencer: added bFlushOnUnload to data layer tracks to control if we should flush level streaming visibility when unloading a data layer to avoid GT hitches.
#rb patrick.enfedaque, andrew.rodham
#lockdown vincent.beauchemin
#preflight 6151b25d59c66a000103a8a8

#ROBOMERGE-OWNER: aurel.cordonnier
#ROBOMERGE-AUTHOR: jeanfrancois.dube
#ROBOMERGE-SOURCE: CL 17630065 via CL 17963637 via CL 18365455 via CL 18365458
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18365460 by aurel cordonnier in ue5-release-engine-test branch]
2021-12-03 00:52:30 -05:00
jon nabozny
e2bf435d34 Sequencer: Fix DataLayer preroll being cancelled out by previous shot unload track (Priority is given to Activation, then Loaded, then Unload)
#rb jeanfrancois.dube, andrew.rodham
[FYI] joji.tsuruga
#preflight 614cd4a8dd423e000134cd9c
#lockdown jeanfrancois.dube

#ROBOMERGE-OWNER: jon.nabozny
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 17612919 via CL 17963064 via CL 18365021 via CL 18365037
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18365107 by jon nabozny in ue5-release-engine-test branch]
2021-12-02 23:58:50 -05:00
jeanfrancois dube
d018a81eb5 Add Insight bookmarks to show data layers prerolls and flushes
#rb patrick.enfedaque
#lockdown vincent.beauchemin
#preflight none

#ROBOMERGE-AUTHOR: jeanfrancois.dube
#ROBOMERGE-SOURCE: CL 17611046 via CL 17962801 via CL 18364976 via CL 18365033
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18365100 by jeanfrancois dube in ue5-release-engine-test branch]
2021-12-02 23:58:22 -05:00
jeanfrancois dube
9fa9fab110 Sequencer: added debug information when flushing streaming or visibility.
#rb andrew.rodham, patrick.enfedaque, richard.malo
#lockdown jeff.farris
#preflight 614b592e59380f0001aa2307

#ROBOMERGE-AUTHOR: jeanfrancois.dube
#ROBOMERGE-SOURCE: CL 17596995 via CL 17955878 via CL 18364885 via CL 18364953
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18365011 by jeanfrancois dube in ue5-release-engine-test branch]
2021-12-02 23:53:01 -05:00
jeanfrancois dube
43b53a76da Added Insights tags to identify MovieSceneDataLayerSystem FlushStreamingFull/FlushStreamingVisibility.
#rb jeff.rarris
#lockdown jeff.rarris
#preflight none

#ROBOMERGE-AUTHOR: jeanfrancois.dube
#ROBOMERGE-SOURCE: CL 17491538 via CL 17933177 via CL 18363044 via CL 18363089
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18363111 by jeanfrancois dube in ue5-release-engine-test branch]
2021-12-02 20:49:45 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
jeanfrancois dube
5de806e695 Only include changes made by user operations to the per-user settings for data layers.
#rb vincent.beauchemin
#preflight 6113d882f19b370001e9817b

#ROBOMERGE-SOURCE: CL 17138927 via CL 17139635
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17139727 by jeanfrancois dube in ue5-release-engine-test branch]
2021-08-11 14:31:49 -04:00
max chen
0e91cf770d Sequencer: Change invalid data layer ensure to log warning since it's possible to just open a level sequence without the map.
#rb none
#preflight 61116b156c6eb00001079f9b

#ROBOMERGE-SOURCE: CL 17127442 via CL 17127456
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17127476 by max chen in ue5-release-engine-test branch]
2021-08-10 19:26:27 -04:00
patrick enfedaque
a2f3f1a3bd Sequencer Data Layer: Distinguish between full streaming flush and visibility flush to minimize blocking loads
#rb jeanfrancois.dube, richard.malo
[FYI] andrew.rodham
#preflight 610d709c4d61ce00013d1edb

#ROBOMERGE-SOURCE: CL 17086273 via CL 17095161
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v853-17066230)

[CL 17095378 by patrick enfedaque in ue5-release-engine-test branch]
2021-08-07 15:20:22 -04:00
patrick enfedaque
46e44b64b7 Sequencer: Add Query to block streaming state only when we are out of preroll
#rb andrew.rodham
#preflight 6102f1bf5b2fb80001da5beb

#ROBOMERGE-SOURCE: CL 16999387 via CL 16999397
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)

[CL 16999401 by patrick enfedaque in ue5-release-engine-test branch]
2021-07-29 14:53:00 -04:00
andrew rodham
f6e3408a3e Sequencer: Added user-defined PrerollState to data layer tracks
#rb Patrick.Enfedaque

#ROBOMERGE-SOURCE: CL 16997208 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)

[CL 16997214 by andrew rodham in ue5-release-engine-test branch]
2021-07-29 12:53:55 -04:00
andrew rodham
c63e054d26 Sequencer: Block until level streaming has been flushed after making an Activation or Unload request from a Data Layer track
#rb Matt.Hoffman
[FYI] Joji.Tsuruga

#ROBOMERGE-SOURCE: CL 16777267 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16777275 by andrew rodham in ue5-release-engine-test branch]
2021-06-24 15:33:05 -04:00
patrick enfedaque
b876645e38 Change FPreAnimatedDataLayerStorage::SavePreAnimatedStateInEditor to take loaded state in consideration when saving existing state
#rb andrew.rodham

#ROBOMERGE-SOURCE: CL 16691036 via CL 16691043
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16691045 by patrick enfedaque in ue5-release-engine-test branch]
2021-06-16 13:11:12 -04:00
andrew rodham
7de603bba9 Sequencer: Add a track for controlling data layers
- Data Layer sections can be assigned any number of data layers for World Partition worlds, and can be instructed to Load, Unload or Activate layers.
  - Pre-rolled data layer sections that are set to Activate will automatically preload data layers without making them visible

#jira UE-116691
#preflight 60c903b72da784000156f28b
#rb Ludovic.Chabant, JeanFrancois.Dube

#ROBOMERGE-SOURCE: CL 16688434 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16688449 by andrew rodham in ue5-release-engine-test branch]
2021-06-16 10:42:51 -04:00