baz/vampires
baz/vampires
1
0
Fork 0
Code Issues 14 Projects 1 Activity

Reduce number of bindings

Browse Source
This commit is contained in:
baz 2025-08-15 22:24:26 +01:00
parent 540ec783cb
commit d572a9b177
3 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Levels/MainMenu/MainMenu.umap (Stored with Git LFS)
View File

Binary file not shown.

69
Source/vampires/Widgets/MainMenuWidget.cpp
View File

@ -15,37 +15,22 @@ void UMainMenuWidget::NativeConstruct()
if (NewGameButton) if (NewGameButton)
{ {
NewGameButton->OnClicked.AddUniqueDynamic(this, &UMainMenuWidget::NewGameButtonOnClicked); NewGameButton->OnClicked.AddUniqueDynamic(this, &UMainMenuWidget::NewGameButtonOnClicked);
NewGameButton->OnClicked.AddUniqueDynamic(this, &UMainMenuWidget::PlayClickedSound); NewGameButton->OnHovered.AddUniqueDynamic(this, &UMainMenuWidget::NewGameButtonOnHovered);
NewGameButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::NewGameButtonOnUnhovered);
NewGameButton->OnHovered.AddUniqueDynamic(this, &UMainMenuWidget::PlayHoveredSound);
NewGameButton->OnHovered.AddUniqueDynamic(this, &UMainMenuWidget::NewGameTextBlockHoveredDelegate);
NewGameButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::NewGameTextBlockUnhoveredDelegate);
NewGameButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::PlayUnhoveredSound);
} }
if (OptionsButton) if (OptionsButton)
{ {
OptionsButton->OnClicked.AddUniqueDynamic(this, &UMainMenuWidget::OptionsButtonOnClicked); OptionsButton->OnClicked.AddUniqueDynamic(this, &UMainMenuWidget::OptionsButtonOnClicked);
OptionsButton->OnClicked.AddUniqueDynamic(this, &UMainMenuWidget::PlayClickedSound); OptionsButton->OnHovered.AddUniqueDynamic(this, &UMainMenuWidget::OptionsButtonOnHovered);
OptionsButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::OptionsButtonOnUnhovered);
OptionsButton->OnHovered.AddUniqueDynamic(this, &UMainMenuWidget::PlayHoveredSound);
OptionsButton->OnHovered.AddUniqueDynamic(this, &UMainMenuWidget::OptionsTextBlockHoveredDelegate);
OptionsButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::OptionsTextBlockUnhoveredDelegate);
OptionsButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::PlayUnhoveredSound);
} }
if (QuitButton) if (QuitButton)
{ {
QuitButton->OnClicked.AddUniqueDynamic(this, &UMainMenuWidget::QuitButtonOnClicked); QuitButton->OnClicked.AddUniqueDynamic(this, &UMainMenuWidget::QuitButtonOnClicked);
QuitButton->OnClicked.AddUniqueDynamic(this, &UMainMenuWidget::PlayClickedSound); QuitButton->OnHovered.AddUniqueDynamic(this, &UMainMenuWidget::QuitButtonOnHovered);
QuitButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::QuitButtonOnUnhovered);
QuitButton->OnHovered.AddUniqueDynamic(this, &UMainMenuWidget::PlayHoveredSound);
QuitButton->OnHovered.AddUniqueDynamic(this, &UMainMenuWidget::QuitTextBlockHoveredDelegate);
QuitButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::QuitTextBlockUnhoveredDelegate);
QuitButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::PlayUnhoveredSound);
} }
QuitButton->SetIsEnabled(false); QuitButton->SetIsEnabled(false);
@ -59,6 +44,8 @@ void UMainMenuWidget::NativeConstruct()
void UMainMenuWidget::NewGameButtonOnClicked() void UMainMenuWidget::NewGameButtonOnClicked()
{ {
PlayClickedSound();
if (NewGameMenuWidget) if (NewGameMenuWidget)
{ {
RemoveFromParent(); RemoveFromParent();
@ -75,6 +62,8 @@ void UMainMenuWidget::NewGameButtonOnClicked()
void UMainMenuWidget::OptionsButtonOnClicked() void UMainMenuWidget::OptionsButtonOnClicked()
{ {
PlayClickedSound();
if (OptionsMenuWidget) if (OptionsMenuWidget)
{ {
RemoveFromParent(); RemoveFromParent();
@ -91,8 +80,46 @@ void UMainMenuWidget::OptionsButtonOnClicked()
void UMainMenuWidget::QuitButtonOnClicked() void UMainMenuWidget::QuitButtonOnClicked()
{ {
PlayClickedSound();
// TODO: Add platform specific Exit requests // TODO: Add platform specific Exit requests
// This is not a bit deal for the moment as we are only building for windows // This is not a bit deal for the moment as we are only building for windows
// For some reason the generic version does not work the same as FWindowsPlatformMisc // For some reason the generic version does not work the same as FWindowsPlatformMisc
FWindowsPlatformMisc::RequestExit(false); FWindowsPlatformMisc::RequestExit(false);
} }
void UMainMenuWidget::NewGameButtonOnHovered()
{
PlayHoveredSound();
SetTextBlockHovered(NewGameTextBlock);
}
void UMainMenuWidget::NewGameButtonOnUnhovered()
{
PlayUnhoveredSound();
SetTextBlockUnhovered(NewGameTextBlock);
}
void UMainMenuWidget::OptionsButtonOnHovered()
{
PlayHoveredSound();
SetTextBlockHovered(OptionsTextBlock);
}
void UMainMenuWidget::OptionsButtonOnUnhovered()
{
PlayUnhoveredSound();
SetTextBlockUnhovered(OptionsTextBlock);
}
void UMainMenuWidget::QuitButtonOnHovered()
{
PlayHoveredSound();
SetTextBlockHovered(QuitTextBlock);
}
void UMainMenuWidget::QuitButtonOnUnhovered()
{
PlayUnhoveredSound();
SetTextBlockUnhovered(QuitTextBlock);
}

13
Source/vampires/Widgets/MainMenuWidget.h
View File

@ -15,7 +15,6 @@ class VAMPIRES_API UMainMenuWidget : public UVampireInteractiveWidget
{ {
GENERATED_BODY() GENERATED_BODY()
protected:
UPROPERTY(meta = (BindWidget)) UPROPERTY(meta = (BindWidget))
TObjectPtr<UButton> NewGameButton; TObjectPtr<UButton> NewGameButton;
@ -57,20 +56,20 @@ private:
void QuitButtonOnClicked(); void QuitButtonOnClicked();
UFUNCTION() UFUNCTION()
void NewGameTextBlockHoveredDelegate() { SetTextBlockHovered(NewGameTextBlock); } void NewGameButtonOnHovered();
UFUNCTION() UFUNCTION()
void NewGameTextBlockUnhoveredDelegate() { SetTextBlockUnhovered(NewGameTextBlock); } void NewGameButtonOnUnhovered();
UFUNCTION() UFUNCTION()
void OptionsTextBlockHoveredDelegate() { SetTextBlockHovered(OptionsTextBlock); } void OptionsButtonOnHovered();
UFUNCTION() UFUNCTION()
void OptionsTextBlockUnhoveredDelegate() { SetTextBlockUnhovered(OptionsTextBlock); } void OptionsButtonOnUnhovered();
UFUNCTION() UFUNCTION()
void QuitTextBlockHoveredDelegate() { SetTextBlockHovered(QuitTextBlock); } void QuitButtonOnHovered();
UFUNCTION() UFUNCTION()
void QuitTextBlockUnhoveredDelegate() { SetTextBlockUnhovered(QuitTextBlock); } void QuitButtonOnUnhovered();
}; };