mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 21:48:58 +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
218 lines
7.3 KiB
C#
218 lines
7.3 KiB
C#
using System.Numerics;
|
|
using Content.Shared.Movement.Components;
|
|
using Content.Shared.Movement.Systems;
|
|
using JetBrains.Annotations;
|
|
using Robust.Client.GameObjects;
|
|
using Robust.Client.Physics;
|
|
using Robust.Client.Player;
|
|
using Robust.Shared.Player;
|
|
using Robust.Shared.Timing;
|
|
|
|
namespace Content.Client.Eye;
|
|
|
|
public sealed class EyeLerpingSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
|
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
|
[Dependency] private readonly SharedEyeSystem _eye = default!;
|
|
[Dependency] private readonly SharedMoverController _mover = default!;
|
|
[Dependency] private readonly SharedTransformSystem _transform = default!;
|
|
|
|
// Convenience variable for for VV.
|
|
[ViewVariables, UsedImplicitly]
|
|
private IEnumerable<LerpingEyeComponent> ActiveEyes => EntityQuery<LerpingEyeComponent>();
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<EyeComponent, ComponentStartup>(OnEyeStartup);
|
|
SubscribeLocalEvent<EyeComponent, ComponentShutdown>(OnEyeShutdown);
|
|
SubscribeLocalEvent<EyeAttachedEvent>(OnAttached);
|
|
|
|
SubscribeLocalEvent<LerpingEyeComponent, EntParentChangedMessage>(HandleMapChange);
|
|
SubscribeLocalEvent<LerpingEyeComponent, LocalPlayerDetachedEvent>(OnDetached);
|
|
|
|
UpdatesAfter.Add(typeof(TransformSystem));
|
|
UpdatesAfter.Add(typeof(PhysicsSystem));
|
|
UpdatesBefore.Add(typeof(SharedEyeSystem));
|
|
UpdatesOutsidePrediction = true;
|
|
}
|
|
|
|
private void OnEyeStartup(EntityUid uid, EyeComponent component, ComponentStartup args)
|
|
{
|
|
if (_playerManager.LocalEntity == uid)
|
|
AddEye(uid, component, true);
|
|
}
|
|
|
|
private void OnEyeShutdown(EntityUid uid, EyeComponent component, ComponentShutdown args)
|
|
{
|
|
RemCompDeferred<LerpingEyeComponent>(uid);
|
|
}
|
|
|
|
// TODO replace this with some way of automatically getting and including any eyes that are associated with a viewport / render able thingy.
|
|
public void AddEye(EntityUid uid, EyeComponent? component = null, bool automatic = false)
|
|
{
|
|
if (!Resolve(uid, ref component))
|
|
return;
|
|
|
|
var lerpInfo = EnsureComp<LerpingEyeComponent>(uid);
|
|
lerpInfo.TargetRotation = GetRotation(uid);
|
|
lerpInfo.LastRotation = lerpInfo.TargetRotation;
|
|
lerpInfo.ManuallyAdded |= !automatic;
|
|
|
|
lerpInfo.TargetZoom = component.Zoom;
|
|
lerpInfo.LastZoom = lerpInfo.TargetZoom;
|
|
|
|
if (component.Eye != null)
|
|
{
|
|
_eye.SetRotation(uid, lerpInfo.TargetRotation, component);
|
|
_eye.SetZoom(uid, lerpInfo.TargetZoom, component);
|
|
}
|
|
}
|
|
|
|
public void RemoveEye(EntityUid uid)
|
|
{
|
|
if (!TryComp(uid, out LerpingEyeComponent? lerp))
|
|
return;
|
|
|
|
// If this is the currently controlled entity, we keep the component.
|
|
if (_playerManager.LocalEntity == uid)
|
|
lerp.ManuallyAdded = false;
|
|
else
|
|
RemComp(uid, lerp);
|
|
}
|
|
|
|
private void HandleMapChange(EntityUid uid, LerpingEyeComponent component, ref EntParentChangedMessage args)
|
|
{
|
|
// Is this actually a map change? If yes, stop any lerps
|
|
if (args.OldMapId != args.Transform.MapUid)
|
|
component.LastRotation = GetRotation(uid, args.Transform);
|
|
}
|
|
|
|
private void OnAttached(ref EyeAttachedEvent ev)
|
|
{
|
|
AddEye(ev.Entity, ev.Component, true);
|
|
}
|
|
|
|
private void OnDetached(EntityUid uid, LerpingEyeComponent component, LocalPlayerDetachedEvent args)
|
|
{
|
|
if (!component.ManuallyAdded)
|
|
RemCompDeferred(uid, component);
|
|
}
|
|
|
|
public override void Update(float frameTime)
|
|
{
|
|
base.Update(frameTime);
|
|
|
|
if (!_gameTiming.IsFirstTimePredicted)
|
|
return;
|
|
|
|
// Set all of our eye rotations to the relevant values.
|
|
var query = AllEntityQuery<LerpingEyeComponent, TransformComponent>();
|
|
|
|
while (query.MoveNext(out var uid, out var lerpInfo, out var xform))
|
|
{
|
|
lerpInfo.LastRotation = lerpInfo.TargetRotation;
|
|
lerpInfo.TargetRotation = GetRotation(uid, xform);
|
|
|
|
lerpInfo.LastZoom = lerpInfo.TargetZoom;
|
|
lerpInfo.TargetZoom = UpdateZoom(uid, frameTime);
|
|
}
|
|
}
|
|
|
|
private Vector2 UpdateZoom(EntityUid uid, float frameTime, EyeComponent? eye = null, ContentEyeComponent? content = null)
|
|
{
|
|
if (!Resolve(uid, ref content, ref eye, false))
|
|
return Vector2.One;
|
|
|
|
var diff = content.TargetZoom - eye.Zoom;
|
|
|
|
if (diff.LengthSquared() < 0.00001f)
|
|
{
|
|
return content.TargetZoom;
|
|
}
|
|
|
|
var change = diff * Math.Min(8f * frameTime, 1);
|
|
|
|
return eye.Zoom + change;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Does the eye need to lerp or is its rotation matched.
|
|
/// </summary>
|
|
private bool NeedsLerp(InputMoverComponent? mover)
|
|
{
|
|
if (mover == null)
|
|
return false;
|
|
|
|
if (mover.RelativeRotation.Equals(mover.TargetRelativeRotation))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
private Angle GetRotation(EntityUid uid, TransformComponent? xform = null, InputMoverComponent? mover = null)
|
|
{
|
|
if (!Resolve(uid, ref xform))
|
|
return Angle.Zero;
|
|
|
|
// If we can move then tie our eye to our inputs (these also get lerped so it should be fine).
|
|
if (Resolve(uid, ref mover, false))
|
|
{
|
|
return -_mover.GetParentGridAngle(mover);
|
|
}
|
|
|
|
// if not tied to a mover then lock it to map / grid
|
|
var relative = xform.GridUid ?? xform.MapUid;
|
|
if (relative != null)
|
|
return -_transform.GetWorldRotation(relative.Value);
|
|
|
|
return Angle.Zero;
|
|
}
|
|
|
|
public override void FrameUpdate(float frameTime)
|
|
{
|
|
var tickFraction = (float) _gameTiming.TickFraction / ushort.MaxValue;
|
|
const double lerpMinimum = 0.00001;
|
|
var query = AllEntityQuery<LerpingEyeComponent, EyeComponent, TransformComponent>();
|
|
|
|
while (query.MoveNext(out var entity, out var lerpInfo, out var eye, out var xform))
|
|
{
|
|
// Handle zoom
|
|
var zoomDiff = Vector2.Lerp(lerpInfo.LastZoom, lerpInfo.TargetZoom, tickFraction);
|
|
|
|
if ((zoomDiff - lerpInfo.TargetZoom).Length() < lerpMinimum)
|
|
{
|
|
_eye.SetZoom(entity, lerpInfo.TargetZoom, eye);
|
|
}
|
|
else
|
|
{
|
|
_eye.SetZoom(entity, zoomDiff, eye);
|
|
}
|
|
|
|
// Handle Rotation
|
|
TryComp<InputMoverComponent>(entity, out var mover);
|
|
|
|
// This needs to be recomputed every frame, as if this is simply the grid rotation, then we need to account for grid angle lerping.
|
|
lerpInfo.TargetRotation = GetRotation(entity, xform, mover);
|
|
|
|
if (!NeedsLerp(mover))
|
|
{
|
|
_eye.SetRotation(entity, lerpInfo.TargetRotation, eye);
|
|
continue;
|
|
}
|
|
|
|
var shortest = Angle.ShortestDistance(lerpInfo.LastRotation, lerpInfo.TargetRotation);
|
|
|
|
if (Math.Abs(shortest.Theta) < lerpMinimum)
|
|
{
|
|
_eye.SetRotation(entity, lerpInfo.TargetRotation, eye);
|
|
continue;
|
|
}
|
|
|
|
_eye.SetRotation(entity, shortest * tickFraction + lerpInfo.LastRotation, eye);
|
|
}
|
|
}
|
|
}
|