Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2025-02-16 21:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

extract IWorldSystem interface

Browse source
This commit is contained in:
in0finite 2021-09-08 20:27:30 +02:00
parent 051d4505ba
commit 4704d750d1
3 changed files with 86 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Assets/Scripts/Behaviours/World/Cell.cs
View file

@ -5,6 +5,7 @@ using SanAndreasUnity.Importing.Items.Placements;
using SanAndreasUnity.Utilities;
using System.Collections.Generic;
using System.Linq;
using SanAndreasUnity.Behaviours.WorldSystem;
using UnityEngine;
using Profiler = UnityEngine.Profiling.Profiler;

21
Assets/Scripts/Behaviours/World/FocusPointManager.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using SanAndreasUnity.Behaviours.WorldSystem;
using UnityEngine;
namespace SanAndreasUnity.Behaviours.World
@ -26,13 +27,13 @@ namespace SanAndreasUnity.Behaviours.World
/// </summary>
public class FocusPointManager<T>
{
private WorldSystemWithDistanceLevels<T> _worldSystem;
private IWorldSystem<T> _worldSystem;
private float _defaultRevealRadius;
public struct FocusPointInfo
{
public long id;
public WorldSystem.FocusPoint focusPoint;
public Transform transform;
public float timeToKeepRevealingAfterRemoved;
public float timeWhenRemoved;
@ -46,7 +47,7 @@ namespace SanAndreasUnity.Behaviours.World
public FocusPointManager(
WorldSystemWithDistanceLevels<T> worldSystem,
IWorldSystem<T> worldSystem,
float defaultRevealRadius)
{
_worldSystem = worldSystem;
@ -58,10 +59,10 @@ namespace SanAndreasUnity.Behaviours.World
if (!_focusPoints.Exists(f => f.transform == tr))
{
float revealRadius = parameters.hasRevealRadius ? parameters.revealRadius : _defaultRevealRadius;
long registeredFocusPointId = _worldSystem.RegisterFocusPoint(revealRadius, tr.position);
var registeredFocusPoint = _worldSystem.RegisterFocusPoint(revealRadius, tr.position);
_focusPoints.Add(new FocusPointInfo
{
id = registeredFocusPointId,
focusPoint = registeredFocusPoint,
transform = tr,
timeToKeepRevealingAfterRemoved = parameters.timeToKeepRevealingAfterRemoved,
hasRevealRadius = parameters.hasRevealRadius,
@ -87,7 +88,7 @@ namespace SanAndreasUnity.Behaviours.World
return;
}
_worldSystem.UnRegisterFocusPoint(focusPoint.id);
_worldSystem.UnRegisterFocusPoint(focusPoint.focusPoint);
_focusPoints.RemoveAt(index);
}
@ -108,12 +109,12 @@ namespace SanAndreasUnity.Behaviours.World
}
UnityEngine.Profiling.Profiler.BeginSample("WorldSystem.UnRegisterFocusPoint()");
_worldSystem.UnRegisterFocusPoint(f.id);
_worldSystem.UnRegisterFocusPoint(f.focusPoint);
UnityEngine.Profiling.Profiler.EndSample();
return true;
}
_worldSystem.FocusPointChangedPosition(f.id, f.transform.position);
_worldSystem.FocusPointChangedPosition(f.focusPoint, f.transform.position);
return false;
});
@ -126,7 +127,7 @@ namespace SanAndreasUnity.Behaviours.World
{
hasElementToRemove = true;
UnityEngine.Profiling.Profiler.BeginSample("WorldSystem.UnRegisterFocusPoint()");
_worldSystem.UnRegisterFocusPoint(_.id);
_worldSystem.UnRegisterFocusPoint(_.focusPoint);
UnityEngine.Profiling.Profiler.EndSample();
}
});
@ -145,7 +146,7 @@ namespace SanAndreasUnity.Behaviours.World
var focusPoint = _focusPoints[i];
if (!focusPoint.hasRevealRadius)
{
_worldSystem.FocusPointChangedRadius(focusPoint.id, newDefaultRevealRadius);
_worldSystem.FocusPointChangedRadius(focusPoint.focusPoint, newDefaultRevealRadius);
}
}
}

121
Assets/Scripts/Behaviours/World/WorldSystem.cs
View file

@ -4,7 +4,7 @@ using System.Linq;
using SanAndreasUnity.Utilities;
using UnityEngine;
namespace SanAndreasUnity.Behaviours.World
namespace SanAndreasUnity.Behaviours.WorldSystem
{
public struct WorldSystemParams
{
@ -12,14 +12,55 @@ namespace SanAndreasUnity.Behaviours.World
public ushort numAreasPerAxis;
}
public class WorldSystemWithDistanceLevels<T>
public interface IWorldSystem<T>
{
void Update();
FocusPoint RegisterFocusPoint(float radius, Vector3 pos);
void UnRegisterFocusPoint(FocusPoint focusPoint);
void FocusPointChangedParameters(FocusPoint focusPoint, Vector3 newPos, float newRadius);
void AddObjectToArea(Vector3 pos, T obj);
void RemoveObjectFromArea(Vector3 pos, T obj);
}
public static class WorldSystemExtensions
{
public static void FocusPointChangedPosition<T>(this IWorldSystem<T> worldSystem, FocusPoint focusPoint, Vector3 newPos)
=> worldSystem.FocusPointChangedParameters(focusPoint, newPos, focusPoint.Radius);
public static void FocusPointChangedRadius<T>(this IWorldSystem<T> worldSystem, FocusPoint focusPoint, float newRadius)
=> worldSystem.FocusPointChangedParameters(focusPoint, focusPoint.Position, newRadius);
}
public sealed class FocusPoint
{
public long Id { get; } = FocusPointIdGenerator.GetNextId();
public float Radius { get; internal set; }
public Vector3 Position { get; internal set; }
public FocusPoint(float radius, Vector3 position)
{
this.Radius = radius;
this.Position = position;
}
public sealed override int GetHashCode()
{
return this.Id.GetHashCode();
}
}
public class WorldSystemWithDistanceLevels<T> : IWorldSystem<T>
{
private readonly WorldSystem<T>[] _worldSystems;
public IReadOnlyList<WorldSystem<T>> WorldSystems => _worldSystems;
private readonly float[] _distanceLevels;
public IReadOnlyList<float> DistanceLevels => _distanceLevels;
private readonly Dictionary<long, WorldSystem<T>.FocusPoint[]> _focusPointsPerLevel = new Dictionary<long, WorldSystem<T>.FocusPoint[]>();
private long _lastFocusPointId = 1;
private readonly Dictionary<long, FocusPoint[]> _focusPointsPerLevel = new Dictionary<long, FocusPoint[]>();
public WorldSystemWithDistanceLevels(
float[] distanceLevels,
@ -63,46 +104,56 @@ namespace SanAndreasUnity.Behaviours.World
return _distanceLevels.Length - 1;
}
public long RegisterFocusPoint(float radius, Vector3 pos)
public FocusPoint RegisterFocusPoint(float radius, Vector3 pos)
{
var focusPoints = new WorldSystem<T>.FocusPoint[_worldSystems.Length];
var focusPoints = new FocusPoint[_worldSystems.Length];
for (int i = 0; i < _worldSystems.Length; i++)
focusPoints[i] = _worldSystems[i].RegisterFocusPoint(Mathf.Min(radius, _distanceLevels[i]), pos);
long id = _lastFocusPointId++;
_focusPointsPerLevel[id] = focusPoints;
return id;
var focusPointToReturn = new FocusPoint(radius, pos);
_focusPointsPerLevel[focusPointToReturn.Id] = focusPoints;
return focusPointToReturn;
}
public void UnRegisterFocusPoint(long id)
public void UnRegisterFocusPoint(FocusPoint focusPoint)
{
if (!_focusPointsPerLevel.TryGetValue(id, out var focusPoints))
if (!_focusPointsPerLevel.TryGetValue(focusPoint.Id, out var focusPoints))
return;
for (int i = 0; i < _worldSystems.Length; i++)
_worldSystems[i].UnRegisterFocusPoint(focusPoints[i]);
}
public void FocusPointChangedPosition(long id, Vector3 newPos)
public void FocusPointChangedParameters(
FocusPoint focusPoint,
Vector3 newPos,
float newRadius)
{
if (!_focusPointsPerLevel.TryGetValue(id, out var focusPoints))
if (!_focusPointsPerLevel.TryGetValue(focusPoint.Id, out var focusPoints))
return;
Vector3 diff = focusPoints[0].Position - newPos;
if (diff.x == 0f && diff.y == 0f && diff.z == 0f) // faster than calling '==' operator
float radiusDiff = focusPoints[0].Radius - newRadius;
if (diff.x == 0f && diff.y == 0f && diff.z == 0f && radiusDiff == 0f) // faster than calling '==' Vector3 operator
return;
for (int i = 0; i < _worldSystems.Length; i++)
_worldSystems[i].FocusPointChangedPosition(focusPoints[i], newPos);
_worldSystems[i].FocusPointChangedParameters(focusPoints[i], newPos, Mathf.Min(newRadius, _distanceLevels[i]));
focusPoint.Position = newPos;
focusPoint.Radius = newRadius;
}
public void FocusPointChangedRadius(long id, float newRadius)
public void AddObjectToArea(Vector3 pos, T obj)
{
if (!_focusPointsPerLevel.TryGetValue(id, out var focusPoints))
return;
throw new NotSupportedException($"You probably want to use {nameof(AddObjectToArea)}() with draw distance parameter");
}
for (int i = 0; i < _worldSystems.Length; i++)
_worldSystems[i].FocusPointChangedRadius(focusPoints[i], Mathf.Min(newRadius, _distanceLevels[i]));
public void RemoveObjectFromArea(Vector3 pos, T obj)
{
throw new NotSupportedException($"You probably want to use {nameof(RemoveObjectFromArea)}() with draw distance parameter");
}
public void AddObjectToArea(Vector3 pos, float drawDistance, T obj)
@ -146,7 +197,7 @@ namespace SanAndreasUnity.Behaviours.World
}
}
public class WorldSystem<T>
public class WorldSystem<T> : IWorldSystem<T>
{
public struct AreaIndex
{
@ -189,22 +240,6 @@ namespace SanAndreasUnity.Behaviours.World
}
}
public sealed class FocusPoint
{
public long Id { get; } = FocusPointIdGenerator.GetNextId();
public float Radius { get; internal set; }
public Vector3 Position { get; internal set; }
internal FocusPoint()
{
}
public override int GetHashCode()
{
return this.Id.GetHashCode();
}
}
private struct Range
{
public short lower, higher;
@ -374,9 +409,7 @@ namespace SanAndreasUnity.Behaviours.World
if (radius < 0)
throw new ArgumentException("Radius can not be < 0");
var focusPoint = new FocusPoint();
focusPoint.Radius = radius;
focusPoint.Position = pos;
var focusPoint = new FocusPoint(radius, pos);
if (!_focusPoints.Add(focusPoint))
throw new Exception("Failed to add focus point to the collection");
@ -406,10 +439,7 @@ namespace SanAndreasUnity.Behaviours.World
});
}
public void FocusPointChangedPosition(FocusPoint focusPoint, Vector3 newPos)
=> this.FocusPointChangedParameters(focusPoint, newPos, focusPoint.Radius);
private void FocusPointChangedParameters(FocusPoint focusPoint, Vector3 newPos, float newRadius)
public void FocusPointChangedParameters(FocusPoint focusPoint, Vector3 newPos, float newRadius)
{
this.ThrowIfConcurrentModification();
@ -455,9 +485,6 @@ namespace SanAndreasUnity.Behaviours.World
focusPoint.Radius = newRadius;
}
public void FocusPointChangedRadius(FocusPoint focusPoint, float newRadius)
=> this.FocusPointChangedParameters(focusPoint, focusPoint.Position, newRadius);
public void AddObjectToArea(Area area, T obj)
{
this.ThrowIfConcurrentModification();