shorten widgets names
This commit is contained in:
parent
606746e810
commit
ae0fad52a2
BIN
UnrealProject/Lost_Edge/Content/Blueprints/EUBP_EditorUtilities.uasset
(Stored with Git LFS)
Normal file
BIN
UnrealProject/Lost_Edge/Content/Blueprints/EUBP_EditorUtilities.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/UI_Minigame_AgeOfWar.uasset
(Stored with Git LFS)
BIN
UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/UI_Minigame_AgeOfWar.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset
(Stored with Git LFS)
BIN
UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset
(Stored with Git LFS)
BIN
UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset
(Stored with Git LFS)
BIN
UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset
(Stored with Git LFS)
BIN
UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset
(Stored with Git LFS)
Binary file not shown.
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "ResolutionResponsiveUserWidget.h"
|
#include "ResolutionResponsiveWidget.h"
|
||||||
|
|
||||||
#include "AutohideWidget.generated.h"
|
#include "AutohideWidget.generated.h"
|
||||||
|
|
||||||
@ -10,7 +10,7 @@
|
|||||||
* Automatically hides itself after some period
|
* Automatically hides itself after some period
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class UAutohideWidget : public UResolutionResponsiveUserWidget
|
class UAutohideWidget : public UResolutionResponsiveWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
@ -3,14 +3,14 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "InputAnimatedWidgetInterface.h"
|
#include "InputAnimatedWidgetInterface.h"
|
||||||
#include "ResolutionResponsiveUserWidget.h"
|
#include "ResolutionResponsiveWidget.h"
|
||||||
|
|
||||||
#include "CutsceneSkipWidget.generated.h"
|
#include "CutsceneSkipWidget.generated.h"
|
||||||
|
|
||||||
DECLARE_DYNAMIC_DELEGATE(FSkipCutsceneDelegate);
|
DECLARE_DYNAMIC_DELEGATE(FSkipCutsceneDelegate);
|
||||||
|
|
||||||
UCLASS(Blueprintable, Abstract)
|
UCLASS(Blueprintable, Abstract)
|
||||||
class UCutsceneSkipWidget : public UResolutionResponsiveUserWidget, public IInputAnimatedWidgetInterface
|
class UCutsceneSkipWidget : public UResolutionResponsiveWidget, public IInputAnimatedWidgetInterface
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
@ -2,14 +2,14 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "ResolutionResponsiveUserWidget.h"
|
#include "ResolutionResponsiveWidget.h"
|
||||||
|
|
||||||
#include "DialogueRowWidget.generated.h"
|
#include "DialogueRowWidget.generated.h"
|
||||||
|
|
||||||
enum class EDialogueWaveType : uint8;
|
enum class EDialogueWaveType : uint8;
|
||||||
|
|
||||||
UCLASS(Blueprintable, Abstract)
|
UCLASS(Blueprintable, Abstract)
|
||||||
class UDialogueRowWidget : public UResolutionResponsiveUserWidget
|
class UDialogueRowWidget : public UResolutionResponsiveWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
@ -3,14 +3,14 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "InputAnimatedWidgetInterface.h"
|
#include "InputAnimatedWidgetInterface.h"
|
||||||
#include "ResolutionResponsiveUserWidget.h"
|
#include "ResolutionResponsiveWidget.h"
|
||||||
|
|
||||||
#include "DialogueSkipWidget.generated.h"
|
#include "DialogueSkipWidget.generated.h"
|
||||||
|
|
||||||
DECLARE_DYNAMIC_DELEGATE(FDialogueSkipDelegate);
|
DECLARE_DYNAMIC_DELEGATE(FDialogueSkipDelegate);
|
||||||
|
|
||||||
UCLASS(Blueprintable, Abstract)
|
UCLASS(Blueprintable, Abstract)
|
||||||
class UDialogueSkipWidget : public UResolutionResponsiveUserWidget, public IInputAnimatedWidgetInterface
|
class UDialogueSkipWidget : public UResolutionResponsiveWidget, public IInputAnimatedWidgetInterface
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
@ -3,12 +3,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "InputAnimatedWidgetInterface.h"
|
#include "InputAnimatedWidgetInterface.h"
|
||||||
#include "ResolutionResponsiveUserWidget.h"
|
#include "ResolutionResponsiveWidget.h"
|
||||||
|
|
||||||
#include "InteractableHintWidget.generated.h"
|
#include "InteractableHintWidget.generated.h"
|
||||||
|
|
||||||
UCLASS(Blueprintable, Abstract)
|
UCLASS(Blueprintable, Abstract)
|
||||||
class UInteractableHintWidget : public UResolutionResponsiveUserWidget, public IInputAnimatedWidgetInterface
|
class UInteractableHintWidget : public UResolutionResponsiveWidget, public IInputAnimatedWidgetInterface
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "AutohideWidget.h"
|
#include "AutohideWidget.h"
|
||||||
#include "ResolutionResponsiveUserWidget.h"
|
#include "ResolutionResponsiveWidget.h"
|
||||||
|
|
||||||
#include "JournalWidget.generated.h"
|
#include "JournalWidget.generated.h"
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Widgets/ResolutionResponsiveUserWidget.h"
|
#include "Widgets/ResolutionResponsiveWidget.h"
|
||||||
|
|
||||||
#include "MainMenuWidget.generated.h"
|
#include "MainMenuWidget.generated.h"
|
||||||
|
|
||||||
|
@ -3,14 +3,14 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "QuickTimeEvent.h" // forward declaration of EQuickTimeEventResult is somehow insufficient on some machines
|
#include "QuickTimeEvent.h" // forward declaration of EQuickTimeEventResult is somehow insufficient on some machines
|
||||||
#include "Widgets/ResolutionResponsiveUserWidget.h"
|
#include "Widgets/ResolutionResponsiveWidget.h"
|
||||||
|
|
||||||
#include "QuickTimeEventWidget.generated.h"
|
#include "QuickTimeEventWidget.generated.h"
|
||||||
|
|
||||||
enum class EQuickTimeEventResult : uint8;
|
enum class EQuickTimeEventResult : uint8;
|
||||||
|
|
||||||
UCLASS(Blueprintable, Abstract)
|
UCLASS(Blueprintable, Abstract)
|
||||||
class UQuickTimeEventWidget : public UResolutionResponsiveUserWidget
|
class UQuickTimeEventWidget : public UResolutionResponsiveWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Widgets/WorldDilationResponsiveUserWidget.h"
|
#include "Widgets/WorldDilationResponsiveWidget.h"
|
||||||
|
|
||||||
#include "QuickTimeEventWidgetManager.generated.h"
|
#include "QuickTimeEventWidgetManager.generated.h"
|
||||||
|
|
||||||
@ -12,7 +12,7 @@ enum class EQuickTimeEventResult : uint8;
|
|||||||
class UQuickTimeEventWidget;
|
class UQuickTimeEventWidget;
|
||||||
|
|
||||||
UCLASS(Blueprintable, Abstract)
|
UCLASS(Blueprintable, Abstract)
|
||||||
class UQuickTimeEventWidgetManager : public UWorldDilationResponsiveUserWidget
|
class UQuickTimeEventWidgetManager : public UWorldDilationResponsiveWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
// Oleg Petruny proprietary.
|
// Oleg Petruny proprietary.
|
||||||
|
|
||||||
#include "ResolutionResponsiveUserWidget.h"
|
#include "ResolutionResponsiveWidget.h"
|
||||||
|
|
||||||
#include "Components/PanelSlot.h"
|
#include "Components/PanelSlot.h"
|
||||||
#include "UnrealClient.h"
|
#include "UnrealClient.h"
|
||||||
|
|
||||||
bool UResolutionResponsiveUserWidget::Initialize()
|
bool UResolutionResponsiveWidget::Initialize()
|
||||||
{
|
{
|
||||||
_viewportResizedEventHandle = FViewport::ViewportResizedEvent.AddUObject(this, &UResolutionResponsiveUserWidget::Rescale);
|
_viewportResizedEventHandle = FViewport::ViewportResizedEvent.AddUObject(this, &UResolutionResponsiveWidget::Rescale);
|
||||||
|
|
||||||
return UUserWidget::Initialize();
|
return UUserWidget::Initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
void UResolutionResponsiveUserWidget::BeginDestroy()
|
void UResolutionResponsiveWidget::BeginDestroy()
|
||||||
{
|
{
|
||||||
if(_viewportResizedEventHandle.IsValid())
|
if(_viewportResizedEventHandle.IsValid())
|
||||||
{
|
{
|
||||||
@ -22,18 +22,18 @@ void UResolutionResponsiveUserWidget::BeginDestroy()
|
|||||||
UUserWidget::BeginDestroy();
|
UUserWidget::BeginDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
void UResolutionResponsiveUserWidget::Rescale(FViewport* ViewPort, uint32 val)
|
void UResolutionResponsiveWidget::Rescale(FViewport* ViewPort, uint32 val)
|
||||||
{
|
{
|
||||||
_scale = (float)defaultResolution / ViewPort->GetSizeXY().GetMin();
|
_scale = (float)defaultResolution / ViewPort->GetSizeXY().GetMin();
|
||||||
Rescale();
|
Rescale();
|
||||||
}
|
}
|
||||||
|
|
||||||
void UResolutionResponsiveUserWidget::Rescale_Implementation()
|
void UResolutionResponsiveWidget::Rescale_Implementation()
|
||||||
{
|
{
|
||||||
SetRenderScale(FVector2D{ _scale });
|
SetRenderScale(FVector2D{ _scale });
|
||||||
}
|
}
|
||||||
|
|
||||||
float UResolutionResponsiveUserWidget::GetScale() const
|
float UResolutionResponsiveWidget::GetScale() const
|
||||||
{
|
{
|
||||||
return _scale;
|
return _scale;
|
||||||
}
|
}
|
@ -4,13 +4,13 @@
|
|||||||
|
|
||||||
#include "Blueprint/UserWidget.h"
|
#include "Blueprint/UserWidget.h"
|
||||||
|
|
||||||
#include "ResolutionResponsiveUserWidget.generated.h"
|
#include "ResolutionResponsiveWidget.generated.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Automatically scale itself for current resolution to keep UI sizes universal.
|
* Automatically scale itself for current resolution to keep UI sizes universal.
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class UResolutionResponsiveUserWidget : public UUserWidget
|
class UResolutionResponsiveWidget : public UUserWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
// Oleg Petruny proprietary.
|
// Oleg Petruny proprietary.
|
||||||
|
|
||||||
#include "WorldDilationResponsiveUserWidget.h"
|
#include "WorldDilationResponsiveWidget.h"
|
||||||
|
|
||||||
#include "Animation/UMGSequencePlayer.h"
|
#include "Animation/UMGSequencePlayer.h"
|
||||||
#include "Animation/WidgetAnimation.h"
|
#include "Animation/WidgetAnimation.h"
|
||||||
@ -8,21 +8,21 @@
|
|||||||
|
|
||||||
#include "CommonFunctions.h"
|
#include "CommonFunctions.h"
|
||||||
|
|
||||||
bool UWorldDilationResponsiveUserWidget::Initialize()
|
bool UWorldDilationResponsiveWidget::Initialize()
|
||||||
{
|
{
|
||||||
UCommonFunctions::GetWorldDilationChangedDelegate().AddDynamic(this, &UWorldDilationResponsiveUserWidget::UpdateAnimations);
|
UCommonFunctions::GetWorldDilationChangedDelegate().AddDynamic(this, &UWorldDilationResponsiveWidget::UpdateAnimations);
|
||||||
|
|
||||||
return UUserWidget::Initialize();
|
return UUserWidget::Initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
void UWorldDilationResponsiveUserWidget::BeginDestroy()
|
void UWorldDilationResponsiveWidget::BeginDestroy()
|
||||||
{
|
{
|
||||||
UCommonFunctions::GetWorldDilationChangedDelegate().RemoveDynamic(this, &UWorldDilationResponsiveUserWidget::UpdateAnimations);
|
UCommonFunctions::GetWorldDilationChangedDelegate().RemoveDynamic(this, &UWorldDilationResponsiveWidget::UpdateAnimations);
|
||||||
|
|
||||||
UUserWidget::BeginDestroy();
|
UUserWidget::BeginDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
void UWorldDilationResponsiveUserWidget::UpdateAnimations(float newSpeed)
|
void UWorldDilationResponsiveWidget::UpdateAnimations(float newSpeed)
|
||||||
{
|
{
|
||||||
UpdateAnimation(GetRootWidget(), newSpeed);
|
UpdateAnimation(GetRootWidget(), newSpeed);
|
||||||
|
|
||||||
@ -70,7 +70,7 @@ void UWorldDilationResponsiveUserWidget::UpdateAnimations(float newSpeed)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void UWorldDilationResponsiveUserWidget::UpdateAnimation(UWidget* widget, float newSpeed)
|
void UWorldDilationResponsiveWidget::UpdateAnimation(UWidget* widget, float newSpeed)
|
||||||
{
|
{
|
||||||
if(auto userWidget = Cast<UUserWidget>(widget))
|
if(auto userWidget = Cast<UUserWidget>(widget))
|
||||||
{
|
{
|
@ -4,13 +4,13 @@
|
|||||||
|
|
||||||
#include "Blueprint/UserWidget.h"
|
#include "Blueprint/UserWidget.h"
|
||||||
|
|
||||||
#include "WorldDilationResponsiveUserWidget.generated.h"
|
#include "WorldDilationResponsiveWidget.generated.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Automatically update animations speed to sync with world time dilation
|
* Automatically update animations speed to sync with world time dilation
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class UWorldDilationResponsiveUserWidget : public UUserWidget
|
class UWorldDilationResponsiveWidget : public UUserWidget
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user