Skip to content

Commit 07d4621

Browse files
committed
Cleanup pt1
1 parent 2ddfec6 commit 07d4621

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Paths/PCGExPathSplineMesh.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ namespace PCGExPathSplineMesh
375375

376376
if (UpGetter) { Segment.UpVector = UpGetter->Read(Index); }
377377
else if (Settings->SplineMeshUpMode == EPCGExSplineMeshUpMode::Constant) { Segment.UpVector = Settings->SplineMeshUpVector; }
378-
else { Segment.FixGimbalLock(); }
378+
else { Segment.ComputeUpVectorFromTangents(); }
379379
}
380380

381381
void FProcessor::CompleteWork()

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Paths/PCGExPathSplineMeshSimple.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ namespace PCGExPathSplineMeshSimple
278278

279279
if (UpGetter) { Segment.UpVector = UpGetter->Read(Index); }
280280
else if (Settings->SplineMeshUpMode == EPCGExSplineMeshUpMode::Constant) { Segment.UpVector = Settings->SplineMeshUpVector; }
281-
else { Segment.FixGimbalLock(); }
281+
else { Segment.ComputeUpVectorFromTangents(); }
282282
}
283283

284284
void FProcessor::CompleteWork()

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Public/Paths/PCGExPathSplineMeshSimple.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class /*PCGEXTENDEDTOOLKIT_API*/ UPCGExPathSplineMeshSimpleSettings : public UPC
2525
GENERATED_BODY()
2626

2727
public:
28+
UPCGExPathSplineMeshSimpleSettings(const FObjectInitializer& ObjectInitializer);
29+
2830
//~Begin UPCGSettings
2931
#if WITH_EDITOR
3032
PCGEX_NODE_INFOS(PathSplineMeshSimple, "Path : Spline Mesh (Simple)", "Create spline mesh components from paths.");

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Public/Paths/PCGExPaths.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ enum class EPCGExSplineMeshUpMode : uint8
5050
{
5151
Constant = 0 UMETA(DisplayName = "Constant", Tooltip="Constant up vector"),
5252
Attribute = 1 UMETA(DisplayName = "Attribute", Tooltip="Per-point attribute value"),
53-
GimbalFix = 2 UMETA(DisplayName = "Auto (Gimbal fix)", Tooltip="Automatically computed up vector to enforce gimbal fix")
53+
Tangents = 2 UMETA(DisplayName = "From Tangents (Gimbal fix)", Tooltip="Automatically computed up vector from tangents to enforce gimbal fix")
5454
};
5555

5656
USTRUCT(BlueprintType)
@@ -308,7 +308,7 @@ namespace PCGExPaths
308308
const FPCGExMeshCollectionEntry* MeshEntry = nullptr;
309309
FSplineMeshParams Params;
310310

311-
void FixGimbalLock()
311+
void ComputeUpVectorFromTangents()
312312
{
313313
// Thanks Drakynfly @ https://www.reddit.com/r/unrealengine/comments/kqo6ez/usplinecomponent_twists_in_on_itself/
314314

0 commit comments

Comments
 (0)