ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-07-31 03:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

CogAbility: Add open asset button on effect and abilities context menu

Browse Source
This commit is contained in:
Arnaud Jamin
2025-01-16 07:56:28 -05:00
parent 24cc2971c8
commit d7ab3f18b9
9 changed files with 153 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp
+20 -11
View File
@@ -222,7 +222,7 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesTableAbilityName(UAbilitySystem
if (ImGui::IsMouseDoubleClicked(0))
{
OpenAbility(Spec.Handle);
OpenAbilityDetails(Spec.Handle);
}
}
@@ -259,7 +259,7 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesTable(UAbilitySystemComponent&
{
TArray<FGameplayAbilitySpec>& Abilities = AbilitySystemComponent.GetActivatableAbilities();
TArray<FGameplayAbilitySpec> FitleredAbilities;
TArray<FGameplayAbilitySpec> FilteredAbilities;
for (FGameplayAbilitySpec& Spec : Abilities)
{
@@ -280,12 +280,12 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesTable(UAbilitySystemComponent&
continue;
}
FitleredAbilities.Add(Spec);
FilteredAbilities.Add(Spec);
}
if (Config->SortByName)
{
FitleredAbilities.Sort([](const FGameplayAbilitySpec& Lhs, const FGameplayAbilitySpec& Rhs)
FilteredAbilities.Sort([](const FGameplayAbilitySpec& Lhs, const FGameplayAbilitySpec& Rhs)
{
return Lhs.Ability.GetName().Compare(Rhs.Ability.GetName()) < 0;
});
@@ -296,7 +296,7 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesTable(UAbilitySystemComponent&
static int SelectedIndex = -1;
int Index = 0;
for (FGameplayAbilitySpec& Spec : FitleredAbilities)
for (FGameplayAbilitySpec& Spec : FilteredAbilities)
{
UGameplayAbility* Ability = Spec.GetPrimaryInstance();
if (Ability == nullptr)
@@ -474,36 +474,45 @@ void FCogAbilityWindow_Abilities::RenderAbilityContextMenu(UAbilitySystemCompone
if (ImGui::BeginPopupContextItem())
{
bool bOpen = OpenedAbilities.Contains(Spec.Handle);
if (ImGui::Checkbox("Open", &bOpen))
if (ImGui::Checkbox("Open Details", &bOpen))
{
if (bOpen)
{
OpenAbility(Spec.Handle);
OpenAbilityDetails(Spec.Handle);
}
else
{
CloseAbility(Spec.Handle);
CloseAbilityDetails(Spec.Handle);
}
ImGui::CloseCurrentPopup();
}
if (ImGui::Button("Remove"))
const ImVec2 ButtonsSize= ImVec2(ImGui::GetFontSize() * 10, 0);
if (ImGui::Button("Cancel", ButtonsSize))
{
AbilitySystemComponent.CancelAbilityHandle(Spec.Handle);
}
if (ImGui::Button("Remove", ButtonsSize))
{
AbilityHandleToRemove = Spec.Handle;
}
FCogWindowWidgets::OpenObjectAssetButton(Spec.Ability, ButtonsSize);
ImGui::EndPopup();
}
}
//--------------------------------------------------------------------------------------------------------------------------
void FCogAbilityWindow_Abilities::OpenAbility(const FGameplayAbilitySpecHandle& Handle)
void FCogAbilityWindow_Abilities::OpenAbilityDetails(const FGameplayAbilitySpecHandle& Handle)
{
OpenedAbilities.AddUnique(Handle);
}
//--------------------------------------------------------------------------------------------------------------------------
void FCogAbilityWindow_Abilities::CloseAbility(const FGameplayAbilitySpecHandle& Handle)
void FCogAbilityWindow_Abilities::CloseAbilityDetails(const FGameplayAbilitySpecHandle& Handle)
{
OpenedAbilities.Remove(Handle);
}
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp
+8 -4
View File
@@ -42,9 +42,9 @@ void FCogAbilityWindow_Effects::ResetConfig()
}
//--------------------------------------------------------------------------------------------------------------------------
void FCogAbilityWindow_Effects::RenderTick(float DetlaTime)
void FCogAbilityWindow_Effects::RenderTick(float DeltaTime)
{
Super::RenderTick(DetlaTime);
Super::RenderTick(DeltaTime);
RenderOpenEffects();
}
@@ -224,8 +224,10 @@ void FCogAbilityWindow_Effects::RenderEffectRow(UAbilitySystemComponent& Ability
//------------------------
if (ImGui::BeginPopupContextItem())
{
const ImVec2 ButtonsSize = ImVec2(ImGui::GetFontSize() * 10, 0);
bool bOpen = OpenedEffects.Contains(ActiveHandle);
if (ImGui::Checkbox("Open", &bOpen))
if (ImGui::Checkbox("Open Details", &bOpen))
{
if (bOpen)
{
@@ -238,12 +240,14 @@ void FCogAbilityWindow_Effects::RenderEffectRow(UAbilitySystemComponent& Ability
ImGui::CloseCurrentPopup();
}
if (ImGui::Button("Remove"))
if (ImGui::Button("Remove", ButtonsSize))
{
AbilitySystemComponent.RemoveActiveGameplayEffect(ActiveHandle);
ImGui::CloseCurrentPopup();
}
FCogWindowWidgets::OpenObjectAssetButton(EffectPtr, ButtonsSize);
ImGui::EndPopup();
}
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Abilities.h
+2 -2
View File
@@ -73,9 +73,9 @@ protected:
virtual void DeactivateAbility(UAbilitySystemComponent& AbilitySystemComponent, FGameplayAbilitySpec& Spec);
virtual void OpenAbility(const FGameplayAbilitySpecHandle& Handle);
virtual void OpenAbilityDetails(const FGameplayAbilitySpecHandle& Handle);
virtual void CloseAbility(const FGameplayAbilitySpecHandle& Handle);
virtual void CloseAbilityDetails(const FGameplayAbilitySpecHandle& Handle);
virtual ImVec4 GetAbilityColor(const UAbilitySystemComponent& AbilitySystemComponent, FGameplayAbilitySpec& Spec);
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Effects.h
+1 -1
View File
@@ -32,7 +32,7 @@ protected:
virtual void RenderContent() override;
virtual void RenderTick(float DetlaTime) override;
virtual void RenderTick(float DeltaTime) override;
virtual void ResetConfig() override;