#77 Added rifle animation FABRIK

xthebat · Dec 18, 2023 · 2bd9414 · 2bd9414
1 parent e55a221
commit 2bd9414
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 7 deletions.
diff --git a/Content/Blueprints/Character/JungleRaider/Animations/TAnimation.uasset b/Content/Blueprints/Character/JungleRaider/Animations/TAnimation.uasset
diff --git a/Content/Blueprints/Character/JungleRaider/Mesh/tm_jungle_raider_variantb2.uasset b/Content/Blueprints/Character/JungleRaider/Mesh/tm_jungle_raider_variantb2.uasset
diff --git a/Content/Blueprints/Character/JungleRaider/Mesh/tm_jungle_raider_variantb2_Skeleton.uasset b/Content/Blueprints/Character/JungleRaider/Mesh/tm_jungle_raider_variantb2_Skeleton.uasset
diff --git a/Content/Blueprints/Character/JungleRaider/Montages/rifle_fire_Montage.uasset b/Content/Blueprints/Character/JungleRaider/Montages/rifle_fire_Montage.uasset
diff --git a/Content/Blueprints/Character/JungleRaider/Montages/rifle_fire_crouch_Montage.uasset b/Content/Blueprints/Character/JungleRaider/Montages/rifle_fire_crouch_Montage.uasset
diff --git a/Content/Blueprints/Character/JungleRaider/Sequences/rifle_fire.uasset b/Content/Blueprints/Character/JungleRaider/Sequences/rifle_fire.uasset
diff --git a/Content/Blueprints/Character/JungleRaider/Sequences/rifle_fire_crouch.uasset b/Content/Blueprints/Character/JungleRaider/Sequences/rifle_fire_crouch.uasset
diff --git a/Content/Blueprints/Character/JungleRaider/shotgun_fire.uasset b/Content/Blueprints/Character/JungleRaider/shotgun_fire.uasset
diff --git a/Content/Blueprints/Weapons/Rifle/ak47/Mesh/w_rifle_ak47_weapon.uasset b/Content/Blueprints/Weapons/Rifle/ak47/Mesh/w_rifle_ak47_weapon.uasset
diff --git a/Content/Blueprints/Weapons/WeaponTableDefinitions.uasset b/Content/Blueprints/Weapons/WeaponTableDefinitions.uasset
diff --git a/Importing/tm_jungle_raider_variantb2.fbx b/Importing/tm_jungle_raider_variantb2.fbx
diff --git a/Importing/tm_jungle_raider_variantb2_fire.blend b/Importing/tm_jungle_raider_variantb2_fire.blend
diff --git a/Source/Cloud9/Character/Components/Cloud9Inventory.cpp b/Source/Cloud9/Character/Components/Cloud9Inventory.cpp
@@ -198,6 +198,8 @@ bool UCloud9Inventory::ReplaceWeaponAt(EWeaponSlot Slot, ACloud9WeaponBase* Weap
 
 ACloud9WeaponBase* UCloud9Inventory::GetSelectedWeapon() const { return GetWeaponAt(SelectedWeaponSlot); }
 
+ACloud9WeaponBase* UCloud9Inventory::GetPendingWeapon() const { return GetWeaponAt(PendingWeaponSlot); }
+
 bool UCloud9Inventory::IsWeaponChanging() const { return SelectedWeaponSlot != PendingWeaponSlot; }
 
 EWeaponType UCloud9Inventory::GetSelectedWeaponType() const

diff --git a/Source/Cloud9/Character/Components/Cloud9Inventory.h b/Source/Cloud9/Character/Components/Cloud9Inventory.h
@@ -61,7 +61,7 @@ class CLOUD9_API UCloud9Inventory
 
 	UFUNCTION(BlueprintCallable)
 	EWeaponSlot GetPendingWeaponSlot() const;
-	
+
 	UFUNCTION(BlueprintCallable)
 	ACloud9WeaponBase* GetWeaponAt(EWeaponSlot Slot) const;
 
@@ -77,6 +77,9 @@ class CLOUD9_API UCloud9Inventory
 	UFUNCTION(BlueprintCallable)
 	ACloud9WeaponBase* GetSelectedWeapon() const;
 
+	UFUNCTION(BlueprintCallable)
+	ACloud9WeaponBase* GetPendingWeapon() const;
+
 	UFUNCTION(BlueprintCallable)
 	bool IsWeaponChanging() const;
 
@@ -104,12 +107,15 @@ class CLOUD9_API UCloud9Inventory
 	UPROPERTY()
 	TArray<ACloud9WeaponBase*> WeaponSlots;
 
+	UPROPERTY(Category=Weapon, BlueprintReadOnly, meta=(AllowPrivateAccess))
 	EWeaponSlot SelectedWeaponSlot;
+
+	UPROPERTY(Category=Weapon, BlueprintReadOnly, meta=(AllowPrivateAccess))
 	EWeaponSlot PendingWeaponSlot;
 
-	UPROPERTY(EditDefaultsOnly, Category = Weapons, meta=(AllowPrivateAccess))
+	UPROPERTY(Category=Weapon, EditDefaultsOnly, meta=(AllowPrivateAccess))
 	EMelee DefaultKnifeName;
 
-	UPROPERTY(EditDefaultsOnly, Category = Weapons, meta=(AllowPrivateAccess))
+	UPROPERTY(Category=Weapon, EditDefaultsOnly, meta=(AllowPrivateAccess))
 	EFirearm DefaultPistolName;
 };
diff --git a/Source/Cloud9/Cloud9.h b/Source/Cloud9/Cloud9.h
@@ -99,7 +99,7 @@ class TOperator
 	template <typename SelfType>
 	constexpr friend auto operator|(SelfType& Self, FunctionType&& Function)
 	{
-		return Function(Forward<SelfType>(Self));
+		return Function(Forward<SelfType>(Self)); // TODO: May be use Function(MoveTempIfPossible(Self)) ???
 	}
 
 	template <typename SelfType>

diff --git a/Source/Cloud9/Weapon/Classes/Cloud9WeaponBase.cpp b/Source/Cloud9/Weapon/Classes/Cloud9WeaponBase.cpp
@@ -468,7 +468,7 @@ bool ACloud9WeaponBase::ChangeActionFlag(bool Flag, bool bIsReleased)
 
 FName ACloud9WeaponBase::GetWeaponName() const
 {
-	log(Fatal, "[Weapon='%s'] Weapon name wasn't override", *GetName())
+	log(Fatal, "[Weapon='%s'] Not implmemented", *GetName())
 	return NAME_None;
 }
 
@@ -478,16 +478,28 @@ EWeaponType ACloud9WeaponBase::GetWeaponType() const
 	return WeaponDefinition->GetWeaponInfo()->Type;
 }
 
+const UStaticMeshSocket* ACloud9WeaponBase::GetSocketByName(FName SocketName) const
+{
+	log(Fatal, "[Weapon='%s'] Not implmemented", *GetName())
+	return nullptr;
+}
+
+const UStaticMeshComponent* ACloud9WeaponBase::GetWeaponMesh() const
+{
+	log(Fatal, "[Weapon='%s'] Not implmemented", *GetName())
+	return nullptr;
+}
+
 EWeaponClass ACloud9WeaponBase::GetWeaponClass() const
 {
-	log(Fatal, "[Weapon='%s'] Weapon class wasn't override", *GetName())
+	log(Fatal, "[Weapon='%s'] Not implmemented", *GetName())
 	return EWeaponClass::NoClass;
 }
 
 bool ACloud9WeaponBase::CanBeDropped() const { return true; }
 
 const UEnum* ACloud9WeaponBase::GetWeaponActions() const
 {
-	log(Fatal, "[Weapon='%s'] Weapon actions wasn't override", *GetName());
+	log(Fatal, "[Weapon='%s'] Not implmemented", *GetName());
 	return nullptr;
 }
diff --git a/Source/Cloud9/Weapon/Classes/Cloud9WeaponBase.h b/Source/Cloud9/Weapon/Classes/Cloud9WeaponBase.h
@@ -68,6 +68,12 @@ class CLOUD9_API ACloud9WeaponBase : public AActor
 	UFUNCTION(BlueprintCallable)
 	EWeaponType GetWeaponType() const;
 
+	UFUNCTION(BlueprintCallable)
+	virtual const UStaticMeshSocket* GetSocketByName(FName SocketName) const;
+
+	UFUNCTION(BlueprintCallable)
+	virtual const UStaticMeshComponent* GetWeaponMesh() const;
+
 	bool IsWeaponInitialized() const { return WeaponDefinition.IsSet(); }
 
 	bool AddToInventory(ACloud9Character* Character, EWeaponSlot NewSlot);

diff --git a/Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.cpp b/Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.cpp
@@ -65,6 +65,13 @@ EWeaponClass ACloud9WeaponFirearm::GetWeaponClass() const { return EWeaponClass:
 
 const UEnum* ACloud9WeaponFirearm::GetWeaponActions() const { return StaticEnum<EFirearmAction>(); }
 
+const UStaticMeshSocket* ACloud9WeaponFirearm::GetSocketByName(FName SocketName) const
+{
+	return WeaponMesh->GetSocketByName(SocketName);
+}
+
+const UStaticMeshComponent* ACloud9WeaponFirearm::GetWeaponMesh() const { return WeaponMesh; }
+
 void ACloud9WeaponFirearm::OnConstruction(const FTransform& Transform)
 {
 	using namespace ETOptional;

diff --git a/Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.h b/Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.h
@@ -57,6 +57,8 @@ class CLOUD9_API ACloud9WeaponFirearm : public ACloud9WeaponBase
 	virtual FName GetWeaponName() const override;
 	virtual EWeaponClass GetWeaponClass() const override;
 	virtual const UEnum* GetWeaponActions() const override;
+	virtual const UStaticMeshSocket* GetSocketByName(FName SocketName) const override;
+	virtual const UStaticMeshComponent* GetWeaponMesh() const override;
 
 protected:
 	virtual void OnConstruction(const FTransform& Transform) override;

diff --git a/Source/Cloud9/Weapon/Classes/Cloud9WeaponMelee.cpp b/Source/Cloud9/Weapon/Classes/Cloud9WeaponMelee.cpp
@@ -50,6 +50,13 @@ const UEnum* ACloud9WeaponMelee::GetWeaponActions() const { return StaticEnum<EM
 
 bool ACloud9WeaponMelee::CanBeDropped() const { return false; }
 
+const UStaticMeshSocket* ACloud9WeaponMelee::GetSocketByName(FName SocketName) const
+{
+	return WeaponMesh->GetSocketByName(SocketName);
+}
+
+const UStaticMeshComponent* ACloud9WeaponMelee::GetWeaponMesh() const { return WeaponMesh; }
+
 void ACloud9WeaponMelee::OnConstruction(const FTransform& Transform)
 {
 	using namespace ETOptional;

diff --git a/Source/Cloud9/Weapon/Classes/Cloud9WeaponMelee.h b/Source/Cloud9/Weapon/Classes/Cloud9WeaponMelee.h
@@ -51,6 +51,8 @@ class CLOUD9_API ACloud9WeaponMelee : public ACloud9WeaponBase
 	virtual EWeaponClass GetWeaponClass() const override;
 	virtual const UEnum* GetWeaponActions() const override;
 	virtual bool CanBeDropped() const override;
+	virtual const UStaticMeshSocket* GetSocketByName(FName SocketName) const override;
+	virtual const UStaticMeshComponent* GetWeaponMesh() const override;
 
 protected:
 	virtual void OnConstruction(const FTransform& Transform) override;