Commit Graph

22 Commits

Author SHA1 Message Date
alexis matte
bf454087c3 Fix crash when unbinding cloth after the user remove the asset in the sklemesh editor.
#jira UE-86998
#jira UE-86948
#rb benoit.deschenes
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 11078236 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v637-11041722)

[CL 11078248 by alexis matte in Main branch]
2020-01-21 18:07:45 -05:00
kriss gossart
dd9c712bad Chaos Cloth - Add missing Chaos Cloth teleport mode.
- Move teleport property from the nv cloth context to the common cloth context.
- Fix Chaos Cloth particle and collision particle initializations.

[FYI] Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10944730 via CL 10944735 via CL 10945108 via CL 10945131
#ROBOMERGE-BOT: (v632-10940481)

[CL 10945155 by kriss gossart in Main branch]
2020-01-10 15:54:40 -05:00
kriss gossart
ccc207e37b Chaos Cloth - Fix time related issues while removing redundant solver substepping and SolverFrequency parameter.
Note: the previous context refactor actually fixed the hitch/jiggling related issue.

#rb none


#ROBOMERGE-SOURCE: CL 10927742 via CL 10928149 via CL 10928154 via CL 10928161
#ROBOMERGE-BOT: (v626-10872990)

[CL 10928163 by kriss gossart in Main branch]
2020-01-09 12:09:36 -05:00
kriss gossart
c6c3bac263 Chaos Cloth - Refactor the cloth simulation and context classes.
- Move the IClothingSimulation and IClothingSimulationContext definitions from ClothingSimulation.h/cpp to ClothingSimulationInterface.h/cpp files to make place for the FClothingSimulationCommon definitions.
- Move common simulation and context implementation from the ClothingSystemRuntimeInterface to the ClothingSystemRuntimeCommon module.
- Merge common code used in Nv and Chaos cloth simulations, and remove duplicated code where possible.
- Move specific FillContext behaviors out of the base simulation class and into the context subclasses.

#rb Benn.Gallagher
[FYI] Jaco.VanDyk

Merge: CL 10878385, CL10879173
Release-11.40-Chaos -> Release-12.00


#ROBOMERGE-SOURCE: CL 10879538 via CL 10879553 via CL 10879562
#ROBOMERGE-BOT: (v626-10872990)

[CL 10880533 by kriss gossart in Main branch]
2020-01-06 12:54:08 -05:00
kriss gossart
f193178f83 Chaos Cloth - Add live editing for cloth property changes.
- Add Chaos Cloth physics refresh, called when UI manipulators are used on collision volumes.
- Tidied up ChaosClothingSimulation.cpp to remove redundant function arguments.
- Bug fix: Shape constraints now have a version where it is not applied on all particles but only to the relevant instance.

[FYI] Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10869211 via CL 10869235 via CL 10869512 via CL 10869901
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870583 by kriss gossart in Main branch]
2019-12-26 15:30:43 -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
kriss gossart
67d91b99a0 Add a calibrated Chaos Cloth parameter migration from existing Nv Cloth configs.
Move the cloth shared config creation responsability out of the Chaos Cloth simulation code to the points where clothing assets are loaded or created within the SkeletalMesh code.
Add shared cloth configs to the list of config classes returned by the cloth factories.
Set all Chaos Cloth default stiffness properties to 0.5.
Remove unused Chaos Cloth volume related properties.
Add a missing stiffness value setup to the bending element constraints.

#rb Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10812067 via CL 10812070 via CL 10812075 via CL 10812077
#ROBOMERGE-BOT: (v610-10636431)

[CL 10812081 by kriss gossart in Main branch]
2019-12-19 13:11:29 -05:00
kriss gossart
655821e9ca Fix missing Chaos Cloth config creation when reloading NvCloth assets made post Ryan's refactor.
Added a new migration path Nv Cloth config to Chaos Cloth config using the legacy config structure.

#rb Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10637234 via CL 10637527 via CL 10637594
#ROBOMERGE-BOT: (v609-10634694)

[CL 10637685 by kriss gossart in Main branch]
2019-12-10 13:21:11 -05:00
kriss gossart
9fa48a6883 Fix CIS missing include after Clothing Asset changes.
#rb none


#ROBOMERGE-SOURCE: CL 10634787 via CL 10634792 via CL 10634795
#ROBOMERGE-BOT: (v608-10590470)

[CL 10634796 by kriss gossart in Main branch]
2019-12-10 05:31:44 -05:00
kriss gossart
fcd0e2ad1d Fix CIS after Clothing Asset changes.
#rb none


#ROBOMERGE-SOURCE: CL 10634760 via CL 10634761 via CL 10634762
#ROBOMERGE-BOT: (v608-10590470)

[CL 10634763 by kriss gossart in Main branch]
2019-12-10 05:19:44 -05:00
kriss gossart
a18007f52d Move common clothing asset functionalities to ClothingSystemRuntimeCommon to enable Chaos Cloth authoring.
Create a new ClothingSimulationFactory function to get the definitive default factory, for whatever cloth factories are actually enabled.
Rework nv cloth/apex dependencies in the ClothingSystemRuntimeNv module to allow the move of the legacy components and common config elements to the common module.
Add legacy cloth asset and runtime components to the common module to allow legacy assets to be loaded in a Chaos simulation, even with nv cloth disabled.
Allow storage of several configs to coexist in the ClothingAsset object config map, with their names as the key.
Resurrect the cloth physical mesh data structure to avoid the UClass overhead.
Add migration functions and BaseEngine redirectors to keep backward compatibility with legacy cloth assets, and assets saved after Ryan's refactor.

#rb Benn.Gallagher, Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10634739 via CL 10634740 via CL 10634741
#ROBOMERGE-BOT: (v608-10590470)

[CL 10634742 by kriss gossart in Main branch]
2019-12-10 05:02:44 -05:00
jaco vandyk
aa7d67c5cd ChaosCloth Performance:
Performance Improvements (Test Asset 980us -> 580us for test asset on test platform):
Removed unnecessary copies and buffer creation
Collapsed transform calculations
In place skinning function
Removed duplicate spring constraints
Moved critical functions to header files so that they can be inlined
Long Range Constraints are switched to iterate per constraint instead of per particle

Scoped Cycle counters added

#rb Benn.Gallagher
#[fyi] Ryan.Kautzman, Michael.Lentine, Benn.Gallagher, Kriss.Gossart
#[review]-10494959 [at]Benn Gallagher


#ushell-cherrypick of 10371495 by jaco.vandyk


#ROBOMERGE-SOURCE: CL 10515883 via CL 10515884 via CL 10515887
#ROBOMERGE-BOT: (v606-10482310)

[CL 10515889 by jaco vandyk in Main branch]
2019-12-05 03:34:25 -05:00
kriss gossart
5fd7dd8bfc Rename ClothLODDataBase to ClothLODDataCommon, and remove from the cloth runtime some related/minor dependencies to the nv module.
Also remove a bunch of unused get/set functions in the ClothMeshAdapter with unnecessary dependencies to the nv module.

#jira
#rb Benn.Gallagher, Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10318411 via CL 10318767 via CL 10318795
#ROBOMERGE-BOT: (v593-10286020)

[CL 10319252 by kriss gossart in Main branch]
2019-11-20 10:13:34 -05:00
jaco vandyk
9e96d86e11 - Chaos triangle mesh face normals are now calculated assuming CCW winding in left handed coordinates. This default is made explicit in the comments to prevent future confusion
- Chaos normal debug rendering now the correct way around for newly imported assets
- Dead code removed from ClothingMeshUtils
- Comments added in code when non default winding order is used for face normal calculations, giving opposite results (like calculation of barycentric coordinates)

#rb Kriss.Gossart
[FYI] Ryan.Kautzman, Michael.Lentine, Benn.Gallagher
[at]Kriss.Gossart


#ROBOMERGE-SOURCE: CL 10284819 via CL 10284820 via CL 10284821
#ROBOMERGE-BOT: (v591-10236483)

[CL 10284822 by jaco vandyk in Main branch]
2019-11-18 05:26:48 -05:00
kriss gossart
9b11c2a5bd Rename ClothPhysicalMeshData files to ClothPhysicalMeshDataBase to match the other class/file names and allow for a common runtime version.
[FYI] Benn.Gallagher, Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10005752 via CL 10005832
#ROBOMERGE-BOT: (v562-10004402)

[CL 10005847 by kriss gossart in Main branch]
2019-11-05 07:32:18 -05:00
kriss gossart
6c392a35cc Rename ClothConfig files to ClothConfigBase in line with the class name definition.
#rb Benn.Gallagher
[FYI] Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 9969464 via CL 9969468
#ROBOMERGE-BOT: (v560-9963197)

[CL 9969469 by kriss gossart in Main branch]
2019-11-04 12:47:03 -05:00
jaco vandyk
4decc429a5 - Adding Cloth configuration parameters that are common to all instances in a skeletal mesh
- Remove the related cvars

#rb Benn.Gallagher
[FYI] Ryan.Kautzman, Michael.Lentine, Kriss.Gossart
[at]Benn.Gallagher


#ROBOMERGE-SOURCE: CL 9890068 via CL 9890205
#ROBOMERGE-BOT: (v553-9872581)

[CL 9890240 by jaco vandyk in Main branch]
2019-10-30 09:51:53 -04:00
jaco vandyk
21e7c9df9f - Adding a ChaosClothConfig with chaos specific parameters.
- Deprecate chaos parameters on skeletal mesh.


#rb Kriss.Gossart
[FYI] Ryan.Kautzman, Michael.Lentine, Benn.Gallagher
[at]Kriss.Gossart


#ROBOMERGE-SOURCE: CL 9818954 via CL 9818995
#ROBOMERGE-BOT: (v546-9757112)

[CL 9819007 by jaco vandyk in Main branch]
2019-10-24 14:50:04 -04:00
Jamie Dale
8a860415dd Fixed localization conflicts
#rb none
#rnx

[CL 9477638 by Jamie Dale in Main branch]
2019-10-08 14:28:14 -04:00
Alexis Matte
d86858d7c0 Fix bad merge from physic copy up
#rb michael.lentine, kriss.gossart, Jaco.Vandyk
#jira none

[CL 9459080 by Alexis Matte in Main branch]
2019-10-07 15:44:28 -04:00
bob tellez
b630afc4b0 #UE4 Add many missing copyrights
#ROBOMERGE-SOURCE: CL 9395652 via CL 9402665
#ROBOMERGE-BOT: (v456-9359915)

[CL 9402691 by bob tellez in Main branch]
2019-10-03 13:36:51 -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