From f47592d3eab1ba457b6ba6a6b04856a1f221ff9d Mon Sep 17 00:00:00 2001 From: 0xZylox <76428709+0xZylox@users.noreply.github.com> Date: Mon, 11 Oct 2021 14:02:27 +0200 Subject: [PATCH] Added CustomCharacterHeadData CustomHairColorSwatch CustomSkinColorSwatch --- Config/DefaultEditor.ini | 2 + Content/Athena/NewDataAsset.uasset | Bin 0 -> 1506 bytes FortniteGame.uproject | 3 +- .../Private/CustomCharacterHeadData.cpp | 4 ++ .../Private/CustomHairColorSwatch.cpp | 4 ++ .../Private/CustomSkinColorSwatch.cpp | 4 ++ .../Public/CustomCharacterHeadData.h | 39 ++++++++++++++++++ .../Public/CustomHairColorSwatch.h | 17 ++++++++ .../Public/CustomSkinColorSwatch.h | 17 ++++++++ 9 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 Content/Athena/NewDataAsset.uasset create mode 100644 Source/FortniteGame/Private/CustomCharacterHeadData.cpp create mode 100644 Source/FortniteGame/Private/CustomHairColorSwatch.cpp create mode 100644 Source/FortniteGame/Private/CustomSkinColorSwatch.cpp create mode 100644 Source/FortniteGame/Public/CustomCharacterHeadData.h create mode 100644 Source/FortniteGame/Public/CustomHairColorSwatch.h create mode 100644 Source/FortniteGame/Public/CustomSkinColorSwatch.h diff --git a/Config/DefaultEditor.ini b/Config/DefaultEditor.ini index e69de29b..139597f9 100644 --- a/Config/DefaultEditor.ini +++ b/Config/DefaultEditor.ini @@ -0,0 +1,2 @@ + + diff --git a/Content/Athena/NewDataAsset.uasset b/Content/Athena/NewDataAsset.uasset new file mode 100644 index 0000000000000000000000000000000000000000..111f35464c544448758bec5765d378db7110812f GIT binary patch literal 1506 zcmb7EJ8Tm{5FL^@e1iD|EFnZBQbokXj*T&ikPzo@5Q(vXh&GG8!bcpRb+;jy3JD5B z0YcCi6bb|tO(bae6hsJ#f|e%ynlvCG8W&gr%*@*7*k_y1NPDw8zc)KObBmV-@0QBt z@>C~)tpg;j!SC19!t&?9tzyrT=brK`;@XL_lnrf=$FvNWhMVxa8?F11hl5JU7m1Ae zM#J8)-@kv@6Atbh3Hbb>pvN=f^-2c=5fBK<$SD$?4|GWtM3K`vg{$!C_QbB0!r=#Z z7VP}_TPI~iegxPB4(Nby`7zjrC#Q2V>~kLHY0eBj|NT7N+p?8g{oy(nu5ZIE2Tm=ii2rp7$D}(-`GK? zSwm*Hbw*$Xe;DoesY+zUe|T z!XkSr-9}tQ)CT`TCJu(I#WekXT4YpEBFcA<+yRLHz#*(wI93_GI1$}Vkvo9-Ivk2) z=3P}cF>6fI;7`7!YuB1hU3e5bfgG9??IKX;Y{eDV)fuMeAYJ*VgysEsx UiDXnHvn%^?|JQ%+BL3Zf0}HMwI{*Lx literal 0 HcmV?d00001 diff --git a/FortniteGame.uproject b/FortniteGame.uproject index cec118c0..591ef0e1 100644 --- a/FortniteGame.uproject +++ b/FortniteGame.uproject @@ -9,7 +9,8 @@ "Type": "Runtime", "LoadingPhase": "Default", "AdditionalDependencies": [ - "Engine" + "Engine", + "CoreUObject" ] } ], diff --git a/Source/FortniteGame/Private/CustomCharacterHeadData.cpp b/Source/FortniteGame/Private/CustomCharacterHeadData.cpp new file mode 100644 index 00000000..caf6c71b --- /dev/null +++ b/Source/FortniteGame/Private/CustomCharacterHeadData.cpp @@ -0,0 +1,4 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "CustomCharacterHeadData.h" + diff --git a/Source/FortniteGame/Private/CustomHairColorSwatch.cpp b/Source/FortniteGame/Private/CustomHairColorSwatch.cpp new file mode 100644 index 00000000..bc6ffc68 --- /dev/null +++ b/Source/FortniteGame/Private/CustomHairColorSwatch.cpp @@ -0,0 +1,4 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "CustomHairColorSwatch.h" + diff --git a/Source/FortniteGame/Private/CustomSkinColorSwatch.cpp b/Source/FortniteGame/Private/CustomSkinColorSwatch.cpp new file mode 100644 index 00000000..3f0d7088 --- /dev/null +++ b/Source/FortniteGame/Private/CustomSkinColorSwatch.cpp @@ -0,0 +1,4 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "CustomSkinColorSwatch.h" + diff --git a/Source/FortniteGame/Public/CustomCharacterHeadData.h b/Source/FortniteGame/Public/CustomCharacterHeadData.h new file mode 100644 index 00000000..2bb4a69e --- /dev/null +++ b/Source/FortniteGame/Public/CustomCharacterHeadData.h @@ -0,0 +1,39 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "UObject/NoExportTypes.h" +#include "CustomSkinColorSwatch.h" +#include "CustomHairColorSwatch.h" +#include "CustomCharacterBodyPartData.h" +#include "CustomCharacterHeadData.generated.h" + +/** + * + */ +UCLASS() +class FORTNITEGAME_API UCustomCharacterHeadData : public UCustomCharacterBodyPartData +{ + GENERATED_BODY() + +public: + + UPROPERTY(EditAnywhere) + TAssetPtr SkinColorSwatch; + + UPROPERTY(EditAnywhere) + TAssetPtr HairColorSwatch; + + UPROPERTY(EditAnywhere) + TArray CapMorphTargets; + + UPROPERTY(EditAnywhere) + TArray HelmetMorphTargets; + + UPROPERTY(EditAnywhere) + TArray MaskMorphTargets; + + UPROPERTY(EditAnywhere) + TArray HatMorphTargets; +}; diff --git a/Source/FortniteGame/Public/CustomHairColorSwatch.h b/Source/FortniteGame/Public/CustomHairColorSwatch.h new file mode 100644 index 00000000..4455bc36 --- /dev/null +++ b/Source/FortniteGame/Public/CustomHairColorSwatch.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Engine/DataAsset.h" +#include "CustomHairColorSwatch.generated.h" + +/** + * + */ +UCLASS() +class FORTNITEGAME_API UCustomHairColorSwatch : public UDataAsset +{ + GENERATED_BODY() + +}; diff --git a/Source/FortniteGame/Public/CustomSkinColorSwatch.h b/Source/FortniteGame/Public/CustomSkinColorSwatch.h new file mode 100644 index 00000000..85483bba --- /dev/null +++ b/Source/FortniteGame/Public/CustomSkinColorSwatch.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Engine/DataAsset.h" +#include "CustomSkinColorSwatch.generated.h" + +/** + * + */ +UCLASS() +class FORTNITEGAME_API UCustomSkinColorSwatch : public UDataAsset +{ + GENERATED_BODY() + +};