feat: rifle animations (in progress)

Added some rifle animations
Added weapon socket

Source/Exo/Private/Characters/Components/ShootingComponent.cpp

@@ -116,14 +116,17 @@ void UShootingComponent::PickUpGun(UStaticMeshComponent* PickedGunMesh)
         DropGun();
 
     FAttachmentTransformRules AttachmentRules(EAttachmentRule::SnapToTarget, EAttachmentRule::SnapToTarget,
-        EAttachmentRule::KeepRelative, true);
+        EAttachmentRule::KeepWorld, true);
 
     PickedGunMesh->SetSimulatePhysics(false);
     PickedGunMesh->SetCastShadow(false);
-    PickedGunMesh->AttachToComponent(PlayerCharacter->Weapon, AttachmentRules, FName(TEXT("GripPoint")));
+    PickedGunMesh->AttachToComponent(PlayerCharacter->GetMesh(), AttachmentRules, FName(TEXT("GripPoint")));
 
     AGunBase* PickedGunBase = Cast<AGunBase>(PickedGunMesh->GetOwner());
 
+    // Tymczasowo
+    bHasRifle = true;
+
     if (IsValid(CurrentGunBase))
     {
         SecondaryGunBase = PickedGunBase;
@@ -176,13 +179,16 @@ void UShootingComponent::DropGun()
     StopAiming();
 
     FDetachmentTransformRules DetachmentRules(EDetachmentRule::KeepRelative, EDetachmentRule::KeepRelative,
-        EDetachmentRule::KeepRelative, false);
+        EDetachmentRule::KeepWorld, false);
     
     CurrentGunMesh->DetachFromComponent(DetachmentRules);
     CurrentGunMesh->SetSimulatePhysics(true);
     CurrentGunMesh->bCastDynamicShadow = true;
     CurrentGunMesh->CastShadow = true;
 
+    // Tymczasowo
+    bHasRifle = false;
+
     CurrentGunMesh = nullptr;
     CurrentGunBase = nullptr;
 }

Source/Exo/Private/Characters/ExoPlayerCharacter.cpp

@@ -33,13 +33,6 @@ AExoPlayerCharacter::AExoPlayerCharacter()
 	InteractionComponent = CreateDefaultSubobject<UInteractionComponent>(TEXT("Interaction Component"));
 	ShootingComponent = CreateDefaultSubobject<UShootingComponent>(TEXT("Shooting Component"));
 	
-	Weapon = CreateDefaultSubobject<USkeletalMeshComponent>("Weapon");
-	Weapon->SetupAttachment(GetMesh());
-	Weapon->SetCollisionEnabled(ECollisionEnabled::NoCollision);
-	Weapon->bCastDynamicShadow = false;
-	Weapon->CastShadow = false;
-	Weapon->SetRelativeLocation(FVector(-50.f, 0.f, -90.f));
-	
 	//bUseControllerRotationPitch = false;
 	//bUseControllerRotationYaw = true;
 	//bUseControllerRotationRoll = false;

Source/Exo/Public/Characters/Components/ShootingComponent.h

@@ -90,6 +90,9 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Mele Attack")
 	float MeleRange = 75.f;
 
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Shooting")
+	bool bHasRifle = false;
+
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Shooting")
 	AThrowableBase* ThrowableItem = nullptr;
 

Source/Exo/Public/Characters/ExoPlayerCharacter.h

@@ -21,9 +21,6 @@ public:
 	AExoPlayerCharacter();
 
 	/// U PROPERTIES ///
-	UPROPERTY(EditAnywhere, Category = "Combat")
-	TObjectPtr<USkeletalMeshComponent> Weapon;
-
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly)
 	TObjectPtr<UInteractionComponent> InteractionComponent;
 	
@@ -60,8 +57,8 @@ public:
 	UPROPERTY(EditAnywhere, Category = "Movement Properties")
 	float CrouchSpeed = 300.f;
 
-	UPROPERTY(EditAnywhere, Category = "Aiming")
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Aiming")
-	float bIsAimingMode = false;
+	bool bIsAimingMode = false;
 
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Crouch")
 	bool bIsCrouchingMode = false;