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

Cleanup 8

Browse Source
This commit is contained in:
W2.Wizard
2021-02-21 14:27:44 +01:00
parent a4409c729b
commit 68f6e0251c
13 changed files with 73 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/GUI/Docking/DockWindow.cs
View File

@@ -134,7 +134,7 @@ namespace FlaxEditor.GUI.Docking
});
// Link to the master panel
_masterPanel?.linkWindow(this);
_masterPanel?.LinkWindow(this);
}
/// <summary>
@@ -409,7 +409,7 @@ namespace FlaxEditor.GUI.Docking
Undock();
// Unlink from the master panel
_masterPanel?.unlinkWindow(this);
_masterPanel?.UnlinkWindow(this);
base.OnDestroy();
}

4
Source/Editor/GUI/Docking/MasterDockPanel.cs
View File

@@ -97,13 +97,13 @@ namespace FlaxEditor.GUI.Docking
return base.HitTest(ref position);
}
internal void linkWindow(DockWindow window)
internal void LinkWindow(DockWindow window)
{
// Add to the windows list
Windows.Add(window);
}
internal void unlinkWindow(DockWindow window)
internal void UnlinkWindow(DockWindow window)
{
// Call event to the window
window.OnUnlinkInternal();

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

@@ -96,17 +96,17 @@ namespace FlaxEditor.GUI.Timeline.Tracks
/// <param name="req">The request data.</param>
public void OnThumbnailRenderingBegin(SceneRenderTask task, GPUContext context, ref CameraCutThumbnailRenderer.Request req)
{
var view = new RenderView();
RenderView view = new RenderView();
var track = (CameraCutTrack)Track;
var cam = track.Camera;
Camera cam = track.Camera;
var viewport = new FlaxEngine.Viewport(Vector2.Zero, task.Buffers.Size);
var orientation = Quaternion.Identity;
Quaternion orientation = Quaternion.Identity;
view.Near = 10.0f;
view.Far = 20000.0f;
var usePerspective = true;
var orthoScale = 1.0f;
var fov = 60.0f;
var customAspectRatio = 0.0f;
bool usePerspective = true;
float orthoScale = 1.0f;
float fov = 60.0f;
float customAspectRatio = 0.0f;
// Try to evaluate camera properties based on the initial camera state
if (cam)
@@ -122,7 +122,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
}
// Try to evaluate camera properties based on the animated tracks
var time = req.ThumbnailIndex == 0 ? Start : Start + Duration;
float time = req.ThumbnailIndex == 0 ? Start : Start + Duration;
foreach (var subTrack in track.SubTracks)
{
if (subTrack is MemberTrack memberTrack)
@@ -133,18 +133,25 @@ namespace FlaxEditor.GUI.Timeline.Tracks
// TODO: try to make it better
if (memberTrack.MemberName == "Position" && value is Vector3 asPosition)
view.Position = asPosition;
else if (memberTrack.MemberName == "Orientation" && value is Quaternion asRotation)
orientation = asRotation;
else if (memberTrack.MemberName == "NearPlane" && value is float asNearPlane)
view.Near = asNearPlane;
else if (memberTrack.MemberName == "FarPlane" && value is float asFarPlane)
view.Far = asFarPlane;
else if (memberTrack.MemberName == "UsePerspective" && value is bool asUsePerspective)
usePerspective = asUsePerspective;
else if (memberTrack.MemberName == "FieldOfView" && value is float asFieldOfView)
fov = asFieldOfView;
else if (memberTrack.MemberName == "CustomAspectRatio" && value is float asCustomAspectRatio)
customAspectRatio = asCustomAspectRatio;
else if (memberTrack.MemberName == "OrthographicScale" && value is float asOrthographicScale)
orthoScale = asOrthographicScale;
}
@@ -162,6 +169,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
{
view.Projection = Matrix.Ortho(viewport.Width * orthoScale, viewport.Height * orthoScale, view.Near, view.Far);
}
Vector3 target = view.Position + view.Direction;
var up = Vector3.Transform(Vector3.Up, orientation);
view.View = Matrix.LookAt(view.Position, target, up);
@@ -186,19 +194,23 @@ namespace FlaxEditor.GUI.Timeline.Tracks
if (image == null)
{
if (req.ThumbnailIndex == 0)
{
image = new Image
{
AnchorPreset = AnchorPresets.MiddleLeft,
Parent = this,
Bounds = new Rectangle(2, 2, CameraCutThumbnailRenderer.Width, CameraCutThumbnailRenderer.Height),
};
}
else
{
image = new Image
{
AnchorPreset = AnchorPresets.MiddleRight,
Parent = this,
Bounds = new Rectangle(Width - 2 - CameraCutThumbnailRenderer.Width, 2, CameraCutThumbnailRenderer.Width, CameraCutThumbnailRenderer.Height),
};
}
image.UnlockChildrenRecursive();
_thumbnails[req.ThumbnailIndex] = image;
UpdateUI();

6
Source/Editor/GUI/Tree/Tree.cs
View File

@@ -297,7 +297,7 @@ namespace FlaxEditor.GUI.Tree
}
}
private void walkSelectExpandedTree(List<TreeNode> selection, TreeNode node)
private void WalkSelectExpandedTree(List<TreeNode> selection, TreeNode node)
{
for (int i = 0; i < node.ChildrenCount; i++)
{
@@ -305,7 +305,7 @@ namespace FlaxEditor.GUI.Tree
{
selection.Add(child);
if (child.IsExpanded)
walkSelectExpandedTree(selection, child);
WalkSelectExpandedTree(selection, child);
}
}
}
@@ -322,7 +322,7 @@ namespace FlaxEditor.GUI.Tree
// Update selection
Selection.Clear();
walkSelectExpandedTree(Selection, _children[0] as TreeNode);
WalkSelectExpandedTree(Selection, _children[0] as TreeNode);
// Check if changed
if (Selection.Count != prev.Count || !Selection.SequenceEqual(prev))