Commit Graph

105 Commits

Author SHA1 Message Date
brett miller
7c0c32d75a GeometryCollectionComponent
-- added ForceMotionBlur property to make the Nanite scene proxy think that the geometry collection is always moving so that motion blur optimizaztion is forced to evaluate motion.

[FYI] graham.wihlidal,jack.oakman,matt.hoffman,yafes.sahin
#deadend
#preflight 613a81bd48c4a400012d99b2

#ROBOMERGE-AUTHOR: brett.miller
#ROBOMERGE-SOURCE: CL 17477454 via CL 17926793 via CL 18361971 via CL 18362051
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18362115 by brett miller in ue5-release-engine-test branch]
2021-12-02 18:57:44 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
devon penney
37467b793f fix cis
#rb none
#jira none

#ROBOMERGE-AUTHOR: devon.penney
#ROBOMERGE-SOURCE: CL 17914047 in //UE5/Release-5.0/... via CL 17914065
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v885-17909292)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17914084 by devon penney in ue5-release-engine-test branch]
2021-10-25 17:35:57 -04:00
devon penney
13cacfe33e add query for global matrices used by niagara
also fixes horde
#rb none
#jira none

#ROBOMERGE-AUTHOR: devon.penney
#ROBOMERGE-SOURCE: CL 17913281 in //UE5/Release-5.0/... via CL 17913300
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v885-17909292)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17913319 by devon penney in ue5-release-engine-test branch]
2021-10-25 17:06:59 -04:00
brett miller
57abd6e620 GeometryCollectionComponent
-- Removal shrinks for bottom of geometry instead of CoM

#jira none
#rb brice.criswell
[FYI] jack.oakman
#okforgitbug internal, public

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

[CL 17527268 by brett miller in ue5-release-engine-test branch]
2021-09-15 17:18:16 -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
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
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
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
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
brett miller
5190cf866a Fracture Mode Editor
-- correct behavior for shift and ctrl selection
-- Select Inverse abides ViewLevel

[FYI] brice.criswell

#ROBOMERGE-SOURCE: CL 16669650 via CL 16669654
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v834-16658389)

[CL 16669656 by brett miller in ue5-release-engine-test branch]
2021-06-15 00:47:27 -04:00
graham wihlidal
67923137a7 More instance data memory and CPU optimizations, and general refactoring.
* Moved Nanite resource ID and hierarchy offset back to primitive data (indirection cost is largely noise these days, and memory savings is more important - GetInstanceData() fetches this data and stores in the pre-existing registers so all the callsites don't have to worry about it).
* Removed FNaniteInfo from FPrimitiveInfo (and the type itself) in favor of just having a 32bit per-instance hierarchy root offset. Hierarchy offset and runtime resource ID just sourced from primitive.
* Removed PrimitiveID from CPU instance data (GPU still needs it). This value was redundantly stored per-instance, and now the GPU Scene upload just blits it over from primitive when the instance data is uploaded.
* Added new virtual GetNaniteResourceInfo on FPrimitiveSceneProxy that retrieves the Nanite resource ID and hierarchy offset stored on a given primitive (needed now that FPrimitiveInstance doesn't cache a copy). The non-virtual FPrimitiveSceneProxy::IsNaniteMesh() helper is used to avoid this virtual function call for non-Nanite proxies.
* Removed deprecated and no longer referenced Nanite::FResources array on FNaniteGeometryCollectionSceneProxy
* Removed expensive per-instance checks() in a few spots
* Stubbed out upcoming per instance payload allocator offset
* Removed deprecated and never referenced non-GPUScene GetInstanceData uniform buffer path
* Significantly cleaned up and optimized a lot of ISM instance data retrieval, including avoiding unnecessary FRenderTransform <-> FMatrix conversions.
* Removed GetInstanceShaderValues API, it was inefficient and annoying to require retrieval of all parameters when often only one or two of them were ever used. In some cases even the origin was unused but .w was needed because of the per-instance random packing.
* Implemented explicit GetInstanceRandomID() accessor to fetch (under current packing) Origin.W without exposing this to the callsites
* Implemented public API for GetInstanceLightMapData(), since the internal version was only accessible by GetInstanceShaderValues()
* Renamed GetInstanceShaderCustomDataValues() -> GetInstanceCustomDataValues() for API consistency

#rb jason.nadro, krzysztof.narkowicz
[FYI] rune.stubbe, brian.karis


#ROBOMERGE-OWNER: graham.wihlidal
#ROBOMERGE-AUTHOR: graham.wihlidal
#ROBOMERGE-SOURCE: CL 16583156
#ROBOMERGE-BOT: (v828-16531559)
#ROBOMERGE-CONFLICT from-shelf

[CL 16583193 by graham wihlidal in ue5-main branch]
2021-06-07 23:55:28 -04:00
jimmy andrews
8a78138782 Add option to use full precision UVs on geometry collection scene proxy
#rb brett.miller, tyson.brochu, david.hill
#preflight 60b6645c5719ca0001388544

#ROBOMERGE-SOURCE: CL 16518423 in //UE5/Private-Frosty/...
#ROBOMERGE-BOT: STARSHIP (Private-Frosty -> Main) (v826-16501804)

[CL 16518431 by jimmy andrews in ue5-main branch]
2021-06-01 14:20:47 -04:00
Brice Criswell
e79975ad6f Chaos : GeoemtryCollection (Integ from Main CL:16450371)
- Force Size Specific data to always have a single element.
#jira none
#rb Benn.Gallagher
#preflight 60aeaeebb44aa20001a82ea5

[CL 16476610 by Brice Criswell in ue5-main branch]
2021-05-26 17:46:30 -04:00
brett miller
9c13522d2c GeometryCollection
-- implemented deferred initialization using the existing SimulatePhysics property and SetSimulatePhysics blueprint function.
-- Cleaned out old caching code

#jira FROST-1065
#rb brice.criswell

#ROBOMERGE-SOURCE: CL 16461543 in //UE5/Private-Frosty/...
#ROBOMERGE-BOT: STARSHIP (Private-Frosty -> Main) (v818-16446889)

[CL 16461679 by brett miller in ue5-main branch]
2021-05-25 22:01:05 -04:00
Brice Criswell
dd608a6141 Chaos : GeoemtryCollection (Integ from Main CL:16450371)
- Transfer defaults to size specific data
#jira UE-116415
#rb None
#fyi Benn.Gallagher
#preflight 60ad5700bb30900001cac176

[CL 16456707 by Brice Criswell in ue5-main branch]
2021-05-25 17:13:53 -04:00
Brice Criswell
05504fb252 Chaos : Geometry Collection : (Review Update)
Collision Attribute Restructuring.
-	Updated the size specific data to be the primary container for collision settings within the geometry collection.
-	Removed non size specific default parameters from the asset.
-	Added support for Capsule collisions.
#jira none
#rb Benn.Gallagher
#fyi Brett.Miller, Cedric.Caillaud
#okforgithup, public, internal
#preflight 60abfa1c88460e0001fbae77

[CL 16439958 by Brice Criswell in ue5-main branch]
2021-05-24 16:21:06 -04:00
Brice Criswell
139a4bed28 Chaos : Geometry Collection
Collision Attribute Restructuring.
-	Updated the size specific data to be the primary container for collision settings within the geometry collection.
-	Removed non size specific default parameters from the asset.
-	Added support for Capsule collisions.
#jira none
#rb Benn.Gallagher
#fyi Brett.Miller, Cedric.Caillaud
#okforgithup, public, internal
#preflight 60a91c321d78490001621e41

[CL 16429701 by Brice Criswell in ue5-main branch]
2021-05-22 12:07:31 -04:00
julien marchand
b4484ee0d0 Fix to allow accessing the specific BodyInstance when the InstancedStaticMeshComponent has an array of BodyInstance instead of retrieving the default one in the primitive component base class.
[at]jaco.vandyk
#jira Frost-2381
#rnx

#ROBOMERGE-SOURCE: CL 16370533 in //UE5/Private-Frosty/...
#ROBOMERGE-BOT: STARSHIP (Private-Frosty -> Main) (v804-16311228)

[CL 16372550 by julien marchand in ue5-main branch]
2021-05-18 14:32:57 -04:00
peter knepley
e07885e125 GeometryCollection
-- Support for Nanite to GeometryCollection conversion
-- Support for multiple UV sets

#jira UE-114992
#rb jimmy.andrews
[FYI] brice.criswell

#ROBOMERGE-OWNER: peter.knepley
#ROBOMERGE-AUTHOR: brett.miller
#ROBOMERGE-SOURCE: CL 16363667 in //UE5/Private-Frosty/...
#ROBOMERGE-BOT: STARSHIP (Private-Frosty -> Main) (v804-16311228)
#ROBOMERGE-CONFLICT from-shelf

[CL 16370251 by peter knepley in ue5-main branch]
2021-05-18 13:03:42 -04:00
brett miller
2a138e24bc UGeometryCollection
-- Wrapped GeometrySource in header tool directive to be stripped out of shipping game builds.

#jira UE-115272
#rb brice.criswell
#lockdown nick.whiting

#ROBOMERGE-SOURCE: CL 16248584 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v799-16237190)

[CL 16263785 by brett miller in ue5-main branch]
2021-05-10 23:54:01 -04:00
Andrew Davidson
3ddc3a4da3 Merge up from //UE5/Dev-LargeWorldCoordinates
#rb none

[CL 16211417 by Andrew Davidson in ue5-main branch]
2021-05-05 15:07:25 -04:00