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

Apply review changes

Browse Source 
Applied review changes and one additional skip of an unused variable
This commit is contained in:
W2.Wizard
2021-02-21 17:03:58 +01:00
parent 3c603d7f09
commit 8b3fc9842d
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
var e = (ParticleEmitterTrack)track;
Guid id = new Guid(stream.ReadBytes(16));
e.Asset = FlaxEngine.Content.LoadAsync<ParticleEmitter>(id);
stream.ReadInt32(); // Skip emitterIndex
var m = e.TrackMedia;
m.StartFrame = stream.ReadInt32();
m.DurationFrames = stream.ReadInt32();

8
Source/Editor/Options/OptionsModule.cs
View File

@@ -229,6 +229,7 @@ namespace FlaxEditor.Options
BorderNormal = Color.FromBgra(0xFF54545C),
TextBoxBackground = Color.FromBgra(0xFF333337),
TextBoxBackgroundSelected = Color.FromBgra(0xFF3F3F46),
ProgressNormal = Color.FromBgra(0xFF0ad328),
// Fonts
FontTitle = options.Interface.TitleFont.GetFont(),
@@ -247,12 +248,11 @@ namespace FlaxEditor.Options
StatusBarSizeGrip = Editor.Icons.StatusBarSizeGrip12,
Translate = Editor.Icons.Translate16,
Rotate = Editor.Icons.Rotate16,
Scale = Editor.Icons.Scale16
Scale = Editor.Icons.Scale16,
SharedTooltip = new Tooltip()
};
style.DragWindow = style.BackgroundSelected * 0.7f;
style.ProgressNormal = Color.FromBgra(0xFF0ad328);
style.SharedTooltip = new Tooltip();
return style;
}

19
Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
View File

@@ -385,20 +385,14 @@ namespace FlaxEditor.SceneGraph.GUI
public ReparentAction(List<Actor> actors)
{
var allActors = new List<Actor>
{
Capacity = Mathf.NextPowerOfTwo(actors.Count)
};
var allActors = new List<Actor>(Mathf.NextPowerOfTwo(actors.Count));
for (int i = 0; i < actors.Count; i++)
{
GetAllActors(allActors, actors[i]);
}
var allScripts = new List<Script>
{
Capacity = allActors.Capacity
};
var allScripts = new List<Script>(allActors.Capacity);
GetAllScripts(allActors, allScripts);
int allCount = allActors.Count + allScripts.Count;
@@ -413,6 +407,7 @@ namespace FlaxEditor.SceneGraph.GUI
_prefabIds[i] = allActors[i].PrefabID;
_prefabObjectIds[i] = allActors[i].PrefabObjectID;
}
for (int i = 0; i < allScripts.Count; i++)
{
int j = _actorsCount + i;
@@ -746,20 +741,28 @@ namespace FlaxEditor.SceneGraph.GUI
{
if (assetItem.IsOfType<SkinnedModel>())
return true;
if (assetItem.IsOfType<Model>())
return true;
if (assetItem.IsOfType<AudioClip>())
return true;
if (assetItem.IsOfType<Prefab>())
return true;
if (assetItem.IsOfType<CollisionData>())
return true;
if (assetItem.IsOfType<ParticleSystem>())
return true;
if (assetItem.IsOfType<SceneAnimation>())
return true;
if (assetItem is VisualScriptItem visualScriptItem && new ScriptType(typeof(Actor)).IsAssignableFrom(visualScriptItem.ScriptType) && visualScriptItem.ScriptType.CanCreateInstance)
return true;
return false;
}

2
Source/Editor/Surface/VisjectSurfaceContext.Serialization.cs
View File

@@ -623,7 +623,7 @@ namespace FlaxEditor.Surface
for (int j = 0; j < boxesCount; j++)
{
var id = stream.ReadByte();
uint type = stream.ReadUInt32();
stream.ReadUInt32(); // Skip type
ushort connectionsCnt = stream.ReadUInt16();
ConnectionHint hint;