Skip to content

Commit 58aa817

Browse files
NebukamNebukam
committed
Inside Path update + changed to wider element type for low level unions
1 parent 466d8b2 commit 58aa817

File tree

59 files changed

+138
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+138
-118
lines changed

‎Content/Subgraphs/Utils/PCGEx_MergeCells.uasset‎

1 Byte
Binary file not shown.

‎Content/Subgraphs/Utils/PCGEx_MergeCells_Clusters.uasset‎

-1.86 KB
Binary file not shown.

‎Source/PCGExtendedToolkit/Private/AssetStaging/PCGExAssetStaging.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include "PCGExRandom.h"
88
#include "PCGExScopedContainers.h"
9+
#include "Data/PCGExPointIO.h"
910

1011

1112
#define LOCTEXT_NAMESPACE "PCGExAssetStagingElement"

‎Source/PCGExtendedToolkit/Private/AssetStaging/PCGExSocketStaging.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66

77
#include "PCGExScopedContainers.h"
8+
#include "Data/PCGExPointIO.h"
89

910

1011
#define LOCTEXT_NAMESPACE "PCGExSocketStagingElement"

‎Source/PCGExtendedToolkit/Private/AssetStaging/PCGExStaging.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "PCGExRandom.h"
88
#include "Engine/StaticMeshSocket.h"
99
#include "Collections/PCGExAssetCollection.h"
10+
#include "Data/PCGExPointIO.h"
1011
#include "Details/PCGExDetailsSettings.h"
1112
#include "Metadata/Accessors/PCGAttributeAccessorHelpers.h"
1213

‎Source/PCGExtendedToolkit/Private/Data/Blending/PCGExUnionBlender.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "Data/PCGExData.h"
1111
#include "Data/PCGExDataFilter.h"
1212
#include "Data/PCGExDataTag.h"
13+
#include "Data/PCGExPointIO.h"
1314
#include "Data/PCGExUnionData.h"
1415

1516
namespace PCGExDataBlending

‎Source/PCGExtendedToolkit/Private/Data/Blending/PCGExUnionOpsManager.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "Data/Blending/PCGExUnionOpsManager.h"
55

66
#include "Data/PCGExData.h"
7+
#include "Data/PCGExPointIO.h"
78
#include "Data/PCGExUnionData.h"
89

910
namespace PCGExDataBlending

‎Source/PCGExtendedToolkit/Private/Data/PCGExUnionData.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55

66
#include "PCGExPointsMT.h"
77
#include "Data/PCGExData.h"
8+
#include "Data/PCGExPointIO.h"
89
#include "Details/PCGExDetailsDistances.h"
910

1011
namespace PCGExData
1112
{
1213
#pragma region Union Data
1314

1415
int32 IUnionData::ComputeWeights(
15-
const TArray<const UPCGBasePointData*>& Sources, const TSharedPtr<PCGEx::FIndexLookup>& IdxLookup, const FConstPoint& Target,
16+
const TArray<const UPCGBasePointData*>& Sources, const TSharedPtr<PCGEx::FIndexLookup>& IdxLookup, const FPoint& Target,
1617
const TSharedPtr<PCGExDetails::FDistances>& InDistanceDetails, TArray<FWeightedPoint>& OutWeightedPoints) const
1718
{
1819
const int32 NumElements = Elements.Num();

‎Source/PCGExtendedToolkit/Private/Details/PCGExDetailsDistances.cpp‎

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,63 +9,43 @@
99
namespace PCGExDetails
1010
{
1111
template <EPCGExDistance Source, EPCGExDistance Target>
12-
FVector TDistances<Source, Target>::GetSourceCenter(const PCGExData::FConstPoint& FromPoint, const FVector& FromCenter, const FVector& ToCenter) const
12+
FVector TDistances<Source, Target>::GetSourceCenter(const PCGExData::FPoint& FromPoint, const FVector& FromCenter, const FVector& ToCenter) const
1313
{
1414
return GetSpatializedCenter<Source>(FromPoint, FromCenter, ToCenter);
1515
}
1616

1717
template <EPCGExDistance Source, EPCGExDistance Target>
18-
FVector TDistances<Source, Target>::GetTargetCenter(const PCGExData::FConstPoint& FromPoint, const FVector& FromCenter, const FVector& ToCenter) const
18+
FVector TDistances<Source, Target>::GetTargetCenter(const PCGExData::FPoint& FromPoint, const FVector& FromCenter, const FVector& ToCenter) const
1919
{
2020
return GetSpatializedCenter<Target>(FromPoint, FromCenter, ToCenter);
2121
}
2222

2323
template <EPCGExDistance Source, EPCGExDistance Target>
24-
void TDistances<Source, Target>::GetCenters(const PCGExData::FConstPoint& SourcePoint, const PCGExData::FConstPoint& TargetPoint, FVector& OutSource, FVector& OutTarget) const
24+
void TDistances<Source, Target>::GetCenters(const PCGExData::FPoint& SourcePoint, const PCGExData::FPoint& TargetPoint, FVector& OutSource, FVector& OutTarget) const
2525
{
2626
const FVector TargetOrigin = TargetPoint.GetLocation();
2727
OutSource = GetSpatializedCenter<Source>(SourcePoint, SourcePoint.GetLocation(), TargetOrigin);
2828
OutTarget = GetSpatializedCenter<Target>(TargetPoint, TargetOrigin, OutSource);
2929
}
3030

3131
template <EPCGExDistance Source, EPCGExDistance Target>
32-
double TDistances<Source, Target>::GetDistSquared(const PCGExData::FConstPoint& SourcePoint, const PCGExData::FConstPoint& TargetPoint) const
32+
double TDistances<Source, Target>::GetDistSquared(const PCGExData::FPoint& SourcePoint, const PCGExData::FPoint& TargetPoint) const
3333
{
3434
const FVector TargetOrigin = TargetPoint.GetLocation();
3535
const FVector OutSource = GetSpatializedCenter<Source>(SourcePoint, SourcePoint.GetLocation(), TargetOrigin);
3636
return FVector::DistSquared(OutSource, GetSpatializedCenter<Target>(TargetPoint, TargetOrigin, OutSource));
3737
}
3838

3939
template <EPCGExDistance Source, EPCGExDistance Target>
40-
double TDistances<Source, Target>::GetDistSquared(const PCGExData::FProxyPoint& SourcePoint, const PCGExData::FConstPoint& TargetPoint) const
41-
{
42-
const FVector TargetOrigin = TargetPoint.GetLocation();
43-
const FVector OutSource = GetSpatializedCenter<Source>(SourcePoint, SourcePoint.GetLocation(), TargetOrigin);
44-
return FVector::DistSquared(OutSource, GetSpatializedCenter<Target>(TargetPoint, TargetOrigin, OutSource));
45-
}
46-
47-
template <EPCGExDistance Source, EPCGExDistance Target>
48-
double TDistances<Source, Target>::GetDist(const PCGExData::FConstPoint& SourcePoint, const PCGExData::FConstPoint& TargetPoint) const
40+
double TDistances<Source, Target>::GetDist(const PCGExData::FPoint& SourcePoint, const PCGExData::FPoint& TargetPoint) const
4941
{
5042
const FVector TargetOrigin = TargetPoint.GetLocation();
5143
const FVector OutSource = GetSpatializedCenter<Source>(SourcePoint, SourcePoint.GetLocation(), TargetOrigin);
5244
return FVector::Dist(OutSource, GetSpatializedCenter<Target>(TargetPoint, TargetOrigin, OutSource));
5345
}
5446

5547
template <EPCGExDistance Source, EPCGExDistance Target>
56-
double TDistances<Source, Target>::GetDistSquared(const PCGExData::FConstPoint& SourcePoint, const PCGExData::FConstPoint& TargetPoint, bool& bOverlap) const
57-
{
58-
const FVector TargetOrigin = TargetPoint.GetLocation();
59-
const FVector SourceOrigin = SourcePoint.GetLocation();
60-
const FVector OutSource = GetSpatializedCenter<Source>(SourcePoint, SourceOrigin, TargetOrigin);
61-
const FVector OutTarget = GetSpatializedCenter<Target>(TargetPoint, TargetOrigin, OutSource);
62-
63-
bOverlap = FVector::DotProduct((TargetOrigin - SourceOrigin), (OutTarget - OutSource)) < 0;
64-
return FVector::DistSquared(OutSource, OutTarget);
65-
}
66-
67-
template <EPCGExDistance Source, EPCGExDistance Target>
68-
double TDistances<Source, Target>::GetDistSquared(const PCGExData::FProxyPoint& SourcePoint, const PCGExData::FConstPoint& TargetPoint, bool& bOverlap) const
48+
double TDistances<Source, Target>::GetDistSquared(const PCGExData::FPoint& SourcePoint, const PCGExData::FPoint& TargetPoint, bool& bOverlap) const
6949
{
7050
const FVector TargetOrigin = TargetPoint.GetLocation();
7151
const FVector SourceOrigin = SourcePoint.GetLocation();
@@ -77,7 +57,7 @@ namespace PCGExDetails
7757
}
7858

7959
template <EPCGExDistance Source, EPCGExDistance Target>
80-
double TDistances<Source, Target>::GetDist(const PCGExData::FConstPoint& SourcePoint, const PCGExData::FConstPoint& TargetPoint, bool& bOverlap) const
60+
double TDistances<Source, Target>::GetDist(const PCGExData::FPoint& SourcePoint, const PCGExData::FPoint& TargetPoint, bool& bOverlap) const
8161
{
8262
const FVector TargetOrigin = TargetPoint.GetLocation();
8363
const FVector SourceOrigin = SourcePoint.GetLocation();

‎Source/PCGExtendedToolkit/Private/Graph/FloodFill/PCGExFloodFillClusters.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "Graph/FloodFill/PCGExFloodFillClusters.h"
55

6+
#include "Data/PCGExPointIO.h"
67
#include "Details/PCGExDetailsSettings.h"
78
#include "Graph/FloodFill/PCGExFloodFill.h"
89
#include "Graph/FloodFill/FillControls/PCGExFillControlsFactoryProvider.h"

0 commit comments

Comments
 (0)