简单重构拆分 SimulationWorld

2026-09-18 17:43:41 +08:00
parent 1e4d3ef8d7
commit 92e1ea0d55
109 changed files with 2605 additions and 1817 deletions
@@ -7,17 +7,18 @@ namespace SepCore.Simulation
    {
        #region Collision Transient

-        public int CollisionCandidateCount => _collisionCandidates.IsCreated ? _collisionCandidates.Length : 0;
-        public int PendingAreaCollisionRequestCount => _areaCollisionRequests.Count;
-        public int LastCollisionQueryCount => _lastCollisionQueryCount;
-        public int LastProjectileCollisionQueryCount => _lastProjectileCollisionQueryCount;
-        public int LastAreaCollisionQueryCount => _lastAreaCollisionQueryCount;
-        public int LastCollisionCandidateCount => _lastCollisionCandidateCount;
-        public int LastProjectileCollisionCandidateCount => _lastProjectileCollisionCandidateCount;
-        public int LastAreaCollisionCandidateCount => _lastAreaCollisionCandidateCount;
-        public int LastResolvedAreaHitCount => _lastResolvedAreaHitCount;
-        public float LastCollisionCellSize => _lastCollisionCellSize;
-        public bool LastCollisionHasEnemyTargets => _lastCollisionHasEnemyTargets;
+        public SimulationStats Stats => new SimulationStats(
+            _collisionCandidates.IsCreated ? _collisionCandidates.Length : 0,
+            _areaCollisionRequests.Count,
+            _lastCollisionQueryCount,
+            _lastProjectileCollisionQueryCount,
+            _lastAreaCollisionQueryCount,
+            _lastCollisionCandidateCount,
+            _lastProjectileCollisionCandidateCount,
+            _lastAreaCollisionCandidateCount,
+            _lastResolvedAreaHitCount,
+            _lastCollisionCellSize,
+            _lastCollisionHasEnemyTargets);

        private void ResetCollisionRuntimeStats()
        {
@@ -45,8 +46,8 @@ namespace SepCore.Simulation
            _enemyCollisionBuckets.Clear();
        }

-        private void AddProjectileCollisionQuery(int queryId, in ProjectileJobOutputData projectile, float radius,
-            int maxTargets = 1)
+        private void AddProjectileCollisionQuery(int queryId, in ProjectileTransformSim transform,
+            in ProjectileIdentitySim identity, float radius, int maxTargets = 1)
        {
            if (!_collisionQueryInputs.IsCreated || radius <= 0f)
            {
@@ -56,14 +57,14 @@ namespace SepCore.Simulation
            _collisionQueryInputs.Add(new CollisionQueryData
            {
                QueryId = queryId,
-                SourceType = CollisionSourceTypeProjectile,
-                SourceEntityId = projectile.EntityId,
-                SourceOwnerEntityId = projectile.OwnerEntityId,
+                SourceType = SimulationCollision.SourceTypeProjectile,
+                SourceEntityId = identity.EntityId,
+                SourceOwnerEntityId = identity.OwnerEntityId,
                SourceWasActiveAtQueryTime = true,
-                Position = projectile.Position,
+                Position = transform.Position,
                Radius = radius,
                MaxTargets = math.max(1, maxTargets),
-                ShapeType = CollisionShapeCircle,
+                ShapeType = SimulationCollision.ShapeCircle,
                Direction = new float3(0f, 0f, 1f),
                HalfAngleDeg = 180f,
                HalfWidth = 0f,
@@ -94,7 +95,7 @@ namespace SepCore.Simulation
            _collisionQueryInputs.Add(new CollisionQueryData
            {
                QueryId = queryId,
-                SourceType = CollisionSourceTypeArea,
+                SourceType = SimulationCollision.SourceTypeArea,
                SourceEntityId = sourceEntityId,
                SourceOwnerEntityId = sourceOwnerEntityId,
                SourceWasActiveAtQueryTime = sourceWasActiveAtQueryTime,
@@ -0,0 +1,23 @@
+namespace SepCore.Simulation
+{
+    public sealed partial class SimulationWorld
+    {
+        #region Enemy Separation Buffers
+
+        private void PrepareEnemySeparationJobBuffers(int enemyCount, int bucketCapacity)
+        {
+            InitializeJobDataChannels();
+            EnsureCapacity(ref _enemySeparationTransforms, enemyCount);
+            _enemySeparationTransforms.Clear();
+            if (enemyCount > 0)
+            {
+                _enemySeparationTransforms.ResizeUninitialized(enemyCount);
+            }
+
+            EnsureCapacity(ref _enemySeparationBuckets, bucketCapacity);
+            _enemySeparationBuckets.Clear();
+        }
+
+        #endregion
+    }
+}
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 59ae2375305641a6a36d1bea0bf1abc2
+guid: 8a7f58c069d920f4698662060cb2db0b
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
@@ -1,91 +0,0 @@
-using Unity.Mathematics;
-
-namespace SepCore.Simulation
-{
-    public sealed partial class SimulationWorld
-    {
-        #region Enemy Separation Temporal
-
-        private void PrepareEnemySeparationJobBuffers(int enemyCount, int bucketCapacity)
-        {
-            InitializeJobDataChannels();
-            EnsureCapacity(ref _enemyJobSeparationOutputs, enemyCount);
-            _enemyJobSeparationOutputs.Clear();
-            if (enemyCount > 0)
-            {
-                _enemyJobSeparationOutputs.ResizeUninitialized(enemyCount);
-            }
-
-            EnsureCapacity(ref _enemySeparationBuckets, bucketCapacity);
-            _enemySeparationBuckets.Clear();
-
-            EnsureCapacity(ref _enemySeparationPreviousPushes, enemyCount);
-            EnsureCapacity(ref _enemySeparationCurrentPushes, enemyCount);
-
-            if (_enemySeparationPreviousPushes.Length < enemyCount)
-            {
-                int oldLength = _enemySeparationPreviousPushes.Length;
-                _enemySeparationPreviousPushes.ResizeUninitialized(enemyCount);
-                for (int i = oldLength; i < enemyCount; i++)
-                {
-                    _enemySeparationPreviousPushes[i] = float2.zero;
-                }
-            }
-            else if (_enemySeparationPreviousPushes.Length > enemyCount)
-            {
-                _enemySeparationPreviousPushes.ResizeUninitialized(enemyCount);
-            }
-
-            _enemySeparationCurrentPushes.Clear();
-            if (enemyCount > 0)
-            {
-                _enemySeparationCurrentPushes.ResizeUninitialized(enemyCount);
-            }
-        }
-
-        private void CommitEnemySeparationTemporalBuffers(int enemyCount)
-        {
-            if (!_enemySeparationPreviousPushes.IsCreated || !_enemySeparationCurrentPushes.IsCreated)
-            {
-                return;
-            }
-
-            int copyCount = math.min(enemyCount,
-                math.min(_enemySeparationPreviousPushes.Length, _enemySeparationCurrentPushes.Length));
-            for (int i = 0; i < copyCount; i++)
-            {
-                _enemySeparationPreviousPushes[i] = _enemySeparationCurrentPushes[i];
-            }
-        }
-
-        private void OnEnemyAddedToSeparationTemporalBuffers()
-        {
-            if (_enemySeparationPreviousPushes.IsCreated)
-            {
-                _enemySeparationPreviousPushes.Add(float2.zero);
-            }
-
-            if (_enemySeparationCurrentPushes.IsCreated)
-            {
-                _enemySeparationCurrentPushes.Add(float2.zero);
-            }
-        }
-
-        private void OnEnemyRemovedFromSeparationTemporalBuffers(int removedIndex)
-        {
-            if (_enemySeparationPreviousPushes.IsCreated && removedIndex >= 0 &&
-                removedIndex < _enemySeparationPreviousPushes.Length)
-            {
-                _enemySeparationPreviousPushes.RemoveAtSwapBack(removedIndex);
-            }
-
-            if (_enemySeparationCurrentPushes.IsCreated && removedIndex >= 0 &&
-                removedIndex < _enemySeparationCurrentPushes.Length)
-            {
-                _enemySeparationCurrentPushes.RemoveAtSwapBack(removedIndex);
-            }
-        }
-
-        #endregion
-    }
-}
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b2c8675358384b21925e6f660ce61a79
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -5,14 +5,6 @@ namespace SepCore.Simulation
 {
    public sealed partial class SimulationWorld
    {
-        // Shared channel constants plus compatibility fields still reflected by tests.
-        private const int CollisionSourceTypeProjectile = 1;
-        private const int CollisionSourceTypeArea = 2;
-        private const int CollisionShapeCircle = 0;
-        private const int CollisionShapeSector = 1;
-        private const int CollisionShapeRectangle = 2;
-
-        // Kept as top-level fields because current regression tests reflect them directly.
        private NativeList<CollisionQueryData> _collisionQueryInputs;
        private readonly List<AreaCollisionRequestData> _areaCollisionRequests = new(16);
    }
@@ -1,151 +0,0 @@
-using Unity.Mathematics;
-using UnityEngine;
-
-namespace SepCore.Simulation
-{
-    public sealed partial class SimulationWorld
-    {
-        #region Job Data Conversion
-
-        private void SyncSimulationStateToJobInputs()
-        {
-            InitializeJobDataChannels();
-            EnsureCapacity(ref _enemyJobInputs, _enemies.Count);
-            EnsureCapacity(ref _projectileJobInputs, _projectiles.Count);
-
-            _enemyJobInputs.Clear();
-            _projectileJobInputs.Clear();
-
-            foreach (EnemySimData data in _enemies)
-            {
-                _enemyJobInputs.Add(ConvertToEnemyJobInput(data));
-            }
-
-            foreach (ProjectileSimData data in _projectiles)
-            {
-                _projectileJobInputs.Add(ConvertToProjectileJobInput(data));
-            }
-        }
-
-        private void PrepareEnemyJobOutputBuffer(int enemyCount)
-        {
-            InitializeJobDataChannels();
-            EnsureCapacity(ref _enemyJobOutputs, enemyCount);
-            _enemyJobOutputs.Clear();
-
-            if (enemyCount > 0)
-            {
-                _enemyJobOutputs.ResizeUninitialized(enemyCount);
-            }
-        }
-
-        private void PrepareProjectileJobOutputBuffer(int projectileCount)
-        {
-            InitializeJobDataChannels();
-            EnsureCapacity(ref _projectileJobOutputs, projectileCount);
-            _projectileJobOutputs.Clear();
-
-            if (projectileCount > 0)
-            {
-                _projectileJobOutputs.ResizeUninitialized(projectileCount);
-            }
-        }
-
-        private void CopyProjectileInputsToOutputs()
-        {
-            for (int i = 0; i < _projectileJobInputs.Length; i++)
-            {
-                ProjectileJobInputData input = _projectileJobInputs[i];
-                _projectileJobOutputs[i] = new ProjectileJobOutputData
-                {
-                    EntityId = input.EntityId,
-                    OwnerEntityId = input.OwnerEntityId,
-                    Position = input.Position,
-                    Forward = input.Forward,
-                    Velocity = input.Velocity,
-                    Speed = input.Speed,
-                    LifeTime = input.LifeTime,
-                    Age = input.Age,
-                    Active = input.Active,
-                    RemainingLifetime = input.RemainingLifetime,
-                    State = input.State
-                };
-            }
-        }
-
-        private static EnemyJobInputData ConvertToEnemyJobInput(in EnemySimData enemy)
-        {
-            return new EnemyJobInputData
-            {
-                EntityId = enemy.EntityId,
-                Position = new float3(enemy.Position.x, enemy.Position.y, enemy.Position.z),
-                Forward = new float3(enemy.Forward.x, enemy.Forward.y, enemy.Forward.z),
-                Rotation = new quaternion(enemy.Rotation.x, enemy.Rotation.y, enemy.Rotation.z, enemy.Rotation.w),
-                Speed = enemy.Speed,
-                AttackRange = enemy.AttackRange,
-                AvoidEnemyOverlap = enemy.AvoidEnemyOverlap,
-                EnemyBodyRadius = enemy.EnemyBodyRadius,
-                SeparationIterations = enemy.SeparationIterations,
-                TargetType = enemy.TargetType,
-                State = enemy.State
-            };
-        }
-
-        private static EnemySimData ConvertToEnemySimData(in EnemyJobOutputData enemy)
-        {
-            return new EnemySimData
-            {
-                EntityId = enemy.EntityId,
-                Position = new Vector3(enemy.Position.x, enemy.Position.y, enemy.Position.z),
-                Forward = new Vector3(enemy.Forward.x, enemy.Forward.y, enemy.Forward.z),
-                Rotation = new Quaternion(enemy.Rotation.value.x, enemy.Rotation.value.y, enemy.Rotation.value.z,
-                    enemy.Rotation.value.w),
-                Speed = enemy.Speed,
-                AttackRange = enemy.AttackRange,
-                AvoidEnemyOverlap = enemy.AvoidEnemyOverlap,
-                EnemyBodyRadius = enemy.EnemyBodyRadius,
-                SeparationIterations = enemy.SeparationIterations,
-                TargetType = enemy.TargetType,
-                State = enemy.State
-            };
-        }
-
-        private static ProjectileJobInputData ConvertToProjectileJobInput(in ProjectileSimData projectile)
-        {
-            return new ProjectileJobInputData
-            {
-                EntityId = projectile.EntityId,
-                OwnerEntityId = projectile.OwnerEntityId,
-                Position = new float3(projectile.Position.x, projectile.Position.y, projectile.Position.z),
-                Forward = new float3(projectile.Forward.x, projectile.Forward.y, projectile.Forward.z),
-                Velocity = new float3(projectile.Velocity.x, projectile.Velocity.y, projectile.Velocity.z),
-                Speed = projectile.Speed,
-                LifeTime = projectile.LifeTime,
-                Age = projectile.Age,
-                Active = projectile.Active,
-                RemainingLifetime = projectile.RemainingLifetime,
-                State = projectile.State
-            };
-        }
-
-        private static ProjectileSimData ConvertToProjectileSimData(in ProjectileJobOutputData projectile)
-        {
-            return new ProjectileSimData
-            {
-                EntityId = projectile.EntityId,
-                OwnerEntityId = projectile.OwnerEntityId,
-                Position = new Vector3(projectile.Position.x, projectile.Position.y, projectile.Position.z),
-                Forward = new Vector3(projectile.Forward.x, projectile.Forward.y, projectile.Forward.z),
-                Velocity = new Vector3(projectile.Velocity.x, projectile.Velocity.y, projectile.Velocity.z),
-                Speed = projectile.Speed,
-                LifeTime = projectile.LifeTime,
-                Age = projectile.Age,
-                Active = projectile.Active,
-                RemainingLifetime = projectile.RemainingLifetime,
-                State = projectile.State
-            };
-        }
-
-        #endregion
-    }
-}
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 57a3f582d9c04803908205e0cd4b5b75
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,6 +1,5 @@
 using System;
 using Unity.Collections;
-using Unity.Mathematics;

 namespace SepCore.Simulation
 {
@@ -16,70 +15,44 @@ namespace SepCore.Simulation
            }

            DisposeJobDataChannels();
-            _enemyJobInputs = new NativeList<EnemyJobInputData>(64, Allocator.Persistent);
-            _enemyJobOutputs = new NativeList<EnemyJobOutputData>(64, Allocator.Persistent);
-            _enemyJobSeparationOutputs = new NativeList<EnemyJobOutputData>(64, Allocator.Persistent);
-            _enemySeparationPreviousPushes = new NativeList<float2>(64, Allocator.Persistent);
-            _enemySeparationCurrentPushes = new NativeList<float2>(64, Allocator.Persistent);
-            _projectileJobInputs = new NativeList<ProjectileJobInputData>(64, Allocator.Persistent);
-            _projectileJobOutputs = new NativeList<ProjectileJobOutputData>(64, Allocator.Persistent);
+            _enemies.Initialize(64);
+            _projectiles.Initialize(64);
+            _pickups.Initialize(32);
+            _enemySeparationTransforms = new NativeList<EnemyTransformSim>(64, Allocator.Persistent);
+            _collectedPickups = new NativeList<int>(64, Allocator.Persistent);
+            _enemySeparationBuckets = new NativeParallelMultiHashMap<long, int>(256, Allocator.Persistent);
            _collisionQueryInputs = new NativeList<CollisionQueryData>(64, Allocator.Persistent);
            _collisionCandidates = new NativeList<CollisionCandidateData>(128, Allocator.Persistent);
-            _enemySeparationBuckets = new NativeParallelMultiHashMap<long, int>(256, Allocator.Persistent);
            _enemyCollisionBuckets = new NativeParallelMultiHashMap<long, int>(256, Allocator.Persistent);
            InitializeEnemyTargetSpatialIndex();
        }

        private void DisposeJobDataChannels()
        {
-            if (_enemyJobInputs.IsCreated)
+            _enemies.Dispose();
+            _projectiles.Dispose();
+            _pickups.Dispose();
+
+            if (_enemySeparationTransforms.IsCreated)
            {
-                _enemyJobInputs.Dispose();
+                _enemySeparationTransforms.Dispose();
            }

-            _enemyJobInputs = default;
+            _enemySeparationTransforms = default;

-            if (_enemyJobOutputs.IsCreated)
+            if (_collectedPickups.IsCreated)
            {
-                _enemyJobOutputs.Dispose();
+                _collectedPickups.Dispose();
            }

-            _enemyJobOutputs = default;
+            _collectedPickups = default;

-            if (_enemyJobSeparationOutputs.IsCreated)
+            if (_enemySeparationBuckets.IsCreated)
            {
-                _enemyJobSeparationOutputs.Dispose();
+                _enemySeparationBuckets.Dispose();
            }

-            _enemyJobSeparationOutputs = default;
-
-            if (_enemySeparationPreviousPushes.IsCreated)
-            {
-                _enemySeparationPreviousPushes.Dispose();
-            }
-
-            _enemySeparationPreviousPushes = default;
-
-            if (_enemySeparationCurrentPushes.IsCreated)
-            {
-                _enemySeparationCurrentPushes.Dispose();
-            }
-
-            _enemySeparationCurrentPushes = default;
-
-            if (_projectileJobInputs.IsCreated)
-            {
-                _projectileJobInputs.Dispose();
-            }
-
-            _projectileJobInputs = default;
-
-            if (_projectileJobOutputs.IsCreated)
-            {
-                _projectileJobOutputs.Dispose();
-            }
-
-            _projectileJobOutputs = default;
+            _enemySeparationBuckets = default;

            if (_collisionQueryInputs.IsCreated)
            {
@@ -95,13 +68,6 @@ namespace SepCore.Simulation

            _collisionCandidates = default;

-            if (_enemySeparationBuckets.IsCreated)
-            {
-                _enemySeparationBuckets.Dispose();
-            }
-
-            _enemySeparationBuckets = default;
-
            if (_enemyCollisionBuckets.IsCreated)
            {
                _enemyCollisionBuckets.Dispose();
@@ -127,24 +93,14 @@ namespace SepCore.Simulation
                return;
            }

-            if (_enemyJobInputs.IsCreated)
+            if (_enemySeparationTransforms.IsCreated)
            {
-                _enemyJobInputs.Clear();
+                _enemySeparationTransforms.Clear();
            }

-            if (_enemyJobOutputs.IsCreated)
+            if (_collectedPickups.IsCreated)
            {
-                _enemyJobOutputs.Clear();
-            }
-
-            if (_projectileJobInputs.IsCreated)
-            {
-                _projectileJobInputs.Clear();
-            }
-
-            if (_projectileJobOutputs.IsCreated)
-            {
-                _projectileJobOutputs.Clear();
+                _collectedPickups.Clear();
            }

            if (_collisionQueryInputs.IsCreated)
@@ -157,21 +113,6 @@ namespace SepCore.Simulation
                _collisionCandidates.Clear();
            }

-            if (_enemyJobSeparationOutputs.IsCreated)
-            {
-                _enemyJobSeparationOutputs.Clear();
-            }
-
-            if (_enemySeparationPreviousPushes.IsCreated)
-            {
-                _enemySeparationPreviousPushes.Clear();
-            }
-
-            if (_enemySeparationCurrentPushes.IsCreated)
-            {
-                _enemySeparationCurrentPushes.Clear();
-            }
-
            if (_enemySeparationBuckets.IsCreated)
            {
                _enemySeparationBuckets.Clear();
@@ -191,13 +132,11 @@ namespace SepCore.Simulation

        private bool AreJobDataChannelsUsable()
        {
-            return IsNativeListUsable(_enemyJobInputs) &&
-                   IsNativeListUsable(_enemyJobOutputs) &&
-                   IsNativeListUsable(_enemyJobSeparationOutputs) &&
-                   IsNativeListUsable(_enemySeparationPreviousPushes) &&
-                   IsNativeListUsable(_enemySeparationCurrentPushes) &&
-                   IsNativeListUsable(_projectileJobInputs) &&
-                   IsNativeListUsable(_projectileJobOutputs) &&
+            return _enemies.IsCreated &&
+                   _projectiles.IsCreated &&
+                   _pickups.IsCreated &&
+                   IsNativeListUsable(_enemySeparationTransforms) &&
+                   IsNativeListUsable(_collectedPickups) &&
                   IsNativeListUsable(_collisionQueryInputs) &&
                   IsNativeListUsable(_collisionCandidates) &&
                   IsNativeMultiHashMapUsable(_enemySeparationBuckets) &&
@@ -1,40 +0,0 @@
-using UnityEngine;
-
-namespace SepCore.Simulation
-{
-    public sealed partial class SimulationWorld
-    {
-        #region Job Output Commit
-
-        private void ApplyJobOutputsToSimulationState()
-        {
-            int enemyCount = Mathf.Min(_enemies.Count, _enemyJobOutputs.Length);
-            bool hasEnemyPositionChanged = false;
-            for (int i = 0; i < enemyCount; i++)
-            {
-                EnemyJobOutputData output = _enemyJobOutputs[i];
-                if (!hasEnemyPositionChanged)
-                {
-                    Vector3 currentPosition = _enemies[i].Position;
-                    hasEnemyPositionChanged = currentPosition.x != output.Position.x ||
-                                              currentPosition.z != output.Position.z;
-                }
-
-                _enemies[i] = ConvertToEnemySimData(output);
-            }
-
-            if (hasEnemyPositionChanged)
-            {
-                MarkEnemyTargetSpatialIndexDirty();
-            }
-
-            int projectileCount = Mathf.Min(_projectiles.Count, _projectileJobOutputs.Length);
-            for (int i = 0; i < projectileCount; i++)
-            {
-                _projectiles[i] = ConvertToProjectileSimData(_projectileJobOutputs[i]);
-            }
-        }
-
-        #endregion
-    }
-}