diff --git a/Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs b/Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs index ff4ddf492..497e0f9d4 100644 --- a/Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.IO; +using FlaxEditor.Utilities; using FlaxEditor.GUI.Timeline.Undo; using FlaxEditor.Viewport.Previews; using FlaxEngine; @@ -120,7 +121,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks private static void LoadTrack(int version, Track track, BinaryReader stream) { var e = (AudioTrack)track; - Guid id = new Guid(stream.ReadBytes(16)); + Guid id = stream.ReadGuid(); e.Asset = FlaxEngine.Content.LoadAsync(id); var m = e.TrackMedia; m.StartFrame = stream.ReadInt32(); @@ -391,7 +392,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks { var time = (Timeline.CurrentFrame - _audioMedia.StartFrame) / Timeline.FramesPerSecond; Curve.Evaluate(out var value, time, false); - Clipboard.Text = Utils.RoundTo2DecimalPlaces(Mathf.Saturate(value)).ToString("0.00"); + Clipboard.Text = FlaxEngine.Utils.RoundTo2DecimalPlaces(Mathf.Saturate(value)).ToString("0.00"); }).LinkTooltip("Copies the current track value to the clipboard").Enabled = Timeline.ShowPreviewValues; } @@ -470,7 +471,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks var time = (Timeline.CurrentFrame - _audioMedia.StartFrame) / Timeline.FramesPerSecond; Curve.Evaluate(out var value, time, false); - _previewValue.Text = Utils.RoundTo2DecimalPlaces(Mathf.Saturate(value)).ToString("0.00"); + _previewValue.Text = FlaxEngine.Utils.RoundTo2DecimalPlaces(Mathf.Saturate(value)).ToString("0.00"); } private void UpdateCurve() @@ -522,7 +523,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks private void OnCurveEditingEnd() { var after = EditTrackAction.CaptureData(this); - if (!Utils.ArraysEqual(_curveEditingStartData, after)) + if (!FlaxEngine.Utils.ArraysEqual(_curveEditingStartData, after)) Timeline.AddBatchedUndoAction(new EditTrackAction(Timeline, this, _curveEditingStartData, after)); _curveEditingStartData = null; } diff --git a/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs b/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs index d85a7edd9..76c06c41a 100644 --- a/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs @@ -4,6 +4,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.IO; +using FlaxEditor.Utilities; using FlaxEngine; using FlaxEngine.GUI; using Object = FlaxEngine.Object; @@ -671,7 +672,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks private static void LoadTrack(int version, Track track, BinaryReader stream) { var e = (CameraCutTrack)track; - e.ActorID = new Guid(stream.ReadBytes(16)); + e.ActorID = stream.ReadGuid(); var m = e.TrackMedia; m.StartFrame = stream.ReadInt32(); m.DurationFrames = stream.ReadInt32(); diff --git a/Source/Editor/GUI/Timeline/Tracks/NestedSceneAnimationTrack.cs b/Source/Editor/GUI/Timeline/Tracks/NestedSceneAnimationTrack.cs index 6118777d5..d42b06d9b 100644 --- a/Source/Editor/GUI/Timeline/Tracks/NestedSceneAnimationTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/NestedSceneAnimationTrack.cs @@ -3,6 +3,7 @@ using System; using System.IO; using System.Linq; +using FlaxEditor.Utilities; using FlaxEngine; namespace FlaxEditor.GUI.Timeline.Tracks @@ -76,7 +77,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks private static void LoadTrack(int version, Track track, BinaryReader stream) { var e = (NestedSceneAnimationTrack)track; - Guid id = new Guid(stream.ReadBytes(16)); + Guid id = stream.ReadGuid(); e.Asset = FlaxEngine.Content.LoadAsync(id); var m = e.TrackMedia; m.StartFrame = stream.ReadInt32(); diff --git a/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs b/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs index 2a5b1554c..1a26555ac 100644 --- a/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.IO; +using FlaxEditor.Utilities; using FlaxEngine; namespace FlaxEditor.GUI.Timeline.Tracks @@ -66,7 +67,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks private static void LoadTrack(int version, Track track, BinaryReader stream) { var e = (ParticleEmitterTrack)track; - Guid id = new Guid(stream.ReadBytes(16)); + Guid id = stream.ReadGuid(); e.Asset = FlaxEngine.Content.LoadAsync(id); stream.ReadInt32(); // Skip emitterIndex var m = e.TrackMedia; diff --git a/Source/Editor/GUI/Timeline/Tracks/PostProcessMaterialTrack.cs b/Source/Editor/GUI/Timeline/Tracks/PostProcessMaterialTrack.cs index a84a047da..201a553a6 100644 --- a/Source/Editor/GUI/Timeline/Tracks/PostProcessMaterialTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/PostProcessMaterialTrack.cs @@ -2,6 +2,7 @@ using System; using System.IO; +using FlaxEditor.Utilities; using FlaxEngine; namespace FlaxEditor.GUI.Timeline.Tracks @@ -65,7 +66,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks private static void LoadTrack(int version, Track track, BinaryReader stream) { var e = (PostProcessMaterialTrack)track; - Guid id = new Guid(stream.ReadBytes(16)); + Guid id = stream.ReadGuid(); e.Asset = FlaxEngine.Content.LoadAsync(id); var m = e.TrackMedia; m.StartFrame = stream.ReadInt32();