Gate inspector transforms to selected source
This commit is contained in:
parent
867984dfbd
commit
4d30d1e994
8 changed files with 54 additions and 35 deletions
|
|
@ -4259,11 +4259,15 @@ static int RunSceneEditorSmoke()
|
|||
var hasCameraPreview = previewItems.Any(item => string.Equals(item.Id, "editor-camera", StringComparison.Ordinal));
|
||||
var hasOnlyVideoPreview = previewItems.Count == 2 && previewItems.All(item => item.Id.StartsWith("feed:", StringComparison.Ordinal));
|
||||
var programCentered = placement is { CenterX: 0.5f, CenterY: 0.5f };
|
||||
editor.SelectNode("editor-camera");
|
||||
var cameraIsNotProgramSource = !editor.HasSelectedProgramSource &&
|
||||
Math.Abs(editor.SelectedProgramX - 0.5f) < 0.001f &&
|
||||
Math.Abs(editor.SelectedProgramY - 0.5f) < 0.001f;
|
||||
|
||||
Console.WriteLine(
|
||||
$"scene-editor-smoke nodes={editor.Nodes.Count} feeds={editor.Nodes.Count(node => node.Kind == MimirSceneEditorNodeKind.SensorFeedPanel)} " +
|
||||
$"preview={previewItems.Count} selected={editor.SelectedNode?.DisplayName} hasDisplay={hasDisplay} cameraPreview={hasCameraPreview} " +
|
||||
$"placement={placement?.CenterX:0.000},{placement?.CenterY:0.000} programCentered={programCentered} aspectLocked={aspectLocked} snapped={snappedToBounds} previewMove={previewMoveHandled} previewHandle={previewHandleAspectLocked}");
|
||||
$"placement={placement?.CenterX:0.000},{placement?.CenterY:0.000} programCentered={programCentered} aspectLocked={aspectLocked} snapped={snappedToBounds} previewMove={previewMoveHandled} previewHandle={previewHandleAspectLocked} cameraSource={editor.HasSelectedProgramSource}");
|
||||
|
||||
return editor.Nodes.Count == 3 &&
|
||||
hasDisplay &&
|
||||
|
|
@ -4273,7 +4277,8 @@ static int RunSceneEditorSmoke()
|
|||
aspectLocked &&
|
||||
snappedToBounds &&
|
||||
previewMoveHandled &&
|
||||
previewHandleAspectLocked
|
||||
previewHandleAspectLocked &&
|
||||
cameraIsNotProgramSource
|
||||
? 0
|
||||
: 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -922,26 +922,29 @@ public sealed class MimirRuntime : IAquariumRuntime, IAquariumRuntimeServicesRec
|
|||
{
|
||||
inspector.Text("inspector.selection", sceneEditor.DescribeSelection, "strong");
|
||||
inspector.Options("inspector.video-feed", "Feed", () => presentationControls.SelectedVideoIndex, SelectVideoLayer, VideoFeedOptions());
|
||||
inspector.Toggle("video.visible", "Visible", () => sceneEditor.SelectedNode?.Visible ?? false, SetSelectedVideoVisible);
|
||||
inspector.Toggle("video.solo", "Solo", () => presentationControls.SelectedVideo?.Solo ?? false, SetSelectedVideoSolo);
|
||||
inspector.Slider("video.opacity", "Opacity", () => presentationControls.SelectedVideo?.Opacity ?? 1.0f, SetSelectedVideoOpacity, 0.0f, 1.0f, "0.00");
|
||||
inspector.Text("inspector.program-placement", "Program Frame", "strong");
|
||||
inspector.Slider("program.x", "X", () => sceneEditor.SelectedProgramX, sceneEditor.SetSelectedProgramX, 0.0f, 1.0f, "0.000");
|
||||
inspector.Slider("program.y", "Y", () => sceneEditor.SelectedProgramY, sceneEditor.SetSelectedProgramY, 0.0f, 1.0f, "0.000");
|
||||
inspector.Slider("program.w", "W", () => sceneEditor.SelectedProgramWidth, sceneEditor.SetSelectedProgramWidth, 0.01f, 1.0f, "0.000");
|
||||
inspector.Slider("program.h", "H", () => sceneEditor.SelectedProgramHeight, sceneEditor.SetSelectedProgramHeight, 0.01f, 1.0f, "0.000");
|
||||
inspector.Slider("program.rotation", "Rotation", () => sceneEditor.SelectedNode?.Transform.RotationRadians ?? 0.0f, sceneEditor.SetSelectedRotation, -MathF.PI, MathF.PI, "0.00");
|
||||
inspector.Row("program.fit", fit =>
|
||||
inspector.Vertical("inspector.source-controls", source =>
|
||||
{
|
||||
fit.Button("program.center", "Center", sceneEditor.CenterSelectedProgramLayer);
|
||||
fit.Button("program.fit-selected", "Fit", sceneEditor.FitSelectedProgramLayer);
|
||||
fit.Button("program.fill-selected", "Fill", sceneEditor.FillSelectedProgramLayer);
|
||||
});
|
||||
inspector.Row("program.order", order =>
|
||||
{
|
||||
order.Button("program.layer-up", "Layer Up", () => MoveSelectedVideoLayer(-1));
|
||||
order.Button("program.layer-down", "Layer Down", () => MoveSelectedVideoLayer(1));
|
||||
});
|
||||
source.Toggle("video.visible", "Visible", () => sceneEditor.SelectedNode?.Visible ?? false, SetSelectedVideoVisible);
|
||||
source.Toggle("video.solo", "Solo", () => presentationControls.SelectedVideo?.Solo ?? false, SetSelectedVideoSolo);
|
||||
source.Slider("video.opacity", "Opacity", () => presentationControls.SelectedVideo?.Opacity ?? 1.0f, SetSelectedVideoOpacity, 0.0f, 1.0f, "0.00");
|
||||
source.Text("inspector.program-placement", "Program Frame", "strong");
|
||||
source.Slider("program.x", "X", () => sceneEditor.SelectedProgramX, sceneEditor.SetSelectedProgramX, 0.0f, 1.0f, "0.000");
|
||||
source.Slider("program.y", "Y", () => sceneEditor.SelectedProgramY, sceneEditor.SetSelectedProgramY, 0.0f, 1.0f, "0.000");
|
||||
source.Slider("program.w", "W", () => sceneEditor.SelectedProgramWidth, sceneEditor.SetSelectedProgramWidth, 0.01f, 1.0f, "0.000");
|
||||
source.Slider("program.h", "H", () => sceneEditor.SelectedProgramHeight, sceneEditor.SetSelectedProgramHeight, 0.01f, 1.0f, "0.000");
|
||||
source.Slider("program.rotation", "Rotation", () => sceneEditor.SelectedNode?.Transform.RotationRadians ?? 0.0f, sceneEditor.SetSelectedRotation, -MathF.PI, MathF.PI, "0.00");
|
||||
source.Row("program.fit", fit =>
|
||||
{
|
||||
fit.Button("program.center", "Center", sceneEditor.CenterSelectedProgramLayer);
|
||||
fit.Button("program.fit-selected", "Fit", sceneEditor.FitSelectedProgramLayer);
|
||||
fit.Button("program.fill-selected", "Fill", sceneEditor.FillSelectedProgramLayer);
|
||||
});
|
||||
source.Row("program.order", order =>
|
||||
{
|
||||
order.Button("program.layer-up", "Layer Up", () => MoveSelectedVideoLayer(-1));
|
||||
order.Button("program.layer-down", "Layer Down", () => MoveSelectedVideoLayer(1));
|
||||
});
|
||||
}, isVisible: () => sceneEditor.HasSelectedProgramSource);
|
||||
}, weight: 0.95f);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@ public sealed class MimirSceneEditorState
|
|||
public MimirSceneEditorNode? SelectedNode =>
|
||||
nodes.FirstOrDefault(node => string.Equals(node.Id, SelectedNodeId, StringComparison.Ordinal));
|
||||
|
||||
public bool HasSelectedProgramSource => SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel };
|
||||
|
||||
public IReadOnlyList<MimirSceneEditorNode> VisibleNodes =>
|
||||
nodes.Where(node => node.Visible).ToArray();
|
||||
|
||||
|
|
@ -279,17 +281,17 @@ public sealed class MimirSceneEditorState
|
|||
}
|
||||
}
|
||||
|
||||
public float SelectedProgramX => SelectedNode is { } selected ? PlacementForNode(selected).CenterX : 0.5f;
|
||||
public float SelectedProgramX => SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected ? PlacementForNode(selected).CenterX : 0.5f;
|
||||
|
||||
public float SelectedProgramY => SelectedNode is { } selected ? PlacementForNode(selected).CenterY : 0.5f;
|
||||
public float SelectedProgramY => SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected ? PlacementForNode(selected).CenterY : 0.5f;
|
||||
|
||||
public float SelectedProgramWidth => SelectedNode is { } selected ? PlacementForNode(selected).Width : 0.1f;
|
||||
public float SelectedProgramWidth => SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected ? PlacementForNode(selected).Width : 0.1f;
|
||||
|
||||
public float SelectedProgramHeight => SelectedNode is { } selected ? PlacementForNode(selected).Height : 0.1f;
|
||||
public float SelectedProgramHeight => SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected ? PlacementForNode(selected).Height : 0.1f;
|
||||
|
||||
public void SetSelectedProgramX(float value)
|
||||
{
|
||||
if (SelectedNode is { } selected)
|
||||
if (SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected)
|
||||
{
|
||||
SetNodeProgramPlacement(selected, PlacementForNode(selected) with { CenterX = value });
|
||||
}
|
||||
|
|
@ -297,7 +299,7 @@ public sealed class MimirSceneEditorState
|
|||
|
||||
public void SetSelectedProgramY(float value)
|
||||
{
|
||||
if (SelectedNode is { } selected)
|
||||
if (SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected)
|
||||
{
|
||||
SetNodeProgramPlacement(selected, PlacementForNode(selected) with { CenterY = value });
|
||||
}
|
||||
|
|
@ -305,7 +307,7 @@ public sealed class MimirSceneEditorState
|
|||
|
||||
public void SetSelectedProgramWidth(float value)
|
||||
{
|
||||
if (SelectedNode is { } selected)
|
||||
if (SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected)
|
||||
{
|
||||
SetNodeProgramPlacement(selected, ResizeProgramPlacement(selected, PlacementForNode(selected), value, resizeWidth: true));
|
||||
}
|
||||
|
|
@ -313,7 +315,7 @@ public sealed class MimirSceneEditorState
|
|||
|
||||
public void SetSelectedProgramHeight(float value)
|
||||
{
|
||||
if (SelectedNode is { } selected)
|
||||
if (SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected)
|
||||
{
|
||||
SetNodeProgramPlacement(selected, ResizeProgramPlacement(selected, PlacementForNode(selected), value, resizeWidth: false));
|
||||
}
|
||||
|
|
@ -321,7 +323,7 @@ public sealed class MimirSceneEditorState
|
|||
|
||||
public void CenterSelectedProgramLayer()
|
||||
{
|
||||
if (SelectedNode is { } selected)
|
||||
if (SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected)
|
||||
{
|
||||
SetNodeProgramPlacement(selected, PlacementForNode(selected) with { CenterX = 0.5f, CenterY = 0.5f });
|
||||
}
|
||||
|
|
@ -329,7 +331,7 @@ public sealed class MimirSceneEditorState
|
|||
|
||||
public void FitSelectedProgramLayer()
|
||||
{
|
||||
if (SelectedNode is not { } selected)
|
||||
if (SelectedNode is not { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -358,7 +360,7 @@ public sealed class MimirSceneEditorState
|
|||
|
||||
public void FillSelectedProgramLayer()
|
||||
{
|
||||
if (SelectedNode is { } selected)
|
||||
if (SelectedNode is { Kind: MimirSceneEditorNodeKind.SensorFeedPanel } selected)
|
||||
{
|
||||
SetNodeProgramPlacement(selected, PlacementForNode(selected) with
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue