vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "OBT1.1.0 Merge branch 'dev_pte' into dev"

Browse Source 
This reverts commit 177cf89756, reversing
changes made to 42ba733cd4.
This commit is contained in:
Eero
2025-12-29 11:18:11 +08:00
parent 177cf89756
commit 046483b9da
86 changed files with 800 additions and 2496 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Map/Hull.cs
+6 -122
View File
@@ -6,7 +6,6 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Threading;
using System.Xml.Linq;
using Barotrauma.MapCreatures.Behavior;
using Barotrauma.Items.Components;
@@ -14,116 +13,6 @@ using Barotrauma.Extensions;
namespace Barotrauma
{
/// <summary>
/// Thread-safe wrapper for Hull list operations.
/// Uses copy-on-write pattern for lock-free reads.
/// </summary>
internal class ThreadSafeHullList : IEnumerable<Hull>
{
private volatile List<Hull> _list = new List<Hull>();
private readonly object _writeLock = new object();
public int Count => _list.Count;
public void Add(Hull hull)
{
lock (_writeLock)
{
var newList = new List<Hull>(_list) { hull };
Interlocked.Exchange(ref _list, newList);
}
}
public bool Remove(Hull hull)
{
lock (_writeLock)
{
var newList = new List<Hull>(_list);
bool removed = newList.Remove(hull);
if (removed)
{
Interlocked.Exchange(ref _list, newList);
}
return removed;
}
}
public void Clear()
{
Interlocked.Exchange(ref _list, new List<Hull>());
}
public bool Contains(Hull hull) => _list.Contains(hull);
public Hull this[int index] => _list[index];
public IEnumerator<Hull> GetEnumerator() => _list.GetEnumerator();
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
// LINQ-friendly methods
public List<Hull> ToList() => new List<Hull>(_list);
public Hull FirstOrDefault(Func<Hull, bool> predicate) => _list.FirstOrDefault(predicate);
public Hull Find(Predicate<Hull> predicate) => _list.Find(predicate);
public List<Hull> FindAll(Predicate<Hull> predicate) => _list.FindAll(predicate);
public IEnumerable<Hull> Where(Func<Hull, bool> predicate) => _list.Where(predicate);
public bool Any() => _list.Any();
public bool Any(Func<Hull, bool> predicate) => _list.Any(predicate);
public bool Exists(Predicate<Hull> predicate) => _list.Exists(predicate);
public void ForEach(Action<Hull> action) => _list.ForEach(action);
}
/// <summary>
/// Thread-safe wrapper for EntityGrid list operations.
/// Uses copy-on-write pattern for lock-free reads.
/// </summary>
internal class ThreadSafeEntityGridList : IEnumerable<EntityGrid>
{
private volatile List<EntityGrid> _list = new List<EntityGrid>();
private readonly object _writeLock = new object();
public int Count => _list.Count;
public void Add(EntityGrid grid)
{
lock (_writeLock)
{
var newList = new List<EntityGrid>(_list) { grid };
Interlocked.Exchange(ref _list, newList);
}
}
public bool Remove(EntityGrid grid)
{
lock (_writeLock)
{
var newList = new List<EntityGrid>(_list);
bool removed = newList.Remove(grid);
if (removed)
{
Interlocked.Exchange(ref _list, newList);
}
return removed;
}
}
public void Clear()
{
Interlocked.Exchange(ref _list, new List<EntityGrid>());
}
public EntityGrid this[int index] => _list[index];
public IEnumerator<EntityGrid> GetEnumerator() => _list.GetEnumerator();
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
// LINQ-friendly methods
public List<EntityGrid> ToList() => new List<EntityGrid>(_list);
public EntityGrid FirstOrDefault(Func<EntityGrid, bool> predicate) => _list.FirstOrDefault(predicate);
public EntityGrid Find(Predicate<EntityGrid> predicate) => _list.Find(predicate);
public IEnumerable<EntityGrid> Where(Func<EntityGrid, bool> predicate) => _list.Where(predicate);
public bool Any() => _list.Any();
}
partial class BackgroundSection
{
public Rectangle Rect;
@@ -224,8 +113,8 @@ namespace Barotrauma
partial class Hull : MapEntity, ISerializableEntity, IServerSerializable
{
public readonly static ThreadSafeHullList HullList = new ThreadSafeHullList();
public readonly static ThreadSafeEntityGridList EntityGrids = new ThreadSafeEntityGridList();
public readonly static List<Hull> HullList = new List<Hull>();
public readonly static List<EntityGrid> EntityGrids = new List<EntityGrid>();
public static bool ShowHulls = true;
@@ -1244,18 +1133,13 @@ namespace Barotrauma
}
/// <summary>
/// Used in <see cref="GetApproximateDistance"/> - ThreadLocal for thread safety
/// Used in <see cref="GetApproximateDistance"/>
/// </summary>
private static readonly ThreadLocal<Dictionary<Hull, float>> cachedDistancesLocal =
new ThreadLocal<Dictionary<Hull, float>>(() => new Dictionary<Hull, float>());
private static readonly Dictionary<Hull, float> cachedDistances = [];
/// <summary>
/// Used in <see cref="GetApproximateDistance"/> - ThreadLocal for thread safety
/// Used in <see cref="GetApproximateDistance"/>
/// </summary>
private static readonly ThreadLocal<PriorityQueue<(Hull hull, Vector2 pos), float>> priorityQueueLocal =
new ThreadLocal<PriorityQueue<(Hull hull, Vector2 pos), float>>(() => new PriorityQueue<(Hull hull, Vector2 pos), float>());
private static Dictionary<Hull, float> cachedDistances => cachedDistancesLocal.Value;
private static PriorityQueue<(Hull hull, Vector2 pos), float> priorityQueue => priorityQueueLocal.Value;
private static readonly PriorityQueue<(Hull hull, Vector2 pos), float> priorityQueue = new PriorityQueue<(Hull hull, Vector2 pos), float>();
/// <summary>
/// Approximate distance from this hull to the target hull, moving through open gaps without passing through walls.