Added : virtual and override fire for weapons

Source/LegumeMix/Private/Player/LMPlayer.cpp

@@ -2,6 +2,8 @@
 
 
 #include "Player/LMPlayer.h"
+
+#include "Camera/CameraComponent.h"
 #include "Weapon/LMAmmo.h"
 #include "Weapon/LMWeaponManager.h"
 
@@ -9,13 +11,14 @@ ALMPlayer::ALMPlayer()
 {
  	// Set this character to call Tick() every frame.  You can turn this off to improve performance if you don't need it.
 	PrimaryActorTick.bCanEverTick = true;
-	
+
-	WeaponManager = CreateDefaultSubobject<ULMWeaponManager>(TEXT("Weapon Manager"));
+	Camera = CreateDefaultSubobject<UCameraComponent>(TEXT("Camera"));
+	Camera->SetupAttachment(RootComponent);
+	Camera->bUsePawnControlRotation = true;
+	Camera->SetRelativeLocation(FVector(20, 0, 90));
 	
 	WeaponSkeletalMeshComponent = CreateDefaultSubobject<USkeletalMeshComponent>(TEXT("Weapon Mesh"));
-	WeaponSkeletalMeshComponent->SetupAttachment(GetMesh());
+	WeaponSkeletalMeshComponent->SetupAttachment(Camera);
-
-	WeaponManager->SetWeaponMeshComponent(WeaponSkeletalMeshComponent);
 }
 
 // Called when the game starts or when spawned
@@ -34,6 +37,19 @@ void ALMPlayer::PickUpAmmo(ALMAmmo* Ammo)
 	}
 }
 
+void ALMPlayer::SetWeaponManager(ULMWeaponManager* Manager)
+{
+	UE_LOG(LogTemp, Warning, TEXT("Set weapon manager"))
+	if (!Manager)
+	{
+		GEngine->AddOnScreenDebugMessage(INDEX_NONE, 10.f, FColor::Red, TEXT("No Weapon Manager was given to the player !"));
+		return;
+	}
+	
+	WeaponManager = Manager;
+	WeaponManager->Initialize(WeaponSkeletalMeshComponent);
+}
+
 // Called every frame
 void ALMPlayer::Tick(float DeltaTime)
 {

Source/LegumeMix/Private/Player/LMPlayerController.cpp

@@ -26,6 +26,7 @@ void ALMPlayerController::SetupInputComponent()
 		Input->BindAction(LookAction, ETriggerEvent::Triggered, this, &ALMPlayerController::Look);
 		Input->BindAction(FireAction, ETriggerEvent::Triggered, this, &ALMPlayerController::Fire);
 		Input->BindAction(ReloadAction, ETriggerEvent::Triggered, this, &ALMPlayerController::Reload);
+		Input->BindAction(ScrollAction, ETriggerEvent::Triggered, this, &ALMPlayerController::Scroll);
 	}
 }
 
@@ -57,3 +58,9 @@ void ALMPlayerController::Reload(const FInputActionValue& InputValue)
 {
 	LegumixPlayer->GetWeaponManager()->Reload();
 }
+
+void ALMPlayerController::Scroll(const FInputActionValue& InputValue)
+{
+	const float ScrollAmount = InputValue.Get<float>();
+	LegumixPlayer->GetWeaponManager()->SwitchWeapon(ScrollAmount);
+}

Source/LegumeMix/Private/Weapon/LMBazoucorn.cpp

@@ -3,7 +3,7 @@
 
 #include "Weapon\LMBazoucorn.h"
 
-void ULMWeapon::Fire()
+void UBazoucorn::Fire()
 {
 	//Fire like a Bazoucorn
 }

Source/LegumeMix/Private/Weapon/LMRadivolver.cpp

@@ -3,7 +3,7 @@
 
 #include "Weapon/LMRadivolver.h"
 
-void ULMWeapon::Fire()
+void ULMRadivolver::Fire()
 {
 	//Fire like a Radivolver
 }

Source/LegumeMix/Private/Weapon/LMWeapon.cpp

@@ -5,6 +5,8 @@
 void ULMWeapon::Initialize()
 {
 	WeaponDataStructure =* WeaponRow.GetRow<FLMWeaponDataStructure>(TEXT(""));
+
+	//Get FVector de la position de l'arme
 }
 
 bool ULMWeapon::HasAmmoInClip()

Source/LegumeMix/Private/Weapon/LMWeaponManager.cpp

@@ -14,6 +14,11 @@ ULMWeaponManager::ULMWeaponManager()
 void ULMWeaponManager::BeginPlay()
 {
 	Super::BeginPlay();
+}
+
+void ULMWeaponManager::Initialize(USkeletalMeshComponent* Mesh)
+{
+	SetWeaponMeshComponent(Mesh);
 
 	for (auto Weapon : StartingWeapons)
 	{
@@ -21,19 +26,18 @@ void ULMWeaponManager::BeginPlay()
 		{
 			ULMWeapon* Instance = NewObject<ULMWeapon>(this, Weapon);
 			Weapons.Add(Instance);
-
+	
-			// TODO
+			// Instance->Initialize(Mesh->GetRelativeLocation());
-			// Instance->Initialize();
 		}
 	}
-
+	
 	if (!Weapons.IsEmpty())
 	{
 		SetWeapon(CurrentWeaponIndex);
 	}
 }
 
-void ULMWeaponManager::AddAmmoType(uint8 AmmoType, int AmmoCount)
+void ULMWeaponManager::AddAmmoType(EAmmoType AmmoType, int AmmoCount)
 {
 	FString Debug = FString::Printf(TEXT("Adding %i ammo of type %i"), AmmoCount, AmmoType);
 	GEngine->AddOnScreenDebugMessage(1, 1.f, FColor::Cyan, Debug);
@@ -41,33 +45,46 @@ void ULMWeaponManager::AddAmmoType(uint8 AmmoType, int AmmoCount)
 	for (const auto Weapon : Weapons)
 	{
 		// TODO : match weapon ammo type
-		if (!Weapon)
+		if (Weapon->WeaponDataStructure.AmmoType == AmmoType)
 			continue;
 
-		// TODO
+		Weapon->AddAmmo(AmmoCount);
-		// Weapon.AddAmmo(AmmoCount);
 	}
 }
 
 void ULMWeaponManager::Fire()
 {
-	// ULMWeapon* Weapon = GetCurrentWeapon();
+	ULMWeapon* Weapon = GetCurrentWeapon();
 	
 	GEngine->AddOnScreenDebugMessage(2, 1.f, FColor::Cyan, "Fire");
-	// TODO
+	Weapon->Fire();
 }
 
 void ULMWeaponManager::Reload()
 {
 	GEngine->AddOnScreenDebugMessage(3, 1.f, FColor::Cyan, "Reloading");
-
 	
-	// ULMWeapon* Weapon = GetCurrentWeapon();
+	ULMWeapon* Weapon = GetCurrentWeapon();
-	// TODO
+	Weapon->Reload();
-	// Weapon->Reload();
 }
 
-void ULMWeaponManager::SetWeapon(int Index)
+void ULMWeaponManager::SwitchWeapon(const int Direction)
+{
+	const int NewIndex = Direction + CurrentWeaponIndex;
+	if (NewIndex >= 0 && NewIndex < Weapons.Num())
+	{
+		SetWeapon(NewIndex);
+	}
+	else
+	{
+		if (NewIndex < 0)
+			SetWeapon(Weapons.Num() - 1);
+		else
+			SetWeapon(0);
+	}
+}
+
+void ULMWeaponManager::SetWeapon(const int Index)
 {
 	if (Index < 0 || Index >= Weapons.Num())
 	{
@@ -79,8 +96,9 @@ void ULMWeaponManager::SetWeapon(int Index)
 
 	if (WeaponMeshComponent)
 	{
-		// TODO
+		GEngine->AddOnScreenDebugMessage(INDEX_NONE, 5, FColor::Red, "Has Mesh");
-		// WeaponMeshComponent->SetSkeletalMesh()
+
+		WeaponMeshComponent->SetSkeletalMeshAsset(GetCurrentWeapon()->WeaponDataStructure.MeshWeapon);
 	}
 }
 

Source/LegumeMix/Public/Player/LMPlayer.h

@@ -6,6 +6,7 @@
 #include "GameFramework/Character.h"
 #include "LMPlayer.generated.h"
 
+class UCameraComponent;
 class ULMWeaponManager;
 
 class ALMAmmo;
@@ -32,10 +33,16 @@ public:
 	UFUNCTION(BlueprintCallable)
 	ULMWeaponManager* GetWeaponManager() { return WeaponManager; }
 
+	UFUNCTION(BlueprintCallable)
+	void SetWeaponManager(ULMWeaponManager* Manager);
+
 private:
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Legumix", meta = (AllowPrivateAccess = true))
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="Legumix", meta = (AllowPrivateAccess = true))
 	TObjectPtr<ULMWeaponManager> WeaponManager;
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Legumix", meta = (AllowPrivateAccess = true))
 	TObjectPtr<USkeletalMeshComponent> WeaponSkeletalMeshComponent;
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Legumix", meta = (AllowPrivateAccess = true))
+	TObjectPtr<UCameraComponent> Camera;
 };

Source/LegumeMix/Public/Player/LMPlayerController.h

@@ -41,6 +41,9 @@ private:
 
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, meta = (AllowPrivateAccess = true))
 	TObjectPtr<UInputAction> ReloadAction;
+	
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, meta = (AllowPrivateAccess = true))
+	TObjectPtr<UInputAction> ScrollAction;
 
 	UPROPERTY(BlueprintReadOnly, meta = (AllowPrivateAccess = true))
 	TObjectPtr<ALMPlayer> LegumixPlayer;
@@ -51,4 +54,5 @@ private:
 	void Look(const FInputActionValue& InputValue);
 	void Fire(const FInputActionValue& InputValue);
 	void Reload(const FInputActionValue& InputValue);
+	void Scroll(const FInputActionValue& InputValue);
 };

Source/LegumeMix/Public/Weapon/LMBazoucorn.h

@@ -13,4 +13,5 @@ UCLASS(BlueprintType, Blueprintable)
 class LEGUMEMIX_API UBazoucorn : public ULMWeapon
 {
 	GENERATED_BODY()
+	virtual void Fire() override;
 };

Source/LegumeMix/Public/Weapon/LMRadivolver.h

@@ -13,4 +13,5 @@ UCLASS(BlueprintType, Blueprintable)
 class LEGUMEMIX_API ULMRadivolver : public ULMWeapon
 {
 	GENERATED_BODY()
+	virtual void Fire() override;
 };

Source/LegumeMix/Public/Weapon/LMWeapon.h

@@ -26,7 +26,7 @@ public:
 
 	void Initialize();
 	
-	void Fire();
+	virtual void Fire();
 	
 	UFUNCTION(BlueprintCallable)
 	void Reload(); //Reload current clip to max ammo in clip

Source/LegumeMix/Public/Weapon/LMWeaponDataStructure.h

@@ -15,7 +15,7 @@ struct FLMWeaponDataStructure : public FTableRowBase
 	int MaxClipAmmo; // Max ammo in clip
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
-	TObjectPtr<UStaticMesh> MeshWeapon; //Mesh of the weapon display in the scene 
+	TObjectPtr<USkeletalMesh> MeshWeapon; //Mesh of the weapon display in the scene 
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	EAmmoType AmmoType; //Type of ammo, which ammo this weapon is using

Source/LegumeMix/Public/Weapon/LMWeaponManager.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "LMAmmo.h"
 #include "Components/ActorComponent.h"
 #include "LMWeaponManager.generated.h"
 
@@ -30,13 +31,16 @@ public:
 	void SetWeapon(int Index);
 
 	UFUNCTION(BlueprintCallable, Category="Legumix")
-	void AddAmmoType(uint8 AmmoType, int AmmoCount);
+	void AddAmmoType(EAmmoType AmmoType, int AmmoCount);
 
 	UFUNCTION(BlueprintCallable, Category="Legumix")
 	void Fire();
 	
 	UFUNCTION(BlueprintCallable, Category="Legumix")
 	void Reload();
+	void SwitchWeapon(int Direction);
+
+	void Initialize(USkeletalMeshComponent* Mesh);
 
 protected:
 	virtual void BeginPlay() override;