Skip to content

Commit 9b3f4cb

Browse files
pavlicekdominikpavlicekdominik
committed
Merge branch '5.1_dev' into 5.1
2 parents bc47410 + 7f6d746 commit 9b3f4cb

18 files changed

+289
-147
lines changed

‎ActorInteractionPlugin.uplugin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"FileVersion": 3,
33
"Version": 4,
4-
"VersionName": "4.0.2.51",
4+
"VersionName": "4.2.1.51",
55
"FriendlyName": "Mountea Interaction System",
66
"Description": "Mountea Interaction System is an Open-source Mountea Framework components-based simple framework providing utilities for smart Actor Interaction with other Actors.\nDeveloped with Game Developers in mind to allow as easy as possible implementation while maintaining high scalability and diverse options to tweak everything.",
77
"Category": "Mountea Framework",

‎Content/Materials/OverlayMaterial/MI_OverlayMaterial_Glowing.uasset

1008 Bytes
Binary file not shown.

‎Content/Materials/OverlayMaterial/M_OverlayMaterial_Glowing.uasset

-459 Bytes
Binary file not shown.

‎Resources/MPLIcon.png

2.2 KB
Loading

‎Resources/settings_icon.png

4.84 KB
Loading

‎Resources/youtube_icon.png

15.7 KB
Loading

‎Source/ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentBase.cpp

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -73,75 +73,75 @@ void UActorInteractableComponentBase::BeginPlay()
7373

7474
// Interaction Events
7575
{
76-
OnInteractableSelected. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableSelectedEvent);
77-
OnInteractorFound. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractorFound);
78-
OnInteractorLost. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractorLost);
79-
80-
OnInteractorOverlapped. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableBeginOverlapEvent);
81-
OnInteractorStopOverlap. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableStopOverlapEvent);
82-
OnInteractorTraced. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableTraced);
83-
84-
OnInteractionCompleted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCompleted);
85-
OnInteractionCycleCompleted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCycleCompleted);
86-
OnInteractionStarted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionStarted);
87-
OnInteractionStopped. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionStopped);
88-
OnInteractionCanceled. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCanceled);
89-
OnLifecycleCompleted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionLifecycleCompleted);
90-
OnCooldownCompleted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCooldownCompleted);
76+
OnInteractableSelected.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableSelectedEvent);
77+
OnInteractorFound.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractorFound);
78+
OnInteractorLost.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractorLost);
79+
80+
OnInteractorOverlapped.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableBeginOverlapEvent);
81+
OnInteractorStopOverlap.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableStopOverlapEvent);
82+
OnInteractorTraced.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableTraced);
83+
84+
OnInteractionCompleted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCompleted);
85+
OnInteractionCycleCompleted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCycleCompleted);
86+
OnInteractionStarted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionStarted);
87+
OnInteractionStopped.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionStopped);
88+
OnInteractionCanceled.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCanceled);
89+
OnLifecycleCompleted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionLifecycleCompleted);
90+
OnCooldownCompleted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCooldownCompleted);
9191
}
9292

9393
// Attributes Events
9494
{
95-
OnInteractableDependencyChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableDependencyChangedEvent);
96-
OnInteractableAutoSetupChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableAutoSetupChangedEvent);
97-
OnInteractableWeightChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableWeightChangedEvent);
98-
OnInteractableStateChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableStateChangedEvent);
99-
OnInteractableOwnerChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableOwnerChangedEvent);
100-
OnInteractableCollisionChannelChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableCollisionChannelChangedEvent);
101-
OnLifecycleModeChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnLifecycleModeChangedEvent);
102-
OnLifecycleCountChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnLifecycleCountChangedEvent);
103-
OnCooldownPeriodChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCooldownPeriodChangedEvent);
104-
OnInteractorChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractorChangedEvent);
95+
OnInteractableDependencyChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableDependencyChangedEvent);
96+
OnInteractableAutoSetupChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableAutoSetupChangedEvent);
97+
OnInteractableWeightChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableWeightChangedEvent);
98+
OnInteractableStateChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableStateChangedEvent);
99+
OnInteractableOwnerChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableOwnerChangedEvent);
100+
OnInteractableCollisionChannelChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableCollisionChannelChangedEvent);
101+
OnLifecycleModeChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnLifecycleModeChangedEvent);
102+
OnLifecycleCountChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnLifecycleCountChangedEvent);
103+
OnCooldownPeriodChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCooldownPeriodChangedEvent);
104+
OnInteractorChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractorChangedEvent);
105105
}
106106

107107
// Ignored Classes Events
108108
{
109-
OnIgnoredInteractorClassAdded. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnIgnoredClassAdded);
110-
OnIgnoredInteractorClassRemoved. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnIgnoredClassRemoved);
109+
OnIgnoredInteractorClassAdded.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnIgnoredClassAdded);
110+
OnIgnoredInteractorClassRemoved.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnIgnoredClassRemoved);
111111
}
112112

113113
// Highlight Events
114114
{
115-
OnHighlightableComponentAdded. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightableComponentAddedEvent);
116-
OnHighlightableComponentRemoved. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightableComponentRemovedEvent);
115+
OnHighlightableComponentAdded.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightableComponentAddedEvent);
116+
OnHighlightableComponentRemoved.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightableComponentRemovedEvent);
117117
}
118118

119119
// Collision Events
120120
{
121-
OnCollisionComponentAdded. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCollisionComponentAddedEvent);
122-
OnCollisionComponentRemoved. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCollisionComponentRemovedEvent);
121+
OnCollisionComponentAdded.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCollisionComponentAddedEvent);
122+
OnCollisionComponentRemoved.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCollisionComponentRemovedEvent);
123123
}
124124

125125
// Widget
126126
{
127-
OnWidgetUpdated. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnWidgetUpdatedEvent);
127+
OnWidgetUpdated.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnWidgetUpdatedEvent);
128128
}
129129

130130
// Highlight
131131
{
132-
OnHighlightTypeChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightTypeChangedEvent);
133-
OnHighlightMaterialChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightMaterialChangedEvent);
132+
OnHighlightTypeChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightTypeChangedEvent);
133+
OnHighlightMaterialChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightMaterialChangedEvent);
134134
}
135135

136136
// Dependency
137137
{
138-
InteractableDependencyStarted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableDependencyStartedCallback);
139-
InteractableDependencyStopped. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableDependencyStoppedCallback);
138+
InteractableDependencyStarted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableDependencyStartedCallback);
139+
InteractableDependencyStopped.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableDependencyStoppedCallback);
140140
}
141141

142142
// Activation
143143
{
144-
OnComponentActivated. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableComponentActivated);
144+
OnComponentActivated.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableComponentActivated);
145145
}
146146

147147
// Bind Changing Input Devices
@@ -157,7 +157,7 @@ void UActorInteractableComponentBase::BeginPlay()
157157
}
158158
}
159159

160-
OnInteractionDeviceChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInputDeviceChanged);
160+
OnInteractionDeviceChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInputDeviceChanged);
161161
}
162162

163163
RemainingLifecycleCount = LifecycleCount;

‎Source/ActorInteractionPlugin/Private/Components/Interactor/ActorInteractorComponentTrace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ void UActorInteractorComponentTrace::ProcessTrace_Implementation()
257257

258258
if (InteractorTag.IsValid() && !localInteractable->Execute_GetInteractableCompatibleTags(Itr).HasTag(InteractorTag))
259259
{
260-
LOG_INFO(TEXT("[ProcessTrace] Interactor Tag %s is not compatible with %s Interactable on %s Actor"), *InteractorTag.ToString(), *localInteractable->Execute_GetInteractableName(Itr).ToString(), *HitActor->GetName())
260+
LOG_WARNING(TEXT("[ProcessTrace] Interactor Tag %s is not compatible with %s Interactable on %s Actor"), *InteractorTag.ToString(), *localInteractable->Execute_GetInteractableName(Itr).ToString(), *HitActor->GetName())
261261
continue;
262262
}
263263

‎Source/ActorInteractionPlugin/Private/Helpers/ActorInteractionPluginSettings.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#include "Helpers/ActorInteractionPluginSettings.h"
44

55
#include "InputMappingContext.h"
6-
#include "Helpers/ActorInteractionPluginLog.h"
76
#include "Helpers/MounteaInteractionSettingsConfig.h"
87
#include "Materials/MaterialInterface.h"
98

109
UActorInteractionPluginSettings::UActorInteractionPluginSettings() :
1110
bEditorDebugEnabled(true),
11+
LogVerbosity(14),
1212
WidgetUpdateFrequency(0.1f)
1313
{
1414
CategoryName = TEXT("Mountea Framework");
@@ -32,4 +32,9 @@ UMaterialInterface* UActorInteractionPluginSettings::GetDefaultHighlightMaterial
3232
UInputMappingContext* UActorInteractionPluginSettings::GetDefaultInputMappingContext() const
3333
{
3434
return InteractionInputMapping.LoadSynchronous();
35-
};
35+
}
36+
37+
EMounteaInteractionLoggingVerbosity UActorInteractionPluginSettings::GetAllowedLoggVerbosity() const
38+
{
39+
return static_cast<EMounteaInteractionLoggingVerbosity>(LogVerbosity);
40+
}

0 commit comments

Comments
 (0)