From 0779e31c75234e90557d77baf34fed5e7c780104 Mon Sep 17 00:00:00 2001 From: Marcel Hara Date: Thu, 16 Mar 2023 17:18:01 +0000 Subject: [PATCH] Updated Positions of Items to Merchant Shop Fixed the origin of the items and properly positioned and scaled items to make the merchant shop work fully --- .../MerchantShopModular_JellyJar_low.uasset | 4 +-- .../ItemsInWorld/BP_BuffPlacedItem.uasset | 4 +-- Content/Levels/Build.umap | 4 +-- .../PlayerTemp/TempCharacter.cpp | 27 +++++++------------ 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset index 169bdc0..1f29c3b 100644 --- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31d214c2da928f053645485cadef58b3a34b0086b29e9c47e91b4b3e855dd3e1 -size 40380 +oid sha256:7e63166802d9289b2e2fec1445a76dbe195aa05e10e26a74840b71dde4360b01 +size 41905 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset index c72efc0..588829f 100644 --- a/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset +++ b/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea7e5b5b8374101c5ddc1d4b250890f3a492338e58d96e55ac0c11a594e108ae -size 31298 +oid sha256:1091781ac2bfd39e2fe229b0b944d91a92345f048d3333c09a52e1d35fa8a55c +size 31313 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index cbd8ac1..dee2c5b 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7a44e7e4e916ef3cc70cd4b017e69a1b6487cb4bad362be87babb29a8ffea12 -size 3374905 +oid sha256:d558287a04397cc61240f1a95c7fe141f7f6cc0b9482b3b07c62b38fac9d100d +size 3374748 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 7a483fa..14a79e7 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -219,7 +219,7 @@ void ATempCharacter::InputDisabler() { PlayerCharacter->DisableInput(GetWorld()->GetFirstPlayerController()); } - //TURNING OFF CROSSHAIR & IMPORTANT STATS + //TURNING OFF CROSSHAIR CrossHairWidget->SetVisibility(ESlateVisibility::Hidden); ImportantStatsWidget->SetVisibility(ESlateVisibility::Hidden); @@ -228,14 +228,14 @@ void ATempCharacter::InputDisabler() APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); PlayerController->SetInputMode(FInputModeUIOnly()); PlayerController->bShowMouseCursor = true; + disableTab = true; if (ThisCamera != nullptr) { - return; - } - else - { + OriginalCameraLocation = ThisCamera->GetComponentLocation(); + OriginalCameraRotation = ThisCamera->GetComponentRotation(); OriginalCameraFOV = ThisCamera->FieldOfView; + UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString()); } } @@ -246,27 +246,20 @@ void ATempCharacter::InputEnabler() { PlayerCharacter->EnableInput(GetWorld()->GetFirstPlayerController()); } - - //TURNING ON THE CROSSHAIR AND IMPORTANTSTATS WIDGET - - CrossHairWidget->SetVisibility(ESlateVisibility::Visible); - ImportantStatsWidget->SetVisibility(ESlateVisibility::Visible); - //Reset UI Mode APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); PlayerController->SetInputMode(FInputModeGameOnly()); PlayerController->bShowMouseCursor = false; - + + UE_LOG(LogTemp, Display, TEXT("Enabling Inputs")); disableTab = true; TraceDistance = 300; if (ThisCamera != nullptr) { - return; - } - else - { + ThisCamera->SetWorldLocation(OriginalCameraLocation); + ThisCamera->SetWorldRotation(OriginalCameraRotation); ThisCamera->FieldOfView = OriginalCameraFOV; - ThisCamera->ResetRelativeTransform(); + UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString()); } }