diff --git a/Content/Blueprints/Player/BP_PlayerCinematic.uasset b/Content/Blueprints/Player/BP_PlayerCinematic.uasset index 960b2772..a66472f9 100644 --- a/Content/Blueprints/Player/BP_PlayerCinematic.uasset +++ b/Content/Blueprints/Player/BP_PlayerCinematic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd02cb80b47531f933c7b48c58076e78dc6672c2a6f0979897fb1e4836c3c1a8 -size 54377 +oid sha256:df2a54b145fb32e9fe46229db2e56acbcdcdc15ebdf4a68d069c8d8707a514db +size 53059 diff --git a/Content/Blueprints/Player/BP_PlayerImpostor.uasset b/Content/Blueprints/Player/BP_PlayerImpostor.uasset index 0714eb29..6cb8fdc8 100644 --- a/Content/Blueprints/Player/BP_PlayerImpostor.uasset +++ b/Content/Blueprints/Player/BP_PlayerImpostor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c90c06e1fe0028fe0d7e61f8969318f079da50d33b4ecdaf3da2bba4b36e3f1e -size 54029 +oid sha256:766c7b22197bbd6e564e2cde9ee68720d4926070dc7a6f747c54da53b8eaa1dc +size 53141 diff --git a/Content/Test/Maps/TestLevel.umap b/Content/Test/Maps/TestLevel.umap index 9df4db20..56284d7a 100644 --- a/Content/Test/Maps/TestLevel.umap +++ b/Content/Test/Maps/TestLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d1d95409b846eeade9dbe404c76370fb6905ee10aa00582ca0047c483d026e9 -size 49583 +oid sha256:fbb01133ef58ce1769f5ca8d576e2735af56ed68f36016df8ed79b500169973b +size 58084 diff --git a/Source/NakedDesire/Player/PlayerCinematic.cpp b/Source/NakedDesire/Player/PlayerCinematic.cpp index b947a8e0..632afe2c 100644 --- a/Source/NakedDesire/Player/PlayerCinematic.cpp +++ b/Source/NakedDesire/Player/PlayerCinematic.cpp @@ -2,6 +2,7 @@ #include "NakedDesireCharacter.h" #include "Kismet/GameplayStatics.h" +#include "NakedDesire/Censorship/CensorshipComponent.h" #include "NakedDesire/Clothing/ClothingManager.h" #include "NakedDesire/Clothing/ClothingVisualsComponent.h" @@ -11,6 +12,17 @@ APlayerCinematic::APlayerCinematic() PrimaryActorTick.bCanEverTick = false; ClothingVisualsComponent = CreateDefaultSubobject(TEXT("Clothing Visuals Component")); + + BoobLCensorship = CreateDefaultSubobject(TEXT("Boob L Censorship")); + BoobLCensorship->SetupAttachment(GetMesh(), FName(TEXT("boob_l"))); + BoobRCensorship = CreateDefaultSubobject(TEXT("Boob R Censorship")); + BoobRCensorship->SetupAttachment(GetMesh(), FName(TEXT("boob_r"))); + VaginaCensorship = CreateDefaultSubobject(TEXT("Vagina Censorship")); + VaginaCensorship->SetupAttachment(GetMesh(), FName(TEXT("pelvis"))); + AnalCensorship = CreateDefaultSubobject(TEXT("Anal Censorship")); + AnalCensorship->SetupAttachment(GetMesh(), FName(TEXT("pelvis"))); + + CensorshipComponent = CreateDefaultSubobject(TEXT("Censorship Component")); } void APlayerCinematic::BeginPlay() @@ -24,4 +36,5 @@ void APlayerCinematic::BeginPlay() } ClothingVisualsComponent->Initialize(GetMesh(), Player->ClothingManager); + CensorshipComponent->Initialize(Player->ClothingManager, BoobLCensorship, BoobRCensorship, VaginaCensorship, AnalCensorship); } \ No newline at end of file diff --git a/Source/NakedDesire/Player/PlayerCinematic.h b/Source/NakedDesire/Player/PlayerCinematic.h index af98d31a..783623b3 100644 --- a/Source/NakedDesire/Player/PlayerCinematic.h +++ b/Source/NakedDesire/Player/PlayerCinematic.h @@ -6,6 +6,8 @@ class ANakedDesireCharacter; class UClothingVisualsComponent; +class UCensorshipComponent; +class UStaticMeshComponent; UCLASS() class NAKEDDESIRE_API APlayerCinematic : public ACharacter @@ -15,6 +17,21 @@ class NAKEDDESIRE_API APlayerCinematic : public ACharacter UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Clothing") UClothingVisualsComponent* ClothingVisualsComponent; + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UStaticMeshComponent* BoobLCensorship; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UStaticMeshComponent* BoobRCensorship; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UStaticMeshComponent* VaginaCensorship; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UStaticMeshComponent* AnalCensorship; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UCensorshipComponent* CensorshipComponent; + UPROPERTY() ANakedDesireCharacter* Player; diff --git a/Source/NakedDesire/Player/PlayerImpostor.cpp b/Source/NakedDesire/Player/PlayerImpostor.cpp index b3f62f2d..ddf5e2d4 100644 --- a/Source/NakedDesire/Player/PlayerImpostor.cpp +++ b/Source/NakedDesire/Player/PlayerImpostor.cpp @@ -2,6 +2,7 @@ #include "NakedDesireCharacter.h" #include "Kismet/GameplayStatics.h" +#include "NakedDesire/Censorship/CensorshipComponent.h" #include "NakedDesire/Clothing/ClothingManager.h" #include "NakedDesire/Clothing/ClothingVisualsComponent.h" @@ -17,6 +18,17 @@ APlayerImpostor::APlayerImpostor() Mesh->SetupAttachment(RootComponent); ClothingVisualsComponent = CreateDefaultSubobject(TEXT("Clothing Visuals Component")); + + BoobLCensorship = CreateDefaultSubobject(TEXT("Boob L Censorship")); + BoobLCensorship->SetupAttachment(GetMesh(), FName(TEXT("boob_l"))); + BoobRCensorship = CreateDefaultSubobject(TEXT("Boob R Censorship")); + BoobRCensorship->SetupAttachment(GetMesh(), FName(TEXT("boob_r"))); + VaginaCensorship = CreateDefaultSubobject(TEXT("Vagina Censorship")); + VaginaCensorship->SetupAttachment(GetMesh(), FName(TEXT("pelvis"))); + AnalCensorship = CreateDefaultSubobject(TEXT("Anal Censorship")); + AnalCensorship->SetupAttachment(GetMesh(), FName(TEXT("pelvis"))); + + CensorshipComponent = CreateDefaultSubobject(TEXT("Censorship Component")); } void APlayerImpostor::BeginPlay() @@ -30,4 +42,5 @@ void APlayerImpostor::BeginPlay() } ClothingVisualsComponent->Initialize(GetMesh(), Player->ClothingManager); + CensorshipComponent->Initialize(Player->ClothingManager, BoobLCensorship, BoobRCensorship, VaginaCensorship, AnalCensorship); } \ No newline at end of file diff --git a/Source/NakedDesire/Player/PlayerImpostor.h b/Source/NakedDesire/Player/PlayerImpostor.h index 561d0043..3d9331b3 100644 --- a/Source/NakedDesire/Player/PlayerImpostor.h +++ b/Source/NakedDesire/Player/PlayerImpostor.h @@ -6,6 +6,8 @@ class ANakedDesireCharacter; class UClothingVisualsComponent; +class UCensorshipComponent; +class UStaticMeshComponent; UCLASS() class NAKEDDESIRE_API APlayerImpostor : public APawn @@ -21,6 +23,21 @@ class NAKEDDESIRE_API APlayerImpostor : public APawn UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Clothing") UClothingVisualsComponent* ClothingVisualsComponent; + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UStaticMeshComponent* BoobLCensorship; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UStaticMeshComponent* BoobRCensorship; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UStaticMeshComponent* VaginaCensorship; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UStaticMeshComponent* AnalCensorship; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta = (AllowPrivateAccess = true), Category = "Censorship") + UCensorshipComponent* CensorshipComponent; + UPROPERTY() ANakedDesireCharacter* Player;