Commit Graph

23 Commits

Author SHA1 Message Date
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
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -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
Zousar Shaker
3b4c8fc1c5 Automated wrapped object pointer upgrade for Engine + ShooterGame + ShooterGame referenced plugins
#rb none

[CL 15224650 by Zousar Shaker in ue5-main branch]
2021-01-27 17:40:25 -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
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
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
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
Richard TalbotWatkin
4a6963147e Removed old modules: EditableMesh, MeshEditor, StaticMeshEditorExtension, BlastPlugin.
Some UV utilities were moved from StaticMeshEditorExtension to DatasmithImporter.
All remaining references to EditableMesh were removed from engine code and plugins with former dependencies.
#rb Jean-Michel.Dignard, Jean-Luc.Corenthin, Michael.Lentine, Bill.Henderson

[CL 14421586 by Richard TalbotWatkin in ue5-main branch]
2020-10-05 12:11:21 -04:00
graham wihlidal
431df3102b Refactor of Nanite GeometryCollection serialization code to avoid the need to do tagged property versioning when Nanite::FResources is altered. This behavior now matches how regular StaticMesh serialization is working for Nanite resource data.
#jira UESP-3364
#rb benn.gallagher, rune.stubbe
#fyi brian.karis, michael.lentine

[CL 14229143 by graham wihlidal in ue5-main branch]
2020-09-01 12:46:08 -04:00
graham wihlidal
c6add29e45 Fix Nanite geometry collection rendering when the translucent "selected geometry" materials get added automatically.
#rb none

[CL 13924823 by graham wihlidal in ue5-main branch]
2020-07-22 13:12:31 -04:00
graham wihlidal
35f1009dc1 Add NaniteResources.h include to GeometryCollectionObject.h for Nanite::FResources
#rb none

[CL 13861216 by graham wihlidal in ue5-main branch]
2020-07-15 03:00:04 -04:00
graham wihlidal
b7beac9e62 Add InstanceUniformShaderParameters.h include to GeometryCollectionObject.h for FNaniteInfo
#rb none

[CL 13861094 by graham wihlidal in ue5-main branch]
2020-07-15 02:29:09 -04:00
graham wihlidal
1d6d62f191 Added initial functionality for building and serializing Nanite cluster pages (currently) 1:1 with Chaos geometry collection groups. This feature is still very much a work in progress.
#rb michael.lentine
#fyi michal.valient, brian.karis, benn.gallagher

[CL 13861053 by graham wihlidal in ue5-main branch]
2020-07-15 01:49:28 -04:00
ori cohen
9cb385014d Remove lvl1 include guards from GeometryCollection
#rb none

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12623495 via CL 12623508 via CL 12623509 via CL 12623510
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12623517 by ori cohen in Main branch]
2020-04-06 12:50:13 -04:00
ori cohen
7ad6a77aa7 Add lvl1 header include (result of script)
#rb none

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12510784 via CL 12510899 via CL 12510908 via CL 12510913
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12510925 by ori cohen in Main branch]
2020-04-01 16:28:03 -04:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
marc audy
c48ebb4d45 Make virtual UObject::Modify WITH_EDITOR. UObject::Modify remains defined as a forceinlined noop without editor to avoid having to fixup all existing code that exists in non-editor that calls Modify.
#rb Michael.Noland
#jira


#ROBOMERGE-SOURCE: CL 8293866 via CL 8353802
#ROBOMERGE-BOT: (v401-8057353)

[CL 8354009 by marc audy in Main branch]
2019-08-27 17:20:03 -04:00
michael lentine
83be52b73a Add a parameter to chance max particles.
#rb none
#jira ue-75850
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8069683 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v400-8057353)

[CL 8069685 by michael lentine in Main branch]
2019-08-15 21:16:13 -04:00
Michael Lentine
f9b3324b32 Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 6903150
#rb none
#rnx

[CL 6903163 by Michael Lentine in Main branch]
2019-06-08 17:15:34 -04:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Michael Lentine
ea5ca985d4 Copying //UE4/Dev-Physics to //UE4/Dev-Main.
#rb none
#lockdown Nick.Penwarden

[CL 4653110 by Michael Lentine in Main branch]
2018-12-12 11:25:29 -05:00