Skip to content
Snippets Groups Projects
Commit 232b0771 authored by Timon Römer's avatar Timon Römer
Browse files

Change formatting

parent 6191037a
No related branches found
No related tags found
1 merge request!88Merges IntenSelect 5.3 into dev 5.3
Pipeline #399769 failed
Showing with 148 additions and 154 deletions
...@@ -25,12 +25,14 @@ public: ...@@ -25,12 +25,14 @@ public:
/** /**
* @param Ar FArchive to read or write from. * @param Ar FArchive to read or write from.
* @param Map PackageMap used to resolve references to UObject* * @param Map PackageMap used to resolve references to UObject*
* @param bOutSuccess return value to signify if the serialization was succesfull (if false, an error will be logged by the calling function) * @param bOutSuccess return value to signify if the serialization was succesfull (if false, an error will be logged
* by the calling function)
* *
* @return return true if the serialization was fully mapped. If false, the property will be considered 'dirty' and will replicate again on the next update. * @return return true if the serialization was fully mapped. If false, the property will be considered 'dirty' and
* This is needed for UActor* properties. If an actor's Actorchannel is not fully mapped, properties referencing it must stay dirty. * will replicate again on the next update. This is needed for UActor* properties. If an actor's Actorchannel is not
* Note that UPackageMap::SerializeObject returns false if an object is unmapped. Generally, you will want to return false from your ::NetSerialize * fully mapped, properties referencing it must stay dirty. Note that UPackageMap::SerializeObject returns false if
* if you make any calls to ::SerializeObject that return false. * an object is unmapped. Generally, you will want to return false from your ::NetSerialize if you make any calls to
* ::SerializeObject that return false.
* *
*/ */
bool NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess) bool NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess)
......
...@@ -112,8 +112,7 @@ void UDirectInteractionComponent::OnBeginInteraction(const FInputActionValue& Va ...@@ -112,8 +112,7 @@ void UDirectInteractionComponent::OnBeginInteraction(const FInputActionValue& Va
if (bOnlyInteractWithClosestActor) if (bOnlyInteractWithClosestActor)
{ {
auto MinElement = *Algo::MinElementBy( auto MinElement = *Algo::MinElementBy(
CurrentInteractableComponentsInRange, CurrentInteractableComponentsInRange, [&](auto Element)
[&](auto Element)
{ return FVector(Element->GetOwner()->GetActorLocation() - InteractionLocation).Size(); }); { return FVector(Element->GetOwner()->GetActorLocation() - InteractionLocation).Size(); });
MinElement->HandleOnActionStartEvents(this, InteractionInputAction, Value, EInteractorType::Direct); MinElement->HandleOnActionStartEvents(this, InteractionInputAction, Value, EInteractorType::Direct);
CurrentlyInteractedComponents = {MinElement}; CurrentlyInteractedComponents = {MinElement};
......
...@@ -80,7 +80,8 @@ void ARWTHVRPawn::NotifyControllerChanged() ...@@ -80,7 +80,8 @@ void ARWTHVRPawn::NotifyControllerChanged()
Super::NotifyControllerChanged(); Super::NotifyControllerChanged();
UE_LOG(Toolkit, Display, TEXT("ARWTHVRPawn: Player Controller has changed, trying to change DCRA attachment if possible...")); UE_LOG(Toolkit, Display,
TEXT("ARWTHVRPawn: Player Controller has changed, trying to change DCRA attachment if possible..."));
// Only do this for all local controlled pawns // Only do this for all local controlled pawns
......
...@@ -13,9 +13,7 @@ FIntenSelectableCircleScoringVisualizer::FIntenSelectableCircleScoringVisualizer ...@@ -13,9 +13,7 @@ FIntenSelectableCircleScoringVisualizer::FIntenSelectableCircleScoringVisualizer
GET_MEMBER_NAME_CHECKED(UIntenSelectableCircleScoring, Radius)); GET_MEMBER_NAME_CHECKED(UIntenSelectableCircleScoring, Radius));
} }
FIntenSelectableCircleScoringVisualizer::~FIntenSelectableCircleScoringVisualizer() FIntenSelectableCircleScoringVisualizer::~FIntenSelectableCircleScoringVisualizer() {}
{
}
FVector FIntenSelectableCircleScoringVisualizer::GetCurrentVectorWorld() const FVector FIntenSelectableCircleScoringVisualizer::GetCurrentVectorWorld() const
{ {
...@@ -115,9 +113,7 @@ void FIntenSelectableCircleScoringVisualizer::DrawVisualization(const UActorComp ...@@ -115,9 +113,7 @@ void FIntenSelectableCircleScoringVisualizer::DrawVisualization(const UActorComp
} }
} }
void FIntenSelectableCircleScoringVisualizer::EndEditing() void FIntenSelectableCircleScoringVisualizer::EndEditing() {}
{
}
UActorComponent* FIntenSelectableCircleScoringVisualizer::GetEditedComponent() const UActorComponent* FIntenSelectableCircleScoringVisualizer::GetEditedComponent() const
{ {
......
...@@ -26,8 +26,6 @@ public class RWTHVRToolkitEditor : ModuleRules ...@@ -26,8 +26,6 @@ public class RWTHVRToolkitEditor : ModuleRules
PrivateDependencyModuleNames.AddRange( PrivateDependencyModuleNames.AddRange(
new string[] new string[]
{ {
// ... add private dependencies that you statically link with here ... // ... add private dependencies that you statically link with here ...
} }
); );
...@@ -35,7 +33,6 @@ public class RWTHVRToolkitEditor : ModuleRules ...@@ -35,7 +33,6 @@ public class RWTHVRToolkitEditor : ModuleRules
PublicIncludePaths.AddRange( PublicIncludePaths.AddRange(
new string[] new string[]
{ {
// ... add private dependencies that you statically link with here ... // ... add private dependencies that you statically link with here ...
} }
); );
...@@ -43,7 +40,6 @@ public class RWTHVRToolkitEditor : ModuleRules ...@@ -43,7 +40,6 @@ public class RWTHVRToolkitEditor : ModuleRules
PrivateIncludePaths.AddRange( PrivateIncludePaths.AddRange(
new string[] new string[]
{ {
// ... add private dependencies that you statically link with here ... // ... add private dependencies that you statically link with here ...
} }
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment