Files
UnrealEngineUWP/Engine/Source/Developer/TreeMap/TreeMap.cpp

726 lines
23 KiB
C++
Raw Normal View History

// Copyright Epic Games, Inc. All Rights Reserved.
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3209340) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3209340 on 2016/11/23 by Ben.Marsh Convert UE4 codebase to an "include what you use" model - where every header just includes the dependencies it needs, rather than every source file including large monolithic headers like Engine.h and UnrealEd.h. Measured full rebuild times around 2x faster using XGE on Windows, and improvements of 25% or more for incremental builds and full rebuilds on most other platforms. * Every header now includes everything it needs to compile. * There's a CoreMinimal.h header that gets you a set of ubiquitous types from Core (eg. FString, FName, TArray, FVector, etc...). Most headers now include this first. * There's a CoreTypes.h header that sets up primitive UE4 types and build macros (int32, PLATFORM_WIN64, etc...). All headers in Core include this first, as does CoreMinimal.h. * Every .cpp file includes its matching .h file first. * This helps validate that each header is including everything it needs to compile. * No engine code includes a monolithic header such as Engine.h or UnrealEd.h any more. * You will get a warning if you try to include one of these from the engine. They still exist for compatibility with game projects and do not produce warnings when included there. * There have only been minor changes to our internal games down to accommodate these changes. The intent is for this to be as seamless as possible. * No engine code explicitly includes a precompiled header any more. * We still use PCHs, but they're force-included on the compiler command line by UnrealBuildTool instead. This lets us tune what they contain without breaking any existing include dependencies. * PCHs are generated by a tool to get a statistical amount of coverage for the source files using it, and I've seeded the new shared PCHs to contain any header included by > 15% of source files. Tool used to generate this transform is at Engine\Source\Programs\IncludeTool. [CL 3209342 by Ben Marsh in Main branch]
2016-11-23 15:48:37 -05:00
#include "CoreMinimal.h"
#include "Misc/Paths.h"
#include "Fonts/SlateFontInfo.h"
#include "Fonts/FontMeasure.h"
#include "Framework/Application/SlateApplication.h"
#include "ITreeMap.h"
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3209340) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3209340 on 2016/11/23 by Ben.Marsh Convert UE4 codebase to an "include what you use" model - where every header just includes the dependencies it needs, rather than every source file including large monolithic headers like Engine.h and UnrealEd.h. Measured full rebuild times around 2x faster using XGE on Windows, and improvements of 25% or more for incremental builds and full rebuilds on most other platforms. * Every header now includes everything it needs to compile. * There's a CoreMinimal.h header that gets you a set of ubiquitous types from Core (eg. FString, FName, TArray, FVector, etc...). Most headers now include this first. * There's a CoreTypes.h header that sets up primitive UE4 types and build macros (int32, PLATFORM_WIN64, etc...). All headers in Core include this first, as does CoreMinimal.h. * Every .cpp file includes its matching .h file first. * This helps validate that each header is including everything it needs to compile. * No engine code includes a monolithic header such as Engine.h or UnrealEd.h any more. * You will get a warning if you try to include one of these from the engine. They still exist for compatibility with game projects and do not produce warnings when included there. * There have only been minor changes to our internal games down to accommodate these changes. The intent is for this to be as seamless as possible. * No engine code explicitly includes a precompiled header any more. * We still use PCHs, but they're force-included on the compiler command line by UnrealBuildTool instead. This lets us tune what they contain without breaking any existing include dependencies. * PCHs are generated by a tool to get a statistical amount of coverage for the source files using it, and I've seeded the new shared PCHs to contain any header included by > 15% of source files. Tool used to generate this transform is at Engine\Source\Programs\IncludeTool. [CL 3209342 by Ben Marsh in Main branch]
2016-11-23 15:48:37 -05:00
#include "XmlFile.h"
typedef TSharedPtr<class FTreeMapNode> FTreeMapNodePtr;
typedef TSharedRef<class FTreeMapNode> FTreeMapNodeRef;
/**
* Rectangle used for tree maps
*/
struct FTreeMapRect
{
/** Position of the rectangle */
FVector2D Position;
/** Dimensions of the rectangle */
FVector2D Size;
/** Default constructor */
FTreeMapRect()
: Position( FVector2D::ZeroVector ),
Size( FVector2D::ZeroVector )
{
}
};
/**
* Single node in a tree map, which may have any number of child nodes, each with their own children and so on
*/
class FTreeMapNode
{
public:
/** Pointer to the source data for this node */
FTreeMapNodeDataPtr Data;
/** List of child nodes */
TArray< FTreeMapNodePtr > Children;
/** For leaf nodes, the size of this node. For non-leaf nodes, the size of all of my child nodes. */
float Size;
/** Node rectangle */
FTreeMapRect Rect;
/** Node rectangle, with padding applied */
FTreeMapRect PaddedRect;
/** Font to use for this node's title */
FSlateFontInfo NameFont;
/** Font to use for this node's second line title */
FSlateFontInfo Name2Font;
/** Font to use for this node's centered text */
FSlateFontInfo CenterTextFont;
/** True if the node is 'interactive'. That is, we have enough room for a title area and padding for the node to be clicked on */
bool bIsInteractive;
Copying WEX-Staging @ (WEX/Main @ 3740665) to //UE4/Main #lockdown Nick.Penwarden #rb none Copying //UE4/WEX-Staging to //UE4/Dev-Main (Source: //WEX/Main/Engine @ 3740665) #lockdown Nick.Penwarden Change 3739326 by Ben.Zeigler Change iteration order of depends nodes so it lists hard management references before soft management references, this is better for the UI when lots of references exist Update text for loading custom asset registry bin to be clearer Change 3739000 by John.Opila Caching optimization for text widget desired size. Change 3713551 by David.Nikdel Allow Set Properties to recognize Json array values as importable. Change 3712485 by Josh.May Added Pete's fix for the PLATFORM_TVOS/PLATFORM_IOS #define conflict introduced by mach-o/loader.h Change 3700174 by Chris.Babcock Fix setFilters crash on some Android devices Change 3691531 by Josh.May Fixed an intermittent crash that occurred when opening the AssetAuditBrower. AssetManagerEditorModule's CurrentRegistrySource was getting set too early, becoming invalid in the event that RegistrySourceMap is resized. Change 3688409 by Gil.Gribb Critical fix for an extremely rare race condition on async IO. Change 3687529 by josh.may Force layout recalculations for single-pass layout SScaleBoxes when their final scale is zero. This tends to occur in calls to SearchForWidgetRecursively before a SScaleBox's AllottedGeometry has been calculated. Change 3684788 by Peter.Sauerbrei fix for archive generation on the build machines Change 3684320 by john.opila Workaround for widgets disappering. Ensuring scale is never 0 so we don't get divide by zero. Change 3684042 by Peter.Sauerbrei more logging to figure out why there is not data in the Applicaiton diretory of the archive Change 3678620 by Ben.Zeigler Minor text changes to size map Change 3678314 by Ben.Zeigler Add Make Collection With References and Audit References to Size Map to easily allow inspecting the specific set of filtered packages in other tools Change 3677875 by Ben.Zeigler Fix crash in size map from keeping reference to node after map was resized, and undo the Name->DisplayName rename as it could affect licensees Change 3676899 by Peter.Sauerbrei narrowed down to the plist data, trying to figure out if it is missing or not Change 3676570 by Peter.Sauerbrei more logging to track down the archive error Change 3676293 by Peter.Sauerbrei fix for compile failure on IOS Change 3676172 by Peter.Sauerbrei potential fix for missing icons in the ipa when run through the build machines Change 3673544 by Ben.Zeigler Sort AllChunksInfo alphabetically so the order is consistent accross build and platforms to facillitate diffing Change 3671597 by Peter.Sauerbrei Merging //UE4/Dev-Mobile/Engine/... to //WEX/Main/Engine/... Change 3670932 by Ben.Zeigler Change it so cooking with the AssetManager writes out AllChunksInfo.csv next to the DevelopmentAssetRegistry, but not the per-chunk csv files as those are not useful. Also made the size counts platform accurate Change 3670906 by Peter.Sauerbrei update WEX for building with Xcode 9 Change 3660026 by Josh.May Moved SWebBrowserView's parent window "searches" to OnPaint. There's definitely something wrong with FindWidgetWindow... Even after deferring SWebBrowserView's calls to FindWidgetWindow until first Tick, the same widget layout artifacts could occur after opening multiple SWebBrowserViews. And, as Nick pointed out in the related email thread, this approach is also more efficient. Change 3655411 by Josh.May Ensure SWebBrowserView's parent window searches are deferred until after Construct. We haven't puzzled through it yet, but calling FindWidgetWindow during Construct seems to corrupt some Slate state. Deferring this search until later gets around the issue and makes sense anyway, given the widget isn't added to the hierarchy until after Construct. Change 3655407 by John.Opila Sneaking in some stats for SpawnActor. Change 3654649 by Ben.Zeigler Refactor SizeMap and ReferenceViewer into the AssetManagerEditor plugin, and delete the old modules. Fix SizeMap crash that I temporarily added. TreeMap is initialized weirdly Change 3648912 by Ben.Zeigler First half of changes to refactor sizemap/reference viewer into the asset manager editor plugin Add GetAllContentBrowserCommandExtenders to ContentBrowserModule that allows registering commands/keybinds to extend the content browser via plugins Add GetSharedMenu/ToolbarExtensibilityManager to AssetEditorToolkit that allows extending the generic asset editor via plugin Move the code to spawn the Reference Viewer and SizeMap into the AssetManagerEditor plugin so these UIs can be tightly bound and share data. This also enables keybinds for Size Map and Audit. Remove size map from the save as dialog, it created a special modal size map window that will not work after my refactor Change 3639419 by Ben.Marsh Use DirectoryInfo instead of DirectoryReference to enumerate projects. Tracking down UHT compile failures on Mac. Change 3638619 by David.Nikdel AsyncLoading: Suggested change by Gil to add lock prior to changing LoadPhase to WaitingForHeader (presumably to make FArchiveAsync2::StartReadingHeader's assumption about locking true) Change 3633562 by Chris.Babcock Update Android virtual keyboard support Change 3630564 by Peter.Sauerbrei fix for the manifest stage problem Change 3629577 by Chris.Babcock Fix merge errors in GameActivity.java Change 3629154 by David.Nikdel Disable debug device output in shipping builds (even if logs are enabled) Change 3626542 by John.Opila Back out changelist 3603452 Undoing the OpenGL load changes as the initial load time was just too damn high! Change 3620472 by David.Nikdel Fix from Nick to fix a BP that crashes on Compile Change 3618090 by Josh.May Reset inertial scrolling for SScrollboxes and STableView-based Slate widgets when scrolling to specific scroll offsets. Change 3613980 by Chris.Babcock Fix issue with Android password keyboard input Change 3603825 by John.Opila Shader change doesn't seem to like standalone PC. Change 3603452 by John.Opila Moving openGL shader compilation into loading instead of at the last minute. Change 3593008 by David.Nikdel Merging CL 3504471 from //Fortnite/Dev-Cinematics/Engine/... to //WEX/Main/Engine/... ---------------------------------------- Sequencer: Delay mouse capture until drag for sequencer time slider - Fixes context menus not opening as a result of mouse capture being taken on mouse down ================================================================================================= THESE CHANGES TOUCH MULTIPLE PLATFORMS ================================================================================================= Change 3739931 by Ben.Zeigler changes to some asset manager code modified on WEX, and fix several FStringAssetReference->FSoftObjectPath Change 3723451 by Josh.May Exposed OnBeforePopup to UMG and Blueprint for UWebBrowser. This is triggered by the CEFBrowserHandler when attempting to open hyperlinks targeting _blank and, when not handled, would result in the page never loading. Added OnBeforePopup handling for the HTMLNewsWidget, ensuring the URLs are opened in an external browser. Change 3711256 by Dmitriy.Dyomin Fixed: Friend list invalidation panel relative transform caching issues Also fixed issues with and set slate.cacherenderdata=0 for better batching Change 3698695 by Josh.May Made the UMG default font overridable via config, allowing us to replace it with a game-scope localized Font asset. If there's a better place for this mechanism/accessor to live, please let me know. Added a new 'Default' font that replicates '/Engine/EngineFonts/Roboto'. This also has a localized Font asset variant for zh-Hans. Change 3676085 by Josh.May Implemented MulticastBroadcastReceiver, a BroadcastReceiver capable of "multicasting" intents to other receivers. AppsFlyer defines a similar MultiInstallBroadcastReceiver class specific to the INSTALL_REFERRER intent, but it MUST be the very first one defined (cannot be guaranteed in our build pipeline AFAIK). Added MulticastBroadcastReceiver (for INSTALL_REFERRER) to the AndroidManifest generation logic, allowing BOTH Adjust and AppsFlyer to receive the intent. Added dev channel support for AndroidAppsFlyer, enabled conditionally based on shipping/distribution and whether or not a valid AppsFlyerDevChannel name is specified. For WEX, our dev channel is WEX_Dev. Fixed AppsFlyer_EventAttribute's Java class lookups and constructor signature. Change 3670860 by Ben.Zeigler First version of improvements to tools to analyze chunks Size Map and Reference Viewer now support reading cooked asset data and displaying chunks. Changing the platform dropdown in the Asset Audit window switches the other windows as well Asset Audit window now has "Add Chunks" button, and selecting AllTypes in the Primary Asset drop down will add all primary assets Size Map now shows Disk Size by default, and supports a right click context menu Significant UI improvements to all 3 tools, including keybind support Split Manage references into Hard and Soft, where Hard are set explicitly and soft are inherited. This allows determining why an asset was included in a chunk/primary asset When the AssetManager builds management information for the audit browser/cooker, it now precomputes a chunk mapping for relevant assets. PackageChunkType is used to refer to these virtual primary assets Add callback to content browser delegates to handle adding arbitrary FAssetData to an asset view, used to show chunks Several changes to the ITreeMap UI used by size map Change 3670290 by Josh.May Added AppleAppID configs for AppsFlyer. Added AdSupport and iAd frameworks for IOSAppsFlyer. According to the AppsFlyer documentation, these are required for IDFA and Apple Search Ads tracking. Change 3643531 by Peter.Sauerbrei fix for save game location and certain data backed up to the cloud when it shouldn't Change 3629303 by Ben.Zeigler Merge fix for shared ptr corruption in async loading thread from Main, and enable asnyc loading thread for WEX Copy of CL #3623261 and 3625806 Change 3629219 by Peter.Sauerbrei Merging using WEX_Main_to_UE4_WEX_Staging bringing over the files that Stan didn't have access to Change 3629063 by Stanley.Hayes Engine Merge: Merging using WEX_Main_to_UE4_WEX_Staging(flipped) Change 3618988 by Josh.May Reimplemented DevicePerformanceBucket-based WorldMap class selection to account for the WorldMap actor being pre-serialized into the UMAP. On a related note, ChildActorComponents marked as "editor only" now mark their spawned Actors as Transient to prevent them from getting serialized at cook-time. Change 3597981 by Josh.May Converted WExpCampaignDefinition's RegionDefinition refs back to hard references and, to compensate, converted WExpZoneDefinition's ZoneBoss refs to soft references. This moves the RegionDefinitions and ZoneDefinitions from chunk 2 to chunk 1 without pulling in assets for the ZoneBosses. This also allows us to grab the ZoneBoss refs during UWExpAssetManager::GetMainMenuAssetList. Reworked UWExpAssetManager::GetMainMenuAssetList and UWExpAssetManager::GetLevelAssetList to build more "complete" asset lists by expanding lists of PrimaryAssetIds. Tweaked the WorldMap's ZoneBoss spawning to account for the switch to AssetPtrs. Change 3581214 by Josh.Markiewicz added cookie deletion for Google on logout [CL 3750870 by Stanley Hayes in Main branch]
2017-11-10 17:20:53 -05:00
/** True if the node is visible at all, if false drawing will skip this entirely */
bool bIsVisible;
public:
/** Default constructor for FTreeMapNode */
FTreeMapNode( const FTreeMapNodeDataRef& InitNodeData );
/** @return Returns true if this is a leaf node */
bool IsLeafNode() const
{
return Children.Num() == 0;
}
};
/**
* Tree map object
*/
class FTreeMap : public ITreeMap
{
public:
/** Default constructor for FTreeMap */
FTreeMap( const FTreeMapOptions& Options, const FTreeMapNodeDataRef& RootNodeData );
/** ITreeMap interface */
virtual TArray<FTreeMapNodeVisualInfo> GetVisuals() override;
private:
enum class ESplitDirection
{
Horizontal,
Vertical
};
/** Recursively sets up nodes in the tree */
void AddNodesRecursively( FTreeMapNodePtr& Node, const FTreeMapNodeDataRef& NodeData );
/** Recursively caches the size of each node. Leaf nodes get the size of their source node, while non-leaf nodes are set to the total size of all of their children */
void CalculateNodeSizesRecursively( const FTreeMapNodeRef& Node, float& MaxNodeSize );
/** Scales the specified node and all sub-nodes by the specified amount */
void ScaleNodesRecursively( const FTreeMapNodeRef& NodeToScale, const float ScaleFactor );
/** Sets up a node using the standard tree mapping algorithm */
void MakeStandardTreeNode( const FTreeMapOptions& Options, FTreeMap::ESplitDirection SplitDirection, const FTreeMapNodeRef& Node );
/** Sets up a node using a squarification method */
void MakeSquarifiedTreeNode( const FTreeMapOptions& Options, const FTreeMapNodeRef& Node );
/** Partitions nodes recursively */
void PartitionNodesRecursively( const FTreeMapOptions& Options, FTreeMap::ESplitDirection SplitDirection, const FTreeMapNodeRef& Node );
/** Pad all of the nodes in to make room for titles and border */
void PadNodesRecursively( const FTreeMapOptions& Options, const FTreeMapNodeRef& Node, const int32 TreeDepth );
private:
/** Root node in the tree map */
FTreeMapNodePtr RootNode;
};
FTreeMapNode::FTreeMapNode( const FTreeMapNodeDataRef& InitNodeData )
: Data( InitNodeData ),
Children(),
Size( 0.0f ),
Rect(),
PaddedRect(),
NameFont(),
Name2Font(),
CenterTextFont(),
bIsInteractive( true )
{
}
FTreeMap::FTreeMap( const FTreeMapOptions& Options, const FTreeMapNodeDataRef& RootNodeData )
{
AddNodesRecursively( RootNode, RootNodeData );
// Cache the size of every node
float MaxNodeSize = 0.0f;
CalculateNodeSizesRecursively( RootNode.ToSharedRef(), MaxNodeSize );
// Also fix up the node sizes as we go. We want the sizes to be proportional to the total display size
const float DisplaySize = Options.DisplayWidth * Options.DisplayHeight;
ScaleNodesRecursively( RootNode.ToSharedRef(), DisplaySize / MaxNodeSize ); // @todo treemap perf: Could use a scale factor w/ accessor instead of recursing here
// The root node has a fixed position and size
RootNode->Rect.Position = FVector2D::ZeroVector;
RootNode->Rect.Size = FVector2D( Options.DisplayWidth, Options.DisplayHeight );
// For regular tree types, we'll choose a "next split direction" that matches the aspect of the display area
const float DisplayAspect = Options.DisplayWidth / Options.DisplayHeight;
const bool bIsWiderThanTall = DisplayAspect >= 1.0f;
const auto SplitDirection = bIsWiderThanTall ? ESplitDirection::Horizontal : ESplitDirection::Vertical;
PartitionNodesRecursively( Options, SplitDirection, RootNode.ToSharedRef() );
// Now add space for titles and borders
const int32 TreeDepth = 0;
PadNodesRecursively( Options, RootNode.ToSharedRef(), TreeDepth );
}
void FTreeMap::AddNodesRecursively( FTreeMapNodePtr& OutNode, const FTreeMapNodeDataRef& NodeData )
{
// Setup this node
OutNode = MakeShareable( new FTreeMapNode( NodeData ) );
// Add children
for( const auto& ChildNodeData : NodeData->Children )
{
FTreeMapNodePtr ChildNode;
AddNodesRecursively( ChildNode, ChildNodeData.ToSharedRef() );
OutNode->Children.Add( ChildNode );
}
}
void FTreeMap::CalculateNodeSizesRecursively( const FTreeMapNodeRef& Node, float& MaxNodeSize )
{
// Is this a leaf node? Leaf nodes will actually determine the size of non-leaf nodes.
if( Node->IsLeafNode() )
{
// NOTE: Size should really always be greater than zero here to get good results, but we don't want to assert.
Node->Size = Node->Data->Size;
}
else
{
// Update child node sizes
float TotalSizeOfChildren = 0.0f;
float MaxSizeOfChildren = 0.0f;
for( const auto& ChildNode : Node->Children )
{
CalculateNodeSizesRecursively( ChildNode.ToSharedRef(), MaxSizeOfChildren );
TotalSizeOfChildren += ChildNode->Size;
}
// Container node. If a size was explicitly set, then we'll use that size.
if( Node->Data->Size > 0.0f )
{
Node->Size = Node->Data->Size;
// Scale the child nodes to fit into the forced container size
const float ScaleFactor = Node->Size / TotalSizeOfChildren;
{
for( const auto& ChildNode : Node->Children )
{
ScaleNodesRecursively( ChildNode.ToSharedRef(), ScaleFactor );
}
}
}
else
{
// Create a size for the node by summing it's child node sizes
Node->Size = TotalSizeOfChildren;
}
// Sort our children, largest to smallest
Node->Children.Sort( []( const FTreeMapNodePtr& A, const FTreeMapNodePtr& B ) { return A->Size > B->Size; } );
}
MaxNodeSize = FMath::Max( MaxNodeSize, Node->Size );
}
void FTreeMap::ScaleNodesRecursively( const FTreeMapNodeRef& NodeToScale, const float ScaleFactor )
{
NodeToScale->Size *= ScaleFactor;
for( const auto& ChildNode : NodeToScale->Children )
{
ScaleNodesRecursively( ChildNode.ToSharedRef(), ScaleFactor );
}
}
void FTreeMap::MakeStandardTreeNode( const FTreeMapOptions& Options, FTreeMap::ESplitDirection SplitDirection, const FTreeMapNodeRef& Node )
{
// Standard tree map algorithm. We alternate between horizontal and vertical packing of children. All children are packed
// into a single row or column. This makes it fairly easy to see the hierarchical structure of the tree, but yields really long rectangles!
FVector2D Offset( FVector2D::ZeroVector );
for( const auto& ChildNode : Node->Children )
{
ChildNode->Rect.Position = Node->Rect.Position + Offset;
const float ChildFractionOfParent = ChildNode->Size / Node->Size;
if( SplitDirection == ESplitDirection::Horizontal )
{
ChildNode->Rect.Size.X = Node->Rect.Size.X * ChildFractionOfParent;
ChildNode->Rect.Size.Y = Node->Rect.Size.Y;
Offset.X += ChildNode->Rect.Size.X;
}
else
{
ChildNode->Rect.Size.X = Node->Rect.Size.X;
ChildNode->Rect.Size.Y = Node->Rect.Size.Y * ChildFractionOfParent;
Offset.Y += ChildNode->Rect.Size.Y;
}
}
}
void FTreeMap::MakeSquarifiedTreeNode( const FTreeMapOptions& Options, const FTreeMapNodeRef& InNode )
{
// NOTE: This algorithm is explained in the paper titled, "Squarified Treemaps", by Mark Bruls, Kees Huizing, and Jarke J.van Wijk
// For squarification, we'll always choose the wider aspect direction at every split (ignoring incoming NextSplitDirection!)
struct Local
{
/** Figure out the highest aspect ratio of all of the blocks, given the length of the rectangle that we want to place these blocks into */
static float GetWorstAspectInRow( const TArray< FTreeMapNodePtr >& Nodes, const float SubRectShortestSide )
{
float MinSize = MAX_FLT;
float MaxSize = 0.0f;
float TotalSize = 0.0f;
for( const auto& Node : Nodes )
{
MinSize = FMath::Min( MinSize, Node->Size );
MaxSize = FMath::Max( MaxSize, Node->Size );
TotalSize += Node->Size;
}
float TotalSizeSquared = TotalSize * TotalSize;
float SubRectShortestSideSquared = SubRectShortestSide * SubRectShortestSide;
float WorstAspect = FMath::Max( ( SubRectShortestSideSquared * MaxSize ) / TotalSizeSquared, TotalSizeSquared / ( SubRectShortestSideSquared * MinSize ) );
return WorstAspect;
}
/** Incoming nodes should be sorted, largest to smallest */
static TArray<FTreeMapNodePtr> BuildRowFromNodes( TArray<FTreeMapNodePtr>& Nodes, const float SubRectShortestSide )
{
TArray<FTreeMapNodePtr> Row;
// Add the first child node to our row
Row.Add( Nodes[ 0 ] );
Nodes.RemoveAt( 0 );
// If there are no more nodes to sort, then we're finished for now
if( Nodes.Num() > 0 )
{
auto NewRow = Row;
do
{
NewRow.Add( Nodes[ 0 ] );
if( GetWorstAspectInRow( Row, SubRectShortestSide ) > GetWorstAspectInRow( NewRow, SubRectShortestSide ) )
{
Row = NewRow;
// Claim the node from the original list
Nodes.RemoveAt( 0 );
}
else
{
break;
}
}
while( Nodes.Num() > 0 );
}
return Row;
}
/** Figures out which nodes will fit */
static void PlaceNodes( TArray<FTreeMapNodePtr>& Row, FTreeMapRect& SubRect )
{
float TotalRowSize = 0.0f;
for( const auto& Node : Row )
{
TotalRowSize += Node->Size;
}
const FVector2D SubRectMax = SubRect.Position + SubRect.Size;
FTreeMapRect PlacementRect = SubRect;
if( SubRect.Size.X < SubRect.Size.Y )
{
// Taller than wide
float RowHeight = TotalRowSize / SubRect.Size.X;
if( PlacementRect.Position.Y + RowHeight >= SubRectMax.Y )
{
RowHeight = SubRectMax.Y - PlacementRect.Position.Y;
}
for( int32 ColumnIndex = 0; ColumnIndex < Row.Num(); ++ColumnIndex )
{
auto& Node = Row[ ColumnIndex ];
float Width = Node->Size / RowHeight;
if( PlacementRect.Position.X + Width > SubRectMax.X || ( ColumnIndex + 1 ) == Row.Num() )
{
Width = SubRectMax.X - PlacementRect.Position.X;
}
Node->Rect.Position = PlacementRect.Position;
Node->Rect.Size.X = Width;
Node->Rect.Size.Y = RowHeight;
PlacementRect.Position.X += Width;
}
const float NewY = SubRect.Position.Y + RowHeight;
SubRect.Size.Y -= NewY - SubRect.Position.Y;
SubRect.Position.Y = NewY;
}
else
{
// Wider than tall
float RowWidth = TotalRowSize / SubRect.Size.Y;
if( PlacementRect.Position.X + RowWidth >= SubRectMax.X )
{
RowWidth = SubRectMax.X - PlacementRect.Position.X;
}
for( int32 ColumnIndex = 0; ColumnIndex < Row.Num(); ++ColumnIndex )
{
auto& Node = Row[ ColumnIndex ];
float Height = Node->Size / RowWidth;
if( PlacementRect.Position.Y + Height > SubRectMax.Y || ( ColumnIndex + 1 ) == Row.Num() )
{
Height = SubRectMax.Y - PlacementRect.Position.Y;
}
Node->Rect.Position = PlacementRect.Position;
Node->Rect.Size.X = RowWidth;
Node->Rect.Size.Y = Height;
PlacementRect.Position.Y += Height;
}
const float NewX = SubRect.Position.X + RowWidth;
SubRect.Size.X -= NewX - SubRect.Position.X;
SubRect.Position.X = NewX;
}
}
};
// Squarify it!
auto ChildrenCopy = InNode->Children;
FTreeMapRect SubRect = InNode->Rect;
do
{
const auto SubRectShortestSide = FMath::Min( SubRect.Size.X, SubRect.Size.Y );
auto Row = Local::BuildRowFromNodes( ChildrenCopy, SubRectShortestSide );
Local::PlaceNodes( Row, SubRect );
}
while( ChildrenCopy.Num() > 0 );
}
void FTreeMap::PartitionNodesRecursively( const FTreeMapOptions& Options, FTreeMap::ESplitDirection SplitDirection, const FTreeMapNodeRef& Node )
{
// Store off our padded copy of the rectangle. We'll actually do the padding later on.
Node->PaddedRect = Node->Rect;
if( !Node->IsLeafNode() )
{
if( Options.TreeMapType == ETreeMapType::Standard )
{
MakeStandardTreeNode( Options, SplitDirection, Node );
}
else if( Options.TreeMapType == ETreeMapType::Squarified )
{
MakeSquarifiedTreeNode( Options, Node );
}
// The default algorithm just alternates between horizontal and vertical. The squarification algorithm ignores this.
auto NextSplitDirection = ( SplitDirection == ESplitDirection::Horizontal ) ? ESplitDirection::Vertical : ESplitDirection::Horizontal;
// Process children
for( const auto& ChildNode : Node->Children )
{
PartitionNodesRecursively( Options, NextSplitDirection, ChildNode.ToSharedRef() );
}
}
}
void FTreeMap::PadNodesRecursively( const FTreeMapOptions& Options, const FTreeMapNodeRef& Node, const int32 TreeDepth )
{
// Inset the container node to leave room for a border, if needed
// Don't inset the root node
const auto OriginalNodeRect = Node->Rect;
// Choose a height for this node's font
const uint16 MinAllowedFontSize = 8; // @todo treemap custom: Don't hardcode and instead make this a customizable option?
Node->NameFont = Options.NameFont;
Node->NameFont.Size = FMath::Max< int32 >( MinAllowedFontSize, Options.NameFont.Size - ( TreeDepth * Options.FontSizeChangeBasedOnDepth ) );
Node->Name2Font = Options.Name2Font;
Node->Name2Font.Size = FMath::Max< int32 >( MinAllowedFontSize, Options.Name2Font.Size - ( TreeDepth * Options.FontSizeChangeBasedOnDepth ) );
Node->CenterTextFont = Options.CenterTextFont;
Node->CenterTextFont.Size = FMath::Max< int32 >( MinAllowedFontSize, Options.CenterTextFont.Size - ( TreeDepth * Options.FontSizeChangeBasedOnDepth ) );
if( Node != RootNode )
{
// Make sure we don't pad beyond our node's size
const float ContainerOuterPadding = TreeDepth == 1 ? Options.TopLevelContainerOuterPadding : Options.NestedContainerOuterPadding;
const FVector2D MaxPadding( Node->PaddedRect.Size * 0.5f );
const FVector2D Padding( FMath::Min( ContainerOuterPadding, MaxPadding.X ), FMath::Min( ContainerOuterPadding, MaxPadding.Y ) );
Node->PaddedRect.Position += Padding;
Node->PaddedRect.Size -= Padding * 2.0f;
}
{
// The 'child area' is the area within this node that we will fit all child nodes into
auto ChildAreaRect = Node->PaddedRect;
// Unless this is a top level node, make sure the node is big enough to bother reporting to our caller. They may not want to visualize tiny nodes!
Copying WEX-Staging @ (WEX/Main @ 3740665) to //UE4/Main #lockdown Nick.Penwarden #rb none Copying //UE4/WEX-Staging to //UE4/Dev-Main (Source: //WEX/Main/Engine @ 3740665) #lockdown Nick.Penwarden Change 3739326 by Ben.Zeigler Change iteration order of depends nodes so it lists hard management references before soft management references, this is better for the UI when lots of references exist Update text for loading custom asset registry bin to be clearer Change 3739000 by John.Opila Caching optimization for text widget desired size. Change 3713551 by David.Nikdel Allow Set Properties to recognize Json array values as importable. Change 3712485 by Josh.May Added Pete's fix for the PLATFORM_TVOS/PLATFORM_IOS #define conflict introduced by mach-o/loader.h Change 3700174 by Chris.Babcock Fix setFilters crash on some Android devices Change 3691531 by Josh.May Fixed an intermittent crash that occurred when opening the AssetAuditBrower. AssetManagerEditorModule's CurrentRegistrySource was getting set too early, becoming invalid in the event that RegistrySourceMap is resized. Change 3688409 by Gil.Gribb Critical fix for an extremely rare race condition on async IO. Change 3687529 by josh.may Force layout recalculations for single-pass layout SScaleBoxes when their final scale is zero. This tends to occur in calls to SearchForWidgetRecursively before a SScaleBox's AllottedGeometry has been calculated. Change 3684788 by Peter.Sauerbrei fix for archive generation on the build machines Change 3684320 by john.opila Workaround for widgets disappering. Ensuring scale is never 0 so we don't get divide by zero. Change 3684042 by Peter.Sauerbrei more logging to figure out why there is not data in the Applicaiton diretory of the archive Change 3678620 by Ben.Zeigler Minor text changes to size map Change 3678314 by Ben.Zeigler Add Make Collection With References and Audit References to Size Map to easily allow inspecting the specific set of filtered packages in other tools Change 3677875 by Ben.Zeigler Fix crash in size map from keeping reference to node after map was resized, and undo the Name->DisplayName rename as it could affect licensees Change 3676899 by Peter.Sauerbrei narrowed down to the plist data, trying to figure out if it is missing or not Change 3676570 by Peter.Sauerbrei more logging to track down the archive error Change 3676293 by Peter.Sauerbrei fix for compile failure on IOS Change 3676172 by Peter.Sauerbrei potential fix for missing icons in the ipa when run through the build machines Change 3673544 by Ben.Zeigler Sort AllChunksInfo alphabetically so the order is consistent accross build and platforms to facillitate diffing Change 3671597 by Peter.Sauerbrei Merging //UE4/Dev-Mobile/Engine/... to //WEX/Main/Engine/... Change 3670932 by Ben.Zeigler Change it so cooking with the AssetManager writes out AllChunksInfo.csv next to the DevelopmentAssetRegistry, but not the per-chunk csv files as those are not useful. Also made the size counts platform accurate Change 3670906 by Peter.Sauerbrei update WEX for building with Xcode 9 Change 3660026 by Josh.May Moved SWebBrowserView's parent window "searches" to OnPaint. There's definitely something wrong with FindWidgetWindow... Even after deferring SWebBrowserView's calls to FindWidgetWindow until first Tick, the same widget layout artifacts could occur after opening multiple SWebBrowserViews. And, as Nick pointed out in the related email thread, this approach is also more efficient. Change 3655411 by Josh.May Ensure SWebBrowserView's parent window searches are deferred until after Construct. We haven't puzzled through it yet, but calling FindWidgetWindow during Construct seems to corrupt some Slate state. Deferring this search until later gets around the issue and makes sense anyway, given the widget isn't added to the hierarchy until after Construct. Change 3655407 by John.Opila Sneaking in some stats for SpawnActor. Change 3654649 by Ben.Zeigler Refactor SizeMap and ReferenceViewer into the AssetManagerEditor plugin, and delete the old modules. Fix SizeMap crash that I temporarily added. TreeMap is initialized weirdly Change 3648912 by Ben.Zeigler First half of changes to refactor sizemap/reference viewer into the asset manager editor plugin Add GetAllContentBrowserCommandExtenders to ContentBrowserModule that allows registering commands/keybinds to extend the content browser via plugins Add GetSharedMenu/ToolbarExtensibilityManager to AssetEditorToolkit that allows extending the generic asset editor via plugin Move the code to spawn the Reference Viewer and SizeMap into the AssetManagerEditor plugin so these UIs can be tightly bound and share data. This also enables keybinds for Size Map and Audit. Remove size map from the save as dialog, it created a special modal size map window that will not work after my refactor Change 3639419 by Ben.Marsh Use DirectoryInfo instead of DirectoryReference to enumerate projects. Tracking down UHT compile failures on Mac. Change 3638619 by David.Nikdel AsyncLoading: Suggested change by Gil to add lock prior to changing LoadPhase to WaitingForHeader (presumably to make FArchiveAsync2::StartReadingHeader's assumption about locking true) Change 3633562 by Chris.Babcock Update Android virtual keyboard support Change 3630564 by Peter.Sauerbrei fix for the manifest stage problem Change 3629577 by Chris.Babcock Fix merge errors in GameActivity.java Change 3629154 by David.Nikdel Disable debug device output in shipping builds (even if logs are enabled) Change 3626542 by John.Opila Back out changelist 3603452 Undoing the OpenGL load changes as the initial load time was just too damn high! Change 3620472 by David.Nikdel Fix from Nick to fix a BP that crashes on Compile Change 3618090 by Josh.May Reset inertial scrolling for SScrollboxes and STableView-based Slate widgets when scrolling to specific scroll offsets. Change 3613980 by Chris.Babcock Fix issue with Android password keyboard input Change 3603825 by John.Opila Shader change doesn't seem to like standalone PC. Change 3603452 by John.Opila Moving openGL shader compilation into loading instead of at the last minute. Change 3593008 by David.Nikdel Merging CL 3504471 from //Fortnite/Dev-Cinematics/Engine/... to //WEX/Main/Engine/... ---------------------------------------- Sequencer: Delay mouse capture until drag for sequencer time slider - Fixes context menus not opening as a result of mouse capture being taken on mouse down ================================================================================================= THESE CHANGES TOUCH MULTIPLE PLATFORMS ================================================================================================= Change 3739931 by Ben.Zeigler changes to some asset manager code modified on WEX, and fix several FStringAssetReference->FSoftObjectPath Change 3723451 by Josh.May Exposed OnBeforePopup to UMG and Blueprint for UWebBrowser. This is triggered by the CEFBrowserHandler when attempting to open hyperlinks targeting _blank and, when not handled, would result in the page never loading. Added OnBeforePopup handling for the HTMLNewsWidget, ensuring the URLs are opened in an external browser. Change 3711256 by Dmitriy.Dyomin Fixed: Friend list invalidation panel relative transform caching issues Also fixed issues with and set slate.cacherenderdata=0 for better batching Change 3698695 by Josh.May Made the UMG default font overridable via config, allowing us to replace it with a game-scope localized Font asset. If there's a better place for this mechanism/accessor to live, please let me know. Added a new 'Default' font that replicates '/Engine/EngineFonts/Roboto'. This also has a localized Font asset variant for zh-Hans. Change 3676085 by Josh.May Implemented MulticastBroadcastReceiver, a BroadcastReceiver capable of "multicasting" intents to other receivers. AppsFlyer defines a similar MultiInstallBroadcastReceiver class specific to the INSTALL_REFERRER intent, but it MUST be the very first one defined (cannot be guaranteed in our build pipeline AFAIK). Added MulticastBroadcastReceiver (for INSTALL_REFERRER) to the AndroidManifest generation logic, allowing BOTH Adjust and AppsFlyer to receive the intent. Added dev channel support for AndroidAppsFlyer, enabled conditionally based on shipping/distribution and whether or not a valid AppsFlyerDevChannel name is specified. For WEX, our dev channel is WEX_Dev. Fixed AppsFlyer_EventAttribute's Java class lookups and constructor signature. Change 3670860 by Ben.Zeigler First version of improvements to tools to analyze chunks Size Map and Reference Viewer now support reading cooked asset data and displaying chunks. Changing the platform dropdown in the Asset Audit window switches the other windows as well Asset Audit window now has "Add Chunks" button, and selecting AllTypes in the Primary Asset drop down will add all primary assets Size Map now shows Disk Size by default, and supports a right click context menu Significant UI improvements to all 3 tools, including keybind support Split Manage references into Hard and Soft, where Hard are set explicitly and soft are inherited. This allows determining why an asset was included in a chunk/primary asset When the AssetManager builds management information for the audit browser/cooker, it now precomputes a chunk mapping for relevant assets. PackageChunkType is used to refer to these virtual primary assets Add callback to content browser delegates to handle adding arbitrary FAssetData to an asset view, used to show chunks Several changes to the ITreeMap UI used by size map Change 3670290 by Josh.May Added AppleAppID configs for AppsFlyer. Added AdSupport and iAd frameworks for IOSAppsFlyer. According to the AppsFlyer documentation, these are required for IDFA and Apple Search Ads tracking. Change 3643531 by Peter.Sauerbrei fix for save game location and certain data backed up to the cloud when it shouldn't Change 3629303 by Ben.Zeigler Merge fix for shared ptr corruption in async loading thread from Main, and enable asnyc loading thread for WEX Copy of CL #3623261 and 3625806 Change 3629219 by Peter.Sauerbrei Merging using WEX_Main_to_UE4_WEX_Staging bringing over the files that Stan didn't have access to Change 3629063 by Stanley.Hayes Engine Merge: Merging using WEX_Main_to_UE4_WEX_Staging(flipped) Change 3618988 by Josh.May Reimplemented DevicePerformanceBucket-based WorldMap class selection to account for the WorldMap actor being pre-serialized into the UMAP. On a related note, ChildActorComponents marked as "editor only" now mark their spawned Actors as Transient to prevent them from getting serialized at cook-time. Change 3597981 by Josh.May Converted WExpCampaignDefinition's RegionDefinition refs back to hard references and, to compensate, converted WExpZoneDefinition's ZoneBoss refs to soft references. This moves the RegionDefinitions and ZoneDefinitions from chunk 2 to chunk 1 without pulling in assets for the ZoneBosses. This also allows us to grab the ZoneBoss refs during UWExpAssetManager::GetMainMenuAssetList. Reworked UWExpAssetManager::GetMainMenuAssetList and UWExpAssetManager::GetLevelAssetList to build more "complete" asset lists by expanding lists of PrimaryAssetIds. Tweaked the WorldMap's ZoneBoss spawning to account for the switch to AssetPtrs. Change 3581214 by Josh.Markiewicz added cookie deletion for Google on logout [CL 3750870 by Stanley Hayes in Main branch]
2017-11-10 17:20:53 -05:00
Node->bIsVisible = ( ChildAreaRect.Size.X * ChildAreaRect.Size.Y >= Options.MinimumVisibleNodeSize );
Node->bIsInteractive = ( TreeDepth <= 1 || ChildAreaRect.Size.X * ChildAreaRect.Size.Y >= Options.MinimumInteractiveNodeSize );
Copying WEX-Staging @ (WEX/Main @ 3740665) to //UE4/Main #lockdown Nick.Penwarden #rb none Copying //UE4/WEX-Staging to //UE4/Dev-Main (Source: //WEX/Main/Engine @ 3740665) #lockdown Nick.Penwarden Change 3739326 by Ben.Zeigler Change iteration order of depends nodes so it lists hard management references before soft management references, this is better for the UI when lots of references exist Update text for loading custom asset registry bin to be clearer Change 3739000 by John.Opila Caching optimization for text widget desired size. Change 3713551 by David.Nikdel Allow Set Properties to recognize Json array values as importable. Change 3712485 by Josh.May Added Pete's fix for the PLATFORM_TVOS/PLATFORM_IOS #define conflict introduced by mach-o/loader.h Change 3700174 by Chris.Babcock Fix setFilters crash on some Android devices Change 3691531 by Josh.May Fixed an intermittent crash that occurred when opening the AssetAuditBrower. AssetManagerEditorModule's CurrentRegistrySource was getting set too early, becoming invalid in the event that RegistrySourceMap is resized. Change 3688409 by Gil.Gribb Critical fix for an extremely rare race condition on async IO. Change 3687529 by josh.may Force layout recalculations for single-pass layout SScaleBoxes when their final scale is zero. This tends to occur in calls to SearchForWidgetRecursively before a SScaleBox's AllottedGeometry has been calculated. Change 3684788 by Peter.Sauerbrei fix for archive generation on the build machines Change 3684320 by john.opila Workaround for widgets disappering. Ensuring scale is never 0 so we don't get divide by zero. Change 3684042 by Peter.Sauerbrei more logging to figure out why there is not data in the Applicaiton diretory of the archive Change 3678620 by Ben.Zeigler Minor text changes to size map Change 3678314 by Ben.Zeigler Add Make Collection With References and Audit References to Size Map to easily allow inspecting the specific set of filtered packages in other tools Change 3677875 by Ben.Zeigler Fix crash in size map from keeping reference to node after map was resized, and undo the Name->DisplayName rename as it could affect licensees Change 3676899 by Peter.Sauerbrei narrowed down to the plist data, trying to figure out if it is missing or not Change 3676570 by Peter.Sauerbrei more logging to track down the archive error Change 3676293 by Peter.Sauerbrei fix for compile failure on IOS Change 3676172 by Peter.Sauerbrei potential fix for missing icons in the ipa when run through the build machines Change 3673544 by Ben.Zeigler Sort AllChunksInfo alphabetically so the order is consistent accross build and platforms to facillitate diffing Change 3671597 by Peter.Sauerbrei Merging //UE4/Dev-Mobile/Engine/... to //WEX/Main/Engine/... Change 3670932 by Ben.Zeigler Change it so cooking with the AssetManager writes out AllChunksInfo.csv next to the DevelopmentAssetRegistry, but not the per-chunk csv files as those are not useful. Also made the size counts platform accurate Change 3670906 by Peter.Sauerbrei update WEX for building with Xcode 9 Change 3660026 by Josh.May Moved SWebBrowserView's parent window "searches" to OnPaint. There's definitely something wrong with FindWidgetWindow... Even after deferring SWebBrowserView's calls to FindWidgetWindow until first Tick, the same widget layout artifacts could occur after opening multiple SWebBrowserViews. And, as Nick pointed out in the related email thread, this approach is also more efficient. Change 3655411 by Josh.May Ensure SWebBrowserView's parent window searches are deferred until after Construct. We haven't puzzled through it yet, but calling FindWidgetWindow during Construct seems to corrupt some Slate state. Deferring this search until later gets around the issue and makes sense anyway, given the widget isn't added to the hierarchy until after Construct. Change 3655407 by John.Opila Sneaking in some stats for SpawnActor. Change 3654649 by Ben.Zeigler Refactor SizeMap and ReferenceViewer into the AssetManagerEditor plugin, and delete the old modules. Fix SizeMap crash that I temporarily added. TreeMap is initialized weirdly Change 3648912 by Ben.Zeigler First half of changes to refactor sizemap/reference viewer into the asset manager editor plugin Add GetAllContentBrowserCommandExtenders to ContentBrowserModule that allows registering commands/keybinds to extend the content browser via plugins Add GetSharedMenu/ToolbarExtensibilityManager to AssetEditorToolkit that allows extending the generic asset editor via plugin Move the code to spawn the Reference Viewer and SizeMap into the AssetManagerEditor plugin so these UIs can be tightly bound and share data. This also enables keybinds for Size Map and Audit. Remove size map from the save as dialog, it created a special modal size map window that will not work after my refactor Change 3639419 by Ben.Marsh Use DirectoryInfo instead of DirectoryReference to enumerate projects. Tracking down UHT compile failures on Mac. Change 3638619 by David.Nikdel AsyncLoading: Suggested change by Gil to add lock prior to changing LoadPhase to WaitingForHeader (presumably to make FArchiveAsync2::StartReadingHeader's assumption about locking true) Change 3633562 by Chris.Babcock Update Android virtual keyboard support Change 3630564 by Peter.Sauerbrei fix for the manifest stage problem Change 3629577 by Chris.Babcock Fix merge errors in GameActivity.java Change 3629154 by David.Nikdel Disable debug device output in shipping builds (even if logs are enabled) Change 3626542 by John.Opila Back out changelist 3603452 Undoing the OpenGL load changes as the initial load time was just too damn high! Change 3620472 by David.Nikdel Fix from Nick to fix a BP that crashes on Compile Change 3618090 by Josh.May Reset inertial scrolling for SScrollboxes and STableView-based Slate widgets when scrolling to specific scroll offsets. Change 3613980 by Chris.Babcock Fix issue with Android password keyboard input Change 3603825 by John.Opila Shader change doesn't seem to like standalone PC. Change 3603452 by John.Opila Moving openGL shader compilation into loading instead of at the last minute. Change 3593008 by David.Nikdel Merging CL 3504471 from //Fortnite/Dev-Cinematics/Engine/... to //WEX/Main/Engine/... ---------------------------------------- Sequencer: Delay mouse capture until drag for sequencer time slider - Fixes context menus not opening as a result of mouse capture being taken on mouse down ================================================================================================= THESE CHANGES TOUCH MULTIPLE PLATFORMS ================================================================================================= Change 3739931 by Ben.Zeigler changes to some asset manager code modified on WEX, and fix several FStringAssetReference->FSoftObjectPath Change 3723451 by Josh.May Exposed OnBeforePopup to UMG and Blueprint for UWebBrowser. This is triggered by the CEFBrowserHandler when attempting to open hyperlinks targeting _blank and, when not handled, would result in the page never loading. Added OnBeforePopup handling for the HTMLNewsWidget, ensuring the URLs are opened in an external browser. Change 3711256 by Dmitriy.Dyomin Fixed: Friend list invalidation panel relative transform caching issues Also fixed issues with and set slate.cacherenderdata=0 for better batching Change 3698695 by Josh.May Made the UMG default font overridable via config, allowing us to replace it with a game-scope localized Font asset. If there's a better place for this mechanism/accessor to live, please let me know. Added a new 'Default' font that replicates '/Engine/EngineFonts/Roboto'. This also has a localized Font asset variant for zh-Hans. Change 3676085 by Josh.May Implemented MulticastBroadcastReceiver, a BroadcastReceiver capable of "multicasting" intents to other receivers. AppsFlyer defines a similar MultiInstallBroadcastReceiver class specific to the INSTALL_REFERRER intent, but it MUST be the very first one defined (cannot be guaranteed in our build pipeline AFAIK). Added MulticastBroadcastReceiver (for INSTALL_REFERRER) to the AndroidManifest generation logic, allowing BOTH Adjust and AppsFlyer to receive the intent. Added dev channel support for AndroidAppsFlyer, enabled conditionally based on shipping/distribution and whether or not a valid AppsFlyerDevChannel name is specified. For WEX, our dev channel is WEX_Dev. Fixed AppsFlyer_EventAttribute's Java class lookups and constructor signature. Change 3670860 by Ben.Zeigler First version of improvements to tools to analyze chunks Size Map and Reference Viewer now support reading cooked asset data and displaying chunks. Changing the platform dropdown in the Asset Audit window switches the other windows as well Asset Audit window now has "Add Chunks" button, and selecting AllTypes in the Primary Asset drop down will add all primary assets Size Map now shows Disk Size by default, and supports a right click context menu Significant UI improvements to all 3 tools, including keybind support Split Manage references into Hard and Soft, where Hard are set explicitly and soft are inherited. This allows determining why an asset was included in a chunk/primary asset When the AssetManager builds management information for the audit browser/cooker, it now precomputes a chunk mapping for relevant assets. PackageChunkType is used to refer to these virtual primary assets Add callback to content browser delegates to handle adding arbitrary FAssetData to an asset view, used to show chunks Several changes to the ITreeMap UI used by size map Change 3670290 by Josh.May Added AppleAppID configs for AppsFlyer. Added AdSupport and iAd frameworks for IOSAppsFlyer. According to the AppsFlyer documentation, these are required for IDFA and Apple Search Ads tracking. Change 3643531 by Peter.Sauerbrei fix for save game location and certain data backed up to the cloud when it shouldn't Change 3629303 by Ben.Zeigler Merge fix for shared ptr corruption in async loading thread from Main, and enable asnyc loading thread for WEX Copy of CL #3623261 and 3625806 Change 3629219 by Peter.Sauerbrei Merging using WEX_Main_to_UE4_WEX_Staging bringing over the files that Stan didn't have access to Change 3629063 by Stanley.Hayes Engine Merge: Merging using WEX_Main_to_UE4_WEX_Staging(flipped) Change 3618988 by Josh.May Reimplemented DevicePerformanceBucket-based WorldMap class selection to account for the WorldMap actor being pre-serialized into the UMAP. On a related note, ChildActorComponents marked as "editor only" now mark their spawned Actors as Transient to prevent them from getting serialized at cook-time. Change 3597981 by Josh.May Converted WExpCampaignDefinition's RegionDefinition refs back to hard references and, to compensate, converted WExpZoneDefinition's ZoneBoss refs to soft references. This moves the RegionDefinitions and ZoneDefinitions from chunk 2 to chunk 1 without pulling in assets for the ZoneBosses. This also allows us to grab the ZoneBoss refs during UWExpAssetManager::GetMainMenuAssetList. Reworked UWExpAssetManager::GetMainMenuAssetList and UWExpAssetManager::GetLevelAssetList to build more "complete" asset lists by expanding lists of PrimaryAssetIds. Tweaked the WorldMap's ZoneBoss spawning to account for the switch to AssetPtrs. Change 3581214 by Josh.Markiewicz added cookie deletion for Google on logout [CL 3750870 by Stanley Hayes in Main branch]
2017-11-10 17:20:53 -05:00
if( Node->bIsInteractive && Node->bIsVisible )
{
// Figure out how much space we need for the title text
const TSharedRef< FSlateFontMeasure >& FontMeasureService = FSlateApplication::Get().GetRenderer()->GetFontMeasureService();
const float MaxCharacterHeight = FontMeasureService->GetMaxCharacterHeight( Node->NameFont ); // @todo treemap perf: Cache this for various heights to reduce calls to FSlateFontMeasure
const float ContainerTitleAreaHeight = MaxCharacterHeight;
// Leave room for a title if we were asked to do that
{
const float Padding = FMath::Min( ChildAreaRect.Size.Y, ContainerTitleAreaHeight );
ChildAreaRect.Position.Y += Padding;
ChildAreaRect.Size.Y -= Padding;
}
// Apply inner padding before our child nodes, if needed
{
// Make sure we don't pad beyond our node's size
const FVector2D MaxPadding( ChildAreaRect.Size * 0.5f );
const FVector2D Padding( FMath::Min( Options.ContainerInnerPadding, MaxPadding.X ), FMath::Min( Options.ContainerInnerPadding, MaxPadding.Y ) );
ChildAreaRect.Position += Padding;
ChildAreaRect.Size -= Padding * 2.0f;
}
}
// Offset and scale all of the child node rects to fit into the child area. This is where some squashing might happen,
// and the sizes are no longer 1:1 with what they originally represented. But for our purposes this is OK! If you need
// the sizes to be perfectly accurate, then disable all padding options.
for( const auto& ChildNode : Node->Children )
{
ChildNode->PaddedRect.Position = ChildAreaRect.Position + ( ChildNode->PaddedRect.Position - OriginalNodeRect.Position ) / OriginalNodeRect.Size * ChildAreaRect.Size;
ChildNode->PaddedRect.Size = ChildNode->PaddedRect.Size / OriginalNodeRect.Size * ChildAreaRect.Size;
}
}
// Process children
for( const auto& ChildNode : Node->Children )
{
PadNodesRecursively( Options, ChildNode.ToSharedRef(), TreeDepth + 1 );
}
}
TSharedRef<ITreeMap> ITreeMap::CreateTreeMap( const FTreeMapOptions& Options, const FTreeMapNodeDataRef& RootNodeData )
{
return MakeShareable( new FTreeMap( Options, RootNodeData ) );
}
FTreeMapNodeDataPtr ITreeMap::ParseOPMLToTreeMapData( const FString& OPMLFilePath, FString& OutErrorMessage )
{
// Use the file name as the root node name
const FString RootNodeName = FPaths::GetBaseFilename( OPMLFilePath );
FXmlFile OPML;
bool bLoadResult = OPML.LoadFile( OPMLFilePath );
FTreeMapNodeDataPtr RootNodeData;
if( bLoadResult && OPML.IsValid() )
{
// Get the working Xml Node
const FXmlNode* XmlRoot = OPML.GetRootNode();
if( XmlRoot != nullptr )
{
const auto& RootName = XmlRoot->GetTag();
if( RootName.Equals( TEXT( "opml" ), ESearchCase::IgnoreCase ) )
{
for( const auto& OuterXmlNode : XmlRoot->GetChildrenNodes() )
{
const auto& OuterNodeName = OuterXmlNode->GetTag();
if( OuterNodeName.Equals( TEXT( "body" ), ESearchCase::IgnoreCase ) )
{
struct Local
{
static void RecursivelyCreateNodes( const FTreeMapNodeDataRef& NodeData, const FXmlNode& XmlNode )
{
for( const auto& ChildXmlNode : XmlNode.GetChildrenNodes() )
{
const auto& NodeName = ChildXmlNode->GetTag();
if( NodeName.Equals( TEXT( "outline" ), ESearchCase::IgnoreCase ) )
{
FTreeMapNodeDataRef ChildNodeData = MakeShareable( new FTreeMapNodeData() );
ChildNodeData->Parent = &NodeData.Get();
// All outline nodes MUST have a text attribute (required as part of OPML spec)
const auto& OutlineText = ChildXmlNode->GetAttribute( TEXT( "text" ) );
ChildNodeData->Name = OutlineText;
NodeData->Children.Add( ChildNodeData );
// Recurse into children
RecursivelyCreateNodes( ChildNodeData, *ChildXmlNode );
// Setup attributes of this node
{
const float DefaultLeafNodeSize = 1.0f; // Leaf nodes must always have a non-zero size!
const float DefaultContainerNodeSize = 0.0f; // 0.0 for container nodes, means "compute my size using my children"
ChildNodeData->Size = ChildNodeData->IsLeafNode() ? DefaultLeafNodeSize : DefaultContainerNodeSize;
// Parse out any hash tags
int32 HashTagCharIndex;
while( ChildNodeData->Name.FindChar( '#', HashTagCharIndex ) )
{
// Parse hash tag string
int32 HashTagLength = 1;
while( ( ChildNodeData->Name.Len() > HashTagCharIndex + HashTagLength ) &&
!FChar::IsWhitespace( ChildNodeData->Name[ HashTagCharIndex + HashTagLength ] ) &&
ChildNodeData->Name[ HashTagCharIndex + HashTagLength ] != '#' )
{
++HashTagLength;
}
if( HashTagLength > 1 )
{
const FString HashTag = ChildNodeData->Name.Mid( HashTagCharIndex + 1, HashTagLength - 1 );
ChildNodeData->HashTags.Add( HashTag );
// Strip the hash tag ofg of the original string
ChildNodeData->Name.MidInline( 0, HashTagCharIndex, EAllowShrinking::No );
if( HashTagCharIndex + HashTagLength < ChildNodeData->Name.Len() )
{
ChildNodeData->Name += ChildNodeData->Name.Mid( HashTagCharIndex + HashTagLength );
}
}
}
// Clean up any leftover whitespace in the node name, after stripping out hash tags
Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 3620134) #lockdown Nick.Penwarden #rb none ============================ MAJOR FEATURES & CHANGES ============================ Change 3550452 by Ben.Marsh UAT: Improve readability of error message when an editor commandlet fails with an error code. Change 3551179 by Ben.Marsh Add methods for reading text files into an array of strings. Change 3551260 by Ben.Marsh Core: Change FFileHelper routines to use enum classes for flags. Change 3555697 by Gil.Gribb Fixed a rare crash when the asset registry scanner found old cooked files with package level compression. #jira UE-47668 Change 3556464 by Ben.Marsh UGS: If working in a virtual stream, use the name of the first non-virtual ancestor for writing version files. Change 3557630 by Ben.Marsh Allow the network version to be set via Build.version if it's not overriden from Version.h. Change 3561357 by Gil.Gribb Fixed crashes related to loading old unversioned files in the editor. #jira UE-47806 Change 3565711 by Graeme.Thornton PR #3839: Make non-encoding specific Base64 functions accessible (Contributed by stfx) Change 3565864 by Robert.Manuszewski Temp fix for a race condition with the async loading thread enabled - caching the linker in case it gets removed (but not deleted) from super class object. Change 3569022 by Ben.Marsh PR #3849: Update gitignore (Contributed by mhutch) Change 3569113 by Ben.Marsh Fix Japanese errors not displaying correctly in the cook output log. #jira UE-47746 Change 3569486 by Ben.Marsh UGS: Always sync the Enterprise folder if the selected .uproject file has the "Enterprise" flag set. Change 3570483 by Graeme.Thornton Minor C# cleanups. Removing some redundant "using" calls which also cause dotnetcore compile errors Change 3570513 by Robert.Manuszewski Fix for a race condition with async loading thread enabled. Change 3570664 by Ben.Marsh UBT: Use P/Invoke to determine number of physical processors on Windows rather than using WMI. Starting up WMIC adds 2.5 seconds to build times, and is not compatible with .NET core. Change 3570708 by Robert.Manuszewski Added ENABLE_GC_OBJECT_CHECKS macro to be able to quickly toggle UObject pointer checks in shipping builds when the garbage collector is running. Change 3571592 by Ben.Marsh UBT: Allow running with -installed without creating [InstalledPlatforms] entries in BaseEngine.ini. If there is no HasInstalledPlatformInfo=true setting, assume that all platforms are still available. Change 3572215 by Graeme.Thornton UBT - Remove some unnecessary using directives - Point SN-DBS code at the new Utils.GetPhysicalProcessorCount call, rather than trying to calculate it itself Change 3572437 by Robert.Manuszewski Game-specific fix for lazy object pointer issues in one of the test levels. The previous fix had to be partially reverted due to side-effects. #jira UE-44996 Change 3572480 by Robert.Manuszewski MaterialInstanceCollections will no longer be added to GC clusters to prevent materials staying around in memory for too long Change 3573547 by Ben.Marsh Add support for displaying log timestamps in local time. Set LogTimes=Local in *Engine.ini, or pass -LocalLogTimes on the command line. Change 3574562 by Robert.Manuszewski PR #3847: Add GC callbacks for script integrations (Contributed by mhutch) Change 3575017 by Ben.Marsh Move some functions related to generating window resolutions out of Core (FParse::Resolution, GenerateConvenientWindowedResolutions). Also remove a few headers from shared PCHs prior to splitting application functionality out of Core. Change 3575689 by Ben.Marsh Add a fixed URL for opening the API documentation, so it works correctly in "internal" and "perforce" builds. Change 3575934 by Steve.Robb Fix for nested preprocessor definitions. Change 3575961 by Steve.Robb Fix for nested zeros. Change 3576297 by Robert.Manuszewski Material resources will now be discarded in PostLoad (Game Thread) instead of in Serialize (potentially Async Loading Thread) so that shader deregistration doesn't assert when done from a different thread than the game thread. #jira FORT-38977 Change 3576366 by Ben.Marsh Add shim functions to allow redirecting FPlatformMisc::ClipboardCopy()/ClipboardPaste() to FPlatformApplicationMisc::ClipboardCopy()/ClipboardPaste() while they are deprecated. Change 3578290 by Graeme.Thornton Changes to Ionic zip library to allow building on dot net core Change 3578291 by Graeme.Thornton Ionic zip library binaries built for .NET Core Change 3578354 by Graeme.Thornton Added FBase64::GetDecodedDataSize() to determine the size of bytes of a decoded base64 string Change 3578674 by Robert.Manuszewski After loading packages flush linker cache on uncooked platforms to free precache memory Change 3579068 by Steve.Robb Fix for CLASS_Intrinsic getting stomped. Fix to EClassFlags so that they are visible in the debugger. Re-added mysteriously-removed comments. Change 3579228 by Steve.Robb BOM removed. Change 3579297 by Ben.Marsh Fix exception if a plugin lists the same module twice. #jira UE-48232 Change 3579898 by Robert.Manuszewski When creating GC clusters and asserting due to objects still being pending load, the object name and cluster name will now be logged with the assert. Change 3579983 by Robert.Manuszewski More fixes for freeing linker cache memory in the editor. Change 3580012 by Graeme.Thornton Remove redundant copy of FileReference.cs Change 3580408 by Ben.Marsh Validate that arguments passed to the checkf macro are valid sprintf types, and fix up a few places which are currently incorrect. Change 3582104 by Graeme.Thornton Added a dynamic compilation path that uses the latest roslyn apis. Currently only used by the .NET Core path. Change 3582131 by Graeme.Thornton #define out some PerformanceCounter calls that don't exist in .NET Core. They're only used by mono-specific calls anyway. Change 3582645 by Ben.Marsh PR #3879: fix bug when creating a new VS2017 C++ project (Contributed by mnannola) #jira UE-48192 Change 3583955 by Robert.Manuszewski Support for EDL cooked packages in the editor Change 3584035 by Graeme.Thornton Split RunExternalExecutable into RunExternaNativelExecutable and RunExternalDotNETExecutable. When running under .NET Core, externally launched DotNET utilities must be launched via the 'dotnet' proxy to work correctly. Change 3584177 by Robert.Manuszewski Removed unused member variable (FArchiveAsync2::bKeepRestOfFilePrecached) Change 3584315 by Ben.Marsh Move Android JNI accessor functions into separate header, to decouple it from the FAndroidApplication class. Change 3584370 by Ben.Marsh Move hooks which allow platforms to load any modules into the FPlatformApplicationMisc classes. Change 3584498 by Ben.Marsh Move functions for getting and setting the hardware window pointer onto the appropriate platform window classes. Change 3585003 by Steve.Robb Fix for TChunkedArray ranged-for iteration. #jira UE-48297 Change 3585235 by Ben.Marsh Remove LogEngine extern from Core; use the platform log channels instead. Change 3585942 by Ben.Marsh Move MessageBoxExt() implementation into application layer for platforms that require it. Change 3587071 by Ben.Marsh Move Linux's UngrabAllInput() function into a callback, so DebugBreak still works without SDL. Change 3587161 by Ben.Marsh Remove headers which will be stripped out of the Core module from Core.h and PlatformIncludes.h. Change 3587579 by Steve.Robb Fix for Children list not being rebuilt after hot reload. Change 3587584 by Graeme.Thornton Logging improvements for pak signature check failures - Added "PakCorrupt" console command which corrupts the master signature table - Added some extra log information about which block failed - Re-hash the master signature table and to make sure that it hasn't changed since startup - Moved the ensure around so that some extra logging messages can make it out before the ensure is hit - Added PAK_SIGNATURE_CHECK_FAILS_ARE_FATAL to IPlatformFilePak.h so we have a single place to make signature check failures fatal again Change 3587586 by Graeme.Thornton Changes to make UBT build and run on .NET Core - Added *_DNC csproj files for DotNETUtilities and UnrealBuildTool projects which contain the .NET Core build setups - VCSharpProjectFile can no be asked for the CsProjectInfo for a particular configuration, which is cached for future use - After loading VCSharpProjectFiles, .NET Core based projects will be excluded unless generating VSCode projects Change 3587953 by Steve.Robb Allow arbitrary UENUM initializers for enumerators. Editor-only data UENUM support. Enumerators named MAX are now treated as the UENUM's maximum, and will not cause a MAX+1 value to be generated. #jira UE-46274 Change 3589827 by Graeme.Thornton More fixes for VSCode project generation and for UBT running on .NET Core - Use a different file extension for rules assemblies when build on .NET Core, so they never get used by their counterparts - UEConsoleTraceListener supports stdout/stderror constructor parameter and outputs to the appropriate channel - Added documentation for UEConsoleTraceListener - All platforms .NET project compilation tasks/launch configs now use "dotnet" and not the normal batch files - Restored the default UBT log verbosity to "Log" rather than "VeryVeryVerbose" - Renamed assemblies for .NETCore versions of DotNETUtilities and UnrealBuildTool so they don't conflict with the output of the existing .NET Desktop Framework stuff Change 3589868 by Graeme.Thornton Separate .NET Core projects for UBT and DotNETCommon out into their own directories so that their intermediates don't overlap with the standard .NET builds, causing failures. UBT registers ONLY .NET Core C# projects when generating VSCode solutions, and ONLY standard C# projects in all other cases Change 3589919 by Robert.Manuszewski Fixing crash when cooking textures that have already been cooked for EDL (support for cooked content in the editor) Change 3589940 by Graeme.Thornton Force UBT to think it's running on mono when actually running on .NET Core. Disables a lot of windows specific code paths. Change 3590078 by Graeme.Thornton Fully disable automatic assembly info generation in .NET Core projects Change 3590534 by Robert.Manuszewski Marking UObject as intrinsic clas to fix a crash on UFE startup. Change 3591498 by Gil.Gribb UE4 - Fixed several edge cases in the low level async loading code, especially around cancellation. Also PakFileTest is a console command which can be used to stress test pak file loading. Change 3591605 by Gil.Gribb UE4 - Follow up to fixing several edge cases in the low level async loading code. Change 3592577 by Graeme.Thornton .NET Core C# projects now reference source files explicitly, to stop it accidentally compiling various intermediates Change 3592684 by Steve.Robb Fix for EObjectFlags being passed as the wrong argument to csgCopyBrush. Change 3592710 by Steve.Robb Fix for invalid casts in ListProps command. Some name changes in command output. Change 3592715 by Ben.Marsh Move Windows event log code into cpp file, and expose it to other modules even if it's not enabled by default. Change 3592767 by Gil.Gribb UE4 - Changed the logic so that engine UObjects boot before anything else. The engine classes are known to be cycle-free, so we will get them done before moving onto game modules. Change 3592770 by Gil.Gribb UE4 - Fixed a race condition with async read completion in the prescence of cancels. Change 3593090 by Steve.Robb Better error message when there two clashing type names are found. Change 3593697 by Steve.Robb VisitTupleElements function, which calls a functor for each element in the tuple. Change 3595206 by Ben.Marsh Include additional diagnostics for missing imports when a module load fails. Change 3596140 by Graeme.Thornton Batch file for running MSBuild Change 3596267 by Steve.Robb Thread safety fix to FPaths::GetProjectFilePath(). Change 3596271 by Robert.Manuszewski Added code to verify compression flags in package file summary to avoid cases where corrupt packages are crashing the editor #jira UE-47535 Change 3596283 by Steve.Robb Redundant casts removed from UHT. Change 3596303 by Ben.Marsh EC: Improve parsing of Android Clang errors and warnings, which are formatted as MSVC diagnostics to allow go-to-line clicking in the Output Window. Change 3596337 by Ben.Marsh UBT: Format messages about incorrect headers in a way that makes them clickable from Visual Studio. Change 3596367 by Steve.Robb Iterator checks in ranged-for on TMap, TSet and TSparseArray. Change 3596410 by Gil.Gribb UE4 - Improved some error messages on runtime failures in the EDL. Change 3596532 by Ben.Marsh UnrealVS: Fix setting command line to empty not affecting property sheet. Also remove support for VS2013. #jira UE-48119 Change 3596631 by Steve.Robb Tool which takes a .map file and a .objmap file (from UBT) and creates a report which shows the size of all the symbols contributed by the source code per-folder. Change 3596807 by Ben.Marsh Improve Intellisense when generated headers are missing or out of date (eg. line numbers changed, etc...). These errors seem to be masked by VAX, but are present when using the default Visual Studio Intellisense. * UCLASS macro is defined to empty when __INTELLISENSE__ is defined. Previous macro was preventing any following class declaration being parsed correctly if generated code was out of date, causing squiggles over all class methods/variables. * Insert a semicolon after each expanded GENERATED_BODY macro, so that if it parses incorrectly, the compiler can still continue parsing the next declaration. Change 3596957 by Steve.Robb UBT can be used to write out an .objsrcmap file for use with the MapFileParser. Renaming of ObjMap to ObjSrcMap in MapFileParser. Change 3597213 by Ben.Marsh Remove AutoReporter. We don't support this any more. Change 3597558 by Ben.Marsh UGS: Allow adding custom actions to the context menu for right clicking on a changelist. Actions are specified in the project's UnrealEngine.ini file, with the following syntax: +ContextMenu=(Label="This is the menu item", Execute="foo.exe", Arguments="bar") The standard set of variables for custom tools is expanded in each parameter (eg. $(ProjectDir), $(EditorConfig), etc...), plus the $(Change) variable. Change 3597982 by Ben.Marsh Add an option to allow overriding the local DDC path from the editor (under Editor Preferences > Global > Local Derived Data Cache). #jira UE-47173 Change 3598045 by Ben.Marsh UGS: Add variables for stream and client name, and the ability to escape any variables for URIs using the syntax $(VariableName:URI). Change 3599214 by Ben.Marsh Avoid string duplication when comparing extensions. Change 3600038 by Steve.Robb Fix for maps being modified during iteration in cache compaction. Change 3600136 by Steve.Robb GitHub #3538 : Fixed a bug with the handling of 'TMap' key/value types in the UnrealHeaderTool Change 3600214 by Steve.Robb More accurate error message when unsupported template parameters are provided in a TSet property. Change 3600232 by Ben.Marsh UBT: Force UHT to run again if the .build.cs file for a module has changed. #jira UE-46119 Change 3600246 by Steve.Robb GitHub #3045 : allow multiple interface definition in a file Change 3600645 by Ben.Marsh Convert QAGame to Include-What-You-Use. Change 3600897 by Ben.Marsh Fix invalid path (multiple slashes) in LibCurl.build.cs. Causes exception when scanning for includes. Change 3601558 by Graeme.Thornton Simple first pass VSCode editor integration plugin Change 3601658 by Graeme.Thornton Enable intellisense generation for VS Code project files and setup include paths properly Change 3601762 by Ben.Marsh UBT: Add support for adaptive non-unity builds when working from a Git repository. The ISourceFileWorkingSet interface is now used to query files belonging to the working set, and has separate implementations for Perforce (PerforceSourceFileWorkingSet) and Git (GitSourceFileWorkingSet). The Git implementation is used if a .git directory is found in the directory containing the Engine folder, the directory containing the project file, or the parent directory of the project file, and spawns a "git status" process in the background to determine which files are untracked or staged. Several new settings are supported in BuildConfiguration.xml to allow modifying default behavior: <SourceFileWorkingSet> <Provider>Default</Provider> <!-- May be None, Default, Git or Perforce --> <RepositoryPath></RepositoryPath> <!-- Specifies the path to the repository, relative to the directory containing the Engine folder. If not set, tries to find a .git directory in the locations listed above. --> <GitPath>git</GitPath> <!-- Specifies the path to the Git executable. Defaults to "git", which assumes that it will be on the PATH --> </SourceFileWorkingSet> Change 3604032 by Graeme.Thornton First attempt at automatically detecting the existance and location of visual studio code in the source code accessor module. Only works for windows. Change 3604038 by Graeme.Thornton Added FSourceCodeNavigation::GetSelectedSourceCodeIDE() which returns the name of the selected source code accessor. Replaced all usages of FSourceCodeNavigation::GetSuggestedSourceCodeIDE() with GetSelectedSourceCodeIDE(), where the message is referring to the opening or editing of code. Change 3604106 by Steve.Robb GitHub #3561 : UE-44950: Don't see all caps struct constructor as macro Change 3604192 by Steve.Robb GitHub #3911 : Improving ToUpper/ToLower efficiency Change 3604273 by Graeme.Thornton IWYU build fixes when malloc profiler is enabled Change 3605457 by Ben.Marsh Fix race for intiialization of ThreadID variable on FRunnableThreadWin, and restore a previous check that was working around it. Change 3606720 by James.Hopkin Dave Ratti's fix to character base recursion protection code - was missing a GetOwner call, instead attempting to cast a component to a pawn. Change 3606807 by Graeme.Thornton Disabled optimizations around FShooterStyle::Create(), which was crashing in Win64 shipping game builds due to some known compiler issue. Same variety of fix as BenZ did in CL 3567741. Change 3607026 by James.Hopkin Fixed incorrect ABrush cast - was attempting to cast a UModel to ABrush, which can never succeed Change 3607142 by Graeme.Thornton UBT - Minor refactor of BackgroundProcess shutdown in SourceFileWorkingSet. Check whether the process has already exited before trying to kill it during Dispose. Change 3607146 by Ben.Marsh UGS: Fix exception due to formatting string when Perforce throws an error. Change 3607147 by Steve.Robb Efficiency fix for integer properties, which were causing a property mismatch and thus a tag lookup every time. Float and double conversion support added to int properties. NAME_DoubleProperty added. Fix for converting enum class enumerators > 255 to int properties. Change 3607516 by Ben.Marsh PR #3935: Fix DECLARE_DELEGATE_NineParams, DECLARE_MULTICAST_DELEGATE_NineParams. (Contributed by enginevividgames) Change 3610421 by Ben.Marsh UAT: Move help for RebuildLightMapsCommand into attributes, so they display when running with -help. Change 3610657 by Ben.Marsh UAT: Unify initialization of command environment for build machines and local execution. Always derive parameters which aren't manually set via environment variables. Change 3611000 by Ben.Marsh UAT: Remove the -ForceLocal command line option. Settings are now determined automatically, independently of the -Buildmachine argument. Change 3612471 by Ben.Marsh UBT: Move FastJSON into DotNETUtilities. Change 3613479 by Ben.Marsh UBT: Remove the bIsCodeProject flag from UProjectInfo. This was only really being used to determine which projects to generate an IDE project for, so it is now checked in the project file generator. Change 3613910 by Ben.Marsh UBT: Remove unnecessary code to guess a project from the target name; doesn't work due to init order, actual project is determined later. Change 3614075 by Ben.Marsh UBT: Remove hacks for testing project file attributes by name. Change 3614090 by Ben.Marsh UBT: Remove global lookup of project by name. Projects should be explicitly specified by path when necessary. Change 3614488 by Ben.Marsh UBT: Prevent annoying (but handled) exception when constructing SQLiteModuleSupport objects with -precompile enabled. Change 3614490 by Ben.Marsh UBT: Simplify generation of arguments for building intellisense; determine the platform/configuration to build from the project file generation code, rather than inside the target itself. Change 3614962 by Ben.Marsh UBT: Move the VS2017 strict conformance mode (/permissive-) behind a command line option (-Strict), and disable it by default. Building with this mode is not guaranteed to work correctly without updated Windows headers. Change 3615416 by Ben.Marsh EC: Include an icon showing the overall status of a build in the grid view. Change 3615713 by Ben.Marsh UBT: Delete any files in output directories which match output files in other directories. Allows automatically deleting build products which are moved into another folder. #jira UE-48987 Change 3616652 by Ben.Marsh Plugins: Fix incorrect dialog when binaries for a plugin are missing. Should only prompt to disable if starting a content-only project. #jira UE-49007 Change 3616680 by Ben.Marsh Add the CodeAPI-HTML.tgz file into the installed engine build. Change 3616767 by Ben.Marsh Plugins: Tweak error message if the FModuleManager::IsUpToDate() function returns false for a plugin module; the module may be missing, not just incompatible. Change 3616864 by Ben.Marsh Cap the length of the temporary package name during save, to prevent excessively long filenames going over the limit once a GUID is appended. #jira UE-48711 Change 3619964 by Ben.Marsh UnrealVS: Fix single file compile for foreign projects, where the command line contains $(SolutionDir) and $(ProjectName) variables. Change 3548930 by Ben.Marsh UBT: Remove UEBuildModuleCSDLL; there is no codepath that still supports creating them. Remove the remaining UEBuildModule/UEBuildModuleCPP abstraction. Change 3558056 by Ben.Marsh Deprecate FString::Trim() and FString::TrimTrailing(), and replace them with separate versions to mutate (TrimStartInline(), TrimEndInline()) or return by copy (TrimStart(), TrimEnd()). Also add a functions to trim whitespace from both ends of a string (TrimStartAndEnd(), TrimStartAndEndInline()). Change 3563309 by Graeme.Thornton Moved some common C# classes into the DotNETCommon assembly Change 3570283 by Graeme.Thornton Move some code out of RPCUtility and into DotNETCommon, removing the dependency between the two projects Added UEConsoleTraceListener to replace ConsoleTraceListener, which doesn't exist in DotNetCore Change 3572811 by Ben.Marsh UBT: Add -enableasan / -enabletsan command line options and bEnableAddressSanitizer / bEnableThreadSanitizer settings in BuildConfiguration.xml (and remove environment variables). Change 3573397 by Ben.Marsh UBT: Create a <ExeName>.version file for every target built by UBT, in the same JSON format as Engine/Build/Build.version. This allows monolithic targets to read a version number at runtime, unlike when it's embedded in a modules file, and allows creating versioned client executables that will work with versioned servers when syncing through UGS. Change 3575659 by Ben.Marsh Remove CHM API documentation. Change 3582103 by Graeme.Thornton Simple ResX writer implemetation that the xbox deloyment code can use instead of the one from the windows forms assembly, which isn't supported on .NET Core Removed reference to System.Windows.Form from UBT. Change 3584113 by Ben.Marsh Move key-mapping functionality into the InputCore module. Change 3584278 by Ben.Marsh Move FPlatformMisc::RequestMinimize() into FPlatformApplicationMisc. Change 3584453 by Ben.Marsh Move functionality for querying device display density to FApplicationMisc, due to dependence on application-level functionality on mobile platforms. Change 3585301 by Ben.Marsh Move PlatformPostInit() into an FPlatformApplicationMisc function. Change 3587050 by Ben.Marsh Move IsThisApplicationForeground() into FPlatformApplicationMisc. Change 3587059 by Ben.Marsh Move RequiresVirtualKeyboard() into FPlatformApplicationMisc. Change 3587119 by Ben.Marsh Move GetAbsoluteLogFilename() into FPlatformMisc. Change 3587800 by Steve.Robb Fixes to container visualizers for types whose pointer type isn't simply Type*. Change 3588393 by Ben.Marsh Move platform output devices into their own headers. Change 3588868 by Ben.Marsh Move creation of console, error and warning output devices int PlatformApplicationMisc. Change 3589879 by Graeme.Thornton All automation projects now have a reference to DotNETUtilities Fixed a build error in the WEX automation library Change 3590034 by Ben.Marsh Move functionality related to windowing and input out of the Core module and into an ApplicationCore module, so it is possible to build utilities with Core without adding dependencies on XInput (Windows), SDL (Linux), and OpenGL (Mac). Change 3593754 by Steve.Robb Fix for tuple debugger visualization. Change 3597208 by Ben.Marsh Move CrashReporter out of a public folder; it's not in a form that is usable by subscribers and licensees. Change 3600163 by Ben.Marsh UBT: Simplify how targets are cleaned. Delete all intermediate folders for a platform/configuration, and delete any build products matching the UE4 naming convention for that target, rather than relying on the current build configuration or list of previous build products. This will ensure that build products which are no longer being generated will also be cleaned. #jira UE-46725 Change 3604279 by Graeme.Thornton Move pre/post garbage collection delegates into accessor functions so they can be used by globally constructed objects Change 3606685 by James.Hopkin Removed redundant 'Cast's (casting to either the same type or a base). In SClassViewer, replaced cast with TAssetPtr::operator* call to get the wrapped UClass. Also removed redundant 'IsA's from AnimationRetargetContent::AddRemappedAsset in EditorAnimUtils.cpp. Change 3610950 by Ben.Marsh UAT: Simplify logic for detecting Perforce settings, using environment variables if they are set, otherwise falling back to detecting them. Removes special cases for build machines, and makes it simpler to set up UAT commands on builders outside Epic. Change 3610991 by Ben.Marsh UAT: Use the correct P4 settings to detect settings if only some parameters are specified on the command line. Change 3612342 by Ben.Marsh UBT: Change JsonObject.Read() to take a FileReference parameter. Change 3612362 by Ben.Marsh UBT: Remove some more cases of paths being passed as strings rather than using FileReference objects. Change 3619128 by Ben.Marsh Include builder warnings and errors in the notification emails for automated tests, otherwise it's difficult to track down non-test failures. [CL 3620189 by Ben Marsh in Main branch]
2017-08-31 12:08:38 -04:00
ChildNodeData->Name.TrimStartAndEndInline();
}
}
else
{
// Node that we're not interested in
}
}
}
};
RootNodeData = MakeShareable( new FTreeMapNodeData() );
RootNodeData->Parent = NULL;
RootNodeData->Name = RootNodeName;
Local::RecursivelyCreateNodes( RootNodeData.ToSharedRef(), *OuterXmlNode );
}
else
{
// Top level node that we're not interested in
}
}
if( !RootNodeData.IsValid() )
{
OutErrorMessage = TEXT( "Couldn't find a 'body' node in the XML document" );
}
}
else
{
OutErrorMessage = TEXT( "File does not appear to be an OPML-formatted XML document" );
}
}
else
{
OutErrorMessage = TEXT( "No root node found in XML document" );
}
}
else
{
// Couldn't load file
OutErrorMessage = OPML.GetLastError();
}
return RootNodeData;
}
TArray<FTreeMapNodeVisualInfo> FTreeMap::GetVisuals()
{
TArray<FTreeMapNodeVisualInfo> Visuals;
struct Local
{
static void RecursivelyGatherVisuals( TArray<FTreeMapNodeVisualInfo>& VisualsList, const FTreeMapNodeRef& Node )
{
Copying WEX-Staging @ (WEX/Main @ 3740665) to //UE4/Main #lockdown Nick.Penwarden #rb none Copying //UE4/WEX-Staging to //UE4/Dev-Main (Source: //WEX/Main/Engine @ 3740665) #lockdown Nick.Penwarden Change 3739326 by Ben.Zeigler Change iteration order of depends nodes so it lists hard management references before soft management references, this is better for the UI when lots of references exist Update text for loading custom asset registry bin to be clearer Change 3739000 by John.Opila Caching optimization for text widget desired size. Change 3713551 by David.Nikdel Allow Set Properties to recognize Json array values as importable. Change 3712485 by Josh.May Added Pete's fix for the PLATFORM_TVOS/PLATFORM_IOS #define conflict introduced by mach-o/loader.h Change 3700174 by Chris.Babcock Fix setFilters crash on some Android devices Change 3691531 by Josh.May Fixed an intermittent crash that occurred when opening the AssetAuditBrower. AssetManagerEditorModule's CurrentRegistrySource was getting set too early, becoming invalid in the event that RegistrySourceMap is resized. Change 3688409 by Gil.Gribb Critical fix for an extremely rare race condition on async IO. Change 3687529 by josh.may Force layout recalculations for single-pass layout SScaleBoxes when their final scale is zero. This tends to occur in calls to SearchForWidgetRecursively before a SScaleBox's AllottedGeometry has been calculated. Change 3684788 by Peter.Sauerbrei fix for archive generation on the build machines Change 3684320 by john.opila Workaround for widgets disappering. Ensuring scale is never 0 so we don't get divide by zero. Change 3684042 by Peter.Sauerbrei more logging to figure out why there is not data in the Applicaiton diretory of the archive Change 3678620 by Ben.Zeigler Minor text changes to size map Change 3678314 by Ben.Zeigler Add Make Collection With References and Audit References to Size Map to easily allow inspecting the specific set of filtered packages in other tools Change 3677875 by Ben.Zeigler Fix crash in size map from keeping reference to node after map was resized, and undo the Name->DisplayName rename as it could affect licensees Change 3676899 by Peter.Sauerbrei narrowed down to the plist data, trying to figure out if it is missing or not Change 3676570 by Peter.Sauerbrei more logging to track down the archive error Change 3676293 by Peter.Sauerbrei fix for compile failure on IOS Change 3676172 by Peter.Sauerbrei potential fix for missing icons in the ipa when run through the build machines Change 3673544 by Ben.Zeigler Sort AllChunksInfo alphabetically so the order is consistent accross build and platforms to facillitate diffing Change 3671597 by Peter.Sauerbrei Merging //UE4/Dev-Mobile/Engine/... to //WEX/Main/Engine/... Change 3670932 by Ben.Zeigler Change it so cooking with the AssetManager writes out AllChunksInfo.csv next to the DevelopmentAssetRegistry, but not the per-chunk csv files as those are not useful. Also made the size counts platform accurate Change 3670906 by Peter.Sauerbrei update WEX for building with Xcode 9 Change 3660026 by Josh.May Moved SWebBrowserView's parent window "searches" to OnPaint. There's definitely something wrong with FindWidgetWindow... Even after deferring SWebBrowserView's calls to FindWidgetWindow until first Tick, the same widget layout artifacts could occur after opening multiple SWebBrowserViews. And, as Nick pointed out in the related email thread, this approach is also more efficient. Change 3655411 by Josh.May Ensure SWebBrowserView's parent window searches are deferred until after Construct. We haven't puzzled through it yet, but calling FindWidgetWindow during Construct seems to corrupt some Slate state. Deferring this search until later gets around the issue and makes sense anyway, given the widget isn't added to the hierarchy until after Construct. Change 3655407 by John.Opila Sneaking in some stats for SpawnActor. Change 3654649 by Ben.Zeigler Refactor SizeMap and ReferenceViewer into the AssetManagerEditor plugin, and delete the old modules. Fix SizeMap crash that I temporarily added. TreeMap is initialized weirdly Change 3648912 by Ben.Zeigler First half of changes to refactor sizemap/reference viewer into the asset manager editor plugin Add GetAllContentBrowserCommandExtenders to ContentBrowserModule that allows registering commands/keybinds to extend the content browser via plugins Add GetSharedMenu/ToolbarExtensibilityManager to AssetEditorToolkit that allows extending the generic asset editor via plugin Move the code to spawn the Reference Viewer and SizeMap into the AssetManagerEditor plugin so these UIs can be tightly bound and share data. This also enables keybinds for Size Map and Audit. Remove size map from the save as dialog, it created a special modal size map window that will not work after my refactor Change 3639419 by Ben.Marsh Use DirectoryInfo instead of DirectoryReference to enumerate projects. Tracking down UHT compile failures on Mac. Change 3638619 by David.Nikdel AsyncLoading: Suggested change by Gil to add lock prior to changing LoadPhase to WaitingForHeader (presumably to make FArchiveAsync2::StartReadingHeader's assumption about locking true) Change 3633562 by Chris.Babcock Update Android virtual keyboard support Change 3630564 by Peter.Sauerbrei fix for the manifest stage problem Change 3629577 by Chris.Babcock Fix merge errors in GameActivity.java Change 3629154 by David.Nikdel Disable debug device output in shipping builds (even if logs are enabled) Change 3626542 by John.Opila Back out changelist 3603452 Undoing the OpenGL load changes as the initial load time was just too damn high! Change 3620472 by David.Nikdel Fix from Nick to fix a BP that crashes on Compile Change 3618090 by Josh.May Reset inertial scrolling for SScrollboxes and STableView-based Slate widgets when scrolling to specific scroll offsets. Change 3613980 by Chris.Babcock Fix issue with Android password keyboard input Change 3603825 by John.Opila Shader change doesn't seem to like standalone PC. Change 3603452 by John.Opila Moving openGL shader compilation into loading instead of at the last minute. Change 3593008 by David.Nikdel Merging CL 3504471 from //Fortnite/Dev-Cinematics/Engine/... to //WEX/Main/Engine/... ---------------------------------------- Sequencer: Delay mouse capture until drag for sequencer time slider - Fixes context menus not opening as a result of mouse capture being taken on mouse down ================================================================================================= THESE CHANGES TOUCH MULTIPLE PLATFORMS ================================================================================================= Change 3739931 by Ben.Zeigler changes to some asset manager code modified on WEX, and fix several FStringAssetReference->FSoftObjectPath Change 3723451 by Josh.May Exposed OnBeforePopup to UMG and Blueprint for UWebBrowser. This is triggered by the CEFBrowserHandler when attempting to open hyperlinks targeting _blank and, when not handled, would result in the page never loading. Added OnBeforePopup handling for the HTMLNewsWidget, ensuring the URLs are opened in an external browser. Change 3711256 by Dmitriy.Dyomin Fixed: Friend list invalidation panel relative transform caching issues Also fixed issues with and set slate.cacherenderdata=0 for better batching Change 3698695 by Josh.May Made the UMG default font overridable via config, allowing us to replace it with a game-scope localized Font asset. If there's a better place for this mechanism/accessor to live, please let me know. Added a new 'Default' font that replicates '/Engine/EngineFonts/Roboto'. This also has a localized Font asset variant for zh-Hans. Change 3676085 by Josh.May Implemented MulticastBroadcastReceiver, a BroadcastReceiver capable of "multicasting" intents to other receivers. AppsFlyer defines a similar MultiInstallBroadcastReceiver class specific to the INSTALL_REFERRER intent, but it MUST be the very first one defined (cannot be guaranteed in our build pipeline AFAIK). Added MulticastBroadcastReceiver (for INSTALL_REFERRER) to the AndroidManifest generation logic, allowing BOTH Adjust and AppsFlyer to receive the intent. Added dev channel support for AndroidAppsFlyer, enabled conditionally based on shipping/distribution and whether or not a valid AppsFlyerDevChannel name is specified. For WEX, our dev channel is WEX_Dev. Fixed AppsFlyer_EventAttribute's Java class lookups and constructor signature. Change 3670860 by Ben.Zeigler First version of improvements to tools to analyze chunks Size Map and Reference Viewer now support reading cooked asset data and displaying chunks. Changing the platform dropdown in the Asset Audit window switches the other windows as well Asset Audit window now has "Add Chunks" button, and selecting AllTypes in the Primary Asset drop down will add all primary assets Size Map now shows Disk Size by default, and supports a right click context menu Significant UI improvements to all 3 tools, including keybind support Split Manage references into Hard and Soft, where Hard are set explicitly and soft are inherited. This allows determining why an asset was included in a chunk/primary asset When the AssetManager builds management information for the audit browser/cooker, it now precomputes a chunk mapping for relevant assets. PackageChunkType is used to refer to these virtual primary assets Add callback to content browser delegates to handle adding arbitrary FAssetData to an asset view, used to show chunks Several changes to the ITreeMap UI used by size map Change 3670290 by Josh.May Added AppleAppID configs for AppsFlyer. Added AdSupport and iAd frameworks for IOSAppsFlyer. According to the AppsFlyer documentation, these are required for IDFA and Apple Search Ads tracking. Change 3643531 by Peter.Sauerbrei fix for save game location and certain data backed up to the cloud when it shouldn't Change 3629303 by Ben.Zeigler Merge fix for shared ptr corruption in async loading thread from Main, and enable asnyc loading thread for WEX Copy of CL #3623261 and 3625806 Change 3629219 by Peter.Sauerbrei Merging using WEX_Main_to_UE4_WEX_Staging bringing over the files that Stan didn't have access to Change 3629063 by Stanley.Hayes Engine Merge: Merging using WEX_Main_to_UE4_WEX_Staging(flipped) Change 3618988 by Josh.May Reimplemented DevicePerformanceBucket-based WorldMap class selection to account for the WorldMap actor being pre-serialized into the UMAP. On a related note, ChildActorComponents marked as "editor only" now mark their spawned Actors as Transient to prevent them from getting serialized at cook-time. Change 3597981 by Josh.May Converted WExpCampaignDefinition's RegionDefinition refs back to hard references and, to compensate, converted WExpZoneDefinition's ZoneBoss refs to soft references. This moves the RegionDefinitions and ZoneDefinitions from chunk 2 to chunk 1 without pulling in assets for the ZoneBosses. This also allows us to grab the ZoneBoss refs during UWExpAssetManager::GetMainMenuAssetList. Reworked UWExpAssetManager::GetMainMenuAssetList and UWExpAssetManager::GetLevelAssetList to build more "complete" asset lists by expanding lists of PrimaryAssetIds. Tweaked the WorldMap's ZoneBoss spawning to account for the switch to AssetPtrs. Change 3581214 by Josh.Markiewicz added cookie deletion for Google on logout [CL 3750870 by Stanley Hayes in Main branch]
2017-11-10 17:20:53 -05:00
if (!Node->bIsVisible)
{
return;
}
// Add a visual for the node that was passed in. We'll recurse down into children afterwards.
FTreeMapNodeVisualInfo Visual;
Visual.NodeData = Node->Data.Get();
Visual.Position = Node->PaddedRect.Position;
Visual.Size = Node->PaddedRect.Size;
Visual.Color = Node->Data->Color;
Visual.NameFont = Node->NameFont;
Visual.Name2Font = Node->Name2Font;
Visual.CenterTextFont = Node->CenterTextFont;
Visual.bIsInteractive = Node->bIsInteractive;
// If the node is non-interactive, then ghost it
if( !Visual.bIsInteractive )
{
Visual.Color.A *= 0.25f;
}
VisualsList.Add( Visual );
// Process children
for( auto ChildNodeIndex = 0; ChildNodeIndex < Node->Children.Num(); ++ChildNodeIndex )
{
const auto& ChildNode = Node->Children[ ChildNodeIndex ];
// Make up a distinct color for all of the root's top level nodes
RecursivelyGatherVisuals( VisualsList, ChildNode.ToSharedRef() );
}
}
};
Local::RecursivelyGatherVisuals( Visuals, RootNode.ToSharedRef() );
return Visuals;
}