GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Use util for guid read

Browse Source
This commit is contained in:
Wojtek Figat
2021-09-03 14:31:15 +02:00
parent d19d0ef0e5
commit 1a87f2ea1a
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs
View File

@@ -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<AudioClip>(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;
}

3
Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs
View File

@@ -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();

3
Source/Editor/GUI/Timeline/Tracks/NestedSceneAnimationTrack.cs
View File

@@ -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<SceneAnimation>(id);
var m = e.TrackMedia;
m.StartFrame = stream.ReadInt32();

3
Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs
View File

@@ -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<ParticleEmitter>(id);
stream.ReadInt32(); // Skip emitterIndex
var m = e.TrackMedia;

3
Source/Editor/GUI/Timeline/Tracks/PostProcessMaterialTrack.cs
View File

@@ -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<MaterialBase>(id);
var m = e.TrackMedia;
m.StartFrame = stream.ReadInt32();