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

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source 
# Conflicts:
#	Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
This commit is contained in:
Wojtek Figat
2023-05-08 22:22:32 +02:00
parent 69cdb1268a 8edc154501
commit 80e6853f44
11 changed files with 103 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
View File

@@ -655,7 +655,9 @@ namespace FlaxEditor.CustomEditors.Dedicated
if (uiControl.Name.StartsWith(previousName))
{
string newName = controlType.Name + uiControl.Name.Substring(previousName.Length);
uiControl.Name = Utilities.Utils.IncrementNameNumber(newName, x => uiControl.Parent.GetChild(x) == null);
if (uiControl.Parent != null)
newName = Utilities.Utils.IncrementNameNumber(newName, x => uiControl.Parent.GetChild(x) == null);
uiControl.Name = newName;
}
}

14
Source/Editor/Editor.cs
View File

@@ -358,11 +358,19 @@ namespace FlaxEditor
{
// Check if prefab root control is this UIControl
var loadingPreview = Viewport.Previews.PrefabPreview.LoadingPreview;
if (loadingPreview != null)
var activePreviews = Viewport.Previews.PrefabPreview.ActivePreviews;
if (activePreviews != null)
{
foreach (var preview in activePreviews)
{
if (preview == loadingPreview ||
(preview.Instance != null && (preview.Instance == control || preview.Instance.HasActorInHierarchy(control))))
{
// Link it to the prefab preview to see it in the editor
loadingPreview.customControlLinked = control;
return loadingPreview;
preview.customControlLinked = control;
return preview;
}
}
}
return null;
}

16
Source/Editor/Viewport/Previews/PrefabPreview.cs
View File

@@ -1,6 +1,7 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
using System;
using System.Collections.Generic;
using FlaxEngine;
using Object = FlaxEngine.Object;
@@ -13,10 +14,15 @@ namespace FlaxEditor.Viewport.Previews
public class PrefabPreview : AssetPreview
{
/// <summary>
/// The preview that is during prefab instance spawning. Used to link some actors such as UIControl to preview scene and view.
/// The currently spawned prefab instance owner. Used to link some actors such as UIControl to preview scene and view.
/// </summary>
internal static PrefabPreview LoadingPreview;
/// <summary>
/// The list of active prefab previews. Used to link some actors such as UIControl to preview scene and view.
/// </summary>
internal static List<PrefabPreview> ActivePreviews;
private Prefab _prefab;
private Actor _instance;
internal UIControl customControlLinked;
@@ -48,13 +54,13 @@ namespace FlaxEditor.Viewport.Previews
_prefab.WaitForLoaded();
// Spawn prefab
var prevPreview = LoadingPreview;
LoadingPreview = this;
var instance = PrefabManager.SpawnPrefab(_prefab, null);
LoadingPreview = prevPreview;
LoadingPreview = null;
if (instance == null)
{
_prefab = null;
ActivePreviews.Remove(this);
throw new Exception("Failed to spawn a prefab for the preview.");
}
@@ -120,6 +126,9 @@ namespace FlaxEditor.Viewport.Previews
public PrefabPreview(bool useWidgets)
: base(useWidgets)
{
if (ActivePreviews == null)
ActivePreviews = new List<PrefabPreview>();
ActivePreviews.Add(this);
}
/// <inheritdoc />
@@ -137,6 +146,7 @@ namespace FlaxEditor.Viewport.Previews
/// <inheritdoc />
public override void OnDestroy()
{
ActivePreviews.Remove(this);
Prefab = null;
base.OnDestroy();

42
Source/Editor/Windows/Profiler/CPU.cs
View File

@@ -197,7 +197,7 @@ namespace FlaxEditor.Windows.Profiler
if (_tableRowsCache == null)
_tableRowsCache = new List<Row>();
var viewRange = GetEventsViewRange();
var viewRange = _showOnlyLastUpdateEvents ? GetMainThreadUpdateRange() : ViewRange.Full;
UpdateTimeline(ref viewRange);
UpdateTable(ref viewRange);
}
@@ -235,36 +235,27 @@ namespace FlaxEditor.Windows.Profiler
}
}
private ViewRange GetEventsViewRange()
private ViewRange GetMainThreadUpdateRange()
{
if (_showOnlyLastUpdateEvents)
{
// Find root event named 'Update' and use it as a view range
if (_events != null && _events.Count != 0)
{
var data = _events.Get(_mainChart.SelectedSampleIndex);
if (data != null)
var threads = _events.Get(_mainChart.SelectedSampleIndex);
if (threads != null)
{
for (int j = 0; j < data.Length; j++)
for (int j = 0; j < threads.Length; j++)
{
var events = data[j].Events;
if (events == null)
var thread = threads[j];
if (thread.Name != "Main" || thread.Events == null)
continue;
for (int i = 0; i < events.Length; i++)
for (int i = 0; i < thread.Events.Length; i++)
{
var e = events[i];
ref var e = ref thread.Events[i];
if (e.Depth == 0 && e.Name == "Update")
{
return new ViewRange(ref e);
}
}
}
}
}
}
return ViewRange.Full;
}
@@ -352,6 +343,19 @@ namespace FlaxEditor.Windows.Profiler
// Find the first event start time (for the timeline start time)
double startTime = double.MaxValue;
if (viewRange.Start > 0)
{
startTime = viewRange.Start;
}
else
{
var r = GetMainThreadUpdateRange();
if (r.Start > 0)
{
startTime = r.Start;
}
else
{
for (int i = 0; i < data.Length; i++)
{
if (data[i].Events != null && data[i].Events.Length != 0)
@@ -359,6 +363,8 @@ namespace FlaxEditor.Windows.Profiler
}
if (startTime >= double.MaxValue)
return 0;
}
}
var container = _timeline.EventsContainer;

2
Source/Engine/Content/Asset.h
View File

@@ -25,7 +25,7 @@ API_CLASS(Abstract, NoSpawn) class FLAXENGINE_API Asset : public ManagedScriptin
{
DECLARE_SCRIPTING_TYPE_NO_SPAWN(Asset);
friend Content;
friend class LoadAssetTask;
friend LoadAssetTask;
friend class ContentService;
public:
/// <summary>

15
Source/Engine/Content/Loading/Tasks/LoadAssetTask.h
View File

@@ -69,9 +69,24 @@ protected:
return Result::Ok;
}
void OnFail() override
{
if (Asset)
{
Asset->_loadingTask = nullptr;
Asset = nullptr;
}
// Base
ContentLoadTask::OnFail();
}
void OnEnd() override
{
if (Asset)
{
Asset->_loadingTask = nullptr;
Asset = nullptr;
}
// Base
ContentLoadTask::OnEnd();

1
Source/Engine/Content/Types.h
View File

@@ -7,5 +7,6 @@ struct AssetInfo;
class Content;
class Asset;
class ContentLoadTask;
class LoadAssetTask;
template<typename T>
class AssetReference;

4
Source/Engine/Platform/Linux/LinuxPlatform.cpp
View File

@@ -2048,12 +2048,12 @@ bool LinuxPlatform::Init()
// Get user locale string
setlocale(LC_ALL, "");
const char* locale = setlocale(LC_CTYPE, NULL);
if (strcmp(locale, "C") == 0)
locale = "";
UserLocale = String(locale);
if (UserLocale.FindLast('.') != -1)
UserLocale = UserLocale.Left(UserLocale.Find('.'));
UserLocale.Replace('_', '-');
if (UserLocale == TEXT("C"))
UserLocale = TEXT("en");
// Get computer name string
gethostname(buffer, UNIX_APP_BUFF_SIZE);

27
Source/Engine/Profiler/ProfilerCPU.cpp
View File

@@ -24,7 +24,7 @@ ProfilerCPU::EventBuffer::~EventBuffer()
DeleteArray(_data, _capacity);
}
void ProfilerCPU::EventBuffer::Extract(Array<Event>& data, bool withRemove)
void ProfilerCPU::EventBuffer::Extract(Array<Event>& data, bool withRemoval)
{
data.Clear();
@@ -36,6 +36,13 @@ void ProfilerCPU::EventBuffer::Extract(Array<Event>& data, bool withRemove)
if (count == 0)
return;
// Fix iterators when buffer is full (begin == end)
if (count == capacity)
{
_count--;
count--;
}
// Find the first item (skip non-root events)
Iterator firstEvent = Begin();
for (auto i = firstEvent; i.IsNotEnd(); ++i)
@@ -55,7 +62,7 @@ void ProfilerCPU::EventBuffer::Extract(Array<Event>& data, bool withRemove)
Iterator lastEndedRoot = End();
for (auto i = Last(); i != firstEvent; --i)
{
if (i.Event().Depth == 0 && i.Event().End != 0)
if (i.Event().Depth == 0 && i.Event().End > 0)
{
lastEndedRoot = i;
break;
@@ -71,31 +78,27 @@ void ProfilerCPU::EventBuffer::Extract(Array<Event>& data, bool withRemove)
const double lastRootEventEndTime = lastEndedRoot.Event().End;
for (auto i = --End(); i != lastEndedRoot; --i)
{
if (i.Event().End != 0 && i.Event().End <= lastRootEventEndTime)
if (i.Event().End > 0 && i.Event().End <= lastRootEventEndTime)
{
lastEvent = i;
break;
}
}
if (withRemove)
if (withRemoval)
{
// Remove all the events between [Begin(), lastEvent]
_count -= (lastEvent.Index() - Begin().Index()) & _capacityMask;
}
// Extract all the events between [firstEvent, lastEvent]
const int32 head = (lastEvent.Index() + 1) & _capacityMask;
count = (lastEvent.Index() - firstEvent.Index() + 1) & _capacityMask;
data.Resize(count, false);
int32 tail = (head - count) & _capacityMask;
int32 spaceLeft = capacity - tail;
int32 spaceLeftCount = Math::Min(spaceLeft, count);
int32 overflow = count - spaceLeft;
const int32 tail = (head - count) & _capacityMask;
const int32 spaceLeft = capacity - tail;
const int32 spaceLeftCount = Math::Min(spaceLeft, count);
const int32 overflow = count - spaceLeft;
Platform::MemoryCopy(data.Get(), &_data[tail], spaceLeftCount * sizeof(Event));
if (overflow > 0)
Platform::MemoryCopy(data.Get() + spaceLeftCount, &_data[0], overflow * sizeof(Event));

4
Source/Engine/Profiler/ProfilerCPU.h
View File

@@ -106,8 +106,8 @@ public:
/// Extracts the buffer data (only ended events starting from the root level with depth=0).
/// </summary>
/// <param name="data">The output data.</param>
/// <param name="withRemove">True if also remove extracted events to prevent double-gather, false if don't modify the buffer data.</param>
void Extract(Array<Event, HeapAllocation>& data, bool withRemove);
/// <param name="withRemoval">True if also remove extracted events to prevent double-gather, false if don't modify the buffer data.</param>
void Extract(Array<Event, HeapAllocation>& data, bool withRemoval);
public:
/// <summary>

10
Source/Engine/Profiler/ProfilingTools.cpp
View File

@@ -57,13 +57,13 @@ void ProfilingToolsService::Update()
ProfilingTools::EventsCPU.EnsureCapacity(threads.Count());
for (int32 i = 0; i < threads.Count(); i++)
{
auto t = threads[i];
if (t == nullptr)
ProfilerCPU::Thread* thread = threads[i];
if (thread == nullptr)
continue;
ProfilingTools::ThreadStats* pt = nullptr;
for (auto& e : ProfilingTools::EventsCPU)
{
if (e.Name == t->GetName())
if (e.Name == thread->GetName())
{
pt = &e;
break;
@@ -72,10 +72,10 @@ void ProfilingToolsService::Update()
if (!pt)
{
pt = &ProfilingTools::EventsCPU.AddOne();
pt->Name = t->GetName();
pt->Name = thread->GetName();
}
t->Buffer.Extract(pt->Events, true);
thread->Buffer.Extract(pt->Events, true);
}
#if 0