Commit Graph

96 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
benn gallagher
d2df53feb5 Rotate geometry collection DDC again to update with previous changes to levelsets from CL#12714484
#rb none
#jira
[FYI] Jack.Oakman, Ryan.Kautzman

#ROBOMERGE-SOURCE: CL 12726030 in //UE4/Release-4.25/... via CL 12726037 via CL 12781729
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782540 by benn gallagher in Main branch]
2020-04-14 13:40:36 -04:00
bill henderson
1f1daf0d64 CIS fix
#rb none
#jira nojira

#ROBOMERGE-SOURCE: CL 12720061 in //UE4/Release-4.25/... via CL 12721833 via CL 12781716
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782530 by bill henderson in Main branch]
2020-04-14 13:39:41 -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
benn gallagher
ef53d22af6 Rotate GeometryCollection DDC to pick up changes to collision and surface winding from yesterday.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12688610 in //UE4/Release-4.25/... via CL 12688612 via CL 12688613
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12688614 by benn gallagher in Main branch]
2020-04-09 06:48:53 -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
benn gallagher
d5bfd8cb7f Hooked up geometry collections to the component body instance filter data so configuring the filter in the details panel now functions correctly. Also defaulted the body instance for geometry collections into the ECC_Destructible query channel.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12553459 in //UE4/Release-4.25/... via CL 12553609 via CL 12553709
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12554106 by benn gallagher in Main branch]
2020-04-02 11:57:01 -04:00
ori cohen
3493053799 Set various chaos related modules to have access to level 1 files
#rb none

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12511442 via CL 12511458 via CL 12511475 via CL 12511478
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12511485 by ori cohen in Main branch]
2020-04-01 17:09:25 -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
benn gallagher
e7064af89a Fixed generation of cluster implicits due to errors in mass space recursive calculation for particle locations.
Fixed initial cluster transforms being incorrect in SQ
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12509129 in //UE4/Release-4.25/... via CL 12509143 via CL 12509187
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12509199 by benn gallagher in Main branch]
2020-04-01 14:23:27 -04:00
bill henderson
d861b0c31b Chaos: progress towards bringing NiagaraDataInterface up to date.
#jira UE-89161
#rb none

#ROBOMERGE-OWNER: bill.henderson
#ROBOMERGE-AUTHOR: bill.henderson
#ROBOMERGE-SOURCE: CL 12505184 in //UE4/Release-4.25/... via CL 12505185 via CL 12505625
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12505635 by bill henderson in Main branch]
2020-04-01 09:34:47 -04:00
devin doucette
b59af50e44 Added missing DDC stats for a few types
#rb Zousar.Shaker
#rnx

#ROBOMERGE-OWNER: devin.doucette
#ROBOMERGE-AUTHOR: devin.doucette
#ROBOMERGE-SOURCE: CL 12475124 via CL 12475300 via CL 12475323 via CL 12475339
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12475349 by devin doucette in Main branch]
2020-03-27 17:52:09 -04:00
benn gallagher
bcfe976d65 Rotating geometry collection DDC key missed by 12386066
#rb none
#jira
[FYI] Brice.Criswell

#ROBOMERGE-SOURCE: CL 12387306 in //UE4/Release-4.25/... via CL 12387307
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12387308 by benn gallagher in Main branch]
2020-03-24 07:46:10 -04:00
robert manuszewski
b7568cc694 Fix for UE-90683: You can no longer delete conflicting variables
Refactored FindField into FindUField and FindFProperty to avoid confusion caused by the fact that FindField<UField> will no longer return FProperties.

#jira UE-90683
#rb Steve.Robb
#tests Basic editor functionality test, cooked and ran PC client and server, bot soak tests for two hours

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 12190998 in //UE4/Release-4.25/... via CL 12190999
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12191300 by robert manuszewski in Main branch]
2020-03-15 10:33:45 -04:00
benn gallagher
6f7b8aec37 Fixed for implicit type mismatch and bad serialization.
Revived SharedImplicitsAttribute to correctly handle the type change.
Undid breaking of old assets on load.
Removed const casting from dynamic collection initialization and safely handle attribute upgrades during geometry collection serialization.
Fixed attempted copies of managed attributes of different types.
#rb Brice.Criswell
#jira

#ROBOMERGE-SOURCE: CL 12125198 in //UE4/Release-4.25/... via CL 12125214
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12140098 by benn gallagher in Main branch]
2020-03-11 17:01:25 -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
ryan kautzman
d64c4b88bb Fix CIS.
[FYI] Marc.Audy, Michael.Lentine
#rb: none
#jira: UE-89409

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

[CL 12026194 by ryan kautzman in Main branch]
2020-03-06 18:17:16 -05:00
ryan kautzman
f06e7a4943 Remove the DynamicCollection from the geometry collection's FSimulationParameters. Make the GameThreadCollection on the FGeometryCollectionPhysicsProxy a reference to a collection passed to the constructor. So, the game thread dynamic collection is now owned outside of the proxy. Fixes the RigidBodies_SingleFallingUnderGravity test.
[FYI] Brice.Criswell, Michael.Lentine, Benn.Gallagher, Bill.Henderson
#rb: none
#jira: none

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

[CL 11980319 by ryan kautzman in Main branch]
2020-03-05 21:21:50 -05:00