Commit Graph

48 Commits

Author SHA1 Message Date
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
Matt Peters
7ad238a806 AssetRegistry includes (Engine/Source): change #include "AssetData.h" -> #include "AssetRegistry/AssetData.h", and similar for the other moved AssetRegistry headers.
#rb Zousar.Shaker
#rnx
#preflight 6270509a220f89f0ad573030

[CL 20016982 by Matt Peters in ue5-main branch]
2022-05-02 18:06:48 -04:00
andrew davidson
3debbbd465 Fix FVector2D variant casts
Submitted on behalf of fred.kimberley
#rb andy.davidson
#preflight 61f8719ea6632a34f35e654b

#ROBOMERGE-AUTHOR: andrew.davidson
#ROBOMERGE-SOURCE: CL 18801709 in //UE5/Release-5.0/... via CL 18802160 via CL 18821533
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v908-18788545)

[CL 18821619 by andrew davidson in ue5-main branch]
2022-02-02 01:45:23 -05:00
lucas dower
1119e5b905 Added copy and paste for blend samples
#jira UE-107216
#rb Thomas.Sarkanen
#preflight 61bb0683bd7d5fe54eb9bbf8

#ROBOMERGE-AUTHOR: lucas.dower
#ROBOMERGE-SOURCE: CL 18474363 in //UE5/Release-5.0/... via CL 18480618
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18480693 by lucas dower in ue5-release-engine-test branch]
2021-12-16 18:21:12 -05:00
thomas sarkanen
3111c33a09 Improved appearance of below widget controls for anim nodes
Ordering of error reporting and functions switched
Incorporated debug vis for players & blendspaces into nodes
Fixed blendspace graphs not displaying functions
Also fixes regular BP composite nodes showing their error indicator in the title bar
Tweaked appearance of player nodes to incorporate their sliders

#rb Jurre.deBaare

#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 17437639 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17437665 by thomas sarkanen in ue5-release-engine-test branch]
2021-09-06 08:03:02 -04:00
danny chapman
e1267a03bf Remove ability to lock samples from BlendSpace. This didn't go into EA so there shouldn't be any backwards capatibility problems.
#jira UE-125223
#rb thomas.sarkanen

#ROBOMERGE-AUTHOR: danny.chapman
#ROBOMERGE-SOURCE: CL 17437196 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17437200 by danny chapman in ue5-release-engine-test branch]
2021-09-06 06:01:06 -04:00
jose villarroel
2fba927bad Fix for overshoot w/ blendspace smoothing
Renamed GetWeight (deprecated) to GetClampedWeight
[at]Danny.Chapman
[FYI] Caleb.Longmire
#preflight 611a8b8a8ff5540001d82efc

#ROBOMERGE-SOURCE: CL 17177456 via CL 17177491
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17177506 by jose villarroel in ue5-release-engine-test branch]
2021-08-16 12:40:51 -04:00
danny chapman
4cab553815 Navigation into/out of Blendspace graphs
#rb thomas.sarkanen
#jira UE-117372

#ROBOMERGE-SOURCE: CL 16771404 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16771411 by danny chapman in ue5-release-engine-test branch]
2021-06-24 08:41:55 -04:00
danny chapman
81011ded4d Remove sample connection drawing in blendspace when using the grid
#rb thomas.sarkanen
#jira UE-118637

#ROBOMERGE-SOURCE: CL 16769794 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16769799 by danny chapman in ue5-release-engine-test branch]
2021-06-24 05:05:22 -04:00
jurre debaare
8cead34a90 Moving samples in Blend Spaces creates multiple/continuous undo points
#fix added inter-frame scoped transaction for interactive changes to blend samples, and patched up paths which should broadcast interactive/non-interactive versions of OnSampleMoved
#misc added scoped transaction to blendspace sample analysis
#misc float-to-double truncation fix
#jira UE-106304
#preflight 60cb38ff4ce02c0001d445ba
#rb Danny.Chapman, Thomas.Sarkanen

#ROBOMERGE-SOURCE: CL 16704023 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16704027 by jurre debaare in ue5-release-engine-test branch]
2021-06-17 09:49:09 -04:00
danny chapman
8adff3cc22 Improve blendspace drawing with the grid. Makes it default to off when using the grid, too. Show an underlay on "bad" samples when using the grid.
#jira UE-114518,UE-116195
#rb thomas.sarkanen

#ROBOMERGE-SOURCE: CL 16659510 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v834-16658389)

[CL 16659514 by danny chapman in ue5-release-engine-test branch]
2021-06-14 12:06:28 -04:00
danny chapman
88b18ac0ba Makes the analysis functions more easily available for use by custom analysis. Implements Locomotion and RootMotion functions as a plugin. Some improvements to the blendspace sample menu. Adds duplicate functionality to that menu too. Other miscellaneous fixes.
#preflight 60a84c581d784900014f1e0a
#rb thomas.sarkanen

[CL 16428962 by danny chapman in ue5-main branch]
2021-05-22 06:49:19 -04:00
danny chapman
e54fad360e Analysis for BlendSpace. Also includes:
Tweaks to the rendering of blendspaces, including separating the graph from the buttons
Context menu changes for the sample details
Changes to AnimationBlueprintLibrary and AnimPose from Jurre to help get the poses during analysis

#jira UE-114512
#rb thomas.sarkanen

[CL 16356830 by danny chapman in ue5-main branch]
2021-05-17 15:03:56 -04:00
danny chapman
bbb042dc7a Improve BlendSpace Smoothing, adding options like SpringDamper, Ease In/Out and Exponential. Make existing blendspace assets use the grid for interpolation by default. Tidyup to make UI naming etc (more) consistent.
#rb thomas.sarkanen
#jira UE-110461,UE-110921

[CL 15766043 by danny chapman in ue5-main branch]
2021-03-22 13:43:03 -04:00
danny chapman
6f91447a33 Improve the way the preview position etc are shown and used. Some code tidyup too, removing unnecessary checks on BlendSpace.Get()
#jira UE-110317

[CL 15739969 by danny chapman in ue5-main branch]
2021-03-18 14:19:53 -04:00
matt kuhlenschmidt
f7429effc9 UMG reskin cleanup
#jira UETOOL-2622

#ROBOMERGE-SOURCE: CL 15734177 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15737074 by matt kuhlenschmidt in ue5-main branch]
2021-03-18 08:38:12 -04:00
danny chapman
327bc41cf6 Fix static analysis warning
#jira UE-110178
#rb trivial

[CL 15641692 by danny chapman in ue5-main branch]
2021-03-08 12:39:00 -04:00
danny chapman
08c9a4bbc2 Use triangulation at runtime in BlendSpace. This is coupled with changes to the BlendSpace UI.
#jira UE-108158
#rb thomas.sarkanen

[CL 15626759 by danny chapman in ue5-main branch]
2021-03-05 13:37:08 -04:00
thomas sarkanen
c2c775b6ad Re-added missing include to fix non-unity build
#jira UE-109459 - //UE5/Release-5.0-EarlyAccess - NonUnity Compile UnrealEditor Win64 - errors in SAnimationBlendSpaceGridWidget.cpp
#rb trivial

#ROBOMERGE-SOURCE: CL 15557348 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15557396 by thomas sarkanen in ue5-main branch]
2021-03-01 11:07:16 -04:00
thomas sarkanen
fbf3d2ec7a Changed Blendspace preview behavior & misc fixes
Preview point can no longer be dragged by just clicking on it. Now the only way to move it is to shift-drag. This is reflected in the various status and help messages.
Also fixed up some drawing issues:
- Preview point is now drawn underneath sample points
- Preview point is now a cross rather than the same icon as a sample point. This means it is visible when drawn co-incident with a sample
- Icons for arrows & points were being drawn at the wrong size.
- Settings icons (e.g. triagulation, labels) were of the wrong color
- Triangulation was over-bright
- Labels needed to dim triangulation when visible because they used the same color. Now they have a background so they are more readable and color is no longer dimmed.

#jira UE-108913 - BlendSpace Graph preview pin snaps back to the center of the Graph
#rb Danny.Chapman

#ROBOMERGE-OWNER: thomas.sarkanen
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 15515048 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)
#ROBOMERGE-CONFLICT from-shelf

[CL 15515188 by thomas sarkanen in ue5-main branch]
2021-02-24 12:03:57 -04:00
danny chapman
9a6d7ca014 Reworks BlendSpace to make UBlendSpace the main runtime class, which is able to handle 1 and 2 dimensions.
#jira UE-108155
#rb thomas.sarkanen

[CL 15406467 by danny chapman in ue5-main branch]
2021-02-15 10:12:58 -04:00
danny chapman
7a8204d8fe Fix divide by zero when the blend space grid widget is opened without data
#rb thomas.sarkanen

#ROBOMERGE-SOURCE: CL 15315548 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15315558 by danny chapman in ue5-main branch]
2021-02-04 11:27:45 -04:00
danny chapman
429016078e Show the current as well as target preview position in BlendSpaces
#jira UE-107436

[CL 15271911 by danny chapman in ue5-main branch]
2021-02-01 13:01:45 -04:00
Thomas Sarkanen
79c9b00eea Misc BlendSpace 2.0 fixes
Fixed drag/drop of samples in blend space graphs.
Fixed issues around replacing samples and stale anim graph tabs when replacing/deleting samples.
Prevented sample point graph duplication from My Blueprint.
Preserved sync groups when converting from players to graphs.

#jira none
#rb Jurre.deBaare

[CL 15216418 by Thomas Sarkanen in ue5-main branch]
2021-01-27 07:24:02 -04:00
Thomas Sarkanen
5419497f90 BlendSpace 2.0: Blendspace Graph Node
Added a new animation graph node that hosts its own UBlendSpaceBase. Modified UBlendSpaceBase to allow for pose links to be evaluated as the sample points.
The new blend space graphs can be spawned from existing UBlendSpace and UBlendSpace1D assets, or they can be created from scratch, or they can be converted from existing blendspace player nodes via the context menu.

Fixed anim node conversion functions so that their transactions work correctly.

Updated FBlueprintEditorUtils::IsGraphNameUnique to allow it to work with any object as the outer, not just UBlueprint. UBlueprint still has a special case for functions and events. This is to support GenerateUniqueGraphName within a scope (e.g. an outer graph).

Formalized the concept of 'node sub-graphs' (as well as the composite node pattern a little). Previously a number of known node types that contained sub-graphs (e.g. UK2Node_Composite) had special case logic for dealing with node/graph deletion etc. Now  any node can opt into this behaviour via the GetSubGraphs() override.

Added status bar readouts for the blendspace grid, so we dont have to stuff the prompts into the tooltip any more.

Moved anim BP related APIs out of FBlueprintEditor. They are always used via FAnimationBlueprintEditor.

Refactored graph title bar widget creation out into a function to allow other document tab factories to create it.

Altered breadcrumb trail click callbacks and SMyBlueprint::ExecuteAction to always JumpToHyperLink rather than calling OpenDocument directly. This allows unknown (to FBlueprintEditor) document types that reference objects to be correctly jumped to using the breadcrumb trail. Derived asset editors (i.e. FAnimationBlueprintEditor) can intercept the JumpToHyperlink call to ensure that the correct document is presented (i.e. the correct tab payload is generated).

Instead of making yet another bunch of duplicated code for handling the various alpha blend options, refactored this into FAnimGraphNodeAlphaOptions (for editor code) and FAnimNodeAlphaOptions (for runtime code).

Added OnCopyTermDefaultsToDefaultObject for per-node copying of default values from editor node to runtime node, rather than another special-case in the compiler.

#rb Jurre.deBaare,Phillip.Kavan

[CL 15177316 by Thomas Sarkanen in ue5-main branch]
2021-01-25 08:43:19 -04:00