Serialization v3 content PR (#3491)
* serv3 in shared pt 1 * beginning of deepclone api * progress in implementing ideepclone & serv3 in content * adds target * its cant hurt you it cant hurt you * more changes to content.server * adds dataclasses * almost there * renamed & edited entry * finishes refactoring content to use serv3 * gasmixture runtimes, next: reagentunit * fucin hell that was an annoying one * adds flags * fixes some yaml errors * removes comment * fixes generic components for now * removes todo actually clones values my god paul fixes bug involving resolving custom data classes from other proj renames dataclass fixes spritecomp adds WithFormat.Constants support * adds deepclone to ResistanceSet * adds a bunch of deepclone implementations adds a deepclone analyzer (TODO) adds a deep clone fallback for classes & structs * fixes a bunch of runtimes * adds deepclone to entityuid * adds generator to sln * gets rid of warnings * fixes * argh * componentdata refactors * more deepclone impl * heck me i reworked all of content deepclone * renames custom dataclasstarget * misc * reworks prototypes * deepclone nuke * renamed customdataclass attribute * fixes everything * misc fixed * the killcommit * getting there * changed yamlfieldattribute namespace * adds back iselfserialize * renames everything to data(field/definition) * ouch * Fix most errors on content * Fix more errors in content * Fix some components * work on tests * fixes some customdataclasses * fuggin shit * yes * yeas * Remove data classes * Data field naming fixes * arg * Git resetti RobustToolbox * Merge fixes * General fixes * Fix startup serialization errors * Fix DamageContainerPrototype when supported classes or types are null * Implement construction graph step type serializer * Fix up construction serialization * Fix up construction serialization part 2 * Fix null list in technology database component * Fix body serialization * Fix entity storage serialization * Fix actions serialization * Fix AI serialization * Fix reaction serialization * Fix body serialization * Fix grid atmosphere serialization * Rename IServ3Manager to ISerializationManager * Convert every non generic serializer to the new format, general fixes * Serialization and body system fix * pushinheritance fix * Update all prototypes to have a parent and have consistent id/parent properties * Merge fixes * smh my head * cuddling slaps * Content commit for engine PR * stuff * more fixes * argh * yes even you are fixed * changelog fixes * fixes seeds * argh * Test fixes * Add writing for alert order prototype * Fix alert order writing * FIX * its been alot ok * Fix the rest of the visualizers * Fix server alerts component tests * Fix alert prototype tests not using the read value * Fix alert prototype tests initializing serialization multiple times * THIS IS AN AMERICAN CODEBASE GOD BLESS THE USA * Add ImplicitDataDefinitionForInheritors to IMechanismBehavior Fixes the behaviors not being found * Fix NRE in strap component Good night to the 1 buckle optimization * Fix clothing component slot flags serialization tag * Fix body component in all components test * Merge fixes * ffs * Make construction graph prototype use serialization hooks * human yaml linted * a * Do the thing for construction * stuff * a * monke see yaml linter * LINT HARDER * Remove redundant todo * yes * Add skip hook argument to readers and copiers * we gamin * test/datafield fixes * adds more verbose validation * moves linter to action * Improve construction graph step type serializer error message * Fix ammo box component NRE * gamin * some updates to the linter * yes * removes that test * misc fixes * array fix priority fix misc fixes * adds proper info the validation * adds alwaysrelevant usa * Make yaml linter take half as long to run (~50% less) * Make yaml linter 5 times faster (~80% less execution time) * based vera being based * fixes mapsaving * warning cleanup & moves surpressor * removes old msbuild targets * Revert "Make yaml linter 5 times faster (~80% less execution time)" This reverts commit 3e6091359a26252c3e98828199553de668031c63. * Add -nowarn to yaml linter run configuration * Improve yaml linter message feedback * Make dependencies an argument instead of a property on the serialization manager * yamllinting slaps * Clean up type serializers * Move yaml linter code to its own method * Fix yaml errors * Change yaml linter action name and remove -nowarn * yaml linter please shut * Git resetti robust toolbox Co-authored-by: Paul <ritter.paul1+git@googlemail.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Paul Ritter
GitHub
@@ -10,6 +10,7 @@ using Content.Shared.Atmos;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Maths;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
using Robust.Shared.ViewVariables;
|
||||
|
||||
namespace Content.Server.Atmos
|
||||
@@ -18,28 +19,28 @@ namespace Content.Server.Atmos
|
||||
/// A general-purpose, variable volume gas mixture.
|
||||
/// </summary>
|
||||
[Serializable]
|
||||
public class GasMixture : IExposeData, IEquatable<GasMixture>, ICloneable
|
||||
[DataDefinition]
|
||||
public class GasMixture : IEquatable<GasMixture>, ICloneable, ISerializationHooks
|
||||
{
|
||||
private readonly AtmosphereSystem _atmosphereSystem;
|
||||
private AtmosphereSystem? _atmosphereSystem;
|
||||
|
||||
public static GasMixture SpaceGas => new() {Volume = 2500f, Immutable = true, Temperature = Atmospherics.TCMB};
|
||||
|
||||
// This must always have a length that is a multiple of 4 for SIMD acceleration.
|
||||
[ViewVariables]
|
||||
private float[] _moles;
|
||||
[DataField("moles")] [ViewVariables] private float[] _moles = new float[Atmospherics.AdjustedNumberOfGases];
|
||||
|
||||
[ViewVariables]
|
||||
private float[] _molesArchived;
|
||||
[DataField("molesArchived")] [ViewVariables]
|
||||
private float[] _molesArchived = new float[Atmospherics.AdjustedNumberOfGases];
|
||||
|
||||
[ViewVariables]
|
||||
[DataField("temperature")] [ViewVariables]
|
||||
private float _temperature = Atmospherics.TCMB;
|
||||
|
||||
public IReadOnlyList<float> Gases => _moles;
|
||||
|
||||
[ViewVariables]
|
||||
[DataField("immutable")] [ViewVariables]
|
||||
public bool Immutable { get; private set; }
|
||||
|
||||
[ViewVariables]
|
||||
[DataField("lastShare")] [ViewVariables]
|
||||
public float LastShare { get; private set; }
|
||||
|
||||
[ViewVariables]
|
||||
@@ -55,6 +56,7 @@ namespace Content.Server.Atmos
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
get
|
||||
{
|
||||
_atmosphereSystem ??= EntitySystem.Get<AtmosphereSystem>();
|
||||
Span<float> tmp = stackalloc float[_moles.Length];
|
||||
NumericsHelpers.Multiply(_moles, _atmosphereSystem.GasSpecificHeats, tmp);
|
||||
|
||||
@@ -68,6 +70,7 @@ namespace Content.Server.Atmos
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
get
|
||||
{
|
||||
_atmosphereSystem ??= EntitySystem.Get<AtmosphereSystem>();
|
||||
Span<float> tmp = stackalloc float[_moles.Length];
|
||||
NumericsHelpers.Multiply(_molesArchived, _atmosphereSystem.GasSpecificHeats, tmp);
|
||||
|
||||
@@ -106,10 +109,10 @@ namespace Content.Server.Atmos
|
||||
[ViewVariables]
|
||||
public float ThermalEnergy => Temperature * HeatCapacity;
|
||||
|
||||
[ViewVariables]
|
||||
[DataField("temperatureArchived")] [ViewVariables]
|
||||
public float TemperatureArchived { get; private set; }
|
||||
|
||||
[ViewVariables]
|
||||
[DataField("volume")] [ViewVariables]
|
||||
public float Volume { get; set; }
|
||||
|
||||
public GasMixture() : this(null)
|
||||
@@ -118,9 +121,7 @@ namespace Content.Server.Atmos
|
||||
|
||||
public GasMixture(AtmosphereSystem? atmosphereSystem)
|
||||
{
|
||||
_atmosphereSystem = atmosphereSystem ?? EntitySystem.Get<AtmosphereSystem>();
|
||||
_moles = new float[Atmospherics.AdjustedNumberOfGases];
|
||||
_molesArchived = new float[Atmospherics.AdjustedNumberOfGases];
|
||||
_atmosphereSystem = atmosphereSystem;
|
||||
}
|
||||
|
||||
public GasMixture(float volume, AtmosphereSystem? atmosphereSystem = null): this(atmosphereSystem)
|
||||
@@ -262,6 +263,7 @@ namespace Content.Server.Atmos
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public float Share(GasMixture sharer, int atmosAdjacentTurfs)
|
||||
{
|
||||
_atmosphereSystem ??= EntitySystem.Get<AtmosphereSystem>();
|
||||
var temperatureDelta = TemperatureArchived - sharer.TemperatureArchived;
|
||||
var absTemperatureDelta = Math.Abs(temperatureDelta);
|
||||
var oldHeatCapacity = 0f;
|
||||
@@ -485,6 +487,7 @@ namespace Content.Server.Atmos
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public ReactionResult React(IGasMixtureHolder holder)
|
||||
{
|
||||
_atmosphereSystem ??= EntitySystem.Get<AtmosphereSystem>();
|
||||
var reaction = ReactionResult.NoReaction;
|
||||
var temperature = Temperature;
|
||||
var energy = ThermalEnergy;
|
||||
@@ -533,16 +536,8 @@ namespace Content.Server.Atmos
|
||||
NumericsHelpers.Multiply(_moles, multiplier);
|
||||
}
|
||||
|
||||
void IExposeData.ExposeData(ObjectSerializer serializer)
|
||||
void ISerializationHooks.AfterDeserialization()
|
||||
{
|
||||
serializer.DataField(this, x => x.Immutable, "immutable", false);
|
||||
serializer.DataField(this, x => x.Volume, "volume", 0f);
|
||||
serializer.DataField(this, x => x.LastShare, "lastShare", 0f);
|
||||
serializer.DataField(this, x => x.TemperatureArchived, "temperatureArchived", 0f);
|
||||
serializer.DataField(ref _moles, "moles", new float[Atmospherics.AdjustedNumberOfGases]);
|
||||
serializer.DataField(ref _molesArchived, "molesArchived", new float[Atmospherics.AdjustedNumberOfGases]);
|
||||
serializer.DataField(ref _temperature, "temperature", Atmospherics.TCMB);
|
||||
|
||||
// The arrays MUST have a specific length.
|
||||
Array.Resize(ref _moles, Atmospherics.AdjustedNumberOfGases);
|
||||
Array.Resize(ref _molesArchived, Atmospherics.AdjustedNumberOfGases);
|
||||
|
||||
Reference in New Issue
Block a user