mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-05-02 21:17:30 +03:00
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml
324 lines
11 KiB
C#
324 lines
11 KiB
C#
using Content.Client.UserInterface.Controls;
|
|
using Content.Shared.Shuttles.Components;
|
|
using Robust.Client.AutoGenerated;
|
|
using Robust.Client.Graphics;
|
|
using Robust.Client.ResourceManagement;
|
|
using Robust.Client.UserInterface.XAML;
|
|
using Robust.Shared.Map.Components;
|
|
using Robust.Shared.Physics;
|
|
using Robust.Shared.Threading;
|
|
using Robust.Shared.Timing;
|
|
using Robust.Shared.Utility;
|
|
using Vector2 = System.Numerics.Vector2;
|
|
|
|
namespace Content.Client.Shuttles.UI;
|
|
|
|
/// <summary>
|
|
/// Provides common functionality for radar-like displays on shuttle consoles.
|
|
/// </summary>
|
|
[GenerateTypedNameReferences]
|
|
[Virtual]
|
|
public partial class BaseShuttleControl : MapGridControl
|
|
{
|
|
[Dependency] private readonly IParallelManager _parallel = default!;
|
|
protected readonly SharedMapSystem Maps;
|
|
|
|
protected readonly Font Font;
|
|
|
|
private GridDrawJob _drawJob;
|
|
|
|
// Cache grid drawing data as it can be expensive to build
|
|
public readonly Dictionary<EntityUid, GridDrawData> GridData = new();
|
|
|
|
// Per-draw caching
|
|
private readonly List<Vector2i> _gridTileList = new();
|
|
private readonly HashSet<Vector2i> _gridNeighborSet = new();
|
|
private readonly List<(Vector2 Start, Vector2 End)> _edges = new();
|
|
|
|
private Vector2[] _allVertices = Array.Empty<Vector2>();
|
|
|
|
private (DirectionFlag, Vector2i)[] _neighborDirections;
|
|
|
|
public BaseShuttleControl() : this(32f, 32f, 32f)
|
|
{
|
|
}
|
|
|
|
public BaseShuttleControl(float minRange, float maxRange, float range) : base(minRange, maxRange, range)
|
|
{
|
|
RobustXamlLoader.Load(this);
|
|
Maps = EntManager.System<SharedMapSystem>();
|
|
Font = new VectorFont(IoCManager.Resolve<IResourceCache>().GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 12);
|
|
|
|
_drawJob = new GridDrawJob()
|
|
{
|
|
ScaledVertices = _allVertices,
|
|
};
|
|
|
|
_neighborDirections = new (DirectionFlag, Vector2i)[4];
|
|
|
|
for (var i = 0; i < 4; i++)
|
|
{
|
|
var dir = (DirectionFlag) Math.Pow(2, i);
|
|
var dirVec = dir.AsDir().ToIntVec();
|
|
_neighborDirections[i] = (dir, dirVec);
|
|
}
|
|
}
|
|
|
|
protected void DrawData(DrawingHandleScreen handle, string text)
|
|
{
|
|
var coordsDimensions = handle.GetDimensions(Font, text, 1f);
|
|
const float coordsMargins = 5f;
|
|
|
|
handle.DrawString(Font,
|
|
new Vector2(coordsMargins, PixelHeight) - new Vector2(0f, coordsDimensions.Y + coordsMargins),
|
|
text,
|
|
Color.FromSrgb(IFFComponent.SelfColor));
|
|
}
|
|
|
|
protected void DrawCircles(DrawingHandleScreen handle)
|
|
{
|
|
// Equatorial lines
|
|
var gridLines = Color.LightGray.WithAlpha(0.01f);
|
|
|
|
// Each circle is this x distance of the last one.
|
|
const float EquatorialMultiplier = 2f;
|
|
|
|
var minDistance = MathF.Pow(EquatorialMultiplier, EquatorialMultiplier * 1.5f);
|
|
var maxDistance = MathF.Pow(2f, EquatorialMultiplier * 6f);
|
|
var cornerDistance = MathF.Sqrt(WorldRange * WorldRange + WorldRange * WorldRange);
|
|
|
|
var origin = ScalePosition(-new Vector2(Offset.X, -Offset.Y));
|
|
|
|
for (var radius = minDistance; radius <= maxDistance; radius *= EquatorialMultiplier)
|
|
{
|
|
if (radius > cornerDistance)
|
|
continue;
|
|
|
|
var color = Color.ToSrgb(gridLines).WithAlpha(0.05f);
|
|
var scaledRadius = MinimapScale * radius;
|
|
var text = $"{radius:0}m";
|
|
var textDimensions = handle.GetDimensions(Font, text, UIScale);
|
|
|
|
handle.DrawCircle(origin, scaledRadius, color, false);
|
|
handle.DrawString(Font, ScalePosition(new Vector2(0f, -radius)) - new Vector2(0f, textDimensions.Y), text, UIScale, color);
|
|
}
|
|
|
|
const int gridLinesRadial = 8;
|
|
|
|
for (var i = 0; i < gridLinesRadial; i++)
|
|
{
|
|
Angle angle = (Math.PI / gridLinesRadial) * i;
|
|
// TODO: Handle distance properly.
|
|
var aExtent = angle.ToVec() * ScaledMinimapRadius * 1.42f;
|
|
var lineColor = Color.MediumSpringGreen.WithAlpha(0.02f);
|
|
handle.DrawLine(origin - aExtent, origin + aExtent, lineColor);
|
|
}
|
|
}
|
|
|
|
protected void DrawGrid(DrawingHandleScreen handle, Matrix3 matrix, Entity<MapGridComponent> grid, Color color, float alpha = 0.01f)
|
|
{
|
|
var rator = Maps.GetAllTilesEnumerator(grid.Owner, grid.Comp);
|
|
var minimapScale = MinimapScale;
|
|
var midpoint = new Vector2(MidPoint, MidPoint);
|
|
var tileSize = grid.Comp.TileSize;
|
|
|
|
// Check if we even have data
|
|
// TODO: Need to prune old grid-data if we don't draw it.
|
|
var gridData = GridData.GetOrNew(grid.Owner);
|
|
|
|
if (gridData.LastBuild < grid.Comp.LastTileModifiedTick)
|
|
{
|
|
gridData.Vertices.Clear();
|
|
_gridTileList.Clear();
|
|
_gridNeighborSet.Clear();
|
|
|
|
// Okay so there's 2 steps to this
|
|
// 1. Is that get we get a set of all tiles. This is used to decompose into triangle-strips
|
|
// 2. Is that we get a list of all tiles. This is used for edge data to decompose into line-strips.
|
|
while (rator.MoveNext(out var tileRef))
|
|
{
|
|
var index = tileRef.Value.GridIndices;
|
|
_gridNeighborSet.Add(index);
|
|
_gridTileList.Add(index);
|
|
|
|
var bl = Maps.TileToVector(grid, index);
|
|
var br = bl + new Vector2(tileSize, 0f);
|
|
var tr = bl + new Vector2(tileSize, tileSize);
|
|
var tl = bl + new Vector2(0f, tileSize);
|
|
|
|
gridData.Vertices.Add(bl);
|
|
gridData.Vertices.Add(br);
|
|
gridData.Vertices.Add(tl);
|
|
|
|
gridData.Vertices.Add(br);
|
|
gridData.Vertices.Add(tl);
|
|
gridData.Vertices.Add(tr);
|
|
}
|
|
|
|
gridData.EdgeIndex = gridData.Vertices.Count;
|
|
_edges.Clear();
|
|
|
|
foreach (var index in _gridTileList)
|
|
{
|
|
// We get all of the raw lines up front
|
|
// then we decompose them into longer lines in a separate step.
|
|
foreach (var (dir, dirVec) in _neighborDirections)
|
|
{
|
|
var neighbor = index + dirVec;
|
|
|
|
if (_gridNeighborSet.Contains(neighbor))
|
|
continue;
|
|
|
|
var bl = Maps.TileToVector(grid, index);
|
|
var br = bl + new Vector2(tileSize, 0f);
|
|
var tr = bl + new Vector2(tileSize, tileSize);
|
|
var tl = bl + new Vector2(0f, tileSize);
|
|
|
|
// Could probably rotate this but this might be faster?
|
|
Vector2 actualStart;
|
|
Vector2 actualEnd;
|
|
|
|
switch (dir)
|
|
{
|
|
case DirectionFlag.South:
|
|
actualStart = bl;
|
|
actualEnd = br;
|
|
break;
|
|
case DirectionFlag.East:
|
|
actualStart = br;
|
|
actualEnd = tr;
|
|
break;
|
|
case DirectionFlag.North:
|
|
actualStart = tr;
|
|
actualEnd = tl;
|
|
break;
|
|
case DirectionFlag.West:
|
|
actualStart = tl;
|
|
actualEnd = bl;
|
|
break;
|
|
default:
|
|
throw new NotImplementedException();
|
|
}
|
|
|
|
_edges.Add((actualStart, actualEnd));
|
|
}
|
|
}
|
|
|
|
// Decompose the edges into longer lines to save data.
|
|
// Now we decompose the lines into longer lines (less data to send to the GPU)
|
|
var decomposed = true;
|
|
|
|
while (decomposed)
|
|
{
|
|
decomposed = false;
|
|
|
|
for (var i = 0; i < _edges.Count; i++)
|
|
{
|
|
var (start, end) = _edges[i];
|
|
var neighborFound = false;
|
|
var neighborIndex = 0;
|
|
Vector2 neighborStart;
|
|
Vector2 neighborEnd = Vector2.Zero;
|
|
|
|
// Does our end correspond with another start?
|
|
for (var j = i + 1; j < _edges.Count; j++)
|
|
{
|
|
(neighborStart, neighborEnd) = _edges[j];
|
|
|
|
if (!end.Equals(neighborStart))
|
|
continue;
|
|
|
|
neighborFound = true;
|
|
neighborIndex = j;
|
|
break;
|
|
}
|
|
|
|
if (!neighborFound)
|
|
continue;
|
|
|
|
// Check if our start and the neighbor's end are collinear
|
|
if (!CollinearSimplifier.IsCollinear(start, end, neighborEnd, 10f * float.Epsilon))
|
|
continue;
|
|
|
|
decomposed = true;
|
|
_edges[i] = (start, neighborEnd);
|
|
_edges.RemoveAt(neighborIndex);
|
|
}
|
|
}
|
|
|
|
gridData.Vertices.EnsureCapacity(_edges.Count * 2);
|
|
|
|
foreach (var edge in _edges)
|
|
{
|
|
gridData.Vertices.Add(edge.Start);
|
|
gridData.Vertices.Add(edge.End);
|
|
}
|
|
|
|
gridData.LastBuild = grid.Comp.LastTileModifiedTick;
|
|
}
|
|
|
|
var totalData = gridData.Vertices.Count;
|
|
var triCount = gridData.EdgeIndex;
|
|
var edgeCount = totalData - gridData.EdgeIndex;
|
|
Extensions.EnsureLength(ref _allVertices, totalData);
|
|
|
|
_drawJob.MidPoint = midpoint;
|
|
_drawJob.Matrix = matrix;
|
|
_drawJob.MinimapScale = minimapScale;
|
|
_drawJob.Vertices = gridData.Vertices;
|
|
_drawJob.ScaledVertices = _allVertices;
|
|
|
|
_parallel.ProcessNow(_drawJob, totalData);
|
|
|
|
const float BatchSize = 3f * 4096;
|
|
|
|
for (var i = 0; i < Math.Ceiling(triCount / BatchSize); i++)
|
|
{
|
|
var start = (int) (i * BatchSize);
|
|
var end = (int) Math.Min(triCount, start + BatchSize);
|
|
var count = end - start;
|
|
handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, new Span<Vector2>(_allVertices, start, count), color.WithAlpha(alpha));
|
|
}
|
|
|
|
handle.DrawPrimitives(DrawPrimitiveTopology.LineList, new Span<Vector2>(_allVertices, gridData.EdgeIndex, edgeCount), color);
|
|
}
|
|
|
|
private record struct GridDrawJob : IParallelRobustJob
|
|
{
|
|
public int BatchSize => 16;
|
|
|
|
public float MinimapScale;
|
|
public Vector2 MidPoint;
|
|
public Matrix3 Matrix;
|
|
|
|
public List<Vector2> Vertices;
|
|
public Vector2[] ScaledVertices;
|
|
|
|
public void Execute(int index)
|
|
{
|
|
var vert = Vertices[index];
|
|
var adjustedVert = Matrix.Transform(vert);
|
|
adjustedVert = adjustedVert with { Y = -adjustedVert.Y };
|
|
|
|
var scaledVert = ScalePosition(adjustedVert, MinimapScale, MidPoint);
|
|
ScaledVertices[index] = scaledVert;
|
|
}
|
|
}
|
|
}
|
|
|
|
public sealed class GridDrawData
|
|
{
|
|
/*
|
|
* List of lists because we use LineStrip and TriangleStrip respectively (less data to pass to the GPU).
|
|
*/
|
|
|
|
public List<Vector2> Vertices = new();
|
|
|
|
/// <summary>
|
|
/// Vertices index from when edges start.
|
|
/// </summary>
|
|
public int EdgeIndex;
|
|
|
|
public GameTick LastBuild;
|
|
}
|