Compare commits
No commits in common. "6340639844e198bb33ad6a519b4eab255a422f0e" and "4294658f41fe5a5075903ce197ca36b59a4f72f7" have entirely different histories.
6340639844
...
4294658f41
2
.gitignore
vendored
2
.gitignore
vendored
@ -19,4 +19,4 @@ Saved
|
|||||||
|
|
||||||
Plugins/Developer/RiderLink/
|
Plugins/Developer/RiderLink/
|
||||||
|
|
||||||
vampires.sln.DotSettings.user
|
tank.sln.DotSettings.user
|
||||||
|
BIN
Content/Player/BP_PlayerController.uasset
(Stored with Git LFS)
BIN
Content/Player/BP_PlayerController.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Widgets/Pause/BP_PauseWidget.uasset
(Stored with Git LFS)
BIN
Content/Widgets/Pause/BP_PauseWidget.uasset
(Stored with Git LFS)
Binary file not shown.
@ -9,10 +9,8 @@
|
|||||||
#include "Inputable.h"
|
#include "Inputable.h"
|
||||||
#include "VampireGameMode.h"
|
#include "VampireGameMode.h"
|
||||||
#include "Blueprint/UserWidget.h"
|
#include "Blueprint/UserWidget.h"
|
||||||
#include "Blueprint/WidgetBlueprintLibrary.h"
|
|
||||||
#include "Kismet/GameplayStatics.h"
|
#include "Kismet/GameplayStatics.h"
|
||||||
#include "Widgets/HUDWidget.h"
|
#include "Widgets/HUDWidget.h"
|
||||||
#include "Widgets/PauseWidget.h"
|
|
||||||
|
|
||||||
void AVampirePlayerController::OnPossess(APawn* aPawn)
|
void AVampirePlayerController::OnPossess(APawn* aPawn)
|
||||||
{
|
{
|
||||||
@ -96,16 +94,7 @@ void AVampirePlayerController::OnPause(const FInputActionValue& PauseInput)
|
|||||||
|
|
||||||
if (SetPause(true))
|
if (SetPause(true))
|
||||||
{
|
{
|
||||||
if (PauseUI)
|
//TODO: Add pause screen
|
||||||
{
|
|
||||||
currentPauseUI = CreateWidget<UPauseWidget, AVampirePlayerController*>(this, PauseUI.Get());
|
|
||||||
if (currentPauseUI)
|
|
||||||
{
|
|
||||||
currentPauseUI->AddToViewport();
|
|
||||||
UWidgetBlueprintLibrary::SetInputMode_UIOnlyEx(this, currentPauseUI, EMouseLockMode::LockInFullscreen);
|
|
||||||
bShowMouseCursor = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
#include "GameFramework/PlayerController.h"
|
#include "GameFramework/PlayerController.h"
|
||||||
#include "VampirePlayerController.generated.h"
|
#include "VampirePlayerController.generated.h"
|
||||||
|
|
||||||
class UPauseWidget;
|
|
||||||
struct FInputActionValue;
|
struct FInputActionValue;
|
||||||
class UInputAction;
|
class UInputAction;
|
||||||
class UHUDWidget;
|
class UHUDWidget;
|
||||||
@ -19,13 +18,10 @@ class VAMPIRES_API AVampirePlayerController : public APlayerController
|
|||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// UI
|
|
||||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||||
TSubclassOf<UHUDWidget> PlayerHUD = nullptr;
|
TSubclassOf<UHUDWidget> PlayerHUD = nullptr;
|
||||||
|
|
||||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
|
||||||
TSubclassOf<UPauseWidget> PauseUI = nullptr;
|
|
||||||
|
|
||||||
// Inputs
|
// Inputs
|
||||||
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
|
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
|
||||||
UInputAction* MovementAction;
|
UInputAction* MovementAction;
|
||||||
@ -37,8 +33,6 @@ private:
|
|||||||
|
|
||||||
TObjectPtr<UHUDWidget> currentPlayerHUD = nullptr;
|
TObjectPtr<UHUDWidget> currentPlayerHUD = nullptr;
|
||||||
|
|
||||||
TObjectPtr<UPauseWidget> currentPauseUI = nullptr;
|
|
||||||
|
|
||||||
FTimerHandle pawnLifeTimeHandle;
|
FTimerHandle pawnLifeTimeHandle;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -1,40 +0,0 @@
|
|||||||
// Fill out your copyright notice in the Description page of Project Settings.
|
|
||||||
|
|
||||||
|
|
||||||
#include "PauseWidget.h"
|
|
||||||
|
|
||||||
#include "Blueprint/WidgetBlueprintLibrary.h"
|
|
||||||
#include "Components/Button.h"
|
|
||||||
#include "Kismet/GameplayStatics.h"
|
|
||||||
|
|
||||||
void UPauseWidget::Init()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void UPauseWidget::NativeConstruct()
|
|
||||||
{
|
|
||||||
Super::NativeConstruct();
|
|
||||||
|
|
||||||
if (ResumeButton)
|
|
||||||
{
|
|
||||||
ResumeButton->OnClicked.AddUniqueDynamic(this, &UPauseWidget::ResumeButtonClicked);
|
|
||||||
}
|
|
||||||
|
|
||||||
SetIsFocusable(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void UPauseWidget::ResumeButtonClicked()
|
|
||||||
{
|
|
||||||
//TODO: Implementation
|
|
||||||
|
|
||||||
RemoveFromParent();
|
|
||||||
|
|
||||||
if (APlayerController* playerController = UGameplayStatics::GetPlayerController(GetWorld(), 0))
|
|
||||||
{
|
|
||||||
UWidgetBlueprintLibrary::SetInputMode_GameOnly(playerController);
|
|
||||||
playerController->bShowMouseCursor = false;
|
|
||||||
playerController->SetPause(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
SetIsFocusable(false);
|
|
||||||
}
|
|
@ -1,31 +0,0 @@
|
|||||||
// Fill out your copyright notice in the Description page of Project Settings.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "CoreMinimal.h"
|
|
||||||
#include "Blueprint/UserWidget.h"
|
|
||||||
#include "PauseWidget.generated.h"
|
|
||||||
|
|
||||||
class UButton;
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
UCLASS()
|
|
||||||
class VAMPIRES_API UPauseWidget : public UUserWidget
|
|
||||||
{
|
|
||||||
GENERATED_BODY()
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
UPROPERTY(BlueprintReadWrite, meta=(BindWidget))
|
|
||||||
UButton* ResumeButton;
|
|
||||||
|
|
||||||
void Init();
|
|
||||||
|
|
||||||
virtual void NativeConstruct() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
UFUNCTION()
|
|
||||||
void ResumeButtonClicked();
|
|
||||||
};
|
|
2
vampires.sln.DotSettings.user
Normal file
2
vampires.sln.DotSettings.user
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||||
|
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=54EDB041_002DBA9B_002D35E0_002D8F53_002D9AB64E706FB2_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_003FEpic_0020Games_003FUE_005F5_002E4_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AAIModule_002Fd_003APrivate_002Ff_003AAIController_002Ecpp/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
|
Loading…
x
Reference in New Issue
Block a user