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

Minor adjustments for #3411

Browse Source
This commit is contained in:
Wojtek Figat
2025-09-14 22:00:57 +02:00
parent 5582579173
commit ada6b9140f
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Editor/Gizmo/MaterialAxisLocked.flax (Stored with Git LFS)
View File

Binary file not shown.

17
Source/Editor/Gizmo/TransformGizmoBase.Draw.cs
View File

@@ -1,9 +1,7 @@
// Copyright (c) Wojciech Figat. All rights reserved.
using FlaxEditor.Options;
using FlaxEditor.SceneGraph;
using FlaxEngine;
using System;
namespace FlaxEditor.Gizmo
{
@@ -24,8 +22,8 @@ namespace FlaxEditor.Gizmo
private MaterialBase _materialSphere;
// Material Parameter Names
const String _brightnessParamName = "Brightness";
const String _opacityParamName = "Opacity";
private const string _brightnessParamName = "Brightness";
private const string _opacityParamName = "Opacity";
/// <summary>
/// Used for example when the selection can't be moved because one actor is static.
@@ -82,7 +80,9 @@ namespace FlaxEditor.Gizmo
{
_isDisabled = ShouldGizmoBeLocked();
float brightness = _isDisabled ? options.Visual.TransformGizmoBrighnessDisabled : options.Visual.TransformGizmoBrightness;
float brightness = _isDisabled ? options.Visual.TransformGizmoBrightnessDisabled : options.Visual.TransformGizmoBrightness;
if (Mathf.NearEqual(brightness, (float)_materialAxisX.GetParameterValue(_brightnessParamName)))
return;
_materialAxisX.SetParameterValue(_brightnessParamName, brightness);
_materialAxisY.SetParameterValue(_brightnessParamName, brightness);
_materialAxisZ.SetParameterValue(_brightnessParamName, brightness);
@@ -91,10 +91,10 @@ namespace FlaxEditor.Gizmo
private bool ShouldGizmoBeLocked()
{
bool gizmoLocked = false;
if (Editor.Instance.StateMachine.IsPlayMode)
if (Editor.Instance.StateMachine.IsPlayMode && Owner is Viewport.EditorGizmoViewport)
{
foreach (SceneGraphNode obj in Editor.Instance.SceneEditing.Selection)
// Block editing static scene objects in main view during play mode
foreach (var obj in Editor.Instance.SceneEditing.Selection)
{
if (obj.CanTransform == false)
{
@@ -103,7 +103,6 @@ namespace FlaxEditor.Gizmo
}
}
}
return gizmoLocked;
}

2
Source/Editor/Options/VisualOptions.cs
View File

@@ -86,7 +86,7 @@ namespace FlaxEditor.Options
/// </summary>
[DefaultValue(0.25f), Range(0f, 5f)]
[EditorDisplay("Transform Gizmo", "Disabled Gizmo Brightness"), EditorOrder(212)]
public float TransformGizmoBrighnessDisabled { get; set; } = 0.25f;
public float TransformGizmoBrightnessDisabled { get; set; } = 0.25f;
/// <summary>
/// Gets or sets a value indicating whether enable MSAA for DebugDraw primitives rendering. Helps with pixel aliasing but reduces performance.