Removing unused assets, adding light switch meshes, created puzzle di…

…agram class

Source/HouseEscape/Character/HouseEscapeCharacter.cpp

@@ -42,6 +42,10 @@ AHouseEscapeCharacter::AHouseEscapeCharacter()
 
 	isOverlapping = false;
 	mostDesirableTarget = nullptr;
+
+	IsInventoryOpen = false;
+
+	lastItemSelected;
 }
 
 void AHouseEscapeCharacter::BeginPlay()
@@ -55,6 +59,7 @@ void AHouseEscapeCharacter::BeginPlay()
 	messenger->OnItemPickedUp.AddDynamic(this, &AHouseEscapeCharacter::HandleItemPickedUp);
 	messenger->OnAddInteractTarget.AddDynamic(this, &AHouseEscapeCharacter::AddInteractTarget);
 	messenger->OnRemoveInteract.AddDynamic(this, &AHouseEscapeCharacter::RemoveInteractTarget);
+	messenger->OnInventoryItemSelected.AddDynamic(this, &AHouseEscapeCharacter::SetLastItemSelected);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -67,6 +72,7 @@ void AHouseEscapeCharacter::SetupPlayerInputComponent(class UInputComponent* Pla
 
 	// Bind fire event
 	PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &AHouseEscapeCharacter::OnInteract);
+	PlayerInputComponent->BindAction("Inventory", IE_Pressed, this, &AHouseEscapeCharacter::OnInventory);
 
 	// Bind movement events
 	PlayerInputComponent->BindAxis("MoveForward", this, &AHouseEscapeCharacter::MoveForward);
@@ -133,6 +139,11 @@ void AHouseEscapeCharacter::AddInteractTarget(FMessage message)
 	currentTargets.Add(message.interact);
 	isOverlapping = true;
 	AInteractable* tempTarget = AInteractable::FindMostDesirableTarget(currentTargets, this);
+
+	if (!tempTarget)
+	{
+		return;
+	}
 
 	if (mostDesirableTarget == nullptr)
 	{
@@ -162,6 +173,10 @@ void AHouseEscapeCharacter::RemoveInteractTarget(FMessage message)
 	else
 	{
 		mostDesirableTarget = AInteractable::FindMostDesirableTarget(currentTargets, this);
+		if (!mostDesirableTarget)
+		{
+			return;
+		}
 		mostDesirableTarget->SetRenderDepth(true);
 		messenger->CollideWithInteractable(message);
 	}
@@ -182,6 +197,10 @@ void AHouseEscapeCharacter::Tick(float DeltaSeconds)
 	if (FirstPersonCameraComponent->GetForwardVector() != CameraForward && AnyCurrentTargets())
 	{
 		AInteractable* tempMostDesirable = AInteractable::FindMostDesirableTarget(currentTargets, this);
+		if (!tempMostDesirable)
+		{
+			return;
+		}
 		if (mostDesirableTarget != tempMostDesirable)
 		{
 			CameraForward = FirstPersonCameraComponent->GetForwardVector();
@@ -198,3 +217,37 @@ void AHouseEscapeCharacter::Tick(float DeltaSeconds)
 		}
 	}
 }
+
+void AHouseEscapeCharacter::OnInventory()
+{
+	APlayerController* playerController = UGameplayStatics::GetPlayerController(GetWorld(), 0);
+	if (IsInventoryOpen)
+	{
+		playerController->bEnableMouseOverEvents = false;
+		playerController->bShowMouseCursor = false;
+		playerController->bEnableClickEvents = false;
+		playerController->SetInputMode(FInputModeGameOnly());
+	}
+	else
+	{
+		playerController->bEnableMouseOverEvents = true;
+		playerController->bShowMouseCursor = true;
+		playerController->bEnableClickEvents = true;
+		playerController->SetInputMode(FInputModeGameAndUI());
+	}
+
+	FMessage message;
+	message.items = items;
+	messenger->ToggleInventory(message);
+	IsInventoryOpen = !IsInventoryOpen;
+}
+
+void AHouseEscapeCharacter::SetLastItemSelected(FMessage message)
+{
+	lastItemSelected = message.itemInfo;
+}
+
+FItem AHouseEscapeCharacter::GetLastSelectedItem()
+{
+	return lastItemSelected;
+}

Source/HouseEscape/Character/HouseEscapeCharacter.h

@@ -45,6 +45,8 @@ class AHouseEscapeCharacter : public ACharacter
 
 	TArray<AInteractable*> GetCurrentTargets();
 
+	FItem GetLastSelectedItem();
+
 protected:
 	virtual void BeginPlay();
 
@@ -72,6 +74,9 @@ class AHouseEscapeCharacter : public ACharacter
 	virtual void SetupPlayerInputComponent(UInputComponent* InputComponent) override;
 	// End of APawn interface
 
+	UPROPERTY(BlueprintReadOnly)
+		AInteractable* mostDesirableTarget;
+
 private:
 	const float InteractDistance = 300.0f;
 
@@ -84,7 +89,7 @@ class AHouseEscapeCharacter : public ACharacter
 
 	TArray<AInteractable*> currentTargets;
 
-	AInteractable* mostDesirableTarget;
+
 
 	UFUNCTION()
 	void AddInteractTarget(FMessage message);
@@ -97,5 +102,13 @@ class AHouseEscapeCharacter : public ACharacter
 	void Tick(float DeltaSeconds) override;
 
 	UMessenger* messenger;
+
+	void OnInventory();
+	bool IsInventoryOpen;
+
+	FItem lastItemSelected;
+
+	UFUNCTION()
+	void SetLastItemSelected(FMessage message);
 };
 

Source/HouseEscape/Interactables/InteractInterface.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Interface.h"
+#include "MessageStruct.h"
 #include "InteractInterface.generated.h"
 
 UINTERFACE(Blueprintable)
@@ -14,6 +15,9 @@ class IInteractInterface
 	GENERATED_BODY()
 
 public:
-	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "MyCategory")
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Interact")
 	void OnInteract();
+
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Item")
+	void OnUseItem(FMessage message);
 };

Source/HouseEscape/Interactables/Interactable.cpp

@@ -22,6 +22,8 @@ AInteractable::AInteractable()
 	BoxComponent->SetRelativeLocation(FVector::ZeroVector);
 
 	uniqueId = FGuid::NewGuid();
+
+	IsValidInteract = true;
 }
 
 // Called when the game starts or when spawned
@@ -75,6 +77,10 @@ void AInteractable::OnInteract_Implementation()
 {
 }
 
+void AInteractable::OnUseItem_Implementation(FMessage message)
+{
+}
+
 bool AInteractable::IsPlayerOverlapping()
 {
 	return BoxComponent->IsOverlappingActor(UGameplayStatics::GetPlayerCharacter(GetWorld(), 0));
@@ -113,7 +119,7 @@ AInteractable* AInteractable::FindMostDesirableTarget(TArray<AInteractable*> int
 
 void AInteractable::SetRenderDepth(bool renderSet)
 {
-	StaticMeshComponent->SetRenderCustomDepth(renderSet);
+	Cast<UStaticMeshComponent>(RootComponent)->SetRenderCustomDepth(renderSet);
 }
 
 TEnumAsByte<Interacts> AInteractable::GetInteractType()

Source/HouseEscape/Interactables/Interactable.h

@@ -44,7 +44,9 @@ class HOUSEESCAPE_API AInteractable : public AActor, public IInteractInterface
 	USaveGameUtil* saveGameUtil;
 
 	virtual void OnInteract_Implementation() override;
+	virtual void OnUseItem_Implementation(FMessage message) override;
 
+	UPROPERTY(EditAnywhere, BlueprintReadOnly)
 	TEnumAsByte<Interacts> interactType;
 
 public:	
@@ -58,6 +60,8 @@ class HOUSEESCAPE_API AInteractable : public AActor, public IInteractInterface
 
 	TEnumAsByte<Interacts> GetInteractType();
 
+	bool GetIsValidInteract();
+
 protected:
 
 	UFUNCTION()
@@ -69,4 +73,6 @@ class HOUSEESCAPE_API AInteractable : public AActor, public IInteractInterface
 	bool IsPlayerOverlapping();
 
 	FGuid uniqueId;
+
+	bool IsValidInteract;
 };

Source/HouseEscape/Interactables/Items/ItemStruct.h

@@ -18,21 +18,18 @@ struct FItem
 
 public:
 
-	UPROPERTY(EditAnywhere)
-	UStaticMeshComponent* meshComponent;
-
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, BlueprintReadOnly)
 	TEnumAsByte<ItemType> itemType;
 
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, BlueprintReadOnly)
 	UTexture2D* texture;
 
-	UPROPERTY(EditAnywhere)
-	FName name;
+	UPROPERTY(EditAnywhere, BlueprintReadOnly)
+	FText name;
 
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, BlueprintReadOnly)
 	int itemIndex;
 
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere, BlueprintReadOnly)
 	AItemBase* baseClass;
 };

Source/HouseEscape/Interactables/LightSwitch.cpp

@@ -9,12 +9,13 @@ void ALightSwitch::OnInteract_Implementation()
 	{
 		pointLight->GetLightComponent()->SetActive(false);
 		pointLight->GetLightComponent()->ToggleVisibility(false);
+		SwitchFlip->SetRelativeRotation(FRotator::ZeroRotator);
 	}
 	else
 	{
-
 		pointLight->GetLightComponent()->SetActive(true);
 		pointLight->GetLightComponent()->ToggleVisibility(true);
+		SwitchFlip->SetRelativeRotation(FRotator(0, 0, -45));
 	}
 
 	if (pointLight2 != nullptr)
@@ -38,4 +39,25 @@ void ALightSwitch::OnInteract_Implementation()
 ALightSwitch::ALightSwitch()
 {
 	interactType = Interacts::LightSwitch;
+
+	static ConstructorHelpers::FObjectFinder<UStaticMesh> LightSwitchBase(TEXT("/Game/StaticMeshes/Items/LightSwitch/LightSwitchBase.LightSwitchBase"));
+	StaticMeshComponent->SetStaticMesh(LightSwitchBase.Object);
+
+	static ConstructorHelpers::FObjectFinder<UStaticMesh> LightSwitchFlip(TEXT("/Game/StaticMeshes/Items/LightSwitch/LightSwitchFlip.LightSwitchFlip"));
+	SwitchFlip = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("Flipper"));
+	SwitchFlip->SetStaticMesh(LightSwitchFlip.Object);
+	SwitchFlip->SetRelativeLocation(FVector(0, -1, 0));
+	SwitchFlip->SetupAttachment(RootComponent);
+
+	static ConstructorHelpers::FObjectFinder<UStaticMesh> LightSwitchScrewTop(TEXT("/Game/StaticMeshes/Items/LightSwitch/LightSwitchScrewTop.LightSwitchScrewTop"));
+	TopScrew = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("TopScrew"));
+	TopScrew->SetStaticMesh(LightSwitchScrewTop.Object);
+	TopScrew->SetupAttachment(RootComponent);
+
+	static ConstructorHelpers::FObjectFinder<UStaticMesh> LightSwitchScrewBottom(TEXT("/Game/StaticMeshes/Items/LightSwitch/LightSwitchScrewBottom.LightSwitchScrewBottom"));
+	BottomScrew = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("BottomScrew"));
+	BottomScrew->SetStaticMesh(LightSwitchScrewBottom.Object);
+	BottomScrew->SetupAttachment(RootComponent);
+
+	BoxComponent->SetRelativeLocation(FVector(0, 30, 0));
 }

Source/HouseEscape/Interactables/LightSwitch.h

@@ -21,6 +21,15 @@ class HOUSEESCAPE_API ALightSwitch : public AInteractable
 	UPROPERTY(EditAnywhere)
 	APointLight* pointLight2;
 
+	UPROPERTY(EditAnywhere)
+	UStaticMeshComponent* SwitchFlip;
+
+	UPROPERTY(EditAnywhere)
+	UStaticMeshComponent* TopScrew;
+
+	UPROPERTY(EditAnywhere)
+	UStaticMeshComponent* BottomScrew;
+
 public:
 	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "MyCategory")
 	void OnInteract();

Source/HouseEscape/Interactables/PuzzleDiagram.cpp

@@ -0,0 +1,62 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#include "PuzzleDiagram.h"
+
+APuzzleDiagram::APuzzleDiagram()
+{
+	static ConstructorHelpers::FObjectFinder<UStaticMesh> Plane(TEXT("/Engine/BasicShapes/Plane.Plane"));
+
+	static ConstructorHelpers::FObjectFinder<UMaterialInterface> DiagramMat(TEXT("/Game/Materials/PuzzleDiagram.PuzzleDiagram"));
+	UMaterialInterface* DiagramMaterial = (UMaterialInterface*)DiagramMat.Object;
+
+	StaticMeshComponent->SetStaticMesh(Plane.Object);
+	StaticMeshComponent->SetMaterial(0, DiagramMaterial);
+
+	BoxComponent->SetBoxExtent(FVector(80, 80, 32));
+	BoxComponent->SetRelativeLocation(FVector(0, 0, 40));
+
+	CameraComponent = CreateDefaultSubobject<UCameraComponent>(TEXT("Camera"));
+	CameraComponent->SetRelativeLocation(FVector(0, 0, 120));
+	CameraComponent->SetWorldRotation(FRotator(-90, 0, -90));
+	CameraComponent->SetupAttachment(AInteractable::RootComponent);
+
+	interactType = Interacts::Generic;
+}
+
+void APuzzleDiagram::OnInteract_Implementation()
+{
+	//If we are not currently overlapping the box component, do not interact
+	if (!AInteractable::BoxComponent->IsOverlappingComponent(UGameplayStatics::GetPlayerCharacter(AInteractable::GetWorld(), 0)->GetCapsuleComponent()))
+	{
+		return;
+	}
+
+	messenger->RemoveAllWidgets();
+	APlayerController* playerController = AInteractable::GetWorld()->GetFirstPlayerController();
+
+	//Toggle between player controller's camera and this camera when interact button is pressed
+	if (playerController->GetViewTarget() == this)
+	{
+		playerController->SetViewTargetWithBlend((AActor*)UGameplayStatics::GetPlayerCharacter(AInteractable::GetWorld(), 0), 0.5f);
+		playerController->bEnableMouseOverEvents = false;
+		playerController->bShowMouseCursor = false;
+		playerController->bEnableClickEvents = false;
+		AInteractable::StaticMeshComponent->SetRenderCustomDepth(true);
+
+		FMessage message;
+		message.interactableType = interactType;
+		messenger->CollideWithInteractable(message);
+
+		playerController->SetInputMode(FInputModeGameOnly());
+	}
+	else
+	{
+		playerController->SetViewTargetWithBlend((AActor*)this, 0.5f);
+		playerController->bEnableMouseOverEvents = true;
+		playerController->bShowMouseCursor = true;
+		playerController->bEnableClickEvents = true;
+		AInteractable::StaticMeshComponent->SetRenderCustomDepth(false);
+
+		playerController->SetInputMode(FInputModeGameAndUI());
+	}
+}

Source/HouseEscape/Interactables/PuzzleDiagram.h

@@ -0,0 +1,27 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Interactables/Interactable.h"
+#include "Camera/CameraComponent.h"
+#include "PuzzleDiagram.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class HOUSEESCAPE_API APuzzleDiagram : public AInteractable
+{
+	GENERATED_BODY()
+
+	APuzzleDiagram();
+
+	UPROPERTY(EditAnywhere)
+	UCameraComponent* CameraComponent;
+
+protected:
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Interact")
+	void OnInteract();
+	void OnInteract_Implementation() override;
+};