29. Globe progress bar
This commit is contained in:
		| @@ -143,8 +143,7 @@ public: | ||||
|  | ||||
| #pragma region UObject | ||||
|  | ||||
| 	void GetLifetimeReplicatedProps( TArray< FLifetimeProperty >& OutLifetimeProps ) const override = 0; | ||||
| 	; | ||||
| 	void GetLifetimeReplicatedProps( TArray< FLifetimeProperty >& OutLifetimeProps ) const override; | ||||
| #pragma endregion UObject | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -36,4 +36,4 @@ public: | ||||
| 	 | ||||
| 	void PostInitializeComponents() override; | ||||
| #pragma endregion Actor | ||||
| }; | ||||
| }; | ||||
|   | ||||
| @@ -32,7 +32,7 @@ public: | ||||
| 	FORCEINLINE UAbilitySystemComponent* GetAbilitySystemComponent() const override { return AbilitySystem; } | ||||
| #pragma endregion IAbilitySystem | ||||
|  | ||||
| #pragma region | ||||
| 	 | ||||
| #pragma endregion  | ||||
| // #pragma region | ||||
| // 	 | ||||
| // #pragma endregion  | ||||
| }; | ||||
|   | ||||
| @@ -32,6 +32,7 @@ public class Gasa : ModuleRules | ||||
|             "InputCore",  | ||||
|             "NetCore", | ||||
|             "Niagara", | ||||
|             "SlateCore", | ||||
|             "UMG", | ||||
|         }); | ||||
|     #endregion Engine | ||||
|   | ||||
| @@ -44,6 +44,10 @@ class AGasaPlayerController; | ||||
| class UGasaAbilitySystemComp; | ||||
| class UGasaAttributeSet; | ||||
| class UGasaDevOptions; | ||||
| class UGasaImage; | ||||
| class UGasaOverlay; | ||||
| class UGasaProgressBar; | ||||
| class UGasaSizeBox; | ||||
| #pragma endregion Forwards | ||||
|  | ||||
| #pragma region Logging | ||||
|   | ||||
							
								
								
									
										12
									
								
								Project/Source/Gasa/UI/GasaImage.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								Project/Source/Gasa/UI/GasaImage.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| #pragma once | ||||
|  | ||||
| #include "Components/Image.h" | ||||
|  | ||||
| #include "GasaImage.generated.h" | ||||
|  | ||||
| UCLASS() | ||||
| class UGasaImage : public UImage | ||||
| { | ||||
| 	GENERATED_BODY() | ||||
| public: | ||||
| }; | ||||
							
								
								
									
										12
									
								
								Project/Source/Gasa/UI/GasaOverlay.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								Project/Source/Gasa/UI/GasaOverlay.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| #pragma once | ||||
| #include "Components/Overlay.h" | ||||
|  | ||||
| #include "GasaOverlay.generated.h" | ||||
|  | ||||
| UCLASS() | ||||
| class GASA_API UGasaOverlay : public UOverlay | ||||
| { | ||||
| 	GENERATED_BODY() | ||||
| public: | ||||
| 	 | ||||
| }; | ||||
							
								
								
									
										13
									
								
								Project/Source/Gasa/UI/GasaProgressBar.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								Project/Source/Gasa/UI/GasaProgressBar.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,13 @@ | ||||
| #pragma once | ||||
|  | ||||
| #include "Components/ProgressBar.h" | ||||
|  | ||||
| #include "GasaProgressBar.generated.h" | ||||
|  | ||||
| UCLASS() | ||||
| class GASA_API UGasaProgressBar : public UProgressBar | ||||
| { | ||||
| 	GENERATED_BODY() | ||||
| public: | ||||
|  | ||||
| }; | ||||
							
								
								
									
										0
									
								
								Project/Source/Gasa/UI/GasaSizeBox.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								Project/Source/Gasa/UI/GasaSizeBox.cpp
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										16
									
								
								Project/Source/Gasa/UI/GasaSizeBox.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								Project/Source/Gasa/UI/GasaSizeBox.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,16 @@ | ||||
| #pragma once | ||||
| #include "Components/SizeBox.h" | ||||
|  | ||||
| #include "GasaCommon.h" | ||||
|  | ||||
| #include "GasaSizeBox.generated.h" | ||||
|  | ||||
|  | ||||
| UCLASS() | ||||
| class GASA_API UGasaSizeBox : public USizeBox | ||||
| { | ||||
| 	GENERATED_BODY() | ||||
| 	 | ||||
| public: | ||||
| 	 | ||||
| }; | ||||
							
								
								
									
										61
									
								
								Project/Source/Gasa/UI/GlobeProgressBar.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										61
									
								
								Project/Source/Gasa/UI/GlobeProgressBar.cpp
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,61 @@ | ||||
| #include "GlobeProgressBar.h" | ||||
|  | ||||
| #include "GasaImage.h" | ||||
| #include "GasaProgressBar.h" | ||||
| #include "GasaSizeBox.h" | ||||
| #include "Components/OverlaySlot.h" | ||||
|  | ||||
| // UGlobeProgressBar::UGlobeProgressBar(FObjectInitializer const& ObjectInitializer) | ||||
| // { | ||||
| // } | ||||
|  | ||||
| void UGlobeProgressBar::SetBackgroundStyle(FSlateBrush brush) | ||||
| { | ||||
| 	BG->SetBrush( brush ); | ||||
| } | ||||
|  | ||||
| void UGlobeProgressBar::SetBarPadding(FMargin margin ) | ||||
| { | ||||
| 	UOverlaySlot* BarSlot = CastChecked<UOverlaySlot>(Bar->Slot); | ||||
| 	BarSlot->SetPadding( margin ); | ||||
| } | ||||
|  | ||||
| void UGlobeProgressBar::SetBarStyle(FProgressBarStyle style) | ||||
| { | ||||
| 	Bar->SetWidgetStyle( style ); | ||||
| } | ||||
|  | ||||
| void UGlobeProgressBar::SetGlassPadding(FMargin margin) | ||||
| { | ||||
| 	UOverlaySlot* GlassSlot = CastChecked<UOverlaySlot>(Glass->Slot); | ||||
| 	GlassSlot->SetPadding(margin); | ||||
| } | ||||
|  | ||||
| void UGlobeProgressBar::SetGlassStyle(FSlateBrush brush) | ||||
| { | ||||
| 	Glass->SetBrush(brush); | ||||
| } | ||||
|  | ||||
| void UGlobeProgressBar::SetSize(float width, float height) | ||||
| { | ||||
| 	SizeBox_Root->SetWidthOverride(  width ); | ||||
| 	SizeBox_Root->SetHeightOverride( height ); | ||||
| } | ||||
|  | ||||
| #if 0 | ||||
| void UGlobeProgressBar::UpdateSize() | ||||
| { | ||||
| 	 | ||||
| } | ||||
|  | ||||
| void UGlobeProgressBar::UpdateBackground() | ||||
| { | ||||
| } | ||||
| #endif | ||||
|  | ||||
| #pragma region UserWidget | ||||
| void UGlobeProgressBar::NativePreConstruct() | ||||
| { | ||||
| 	Super::NativePreConstruct(); | ||||
| } | ||||
| #pragma endregion UserWidget | ||||
							
								
								
									
										60
									
								
								Project/Source/Gasa/UI/GlobeProgressBar.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								Project/Source/Gasa/UI/GlobeProgressBar.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,60 @@ | ||||
| #pragma once | ||||
|  | ||||
| #include "GasaCommon.h" | ||||
| #include "GasaUserWidget.h" | ||||
|  | ||||
| #include "GlobeProgressBar.generated.h" | ||||
|  | ||||
| UCLASS() | ||||
| class GASA_API UGlobeProgressBar : public UGasaUserWidget | ||||
| { | ||||
| 	GENERATED_BODY() | ||||
| 	 | ||||
| public: | ||||
| 	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (BindWidget), Category="Globe") | ||||
| 	UGasaSizeBox* SizeBox_Root; | ||||
|  | ||||
| 	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (BindWidget), Category="Globe") | ||||
| 	UGasaOverlay* Overlay_Root; | ||||
| 	 | ||||
| 	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (BindWidget), Category="Globe") | ||||
| 	UGasaImage* Glass; | ||||
| 	 | ||||
| 	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (BindWidget), Category="Globe") | ||||
| 	UGasaImage* BG; | ||||
| 	 | ||||
| 	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (BindWidget), Category="Globe") | ||||
| 	UGasaProgressBar* Bar; | ||||
| 	 | ||||
| 	// UGlobeProgressBar(FObjectInitializer const& ObjectInitializer); | ||||
|  | ||||
| 	UFUNCTION(BlueprintCallable, Category="Globe") | ||||
| 	void SetBackgroundStyle(FSlateBrush brush); | ||||
|  | ||||
| 	UFUNCTION(BlueprintCallable, Category="Globe") | ||||
| 	void SetBarPadding( FMargin margin ); | ||||
| 	 | ||||
| 	UFUNCTION(BlueprintCallable, Category="Globe") | ||||
| 	void SetBarStyle(FProgressBarStyle style); | ||||
|  | ||||
| 	UFUNCTION(BlueprintCallable, Category="Globe") | ||||
| 	void SetGlassPadding( FMargin margin ); | ||||
| 	 | ||||
| 	UFUNCTION(BlueprintCallable, Category="Globe") | ||||
| 	void SetGlassStyle(FSlateBrush brush); | ||||
| 	 | ||||
| 	UFUNCTION(BlueprintCallable, Category="Globe") | ||||
| 	void SetSize(float width, float height); | ||||
|  | ||||
| #if 0 | ||||
| 	UFUNCTION(BlueprintCallable, Category="Globe") | ||||
| 	void UpdateSize(); | ||||
| 	 | ||||
| 	UFUNCTION(BlueprintCallable, Category="Globe") | ||||
| 	void UpdateBackground(); | ||||
| #endif | ||||
|  | ||||
| #pragma region UserWidget | ||||
| 	void NativePreConstruct() override; | ||||
| #pragma endregion UserWidget | ||||
| }; | ||||
| @@ -1,9 +0,0 @@ | ||||
| #pragma once | ||||
| #include "Components/ProgressBar.h" | ||||
|  | ||||
|  | ||||
| UCLASS() | ||||
| class GASA_API UProgressIndicator : public UProgressBar | ||||
| { | ||||
| 	 | ||||
| }; | ||||
		Reference in New Issue
	
	Block a user