Removed unnecessary properties

This commit is contained in:
LongLy 2024-10-25 18:55:47 -06:00
parent f98d8bf04f
commit cff29528d2
4 changed files with 145 additions and 1014 deletions

View File

@ -1,7 +1,7 @@
/Engine=C:/Program Files/Epic Games/UE_5.4/Engine/Shaders
/ShaderAutogen=H:/Projects/OLS/Intermediate/ShaderAutogen
/Plugin/GLTFExporter=C:/Program Files/Epic Games/UE_5.4/Engine/Plugins/Enterprise/GLTFExporter/Shaders
/Plugin/FX/Niagara=C:/Program Files/Epic Games/UE_5.4/Engine/Plugins/FX/Niagara/Shaders
/Plugin/ExrReaderShaders=C:/Program Files/Epic Games/UE_5.4/Engine/Plugins/Media/ImgMedia/Shaders
/Plugin/WmfMedia=C:/Program Files/Epic Games/UE_5.4/Engine/Plugins/Media/WmfMedia/Shaders
/Plugin/FX/Niagara=C:/Program Files/Epic Games/UE_5.4/Engine/Plugins/FX/Niagara/Shaders
/Plugin/Experimental/ChaosNiagara=C:/Program Files/Epic Games/UE_5.4/Engine/Plugins/Experimental/ChaosNiagara/Shaders

File diff suppressed because it is too large Load Diff

View File

@ -108,7 +108,6 @@ void UOLSBaseLayerAnimInstance::NativeBeginPlay()
if (LocomotionComponent)
{
RotationMode = LocomotionComponent->GetRotationMode();
CurrentRootYawOffset = RootYawOffsetClamps.GetRootYawOffsetClamp(RotationMode);
}
});
}
@ -519,9 +518,8 @@ void UOLSBaseLayerAnimInstance::SetRootYawOffset(const float rootYawOffset)
return;
}
const FVector2D& rootYawOffsetClamp = CurrentRootYawOffset.GetRootYawOffsetClamp(Stance);
const float normalRootYawOffset = UKismetMathLibrary::NormalizeAxis(rootYawOffset);
RootYawOffset = (rootYawOffsetClamp.X == rootYawOffsetClamp.Y) ? normalRootYawOffset : FMath::Clamp(normalRootYawOffset, rootYawOffsetClamp.X, rootYawOffsetClamp.Y);
RootYawOffset = (RootYawOffsetAngleClamp.X == RootYawOffsetAngleClamp.Y) ? normalRootYawOffset : FMath::Clamp(normalRootYawOffset, RootYawOffsetAngleClamp.X, RootYawOffsetAngleClamp.Y);
AimYaw = RootYawOffset * -1.f;
}

View File

@ -409,15 +409,6 @@ protected:
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Settings|TurnInPlaceData")
FName RemainingTurnYawCurveName = NAME_None;
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Settings|TurnInPlaceData")
FOLSRootYawOffsetClamps RootYawOffsetClamps;
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Settings|TurnInPlaceData")
FVector2D RootYawOffsetAngleClamp_Standing = FVector2D(-120.f, 100.f);
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Settings|TurnInPlaceData")
FVector2D RootYawOffsetAngleClamp_Crouching = FVector2D(-90.f, 80.f);
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Settings|VelocityData")
float CardinalDirectionDeadZone = 10.f;
@ -453,5 +444,5 @@ protected: // References
protected:
FOLSRootYawOffsetClamp CurrentRootYawOffset;
FVector2D RootYawOffsetAngleClamp = FVector2D(-180.f, 180.f);
};