Commit Graph

43 Commits

Author SHA1 Message Date
ryan kautzman
d07137a6e8 Reconnect ether drag properties to the simulator for geometry collections. Move linear and angular ether drag properties from the GeometryCollectionComponent to UChaosPhysicalMaterial. Add static (angular) friction propterty to UChaosPhysicalMaterial.
[FYI] Benn.Gallagher, Michael.Lentine
#rb: none
#jira: none

#ROBOMERGE-OWNER: ryan.kautzman
#ROBOMERGE-AUTHOR: ryan.kautzman
#ROBOMERGE-SOURCE: CL 12915012 in //UE4/Release-4.25/... via CL 12915022 via CL 12915954
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12915962 by ryan kautzman in Main branch]
2020-04-20 04:54:20 -04:00
bill henderson
a6609977e8 Chaos: Fixes to get event demo level working again
#rb none
#jira nojira

#ROBOMERGE-SOURCE: CL 12719657 in //UE4/Release-4.25/... via CL 12721825 via CL 12781713
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782529 by bill henderson in Main branch]
2020-04-14 13:39:39 -04:00
ori cohen
881ed3fdb7 Missing forward declare and include
#rb none

#ROBOMERGE-SOURCE: CL 12675847 via CL 12675854 via CL 12675856 via CL 12675857
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12675861 by ori cohen in Main branch]
2020-04-08 13:25:48 -04:00
ori cohen
a8d25e0168 IWYU StaticMeshSimulationComponent
#rb none

#ROBOMERGE-SOURCE: CL 12674252 via CL 12674253 via CL 12674255 via CL 12674260
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12674271 by ori cohen in Main branch]
2020-04-08 11:35:04 -04:00
ori cohen
e9ea7658de IWYU SkeletalMeshSimulationComponent
#rb none

#ROBOMERGE-SOURCE: CL 12674050 via CL 12674070 via CL 12674077 via CL 12674088
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12674102 by ori cohen in Main branch]
2020-04-08 11:26:03 -04:00
ori cohen
3d3769b711 IWYU changes
#rb none

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12673540 via CL 12673589 via CL 12673595 via CL 12673596
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12673600 by ori cohen in Main branch]
2020-04-08 10:59:25 -04:00
ori cohen
22879e453d Remove chaos include guard macros
#rb none

#ROBOMERGE-SOURCE: CL 12672568 via CL 12672588 via CL 12672602 via CL 12672607
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12672626 by ori cohen in Main branch]
2020-04-08 10:19:29 -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
e4a7a7d199 Add temp guards for chaos header includes
[FYI] Chris.Caulfield
#rb none

#ROBOMERGE-SOURCE: CL 12558640 via CL 12558650 via CL 12558752 via CL 12558774 via CL 12560025
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12560214 by ori cohen in Main branch]
2020-04-02 14:18:06 -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
robomerge
b8b2f3d0e9 CIS fix
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12064121 in //UE4/Release-4.25/... via CL 12064124
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076632 by robomerge in Main branch]
2020-03-09 13:23:05 -04:00
robomerge
25ce51a063 Hooked up geometry collection to new SQ structures. GT dynamic collection now attached a TGeometryParticle array to store external geometry and transform for queries. Rotated Geometry Collection DDC key to fix previous serialization breakage.
#rb none
#jira
[FYI] Ryan.Kautzman, Brice.Criswell

#ROBOMERGE-SOURCE: CL 12063680 in //UE4/Release-4.25/... via CL 12063684
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076570 by robomerge in Main branch]
2020-03-09 13:22:54 -04:00
brice criswell
20a8922d88 Chaos : Destruction
- Moved the DynamicCollections into ChaosSolvers
#rb none
#jira nojira

#ROBOMERGE-SOURCE: CL 11888120 in //UE4/Release-4.25/... via CL 11888207
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11888232 by brice criswell in Main branch]
2020-03-03 16:56:59 -05:00
benn gallagher
5c655ca2c4 Reimplemented solver actors for Chaos geometry collections.
- Reimplemented TaskGraph tick mode to correctly handle multiple worlds (this involves ticking global command queues outside of world tick and mapping worlds to solver lists for each world tick so we can correctly handle multiple worlds)
 - Audited global commands that had an explicit solver capture and moved them to solver commands
 - Updated headless tests to new API for solver flags
#rb
#jira

#ROBOMERGE-SOURCE: CL 11604093 in //UE4/Release-4.25/... via CL 11604130
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11604166 by benn gallagher in Main branch]
2020-02-25 10:44:05 -05:00
ryan kautzman
f51050e90e Merge 11447502 to Release-4.24.
Add error checking and reporting for level set generation and geometry collection collision shape initialization.

[FYI] Michael.Lentine, Devon.Penney, Brice.Criswell
#rb: none
#jira: none

#ROBOMERGE-SOURCE: CL 11556100 in //UE4/Release-4.25/... via CL 11556116
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579507 by ryan kautzman in Main branch]
2020-02-21 17:41:35 -05:00
Ryan Kautzman
4e412aabdd Merge 11257801 to Release-4.25.
Get clustering building with handles - preliminary checkin.

[FYI] Michael.Lentine
#rb: none
#jira: none

#ROBOMERGE-OWNER: Ryan.Kautzman
#ROBOMERGE-AUTHOR: ryan.kautzman
#ROBOMERGE-SOURCE: CL 11555717 in //UE4/Release-4.25/... via CL 11555721
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579493 by Ryan Kautzman in Main branch]
2020-02-21 17:40:37 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05: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
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Benn Gallagher
d118912346 Fixed collisions on geometry collections and make them exist in the actual world solver so they can interact.
#rb none
#jira UE-84918
#lockdown nick.penwarden

#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: benn.gallagher
#ROBOMERGE-SOURCE: CL 10367302 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v594-10333955)

[CL 10367316 by Benn Gallagher in Main branch]
2019-11-22 05:24:36 -05:00
ryan kautzman
a8b88645a9 Hacking at GeometryCollection debug drawing, trying to replace the int32 rigid body id with a FGuid. It's not there yet, but this change gets things building.
[FYI] Brice.Criswell, Michael.Lentine
#rb: Brice.Criswell
#jira: none

#ROBOMERGE-SOURCE: CL 10089571 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10090379 by ryan kautzman in Main branch]
2019-11-08 19:47:41 -05:00
Benn Gallagher
ea08a4feb7 Removed T from TChaosPhysicsMaterial. Rename to FChaosPhysicsMaterial. Clean up old code in Defines.h
#rb none
#jira


#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: benn.gallagher
#ROBOMERGE-SOURCE: CL 10054737 via CL 10054742 via CL 10054751
#ROBOMERGE-BOT: (v565-10026848)

[CL 10054933 by Benn Gallagher in Main branch]
2019-11-06 08:55:27 -05:00
ori cohen
5799e29c3c First pass removing T,d from Chaos. Only ImplicitObject
#rb none


#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 9944680 via CL 9944735
#ROBOMERGE-BOT: (v558-9892490)

[CL 9945739 by ori cohen in Main branch]
2019-10-31 17:28:08 -04:00
ori cohen
4cde9c8494 Move geometry type over to uint8 so we can easily use Instanced and Scaled
#rb none


#ROBOMERGE-SOURCE: CL 9872549 via CL 9872552
#ROBOMERGE-BOT: (v553-9872581)

[CL 9873728 by ori cohen in Main branch]
2019-10-28 16:29:43 -04:00
michael lentine
acbc579509 Copy from //Fortnite/Dev-Physics
#rb none


#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 9374650 via CL 9374665
#ROBOMERGE-BOT: (v456-9359915)

[CL 9385990 by michael lentine in Main branch]
2019-10-02 17:27:26 -04:00