Skip to content

Commit 3d25d2e

Browse files
authored
Merge branch 'main' into test
2 parents 989bd37 + fb93f8a commit 3d25d2e

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

Source/PCGExCore/Public/Fitting/PCGExFittingVariations.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,21 @@ struct PCGEXCORE_API FPCGExFittingVariations
1212
{
1313
GENERATED_BODY()
1414

15+
FPCGExFittingVariations() = default;
16+
17+
FPCGExFittingVariations(
18+
const FVector& InOffsetMin, const FVector& InOffsetMax,
19+
const EPCGExVariationSnapping InSnapPosition, const FVector& InOffsetSnap, const bool bInAbsoluteOffset,
20+
const FRotator& InRotationMin, const FRotator& InRotationMax,
21+
const EPCGExVariationSnapping InSnapRotation, const FRotator& InRotationSnap, const uint8 InAbsoluteRotation,
22+
const FVector& InScaleMin, const FVector& InScaleMax,
23+
const EPCGExVariationSnapping InSnapScale, const FVector& InScaleSnap, const bool bInUniformScale)
24+
: OffsetMin(InOffsetMin), OffsetMax(InOffsetMax), SnapPosition(InSnapPosition), OffsetSnap(InOffsetSnap), bAbsoluteOffset(bInAbsoluteOffset)
25+
, RotationMin(InRotationMin), RotationMax(InRotationMax), SnapRotation(InSnapRotation), RotationSnap(InRotationSnap), AbsoluteRotation(InAbsoluteRotation)
26+
, ScaleMin(InScaleMin), ScaleMax(InScaleMax), SnapScale(InSnapScale), ScaleSnap(InScaleSnap), bUniformScale(bInUniformScale)
27+
{
28+
}
29+
1530
/** Minimum random offset per axis. */
1631
UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Settings, meta = (PCG_Overridable))
1732
FVector OffsetMin = FVector::ZeroVector;

Source/PCGExCore/Public/PCGExH.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ namespace PCGEx
99
{
1010
struct FIndexKey
1111
{
12-
int32 Index;
13-
uint64 Key;
12+
int32 Index = 0;
13+
uint64 Key = 0;
14+
15+
FIndexKey() = default;
16+
FIndexKey(const int32 InIndex, const uint64 InKey) : Index(InIndex), Key(InKey) {}
1417
};
1518

1619
template <typename, typename = void>

0 commit comments

Comments
 (0)