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

Merge branch 'master' into Visject-DescriptionPanel

Browse Source
This commit is contained in:
Nils Hausfeld
2024-06-18 18:30:09 +02:00
parent 4abe8587f3 0d8691045b
commit 83c72c1458
5 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Editor/GUI/Tree/TreeNode.cs
View File

@@ -698,7 +698,7 @@ namespace FlaxEditor.GUI.Tree
}
}
// Show tree guide lines
// Show tree guidelines
if (Editor.Instance.Options.Options.Interface.ShowTreeLines)
{
TreeNode parentNode = Parent as TreeNode;
@@ -753,15 +753,16 @@ namespace FlaxEditor.GUI.Tree
var children = _children;
if (children.Count == 0)
return;
var last = children.Count - 1;
if (CullChildren)
{
Render2D.PeekClip(out var globalClipping);
Render2D.PeekTransform(out var globalTransform);
// Try to estimate the rough location of the first node, assuming the node height is constant
// Try to estimate the rough location of the first and the last nodes, assuming the node height is constant
var firstChildGlobalRect = GetChildGlobalRectangle(children[0], ref globalTransform);
var firstVisibleChild = Math.Clamp((int)Math.Floor((globalClipping.Y - firstChildGlobalRect.Top) / _headerHeight) + 1, 0, children.Count - 1);
var firstVisibleChild = Math.Clamp((int)Math.Floor((globalClipping.Top - firstChildGlobalRect.Top) / _headerHeight) + 1, 0, last);
if (GetChildGlobalRectangle(children[firstVisibleChild], ref globalTransform).Top > globalClipping.Top || !children[firstVisibleChild].Visible)
{
// Estimate overshoot, either it's partially visible or hidden in the tree
@@ -770,22 +771,29 @@ namespace FlaxEditor.GUI.Tree
var child = children[firstVisibleChild];
if (!child.Visible)
continue;
if (GetChildGlobalRectangle(child, ref globalTransform).Top < globalClipping.Top)
break;
}
}
var lastVisibleChild = Math.Clamp((int)Math.Ceiling((globalClipping.Bottom - firstChildGlobalRect.Top) / _headerHeight) + 1, firstVisibleChild, last);
if (GetChildGlobalRectangle(children[lastVisibleChild], ref globalTransform).Top < globalClipping.Bottom || !children[lastVisibleChild].Visible)
{
// Estimate overshoot, either it's partially visible or hidden in the tree
for (; lastVisibleChild < last; lastVisibleChild++)
{
var child = children[lastVisibleChild];
if (!child.Visible)
continue;
if (GetChildGlobalRectangle(child, ref globalTransform).Top > globalClipping.Bottom)
break;
}
}
for (int i = firstVisibleChild; i < children.Count; i++)
for (int i = firstVisibleChild; i <= lastVisibleChild; i++)
{
var child = children[i];
if (!child.Visible)
continue;
var childGlobalRect = GetChildGlobalRectangle(child, ref globalTransform);
if (!globalClipping.Intersects(ref childGlobalRect))
break;
Render2D.PushTransform(ref child._cachedTransform);
child.Draw();
Render2D.PopTransform();
@@ -799,7 +807,7 @@ namespace FlaxEditor.GUI.Tree
}
else
{
for (int i = 0; i < children.Count; i++)
for (int i = 0; i <= last; i++)
{
var child = children[i];
if (child.Visible)

17
Source/Editor/Surface/ContextMenu/VisjectCMGroup.cs
View File

@@ -96,15 +96,20 @@ namespace FlaxEditor.Surface.ContextMenu
int dotIndex = filterText.IndexOf('.');
if (dotIndex != -1)
{
// Early out and make the group invisible if it doesn't start with the specified string
string filterGroupName = filterText.Substring(0, dotIndex);
if (!Name.StartsWith(filterGroupName, StringComparison.InvariantCultureIgnoreCase))
// If the string in front of the dot has the length of 0 or doesn't start with a letter we skip the filtering to make spawning floats work
if (filterGroupName.Length > 0 && char.IsLetter(filterGroupName[0]))
{
Visible = false;
Profiler.EndEvent();
return;
// Early out and make the group invisible if it doesn't start with the specified string
if (!Name.StartsWith(filterGroupName, StringComparison.InvariantCultureIgnoreCase))
{
Visible = false;
Profiler.EndEvent();
return;
}
filterText = filterText.Substring(dotIndex + 1);
}
filterText = filterText.Substring(dotIndex + 1);
}
}

2
Source/Engine/GraphicsDevice/Vulkan/DescriptorSetVulkan.cpp
View File

@@ -292,7 +292,7 @@ DescriptorPoolSetContainerVulkan* DescriptorPoolsManagerVulkan::AcquirePoolSetCo
ScopeLock lock(_locker);
for (auto* poolSet : _poolSets)
{
if (poolSet->Refs == 0)
if (poolSet->Refs == 0 && Engine::FrameCount - poolSet->LastFrameUsed > VULKAN_RESOURCE_DELETE_SAFE_FRAMES_COUNT)
{
poolSet->LastFrameUsed = Engine::FrameCount;
poolSet->Reset();

5
Source/Engine/Physics/Actors/WheeledVehicle.cpp
View File

@@ -67,8 +67,9 @@ void WheeledVehicle::SetDriveControl(DriveControlSettings value)
for (int32 i = 0; i < steerVsSpeedCount; i++)
{
// Apply only on changed value
if (Math::NotNearEqual(_driveControl.SteerVsSpeed[i].Speed, value.SteerVsSpeed[i].Speed) ||
Math::NotNearEqual(_driveControl.SteerVsSpeed[i].Steer, value.SteerVsSpeed[i].Steer))
if (i > _driveControl.SteerVsSpeed.Count() - 1 ||
Math::NotNearEqual(_driveControl.SteerVsSpeed[i].Speed, value.SteerVsSpeed[i].Speed) ||
Math::NotNearEqual(_driveControl.SteerVsSpeed[i].Steer, value.SteerVsSpeed[i].Steer))
{
SteerControl& steerVsSpeed = value.SteerVsSpeed[i];
steerVsSpeed.Steer = Math::Saturate(steerVsSpeed.Steer);

2
Source/Engine/Render2D/Render2D.cpp
View File

@@ -265,7 +265,7 @@ FORCE_INLINE Render2DVertex MakeVertex(const Float2& point, const Float2& uv, co
{
point,
Half2(uv),
color,
color * TintLayersStack.Peek(),
customData,
mask,
};