Commit Graph

271 Commits

Author SHA1 Message Date
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
brett miller
0e905cf96e FractureTool
-- Additional Undo converage
-- Embedded geometry works with explode
-- Selectable embedded geometry

#jira UE-121974
[FYI] brice.criswell
#preflight 6135505079ce170001469648

#ROBOMERGE-AUTHOR: brett.miller
#ROBOMERGE-SOURCE: CL 17435055 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17435056 by brett miller in ue5-release-engine-test branch]
2021-09-05 20:37:59 -04:00
jimmy andrews
8630aec8da prevent rendering crash if mesh gets into a bad state where all geometry is hidden (by un-hiding everything if that case occurs)
#rnx
#preflight 613121d879ce170001d20414

#ROBOMERGE-SOURCE: CL 17412594 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17412602 by jimmy andrews in ue5-release-engine-test branch]
2021-09-02 22:24:58 -04:00
graham wihlidal
596b78798c Removed per instance Nanite imposter flag and changed code to fetch it from the primitive flags instead. Also removed partially implemented per instance cast shadow flag in favor of the correct one on primitive flags.
#rb rune.stubbe
[FYI] brian.karis
#preflight 6130430317a8610001a7d102

#ROBOMERGE-OWNER: graham.wihlidal
#ROBOMERGE-AUTHOR: graham.wihlidal
#ROBOMERGE-SOURCE: CL 17397605 via CL 17397964
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17397969 by graham wihlidal in ue5-release-engine-test branch]
2021-09-02 00:54:16 -04:00
brett miller
73c0f448a7 GeometryCollectionProximityUtility
-- New algorithm, faster, more robust

#jira UE-121975
#rb jimmy.andrews
#preflight 612efd95b6b29c0001239fa6

#ROBOMERGE-SOURCE: CL 17382962 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17382968 by brett miller in ue5-release-engine-test branch]
2021-09-01 01:43:26 -04:00
brett miller
d84b2a0e45 GeometryCollectionComponent
-- Corrected motion blur problem when cache scrubbing in StaticPose mode

[FYI] jack.oakman,brice.criswell
#preflight 612ee3586256b10001efc6c1

#ROBOMERGE-SOURCE: CL 17381861 via CL 17382101
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17382142 by brett miller in ue5-release-engine-test branch]
2021-08-31 23:27:01 -04:00
jimmy andrews
eb39f94bcf fix Explode Amount slider
Specifically, change UGeometryCollectionComponent::OnCreatePhysicsState's EnsureDataIsCooked() call to just CreateSimulationData(), so we just update the sim data without also re-loading the serialized data (which had some editor/UI specific data discarded)

#rb brett.miller
#rnx
#preflight 612ed65675bca20001e64877

#ROBOMERGE-SOURCE: CL 17381541 via CL 17381917
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17381936 by jimmy andrews in ue5-release-engine-test branch]
2021-08-31 23:01:20 -04:00
brett miller
53614dd251 GeometryCollection
-- Removal mechanism invoked when geometry collection particles have slept for specified time. Particle is disabled, event is triggered, scene proxt geometry is progressivly scaled to a point.

#jira UE-122241
#rb brice.criswell
#preflight 612ea5f775bca20001e0b1b9

#ROBOMERGE-SOURCE: CL 17380472 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17380480 by brett miller in ue5-release-engine-test branch]
2021-08-31 20:24:01 -04:00
brett miller
4025f16ed1 GeometryCollection
-- Selecting a cluster highlights all child bones

#jira UE-121972
[FYI] brice.criswell
#preflight 612c45569db30900011bec76
#p4v-cherrypick 17348626

#ROBOMERGE-SOURCE: CL 17359214 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17359234 by brett miller in ue5-release-engine-test branch]
2021-08-30 17:23:27 -04:00
brett miller
311aaa8031 FractureTool
-- Fixed dangling cluster generation in several of the tools
-- Removed Cluster slection mode
-- Added Parent, Children, AllInLevel selectin modes
-- Added ClusterMerge tool

#jira UE-121969,UE-121970,UE-121971
[FYI] brice.criswell
#preflight 612c072379d62b00013ec5ae
#p4v-cherrypick 17347984

#ROBOMERGE-SOURCE: CL 17359159 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17359170 by brett miller in ue5-release-engine-test branch]
2021-08-30 17:18:37 -04:00
brett miller
8efa2a42b0 FractureTool
-- implemented HideUnselected mode

#jira UE-121963
#rb brice.criswell
#preflight 6123317d9db7df0001e5e4ff
#p4v-cherrypick 17309979

#ROBOMERGE-SOURCE: CL 17359069 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17359084 by brett miller in ue5-release-engine-test branch]
2021-08-30 17:11:38 -04:00
jimmy andrews
ba34527071 fix undo/redo for bone selection on fracture
#rb brett.miller
#rnx
#preflight 611dc5822c1f1c0001195f7a

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

[CL 17235099 by jimmy andrews in ue5-release-engine-test branch]
2021-08-19 11:58:11 -04:00
brett miller
f6a2e03633 GeometryCollectionComponent
-- Fixed bNotifyBreaks and bNotifyCollisions

#jira UE-110033
[FYI] brice.criswell
#preflight 611c418c3a81b00001186ab8

#ROBOMERGE-SOURCE: CL 17227595 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17227598 by brett miller in ue5-release-engine-test branch]
2021-08-18 23:04:26 -04:00
jimmy andrews
cdb830fb63 Minor geometry collection-related code cleanup
#rnx
#preflight 6115e85bb2dc4b0001996f0d

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

[CL 17227509 by jimmy andrews in ue5-release-engine-test branch]
2021-08-18 22:53:28 -04:00
brice criswell
d9f1ca73e4 Chaos : GeometryCollection
Fix BoxCalcBounds with small box array
- preflight against Base 17099190
#jira FROST-4095
#rb Jeff.Rous
[FYI] Brett.Miller

#ROBOMERGE-SOURCE: CL 17139381 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17139679 by brice criswell in ue5-release-engine-test branch]
2021-08-11 14:30:42 -04:00
brett miller
9160a36bcc GeometryCollectionComponent
-- Add DisableThresholdand SleepingThreshold options to the GeometryCollectionComponents ApplyPhysicsField(...) method

#jira UE-117477
#rb brice.criswell

#ROBOMERGE-SOURCE: CL 17128492 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17128506 by brett miller in ue5-release-engine-test branch]
2021-08-10 20:18:11 -04:00
dmitriy dyomin
b0828d6beb Mobile specific implementation for auto-instancing. (disabled by default atm)
Run a compute job that packs most commonly used instance data (LocalToWorld matrix and some other bits - 80 bytes) into per-instance vertex buffer. Vertex shader does not have access to GPUScene and instead loads instance data from a per-instance vertex buffer. If it needs more primitive/instance data than available then it will load it from Primitive UB, binding unique uniform buffer and breaking auto-instancing. Pixel shader has a full access to a GPUScene
There are 3 ways how FSceneDataIntermediates gets populated
 1. PrimitiveId + GPUScene (Desktop)
 2. Per-Instance data + Primitive UB (Mobile)
 3. Primitive UB (auto-instancing disabled)
Details for GPUScene specific vertex inputs and access to FSceneDataIntermediates are hidden behind a macro:
VF_GPUSCENE_DECLARE_INPUT_BLOCK
VF_GPUSCENE_GET_INTERMEDIATES
FSceneDataIntermediates is now stored in FVertexFactoryIntermediates, FMaterialVertexParameters. Added a few GetPrimitiveData() overloads that allows you to access PrimitiveData depending on current context. Removed most of the cases where GetPrimitiveData() gets used with PrimitiveId.
#rb Ola.Ollson

#ROBOMERGE-SOURCE: CL 17093848 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v853-17066230)

[CL 17093856 by dmitriy dyomin in ue5-release-engine-test branch]
2021-08-07 07:20:52 -04:00
michael forot
2f47496d85 Check Field RootNode in code when bad BP setup to avoid UE to crash
#rb kriss.gossart
#jira UE-119777

#ROBOMERGE-SOURCE: CL 17014967 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v839-17012307)

[CL 17014973 by michael forot in ue5-release-engine-test branch]
2021-08-02 07:51:15 -04:00
brett miller
885a4cda81 GeometryCollectionComponent
-- Removed restrictions on RestPose setting to allow ChaosCaching to set rest pose during play.

#rb no.one
#preflight 60fe5cba2882e40001e023f0
#preflight 60febbead830300001746f9a

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

[CL 16970414 by brett miller in ue5-release-engine-test branch]
2021-07-27 13:41:34 -04:00
zousar shaker
d55f79222e Wrapped ObjectPtr upgrade refresh for Engine + ShooterGame
#rb none
#preflight 60f6411c35476b00018dd12c

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

[CL 16892876 by zousar shaker in ue5-release-engine-test branch]
2021-07-20 00:24:38 -04:00
brice criswell
822549680a Chaos - Geometry Collection
- Added CollisionMarginFraction to the size specific data.
#jira FROST-3281
#rb Brett.Miller
#preflight 60e0d9961a88600001ed0e83

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

[CL 16808747 by brice criswell in ue5-release-engine-test branch]
2021-07-03 18:25:03 -04:00
brett miller
83478abc70 GeometryCollectionSceneProxy
-- check for existence of PerBoneHitProxy before accessing it

#jira UE-112900
#rb none

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

[CL 16778242 by brett miller in ue5-release-engine-test branch]
2021-06-24 16:38:40 -04:00
brett miller
b5b3ff21d4 Chaos Caching
-- Removed GeometryCollectionComponent dereferencing from PhysicsThread code
-- Uses PhysicsProxy simulation parameters to determine if events are recorded/played

#rb benn.gallagher
[FYI] brice.criswell

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

[CL 16709713 by brett miller in ue5-release-engine-test branch]
2021-06-17 15:46:36 -04:00
graham wihlidal
860e7f89bb De-interleaved dynamic/material/uncommon data from FPrimitiveInstance into separate data streams to reduce CPU memory footprint, and an upcoming change will also de-interleave this data on the GPU, dramatically saving GPU memory/performance, and also optimizing GPU Scene uploads. This is a mid-refactor change with some crufty temporary code in places since the GPU memory is still interleaved, but it should be removed soon.
#rb brian.karis
[FYI] krzysztof.narkowicz, michal.valient, ola.olsson
#preflight 60ca8449634cd100013c3673

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

[CL 16699461 by graham wihlidal in ue5-release-engine-test branch]
2021-06-16 20:44:01 -04:00
brett miller
dd2a972208 ChaosCaching
-- Removed per observed controls for StartMode, CacheMode and moved to a single set of controls on the cache manager.
-- Cache takes name from observed component.
-- Placed CacheCollection automatically set to Kinematic, non-placed are Record
-- Random access start frame
-- Consistenty record all transforms in Actor space
-- Compatible with Sequencer control
-- Created Playback only CacheManager subclass
-- GeometryCollection recording abides component flags to record/playback breaking/collision/trailing events

#rb benn.gallagher
[FYI] brice.criswell

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

[CL 16684503 by brett miller in ue5-release-engine-test branch]
2021-06-16 01:29:49 -04:00