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

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

Browse Source 
# Conflicts:
#	Flax.flaxproj
This commit is contained in:
Wojtek Figat
2024-03-19 20:23:34 +01:00
parent 83e8f8cb94 292694d89c
commit 6b35c0a161
82 changed files with 2434 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs
View File

@@ -617,8 +617,9 @@ namespace FlaxEditor.Surface.Archetypes
public override void SetLocation(int index, Float2 location)
{
var dataA = (Float4)_node.Values[4 + index * 2];
var ranges = (Float4)_node.Values[0];
dataA.X = location.X;
dataA.X = Mathf.Clamp(location.X, ranges.X, ranges.Y);
_node.Values[4 + index * 2] = dataA;
_node.Surface.MarkAsEdited();
@@ -750,9 +751,10 @@ namespace FlaxEditor.Surface.Archetypes
public override void SetLocation(int index, Float2 location)
{
var dataA = (Float4)_node.Values[4 + index * 2];
var ranges = (Float4)_node.Values[0];
dataA.X = location.X;
dataA.Y = location.Y;
dataA.X = Mathf.Clamp(location.X, ranges.X, ranges.Y);
dataA.Y = Mathf.Clamp(location.Y, ranges.Z, ranges.W);
_node.Values[4 + index * 2] = dataA;
_node.Surface.MarkAsEdited();

10
Source/Editor/Surface/VisjectSurface.Draw.cs
View File

@@ -64,7 +64,11 @@ namespace FlaxEditor.Surface
/// </summary>
protected virtual void DrawBackground()
{
var background = Style.Background;
DrawBackgroundDefault(Style.Background, Width, Height);
}
internal static void DrawBackgroundDefault(Texture background, float width, float height)
{
if (background && background.ResidentMipLevels > 0)
{
var bSize = background.Size;
@@ -77,8 +81,8 @@ namespace FlaxEditor.Surface
if (pos.Y > 0)
pos.Y -= bh;
int maxI = Mathf.CeilToInt(Width / bw + 1.0f);
int maxJ = Mathf.CeilToInt(Height / bh + 1.0f);
int maxI = Mathf.CeilToInt(width / bw + 1.0f);
int maxJ = Mathf.CeilToInt(height / bh + 1.0f);
for (int i = 0; i < maxI; i++)
{