Commit Graph

161 Commits

Author SHA1 Message Date
helge mathee
7f3b86bc17 Improving the PoseDriver by
* adding debug drawing for the cones used for each target
* adding a new normalization mode using a median cone
* adding overrides for distance method + function type per target
* improving the reloading of the pose list to maintain settings for known poses

#rb Lina.Halper, James.Golding

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 5089485 via CL 5091026 via CL 5091045
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5137836 by helge mathee in Dev-Networking branch]
2019-02-22 05:13:28 -05:00
aaron cox
df464ffb6e [CODEREVIEW] Laurent.Delayen, Lina.Halper
[FYI] Luke.Tannenbaum

Validate BaseBoneRef in Update FAnimNode_RigidBody::IsValidToEvaluate(). Should fix crashes caused by referencing bones that don't exist at some LODs.

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: aaron.cox
#ROBOMERGE-SOURCE: CL 5064673 via CL 5065477 via CL 5066422
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5136533 by aaron cox in Dev-Networking branch]
2019-02-22 04:06:35 -05:00
helge mathee
b0aa77e5ce Original CLs 4985309, 4986255
Fixed a bug as uncovered by the new unit test (to be checked in in a separate submit).

* Added a new automation test file setup for animation
* Added a unit test for the calculate velocity node.


#rb Lina.Halper
#rb Aaron.Cox


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 4996498 via CL 4996991 via CL 5000426
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5083846 by helge mathee in Dev-Networking branch]
2019-02-19 19:24:30 -05:00
helge mathee
6d192bd6ec Fix copyright issue in KismetAnimationTypesHeader
#jira UE-70000
#rb Lina.Halper


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 4983061 via CL 4986905 via CL 4989212
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5080251 by helge mathee in Dev-Networking branch]
2019-02-19 18:44:15 -05:00
helge mathee
02f9f477c0 Added three new blueprint nodes:
1) An easing node which can take a float value and run it through most of the easing functions available in FMath
2) A node to record motions over time and output an averaged velocity. This is useful for tracking the velocity of say a weapon and drive secondary effects.
3) A node which is a monolithic large version of 2) to make it easy for riggers to track the velocity of a bone / socket.

#rb Lina.Halper, Laurent.Delayen
[FYI] Laurent.Delayen


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 4974686 via CL 4975432 via CL 4976695
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5077692 by helge mathee in Dev-Networking branch]
2019-02-19 18:14:34 -05:00
lina halper
5b2cc92491 fix issue with having invalid link node id causing it to create circular link
#rb:Aaron.Cox
#jira: UE-67036

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 4939012 in //UE4/Release-4.22/... via CL 4939014
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5068599 by lina halper in Dev-Networking branch]
2019-02-19 15:37:02 -05:00
max chen
5ecdae61c8 Jittery Sequencer Animations with RateScale > 0.0
Two changes fixed this. First we invert out the RateScale when calculating the PlayRate inside  FAnimNode_SequenceEvaluator::UpdateAssetPlayer, since it get's multiplied back in the CreateTickRecordForNode function.   This stops the jittering but the animation playback isn't scaled. To fix that we modify the Sequencer sections PlayRate by the asset'ss RateScale.

#jira UE-63636
#rb max.chen, martin.wilson

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 4896912 in //UE4/Release-4.22/... via CL 4896913
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4911007 by max chen in Dev-Networking branch]
2019-02-05 18:42:17 -05:00
ryan gerleve
f9c954fabb Fix merge conflict
/src/ROBOMERGE_ENGINE_Dev_Networking/FortniteGame/Content/Collections/Audit_InCook_BROnly.collection - merging //UE4/Main/FortniteGame/Content/Collections/Audit_InCook_BROnly.collection#63


--------------------------------------
Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4859489 by ryan gerleve in Dev-Networking branch]
2019-01-31 12:42:57 -05:00
thomas sarkanen
3ff0651d51 Use move semantics to reduce memcpy() overhead when evaluating animation
Poses & curves are now moved instead of copied where possible.
Also removed needless passing of bone space transforms to UAnimInstance::ParallelEvaluateAnimation, which further removes an extra allocation for sub-instances.

#rb Martin.Wilson

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 4810269 via CL 4810272 via CL 4812712 via CL 4812722
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4812775 by thomas sarkanen in Dev-Networking branch]
2019-01-25 11:49:48 -05:00
thomas sarkanen
d8c33a49a7 Removed NaN check that was still getting compiled in Test/Shipping
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 4810258 via CL 4810259 via CL 4812711 via CL 4812721
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4812774 by thomas sarkanen in Dev-Networking branch]
2019-01-25 11:49:45 -05:00
lina halper
b40d8aa0e8 support correct sourcepose for curvesource node
https://udn.unrealengine.com/questions/407109/view.html

#rb:Martin.Wilson
#code review:Thomas.Sarkanen
#jira: none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 4800727 via CL 4803681 via CL 4804958
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4805145 by lina halper in Dev-Networking branch]
2019-01-24 16:34:15 -05:00
marc audy
ca037cc449 Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) [at] 4803512
#rb
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4803543 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4804431 by marc audy in Dev-Networking branch]
2019-01-24 16:07:24 -05:00
thomas sarkanen
7ce2df7b88 Fixed sorting & layout issues with anim nodes
Fixed anim node details customization so that it respects code re-ordered parameters and ordering metadata.
Fixed EditCondition and (As Pin) indicators causing double-checkboxes.
Moved (As Pin) indicators to a right-aligned checkbox instead of right-aligning the label.
Reordered anim node properties: AnimDynamics, ApplyAdditive, BlendBoneByChannel.

Also manually resized the 'eye' icon (as it was box filtered form 40x40) & fixed up asymmetric padding for its checkbox style. This means 'public' checkboxes in Blueprints are now square!

#rb Jurre.deBaare

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 4738868 via CL 4738870 via CL 4738871 via CL 4738872
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4738875 by thomas sarkanen in Dev-Networking branch]
2019-01-17 04:08:30 -05:00
ben marsh
cf4a18955c Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4718806 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4718825 by ben marsh in Dev-Networking branch]
2019-01-14 12:15:37 -05:00
thomas sarkanen
1f0c2aa9dc Making copy pose thread-safe
Moved the work to acquire the bone transforms to PreUpdate on the game thread.
Supported master-pose by checking whether what we are copying is running master-pose (this potentially fixes issues where character heads/hats can detach).
Profiled, this averages ~8us on console per call, so not too bad.

#rb Lina.Halper
[FYI] Lina.Halper

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 4691593 via CL 4692711
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4710653 by thomas sarkanen in Dev-Networking branch]
2019-01-11 13:01:10 -05:00
satchit subramanian
d75e3790f7 Change default value for FAnimNode_RigidBody::bForceDisableCollisionBetweenConstraintBodies
to be false in order to not break existing assets.

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: satchit.subramanian
#ROBOMERGE-SOURCE: CL 4691097 via CL 4691100
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4710536 by satchit subramanian in Dev-Networking branch]
2019-01-11 12:58:49 -05:00
lina halper
b1400cb8b2 Moved CreateConstraint out of disable collision if statement
================================
[FYI] Satchit.Subramanian

#jira:none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 4669256 via CL 4689399
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4710210 by lina halper in Dev-Networking branch]
2019-01-11 12:49:44 -05:00
thomas sarkanen
836356b5b6 Back out changelist 4688737
Just in case - found a potential regression with the editor after this went in.

#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 4688910 via CL 4689070
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4710168 by thomas sarkanen in Dev-Networking branch]
2019-01-11 12:48:12 -05:00
thomas sarkanen
c7ad0a429b Making copy pose thread-safe
Moved the work to acquire the bone transforms to PreUpdate on the game thread.
Supported master-pose by checking whether what we are copying is running master-pose (this potentially fixes issues where character heads/hats can detach).
Profiled, this averages ~8us on console per call, so not too bad.

#rb Lina.Halper

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 4688737 via CL 4689055
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4710153 by thomas sarkanen in Dev-Networking branch]
2019-01-11 12:47:52 -05:00
James Hopkin
235137b0cc Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
Copying to Dev-Main @ CL# 4688301

#rb none

[CL 4707991 by James Hopkin in Dev-Networking branch]
2019-01-11 02:57:03 -05:00
ben marsh
2b46ba7b94 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4662404 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4662413 by ben marsh in Dev-Networking branch]
2018-12-14 13:44:01 -05:00
ben marsh
3c80001dcf Fix missing or incorrect copyright notices.
#rb none
#rnx
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4661905 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4661912 by ben marsh in Dev-Networking branch]
2018-12-14 11:22:02 -05:00
ryan gerleve
9843ebaa9f Merging conflict by hand.
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs - merging //UE4/Main/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp#1


--------------------------------------
Copying //UE4/Dev-Physics to //UE4/Dev-Main.

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 4653110 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4653305 by ryan gerleve in Dev-Networking branch]
2018-12-12 11:43:42 -05:00
max chen
43fe4d6f9b Copying //UE4/Dev-Sequencer to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 4629913 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4629932 by max chen in Dev-Networking branch]
2018-12-04 17:10:23 -05:00
ryan gerleve
289a4fa159 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4567513 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4573136 by ryan gerleve in Dev-Networking branch]
2018-11-16 14:01:06 -05:00