Commit Graph

43 Commits

Author SHA1 Message Date
Jimmy Andrews
f4edf0c0a9 fix crash w/ gc->sm->gc path creating out-of-bounds material IDs
#rb brett.miller
#rnx
#preflight 60a5a958b7ccb00001959fea

[CL 16396136 by Jimmy Andrews in ue5-main branch]
2021-05-19 21:03:35 -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
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
Benn Gallagher
c7cced57cd Geometry Collection : Cache Attribute
- Strip geometry attributes from the collection when using the collection as a simulation viewer.
- Use the transferred bounds on the minimal asset for rendering bounds.
- Minor clean to expose user controllable cache only state to the GeometryCollectionObject


#jira UE-113611
#rb Brett.Miller
[FYI] Graham.Whlidal
#lockdown nick.whiting

#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: brice.criswell
#ROBOMERGE-SOURCE: CL 16052869 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v789-15992632)
#ROBOMERGE-CONFLICT from-shelf

[CL 16060655 by Benn Gallagher in ue5-main branch]
2021-04-20 09:50:07 -04:00
rune stubbe
7588e761f5 Fix for GC not unregistering the Nanite resource with the streamer when it is removed or changed.
Added fence in GC to make sure the renderer is done with the Nanite resource before deleting it
#rb graham.wihlidal

#ROBOMERGE-SOURCE: CL 15786206 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15790745 by rune stubbe in ue5-main branch]
2021-03-23 22:42:38 -04:00
brian karis
f3a08c0335 Remove degenerate triangles from geometry collections before sending to Nanite builder.
#jira UE-108425
#jira UE-104095

#rb graham.wihlidal

#ROBOMERGE-SOURCE: CL 15731006 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15731011 by brian karis in ue5-main branch]
2021-03-17 17:58:16 -04:00
brett miller
c4cc716eb1 Fracture Mode
-- Implemented Delete Branch command.
   -- Fixed bug in Exploded Value that created problems when ISMCs are present on the GeometryCollectionActor
   -- Fixed but in can execute which was failing when an ISMC is attached to the actor
   -- Reset correct eliminates exemplars

#jira none
#rb brice.criswell

#ROBOMERGE-SOURCE: CL 15486072 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15486118 by brett miller in ue5-main branch]
2021-02-21 16:04:54 -04:00
brett miller
8efef822fc GeometryCollection -- include StaticMesh.h to correct non-Unity build
#jira UE-108988
#rb none

#ROBOMERGE-SOURCE: CL 15486066 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15486117 by brett miller in ue5-main branch]
2021-02-21 16:04:49 -04:00
brett miller
f095abd02a GeometryCollection -- Added EmbeddedGeometry: the ability for somulated bones to carry instanced geometry that doesn't contribute to simulation but tracks with evolving rigid body transformation.
#jira FROST-1089
#rb brice.criswell

#ROBOMERGE-SOURCE: CL 15448342 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15454441 by brett miller in ue5-main branch]
2021-02-18 13:20:03 -04:00
brett miller
5f5ac7c11c Fracture Tool -- Merging Geometry Collections and baking in scale is now possible via the New button in the Fracture Tool.
#jira FROST-706
#rb brice.criswell

#ROBOMERGE-SOURCE: CL 15372847 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15372862 by brett miller in ue5-main branch]
2021-02-09 20:08:13 -04:00
mark lintott
d252d894c4 #rb trivial
Fix for uninitialized DamageThreshold warning.

[CL 15355365 by mark lintott in ue5-main branch]
2021-02-08 05:25:21 -04:00
Brice Criswell
71bff90bf4 Chaos : Destruction
- Added Size Specific damage thresholds.

#rb none
#jira FROST-1044

[CL 15260032 by Brice Criswell in ue5-main branch]
2021-01-29 00:35:21 -04:00
brett miller
45a7c4fb36 GeometryCollection -- Asset now has properties for default clustering behaviour. The properties are written to the actor on placement.
#rb none
#jira FROST-977

[CL 15176238 by brett miller in ue5-main branch]
2021-01-25 00:53:27 -04:00
ionut matasaru
a90718a7fb Fixed usage of TRACE_CPUPROFILER_EVENT_SCOPE macro(s) in various places.
Common mistakes:

a) TRACE_CPUPROFILER_EVENT_SCOPE("Foo") or TRACE_CPUPROFILER_EVENT_SCOPE("FClass::Foo")
    --> results in a timer named "Foo" or "FClass::Foo" (the quotes will be included in the name)

b) TRACE_CPUPROFILER_EVENT_SCOPE(TEXT("Foo"))
    --> results in a timer named L"Foo" (L and quotes will be included in the name)

c) TRACE_CPUPROFILER_EVENT_SCOPE_TEXT(TEXT("Other Foo")) or TRACE_CPUPROFILER_EVENT_SCOPE_TEXT("Foo")
    --> Slow! It will use dynamic string matching that adds an unnecessary overhead.

Correct usage:
    TRACE_CPUPROFILER_EVENT_SCOPE(Foo)
    TRACE_CPUPROFILER_EVENT_SCOPE(FClass::Foo)
    TRACE_CPUPROFILER_EVENT_SCOPE_STR("Other Foo") // when timer name has spaces
    TRACE_CPUPROFILER_EVENT_SCOPE_TEXT(*Foo.ToString()) // only if a dynamic name is really needed

#rb Catalin.Dragoiu
#fyi Marc.Audy, Krzysztof.Narkowicz, Rune.Stubbe, Michal.Valient

[CL 15134822 by ionut matasaru in ue5-main branch]
2021-01-19 06:29:15 -04:00
graham wihlidal
ee8f378f7b Geometry collection assets created from one or more static meshes will have Nanite automatically enabled now, as long as at least one of the input meshes had Nanite enabled originally.
#rb trivial
#fyi brian.karis, rune.stubbe
#jira UE-104791

[CL 15028299 by graham wihlidal in ue5-main branch]
2021-01-08 20:00:52 -04:00
Rune Stubbe
dc5e9cb018 Nanite support for geometry collection
The Nanite builder now accepts a set of meshes that will be built into a single resource with a hierarchy root for each input mesh.
Updated runtime code to use this feature for Geometry collection.
Each GC now takes up just a single root page.
Changed geometry collection serialization so Nanite data is now transient similar to how it is transient in RenderData for StaticMesh.
Added bogus serialization functions for parsing and throwing away the old Nanite data, so we don't crash when parsing old files.

#rb brian.karis, graham.wihlidal

[CL 14828108 by Rune Stubbe in ue5-main branch]
2020-12-01 11:18:19 -04:00
Jon Nabozny
cf1d1c03c2 Fix initialization order issue in GeometryCollectionObject.
#fyi Brett.Miller
#rb None
#jira None

[CL 14794705 by Jon Nabozny in ue5-main branch]
2020-11-20 01:16:51 -04:00
brett miller
4359cae5c0 GeometryCollection -- Added Apply Changes button to trigger Simulation Data rebuild.
#rb none
#jira none
#fyi brice.criswell

[CL 14794036 by brett miller in ue5-main branch]
2020-11-19 22:01:51 -04:00
Rune Stubbe
df3e21a55f Fix for LZCompression crash when building multiple platforms at once
#rb graham.wihlidal

[CL 14684712 by Rune Stubbe in ue5-main branch]
2020-11-07 07:15:58 -04:00
graham wihlidal
0e876d9805 Fixed Nanite Geometry Collection crashes and incorrect rendering on cooked platforms.
#rb rune.stubbe
#fyi brian.karis, benn.gallagher, michael.lentine

[CL 14638967 by graham wihlidal in ue5-main branch]
2020-11-02 21:12:24 -04:00
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
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Rune Stubbe
aa79139e4e Fix for Geometry Collection not registering Nanite meshes with Nanite streamer when using Fracture tool
#jira UESP-3618
#rb graham.wihlidal

[CL 14500224 by Rune Stubbe in ue5-main branch]
2020-10-15 05:19:18 -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
Rune Stubbe
42a3b7c43f Enabled LZ4 compression of Nanite data on platforms that don't support LZ decompression in hardware.
Nanite always generates LZ compressed data. All platforms share the same DDC key. Platforms that support hardware LZ decompress during platform-specific serialization.
Added LZ hardware decompression to platform properties and target platform.


#fyi Brian.Karis
#rb Graham.Wihlidal

[CL 14277717 by Rune Stubbe in ue5-main branch]
2020-09-09 04:50:52 -04:00