mausham/MobileShooter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

separated logic for weapon code refactored

Browse Source
This commit is contained in:
Mausham
2025-12-30 12:43:44 -08:00
parent 37dd15d1b9
commit 1a61f3c506
19 changed files with 157 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Darkmatter/Code/Domain/Player/AirboneState.cs
View File

@@ -1,4 +1,5 @@
using Darkmatter.Core;
using System;
using UnityEngine;
namespace Darkmatter.Domain
@@ -17,9 +18,15 @@ namespace Darkmatter.Domain
public override void Update()
{
HandlePlayerMovement();
HandleShoooting();
CheckForStateBreak();
}
private void HandleShoooting()
{
runner.Shoot(inputReader.isShooting);
}
public override void LateUpdate()
{
HandlePlayerRotation();
@@ -44,7 +51,7 @@ namespace Darkmatter.Domain
private void CheckForStateBreak()
{
if (runner.playerController.isGrounded)
if (runner.playerPawn.isGrounded)
{
runner.ChangeState(new LocomotionState(runner));
}

10
Assets/Darkmatter/Code/Domain/Player/LocomotionState.cs
View File

@@ -19,10 +19,16 @@ namespace Darkmatter.Domain
public override void Update()
{
HandlePlayerMovement();
HandleShooting();
CheckForStateBreak();
}
private void HandleShooting()
{
runner.Shoot(inputReader.isShooting);
}
public override void LateUpdate()
{
HandlePlayerRotation();
@@ -39,7 +45,7 @@ namespace Darkmatter.Domain
private void CheckForStateBreak()
{
if (!runner.playerController.isGrounded)
if (!runner.playerPawn.isGrounded)
{
runner.ChangeState(new AirboneState(runner));
}
@@ -57,7 +63,7 @@ namespace Darkmatter.Domain
private void HandlePlayerJump()
{
runner.playerController.Jump(playerConfig.jumpForce);
runner.playerPawn.Jump(playerConfig.jumpForce);
playerAnim.PlayJumpAnim();
}

23
Assets/Darkmatter/Code/Domain/Player/PlayerStateMachine.cs
View File

@@ -6,9 +6,12 @@ namespace Darkmatter.Domain
{
public class PlayerStateMachine : StateMachine
{
[Inject] public readonly IPlayerPawn playerController;
[Inject] public readonly IPlayerPawn playerPawn;
[Inject] public readonly IInputReader inputReader;
[Inject] public readonly IPlayerAnim playerAnim;
[Inject] public readonly ITargetProvider targetProvider;
[Inject] public readonly ICameraService cameraService;
[Inject] public readonly IWeapon GunWeapon;
[Inject] public readonly PlayerConfigSO playerConfig;
[Inject] public readonly CameraConfigSO cameraConfig;
@@ -19,8 +22,8 @@ namespace Darkmatter.Domain
public void Move(Vector2 moveInputDir, float moveSpeed)
{
//player movement with reference to camera
Vector3 cameraForward = playerController.mainCamera.transform.forward;
Vector3 cameraRight = playerController.mainCamera.transform.right;
Vector3 cameraForward =cameraService.mainCamera.transform.forward;
Vector3 cameraRight = cameraService.mainCamera.transform.right;
cameraForward.y = 0f;
cameraRight.y = 0f;
@@ -30,7 +33,7 @@ namespace Darkmatter.Domain
moveDir = cameraRight * moveInputDir.x + cameraForward * moveInputDir.y;
playerController.Move(moveDir * moveSpeed);
playerPawn.Move(moveDir * moveSpeed);
playerAnim.PlayMovementAnim(moveInputDir);
}
@@ -43,7 +46,17 @@ namespace Darkmatter.Domain
pitch -= lookInput.y * cameraConfig.lookSensitivity * Time.deltaTime;
}
pitch = Mathf.Clamp(pitch, cameraConfig.bottomClampAngle, cameraConfig.topClampAngle);
playerController.SetCameraRotation(pitch, Yaw);
playerPawn.SetCameraRotation(pitch, Yaw);
}
public void Shoot(bool isShooting)
{
if (!isShooting) return;
if(GunWeapon.canAttack)
{
GunWeapon.Attack();
}
}