From 38473505f59f86f283f40208cf69268c83e84a05 Mon Sep 17 00:00:00 2001 From: Kingsmedia Date: Thu, 5 May 2022 21:56:31 +0200 Subject: [PATCH] 84 - Zoom While Aiming --- .../Character/BP_BlasterCharacter.uasset | Bin 67067 -> 67300 bytes .../Blueprints/Weapon/BP_AssaultRifle.uasset | Bin 31819 -> 31919 bytes Source/Blaster/Character/BlasterCharacter.h | 7 ++-- Source/Blaster/Components/CombatComponent.cpp | 32 ++++++++++++++++-- Source/Blaster/Components/CombatComponent.h | 20 ++++++++--- Source/Blaster/Weapon/Weapon.h | 10 ++++++ 6 files changed, 59 insertions(+), 10 deletions(-) diff --git a/Content/Blueprints/Character/BP_BlasterCharacter.uasset b/Content/Blueprints/Character/BP_BlasterCharacter.uasset index 8895600d3579821a09cd98e313b98512bf6b92c9..8a75d078cf9005a320a82177d422e82fa0c32061 100644 GIT binary patch delta 19341 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�z9%)QU(qT3;{2fK`0Zpd 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 Yv8@vJ?Qqc^uU;Oq>xZ`PhRR(2f2nB-QUCw| diff --git a/Content/Blueprints/Weapon/BP_AssaultRifle.uasset b/Content/Blueprints/Weapon/BP_AssaultRifle.uasset index 9064d825cb112314d2a6b3867f9046c4ed56ca41..6d0a000e094817925aefcc4cdf703918b56c60db 100644 GIT binary patch delta 1933 zcmZ{lTS${(7{}jl^RPLoY1`*Ebq5(Ey+{i$q!n05P@18ZQ5Rk~M<%&>SZyA%)aNOYDis}WU=zbtLP%Jt3Z-cOFLNVML`gX;CkNe-RCyG?}70=&-?p72j1=5_imjT z-(Wh{<7Z0{ibM$I+ig~G5oj34Fc}5nc!c6eu0bdr{21gJ280-hRVfJR;e*WxrOq&; zk`Kr8#^$HI^CtD$#7bmt%cqmM6Eep}oA&uK(UU&I*v%9r|AmUDjgSVJ7mO@%-m}T< zk*37}I%~IATFZ`{C`PRX|8nH??e5`6 zHM=;{M9DWG&Aj9*kQN`gM76EdF9GS{C5u4X1xbe>>EtC}pj($9!Mx-%)YJ=-%Yvjy zklZ0e%H08;ROpmkMsI{n?Gx;9N|5vmk^x?_0CR?T$vlu=Lby%4@uqTn({8#caTQ^@ zT$W#VAxt+QptFT+6g$oOOS~=Sb$ALMqR1#IsNmfD97bIDxlK5>& zvCb%3_ovTvSt3INUecK0_H#tX0-+xF>y4t1+i8>`3l|y`aXX>TVb94{#r4pl;NW#p+<-~#Uz^Ox4 lUyt@u7gInY&$wk|r)R-wV{n3V+9Pu$iE&Bozv10?u_23&|nd?G<0ETSyZgiQq$Tv!AS zf*|0+i!X?z5fe-kOnA_!Pi_$xK&1*I@yUQj@Ju_mT*967Waj+enZM`Go!p@%`fQQ5 zE@}re2=O9>94I=KgOexehfOp#?OgyN_#+brLSk^P(-N}5LI}n60?xlN^5Y4~oTNSW z#GZWv1@^?^tp~?OX1!ACCXS?x_?9izhuwFudgjv)jr4HnQ{0hUjj3#`;9yPU+WyjL zADRTczEQRs->8kEl~+~p`3F`u!(*-BCX&?`B#XCyU@K&swbUCW)OQSDf#PNCYU zsJ2L|kK`}~c5Toa&q>_fD%H9FiK%Vt)K93EE2>qBYPF(zMNz#bsk9dCfhN`?uGFG) z?89hz5lL9XA%TlFi*Pb}rn-XXhP zmzb~no*w074$rJ|4Y|(Adn7rG_(-?D8(!#5ZigOTH;Z+3YaAr<9m#n`@(sxaMdCnG zuSjN)G(do0RQK|K{));CrqDi^F~sQ3aNQT@L=RUom;t83?JyP`0>!}^dKPMf1=U<8 zlo**9C0^uvcH`W|J`Fh1fg00wO|FD^9`HIU7vaM}Vp zLIl;J97zycaGMH)StNP7JepuQBwfb{>yVLDPM#OK&9g%_x~qs-L#(8gccw3Kme@nX zDZq57pt@V?d^~ellz18I*w}^<>0A*~4Vhu-Vkc&jlOHE{kR(H(Nh5a2sDsmcPFiD% zP<2$go0`YeUWq3c2^xzTj+rA=j@5MB96_xRU`~cu%dRc{Xr#elA6k4%E6W&fFkWN4 z!gz`C7Md-Mw8&=Ie9NHvV}VEUasKnsgmmMlmkm5Q7)}svLPBFC#Y4^1Lrs+@G-Q=g mgEM=0yqu;GetCharacterMovement()->MaxWalkSpeed = BaseWalkSpeed; + + if (Character->GetFollowCamera()) + { + DefaultFOV = Character->GetFollowCamera()->FieldOfView; + CurrentFOV = DefaultFOV; + } } } void UCombatComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) { Super::TickComponent(DeltaTime, TickType, ThisTickFunction); - - SetHUDCrosshairs(DeltaTime); - + if (Character && Character->IsLocallyControlled()) { FHitResult HitResult; TraceUnderCrosshairs(HitResult); HitTarget = HitResult.ImpactPoint; + + SetHUDCrosshairs(DeltaTime); + InterpFOV(DeltaTime); } } @@ -105,6 +113,24 @@ void UCombatComponent::SetHUDCrosshairs(float DeltaTime) } } +void UCombatComponent::InterpFOV(float DeltaTime) +{ + if (EquippedWeapon == nullptr) return; + + if (bAiming) + { + CurrentFOV = FMath::FInterpTo(CurrentFOV, EquippedWeapon->GetZoomedFOV(), DeltaTime, EquippedWeapon->GetZoomInterpSpeed()); + } + else + { + CurrentFOV = FMath::FInterpTo(CurrentFOV, DefaultFOV, DeltaTime, ZoomInterpSpeed); + } + if (Character && Character->GetFollowCamera()) + { + Character->GetFollowCamera()->SetFieldOfView(CurrentFOV); + } +} + void UCombatComponent::SetAiming(bool bIsAiming) { bAiming = bIsAiming; diff --git a/Source/Blaster/Components/CombatComponent.h b/Source/Blaster/Components/CombatComponent.h index d674704..bf5f7ea 100644 --- a/Source/Blaster/Components/CombatComponent.h +++ b/Source/Blaster/Components/CombatComponent.h @@ -63,12 +63,24 @@ private: bool bFireButtonPressed; - /* - * HUD and Crosshairs - */ - + //HUD and Crosshairs float CrosshairVelocityFactor; float CrosshairInAirFactor; + // Aiming and FOV + + // Field of view when not aiming; set to the camera's base FOV in BeginPlay + float DefaultFOV; + + UPROPERTY(EditAnywhere, Category = Combat) + float ZoomedFOV = 30.f; + + float CurrentFOV; + + UPROPERTY(EditAnywhere, Category = Combat) + float ZoomInterpSpeed = 20.f; + + void InterpFOV(float DeltaTime); + FVector HitTarget; }; diff --git a/Source/Blaster/Weapon/Weapon.h b/Source/Blaster/Weapon/Weapon.h index 2682438..5678664 100644 --- a/Source/Blaster/Weapon/Weapon.h +++ b/Source/Blaster/Weapon/Weapon.h @@ -43,6 +43,13 @@ public: UPROPERTY(EditAnywhere, Category= Crosshairs) class UTexture2D* CrosshairsBottom; + + // Zoom FOV while aiming + UPROPERTY(EditAnywhere) + float ZoomedFOV = 30.f; + + UPROPERTY(EditAnywhere) + float ZoomInterpSpeed = 20.f; protected: virtual void BeginPlay() override; @@ -92,4 +99,7 @@ public: void SetWeaponState(EWeaponState State); FORCEINLINE USphereComponent* GetAreaSphere() const { return AreaSphere; } FORCEINLINE USkeletalMeshComponent* GetWeaponMesh() const { return WeaponMesh; }; + FORCEINLINE float GetZoomedFOV() const { return ZoomedFOV; }; + FORCEINLINE float GetZoomInterpSpeed() const { return ZoomInterpSpeed; }; + };