ИИ гонщиков, запуск, перезапуск игры и пр

Assets/Code/Example/Race/Racer/AI/AICarDriver.cs

@@ -0,0 +1,12 @@
+using UnityEngine;
+
+namespace Code.Example.Race.Racer.AI
+{
+    public class AICarDriver : CarControllerRB
+    {
+        public override void SetSteering(Vector2 steeringLinear)
+        {
+            SteeringInput = steeringLinear;
+        }
+    }
+}

Assets/Code/Example/Race/Racer/AI/AICarDriver.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c82b0db1441e417098bccb9ca1575e3e
+timeCreated: 1770639201

Assets/Code/Example/Race/Racer/AI/AIRacerID.cs

@@ -1,11 +1,16 @@
 using System.Collections.Generic;
 using Code.Example.Race.Racer.AI.ID;
+using Code.Example.Race.Track;
+using Code.Infrastructure.EventBus;
+using Reflex.Attributes;
 using UnityEngine;
 
 namespace Code.Example.Race.Racer.AI
 {
     public class AIRacerID : Racer
     {
+        [Inject] private EventBus _eventBus;
+        [SerializeField] private CarControllerRB carController;
         public override void SetData(RacerData data)
         {
             Data = data;
@@ -21,9 +26,10 @@ namespace Code.Example.Race.Racer.AI
 
         public override void NextWaypoint()
         {
-            if(CurrentWaypointIndex >= Waypoints.Count) CurrentWaypointIndex = 0;
+            if (++CurrentWaypointIndex < Waypoints.Count) return;
             
-            CurrentWaypointIndex++;
+            CurrentWaypointIndex = 0;
+            _eventBus.RaiseEvent<IRacerPassedCheckpointHandler>(x=> x.LapPassed(this));
         }
 
         public override void StartRacer()
@@ -66,33 +72,38 @@ namespace Code.Example.Race.Racer.AI
         {
             if (!_running) return;
             
-            var displacement = _velocity * Time.deltaTime;
-            _orientation += _rotation * Time.deltaTime;
-            _orientation = NormalizeAngle(_orientation);
+            var steering =  
+                transform.InverseTransformDirection(
+                    agent.GetSteering(Waypoints[CurrentWaypointIndex]).linear);
             
-            transform.Translate(displacement, Space.World);
-            transform.Rotate(Vector3.up, _orientation);
+            carController.SetSteering(new Vector2(steering.x, steering.z));
+            // var displacement = _velocity * Time.deltaTime;
+            // _orientation += _rotation * Time.deltaTime;
+            // _orientation = NormalizeAngle(_orientation);
+            //
+            // transform.Translate(displacement, Space.World);
+            // transform.Rotate(Vector3.up, _orientation);
         }
         public virtual void LateUpdate()
         {
             if (!_running) return;
-
-            _steering = agent.GetSteering(Waypoints[CurrentWaypointIndex]);
-            
-            _velocity += _steering.linear * Time.deltaTime;
-            _rotation += _steering.angular * Time.deltaTime;
-            if (_velocity.magnitude > Data.speed)
-            {
-                _velocity = _velocity.normalized * Data.speed; 
-            }
-            if (_steering.angular == 0.0f)
-            {
-                _rotation = 0.0f;
-            }
-            if (_steering.linear.sqrMagnitude == 0.0f)
-            {
-                _velocity = Vector3.zero;
-            }
+            //
+            // _steering = agent.GetSteering(Waypoints[CurrentWaypointIndex]);
+            //
+            // _velocity += _steering.linear * Time.deltaTime;
+            // _rotation += _steering.angular * Time.deltaTime;
+            // if (_velocity.magnitude > Data.speed)
+            // {
+            //     _velocity = _velocity.normalized * Data.speed; 
+            // }
+            // if (_steering.angular == 0.0f)
+            // {
+            //     _rotation = 0.0f;
+            // }
+            // if (_steering.linear.sqrMagnitude == 0.0f)
+            // {
+            //     _velocity = Vector3.zero;
+            // }
         }
     }
 }

Assets/Code/Example/Race/Racer/AI/ID/Agent.cs

@@ -16,11 +16,6 @@ namespace Code.Example.Race.Racer.AI.ID
             velocity = Vector3.zero;
             steering = new Steering();
         }
-
-        public void SetSteering(Steering steering)
-        {
-            this.steering = steering;
-        }
         public virtual void Update ()
         {
             Vector3 displacement = velocity * Time.deltaTime;

Assets/Code/Example/Race/Racer/AI/ID/Behaviours/Seek.cs

@@ -9,8 +9,10 @@ namespace Code.Example.Race.Racer.AI.ID.Behaviours
             Steering steering = new Steering();
             
             steering.linear = target.position - transform.position;
+            UnityEngine.Debug.DrawRay(transform.position, steering.linear, Color.yellow, 5f);
+            // steering.linear *= agent.Data.maxAcceleration;
             steering.linear.Normalize();
-            steering.linear *= agent.Data.maxAcceleration;
+            UnityEngine.Debug.Log(steering.linear);
             return steering;
         }
     }

Assets/Code/Example/Race/Racer/CarControllerRB.cs

@@ -1,11 +1,10 @@
-using UnityEngine;
 using System;
 using System.Collections.Generic;
-using Code.Example.Race.Racer.AI;
+using UnityEngine; 
 
-namespace Code.Example.Race.Racer.Player
+namespace Code.Example.Race.Racer
 {
-    public class PlayerCarControllerRB : MonoBehaviour
+    public abstract class CarControllerRB : MonoBehaviour
     {
         public enum ControlMode
         {
@@ -35,30 +34,31 @@ namespace Code.Example.Race.Racer.Player
 
         public List<Wheel> wheels;
 
-        private Rigidbody carRb;
-        
-        [SerializeField] private PlayerCarInput _playerCarInput;
-        [SerializeField] private PlayerRacer _playerRacer;
-        
+        protected Rigidbody CarRb;
 
+        protected Vector2 SteeringInput = Vector2.zero;
+        public abstract void SetSteering(Vector2 steeringLinear);
+        
+        [SerializeField] protected Racer racer;
+        
         // private CarLights carLights;
 
-        void Start()
+        private void Start()
         {
-            carRb = GetComponent<Rigidbody>();
-            carRb.centerOfMass = _centerOfMass;
+            CarRb = GetComponent<Rigidbody>();
+            CarRb.centerOfMass = _centerOfMass;
 
             // carLights = GetComponent<CarLights>();
         }
 
-        void Update()
+        protected virtual void Update()
         {
             // GetInputs();
             AnimateWheels();
             // WheelEffects();
         }
 
-        void FixedUpdate()
+        private void FixedUpdate()
         {
             Move();
             Steer();
@@ -84,51 +84,54 @@ namespace Code.Example.Race.Racer.Player
             // }
         }
 
-        void Move()
+        private void Move()
         {
             foreach (var wheel in wheels)
             {
-                wheel.wheelCollider.motorTorque = _playerCarInput.MovementInput.y * 600 * _playerRacer.Data.maxAcceleration * Time.fixedDeltaTime;
+                wheel.wheelCollider.motorTorque = SteeringInput.y * 600 * racer.Data.maxAcceleration * Time.fixedDeltaTime;
+                // wheel.wheelCollider.motorTorque = _playerCarInput.MovementInput.y * 600 * _playerRacer.Data.maxAcceleration * Time.fixedDeltaTime;
             }
         }
 
-        void Steer()
+        private void Steer()
         {
             foreach (var wheel in wheels)
             {
                 if (wheel.axel != Axel.Front) continue;
                 
-                var _steerAngle = _playerCarInput.MovementInput.x * _playerRacer.Data.turnSensitivity * _playerRacer.Data.maxSteerAngle;
-                wheel.wheelCollider.steerAngle = _steerAngle;
+                var steerAngle = SteeringInput.x * racer.Data.turnSensitivity * racer.Data.maxSteerAngle;
+                // var _steerAngle = _playerCarInput.MovementInput.x * _playerRacer.Data.turnSensitivity * _playerRacer.Data.maxSteerAngle;
+                wheel.wheelCollider.steerAngle = steerAngle;
                 // wheel.wheelCollider.steerAngle = Mathf.Lerp(wheel.wheelCollider.steerAngle, _steerAngle, 0.6f);
             }
         }
 
-        void Brake()
+        protected virtual void Brake()
         {
-            if (_playerCarInput.Brake || _playerCarInput.MovementInput.y == 0)
-            {
-                foreach (var wheel in wheels)
-                {
-                    wheel.wheelCollider.brakeTorque = 300 * _playerRacer.Data.brakeAcceleration * Time.fixedDeltaTime;
-                }
-
-                // carLights.isBackLightOn = true;
-                // carLights.OperateBackLights();
-            }
-            else
-            {
-                foreach (var wheel in wheels)
-                {
-                    wheel.wheelCollider.brakeTorque = 0;
-                }
-
-                // carLights.isBackLightOn = false;
-                // carLights.OperateBackLights();
-            }
+            //|| _playerCarInput.MovementInput.y == 0
+            // if (_playerCarInput.Brake )
+            // {
+            //     foreach (var wheel in wheels)
+            //     {
+            //         wheel.wheelCollider.brakeTorque = 300 * _racer.Data.brakeAcceleration * Time.fixedDeltaTime;
+            //     }
+            //
+            //     // carLights.isBackLightOn = true;
+            //     // carLights.OperateBackLights();
+            // }
+            // else
+            // {
+            //     foreach (var wheel in wheels)
+            //     {
+            //         wheel.wheelCollider.brakeTorque = 0;
+            //     }
+            //
+            //     // carLights.isBackLightOn = false;
+            //     // carLights.OperateBackLights();
+            // }
         }
 
-        void AnimateWheels()
+        private void AnimateWheels()
         {
             foreach (var wheel in wheels)
             {
@@ -140,14 +143,14 @@ namespace Code.Example.Race.Racer.Player
             }
         }
 
-        void WheelEffects()
+        private void WheelEffects()
         {
             foreach (var wheel in wheels)
             {
                 //var dirtParticleMainSettings = wheel.smokeParticle.main;
 
                 if (wheel.axel == Axel.Rear && wheel.wheelCollider.isGrounded &&
-                    carRb.linearVelocity.magnitude >= 10.0f)
+                    CarRb.linearVelocity.magnitude >= 10.0f)
                 {
                     // wheel.wheelEffectObj.GetComponentInChildren<TrailRenderer>().emitting = true;
                     // wheel.smokeParticle.Emit(1);

Assets/Code/Example/Race/Racer/Player/PlayerRBCarController.cs

@@ -0,0 +1,44 @@
+using UnityEngine;
+
+namespace Code.Example.Race.Racer.Player
+{
+    public class PlayerRBCarController : CarControllerRB
+    {
+        [SerializeField] private PlayerCarInput playerCarInput;
+
+        public override void SetSteering(Vector2 steeringLinear)
+        {
+            
+        }
+
+        protected override void Update()
+        {
+            SteeringInput = playerCarInput.MovementInput;
+            base.Update();
+        }
+
+        protected override void Brake()
+        {
+            if (playerCarInput.Brake )
+            {
+                foreach (var wheel in wheels)
+                {
+                    wheel.wheelCollider.brakeTorque = 300 * racer.Data.brakeAcceleration * Time.fixedDeltaTime;
+                }
+            
+                // carLights.isBackLightOn = true;
+                // carLights.OperateBackLights();
+            }
+            else
+            {
+                foreach (var wheel in wheels)
+                {
+                    wheel.wheelCollider.brakeTorque = 0;
+                }
+            
+                // carLights.isBackLightOn = false;
+                // carLights.OperateBackLights();
+            }
+        }
+    }
+}

Assets/Code/Example/Race/Racer/Player/PlayerRBCarController.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bad2326aa0f24acb9bdfeb5fb7d3d208
+timeCreated: 1770640123

Assets/Code/Example/Race/Racer/Player/PlayerRacer.cs

@@ -1,10 +1,15 @@
 using System.Collections.Generic;
+using Code.Example.Race.Track;
+using Code.Infrastructure.EventBus;
+using Reflex.Attributes;
 using UnityEngine;
 
 namespace Code.Example.Race.Racer.Player
 {
     public class PlayerRacer : Racer
     {
+        [Inject] private EventBus _eventBus;
+        
         public Transform CameraPosition;
         public override void SetData(RacerData data)
         {
@@ -13,21 +18,26 @@ namespace Code.Example.Race.Racer.Player
 
         public override void Initialize(List<Transform> waypoints)
         {
-            
+            Waypoints = waypoints; 
         }
 
         public override void NextWaypoint()
         {
+            if (++CurrentWaypointIndex < Waypoints.Count) return;
             
+            CurrentWaypointIndex = 0;
+            _eventBus.RaiseEvent<IPlayerPassedCheckpointHandler>(x=> x.OnPlayerLapPassed(this));
+            _eventBus.RaiseEvent<IRacerPassedCheckpointHandler>(x=> x.LapPassed(this));
         }
-
+        public bool RaceStarted { get; set; }
         public override void StartRacer()
         {
-            
+            RaceStarted = true;
         }
 
         public override void StopRacer()
         {
+            RaceStarted = false;
         }
     }
 }

Assets/Code/Example/Race/Racer/Racer.cs

@@ -6,7 +6,8 @@ namespace Code.Example.Race.Racer
     public abstract class Racer : MonoBehaviour
     {
         protected List<Transform> Waypoints;
-        protected int CurrentWaypointIndex;
+        
+        public int CurrentWaypointIndex { get; protected set; }
         public RacerData Data { get; protected set; }
         public int Id { get; set; }
         public abstract void SetData(RacerData data);

Assets/Code/Example/Race/Racer/RacerFactory.cs

@@ -56,8 +56,8 @@ namespace Code.Example.Race.Racer
                 _eventBus.RaiseEvent<IRacerLoadedHandle>(x => x.RacerLoaded(racerType, null));
 
                 return;
-            }
-            
+            } 
+            UnityEngine.Debug.LogWarning($"Racer loaded {racerType}");
             _racerPrefabsHandle.Add(racerType,
                 Addressables.LoadAssetAsync<GameObject>(_racerConfigs[racerType].prefabReference));
             
@@ -76,8 +76,10 @@ namespace Code.Example.Race.Racer
 
         public void Dispose()
         {
+            UnityEngine.Debug.LogWarning($"Racers released");
             foreach (var prefab in _racerPrefabsHandle) 
                 prefab.Value.Release();
+            _racerPrefabsHandle.Clear();
             
             _racerConfigsHandle.Release();
         }
@@ -90,7 +92,6 @@ namespace Code.Example.Race.Racer
 
     public interface IRacerLoadedHandle : IGlobalSubscriber
     {
-        public void RacerLoaded(RacerType type, Racer racer);
-        public void RacerCreated(RacerType type, Racer racer);
+        public void RacerLoaded(RacerType type, Racer racer); 
     }
 }