Commit Graph

38 Commits

Author SHA1 Message Date
tyson brochu
b44db62740 ClothingMeshUtils:
- fix zero-weight vertices after applying max distance falloff function
- if a zero-weight vertex is ever encountered in the shader, fall back to skinned vertex data
- fix construction of TargetMesh index buffer
- pull out MaxEdgeLength computation into its own function
- simplify Kernel expression

#rnx
#rb kriss.gossart halfdan.ingvarsson
#preflight 60d39b8ca93474000176026c


#ROBOMERGE-OWNER: tyson.brochu
#ROBOMERGE-AUTHOR: tyson.brochu
#ROBOMERGE-SOURCE: CL 16763969
#ROBOMERGE-BOT: (v835-16672529)
#ROBOMERGE-CONFLICT from-shelf

[CL 16764327 by tyson brochu in ue5-main branch]
2021-06-23 18:21:12 -04:00
aurel cordonnier
e0ad4e25df Merge from Release-Engine-Test @ 16624776 to UE5/Main
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16625248 by aurel cordonnier in ue5-main branch]
2021-06-10 13:13:24 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04:00
aurel cordonnier
8eebe8841f Merge UE5/RET @ 16305968 to UE5/Main
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937

[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -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
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
kriss gossart
3ee8251952 Cloth - Fix the cloth wrap deformer capture optimization code in cases where the skinned points' are outside their closest cloth triangle bounding volumes.
#rb Benn.Gallagher
#jira UE-111788
#lockdown Nick.Whiting

#ROBOMERGE-OWNER: kriss.gossart
#ROBOMERGE-AUTHOR: kriss.gossart
#ROBOMERGE-SOURCE: CL 16005071 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v789-15992632)
#ROBOMERGE-CONFLICT from-shelf

[CL 16005192 by kriss gossart in ue5-main branch]
2021-04-14 10:28:40 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
Zousar Shaker
55267633ff Remove the ability to implicitly convert or reinterpret-in-place a TSet or TMap of wrapped pointers as raw pointers, and fix-up all code that was depending on this compatibility API. This ability can't be permitted when we enable lazy load (UE_WITH_OBJECT_HANDLE_LATE_RESOLVE is non-zero) because the hash order of a wrapped pointer differs from a raw pointer, this means that reinterpreting a container of one type to a container of another type means the reinterpreted container isn't in hash order which is invalid.
#rb matt.peters
#fyi devin.doucette
#fyi steve.robb

[CL 15273466 by Zousar Shaker in ue5-main branch]
2021-02-01 15:15:23 -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
Zousar Shaker
8cb2ea3473 Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr)
Call-site changes for non-scalar wrapped object pointer upgrade that overlap with automated pointer changes.

#rb devin.doucette

[CL 14822398 by Zousar Shaker in ue5-main branch]
2020-11-30 14:57:34 -04:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -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
kriss gossart
18feecaa00 Chaos Cloth - Add point based wind model to ensure PhyX cloth asset backward compatibility (AKA "Legacy Wind"). [Merging CL 14397275]
#jira UE-90581, UE-94480
#rb none

[CL 14398091 by kriss gossart in ue5-main branch]
2020-09-25 13:44:05 -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
kriss gossart
7a777cf2dc Chaos Cloth - LOD/graph node refactor.
- Add multi LOD support.
- Add simulation Mesh, Cloth, Collider, and Solver graph node ready classes.
- Fix backstop, and improve backstop debug draw.
- Add Anim debug draw.
- Output cloth sim data in local space.

#jira UESP-3283
#fyi Chris.Caulfield, Michael.Lentine
#rb none

[CL 14112532 by kriss gossart in ue5-main branch]
2020-08-14 06:18:22 -04:00
michael lentine
631ffaa5ea Accelerate cloth binding.
#rb Benn.Gallagher, Chris.Caulfield

#ROBOMERGE-SOURCE: CL 13181746 via CL 13181747 via CL 13181748
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)

[CL 13181876 by michael lentine in Main branch]
2020-05-05 13:05:09 -04:00
kriss gossart
c30351a9c5 Cloth - Fix cloth vertex mapping to render section when one or two points of an element are fixed, allowing to now draw triangles that are partially attached as simulating rather than skinned.
#rb Jurre.deBaare

#ROBOMERGE-SOURCE: CL 13054220 via CL 13054221 via CL 13054222
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13054223 by kriss gossart in Main branch]
2020-04-28 06:32:24 -04:00
kriss gossart
e4292c3cac Chaos Cloth - Rollback UClothLODDataCommon to FClothLODData to prevent crashes in SkeletalMesh PostLoad.
#jira UE-91075
#rb none
[FYI] Benn.Gallagher, Jaco.Vandyk

#ROBOMERGE-OWNER: kriss.gossart
#ROBOMERGE-AUTHOR: kriss.gossart
#ROBOMERGE-SOURCE: CL 12556067 via CL 12556089 via CL 12558368 via CL 12558401 via CL 12559878
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12559891 by kriss gossart in Main branch]
2020-04-02 14:15:35 -04:00
kriss gossart
cad0f14413 Chaos Cloth - Expose friction coefficient to try limit sliding around collision volumes.
- Add per cloth thickness.
- Add shared config to config migration path.
- Fix cloth asset PostLoad migration issues.

[FYI] Benn.Gallagher, Jaco.VanDyk
#jira UE-86455, FORT-255441, FORT-265142


#ROBOMERGE-SOURCE: CL 12308056 via CL 12308064 via CL 12308068 via CL 12310129
#ROBOMERGE-BOT: (v670-12295787)

[CL 12310238 by kriss gossart in Main branch]
2020-03-19 16:17:23 -04:00
kriss gossart
7c1e295410 Chaos Cloth - Enable the SkeletalMeshComponent SetMaxDistanceScale BP function in Chaos Cloth.
[fyi] Gustav.Melich, Michael.Lentine

Merging CL 12116735


#ROBOMERGE-SOURCE: CL 12123731 via CL 12123732 via CL 12130734
#ROBOMERGE-BOT: (v659-12123632)

[CL 12130926 by kriss gossart in Main branch]
2020-03-11 12:14:43 -04: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