tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NRE when spawning and activating randomized expendable lights (#4059)

Browse Source 
* fix nre

* move resolve up to parent

* oopy
This commit is contained in:
mirrorcult
2021-05-28 00:56:06 -07:00
committed by GitHub
parent 557fd29d3b
commit 8b0826ff83
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Content.Client/GameObjects/Components/LightBehaviourComponent.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Client.GameObjects.Components
[ImplicitDataDefinitionForInheritors] [ImplicitDataDefinitionForInheritors]
public abstract class LightBehaviourAnimationTrack : AnimationTrackProperty public abstract class LightBehaviourAnimationTrack : AnimationTrackProperty
{ {
[Dependency] protected readonly IRobustRandom RobustRandom = default!; protected readonly IRobustRandom _random = IoCManager.Resolve<IRobustRandom>();
[DataField("id")] [ViewVariables] public string ID { get; set; } = string.Empty; [DataField("id")] [ViewVariables] public string ID { get; set; } = string.Empty;
@@ -38,23 +38,15 @@ namespace Content.Client.GameObjects.Components
[DataField("enabled")] [ViewVariables] public bool Enabled { get; set; } [DataField("enabled")] [ViewVariables] public bool Enabled { get; set; }
[DataField("startValue")] [ViewVariables] public float StartValue { get; set; } [DataField("startValue")] [ViewVariables] public float StartValue { get; set; } = 0f;
[DataField("endValue")] [DataField("endValue")] [ViewVariables] public float EndValue { get; set; } = 2f;
[ViewVariables]
public float EndValue { get; set; } = 2f;
[DataField("minDuration")] [DataField("minDuration")] [ViewVariables] public float MinDuration { get; set; } = -1f;
[ViewVariables]
public float MinDuration { get; set; } = -1f;
[DataField("maxDuration")] [DataField("maxDuration")] [ViewVariables] public float MaxDuration { get; set; } = 2f;
[ViewVariables]
public float MaxDuration { get; set; } = 2f;
[DataField("interpolate")] [DataField("interpolate")] [ViewVariables] public AnimationInterpolationMode InterpolateMode { get; set; } = AnimationInterpolationMode.Linear;
[ViewVariables]
public AnimationInterpolationMode InterpolateMode { get; set; } = AnimationInterpolationMode.Linear;
[ViewVariables] protected float MaxTime { get; set; } [ViewVariables] protected float MaxTime { get; set; }
@@ -82,7 +74,7 @@ namespace Content.Client.GameObjects.Components
if (MinDuration > 0) if (MinDuration > 0)
{ {
MaxTime = (float) RobustRandom.NextDouble() * (MaxDuration - MinDuration) + MinDuration; MaxTime = (float) _random.NextDouble() * (MaxDuration - MinDuration) + MinDuration;
} }
else else
{ {
@@ -218,23 +210,23 @@ namespace Content.Client.GameObjects.Components
[UsedImplicitly] [UsedImplicitly]
public class RandomizeBehaviour : LightBehaviourAnimationTrack public class RandomizeBehaviour : LightBehaviourAnimationTrack
{ {
private object? _randomValue1; private float _randomValue1;
private object _randomValue2 = default!; private float _randomValue2;
private object _randomValue3 = default!; private float _randomValue3;
private object _randomValue4 = default!; private float _randomValue4;
public override void OnInitialize() public override void OnInitialize()
{ {
_randomValue2 = InterpolateLinear(StartValue, EndValue, (float) RobustRandom.NextDouble()); _randomValue1 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
_randomValue3 = InterpolateLinear(StartValue, EndValue, (float) RobustRandom.NextDouble()); _randomValue2 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
_randomValue4 = InterpolateLinear(StartValue, EndValue, (float) RobustRandom.NextDouble()); _randomValue3 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
} }
public override void OnStart() public override void OnStart()
{ {
if (Property == "Enabled") // special case for boolean, we randomize it if (Property == "Enabled") // special case for boolean, we randomize it
{ {
ApplyProperty(RobustRandom.NextDouble() < 0.5); ApplyProperty(_random.NextDouble() < 0.5);
return; return;
} }
@@ -245,7 +237,7 @@ namespace Content.Client.GameObjects.Components
} }
_randomValue3 = _randomValue4; _randomValue3 = _randomValue4;
_randomValue4 = InterpolateLinear(StartValue, EndValue, (float) RobustRandom.NextDouble()); _randomValue4 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
} }
public override (int KeyFrameIndex, float FramePlayingTime) AdvancePlayback( public override (int KeyFrameIndex, float FramePlayingTime) AdvancePlayback(