diff --git a/.Variations/924b8cc0-5b4b-41d0-a71b-b26465683910.var b/.Variations/924b8cc0-5b4b-41d0-a71b-b26465683910.var index 2180f22b1c..d9f14291e7 100644 --- a/.Variations/924b8cc0-5b4b-41d0-a71b-b26465683910.var +++ b/.Variations/924b8cc0-5b4b-41d0-a71b-b26465683910.var @@ -388,6 +388,105 @@ "8367cbad-6214-4167-855b-9f704bb46ac3": -7.0 } } + }, + { + "Id": "3032e5b0-6d66-4e45-a421-bfd2b19fe0f2", + "IsPreset": true, + "ActivationIndex": 13, + "Title": "Test 2", + "PosOnCanvas": { + "X": 10.533621, + "Y": 726.5019 + }, + "ParameterSetsForChildIds": { + "00000000-0000-0000-0000-000000000000": { + "8c4e188c-18ab-4f69-a60a-14a8e5a12f91": { + "X": 0.14862531, + "Y": -3.3470907, + "Z": 0.0, + "W": 0.0 + }, + "9a4d8846-6b46-4a4b-a8d3-97f3f9eaf8db": { + "X": 0.7718076, + "Y": 0.0, + "Z": 0.0, + "W": 1.0 + }, + "4dd19c0b-10c1-43fa-a3e2-970b4f9c6162": -11.0, + "11ba5bbc-4873-489f-85b7-35080f0988cf": 3.9, + "e95c5f4d-df12-42f6-a879-8e26540b03ac": 5.3, + "6eb81dc2-88b5-4ba7-9f82-fe2389dc2926": 0.8, + "e9fd2c91-7cee-481e-933b-a40a27da15dc": -23.5, + "211fd6ee-26a9-4e15-85ba-4a22e865545d": 16.2, + "8367cbad-6214-4167-855b-9f704bb46ac3": 67.0 + } + } + }, + { + "Id": "b34c6442-9404-467e-a98e-14a1ded6bfd5", + "IsPreset": true, + "ActivationIndex": 14, + "Title": "Test3", + "PosOnCanvas": { + "X": 438.8577, + "Y": 735.4049 + }, + "ParameterSetsForChildIds": { + "00000000-0000-0000-0000-000000000000": { + "8c4e188c-18ab-4f69-a60a-14a8e5a12f91": { + "X": 0.0, + "Y": 0.95, + "Z": 0.0, + "W": 0.0 + }, + "9a4d8846-6b46-4a4b-a8d3-97f3f9eaf8db": { + "X": 19.4, + "Y": 20.0, + "Z": 0.0, + "W": 1.0 + }, + "4dd19c0b-10c1-43fa-a3e2-970b4f9c6162": 28.0, + "11ba5bbc-4873-489f-85b7-35080f0988cf": 132.0, + "e95c5f4d-df12-42f6-a879-8e26540b03ac": 100.0, + "6eb81dc2-88b5-4ba7-9f82-fe2389dc2926": 31.0, + "e9fd2c91-7cee-481e-933b-a40a27da15dc": 0.03, + "211fd6ee-26a9-4e15-85ba-4a22e865545d": -0.2999997, + "8367cbad-6214-4167-855b-9f704bb46ac3": 340.0 + } + } + }, + { + "Id": "998080c1-bf65-4863-a568-1177bc4bf309", + "IsPreset": true, + "ActivationIndex": 15, + "Title": "Test5", + "PosOnCanvas": { + "X": 155.75218, + "Y": 1024.1165 + }, + "ParameterSetsForChildIds": { + "00000000-0000-0000-0000-000000000000": { + "8c4e188c-18ab-4f69-a60a-14a8e5a12f91": { + "X": 0.09, + "Y": 0.01, + "Z": 2.18, + "W": 0.0 + }, + "9a4d8846-6b46-4a4b-a8d3-97f3f9eaf8db": { + "X": 1290.0, + "Y": -34.0, + "Z": -106.7, + "W": 1.0 + }, + "4dd19c0b-10c1-43fa-a3e2-970b4f9c6162": 28.0, + "11ba5bbc-4873-489f-85b7-35080f0988cf": 132.0, + "e95c5f4d-df12-42f6-a879-8e26540b03ac": 5.0, + "6eb81dc2-88b5-4ba7-9f82-fe2389dc2926": 6.5, + "e9fd2c91-7cee-481e-933b-a40a27da15dc": 3.58, + "211fd6ee-26a9-4e15-85ba-4a22e865545d": 0.09, + "8367cbad-6214-4167-855b-9f704bb46ac3": -230.0 + } + } } ] } \ No newline at end of file diff --git a/.Variations/f9d453d1-04d9-43ef-9189-50008f93bcc2.var b/.Variations/f9d453d1-04d9-43ef-9189-50008f93bcc2.var index 7f9f49b9e9..ccdb0eb347 100644 --- a/.Variations/f9d453d1-04d9-43ef-9189-50008f93bcc2.var +++ b/.Variations/f9d453d1-04d9-43ef-9189-50008f93bcc2.var @@ -128,6 +128,32 @@ "806221f8-6e31-45ec-b62e-5baac6c1fd54": 0.16 } } + }, + { + "Id": "38371470-f8e7-46e0-84d4-f49b6af696f0", + "IsPreset": true, + "ActivationIndex": 7, + "Title": "Fire", + "PosOnCanvas": { + "X": 0.0, + "Y": 186.0 + }, + "ParameterSetsForChildIds": { + "00000000-0000-0000-0000-000000000000": { + "a7669abe-65c7-4745-97a6-d0d80f6a3150": 24.9, + "78b314b8-f9d2-4723-9b11-c07ba926db86": -30.000002, + "8060756f-72a4-490b-9677-872b70e73b3a": 1.9, + "297a2220-0648-47d3-82a1-c1077a1326a4": 65.0, + "98662eab-90b9-4af1-8ff3-ba6709b5038e": 1.0, + "4109af01-5c9a-4a9f-af7f-87fbcdcece3d": { + "X": 0.0, + "Y": 0.0019999999 + }, + "806221f8-6e31-45ec-b62e-5baac6c1fd54": 0.07, + "1f09da31-b853-417c-abb1-39e1199a149f": true, + "51621e59-9bdd-4004-a053-d4637278bd92": false + } + } } ] } \ No newline at end of file diff --git a/Core/DataTypes/Point.cs b/Core/DataTypes/Point.cs index 62d551cc40..f46922dd37 100644 --- a/Core/DataTypes/Point.cs +++ b/Core/DataTypes/Point.cs @@ -4,7 +4,7 @@ namespace T3.Core.DataTypes { - [StructLayout(LayoutKind.Explicit, Size = 2 * 16)] + [StructLayout(LayoutKind.Explicit, Size = Stride)] public struct Point { [FieldOffset(0)] @@ -22,8 +22,10 @@ public static Point Separator() { Position = Vector3.Zero, W = Single.NaN, - Orientation = Quaternion.Identity + Orientation = Quaternion.Identity, }; } + + public const int Stride = 2 * 16; } } \ No newline at end of file diff --git a/Core/Operator/Symbol.cs b/Core/Operator/Symbol.cs index 0e3f1a71a0..c2adc89894 100644 --- a/Core/Operator/Symbol.cs +++ b/Core/Operator/Symbol.cs @@ -80,6 +80,8 @@ public Symbol(Type instanceType, Guid symbolId, Guid[] orderedInputIds = null) // input identified by base interface Type inputSlotType = typeof(IInputSlot); + + var inputInfos = instanceType.GetFields().Where(f => inputSlotType.IsAssignableFrom(f.FieldType)); var inputDefs = new List(); foreach (var inputInfo in inputInfos) @@ -89,6 +91,12 @@ public Symbol(Type instanceType, Guid symbolId, Guid[] orderedInputIds = null) var attribute = (InputAttribute)customAttributes[0]; var isMultiInput = inputInfo.FieldType.GetGenericTypeDefinition() == typeof(MultiInputSlot<>); var valueType = inputInfo.FieldType.GetGenericArguments()[0]; + + if (!TypeNameRegistry.Entries.ContainsKey(valueType)) + { + Log.Error($"Skipping input {Name}.{inputInfo.Name} with undefined type {valueType}..."); + continue; + } var inputDef = CreateInputDefinition(attribute.Id, inputInfo.Name, isMultiInput, valueType); inputDefs.Add(inputDef); } @@ -99,6 +107,7 @@ public Symbol(Type instanceType, Guid symbolId, Guid[] orderedInputIds = null) foreach (Guid id in orderedInputIds) { var inputDefinition = inputDefs.Find(inputDef => inputDef != null && inputDef.Id == id); + if (inputDefinition != null) { InputDefinitions.Add(inputDefinition); @@ -120,6 +129,12 @@ from attr in attributes var valueType = output.FieldType.GenericTypeArguments[0]; var attribute = (OutputAttribute)attributes.First(); var outputDataType = GetOutputDataType(output); + + if (!TypeNameRegistry.Entries.ContainsKey(valueType)) + { + Log.Error($"Skipping output {Name}.{output.Name} with undefined type {valueType}..."); + continue; + } OutputDefinitions.Add(new OutputDefinition { diff --git a/Editor/App/AppWindow.cs b/Editor/App/AppWindow.cs index 795b9deee1..60b52cb4a1 100644 --- a/Editor/App/AppWindow.cs +++ b/Editor/App/AppWindow.cs @@ -10,6 +10,7 @@ using T3.Editor.Gui.Styling; using Device = SharpDX.Direct3D11.Device; using Icon = System.Drawing.Icon; +using Rectangle = System.Drawing.Rectangle; using Resource = SharpDX.Direct3D11.Resource; namespace T3.Editor.App @@ -38,11 +39,22 @@ internal AppWindow(string windowTitle, bool disableClose) CreateRenderForm(windowTitle, disableClose); } - public void SetVisible(bool isVisible) => Form.Visible = isVisible; + public void SetVisible(bool isVisible) + { + Form.Visible = isVisible; + } - public void SetSizeable() => Form.FormBorderStyle = FormBorderStyle.Sizable; + public void SetSizeable() + { + Form.FormBorderStyle = FormBorderStyle.Sizable; + if (_boundsBeforeFullscreen.Height != 0 && _boundsBeforeFullscreen.Width != 0) + { + Form.Bounds = _boundsBeforeFullscreen; + } + } public void Show() => Form.Show(); + public Vector2 GetDpi() { @@ -53,6 +65,7 @@ public Vector2 GetDpi() internal void SetFullScreen(int screenIndex) { + _boundsBeforeFullscreen = Form.Bounds; Form.FormBorderStyle = FormBorderStyle.Sizable; Form.WindowState = FormWindowState.Normal; Form.FormBorderStyle = FormBorderStyle.None; @@ -204,5 +217,6 @@ public NoCloseRenderForm(string title) : base(title) private RenderTargetView _renderTargetView; private Texture2D _backBufferTexture; private bool _isResizingRightNow; + private Rectangle _boundsBeforeFullscreen; } } \ No newline at end of file diff --git a/Editor/Gui/Graph/Dialogs/AddInputDialog.cs b/Editor/Gui/Graph/Dialogs/AddInputDialog.cs index 6a6d9be353..95306d8052 100644 --- a/Editor/Gui/Graph/Dialogs/AddInputDialog.cs +++ b/Editor/Gui/Graph/Dialogs/AddInputDialog.cs @@ -1,13 +1,11 @@ using System; -using System.Linq; using ImGuiNET; using T3.Core.Operator; using T3.Editor.Gui.Graph.Helpers; using T3.Editor.Gui.Graph.Modification; -using T3.Editor.Gui.InputUi.VectorInputs; using T3.Editor.Gui.Styling; using T3.Editor.Gui.UiHelpers; - +using T3.Operators.Types.Id_dab61a12_9996_401e_9aa6_328dd6292beb; namespace T3.Editor.Gui.Graph.Dialogs { @@ -33,6 +31,12 @@ public void Draw(Symbol symbol) else if(symbol.InputDefinitions.Exists(i => i.Name == _parameterName)) { warning = "Parameter name already exists."; + isValid = false; + } + else if (symbol.InstanceType == typeof(HomeCanvas)) + { + warning = "You can't add parameters to the home canvas."; + isValid = false; } FormInputs.SetIndent(100); @@ -48,6 +52,7 @@ public void Draw(Symbol symbol) if (CustomComponents.DisablableButton("Add", isValid)) { InputsAndOutputs.AddInputToSymbol(_parameterName, _multiInput, _selectedType, symbol); + _parameterName = string.Empty; } ImGui.SameLine(); diff --git a/Editor/Gui/Graph/GraphNode.cs b/Editor/Gui/Graph/GraphNode.cs index a862279cf8..242b5a2536 100644 --- a/Editor/Gui/Graph/GraphNode.cs +++ b/Editor/Gui/Graph/GraphNode.cs @@ -437,7 +437,11 @@ public static void Draw(SymbolChildUi childUi, Instance instance, bool preventIn var inputSlot = instance.GetInput(inputDefinition.Id); //var valueAsString = inputUi.GetSlotValue(inputSlot); var valueAsString = GetValueString(inputSlot); - + // if (inputSlot is InputSlot f) + // { + // var xxx = f.TypedInputValue.Value; + // } + var valueColor = labelColor; valueColor.Rgba.W *= 0.6f; @@ -1217,7 +1221,7 @@ private static string GetValueString(InputValue inputValue) { return inputValue switch { - InputValue f => $"{f.Value:0.00}", + InputValue f => $"{f.Value:0.000}", InputValue i => $"{i.Value:G3}", InputValue i => $"{i.Value:G3}", InputValue b => $"{b.Value}", @@ -1227,6 +1231,22 @@ private static string GetValueString(InputValue inputValue) _ => "" }; } + + private static string GetValueString(IInputSlot outputSlot) + { + + return outputSlot switch + { + InputSlot f => $"{f.TypedInputValue.Value:0.000}", + InputSlot i => $"{i.TypedInputValue.Value:G3}", + InputSlot i => $"{i.TypedInputValue.Value:G3}", + InputSlot b => $"{b.TypedInputValue.Value}", + InputSlot v3 => $"{v3.TypedInputValue.Value:0.0}", + InputSlot v2 => $"{v2.TypedInputValue.Value:0.0}", + InputSlot s => Truncate(s.TypedInputValue.Value), + _ => "" + }; + } private static string GetValueString(ISlot outputSlot) { diff --git a/Editor/Gui/Interaction/InfinitySliderOverlay.cs b/Editor/Gui/Interaction/InfinitySliderOverlay.cs index a1133ffa66..c0a664310a 100644 --- a/Editor/Gui/Interaction/InfinitySliderOverlay.cs +++ b/Editor/Gui/Interaction/InfinitySliderOverlay.cs @@ -33,10 +33,10 @@ public static void Draw(ref double roundedValue, bool restarted, Vector2 center, _originalValue = roundedValue; } - var mouseYDistance = _center.Y - _io.MousePos.Y; // Vector2.Distance(_center, p1); + var mouseYDistance = _center.Y - _io.MousePos.Y; // Update angle... - var mousePosX = _io.MousePos.X; + var mousePosX = (int)(_io.MousePos.X * 2)/2; var xOffset = mousePosX - _center.X; var deltaX = xOffset - _lastXOffset; _lastXOffset = xOffset; diff --git a/Editor/Gui/Interaction/UserAction.cs b/Editor/Gui/Interaction/UserAction.cs index 901485c7b5..6d1a67b2ff 100644 --- a/Editor/Gui/Interaction/UserAction.cs +++ b/Editor/Gui/Interaction/UserAction.cs @@ -283,7 +283,6 @@ private static readonly List _bindings new KeyboardBinding(UserActions.PlaybackJumpToStartTime, new KeyCombination(Key.Home)), new KeyboardBinding(UserActions.PlaybackJumpToNextKeyframe, new KeyCombination(Key.Period)), new KeyboardBinding(UserActions.PlaybackJumpToPreviousKeyframe, new KeyCombination(Key.Comma)), - new KeyboardBinding(UserActions.PlaybackNextFrame, new KeyCombination(Key.CursorRight, shift: true)), new KeyboardBinding(UserActions.PlaybackJumpBack, new KeyCombination(Key.B)), new KeyboardBinding(UserActions.Undo, new KeyCombination(Key.Z, ctrl: true)), diff --git a/Editor/Gui/T3UI.cs b/Editor/Gui/T3UI.cs index 1364dbe3e7..2ba024e194 100644 --- a/Editor/Gui/T3UI.cs +++ b/Editor/Gui/T3UI.cs @@ -30,6 +30,7 @@ using T3.Editor.Gui.UiHelpers.Wiki; using T3.Editor.Gui.Windows; using T3.Editor.Gui.Windows.Layouts; +using T3.Editor.Gui.Windows.Output; using T3.Editor.SystemUi; using T3.Editor.UiModel; using T3.Operators.Types.Id_5d7d61ae_0a41_4ffa_a51d_93bab665e7fe; @@ -189,10 +190,26 @@ private void TriggerGlobalActionsFromKeyBindings() private static void ToggleFocusMode() { var shouldBeFocusMode = !UserSettings.Config.FocusMode; + + var outputWindow = OutputWindow.GetPrimaryOutputWindow(); + var primaryGraphWindow = GraphWindow.GetPrimaryGraphWindow(); + + if (shouldBeFocusMode && outputWindow != null && primaryGraphWindow != null) + { + primaryGraphWindow.GraphImageBackground.OutputInstance = outputWindow.Pinning.GetPinnedOrSelectedInstance(); + } + UserSettings.Config.FocusMode = shouldBeFocusMode; UserSettings.Config.ShowToolbar = shouldBeFocusMode; ToggleAllUiElements(); LayoutHandling.LoadAndApplyLayoutOrFocusMode(shouldBeFocusMode ? 11 : UserSettings.Config.WindowLayoutIndex); + + outputWindow = OutputWindow.GetPrimaryOutputWindow(); + if (!shouldBeFocusMode && outputWindow != null && primaryGraphWindow != null) + { + outputWindow.Pinning.PinInstance(primaryGraphWindow.GraphImageBackground.OutputInstance); + primaryGraphWindow.GraphImageBackground.ClearBackground(); + } } private void DrawAppMenuBar() diff --git a/Editor/Gui/UiHelpers/UserSettings.cs b/Editor/Gui/UiHelpers/UserSettings.cs index e9611393c1..a5b5fdba57 100644 --- a/Editor/Gui/UiHelpers/UserSettings.cs +++ b/Editor/Gui/UiHelpers/UserSettings.cs @@ -28,7 +28,7 @@ public class ConfigData public readonly Dictionary LastOpsForWindows = new Dictionary(); [JsonConverter(typeof(StringEnumConverter))] - public GraphCanvas.HoverModes HoverMode = GraphCanvas.HoverModes.Live; + public GraphCanvas.HoverModes HoverMode = GraphCanvas.HoverModes.LastValue; public bool AudioMuted; diff --git a/Editor/Gui/Windows/TimeLine/CurrentTimeMarker.cs b/Editor/Gui/Windows/TimeLine/CurrentTimeMarker.cs index bdacbc0664..6fc1400481 100644 --- a/Editor/Gui/Windows/TimeLine/CurrentTimeMarker.cs +++ b/Editor/Gui/Windows/TimeLine/CurrentTimeMarker.cs @@ -16,8 +16,10 @@ public void Draw(Playback playback) var p = new Vector2(TimeLineCanvas.Current.TransformX((float)playback.TimeInBars), 0); var drawList = ImGui.GetWindowDrawList(); - drawList.AddRectFilled(p + new Vector2(-1,0), p + new Vector2(2, 2000), UiColors.BackgroundFull.Fade(0.2f)); - drawList.AddRectFilled(p, p + new Vector2(1, 2000), UiColors.StatusAnimated); + var y = ImGui.GetWindowPos().Y; + var windowHeight = ImGui.GetWindowHeight() +1; + drawList.AddRectFilled(p + new Vector2(-1,y), p + new Vector2(2, windowHeight), UiColors.BackgroundFull.Fade(0.2f)); + drawList.AddRectFilled(p, p + new Vector2(1, y+ windowHeight), UiColors.StatusAnimated); } private static readonly Color _shadowColor = new Color(0, 0, 0, 0.4f); diff --git a/Editor/Gui/Windows/TimeLine/TimeControls.cs b/Editor/Gui/Windows/TimeLine/TimeControls.cs index 4d1dc3a597..186a114404 100644 --- a/Editor/Gui/Windows/TimeLine/TimeControls.cs +++ b/Editor/Gui/Windows/TimeLine/TimeControls.cs @@ -403,10 +403,16 @@ internal static void DrawTimeControls(TimeLineCanvas timeLineCanvas) } } + if (playback.PlaybackSpeed < -1) + { + ImGui.GetWindowDrawList().AddText( ImGui.GetItemRectMin() + new Vector2(20,4), UiColors.ForegroundFull, $"×{-playback.PlaybackSpeed:0}"); + } + + CustomComponents.TooltipForLastItem("Play backwards", "Play backwards (and faster): " + KeyboardBinding.ListKeyboardShortcuts(UserActions.PlaybackBackwards, false) + - "\n Previous frame:" + KeyboardBinding.ListKeyboardShortcuts(UserActions.PlaybackPreviousFrame, false)); + "\nPrevious frame:" + KeyboardBinding.ListKeyboardShortcuts(UserActions.PlaybackPreviousFrame, false)); ImGui.SameLine(); @@ -428,12 +434,17 @@ internal static void DrawTimeControls(TimeLineCanvas timeLineCanvas) } } + if (playback.PlaybackSpeed > 1) + { + ImGui.GetWindowDrawList().AddText( ImGui.GetItemRectMin() + new Vector2(20,4), UiColors.ForegroundFull, $"×{playback.PlaybackSpeed:0}"); + } + CustomComponents.TooltipForLastItem("Start playback", "Play forward (and faster): " + KeyboardBinding.ListKeyboardShortcuts(UserActions.PlaybackForward, false) + - "\n Play half speed (and slower): " + + "\nPlay half speed (and slower): " + KeyboardBinding.ListKeyboardShortcuts(UserActions.PlaybackForwardHalfSpeed, false) + - "\n Next frame:" + KeyboardBinding.ListKeyboardShortcuts(UserActions.PlaybackNextFrame, false)); + "\nNext frame:" + KeyboardBinding.ListKeyboardShortcuts(UserActions.PlaybackNextFrame, false)); ImGui.SameLine(); diff --git a/Editor/Gui/Windows/Variations/VariationBaseCanvas.cs b/Editor/Gui/Windows/Variations/VariationBaseCanvas.cs index 7af13bbd16..d2191bcadc 100644 --- a/Editor/Gui/Windows/Variations/VariationBaseCanvas.cs +++ b/Editor/Gui/Windows/Variations/VariationBaseCanvas.cs @@ -657,7 +657,7 @@ private static void Barycentric(Vector2 p, Vector2 a, Vector2 b, Vector2 c, out /// public IEnumerable GetSelectables() { - return PoolForBlendOperations.Variations; + return PoolForBlendOperations?.Variations; } public bool IsBlendingActive { get; private set; } diff --git a/Editor/Program.cs b/Editor/Program.cs index 4008551883..3a83fb8572 100644 --- a/Editor/Program.cs +++ b/Editor/Program.cs @@ -30,7 +30,7 @@ public static class Program public static Device Device { get; private set; } public static readonly bool IsStandAlone = File.Exists("StartT3.exe"); - public const string Version = "3.8"; + public const string Version = "3.8.1"; /// /// Generate a release string with diff --git a/Editor/UiModel/SymbolUi.cs b/Editor/UiModel/SymbolUi.cs index 3b7ee6899e..b54d759872 100644 --- a/Editor/UiModel/SymbolUi.cs +++ b/Editor/UiModel/SymbolUi.cs @@ -166,7 +166,13 @@ public void UpdateConsistencyWithSymbol() { Log.Debug($"Found no output ui for '{output.Name}' in {Symbol.Name} - creating a new one"); OutputUis.Remove(output.Id); // if type has changed remove the old entry - var outputUiCreator = outputUiFactory[output.ValueType]; + + if (!outputUiFactory.TryGetValue(output.ValueType, out var outputUiCreator)) + { + Log.Error($"Ignored {Symbol.Name}.{output.Name} with unknown type {output.ValueType}"); + continue; + } + var newOutputUi = outputUiCreator(); newOutputUi.OutputDefinition = output; newOutputUi.PosOnCanvas = ComputeNewOutputUiPositionOnCanvas(ChildUis, OutputUis); @@ -265,8 +271,9 @@ public SymbolChild AddChildAsCopyFromSource(Symbol symbolToAdd, SymbolChild sour var newChildUi = sourceChildUi.Clone(); - newChildUi.SymbolChild = newChild;// Symbol.Children.Find(entry => entry.Id == newChildId); + newChildUi.SymbolChild = newChild; newChildUi.PosOnCanvas = posInCanvas; + newChildUi.Comment = sourceChildUi.Comment; ChildUis.Add(newChildUi); return newChild; diff --git a/Operators/Types/lib/3d/gizmo/BoundingBox_9123651a-5df8-4f85-9e14-2068f33e2ff1.t3 b/Operators/Types/lib/3d/gizmo/BoundingBox_9123651a-5df8-4f85-9e14-2068f33e2ff1.t3 index a809fdb8e7..e9208fbb2e 100644 --- a/Operators/Types/lib/3d/gizmo/BoundingBox_9123651a-5df8-4f85-9e14-2068f33e2ff1.t3 +++ b/Operators/Types/lib/3d/gizmo/BoundingBox_9123651a-5df8-4f85-9e14-2068f33e2ff1.t3 @@ -41,7 +41,7 @@ { "Id": "2ba96aee-ff89-41bd-90c5-c6c36907b6e4"/*Set*/, "Type": "System.Int32", - "Value": 3 + "Value": 2 } ], "Outputs": [] diff --git a/Operators/Types/lib/3d/gizmo/SphereGizmo_1998f949-5c0a-4f39-82cf-b0bda31f7f21.t3 b/Operators/Types/lib/3d/gizmo/SphereGizmo_1998f949-5c0a-4f39-82cf-b0bda31f7f21.t3 index bd87445fc8..8ffdbacfbb 100644 --- a/Operators/Types/lib/3d/gizmo/SphereGizmo_1998f949-5c0a-4f39-82cf-b0bda31f7f21.t3 +++ b/Operators/Types/lib/3d/gizmo/SphereGizmo_1998f949-5c0a-4f39-82cf-b0bda31f7f21.t3 @@ -26,6 +26,11 @@ "Id": "d6156f1a-7196-43ff-bc78-d4f3386ca269"/*RadialPoints*/, "SymbolId": "3352d3a1-ab04-4d0a-bb43-da69095b73fd", "InputValues": [ + { + "Id": "b654ffe2-d46e-4a62-89b3-a9692d5c6481"/*Count*/, + "Type": "System.Int32", + "Value": 50 + }, { "Id": "acce4779-56d6-47c4-9c52-874fca91a3a1"/*Radius*/, "Type": "System.Single", @@ -45,6 +50,11 @@ "Type": "System.Single", "Value": 1.0 }, + { + "Id": "76124db6-4b89-4d7c-bd25-2ebf95b1c141"/*CloseCircleLine*/, + "Type": "System.Boolean", + "Value": true + }, { "Id": "6df5829e-a534-4620-bcd5-9324f94b4f54"/*Axis*/, "Type": "System.Numerics.Vector3", @@ -96,42 +106,95 @@ { "Id": "414c8045-5086-4449-9d9a-03f28c3966b3"/*Size*/, "Type": "System.Single", - "Value": 0.08 + "Value": 0.025 + } + ], + "Outputs": [] + }, + { + "Id": "e1b3b07a-4337-4a21-8cd3-c1cf80e5938e"/*Value*/, + "SymbolId": "5d7d61ae-0a41-4ffa-a51d-93bab665e7fe", + "InputValues": [ + { + "Id": "7773837e-104a-4b3d-a41f-cadbd9249af2"/*Float*/, + "Type": "System.Single", + "Value": 1.0 } ], "Outputs": [] }, { - "Id": "2ae320c3-1cf4-441d-80d1-10ef04deee06"/*_AppendPoints*/, - "SymbolId": "9d3d0582-5e55-4268-9649-07d4dd11d792", + "Id": "dfab703d-1920-4afa-b790-0ea773124b58"/*Transform*/, + "SymbolId": "284d2183-197d-47fd-b130-873cced78b1c", + "InputValues": [], + "Outputs": [] + }, + { + "Id": "379b4030-26d4-4e46-bf03-5d4786e09a3e"/*Execute*/, + "SymbolId": "936e4324-bea2-463a-b196-6064a2d8a6b2", + "InputValues": [], + "Outputs": [] + }, + { + "Id": "4fe380ae-8749-4a3c-9859-eb792004b8b3"/*Value*/, + "SymbolId": "5d7d61ae-0a41-4ffa-a51d-93bab665e7fe", + "InputValues": [ + { + "Id": "7773837e-104a-4b3d-a41f-cadbd9249af2"/*Float*/, + "Type": "System.Single", + "Value": 0.84 + } + ], + "Outputs": [] + }, + { + "Id": "34c30ed0-b20d-4613-a809-f9b51c01991b"/*Float3ToVector3*/, + "SymbolId": "94a5de3b-ee6a-43d3-8d21-7b8fe94b042b", + "InputValues": [], + "Outputs": [] + }, + { + "Id": "40cd90cb-39c3-4b04-8c84-f537f0e2d0b4"/*Transform*/, + "SymbolId": "284d2183-197d-47fd-b130-873cced78b1c", + "InputValues": [], + "Outputs": [] + }, + { + "Id": "14be5539-3247-4857-92e8-d6317f78d1c7"/*Float3ToVector3*/, + "SymbolId": "94a5de3b-ee6a-43d3-8d21-7b8fe94b042b", "InputValues": [], "Outputs": [] }, { - "Id": "515c4a57-7b2a-4635-aed4-70b93d632015"/*RadialPoints*/, + "Id": "e8a92c99-a038-4007-96de-71bc23df9c52"/*RadialPoints*/, "SymbolId": "3352d3a1-ab04-4d0a-bb43-da69095b73fd", "InputValues": [ + { + "Id": "b654ffe2-d46e-4a62-89b3-a9692d5c6481"/*Count*/, + "Type": "System.Int32", + "Value": 4 + }, { "Id": "acce4779-56d6-47c4-9c52-874fca91a3a1"/*Radius*/, "Type": "System.Single", - "Value": 1.0 + "Value": 0.0 }, { - "Id": "f6986f68-851b-4cd1-ae59-bf189aa1698e"/*Offset*/, + "Id": "94b2a118-f760-4043-933c-31283e6e7006"/*Cycles*/, + "Type": "System.Single", + "Value": 0.5 + }, + { + "Id": "6df5829e-a534-4620-bcd5-9324f94b4f54"/*Axis*/, "Type": "System.Numerics.Vector3", "Value": { "X": 0.0, - "Y": 0.0, + "Y": 1.0, "Z": 0.0 } }, { - "Id": "94b2a118-f760-4043-933c-31283e6e7006"/*Cycles*/, - "Type": "System.Single", - "Value": 1.05 - }, - { - "Id": "6df5829e-a534-4620-bcd5-9324f94b4f54"/*Axis*/, + "Id": "01a62754-7629-487d-a43a-f0cd2fbfafce"/*OrientationAxis*/, "Type": "System.Numerics.Vector3", "Value": { "X": 1.0, @@ -140,43 +203,67 @@ } }, { - "Id": "3ee710be-8954-431b-8d3a-38f7f03f0f02"/*W*/, - "Type": "System.Single", - "Value": 4.06 - }, - { - "Id": "526cf26b-6cf6-4cba-be2a-4819c2a422bf"/*WOffset*/, + "Id": "cd917c3d-489e-4e4d-b5dc-eacc846d82ef"/*OrientationAngle*/, "Type": "System.Single", - "Value": 0.0 + "Value": -90.0 } ], "Outputs": [] }, { - "Id": "f5c5240e-595d-476d-84af-6a13985d883b"/*RadialPoints*/, + "Id": "7a86c7c3-0c4d-49d1-aff9-4b8588c97fa2"/*CombineBuffers*/, + "SymbolId": "4dd8a618-eb3b-40af-9851-89c50683d83e", + "InputValues": [], + "Outputs": [] + }, + { + "Id": "3468be00-ddba-4254-b1ef-b91dbf68fe3b"/*RepeatAtGPoints*/, + "SymbolId": "780edb20-f83f-494c-ab17-7015e2311250", + "InputValues": [], + "Outputs": [] + }, + { + "Id": "ccbc6ed6-4e96-4ca0-af3a-b9475588dc33"/*RadialPoints*/, "SymbolId": "3352d3a1-ab04-4d0a-bb43-da69095b73fd", "InputValues": [ + { + "Id": "b654ffe2-d46e-4a62-89b3-a9692d5c6481"/*Count*/, + "Type": "System.Int32", + "Value": 1 + }, { "Id": "acce4779-56d6-47c4-9c52-874fca91a3a1"/*Radius*/, "Type": "System.Single", - "Value": 1.0 + "Value": 0.0 }, { - "Id": "f6986f68-851b-4cd1-ae59-bf189aa1698e"/*Offset*/, + "Id": "01a62754-7629-487d-a43a-f0cd2fbfafce"/*OrientationAxis*/, "Type": "System.Numerics.Vector3", "Value": { - "X": 0.0, + "X": 1.0, "Y": 0.0, "Z": 0.0 } }, { - "Id": "94b2a118-f760-4043-933c-31283e6e7006"/*Cycles*/, + "Id": "cd917c3d-489e-4e4d-b5dc-eacc846d82ef"/*OrientationAngle*/, "Type": "System.Single", - "Value": 1.05 + "Value": 90.0 + } + ], + "Outputs": [] + }, + { + "Id": "29e347ee-bf81-49b5-9e45-4853727fd6f4"/*LinePoints*/, + "SymbolId": "4ae9e2f5-7cb3-40b0-a662-0662e8cb7c68", + "InputValues": [ + { + "Id": "951a1792-e607-4595-b211-97be7d27694c"/*Count*/, + "Type": "System.Int32", + "Value": 2 }, { - "Id": "6df5829e-a534-4620-bcd5-9324f94b4f54"/*Axis*/, + "Id": "8f439130-529c-42ff-a5c0-255476120f03"/*Direction*/, "Type": "System.Numerics.Vector3", "Value": { "X": 0.0, @@ -185,89 +272,26 @@ } }, { - "Id": "3ee710be-8954-431b-8d3a-38f7f03f0f02"/*W*/, + "Id": "d120d8f7-aff6-4e30-b0d2-c45e3e477fde"/*W*/, "Type": "System.Single", - "Value": 4.06 + "Value": 0.86 }, { - "Id": "526cf26b-6cf6-4cba-be2a-4819c2a422bf"/*WOffset*/, - "Type": "System.Single", - "Value": 0.0 - } - ], - "Outputs": [] - }, - { - "Id": "c7ee0eff-bc7f-40e0-8fb9-c12e857c299c"/*_AppendPoints*/, - "SymbolId": "9d3d0582-5e55-4268-9649-07d4dd11d792", - "InputValues": [], - "Outputs": [] - }, - { - "Id": "e1b3b07a-4337-4a21-8cd3-c1cf80e5938e"/*Value*/, - "SymbolId": "5d7d61ae-0a41-4ffa-a51d-93bab665e7fe", - "InputValues": [ - { - "Id": "7773837e-104a-4b3d-a41f-cadbd9249af2"/*Float*/, - "Type": "System.Single", - "Value": 1.0 - } - ], - "Outputs": [] - }, - { - "Id": "dfab703d-1920-4afa-b790-0ea773124b58"/*Transform*/, - "SymbolId": "284d2183-197d-47fd-b130-873cced78b1c", - "InputValues": [], - "Outputs": [] - }, - { - "Id": "379b4030-26d4-4e46-bf03-5d4786e09a3e"/*Execute*/, - "SymbolId": "936e4324-bea2-463a-b196-6064a2d8a6b2", - "InputValues": [], - "Outputs": [] - }, - { - "Id": "4fe380ae-8749-4a3c-9859-eb792004b8b3"/*Value*/, - "SymbolId": "5d7d61ae-0a41-4ffa-a51d-93bab665e7fe", - "InputValues": [ + "Id": "a8dfe0e7-ad33-47cf-ab78-726385e38434"/*OrientationAxis*/, + "Type": "System.Numerics.Vector3", + "Value": { + "X": 1.0, + "Y": 0.0, + "Z": 0.0 + } + }, { - "Id": "7773837e-104a-4b3d-a41f-cadbd9249af2"/*Float*/, + "Id": "208b724d-c5d7-4eaa-94a1-e1f045f14969"/*OrientationAngle*/, "Type": "System.Single", - "Value": 0.84 + "Value": 90.0 } ], "Outputs": [] - }, - { - "Id": "34c30ed0-b20d-4613-a809-f9b51c01991b"/*Float3ToVector3*/, - "SymbolId": "94a5de3b-ee6a-43d3-8d21-7b8fe94b042b", - "InputValues": [], - "Outputs": [] - }, - { - "Id": "40cd90cb-39c3-4b04-8c84-f537f0e2d0b4"/*Transform*/, - "SymbolId": "284d2183-197d-47fd-b130-873cced78b1c", - "InputValues": [], - "Outputs": [] - }, - { - "Id": "14be5539-3247-4857-92e8-d6317f78d1c7"/*Float3ToVector3*/, - "SymbolId": "94a5de3b-ee6a-43d3-8d21-7b8fe94b042b", - "InputValues": [], - "Outputs": [] - }, - { - "Id": "9c7ef3a0-6a86-4382-b0e9-42c845d4554b"/*Locator*/, - "SymbolId": "348652c3-abf5-4fe9-873b-89d1acaaf0ff", - "InputValues": [], - "Outputs": [] - }, - { - "Id": "9c6603cf-724b-43ac-9324-92b520d71150"/*VisibleGizmos*/, - "SymbolId": "d61d7192-9ca3-494e-91e2-10a530ee9375", - "InputValues": [], - "Outputs": [] } ], "Connections": [ @@ -296,16 +320,16 @@ "TargetSlotId": "627f766e-056c-413e-8530-838d673bd031" }, { - "SourceParentOrChildId": "515c4a57-7b2a-4635-aed4-70b93d632015", + "SourceParentOrChildId": "d6156f1a-7196-43ff-bc78-d4f3386ca269", "SourceSlotId": "d7605a96-adc6-4a2b-9ba4-33adef3b7f4c", - "TargetParentOrChildId": "2ae320c3-1cf4-441d-80d1-10ef04deee06", - "TargetSlotId": "8d597942-a0d2-43a0-a039-d450e197702e" + "TargetParentOrChildId": "3468be00-ddba-4254-b1ef-b91dbf68fe3b", + "TargetSlotId": "47c3c549-78bb-41fd-a88c-58f643870b40" }, { - "SourceParentOrChildId": "d6156f1a-7196-43ff-bc78-d4f3386ca269", - "SourceSlotId": "d7605a96-adc6-4a2b-9ba4-33adef3b7f4c", - "TargetParentOrChildId": "2ae320c3-1cf4-441d-80d1-10ef04deee06", - "TargetSlotId": "d331b1f7-3ec3-4dc3-a019-ef72d86b3a98" + "SourceParentOrChildId": "7a86c7c3-0c4d-49d1-aff9-4b8588c97fa2", + "SourceSlotId": "e113f77f-53fe-4b29-95df-2f75e36eb251", + "TargetParentOrChildId": "3468be00-ddba-4254-b1ef-b91dbf68fe3b", + "TargetSlotId": "a952d91a-a86b-4370-acd9-e17b19025966" }, { "SourceParentOrChildId": "4fe380ae-8749-4a3c-9859-eb792004b8b3", @@ -355,12 +379,6 @@ "TargetParentOrChildId": "4fe380ae-8749-4a3c-9859-eb792004b8b3", "TargetSlotId": "7773837e-104a-4b3d-a41f-cadbd9249af2" }, - { - "SourceParentOrChildId": "e1b3b07a-4337-4a21-8cd3-c1cf80e5938e", - "SourceSlotId": "f83f1835-477e-4bb6-93f0-14bf273b8e94", - "TargetParentOrChildId": "515c4a57-7b2a-4635-aed4-70b93d632015", - "TargetSlotId": "3ee710be-8954-431b-8d3a-38f7f03f0f02" - }, { "SourceParentOrChildId": "00000000-0000-0000-0000-000000000000", "SourceSlotId": "188c2244-e55a-4c55-be93-cccbd6fd4e41", @@ -368,20 +386,32 @@ "TargetSlotId": "75419a73-8a3e-4538-9a1d-e3b0ce7f8561" }, { - "SourceParentOrChildId": "c7ee0eff-bc7f-40e0-8fb9-c12e857c299c", - "SourceSlotId": "02610e60-ae30-46c8-bbab-00ee5b1078d3", + "SourceParentOrChildId": "3468be00-ddba-4254-b1ef-b91dbf68fe3b", + "SourceSlotId": "3ac76b2a-7b1c-4762-a3f6-50529cd42fa8", "TargetParentOrChildId": "64d33c5f-7911-44a6-9358-6af239d5dff8", "TargetSlotId": "e15b6dc7-aaf9-4244-a4b8-4ac13ee7d23f" }, { - "SourceParentOrChildId": "40cd90cb-39c3-4b04-8c84-f537f0e2d0b4", - "SourceSlotId": "2d329133-29b9-4f56-b5a6-5ff7d83638fa", - "TargetParentOrChildId": "9c6603cf-724b-43ac-9324-92b520d71150", - "TargetSlotId": "4d663aa5-e2d4-40e0-8901-abe09cb832c3" + "SourceParentOrChildId": "e8a92c99-a038-4007-96de-71bc23df9c52", + "SourceSlotId": "d7605a96-adc6-4a2b-9ba4-33adef3b7f4c", + "TargetParentOrChildId": "7a86c7c3-0c4d-49d1-aff9-4b8588c97fa2", + "TargetSlotId": "b5d25dfd-5d9f-4b5b-b3f5-36b93b13cba3" + }, + { + "SourceParentOrChildId": "ccbc6ed6-4e96-4ca0-af3a-b9475588dc33", + "SourceSlotId": "d7605a96-adc6-4a2b-9ba4-33adef3b7f4c", + "TargetParentOrChildId": "7a86c7c3-0c4d-49d1-aff9-4b8588c97fa2", + "TargetSlotId": "b5d25dfd-5d9f-4b5b-b3f5-36b93b13cba3" }, { - "SourceParentOrChildId": "c7ee0eff-bc7f-40e0-8fb9-c12e857c299c", - "SourceSlotId": "02610e60-ae30-46c8-bbab-00ee5b1078d3", + "SourceParentOrChildId": "29e347ee-bf81-49b5-9e45-4853727fd6f4", + "SourceSlotId": "68514ced-4368-459a-80e9-463a808bff0b", + "TargetParentOrChildId": "7a86c7c3-0c4d-49d1-aff9-4b8588c97fa2", + "TargetSlotId": "b5d25dfd-5d9f-4b5b-b3f5-36b93b13cba3" + }, + { + "SourceParentOrChildId": "3468be00-ddba-4254-b1ef-b91dbf68fe3b", + "SourceSlotId": "3ac76b2a-7b1c-4762-a3f6-50529cd42fa8", "TargetParentOrChildId": "aec4013e-e4eb-4d1c-ae9f-91a1f6dfb988", "TargetSlotId": "5df18658-ef86-4c0f-8bb4-4ac3fbbf9a33" }, @@ -391,18 +421,6 @@ "TargetParentOrChildId": "aec4013e-e4eb-4d1c-ae9f-91a1f6dfb988", "TargetSlotId": "cc442161-e9ca-40ea-be3b-f87189d4e155" }, - { - "SourceParentOrChildId": "f5c5240e-595d-476d-84af-6a13985d883b", - "SourceSlotId": "d7605a96-adc6-4a2b-9ba4-33adef3b7f4c", - "TargetParentOrChildId": "c7ee0eff-bc7f-40e0-8fb9-c12e857c299c", - "TargetSlotId": "8d597942-a0d2-43a0-a039-d450e197702e" - }, - { - "SourceParentOrChildId": "2ae320c3-1cf4-441d-80d1-10ef04deee06", - "SourceSlotId": "02610e60-ae30-46c8-bbab-00ee5b1078d3", - "TargetParentOrChildId": "c7ee0eff-bc7f-40e0-8fb9-c12e857c299c", - "TargetSlotId": "d331b1f7-3ec3-4dc3-a019-ef72d86b3a98" - }, { "SourceParentOrChildId": "e1b3b07a-4337-4a21-8cd3-c1cf80e5938e", "SourceSlotId": "f83f1835-477e-4bb6-93f0-14bf273b8e94", @@ -420,12 +438,6 @@ "SourceSlotId": "b73347d9-9d9f-4929-b9df-e2d6db722856", "TargetParentOrChildId": "dfab703d-1920-4afa-b790-0ea773124b58", "TargetSlotId": "dcd066ce-ac44-4e76-85b3-78821245d9dc" - }, - { - "SourceParentOrChildId": "e1b3b07a-4337-4a21-8cd3-c1cf80e5938e", - "SourceSlotId": "f83f1835-477e-4bb6-93f0-14bf273b8e94", - "TargetParentOrChildId": "f5c5240e-595d-476d-84af-6a13985d883b", - "TargetSlotId": "3ee710be-8954-431b-8d3a-38f7f03f0f02" } ] } \ No newline at end of file diff --git a/Operators/Types/lib/3d/gizmo/SphereGizmo_1998f949-5c0a-4f39-82cf-b0bda31f7f21.t3ui b/Operators/Types/lib/3d/gizmo/SphereGizmo_1998f949-5c0a-4f39-82cf-b0bda31f7f21.t3ui index c0a20cb8d6..0f60ee0910 100644 --- a/Operators/Types/lib/3d/gizmo/SphereGizmo_1998f949-5c0a-4f39-82cf-b0bda31f7f21.t3ui +++ b/Operators/Types/lib/3d/gizmo/SphereGizmo_1998f949-5c0a-4f39-82cf-b0bda31f7f21.t3ui @@ -27,8 +27,8 @@ { "ChildId": "d6156f1a-7196-43ff-bc78-d4f3386ca269"/*RadialPoints*/, "Position": { - "X": 308.46332, - "Y": 45.74582 + "X": 439.16174, + "Y": -49.76834 } }, { @@ -45,53 +45,25 @@ "Y": 46.40672 } }, - { - "ChildId": "2ae320c3-1cf4-441d-80d1-10ef04deee06"/*_AppendPoints*/, - "Position": { - "X": 454.50946, - "Y": 39.14827 - } - }, - { - "ChildId": "515c4a57-7b2a-4635-aed4-70b93d632015"/*RadialPoints*/, - "Position": { - "X": 308.46332, - "Y": 101.74581 - } - }, - { - "ChildId": "f5c5240e-595d-476d-84af-6a13985d883b"/*RadialPoints*/, - "Position": { - "X": 308.46332, - "Y": 157.74579 - } - }, - { - "ChildId": "c7ee0eff-bc7f-40e0-8fb9-c12e857c299c"/*_AppendPoints*/, - "Position": { - "X": 594.20966, - "Y": 86.77962 - } - }, { "ChildId": "e1b3b07a-4337-4a21-8cd3-c1cf80e5938e"/*Value*/, "Position": { - "X": 129.55092, - "Y": 172.41403 + "X": 289.16174, + "Y": -49.76834 } }, { "ChildId": "dfab703d-1920-4afa-b790-0ea773124b58"/*Transform*/, "Position": { "X": 968.33203, - "Y": 79.38623 + "Y": 44.489502 } }, { "ChildId": "379b4030-26d4-4e46-bf03-5d4786e09a3e"/*Execute*/, "Position": { - "X": 1098.332, - "Y": 79.38623 + "X": 1118.332, + "Y": 44.489502 } }, { @@ -111,8 +83,8 @@ { "ChildId": "40cd90cb-39c3-4b04-8c84-f537f0e2d0b4"/*Transform*/, "Position": { - "X": 1228.332, - "Y": 79.38623 + "X": 1248.332, + "Y": 44.489502 } }, { @@ -123,17 +95,38 @@ } }, { - "ChildId": "9c7ef3a0-6a86-4382-b0e9-42c845d4554b"/*Locator*/, + "ChildId": "e8a92c99-a038-4007-96de-71bc23df9c52"/*RadialPoints*/, + "Position": { + "X": 289.16174, + "Y": -198.76834 + } + }, + { + "ChildId": "7a86c7c3-0c4d-49d1-aff9-4b8588c97fa2"/*CombineBuffers*/, + "Position": { + "X": 439.16174, + "Y": -198.76834 + } + }, + { + "ChildId": "3468be00-ddba-4254-b1ef-b91dbf68fe3b"/*RepeatAtGPoints*/, + "Position": { + "X": 589.16174, + "Y": -198.76834 + } + }, + { + "ChildId": "ccbc6ed6-4e96-4ca0-af3a-b9475588dc33"/*RadialPoints*/, "Position": { - "X": 657.8304, - "Y": 485.5435 + "X": 289.16174, + "Y": -155.76834 } }, { - "ChildId": "9c6603cf-724b-43ac-9324-92b520d71150"/*VisibleGizmos*/, + "ChildId": "29e347ee-bf81-49b5-9e45-4853727fd6f4"/*LinePoints*/, "Position": { - "X": 1418.3094, - "Y": 161.45782 + "X": 289.16174, + "Y": -112.76834 } } ], diff --git a/Operators/Types/lib/3d/gizmo/VisualizePoints_37bdbafc-d14c-4b81-91c3-8f63c3b63812.t3 b/Operators/Types/lib/3d/gizmo/VisualizePoints_37bdbafc-d14c-4b81-91c3-8f63c3b63812.t3 index b0be8a46e2..981ef54e89 100644 --- a/Operators/Types/lib/3d/gizmo/VisualizePoints_37bdbafc-d14c-4b81-91c3-8f63c3b63812.t3 +++ b/Operators/Types/lib/3d/gizmo/VisualizePoints_37bdbafc-d14c-4b81-91c3-8f63c3b63812.t3 @@ -42,7 +42,7 @@ }, { "Id": "40a04de8-54aa-4f66-acea-80ffc4dab7bd"/*PointSize*/, - "DefaultValue": 0.005 + "DefaultValue": 0.003 }, { "Id": "f6942098-3f69-41fb-9228-96bd2ffb1cbf"/*UseWForSize*/, @@ -647,8 +647,8 @@ "Id": "cc442161-e9ca-40ea-be3b-f87189d4e155"/*Color*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.9029126, - "Y": 0.0, + "X": 0.9843895, + "Y": 0.5335398, "Z": 1.0, "W": 1.0 } @@ -656,7 +656,7 @@ { "Id": "414c8045-5086-4449-9d9a-03f28c3966b3"/*Size*/, "Type": "System.Single", - "Value": 0.06 + "Value": 0.029 }, { "Id": "7acc95ad-d317-42fc-97f8-85f48d7e516f"/*EnableZTest*/, diff --git a/Operators/Types/lib/3d/mesh/_/VisualizeMesh_f8b12b4f-c10b-4e8b-9a69-344dbe8a063e.t3 b/Operators/Types/lib/3d/mesh/_/VisualizeMesh_f8b12b4f-c10b-4e8b-9a69-344dbe8a063e.t3 index 2ff27d9842..e29a1a4a53 100644 --- a/Operators/Types/lib/3d/mesh/_/VisualizeMesh_f8b12b4f-c10b-4e8b-9a69-344dbe8a063e.t3 +++ b/Operators/Types/lib/3d/mesh/_/VisualizeMesh_f8b12b4f-c10b-4e8b-9a69-344dbe8a063e.t3 @@ -36,7 +36,7 @@ "X": 0.75892043, "Y": 0.927727, "Z": 1.0, - "W": 0.73 + "W": 0.62 } }, { @@ -55,9 +55,9 @@ "Id": "8c9dee45-d165-48c8-b8dd-b7f47e77fd00"/*Color*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.8, + "X": 1.0, "Y": 0.0, - "Z": 0.73779374, + "Z": 0.92224216, "W": 1.0 } }, @@ -98,16 +98,21 @@ "Id": "c4332cb5-4dbc-4dd1-a738-cee8a3098c17"/*Color*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 1.0, + "X": 0.9665072, "Y": 0.0, - "Z": 0.9202814, + "Z": 0.8894586, "W": 1.0 } }, { "Id": "40a04de8-54aa-4f66-acea-80ffc4dab7bd"/*PointSize*/, "Type": "System.Single", - "Value": 0.005 + "Value": 0.0006 + }, + { + "Id": "f6942098-3f69-41fb-9228-96bd2ffb1cbf"/*UseWForSize*/, + "Type": "System.Boolean", + "Value": false } ], "Outputs": [] diff --git a/Operators/Types/lib/3d/mesh/modify/RecomputeNormals_68e0d0cb-1e57-4e9c-9f22-bd7927ddb4c5.t3 b/Operators/Types/lib/3d/mesh/modify/RecomputeNormals_68e0d0cb-1e57-4e9c-9f22-bd7927ddb4c5.t3 index 7b1763a2bc..35da1579f6 100644 --- a/Operators/Types/lib/3d/mesh/modify/RecomputeNormals_68e0d0cb-1e57-4e9c-9f22-bd7927ddb4c5.t3 +++ b/Operators/Types/lib/3d/mesh/modify/RecomputeNormals_68e0d0cb-1e57-4e9c-9f22-bd7927ddb4c5.t3 @@ -109,7 +109,7 @@ { "Id": "e010c56f-ff0b-44b6-bbd9-b50e2ccec2bf"/*A*/, "Type": "System.Int32", - "Value": 8 + "Value": 16 }, { "Id": "e02f9e84-a7bf-45bf-9cb1-0b0c1c396796"/*B*/, diff --git a/Operators/Types/lib/3d/mesh/modify/RecomputeNormals_68e0d0cb-1e57-4e9c-9f22-bd7927ddb4c5.t3ui b/Operators/Types/lib/3d/mesh/modify/RecomputeNormals_68e0d0cb-1e57-4e9c-9f22-bd7927ddb4c5.t3ui index 623ce33ba0..862cf3b0cf 100644 --- a/Operators/Types/lib/3d/mesh/modify/RecomputeNormals_68e0d0cb-1e57-4e9c-9f22-bd7927ddb4c5.t3ui +++ b/Operators/Types/lib/3d/mesh/modify/RecomputeNormals_68e0d0cb-1e57-4e9c-9f22-bd7927ddb4c5.t3ui @@ -6,15 +6,15 @@ "InputId": "b55aeb9b-5286-476a-b8f0-86cb96e41310"/*InputMesh*/, "Relevancy": "Required", "Position": { - "X": -462.8841, - "Y": 1515.7004 + "X": -142.75635, + "Y": 1687.4246 } }, { "InputId": "fd3f8225-3d33-40d3-af15-ae768e2c67ad"/*RecomputeIndices*/, "Position": { - "X": -490.75208, - "Y": 1721.3334 + "X": -170.62433, + "Y": 1893.0575 } } ], @@ -57,8 +57,8 @@ { "ChildId": "d9a56ba8-96d0-4a9b-9c09-bc1174b1ba23"/*vertices*/, "Position": { - "X": 132.45526, - "Y": 1469.268 + "X": 452.583, + "Y": 1640.9921 } }, { @@ -71,8 +71,8 @@ { "ChildId": "adaec98b-49cf-416c-9e5a-d00b341eb190"/*_MeshBufferComponents*/, "Position": { - "X": -206.5777, - "Y": 1490.2572 + "X": 113.55005, + "Y": 1661.9813 } }, { @@ -104,8 +104,8 @@ { "ChildId": "9a6202d0-c69b-4a4e-9473-f7a533c01475"/*faces*/, "Position": { - "X": 133.97473, - "Y": 1567.8145 + "X": 454.10248, + "Y": 1739.5386 } }, { diff --git a/Operators/Types/lib/img/fx/FluidFeedback.cs b/Operators/Types/lib/img/fx/FluidFeedback.cs index cb5bc60ec8..2a0121b4e5 100644 --- a/Operators/Types/lib/img/fx/FluidFeedback.cs +++ b/Operators/Types/lib/img/fx/FluidFeedback.cs @@ -46,6 +46,9 @@ public class FluidFeedback : Instance [Input(Guid = "1f09da31-b853-417c-abb1-39e1199a149f")] public readonly InputSlot IsEnabled = new InputSlot(); + [Input(Guid = "51621e59-9bdd-4004-a053-d4637278bd92")] + public readonly InputSlot Reset = new InputSlot(); + } } diff --git a/Operators/Types/lib/img/fx/FluidFeedback_f9d453d1-04d9-43ef-9189-50008f93bcc2.t3 b/Operators/Types/lib/img/fx/FluidFeedback_f9d453d1-04d9-43ef-9189-50008f93bcc2.t3 index a6efedc6ca..ab7b18c60b 100644 --- a/Operators/Types/lib/img/fx/FluidFeedback_f9d453d1-04d9-43ef-9189-50008f93bcc2.t3 +++ b/Operators/Types/lib/img/fx/FluidFeedback_f9d453d1-04d9-43ef-9189-50008f93bcc2.t3 @@ -49,6 +49,10 @@ { "Id": "1f09da31-b853-417c-abb1-39e1199a149f"/*IsEnabled*/, "DefaultValue": true + }, + { + "Id": "51621e59-9bdd-4004-a053-d4637278bd92"/*Reset*/, + "DefaultValue": false } ], "Children": [ @@ -293,6 +297,40 @@ "SymbolId": "a18ae2d3-1735-40b8-bebb-65a6788bc872", "InputValues": [], "Outputs": [] + }, + { + "Id": "0854ce4c-ce43-4101-8e22-5f0b6f9b6668"/*BoolToInt*/, + "SymbolId": "cd43942a-887e-4e34-bc54-0c2e5e8bc2af", + "InputValues": [ + { + "Id": "cbbb6b8a-0dc9-4a85-8abc-e4c9c1c9c8be"/*ResultForTrue*/, + "Type": "System.Int32", + "Value": 2 + } + ], + "Outputs": [] + }, + { + "Id": "7e785aab-3484-4640-8180-6729fe84d190"/*Layer2d*/, + "SymbolId": "d8c5330f-59b5-4907-b845-a02def3042fa", + "InputValues": [ + { + "Id": "1d9ccc5d-bed4-4d07-b664-0903442e4f58"/*ScaleMode*/, + "Type": "System.Int32", + "Value": 3 + }, + { + "Id": "ed4f8c30-7b71-4649-97e6-710a718039b0"/*Color*/, + "Type": "System.Numerics.Vector4", + "Value": { + "X": 0.0, + "Y": 0.0, + "Z": 0.0, + "W": 1.0 + } + } + ], + "Outputs": [] } ], "Connections": [ @@ -302,6 +340,18 @@ "TargetParentOrChildId": "00000000-0000-0000-0000-000000000000", "TargetSlotId": "b9baba42-18b6-4792-929d-bf628ce8a488" }, + { + "SourceParentOrChildId": "7baf81a5-67a6-4a1c-baa0-16551401ba2b", + "SourceSlotId": "b0cfa6f9-3c3d-4499-b21a-5904d1cb3bd7", + "TargetParentOrChildId": "0854ce4c-ce43-4101-8e22-5f0b6f9b6668", + "TargetSlotId": "9b64f287-d14a-493e-a1c7-dcbcdc703849" + }, + { + "SourceParentOrChildId": "00000000-0000-0000-0000-000000000000", + "SourceSlotId": "51621e59-9bdd-4004-a053-d4637278bd92", + "TargetParentOrChildId": "0854ce4c-ce43-4101-8e22-5f0b6f9b6668", + "TargetSlotId": "c644165f-3901-4dbf-8091-05f958e668e5" + }, { "SourceParentOrChildId": "b47840dc-b5f2-42cc-b69e-5564f1ad74bd", "SourceSlotId": "7e846b2f-1d1a-4bfd-bbc8-d71aaaf9b5d4", @@ -393,7 +443,7 @@ "TargetSlotId": "af89954f-9f79-4782-95ab-f40bb50339c8" }, { - "SourceParentOrChildId": "7baf81a5-67a6-4a1c-baa0-16551401ba2b", + "SourceParentOrChildId": "0854ce4c-ce43-4101-8e22-5f0b6f9b6668", "SourceSlotId": "b0cfa6f9-3c3d-4499-b21a-5904d1cb3bd7", "TargetParentOrChildId": "afd5fce9-a50b-4fd3-aa4e-ce62adf95ce9", "TargetSlotId": "00fd2794-567a-4f9b-a900-c2ebf9760764" @@ -410,6 +460,12 @@ "TargetParentOrChildId": "afd5fce9-a50b-4fd3-aa4e-ce62adf95ce9", "TargetSlotId": "988dd1b5-636d-4a78-9592-2c6601401cc1" }, + { + "SourceParentOrChildId": "7e785aab-3484-4640-8180-6729fe84d190", + "SourceSlotId": "e4a8d926-7abd-4d2a-82a1-b7d140cb457f", + "TargetParentOrChildId": "afd5fce9-a50b-4fd3-aa4e-ce62adf95ce9", + "TargetSlotId": "988dd1b5-636d-4a78-9592-2c6601401cc1" + }, { "SourceParentOrChildId": "00000000-0000-0000-0000-000000000000", "SourceSlotId": "a7669abe-65c7-4745-97a6-d0d80f6a3150", diff --git a/Operators/Types/lib/img/fx/FluidFeedback_f9d453d1-04d9-43ef-9189-50008f93bcc2.t3ui b/Operators/Types/lib/img/fx/FluidFeedback_f9d453d1-04d9-43ef-9189-50008f93bcc2.t3ui index 221d794ece..9732b41ef8 100644 --- a/Operators/Types/lib/img/fx/FluidFeedback_f9d453d1-04d9-43ef-9189-50008f93bcc2.t3ui +++ b/Operators/Types/lib/img/fx/FluidFeedback_f9d453d1-04d9-43ef-9189-50008f93bcc2.t3ui @@ -99,6 +99,13 @@ "X": -254.34756, "Y": 421.9679 } + }, + { + "InputId": "51621e59-9bdd-4004-a053-d4637278bd92"/*Reset*/, + "Position": { + "X": -254.34756, + "Y": 466.9679 + } } ], "SymbolChildUis": [ @@ -204,6 +211,20 @@ "X": 518.66, "Y": 46.768646 } + }, + { + "ChildId": "0854ce4c-ce43-4101-8e22-5f0b6f9b6668"/*BoolToInt*/, + "Position": { + "X": 818.66, + "Y": 46.768646 + } + }, + { + "ChildId": "7e785aab-3484-4640-8180-6729fe84d190"/*Layer2d*/, + "Position": { + "X": 1036.7205, + "Y": 206.65576 + } } ], "OutputUis": [ diff --git a/Operators/Types/lib/io/input/MouseInput.cs b/Operators/Types/lib/io/input/MouseInput.cs index a7674446ac..b1e20b52dc 100644 --- a/Operators/Types/lib/io/input/MouseInput.cs +++ b/Operators/Types/lib/io/input/MouseInput.cs @@ -11,14 +11,18 @@ namespace T3.Operators.Types.Id_eff2ffff_dc39_4b90_9b1c_3c0a9a0108c6 public class MouseInput : Instance { [Output(Guid = "CDC87CE1-FAB8-4B96-9137-9965E064BFA3", DirtyFlagTrigger = DirtyFlagTrigger.Animated)] - public readonly Slot Position = new Slot(); + public readonly Slot Position = new(); [Output(Guid = "78CAABCF-9C3B-4E50-9D80-BDCBABAEB003", DirtyFlagTrigger = DirtyFlagTrigger.Animated)] - public readonly Slot IsLeftButtonDown = new Slot(); + public readonly Slot IsLeftButtonDown = new(); + [Output(Guid = "BE90EED3-26BF-4DC3-9771-073C04D359BC", DirtyFlagTrigger = DirtyFlagTrigger.Animated)] + public readonly Slot Position3d = new(); + public MouseInput() { Position.UpdateAction = Update; + Position3d.UpdateAction = Update; IsLeftButtonDown.UpdateAction = Update; } @@ -34,11 +38,16 @@ private void Update(EvaluationContext context) { case OutputModes.Normalized: Position.Value = lastPosition; + Position3d.Value = new Vector3(lastPosition.X, lastPosition.Y, 0).ToNumerics(); break; case OutputModes.SignedPosition: Position.Value = (lastPosition - new Vector2(0.5f, 0.5f)) * new Vector2(aspectRatio, -1) * scale; + Position3d.Value = new Vector3(lastPosition.X, lastPosition.Y, 0).ToNumerics(); break; case OutputModes.OnWorldXYPlane: + case OutputModes.OnWorldFloorPlane: + { + var clipSpaceToWorld = ComposeClipSpaceToWorld(context); var cameraToWorld = context.WorldToCamera; cameraToWorld.Invert(); @@ -47,17 +56,24 @@ private void Update(EvaluationContext context) var posInWorld = Vector3.TransformCoordinate(new Vector3(posInClip.X, posInClip.Y, 0f), clipSpaceToWorld); var targetInWorld = Vector3.TransformCoordinate(new Vector3(posInClip.X, posInClip.Y, 1f), clipSpaceToWorld); var ray = new SharpDX.Ray(posInWorld, targetInWorld - posInWorld); - var xyPlane = new Plane(SharpDX.Vector3.Zero, SharpDX.Vector3.UnitZ); + + var xyPlaneName = mode == OutputModes.OnWorldXYPlane ? SharpDX.Vector3.UnitZ : SharpDX.Vector3.UnitY; + var xyPlane = new Plane(SharpDX.Vector3.Zero, xyPlaneName); if (xyPlane.Intersects(ref ray, out SharpDX.Vector3 p)) { Position.Value = new Vector2(p.X, p.Y) ; + Position3d.Value = p.ToNumerics(); } break; + } default: throw new ArgumentOutOfRangeException(nameof(mode)); } IsLeftButtonDown.Value = Core.IO.MouseInput.IsLeftButtonDown; + Position3d.DirtyFlag.Clear(); + Position.DirtyFlag.Clear(); + IsLeftButtonDown.DirtyFlag.Clear(); } private static Matrix ComposeClipSpaceToWorld(EvaluationContext context) @@ -73,7 +89,7 @@ private static Matrix ComposeClipSpaceToWorld(EvaluationContext context) } [Input(Guid = "49775CC2-35B7-4C9F-A502-59FE8FBBE2A7")] - public readonly InputSlot DoUpdate = new InputSlot(); + public readonly InputSlot DoUpdate = new(); [Input(Guid = "1327525C-716C-43E4-A5D1-58CF35440462", MappedType = typeof(OutputModes))] public readonly InputSlot OutputMode = new(); @@ -86,6 +102,7 @@ private enum OutputModes Normalized, SignedPosition, OnWorldXYPlane, + OnWorldFloorPlane } } } \ No newline at end of file diff --git a/Operators/Types/lib/io/input/MouseInput_eff2ffff-dc39-4b90-9b1c-3c0a9a0108c6.t3ui b/Operators/Types/lib/io/input/MouseInput_eff2ffff-dc39-4b90-9b1c-3c0a9a0108c6.t3ui index 2531a0729e..fe2a807b8d 100644 --- a/Operators/Types/lib/io/input/MouseInput_eff2ffff-dc39-4b90-9b1c-3c0a9a0108c6.t3ui +++ b/Operators/Types/lib/io/input/MouseInput_eff2ffff-dc39-4b90-9b1c-3c0a9a0108c6.t3ui @@ -39,6 +39,13 @@ "X": 0.0, "Y": 0.0 } + }, + { + "OutputId": "be90eed3-26bf-4dc3-9771-073c04d359bc"/*Position3d*/, + "Position": { + "X": 0.0, + "Y": 100.0 + } } ] } \ No newline at end of file diff --git a/Operators/Types/lib/io/time/vj/GetBpm.cs b/Operators/Types/lib/io/time/vj/GetBpm.cs new file mode 100644 index 0000000000..4578252071 --- /dev/null +++ b/Operators/Types/lib/io/time/vj/GetBpm.cs @@ -0,0 +1,37 @@ +using System; +using System.Diagnostics; +using T3.Core; +using T3.Core.Animation; +using T3.Core.DataTypes; +using T3.Core.Logging; +using T3.Core.Operator; +using T3.Core.Operator.Attributes; +using T3.Core.Operator.Slots; +using T3.Core.Resource; +using T3.Core.Utils; + +namespace T3.Operators.Types.Id_6ae8ebb8_3174_463d_9ffb_e14e12eb3029 +{ + public class GetBpm : Instance + { + [Output(Guid = "551EBFF2-2044-4F28-A6BA-2384A74C8919")] + public readonly Slot Result = new(); + + public GetBpm() + { + Result.UpdateAction = Update; + } + + private void Update(EvaluationContext context) + { + + if (Playback.Current == null) + { + Log.Warning("Can't get BPM rate without value playback", this); + return; + } + + Result.Value = (float)Playback.Current.Bpm; + } + } +} \ No newline at end of file diff --git a/Operators/Types/lib/io/time/vj/GetBpm_6ae8ebb8-3174-463d-9ffb-e14e12eb3029.t3 b/Operators/Types/lib/io/time/vj/GetBpm_6ae8ebb8-3174-463d-9ffb-e14e12eb3029.t3 new file mode 100644 index 0000000000..2162deb86f --- /dev/null +++ b/Operators/Types/lib/io/time/vj/GetBpm_6ae8ebb8-3174-463d-9ffb-e14e12eb3029.t3 @@ -0,0 +1,8 @@ +{ + "Name": "GetBpm", + "Id": "6ae8ebb8-3174-463d-9ffb-e14e12eb3029", + "Namespace": "lib.io.time.vj", + "Inputs": [], + "Children": [], + "Connections": [] +} \ No newline at end of file diff --git a/Operators/Types/lib/io/time/vj/GetBpm_6ae8ebb8-3174-463d-9ffb-e14e12eb3029.t3ui b/Operators/Types/lib/io/time/vj/GetBpm_6ae8ebb8-3174-463d-9ffb-e14e12eb3029.t3ui new file mode 100644 index 0000000000..c995b16767 --- /dev/null +++ b/Operators/Types/lib/io/time/vj/GetBpm_6ae8ebb8-3174-463d-9ffb-e14e12eb3029.t3ui @@ -0,0 +1,15 @@ +{ + "Id": "6ae8ebb8-3174-463d-9ffb-e14e12eb3029"/*GetBpm*/, + "Description": "Returns the current BPM rate", + "InputUis": [], + "SymbolChildUis": [], + "OutputUis": [ + { + "OutputId": "551ebff2-2044-4f28-a6ba-2384a74c8919"/*Result*/, + "Position": { + "X": 300.0, + "Y": 200.0 + } + } + ] +} \ No newline at end of file diff --git a/Operators/Types/lib/point/combine/PairPointsForSplines.cs b/Operators/Types/lib/point/combine/PairPointsForSplines.cs index fc5d650008..8641be67b9 100644 --- a/Operators/Types/lib/point/combine/PairPointsForSplines.cs +++ b/Operators/Types/lib/point/combine/PairPointsForSplines.cs @@ -37,6 +37,9 @@ public class PairPointsForSplines : Instance [Input(Guid = "b286781b-e808-40c3-8193-fbcc8215d534")] public readonly InputSlot TangentB_WFactor = new InputSlot(); + + [Input(Guid = "b59c4f08-b0e8-4ba5-bbb5-eb5c04278943")] + public readonly InputSlot Debug = new InputSlot(); } } diff --git a/Operators/Types/lib/point/combine/PairPointsForSplines_5c7b6f3e-d3d5-4cfa-b30e-1a8cb6dbb4ad.t3 b/Operators/Types/lib/point/combine/PairPointsForSplines_5c7b6f3e-d3d5-4cfa-b30e-1a8cb6dbb4ad.t3 index 1c26a1b958..04098f386d 100644 --- a/Operators/Types/lib/point/combine/PairPointsForSplines_5c7b6f3e-d3d5-4cfa-b30e-1a8cb6dbb4ad.t3 +++ b/Operators/Types/lib/point/combine/PairPointsForSplines_5c7b6f3e-d3d5-4cfa-b30e-1a8cb6dbb4ad.t3 @@ -42,6 +42,10 @@ { "Id": "b286781b-e808-40c3-8193-fbcc8215d534"/*TangentB_WFactor*/, "DefaultValue": 0.0 + }, + { + "Id": "b59c4f08-b0e8-4ba5-bbb5-eb5c04278943"/*Debug*/, + "DefaultValue": 0.0 } ], "Children": [ @@ -356,6 +360,12 @@ "TargetParentOrChildId": "9b4491c9-d84e-4341-922e-69e71dcca8a9", "TargetSlotId": "49556d12-4cd1-4341-b9d8-c356668d296c" }, + { + "SourceParentOrChildId": "00000000-0000-0000-0000-000000000000", + "SourceSlotId": "b59c4f08-b0e8-4ba5-bbb5-eb5c04278943", + "TargetParentOrChildId": "9b4491c9-d84e-4341-922e-69e71dcca8a9", + "TargetSlotId": "49556d12-4cd1-4341-b9d8-c356668d296c" + }, { "SourceParentOrChildId": "d833bd20-6e8a-4d86-a09f-bad0338cb220", "SourceSlotId": "a6fe06e0-b6a9-463c-9e62-930c58b0a0a1", diff --git a/Operators/Types/lib/point/combine/PairPointsForSplines_5c7b6f3e-d3d5-4cfa-b30e-1a8cb6dbb4ad.t3ui b/Operators/Types/lib/point/combine/PairPointsForSplines_5c7b6f3e-d3d5-4cfa-b30e-1a8cb6dbb4ad.t3ui index c887a8a6e2..11dd0980d4 100644 --- a/Operators/Types/lib/point/combine/PairPointsForSplines_5c7b6f3e-d3d5-4cfa-b30e-1a8cb6dbb4ad.t3ui +++ b/Operators/Types/lib/point/combine/PairPointsForSplines_5c7b6f3e-d3d5-4cfa-b30e-1a8cb6dbb4ad.t3ui @@ -66,6 +66,13 @@ "X": -1056.4153, "Y": 1277.1256 } + }, + { + "InputId": "b59c4f08-b0e8-4ba5-bbb5-eb5c04278943"/*Debug*/, + "Position": { + "X": -1056.4153, + "Y": 1322.1256 + } } ], "SymbolChildUis": [ diff --git a/Operators/Types/lib/point/draw/DrawLines_836f211f-b387-417c-8316-658e0dc6e117.t3ui b/Operators/Types/lib/point/draw/DrawLines_836f211f-b387-417c-8316-658e0dc6e117.t3ui index 1799f9780b..dd946d8975 100644 --- a/Operators/Types/lib/point/draw/DrawLines_836f211f-b387-417c-8316-658e0dc6e117.t3ui +++ b/Operators/Types/lib/point/draw/DrawLines_836f211f-b387-417c-8316-658e0dc6e117.t3ui @@ -168,8 +168,8 @@ "Y": 287.37302 }, "Position": { - "X": 1345.6085, - "Y": 1046.331 + "X": 1156.8243, + "Y": 203.26685 } }, { diff --git a/Operators/Types/lib/point/generate/APoint.cs b/Operators/Types/lib/point/generate/APoint.cs index 68a356502e..9e670657a1 100644 --- a/Operators/Types/lib/point/generate/APoint.cs +++ b/Operators/Types/lib/point/generate/APoint.cs @@ -1,10 +1,12 @@ using System; -using T3.Core; +using SharpDX; using T3.Core.DataTypes; using T3.Core.Operator; using T3.Core.Operator.Attributes; using T3.Core.Operator.Interfaces; using T3.Core.Operator.Slots; +using SharpDX.Direct3D11; +using T3.Core.Logging; using T3.Core.Resource; using T3.Core.Utils; using Point = T3.Core.DataTypes.Point; @@ -15,15 +17,19 @@ namespace T3.Operators.Types.Id_9989f539_f86c_4508_83d7_3fc0e559f502 { public class APoint : Instance, ITransformable { + [Output(Guid = "5915D7E2-054D-4917-86BD-25AD1BEB1754")] + public readonly Slot Buffer = new(); + [Output(Guid = "D9C04756-8922-496D-8380-120F280EF65B")] public readonly Slot ResultList = new(); [Output(Guid = "8698D60D-8CD9-4A3F-9001-19DAC29028CC")] public readonly Slot OutPosition = new(); + public APoint() { - //ResultList.TransformableOp = this; + Buffer.UpdateAction = UpdateWithBuffer; ResultList.UpdateAction = Update; OutPosition.UpdateAction = Update; _pointListWithSeparator.TypedElements[1] = Point.Separator(); @@ -35,16 +41,23 @@ public APoint() public Action TransformCallback { get; set; } + private void UpdateWithBuffer(EvaluationContext context) + { + Update(context); + UpdateBuffer(); + Buffer.Value = _bufferWithViews; + } + private void Update(EvaluationContext context) { TransformCallback?.Invoke(this, context); var from = Position.GetValue(context); var w = W.GetValue(context); - var addSeparator = AddSeparator.GetValue(context); + _addSeparator = AddSeparator.GetValue(context); var rot = Quaternion.CreateFromAxisAngle(Vector3.Normalize( RotationAxis.GetValue(context)), RotationAngle.GetValue(context) * MathUtils.ToRad); - var array = addSeparator ? _pointListWithSeparator : _pointList; + var array = _addSeparator ? _pointListWithSeparator : _pointList; OutPosition.Value = from; array.TypedElements[0].Position = from; array.TypedElements[0].W = w; @@ -55,24 +68,55 @@ private void Update(EvaluationContext context) OutPosition.DirtyFlag.Clear(); } - private readonly StructuredList _pointListWithSeparator = new StructuredList(2); - private readonly StructuredList _pointList = new StructuredList(1); - //private readonly Point Separator; + private void UpdateBuffer() + { + var source = _addSeparator ? _pointListWithSeparator : _pointList; + var sizeChanged = _buffer == null || _buffer.Description.SizeInBytes != source.TotalSizeInBytes; + + using (var data = new DataStream(source.TotalSizeInBytes, true, true)) + { + data.Position = 0; + source.WriteToStream(data); + + try + { + ResourceManager.SetupStructuredBuffer(data, source.TotalSizeInBytes, Point.Stride, ref _buffer); + } + catch (Exception e) + { + Log.Error("Failed to setup structured buffer " + e.Message, this); + return; + } + } + + if (sizeChanged) + { + ResourceManager.CreateStructuredBufferSrv(_buffer, ref _bufferWithViews.Srv); + ResourceManager.CreateStructuredBufferUav(_buffer, UnorderedAccessViewBufferFlags.None, ref _bufferWithViews.Uav); + } + } + private readonly StructuredList _pointListWithSeparator = new(2); + private readonly StructuredList _pointList = new(1); + + private SharpDX.Direct3D11.Buffer _buffer; + private readonly BufferWithViews _bufferWithViews = new(); + private bool _addSeparator; + [Input(Guid = "a0a453db-d8f1-415a-9a98-3c88a25b15e7")] - public readonly InputSlot Position = new InputSlot(); + public readonly InputSlot Position = new(); [Input(Guid = "55a3370f-1768-414f-b38d-4accc5e93914")] - public readonly InputSlot RotationAxis = new InputSlot(); + public readonly InputSlot RotationAxis = new(); [Input(Guid = "E9859381-EB88-4856-91C5-60D30AC6035A")] - public readonly InputSlot RotationAngle = new InputSlot(); + public readonly InputSlot RotationAngle = new(); [Input(Guid = "2d7d85ce-7b5e-4e86-bae2-88a7c4f7a2e5")] - public readonly InputSlot W = new InputSlot(); + public readonly InputSlot W = new(); [Input(Guid = "53CDE701-435F-42E4-B598-DB0E607A238C")] - public readonly InputSlot AddSeparator = new InputSlot(); + public readonly InputSlot AddSeparator = new(); } } \ No newline at end of file diff --git a/Operators/Types/lib/point/generate/APoint_9989f539-f86c-4508-83d7-3fc0e559f502.t3ui b/Operators/Types/lib/point/generate/APoint_9989f539-f86c-4508-83d7-3fc0e559f502.t3ui index bf390794e5..5982f8454a 100644 --- a/Operators/Types/lib/point/generate/APoint_9989f539-f86c-4508-83d7-3fc0e559f502.t3ui +++ b/Operators/Types/lib/point/generate/APoint_9989f539-f86c-4508-83d7-3fc0e559f502.t3ui @@ -56,6 +56,13 @@ "X": 0.0, "Y": 100.0 } + }, + { + "OutputId": "5915d7e2-054d-4917-86bd-25ad1beb1754"/*Buffer*/, + "Position": { + "X": 0.0, + "Y": 200.0 + } } ], "Links": [ diff --git a/Operators/Types/lib/point/modify/SelectPoints_371d72b8-69d4-4ced-beda-271386ad2fd6.t3 b/Operators/Types/lib/point/modify/SelectPoints_371d72b8-69d4-4ced-beda-271386ad2fd6.t3 index 6168d1bc16..0c849be062 100644 --- a/Operators/Types/lib/point/modify/SelectPoints_371d72b8-69d4-4ced-beda-271386ad2fd6.t3 +++ b/Operators/Types/lib/point/modify/SelectPoints_371d72b8-69d4-4ced-beda-271386ad2fd6.t3 @@ -73,7 +73,7 @@ }, { "Id": "62119baf-5e02-4d2e-82bb-f82a149ccfb7"/*Visibility*/, - "DefaultValue": "Inherit" + "DefaultValue": "IfSelected" } ], "Children": [ @@ -264,8 +264,8 @@ "Type": "System.Numerics.Vector4", "Value": { "X": 1.0, - "Y": 0.39803028, - "Z": 0.40188813, + "Y": 0.49, + "Z": 0.249, "W": 0.15 } } @@ -295,6 +295,298 @@ "SymbolId": "9db2fcbf-54b9-4222-878b-80d1a0dc6edf", "InputValues": [], "Outputs": [] + }, + { + "Id": "f5acc3fb-dd9d-44b0-8de6-f0933f434b70"/*Switch*/, + "SymbolId": "e64f95e4-c045-400f-98ca-7c020ad46174", + "InputValues": [], + "Outputs": [] + }, + { + "Id": "dfb513d5-31f9-45df-85e2-157e13369d65"/*SphereGizmo*/, + "SymbolId": "1998f949-5c0a-4f39-82cf-b0bda31f7f21", + "InputValues": [ + { + "Id": "15f73f4f-a4f1-4ff0-aba5-074ea2d328bc"/*Radius*/, + "Type": "System.Single", + "Value": 0.5 + }, + { + "Id": "188c2244-e55a-4c55-be93-cccbd6fd4e41"/*Color*/, + "Type": "System.Numerics.Vector4", + "Value": { + "X": 1.0, + "Y": 0.49, + "Z": 0.249, + "W": 0.15 + } + }, + { + "Id": "a407fbe3-1f1b-4466-b4c2-511733046d00"/*InnerRadius*/, + "Type": "System.Single", + "Value": 0.64 + } + ], + "Outputs": [] + }, + { + "Id": "574a29a7-bdef-4aa7-bc88-e54ad6631997"/*CommonPointSets*/, + "SymbolId": "353f63fc-e613-43ca-b037-02d7b9f4e935", + "InputValues": [ + { + "Id": "2ba96aee-ff89-41bd-90c5-c6c36907b6e4"/*Set*/, + "Type": "System.Int32", + "Value": 3 + } + ], + "Outputs": [] + }, + { + "Id": "64829ae9-ea40-4e28-ad54-658d22e60b8b"/*DrawLines*/, + "SymbolId": "836f211f-b387-417c-8316-658e0dc6e117", + "InputValues": [ + { + "Id": "75419a73-8a3e-4538-9a1d-e3b0ce7f8561"/*Color*/, + "Type": "System.Numerics.Vector4", + "Value": { + "X": 1.0, + "Y": 0.49, + "Z": 0.249, + "W": 0.15 + } + } + ], + "Outputs": [] + }, + { + "Id": "29252b0a-45d5-44bf-9ac3-b60389e0e630"/*TransformPoints*/, + "SymbolId": "7f6c64fe-ca2e-445e-a9b4-c70291ce354e", + "InputValues": [ + { + "Id": "454d0150-dac4-41b2-83f8-d1ecc3ef76d4"/*Rotation*/, + "Type": "System.Numerics.Vector3", + "Value": { + "X": 90.0, + "Y": 0.0, + "Z": 0.0 + } + } + ], + "Outputs": [] + }, + { + "Id": "77d555bc-4da7-4a55-bc2f-fb531c546dc1"/*CombineBuffers*/, + "SymbolId": "4dd8a618-eb3b-40af-9851-89c50683d83e", + "InputValues": [], + "Outputs": [] + }, + { + "Id": "33137d70-9d92-46e0-be1b-20c0455197af"/*CommonPointSets*/, + "SymbolId": "353f63fc-e613-43ca-b037-02d7b9f4e935", + "InputValues": [ + { + "Id": "2ba96aee-ff89-41bd-90c5-c6c36907b6e4"/*Set*/, + "Type": "System.Int32", + "Value": 5 + } + ], + "Outputs": [] + }, + { + "Id": "0b077fef-c597-4a2c-a878-e652e1b1ff87"/*TransformPoints*/, + "SymbolId": "7f6c64fe-ca2e-445e-a9b4-c70291ce354e", + "InputValues": [ + { + "Id": "9e803bd1-c5a3-4f6f-926d-d19f32dcbae5"/*Translation*/, + "Type": "System.Numerics.Vector3", + "Value": { + "X": 0.0, + "Y": -0.11, + "Z": 0.0 + } + }, + { + "Id": "523b7acd-d8e7-4473-9ec7-15eec1d795df"/*Stretch*/, + "Type": "System.Numerics.Vector3", + "Value": { + "X": 1.0, + "Y": -1.0, + "Z": 1.0 + } + }, + { + "Id": "a6e5770b-39dc-4d7b-b92e-53302dc89395"/*Scale*/, + "Type": "System.Single", + "Value": 0.2 + } + ], + "Outputs": [] + }, + { + "Id": "7305d9f5-690a-4208-9d78-2fe157eb75ad"/*AColor*/, + "SymbolId": "70176d3c-825c-40b3-8121-a465735518fe", + "InputValues": [ + { + "Id": "03dc1ef1-d75a-4f65-a607-d5dc4de56a2c"/*RGBA*/, + "Type": "System.Numerics.Vector4", + "Value": { + "X": 2.2286868, + "Y": 1.2407514, + "Z": 0.61014766, + "W": 0.23444976 + } + } + ], + "Outputs": [] + }, + { + "Id": "af3fb700-6029-435e-9998-a0f4639cd32a"/*CommonPointSets*/, + "SymbolId": "353f63fc-e613-43ca-b037-02d7b9f4e935", + "InputValues": [ + { + "Id": "2ba96aee-ff89-41bd-90c5-c6c36907b6e4"/*Set*/, + "Type": "System.Int32", + "Value": 2 + } + ], + "Outputs": [] + }, + { + "Id": "37cc7615-c57a-4cc2-9924-b65a74879912"/*TransformPoints*/, + "SymbolId": "7f6c64fe-ca2e-445e-a9b4-c70291ce354e", + "InputValues": [ + { + "Id": "9e803bd1-c5a3-4f6f-926d-d19f32dcbae5"/*Translation*/, + "Type": "System.Numerics.Vector3", + "Value": { + "X": 0.0, + "Y": 0.0, + "Z": 0.0 + } + }, + { + "Id": "523b7acd-d8e7-4473-9ec7-15eec1d795df"/*Stretch*/, + "Type": "System.Numerics.Vector3", + "Value": { + "X": 5.0, + "Y": 0.76, + "Z": 5.0 + } + } + ], + "Outputs": [] + }, + { + "Id": "f6c5c544-3d02-4d6a-89ea-4a77ca3aaade"/*LinePoints*/, + "SymbolId": "4ae9e2f5-7cb3-40b0-a662-0662e8cb7c68", + "InputValues": [ + { + "Id": "951a1792-e607-4595-b211-97be7d27694c"/*Count*/, + "Type": "System.Int32", + "Value": 5 + }, + { + "Id": "6fa2fddb-3b8d-4fda-9ac4-796618aa88d0"/*LengthFactor*/, + "Type": "System.Single", + "Value": 4.0 + }, + { + "Id": "8f439130-529c-42ff-a5c0-255476120f03"/*Direction*/, + "Type": "System.Numerics.Vector3", + "Value": { + "X": 0.0, + "Y": 1.0, + "Z": 0.0 + } + } + ], + "Outputs": [] + }, + { + "Id": "443aa8fb-dfa2-4778-bda1-c3c2d3b31c2d"/*RepeatAtGPoints*/, + "SymbolId": "780edb20-f83f-494c-ab17-7015e2311250", + "InputValues": [ + { + "Id": "9df1f57c-a079-49c1-b537-d8eb08f2d0d3"/*Scale*/, + "Type": "System.Single", + "Value": 0.63 + } + ], + "Outputs": [] + }, + { + "Id": "156c13ba-6b6f-4be7-a43a-fcdfc3e68549"/*DrawLines*/, + "SymbolId": "836f211f-b387-417c-8316-658e0dc6e117", + "InputValues": [ + { + "Id": "75419a73-8a3e-4538-9a1d-e3b0ce7f8561"/*Color*/, + "Type": "System.Numerics.Vector4", + "Value": { + "X": 1.0, + "Y": 0.49, + "Z": 0.249, + "W": 0.15 + } + } + ], + "Outputs": [] + }, + { + "Id": "2b3221ab-4e7d-492c-a7e7-e0860333fab7"/*GridPoints*/, + "SymbolId": "3ee8f66d-68df-43c1-b0eb-407259bf7e86", + "InputValues": [ + { + "Id": "72eda38f-fc49-4b1f-b7c0-97e07bee4f7c"/*CountX*/, + "Type": "System.Int32", + "Value": 5 + }, + { + "Id": "8c46fc72-8960-4247-a5ef-dd38f822f1bb"/*CountY*/, + "Type": "System.Int32", + "Value": 5 + }, + { + "Id": "6de4f08a-5834-4b9b-93e8-8f93fe32164c"/*CountZ*/, + "Type": "System.Int32", + "Value": 5 + }, + { + "Id": "940133dd-4e45-4a78-8b13-8831e30f78b8"/*Scale*/, + "Type": "System.Single", + "Value": 4.0 + } + ], + "Outputs": [] + }, + { + "Id": "0ecf3b4c-a658-4c78-9216-d9cede257733"/*CommonPointSets*/, + "SymbolId": "353f63fc-e613-43ca-b037-02d7b9f4e935", + "InputValues": [ + { + "Id": "2ba96aee-ff89-41bd-90c5-c6c36907b6e4"/*Set*/, + "Type": "System.Int32", + "Value": 0 + } + ], + "Outputs": [] + }, + { + "Id": "a20e1ea7-aaec-4911-bbe3-647fafbc03dd"/*RepeatAtGPoints*/, + "SymbolId": "780edb20-f83f-494c-ab17-7015e2311250", + "InputValues": [ + { + "Id": "9df1f57c-a079-49c1-b537-d8eb08f2d0d3"/*Scale*/, + "Type": "System.Single", + "Value": 0.05 + } + ], + "Outputs": [] + }, + { + "Id": "bf61bf53-57f6-4ebe-85e1-e2874432ee84"/*DrawLines*/, + "SymbolId": "836f211f-b387-417c-8316-658e0dc6e117", + "InputValues": [], + "Outputs": [] } ], "Connections": [ @@ -304,6 +596,12 @@ "TargetParentOrChildId": "00000000-0000-0000-0000-000000000000", "TargetSlotId": "d81a0df4-54b4-4587-8f0f-32a740261d73" }, + { + "SourceParentOrChildId": "33137d70-9d92-46e0-be1b-20c0455197af", + "SourceSlotId": "e5dc2cd0-c57f-4e72-9452-e162fe1c37d5", + "TargetParentOrChildId": "0b077fef-c597-4a2c-a878-e652e1b1ff87", + "TargetSlotId": "565ff364-c3d9-4c60-a9a0-79fdd36d3477" + }, { "SourceParentOrChildId": "0af0517c-6e30-4db1-aa2f-849261f5f664", "SourceSlotId": "a6fe06e0-b6a9-463c-9e62-930c58b0a0a1", @@ -316,18 +614,42 @@ "TargetParentOrChildId": "0bde3fbc-a631-4a90-b73c-0182cf3440b8", "TargetSlotId": "f79ccc37-05fd-4f81-97d6-6c1cafca180c" }, + { + "SourceParentOrChildId": "7305d9f5-690a-4208-9d78-2fe157eb75ad", + "SourceSlotId": "fae78369-9db9-4b00-94f2-89e7581db426", + "TargetParentOrChildId": "156c13ba-6b6f-4be7-a43a-fcdfc3e68549", + "TargetSlotId": "75419a73-8a3e-4538-9a1d-e3b0ce7f8561" + }, + { + "SourceParentOrChildId": "443aa8fb-dfa2-4778-bda1-c3c2d3b31c2d", + "SourceSlotId": "3ac76b2a-7b1c-4762-a3f6-50529cd42fa8", + "TargetParentOrChildId": "156c13ba-6b6f-4be7-a43a-fcdfc3e68549", + "TargetSlotId": "e15b6dc7-aaf9-4244-a4b8-4ac13ee7d23f" + }, { "SourceParentOrChildId": "c373b1e2-6c3b-4080-964e-bfe924ccf5a9", "SourceSlotId": "751e97de-c418-48c7-823e-d4660073a559", "TargetParentOrChildId": "223c1ca9-1ab7-4af6-b995-a142eba5090c", "TargetSlotId": "0f9eebb0-6f13-4751-abac-15a467ad56c2" }, + { + "SourceParentOrChildId": "574a29a7-bdef-4aa7-bc88-e54ad6631997", + "SourceSlotId": "e5dc2cd0-c57f-4e72-9452-e162fe1c37d5", + "TargetParentOrChildId": "29252b0a-45d5-44bf-9ac3-b60389e0e630", + "TargetSlotId": "565ff364-c3d9-4c60-a9a0-79fdd36d3477" + }, { "SourceParentOrChildId": "402ba3d9-9139-4b1b-a801-e0072aac01af", "SourceSlotId": "1368ab8e-d75e-429f-8ecd-0944f3ede9ab", "TargetParentOrChildId": "2a86665f-93ea-4516-b27b-876a9289735d", "TargetSlotId": "e79473f4-3fd2-467e-acda-b27ef7dae6a9" }, + { + "SourceParentOrChildId": "af3fb700-6029-435e-9998-a0f4639cd32a", + "SourceSlotId": "e5dc2cd0-c57f-4e72-9452-e162fe1c37d5", + "TargetParentOrChildId": "37cc7615-c57a-4cc2-9924-b65a74879912", + "TargetSlotId": "565ff364-c3d9-4c60-a9a0-79fdd36d3477" + }, { "SourceParentOrChildId": "730dadc2-d447-45af-afed-465165dd49f0", "SourceSlotId": "c382284f-7e37-4eb0-b284-bc735247f26b", @@ -346,6 +668,18 @@ "TargetParentOrChildId": "402ba3d9-9139-4b1b-a801-e0072aac01af", "TargetSlotId": "7a13b834-21e5-4cef-ad5b-23c3770ea763" }, + { + "SourceParentOrChildId": "37cc7615-c57a-4cc2-9924-b65a74879912", + "SourceSlotId": "ba17981e-ef9f-46f1-a653-6d50affa8838", + "TargetParentOrChildId": "443aa8fb-dfa2-4778-bda1-c3c2d3b31c2d", + "TargetSlotId": "47c3c549-78bb-41fd-a88c-58f643870b40" + }, + { + "SourceParentOrChildId": "f6c5c544-3d02-4d6a-89ea-4a77ca3aaade", + "SourceSlotId": "68514ced-4368-459a-80e9-463a808bff0b", + "TargetParentOrChildId": "443aa8fb-dfa2-4778-bda1-c3c2d3b31c2d", + "TargetSlotId": "a952d91a-a86b-4370-acd9-e17b19025966" + }, { "SourceParentOrChildId": "00000000-0000-0000-0000-000000000000", "SourceSlotId": "ef02525a-3a75-4ae7-bc01-7581efeda246", @@ -376,6 +710,18 @@ "TargetParentOrChildId": "62f91867-83c8-4e0e-8338-453cee059d9f", "TargetSlotId": "0f9eebb0-6f13-4751-abac-15a467ad56c2" }, + { + "SourceParentOrChildId": "7305d9f5-690a-4208-9d78-2fe157eb75ad", + "SourceSlotId": "fae78369-9db9-4b00-94f2-89e7581db426", + "TargetParentOrChildId": "64829ae9-ea40-4e28-ad54-658d22e60b8b", + "TargetSlotId": "75419a73-8a3e-4538-9a1d-e3b0ce7f8561" + }, + { + "SourceParentOrChildId": "77d555bc-4da7-4a55-bc2f-fb531c546dc1", + "SourceSlotId": "e113f77f-53fe-4b29-95df-2f75e36eb251", + "TargetParentOrChildId": "64829ae9-ea40-4e28-ad54-658d22e60b8b", + "TargetSlotId": "e15b6dc7-aaf9-4244-a4b8-4ac13ee7d23f" + }, { "SourceParentOrChildId": "0bde3fbc-a631-4a90-b73c-0182cf3440b8", "SourceSlotId": "35c0e513-812f-49e2-96fa-17541751c19b", @@ -412,6 +758,18 @@ "TargetParentOrChildId": "730dadc2-d447-45af-afed-465165dd49f0", "TargetSlotId": "88938b09-d5a7-437c-b6e1-48a5b375d756" }, + { + "SourceParentOrChildId": "29252b0a-45d5-44bf-9ac3-b60389e0e630", + "SourceSlotId": "ba17981e-ef9f-46f1-a653-6d50affa8838", + "TargetParentOrChildId": "77d555bc-4da7-4a55-bc2f-fb531c546dc1", + "TargetSlotId": "b5d25dfd-5d9f-4b5b-b3f5-36b93b13cba3" + }, + { + "SourceParentOrChildId": "0b077fef-c597-4a2c-a878-e652e1b1ff87", + "SourceSlotId": "ba17981e-ef9f-46f1-a653-6d50affa8838", + "TargetParentOrChildId": "77d555bc-4da7-4a55-bc2f-fb531c546dc1", + "TargetSlotId": "b5d25dfd-5d9f-4b5b-b3f5-36b93b13cba3" + }, { "SourceParentOrChildId": "3df47cb1-3ad4-473a-a8ce-194fbfab1e76", "SourceSlotId": "e81c99ce-fcee-4e7c-a1c7-0aa3b352b7e1", @@ -592,12 +950,36 @@ "TargetParentOrChildId": "9f922da7-e8e7-4215-a98a-70a5d5dcd011", "TargetSlotId": "16f98211-fe97-4235-b33a-ddbbd2b5997f" }, + { + "SourceParentOrChildId": "0ecf3b4c-a658-4c78-9216-d9cede257733", + "SourceSlotId": "e5dc2cd0-c57f-4e72-9452-e162fe1c37d5", + "TargetParentOrChildId": "a20e1ea7-aaec-4911-bbe3-647fafbc03dd", + "TargetSlotId": "47c3c549-78bb-41fd-a88c-58f643870b40" + }, + { + "SourceParentOrChildId": "2b3221ab-4e7d-492c-a7e7-e0860333fab7", + "SourceSlotId": "eb8c79d4-d147-419c-a606-4bbe7b71933f", + "TargetParentOrChildId": "a20e1ea7-aaec-4911-bbe3-647fafbc03dd", + "TargetSlotId": "a952d91a-a86b-4370-acd9-e17b19025966" + }, { "SourceParentOrChildId": "00000000-0000-0000-0000-000000000000", "SourceSlotId": "33e347d3-3edd-4428-bd82-dbe87daf063d", "TargetParentOrChildId": "bc7ca7d1-4783-4454-865b-0ccff41c19c8", "TargetSlotId": "253b9ae4-fac5-4641-bf0c-d8614606a840" }, + { + "SourceParentOrChildId": "7305d9f5-690a-4208-9d78-2fe157eb75ad", + "SourceSlotId": "fae78369-9db9-4b00-94f2-89e7581db426", + "TargetParentOrChildId": "bf61bf53-57f6-4ebe-85e1-e2874432ee84", + "TargetSlotId": "75419a73-8a3e-4538-9a1d-e3b0ce7f8561" + }, + { + "SourceParentOrChildId": "a20e1ea7-aaec-4911-bbe3-647fafbc03dd", + "SourceSlotId": "3ac76b2a-7b1c-4762-a3f6-50529cd42fa8", + "TargetParentOrChildId": "bf61bf53-57f6-4ebe-85e1-e2874432ee84", + "TargetSlotId": "e15b6dc7-aaf9-4244-a4b8-4ac13ee7d23f" + }, { "SourceParentOrChildId": "00000000-0000-0000-0000-000000000000", "SourceSlotId": "0b11d459-01cc-4e91-99d2-37e77a0c8a35", @@ -628,6 +1010,18 @@ "TargetParentOrChildId": "c40b3c1a-3ec3-410a-9850-ddaa37ce049b", "TargetSlotId": "0f9eebb0-6f13-4751-abac-15a467ad56c2" }, + { + "SourceParentOrChildId": "7305d9f5-690a-4208-9d78-2fe157eb75ad", + "SourceSlotId": "fae78369-9db9-4b00-94f2-89e7581db426", + "TargetParentOrChildId": "dddecb5b-0355-4058-8690-04d4cd26623b", + "TargetSlotId": "656697b8-b271-463b-9e38-fdb5758d3736" + }, + { + "SourceParentOrChildId": "7305d9f5-690a-4208-9d78-2fe157eb75ad", + "SourceSlotId": "fae78369-9db9-4b00-94f2-89e7581db426", + "TargetParentOrChildId": "dfb513d5-31f9-45df-85e2-157e13369d65", + "TargetSlotId": "188c2244-e55a-4c55-be93-cccbd6fd4e41" + }, { "SourceParentOrChildId": "c373b1e2-6c3b-4080-964e-bfe924ccf5a9", "SourceSlotId": "751e97de-c418-48c7-823e-d4660073a559", @@ -665,8 +1059,8 @@ "TargetSlotId": "da4cd6c8-2307-45da-9258-49c578025aa8" }, { - "SourceParentOrChildId": "dddecb5b-0355-4058-8690-04d4cd26623b", - "SourceSlotId": "9e1e233f-bd4a-461b-983d-90a4d88ef286", + "SourceParentOrChildId": "f5acc3fb-dd9d-44b0-8de6-f0933f434b70", + "SourceSlotId": "9300b07e-977d-47b0-908e-c4b1e5e53a64", "TargetParentOrChildId": "e3ae07d5-67c7-45eb-b18c-b4afe586c5d1", "TargetSlotId": "dcd066ce-ac44-4e76-85b3-78821245d9dc" }, @@ -675,6 +1069,42 @@ "SourceSlotId": "2c5e5bb5-6023-4ff4-906d-d0a905110e95", "TargetParentOrChildId": "e5fd7543-e23e-447c-8d77-9c7da1413613", "TargetSlotId": "01809b63-4b4a-47be-9588-98d5998ddb0c" + }, + { + "SourceParentOrChildId": "00000000-0000-0000-0000-000000000000", + "SourceSlotId": "2c5e5bb5-6023-4ff4-906d-d0a905110e95", + "TargetParentOrChildId": "f5acc3fb-dd9d-44b0-8de6-f0933f434b70", + "TargetSlotId": "00fd2794-567a-4f9b-a900-c2ebf9760764" + }, + { + "SourceParentOrChildId": "dfb513d5-31f9-45df-85e2-157e13369d65", + "SourceSlotId": "0b43d459-2c94-4d5e-a75a-61d38d93118b", + "TargetParentOrChildId": "f5acc3fb-dd9d-44b0-8de6-f0933f434b70", + "TargetSlotId": "988dd1b5-636d-4a78-9592-2c6601401cc1" + }, + { + "SourceParentOrChildId": "dddecb5b-0355-4058-8690-04d4cd26623b", + "SourceSlotId": "9e1e233f-bd4a-461b-983d-90a4d88ef286", + "TargetParentOrChildId": "f5acc3fb-dd9d-44b0-8de6-f0933f434b70", + "TargetSlotId": "988dd1b5-636d-4a78-9592-2c6601401cc1" + }, + { + "SourceParentOrChildId": "64829ae9-ea40-4e28-ad54-658d22e60b8b", + "SourceSlotId": "73ebf863-ba71-421c-bee7-312f13c5eff0", + "TargetParentOrChildId": "f5acc3fb-dd9d-44b0-8de6-f0933f434b70", + "TargetSlotId": "988dd1b5-636d-4a78-9592-2c6601401cc1" + }, + { + "SourceParentOrChildId": "156c13ba-6b6f-4be7-a43a-fcdfc3e68549", + "SourceSlotId": "73ebf863-ba71-421c-bee7-312f13c5eff0", + "TargetParentOrChildId": "f5acc3fb-dd9d-44b0-8de6-f0933f434b70", + "TargetSlotId": "988dd1b5-636d-4a78-9592-2c6601401cc1" + }, + { + "SourceParentOrChildId": "bf61bf53-57f6-4ebe-85e1-e2874432ee84", + "SourceSlotId": "73ebf863-ba71-421c-bee7-312f13c5eff0", + "TargetParentOrChildId": "f5acc3fb-dd9d-44b0-8de6-f0933f434b70", + "TargetSlotId": "988dd1b5-636d-4a78-9592-2c6601401cc1" } ] } \ No newline at end of file diff --git a/Operators/Types/lib/point/modify/SelectPoints_371d72b8-69d4-4ced-beda-271386ad2fd6.t3ui b/Operators/Types/lib/point/modify/SelectPoints_371d72b8-69d4-4ced-beda-271386ad2fd6.t3ui index 803e0debdb..70a2a55f04 100644 --- a/Operators/Types/lib/point/modify/SelectPoints_371d72b8-69d4-4ced-beda-271386ad2fd6.t3ui +++ b/Operators/Types/lib/point/modify/SelectPoints_371d72b8-69d4-4ced-beda-271386ad2fd6.t3ui @@ -13,8 +13,8 @@ { "InputId": "2c5e5bb5-6023-4ff4-906d-d0a905110e95"/*VolumeShape*/, "Position": { - "X": -945.5289, - "Y": 2281.6829 + "X": -927.20746, + "Y": 2198.4277 } }, { @@ -268,8 +268,8 @@ { "ChildId": "dddecb5b-0355-4058-8690-04d4cd26623b"/*BoundingBox*/, "Position": { - "X": 758.44385, - "Y": 2320.3564 + "X": 557.28064, + "Y": 2534.5527 } }, { @@ -282,8 +282,8 @@ { "ChildId": "4b427f65-8d42-4888-945b-ccead60b49ca"/*Multiply*/, "Position": { - "X": 760.97595, - "Y": 2426.868 + "X": 917.98425, + "Y": 2482.8403 } }, { @@ -292,6 +292,132 @@ "X": -797.6117, "Y": 2600.9817 } + }, + { + "ChildId": "f5acc3fb-dd9d-44b0-8de6-f0933f434b70"/*Switch*/, + "Position": { + "X": 707.28064, + "Y": 2478.5527 + } + }, + { + "ChildId": "dfb513d5-31f9-45df-85e2-157e13369d65"/*SphereGizmo*/, + "Position": { + "X": 557.28064, + "Y": 2478.5527 + } + }, + { + "ChildId": "574a29a7-bdef-4aa7-bc88-e54ad6631997"/*CommonPointSets*/, + "Position": { + "X": 107.28064, + "Y": 2590.5527 + } + }, + { + "ChildId": "64829ae9-ea40-4e28-ad54-658d22e60b8b"/*DrawLines*/, + "Position": { + "X": 557.28064, + "Y": 2590.5527 + } + }, + { + "ChildId": "29252b0a-45d5-44bf-9ac3-b60389e0e630"/*TransformPoints*/, + "Position": { + "X": 257.28064, + "Y": 2590.5527 + } + }, + { + "ChildId": "77d555bc-4da7-4a55-bc2f-fb531c546dc1"/*CombineBuffers*/, + "Position": { + "X": 407.28064, + "Y": 2590.5527 + } + }, + { + "ChildId": "33137d70-9d92-46e0-be1b-20c0455197af"/*CommonPointSets*/, + "Position": { + "X": 107.28064, + "Y": 2653.5527 + } + }, + { + "ChildId": "0b077fef-c597-4a2c-a878-e652e1b1ff87"/*TransformPoints*/, + "Position": { + "X": 257.28064, + "Y": 2653.5527 + } + }, + { + "ChildId": "7305d9f5-690a-4208-9d78-2fe157eb75ad"/*AColor*/, + "Position": { + "X": 330.2011, + "Y": 2477.299 + } + }, + { + "ChildId": "af3fb700-6029-435e-9998-a0f4639cd32a"/*CommonPointSets*/, + "Position": { + "X": 74.29689, + "Y": 2812.0874 + } + }, + { + "ChildId": "37cc7615-c57a-4cc2-9924-b65a74879912"/*TransformPoints*/, + "Position": { + "X": 262.2025, + "Y": 2800.455 + } + }, + { + "ChildId": "f6c5c544-3d02-4d6a-89ea-4a77ca3aaade"/*LinePoints*/, + "Position": { + "X": 262.2025, + "Y": 2757.455 + } + }, + { + "ChildId": "443aa8fb-dfa2-4778-bda1-c3c2d3b31c2d"/*RepeatAtGPoints*/, + "Position": { + "X": 412.2025, + "Y": 2757.455 + } + }, + { + "ChildId": "156c13ba-6b6f-4be7-a43a-fcdfc3e68549"/*DrawLines*/, + "Position": { + "X": 562.2025, + "Y": 2757.455 + } + }, + { + "ChildId": "2b3221ab-4e7d-492c-a7e7-e0860333fab7"/*GridPoints*/, + "Position": { + "X": 244.47253, + "Y": 2985.326 + } + }, + { + "ChildId": "0ecf3b4c-a658-4c78-9216-d9cede257733"/*CommonPointSets*/, + "Position": { + "X": 244.47253, + "Y": 3028.326 + } + }, + { + "ChildId": "a20e1ea7-aaec-4911-bbe3-647fafbc03dd"/*RepeatAtGPoints*/, + "Position": { + "X": 416.92813, + "Y": 2986.0918 + } + }, + { + "ChildId": "bf61bf53-57f6-4ebe-85e1-e2874432ee84"/*DrawLines*/, + "Position": { + "X": 566.9281, + "Y": 2986.0918 + } } ], "OutputUis": [ diff --git a/Operators/Types/user/cynic/research/data/ExportPointList_d5607e3b-15e8-402c-8d54-b29e40415ab0.t3 b/Operators/Types/user/cynic/research/data/ExportPointList_d5607e3b-15e8-402c-8d54-b29e40415ab0.t3 index 9c24a03719..3b6c5ed5ba 100644 --- a/Operators/Types/user/cynic/research/data/ExportPointList_d5607e3b-15e8-402c-8d54-b29e40415ab0.t3 +++ b/Operators/Types/user/cynic/research/data/ExportPointList_d5607e3b-15e8-402c-8d54-b29e40415ab0.t3 @@ -17,1396 +17,7 @@ }, { "Id": "b3d57d74-ac47-4287-b42a-d85e64501eb5"/*InputList*/, - "DefaultValue": { - "StructuredList": [ - { - "Position": { - "X": 191.35898, - "Y": -0.483946, - "Z": -189.22058 - }, - "W": 0.1308553, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 142.82611, - "Y": -0.483946, - "Z": -205.36407 - }, - "W": 0.1844925, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 94.293236, - "Y": -0.483946, - "Z": -221.50757 - }, - "W": 0.23812968, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 45.760365, - "Y": -0.483946, - "Z": -237.65106 - }, - "W": 0.29176685, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -2.7725084, - "Y": -0.483946, - "Z": -253.79456 - }, - "W": 0.34540406, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -51.30538, - "Y": -0.483946, - "Z": -269.93805 - }, - "W": 0.39904124, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -99.83825, - "Y": -0.483946, - "Z": -286.08154 - }, - "W": 0.4526784, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -148.37111, - "Y": -0.483946, - "Z": -302.22504 - }, - "W": 0.5063156, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -196.90399, - "Y": -0.483946, - "Z": -318.36853 - }, - "W": 0.5599528, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -245.43689, - "Y": -0.483946, - "Z": -334.51202 - }, - "W": 0.61359, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -293.96973, - "Y": -0.483946, - "Z": -350.65552 - }, - "W": 0.66722715, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -342.5026, - "Y": -0.483946, - "Z": -366.799 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -311.366, - "Y": -0.4399509, - "Z": -333.45364 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.09090909 - } - }, - { - "Position": { - "X": -280.2294, - "Y": -0.3959558, - "Z": -300.10828 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.18181819 - } - }, - { - "Position": { - "X": -249.09279, - "Y": -0.35196072, - "Z": -266.7629 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.27272728 - } - }, - { - "Position": { - "X": -217.95619, - "Y": -0.30796564, - "Z": -233.41754 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.36363637 - } - }, - { - "Position": { - "X": -186.8196, - "Y": -0.26397052, - "Z": -200.07219 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.45454547 - } - }, - { - "Position": { - "X": -155.683, - "Y": -0.21997544, - "Z": -166.72682 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.54545456 - } - }, - { - "Position": { - "X": -124.5464, - "Y": -0.17598037, - "Z": -133.38147 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.6363636 - } - }, - { - "Position": { - "X": -93.40979, - "Y": -0.13198526, - "Z": -100.03609 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.72727275 - } - }, - { - "Position": { - "X": -62.273182, - "Y": -0.08799016, - "Z": -66.69071 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.8181819 - } - }, - { - "Position": { - "X": -31.136591, - "Y": -0.04399508, - "Z": -33.345356 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.90909094 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 1.0 - } - }, - { - "Position": { - "X": -31.1366, - "Y": -0.043995094, - "Z": -33.345367 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.9090909 - } - }, - { - "Position": { - "X": -62.2732, - "Y": -0.08799019, - "Z": -66.690735 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.8181818 - } - }, - { - "Position": { - "X": -93.4098, - "Y": -0.13198528, - "Z": -100.036095 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.72727275 - } - }, - { - "Position": { - "X": -124.5464, - "Y": -0.17598037, - "Z": -133.38147 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.6363636 - } - }, - { - "Position": { - "X": -155.683, - "Y": -0.21997546, - "Z": -166.72682 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.5454545 - } - }, - { - "Position": { - "X": -186.8196, - "Y": -0.26397055, - "Z": -200.07219 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.45454544 - } - }, - { - "Position": { - "X": -217.95619, - "Y": -0.30796564, - "Z": -233.41754 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.36363637 - } - }, - { - "Position": { - "X": -249.0928, - "Y": -0.35196075, - "Z": -266.76294 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.27272725 - } - }, - { - "Position": { - "X": -280.2294, - "Y": -0.39595583, - "Z": -300.1083 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.18181813 - } - }, - { - "Position": { - "X": -311.366, - "Y": -0.4399509, - "Z": -333.45364 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.090909064 - } - }, - { - "Position": { - "X": -342.5026, - "Y": -0.483946, - "Z": -366.799 - }, - "W": 0.06007549, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -329.89734, - "Y": -0.483946, - "Z": -317.34006 - }, - "W": 0.13281281, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -317.29205, - "Y": -0.483946, - "Z": -267.88113 - }, - "W": 0.20555012, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -304.6868, - "Y": -0.483946, - "Z": -218.42218 - }, - "W": 0.27828744, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -292.0815, - "Y": -0.483946, - "Z": -168.96324 - }, - "W": 0.35102475, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -279.47626, - "Y": -0.483946, - "Z": -119.5043 - }, - "W": 0.42376208, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -266.87097, - "Y": -0.483946, - "Z": -70.045364 - }, - "W": 0.4964994, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -254.26572, - "Y": -0.483946, - "Z": -20.586437 - }, - "W": 0.5692367, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -241.66045, - "Y": -0.483946, - "Z": 28.87252 - }, - "W": 0.64197403, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -229.05518, - "Y": -0.483946, - "Z": 78.33148 - }, - "W": 0.71471137, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -216.44992, - "Y": -0.483946, - "Z": 127.790405 - }, - "W": 0.78744864, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -203.84465, - "Y": -0.483946, - "Z": 177.24934 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -185.31332, - "Y": -0.4399509, - "Z": 161.13577 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.09090909 - } - }, - { - "Position": { - "X": -166.78198, - "Y": -0.3959558, - "Z": 145.02219 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.18181819 - } - }, - { - "Position": { - "X": -148.25066, - "Y": -0.35196072, - "Z": 128.90862 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.27272728 - } - }, - { - "Position": { - "X": -129.71931, - "Y": -0.30796564, - "Z": 112.79504 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.36363637 - } - }, - { - "Position": { - "X": -111.18799, - "Y": -0.26397052, - "Z": 96.68146 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.45454547 - } - }, - { - "Position": { - "X": -92.656654, - "Y": -0.21997544, - "Z": 80.56788 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.54545456 - } - }, - { - "Position": { - "X": -74.12533, - "Y": -0.17598037, - "Z": 64.45431 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.6363636 - } - }, - { - "Position": { - "X": -55.59399, - "Y": -0.13198526, - "Z": 48.340725 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.72727275 - } - }, - { - "Position": { - "X": -37.062653, - "Y": -0.08799016, - "Z": 32.227142 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.8181819 - } - }, - { - "Position": { - "X": -18.531326, - "Y": -0.04399508, - "Z": 16.113571 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.90909094 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 1.0 - } - }, - { - "Position": { - "X": -18.531332, - "Y": -0.043995094, - "Z": 16.113577 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.9090909 - } - }, - { - "Position": { - "X": -37.062664, - "Y": -0.08799019, - "Z": 32.227154 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.8181818 - } - }, - { - "Position": { - "X": -55.593998, - "Y": -0.13198528, - "Z": 48.340733 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.72727275 - } - }, - { - "Position": { - "X": -74.12533, - "Y": -0.17598037, - "Z": 64.45431 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.6363636 - } - }, - { - "Position": { - "X": -92.65666, - "Y": -0.21997546, - "Z": 80.56789 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.5454545 - } - }, - { - "Position": { - "X": -111.187996, - "Y": -0.26397055, - "Z": 96.681465 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.45454544 - } - }, - { - "Position": { - "X": -129.71931, - "Y": -0.30796564, - "Z": 112.79504 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.36363637 - } - }, - { - "Position": { - "X": -148.25066, - "Y": -0.35196075, - "Z": 128.90862 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.27272725 - } - }, - { - "Position": { - "X": -166.782, - "Y": -0.39595583, - "Z": 145.0222 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.18181813 - } - }, - { - "Position": { - "X": -185.31332, - "Y": -0.4399509, - "Z": 161.13577 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.090909064 - } - }, - { - "Position": { - "X": -203.84465, - "Y": -0.483946, - "Z": 177.24934 - }, - "W": 0.113695964, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -167.91705, - "Y": -0.483946, - "Z": 143.9339 - }, - "W": 0.1924866, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -131.98944, - "Y": -0.483946, - "Z": 110.61845 - }, - "W": 0.27127725, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -96.061844, - "Y": -0.483946, - "Z": 77.303 - }, - "W": 0.35006788, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -60.134243, - "Y": -0.483946, - "Z": 43.987556 - }, - "W": 0.42885852, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": -24.206638, - "Y": -0.483946, - "Z": 10.672108 - }, - "W": 0.5076492, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 11.7209635, - "Y": -0.483946, - "Z": -22.64334 - }, - "W": 0.5864398, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 47.648556, - "Y": -0.483946, - "Z": -55.95878 - }, - "W": 0.6652304, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 83.576164, - "Y": -0.483946, - "Z": -89.27423 - }, - "W": 0.74402106, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 119.503784, - "Y": -0.483946, - "Z": -122.58969 - }, - "W": 0.8228117, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 155.43137, - "Y": -0.483946, - "Z": -155.90514 - }, - "W": 0.9016024, - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 191.35898, - "Y": -0.483946, - "Z": -189.22058 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Position": { - "X": 173.9627, - "Y": -0.4399509, - "Z": -172.0187 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.09090909 - } - }, - { - "Position": { - "X": 156.56644, - "Y": -0.3959558, - "Z": -154.81683 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.18181819 - } - }, - { - "Position": { - "X": 139.17017, - "Y": -0.35196072, - "Z": -137.61496 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.27272728 - } - }, - { - "Position": { - "X": 121.773895, - "Y": -0.30796564, - "Z": -120.41309 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.36363637 - } - }, - { - "Position": { - "X": 104.377625, - "Y": -0.26397052, - "Z": -103.21122 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.45454547 - } - }, - { - "Position": { - "X": 86.98135, - "Y": -0.21997544, - "Z": -86.00935 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.54545456 - } - }, - { - "Position": { - "X": 69.58508, - "Y": -0.17598037, - "Z": -68.80749 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.6363636 - } - }, - { - "Position": { - "X": 52.18881, - "Y": -0.13198526, - "Z": -51.60561 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.72727275 - } - }, - { - "Position": { - "X": 34.79253, - "Y": -0.08799016, - "Z": -34.403732 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.8181819 - } - }, - { - "Position": { - "X": 17.396265, - "Y": -0.04399508, - "Z": -17.201866 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.90909094 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 1.0 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.9090909 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.8181818 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.72727275 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.6363636 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.5454545 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.45454544 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.36363637 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.27272725 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.18181813 - } - }, - { - "Position": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0 - }, - "W": "NaN", - "Orientation": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, - "W": 0.090909064 - } - } - ] - } + "DefaultValue": null } ], "Children": [], diff --git a/Operators/Types/user/pixtur/examples/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3 b/Operators/Types/user/pixtur/examples/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3 index 7517bdb646..294445cefa 100644 --- a/Operators/Types/user/pixtur/examples/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3 +++ b/Operators/Types/user/pixtur/examples/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3 @@ -219,7 +219,7 @@ { "Id": "78b314b8-f9d2-4723-9b11-c07ba926db86"/*Shade*/, "Type": "System.Single", - "Value": -30.000002 + "Value": -30.0 }, { "Id": "8060756f-72a4-490b-9677-872b70e73b3a"/*BlurRadius*/, @@ -253,6 +253,11 @@ "Id": "1f09da31-b853-417c-abb1-39e1199a149f"/*IsEnabled*/, "Type": "System.Boolean", "Value": true + }, + { + "Id": "51621e59-9bdd-4004-a053-d4637278bd92"/*Reset*/, + "Type": "System.Boolean", + "Value": false } ], "Outputs": [] @@ -666,7 +671,7 @@ { "Id": "835d7f17-9de4-4612-a2f0-01c1346cdf1a"/*Spacing*/, "Type": "System.Single", - "Value": 16.6 + "Value": 37.0 }, { "Id": "50c9ab21-39f4-4e92-b5a7-ad9e60ae6ec3"/*FontPath*/, @@ -675,1168 +680,211 @@ } ], "Outputs": [] + } + ], + "Connections": [ + { + "SourceParentOrChildId": "7adf0c05-6be9-4472-a171-6470b0ab59ea", + "SourceSlotId": "7a4c4feb-be2f-463e-96c6-cd9a6bad77a2", + "TargetParentOrChildId": "00000000-0000-0000-0000-000000000000", + "TargetSlotId": "80df5695-1d1e-46f3-ac5f-89a4294317d7" }, { - "Id": "55ed6a86-631d-46b9-b387-9df1a0de39f6"/*DetectEdges*/, - "SymbolId": "2a5475c8-9e16-409f-8c40-a3063e045d38", - "InputValues": [], - "Outputs": [] + "SourceParentOrChildId": "8b161a5a-09ea-4b49-a9ff-dc46b96d44a9", + "SourceSlotId": "b9baba42-18b6-4792-929d-bf628ce8a488", + "TargetParentOrChildId": "10b991d3-0ec5-40b2-9f1c-78f8c9048ee8", + "TargetSlotId": "f6bdd487-c16e-4fb0-bfba-b3801f121314" }, { - "Id": "d01aa3f5-89c7-40b6-83f1-5a8d09adc62d"/*RenderTarget*/, - "SymbolId": "f9fe78c5-43a6-48ae-8e8c-6cdbbc330dd1", - "InputValues": [ - { - "Id": "8bb4a4e5-0c88-4d99-a5b2-2c9e22bd301f"/*ClearColor*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.009534956, - "Y": 0.00955656, - "Z": 0.009579597, - "W": 1.0 - } - } - ], - "Outputs": [] + "SourceParentOrChildId": "ccb235a2-9a5d-4046-a503-808d212ab6a2", + "SourceSlotId": "adcfd192-23a3-48c1-ae21-e7d36e055673", + "TargetParentOrChildId": "13c6661e-158f-41f2-8b37-f7f5757bf360", + "TargetSlotId": "08f181bb-9777-497c-871d-bcc1ff252f2f" }, { - "Id": "dbdf0a88-3a43-4bde-915f-c99f7085e1b3"/*LoadImage*/, - "SymbolId": "0b3436db-e283-436e-ba85-2f3a1de76a9d", - "InputValues": [ - { - "Id": "76cc3811-4ae0-48b2-a119-890db5a4eeb2"/*Path*/, - "Type": "System.String", - "Value": "Resources\\user\\pixtur\\testcontent\\T3-Logo\\T3-Logo-with-claim.png" - } - ], - "Outputs": [] + "SourceParentOrChildId": "54dbf23d-70a7-413b-95dc-e56e61f129c4", + "SourceSlotId": "e0c4fedd-5c2f-46c8-b67d-5667435fb037", + "TargetParentOrChildId": "365d216c-06b4-4c5f-a7db-c14d63bb2bf3", + "TargetSlotId": "a7fff052-42c2-40fb-938e-9fb9b6cfa591" }, { - "Id": "1c5a9fae-fdc0-4a2b-84a1-7b4eecc40bbb"/*Crop*/, - "SymbolId": "a29cf1c8-d9cd-4a5d-b06c-597cbeb5b33d", - "InputValues": [ - { - "Id": "eff02108-2335-46b5-95ba-4235b9a26349"/*LeftRight*/, - "Type": "SharpDX.Size2", - "Value": { - "Width": 401, - "Height": 401 - } - }, - { - "Id": "db4c2d41-c369-4182-83fd-cb04aa04ec76"/*TopBottom*/, - "Type": "SharpDX.Size2", - "Value": { - "Width": 401, - "Height": 401 - } - }, - { - "Id": "3b62379a-de94-4be1-8471-357710ba14c3"/*PaddingColor*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.9999999, - "Y": 0.9999999, - "Z": 0.9999999, - "W": 0.0 - } - } - ], - "Outputs": [] + "SourceParentOrChildId": "b6deb84a-1081-4813-9c07-ca4d40779adf", + "SourceSlotId": "8d199a8d-b02e-4fa2-8f7d-b156e4302fe3", + "TargetParentOrChildId": "41797226-faa3-4870-ba62-0b8fda93384c", + "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" }, { - "Id": "c27f55d8-0664-4c8a-ba87-64d1ad32872a"/*Layer2d*/, - "SymbolId": "d8c5330f-59b5-4907-b845-a02def3042fa", - "InputValues": [ - { - "Id": "38f34034-b36f-4351-84e1-1a4f96e03fc6"/*Scale*/, - "Type": "System.Single", - "Value": 0.39 - }, - { - "Id": "ed4f8c30-7b71-4649-97e6-710a718039b0"/*Color*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 1.0, - "Y": 1.0, - "Z": 1.0, - "W": 0.0 - } - } - ], - "Outputs": [] + "SourceParentOrChildId": "bc669038-58d7-4438-b6a0-479245473ecc", + "SourceSlotId": "e81c99ce-fcee-4e7c-a1c7-0aa3b352b7e1", + "TargetParentOrChildId": "5a5eff1a-1f54-40fc-882b-99117d0c4037", + "TargetSlotId": "dcd066ce-ac44-4e76-85b3-78821245d9dc" }, { - "Id": "213d8d2c-8302-4914-9076-44e04e46de5f"/*Grain*/, - "SymbolId": "b5102fba-f05b-43fc-aa1d-613fe1d68ad2", - "InputValues": [ - { - "Id": "195da7e0-5279-4900-80cd-5635e96ab454"/*Amount*/, - "Type": "System.Single", - "Value": 0.006 - }, - { - "Id": "d24cce46-dd3f-4047-a33f-50abbca89cc4"/*Exponent*/, - "Type": "System.Single", - "Value": 1.8199999 - }, - { - "Id": "f1334f45-4335-4198-9b6e-ab9e8384aa32"/*Speed*/, - "Type": "System.Single", - "Value": 10.0 - } - ], - "Outputs": [] + "SourceParentOrChildId": "5a5eff1a-1f54-40fc-882b-99117d0c4037", + "SourceSlotId": "2d329133-29b9-4f56-b5a6-5ff7d83638fa", + "TargetParentOrChildId": "65d81281-ac06-4089-8bdb-5d95aa576465", + "TargetSlotId": "4da253b7-4953-439a-b03f-1d515a78bddf" }, { - "Id": "485cbaff-86d3-482c-bb88-742e2060be8c"/*ColorGrade*/, - "SymbolId": "42d86738-d644-47c8-ab92-cc426d958e51", - "InputValues": [ - { - "Id": "16231de9-2e85-4a9a-a2d1-99dfac18a0f6"/*PreSaturate*/, - "Type": "System.Single", - "Value": 0.63 - }, - { - "Id": "4dc44a7b-fe7c-4807-aaaa-53fb553de017"/*Gain*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.20345795, - "Y": 0.20345795, - "Z": 0.20345795, - "W": 0.46 - } - }, - { - "Id": "be4dc864-a5f9-4356-91f9-58de8056a3a8"/*Gamma*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.51, - "Y": 0.51, - "Z": 0.51, - "W": 0.496 - } - }, - { - "Id": "e8cc8a26-313e-4399-b800-901019bbaa78"/*Lift*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.50275826, - "Y": 0.50275826, - "Z": 0.50275826, - "W": 0.47 - } - }, - { - "Id": "423eb712-f7e3-4402-b841-324a9fc91c54"/*VignetteColor*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.3367464, - "Y": 0.3367464, - "Z": 0.3367464, - "W": 0.0 - } - }, - { - "Id": "a0aaadb8-3b39-4a29-b04b-5043ec8bbf42"/*VignetteRadius*/, - "Type": "System.Single", - "Value": 1.22 - }, - { - "Id": "e94da387-2c81-4ae0-a37e-3141e16c345d"/*VignetteFeather*/, - "Type": "System.Single", - "Value": 0.87 - }, - { - "Id": "f493d824-0f3e-4b30-838b-59ee0fba755b"/*VignetteCenter*/, - "Type": "System.Numerics.Vector2", - "Value": { - "X": 0.12, - "Y": 0.05 - } - } - ], - "Outputs": [] + "SourceParentOrChildId": "d54f20b9-404a-421d-b898-6040cdb5454a", + "SourceSlotId": "d140f068-d71e-4af5-a563-ab599dae5dbf", + "TargetParentOrChildId": "74332040-0f1d-4031-953b-799c210b8d07", + "TargetSlotId": "c10f9c6c-9923-42c6-848d-6b98097acc67" }, { - "Id": "6a410b3d-a129-4238-bcb4-199a5e745517"/*BlurWithMask*/, - "SymbolId": "d40966c3-2369-40f2-8202-e5c8ab6d9cc0", - "InputValues": [ - { - "Id": "fa5bb047-7466-4d68-9977-7a86815ca0f2"/*Size*/, - "Type": "System.Single", - "Value": 8.0 - }, - { - "Id": "25091e3d-36ef-4892-965c-b7d3c983da22"/*Samples*/, - "Type": "System.Single", - "Value": 30.0 - }, - { - "Id": "0623d858-8986-4058-b209-28b0649f1441"/*Color*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 1.0, - "Y": 1.0, - "Z": 1.0, - "W": 1.0 - } - }, - { - "Id": "731eaf1c-aef0-4310-a470-62c0dfeb310a"/*ApplyMaskToAlpha*/, - "Type": "System.Single", - "Value": 0.38 - } - ], - "Outputs": [] + "SourceParentOrChildId": "13c6661e-158f-41f2-8b37-f7f5757bf360", + "SourceSlotId": "c52dfa83-9820-4a54-b90b-62278dc8fe3f", + "TargetParentOrChildId": "74332040-0f1d-4031-953b-799c210b8d07", + "TargetSlotId": "e15b6dc7-aaf9-4244-a4b8-4ac13ee7d23f" }, { - "Id": "29975a4f-8675-4294-81eb-51094d0a6a50"/*LinearGradient*/, - "SymbolId": "2c3d2c26-ac45-42e9-8f13-6ea338333568", - "InputValues": [ - { - "Id": "e47e9e63-9c94-4c29-9555-2452fa498d57"/*Gradient*/, - "Type": "T3.Core.DataTypes.Gradient", - "Value": { - "Gradient": { - "Interpolation": "Linear", - "Steps": [ - { - "Id": "373477e0-b8d5-491b-9dcc-4e216867a722", - "NormalizedPosition": 0.0, - "Color": { - "R": 0.0, - "G": 1.2159347E-11, - "B": 1E-06, - "A": 1.0 - } - }, - { - "Id": "7b90457f-ce64-4c0d-95b8-e24802c0111a", - "NormalizedPosition": 1.0, - "Color": { - "R": 1.0, - "G": 0.99999, - "B": 1.0, - "A": 1.0 - } - } - ] - } - } - }, - { - "Id": "abf3456d-35bc-49ec-9aa6-c5571fbb209a"/*Center*/, - "Type": "System.Numerics.Vector2", - "Value": { - "X": 1.21, - "Y": 0.0 - } - }, - { - "Id": "8169be8f-cb35-4900-b462-f2139b412d59"/*Rotation*/, - "Type": "System.Single", - "Value": 77.0 - }, - { - "Id": "10d59d0f-a5a3-42e6-b874-345ab028978e"/*Size*/, - "Type": "System.Single", - "Value": 0.52 - } - ], - "Outputs": [] + "SourceParentOrChildId": "e4fef484-22e3-461e-8677-e1ffabcb87b1", + "SourceSlotId": "e81c99ce-fcee-4e7c-a1c7-0aa3b352b7e1", + "TargetParentOrChildId": "7adf0c05-6be9-4472-a171-6470b0ab59ea", + "TargetSlotId": "4da253b7-4953-439a-b03f-1d515a78bddf" }, { - "Id": "3c141524-9b1a-4a4c-8971-743cdb213c03"/*Execute*/, - "SymbolId": "936e4324-bea2-463a-b196-6064a2d8a6b2", - "InputValues": [], - "Outputs": [] + "SourceParentOrChildId": "e179735f-2a45-4086-9c1a-5add14b87b8c", + "SourceSlotId": "e4a8d926-7abd-4d2a-82a1-b7d140cb457f", + "TargetParentOrChildId": "8b161a5a-09ea-4b49-a9ff-dc46b96d44a9", + "TargetSlotId": "ebd35d33-dc73-46ae-a82c-2060d750018a" }, { - "Id": "f762f5ce-bfd8-4acd-866a-bff0d6f8f002"/*Camera*/, - "SymbolId": "746d886c-5ab6-44b1-bb15-f3ce2fadf7e6", - "InputValues": [ - { - "Id": "313596cc-3854-436b-89da-5fd40164ce76"/*Position*/, - "Type": "System.Numerics.Vector3", - "Value": { - "X": 0.0, - "Y": 0.0, - "Z": 1.79 - } - } - ], - "Outputs": [] - }, - { - "Id": "266bee6f-50a4-4fed-af73-049434a90287"/*DustParticles*/, - "SymbolId": "d14233a2-8240-47d3-bb92-0854f6d3b218", - "InputValues": [ - { - "Id": "e92432c8-6ceb-494b-9cf4-b21191567b29"/*Color*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 1.0, - "Y": 0.99999, - "Z": 0.99999, - "W": 0.46 - } - }, - { - "Id": "70f0f867-a4de-44da-b8e3-a7e95e1740a3"/*Size*/, - "Type": "System.Single", - "Value": 0.028 - }, - { - "Id": "c42d8124-d656-4b52-864f-9c9d888e0c54"/*WrapSize*/, - "Type": "System.Single", - "Value": 2.19 - }, - { - "Id": "0744e03b-9df3-4a5e-9cfa-f522d9d946ea"/*NoiseAmount*/, - "Type": "System.Single", - "Value": 0.02 - }, - { - "Id": "f084ae44-d69a-48c3-936b-b89e310ca185"/*Reset*/, - "Type": "System.Boolean", - "Value": false - }, - { - "Id": "49337c9b-7016-4093-b695-f7d1dd948fa1"/*FadeNearest*/, - "Type": "System.Single", - "Value": 0.011 - }, - { - "Id": "60b17724-e469-463f-9700-745b4d45d6ff"/*EnableZWrite*/, - "Type": "System.Boolean", - "Value": false - } - ], - "Outputs": [] - }, - { - "Id": "bc840e96-6675-4add-8a9b-d0e9de734d3d"/*SetFog*/, - "SymbolId": "74cbfce0-f8b8-46a1-b5d6-38477d4eec99", - "InputValues": [ - { - "Id": "7a331539-33ea-48b9-8930-daf93dd33d7c"/*Distance*/, - "Type": "System.Single", - "Value": 1.1800001 - } - ], - "Outputs": [] - }, - { - "Id": "ce6c111f-cfe0-488e-be45-2e5b2c072962"/*Grain*/, - "SymbolId": "b5102fba-f05b-43fc-aa1d-613fe1d68ad2", - "InputValues": [ - { - "Id": "195da7e0-5279-4900-80cd-5635e96ab454"/*Amount*/, - "Type": "System.Single", - "Value": 0.052999996 - } - ], - "Outputs": [] - }, - { - "Id": "25bd2f25-ea61-448e-b594-191af16b8489"/*WaveForm2*/, - "SymbolId": "92e28e50-bd40-4f93-ba92-8f69cded6ec1", - "InputValues": [], - "Outputs": [] - }, - { - "Id": "4dc12b23-60fe-4e64-8a45-992ac57f07bc"/*ImageLevels*/, - "SymbolId": "592a2b6f-d4e3-43e0-9e73-034cca3b3900", - "InputValues": [ - { - "Id": "1224b62e-5fca-41e9-a388-4c13c1458d56"/*Center*/, - "Type": "System.Numerics.Vector2", - "Value": { - "X": 0.25, - "Y": 0.0 - } - }, - { - "Id": "48e80f45-9685-4ded-aa1c-d05e16658c5a"/*Width*/, - "Type": "System.Single", - "Value": 0.43 - } - ], - "Outputs": [] - }, - { - "Id": "c12d9089-9edf-418c-8121-478c50ff2d7e"/*LinearGradient*/, - "SymbolId": "2c3d2c26-ac45-42e9-8f13-6ea338333568", - "InputValues": [ - { - "Id": "e47e9e63-9c94-4c29-9555-2452fa498d57"/*Gradient*/, - "Type": "T3.Core.DataTypes.Gradient", - "Value": { - "Gradient": { - "Interpolation": "Linear", - "Steps": [ - { - "Id": "ec6af294-1254-4644-8a25-c9dade32241e", - "NormalizedPosition": 0.0, - "Color": { - "R": 0.0, - "G": 1.2159347E-11, - "B": 1E-06, - "A": 1.0 - } - }, - { - "Id": "ea09c853-e8bc-421d-a7bf-dac7e9f4e6ce", - "NormalizedPosition": 1.0, - "Color": { - "R": 1.0, - "G": 0.99999, - "B": 1.0, - "A": 1.0 - } - } - ] - } - } - } - ], - "Outputs": [] - }, - { - "Id": "0791be4c-dfcf-4444-a5af-1ac1edfb03de"/*ColorGrade*/, - "SymbolId": "42d86738-d644-47c8-ab92-cc426d958e51", - "InputValues": [ - { - "Id": "16231de9-2e85-4a9a-a2d1-99dfac18a0f6"/*PreSaturate*/, - "Type": "System.Single", - "Value": 0.84 - }, - { - "Id": "4dc44a7b-fe7c-4807-aaaa-53fb553de017"/*Gain*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.41069093, - "Y": 0.41654038, - "Z": 0.5, - "W": 0.506 - } - }, - { - "Id": "be4dc864-a5f9-4356-91f9-58de8056a3a8"/*Gamma*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.37799042, - "Y": 0.37655, - "Z": 0.37682152, - "W": 0.506 - } - }, - { - "Id": "e8cc8a26-313e-4399-b800-901019bbaa78"/*Lift*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.53280973, - "Y": 0.5421923, - "Z": 0.58373207, - "W": 0.25 - } - }, - { - "Id": "423eb712-f7e3-4402-b841-324a9fc91c54"/*VignetteColor*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 1.0, - "Y": 0.9655386, - "Z": 0.92743886, - "W": 0.39 - } - }, - { - "Id": "a0aaadb8-3b39-4a29-b04b-5043ec8bbf42"/*VignetteRadius*/, - "Type": "System.Single", - "Value": 2.75 - }, - { - "Id": "e94da387-2c81-4ae0-a37e-3141e16c345d"/*VignetteFeather*/, - "Type": "System.Single", - "Value": 1.5 - }, - { - "Id": "f493d824-0f3e-4b30-838b-59ee0fba755b"/*VignetteCenter*/, - "Type": "System.Numerics.Vector2", - "Value": { - "X": 0.0, - "Y": -0.81 - } - } - ], - "Outputs": [] - } - ], - "Connections": [ - { - "SourceParentOrChildId": "7adf0c05-6be9-4472-a171-6470b0ab59ea", - "SourceSlotId": "7a4c4feb-be2f-463e-96c6-cd9a6bad77a2", - "TargetParentOrChildId": "00000000-0000-0000-0000-000000000000", - "TargetSlotId": "80df5695-1d1e-46f3-ac5f-89a4294317d7" - }, - { - "SourceParentOrChildId": "d01aa3f5-89c7-40b6-83f1-5a8d09adc62d", - "SourceSlotId": "7a4c4feb-be2f-463e-96c6-cd9a6bad77a2", - "TargetParentOrChildId": "0791be4c-dfcf-4444-a5af-1ac1edfb03de", + "SourceParentOrChildId": "10b991d3-0ec5-40b2-9f1c-78f8c9048ee8", + "SourceSlotId": "2ce1453b-432b-4d12-8fb7-d883e3d0c136", + "TargetParentOrChildId": "913845cc-dada-4f76-9259-b1ee7bb8241b", "TargetSlotId": "777b2c27-a3c8-40d0-a196-80a08af51296" }, { - "SourceParentOrChildId": "8b161a5a-09ea-4b49-a9ff-dc46b96d44a9", - "SourceSlotId": "b9baba42-18b6-4792-929d-bf628ce8a488", - "TargetParentOrChildId": "10b991d3-0ec5-40b2-9f1c-78f8c9048ee8", - "TargetSlotId": "f6bdd487-c16e-4fb0-bfba-b3801f121314" - }, - { - "SourceParentOrChildId": "ccb235a2-9a5d-4046-a503-808d212ab6a2", - "SourceSlotId": "adcfd192-23a3-48c1-ae21-e7d36e055673", - "TargetParentOrChildId": "13c6661e-158f-41f2-8b37-f7f5757bf360", - "TargetSlotId": "08f181bb-9777-497c-871d-bcc1ff252f2f" - }, - { - "SourceParentOrChildId": "dbdf0a88-3a43-4bde-915f-c99f7085e1b3", - "SourceSlotId": "e0c4fedd-5c2f-46c8-b67d-5667435fb037", - "TargetParentOrChildId": "1c5a9fae-fdc0-4a2b-84a1-7b4eecc40bbb", - "TargetSlotId": "a7fff052-42c2-40fb-938e-9fb9b6cfa591" - }, - { - "SourceParentOrChildId": "0791be4c-dfcf-4444-a5af-1ac1edfb03de", + "SourceParentOrChildId": "913845cc-dada-4f76-9259-b1ee7bb8241b", "SourceSlotId": "1680781d-af5e-4b77-beb6-3e4a12d73d59", - "TargetParentOrChildId": "213d8d2c-8302-4914-9076-44e04e46de5f", + "TargetParentOrChildId": "9c257d30-71ae-4f88-8514-613c2529f1e1", "TargetSlotId": "4525c76c-cdcf-47f3-aa96-335cfc5b5c1b" }, { - "SourceParentOrChildId": "485cbaff-86d3-482c-bb88-742e2060be8c", - "SourceSlotId": "1680781d-af5e-4b77-beb6-3e4a12d73d59", - "TargetParentOrChildId": "25bd2f25-ea61-448e-b594-191af16b8489", - "TargetSlotId": "73afdd61-dd59-4018-a473-025272deab93" + "SourceParentOrChildId": "365d216c-06b4-4c5f-a7db-c14d63bb2bf3", + "SourceSlotId": "0f7a4421-97d7-48d0-8a99-a7cc84356be2", + "TargetParentOrChildId": "9fdbfd1b-5f4c-4291-ad62-2d2725b4c113", + "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" }, { - "SourceParentOrChildId": "54dbf23d-70a7-413b-95dc-e56e61f129c4", - "SourceSlotId": "e0c4fedd-5c2f-46c8-b67d-5667435fb037", - "TargetParentOrChildId": "365d216c-06b4-4c5f-a7db-c14d63bb2bf3", - "TargetSlotId": "a7fff052-42c2-40fb-938e-9fb9b6cfa591" + "SourceParentOrChildId": "365d216c-06b4-4c5f-a7db-c14d63bb2bf3", + "SourceSlotId": "0f7a4421-97d7-48d0-8a99-a7cc84356be2", + "TargetParentOrChildId": "b6deb84a-1081-4813-9c07-ca4d40779adf", + "TargetSlotId": "29f6bc05-de55-4336-a275-f06b835c66f8" }, { - "SourceParentOrChildId": "bc840e96-6675-4add-8a9b-d0e9de734d3d", - "SourceSlotId": "7c2134d1-45c6-4dc7-b591-a4a5113f5747", - "TargetParentOrChildId": "3c141524-9b1a-4a4c-8971-743cdb213c03", - "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" + "SourceParentOrChildId": "a20d2377-e158-4e94-aae3-4d2de084f52e", + "SourceSlotId": "d140f068-d71e-4af5-a563-ab599dae5dbf", + "TargetParentOrChildId": "b6deb84a-1081-4813-9c07-ca4d40779adf", + "TargetSlotId": "4837051f-033c-4e9e-9d1c-0fe85c1467cb" }, { - "SourceParentOrChildId": "c27f55d8-0664-4c8a-ba87-64d1ad32872a", + "SourceParentOrChildId": "9fdbfd1b-5f4c-4291-ad62-2d2725b4c113", "SourceSlotId": "e4a8d926-7abd-4d2a-82a1-b7d140cb457f", - "TargetParentOrChildId": "3c141524-9b1a-4a4c-8971-743cdb213c03", + "TargetParentOrChildId": "bc669038-58d7-4438-b6a0-479245473ecc", "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" }, { - "SourceParentOrChildId": "b6deb84a-1081-4813-9c07-ca4d40779adf", - "SourceSlotId": "8d199a8d-b02e-4fa2-8f7d-b156e4302fe3", - "TargetParentOrChildId": "41797226-faa3-4870-ba62-0b8fda93384c", - "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" - }, - { - "SourceParentOrChildId": "d01aa3f5-89c7-40b6-83f1-5a8d09adc62d", - "SourceSlotId": "7a4c4feb-be2f-463e-96c6-cd9a6bad77a2", - "TargetParentOrChildId": "485cbaff-86d3-482c-bb88-742e2060be8c", - "TargetSlotId": "777b2c27-a3c8-40d0-a196-80a08af51296" + "SourceParentOrChildId": "74332040-0f1d-4031-953b-799c210b8d07", + "SourceSlotId": "73ebf863-ba71-421c-bee7-312f13c5eff0", + "TargetParentOrChildId": "bc669038-58d7-4438-b6a0-479245473ecc", + "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" }, { - "SourceParentOrChildId": "485cbaff-86d3-482c-bb88-742e2060be8c", - "SourceSlotId": "1680781d-af5e-4b77-beb6-3e4a12d73d59", - "TargetParentOrChildId": "4dc12b23-60fe-4e64-8a45-992ac57f07bc", - "TargetSlotId": "f434bac8-b7d8-4787-adf2-1782d6588da8" + "SourceParentOrChildId": "017c0340-18d4-48ea-9c74-870f3209da99", + "SourceSlotId": "e21e3843-7d63-4db2-9234-77664e872a0f", + "TargetParentOrChildId": "ccb235a2-9a5d-4046-a503-808d212ab6a2", + "TargetSlotId": "82b2e8d3-40c2-4a4c-a9ad-806d5097a8fd" }, { - "SourceParentOrChildId": "7adf0c05-6be9-4472-a171-6470b0ab59ea", + "SourceParentOrChildId": "65d81281-ac06-4089-8bdb-5d95aa576465", "SourceSlotId": "7a4c4feb-be2f-463e-96c6-cd9a6bad77a2", - "TargetParentOrChildId": "55ed6a86-631d-46b9-b387-9df1a0de39f6", - "TargetSlotId": "4041b6d8-15e5-428c-9967-7105975a46f7" - }, - { - "SourceParentOrChildId": "bc669038-58d7-4438-b6a0-479245473ecc", - "SourceSlotId": "e81c99ce-fcee-4e7c-a1c7-0aa3b352b7e1", - "TargetParentOrChildId": "5a5eff1a-1f54-40fc-882b-99117d0c4037", - "TargetSlotId": "dcd066ce-ac44-4e76-85b3-78821245d9dc" - }, - { - "SourceParentOrChildId": "5a5eff1a-1f54-40fc-882b-99117d0c4037", - "SourceSlotId": "2d329133-29b9-4f56-b5a6-5ff7d83638fa", - "TargetParentOrChildId": "65d81281-ac06-4089-8bdb-5d95aa576465", - "TargetSlotId": "4da253b7-4953-439a-b03f-1d515a78bddf" - }, - { - "SourceParentOrChildId": "1c5a9fae-fdc0-4a2b-84a1-7b4eecc40bbb", - "SourceSlotId": "0f7a4421-97d7-48d0-8a99-a7cc84356be2", - "TargetParentOrChildId": "6a410b3d-a129-4238-bcb4-199a5e745517", - "TargetSlotId": "29f6bc05-de55-4336-a275-f06b835c66f8" - }, - { - "SourceParentOrChildId": "29975a4f-8675-4294-81eb-51094d0a6a50", - "SourceSlotId": "d140f068-d71e-4af5-a563-ab599dae5dbf", - "TargetParentOrChildId": "6a410b3d-a129-4238-bcb4-199a5e745517", - "TargetSlotId": "4837051f-033c-4e9e-9d1c-0fe85c1467cb" - }, - { - "SourceParentOrChildId": "d54f20b9-404a-421d-b898-6040cdb5454a", - "SourceSlotId": "d140f068-d71e-4af5-a563-ab599dae5dbf", - "TargetParentOrChildId": "74332040-0f1d-4031-953b-799c210b8d07", - "TargetSlotId": "c10f9c6c-9923-42c6-848d-6b98097acc67" - }, - { - "SourceParentOrChildId": "13c6661e-158f-41f2-8b37-f7f5757bf360", - "SourceSlotId": "c52dfa83-9820-4a54-b90b-62278dc8fe3f", - "TargetParentOrChildId": "74332040-0f1d-4031-953b-799c210b8d07", - "TargetSlotId": "e15b6dc7-aaf9-4244-a4b8-4ac13ee7d23f" - }, - { - "SourceParentOrChildId": "e4fef484-22e3-461e-8677-e1ffabcb87b1", - "SourceSlotId": "e81c99ce-fcee-4e7c-a1c7-0aa3b352b7e1", - "TargetParentOrChildId": "7adf0c05-6be9-4472-a171-6470b0ab59ea", - "TargetSlotId": "4da253b7-4953-439a-b03f-1d515a78bddf" - }, - { - "SourceParentOrChildId": "e179735f-2a45-4086-9c1a-5add14b87b8c", - "SourceSlotId": "e4a8d926-7abd-4d2a-82a1-b7d140cb457f", - "TargetParentOrChildId": "8b161a5a-09ea-4b49-a9ff-dc46b96d44a9", - "TargetSlotId": "ebd35d33-dc73-46ae-a82c-2060d750018a" - }, - { - "SourceParentOrChildId": "10b991d3-0ec5-40b2-9f1c-78f8c9048ee8", - "SourceSlotId": "2ce1453b-432b-4d12-8fb7-d883e3d0c136", - "TargetParentOrChildId": "913845cc-dada-4f76-9259-b1ee7bb8241b", - "TargetSlotId": "777b2c27-a3c8-40d0-a196-80a08af51296" - }, - { - "SourceParentOrChildId": "913845cc-dada-4f76-9259-b1ee7bb8241b", - "SourceSlotId": "1680781d-af5e-4b77-beb6-3e4a12d73d59", - "TargetParentOrChildId": "9c257d30-71ae-4f88-8514-613c2529f1e1", - "TargetSlotId": "4525c76c-cdcf-47f3-aa96-335cfc5b5c1b" - }, - { - "SourceParentOrChildId": "365d216c-06b4-4c5f-a7db-c14d63bb2bf3", - "SourceSlotId": "0f7a4421-97d7-48d0-8a99-a7cc84356be2", - "TargetParentOrChildId": "9fdbfd1b-5f4c-4291-ad62-2d2725b4c113", - "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" - }, - { - "SourceParentOrChildId": "365d216c-06b4-4c5f-a7db-c14d63bb2bf3", - "SourceSlotId": "0f7a4421-97d7-48d0-8a99-a7cc84356be2", - "TargetParentOrChildId": "b6deb84a-1081-4813-9c07-ca4d40779adf", - "TargetSlotId": "29f6bc05-de55-4336-a275-f06b835c66f8" - }, - { - "SourceParentOrChildId": "a20d2377-e158-4e94-aae3-4d2de084f52e", - "SourceSlotId": "d140f068-d71e-4af5-a563-ab599dae5dbf", - "TargetParentOrChildId": "b6deb84a-1081-4813-9c07-ca4d40779adf", - "TargetSlotId": "4837051f-033c-4e9e-9d1c-0fe85c1467cb" - }, - { - "SourceParentOrChildId": "9fdbfd1b-5f4c-4291-ad62-2d2725b4c113", - "SourceSlotId": "e4a8d926-7abd-4d2a-82a1-b7d140cb457f", - "TargetParentOrChildId": "bc669038-58d7-4438-b6a0-479245473ecc", - "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" - }, - { - "SourceParentOrChildId": "74332040-0f1d-4031-953b-799c210b8d07", - "SourceSlotId": "73ebf863-ba71-421c-bee7-312f13c5eff0", - "TargetParentOrChildId": "bc669038-58d7-4438-b6a0-479245473ecc", - "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" - }, - { - "SourceParentOrChildId": "266bee6f-50a4-4fed-af73-049434a90287", - "SourceSlotId": "846bc771-7367-48e2-8389-206e2ee5c063", - "TargetParentOrChildId": "bc840e96-6675-4add-8a9b-d0e9de734d3d", - "TargetSlotId": "afadb109-37b2-49aa-8c32-627cc35fd574" - }, - { - "SourceParentOrChildId": "6a410b3d-a129-4238-bcb4-199a5e745517", - "SourceSlotId": "8d199a8d-b02e-4fa2-8f7d-b156e4302fe3", - "TargetParentOrChildId": "c27f55d8-0664-4c8a-ba87-64d1ad32872a", - "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" - }, - { - "SourceParentOrChildId": "017c0340-18d4-48ea-9c74-870f3209da99", - "SourceSlotId": "e21e3843-7d63-4db2-9234-77664e872a0f", - "TargetParentOrChildId": "ccb235a2-9a5d-4046-a503-808d212ab6a2", - "TargetSlotId": "82b2e8d3-40c2-4a4c-a9ad-806d5097a8fd" - }, - { - "SourceParentOrChildId": "f762f5ce-bfd8-4acd-866a-bff0d6f8f002", - "SourceSlotId": "2e1742d8-9ba3-4236-a0cd-a2b02c9f5924", - "TargetParentOrChildId": "d01aa3f5-89c7-40b6-83f1-5a8d09adc62d", - "TargetSlotId": "4da253b7-4953-439a-b03f-1d515a78bddf" - }, - { - "SourceParentOrChildId": "65d81281-ac06-4089-8bdb-5d95aa576465", - "SourceSlotId": "7a4c4feb-be2f-463e-96c6-cd9a6bad77a2", - "TargetParentOrChildId": "e179735f-2a45-4086-9c1a-5add14b87b8c", - "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" - }, - { - "SourceParentOrChildId": "9c257d30-71ae-4f88-8514-613c2529f1e1", - "SourceSlotId": "df388f27-f5b6-417b-87a7-a6a59b625128", - "TargetParentOrChildId": "e3f8f294-7190-4aaf-a34f-4ff95c2ac292", - "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" - }, - { - "SourceParentOrChildId": "e3f8f294-7190-4aaf-a34f-4ff95c2ac292", - "SourceSlotId": "e4a8d926-7abd-4d2a-82a1-b7d140cb457f", - "TargetParentOrChildId": "e4fef484-22e3-461e-8677-e1ffabcb87b1", - "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" - }, - { - "SourceParentOrChildId": "41797226-faa3-4870-ba62-0b8fda93384c", - "SourceSlotId": "e4a8d926-7abd-4d2a-82a1-b7d140cb457f", - "TargetParentOrChildId": "e4fef484-22e3-461e-8677-e1ffabcb87b1", - "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" - }, - { - "SourceParentOrChildId": "954bcc9a-1c74-492a-80fd-5abea51f54a1", - "SourceSlotId": "3f8b20a7-c8b8-45ab-86a1-0efcd927358e", - "TargetParentOrChildId": "e4fef484-22e3-461e-8677-e1ffabcb87b1", - "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" - }, - { - "SourceParentOrChildId": "3c141524-9b1a-4a4c-8971-743cdb213c03", - "SourceSlotId": "e81c99ce-fcee-4e7c-a1c7-0aa3b352b7e1", - "TargetParentOrChildId": "f762f5ce-bfd8-4acd-866a-bff0d6f8f002", - "TargetSlotId": "047b8fae-468c-48a7-8f3a-5fac8dd5b3c6" - } - ], - "Animator": [ - { - "InstanceId": "74332040-0f1d-4031-953b-799c210b8d07", - "InputId": "28f85ae9-ebae-4300-8aa0-738c6327cc44", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": -1.4564, - "Value": -1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.6123644150663141, - "OutTangentAngle": 3.7539570686561072 - }, - { - "Time": 0.0, - "Value": 0.02303958267925732, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.6123644150663141, - "OutTangentAngle": 3.24590643015761 - }, - { - "Time": 1.6165, - "Value": 0.19227709324510353, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.10431377656781704, - "OutTangentAngle": 3.15654618892032 - }, - { - "Time": 6.0, - "Value": 0.2578308015552926, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.014953535330526568, - "OutTangentAngle": 3.874186179941759 - }, - { - "Time": 6.825, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.7325935263519661, - "OutTangentAngle": -2.408999127237827 - } - ] - } - }, - { - "InstanceId": "5a5eff1a-1f54-40fc-882b-99117d0c4037", - "InputId": "b4a8c16d-5a0f-4867-ae03-92a675abe709", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 0.0713, - "Value": 0.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 5.7224, - "Value": 0.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Horizontal", - "OutEditMode": "Horizontal", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } - }, - { - "InstanceId": "9fdbfd1b-5f4c-4291-ad62-2d2725b4c113", - "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 1.8335, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 5.348, - "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 5.7397, - "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } - }, - { - "InstanceId": "e179735f-2a45-4086-9c1a-5add14b87b8c", - "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 5.6095, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 6.2171, - "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } - }, - { - "InstanceId": "a20d2377-e158-4e94-aae3-4d2de084f52e", - "InputId": "abf3456d-35bc-49ec-9aa6-c5571fbb209a", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 3.451, - "Value": -0.5, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.299504542816746, - "OutTangentAngle": 3.441097196406539 - }, - { - "Time": 6.7, - "Value": 0.5032699704170227, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.299504542816746, - "OutTangentAngle": -2.842088110773047 - } - ] - } - }, - { - "InstanceId": "41797226-faa3-4870-ba62-0b8fda93384c", - "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 7.5, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 7.9, - "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } - }, - { - "InstanceId": "954bcc9a-1c74-492a-80fd-5abea51f54a1", - "InputId": "0e5f05b4-5e8a-4f6d-8cac-03b04649eb67", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 5.4862, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 6.1282, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Horizontal", - "OutEditMode": "Horizontal", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 7.7132, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Horizontal", - "OutEditMode": "Horizontal", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 7.8784, - "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } - }, - { - "InstanceId": "29975a4f-8675-4294-81eb-51094d0a6a50", - "InputId": "abf3456d-35bc-49ec-9aa6-c5571fbb209a", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 2.3875, - "Value": -1.309999942779541, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 1.2844441311561425, - "OutTangentAngle": 4.426036784745936 - }, - { - "Time": 3.1295, - "Value": 1.2100000381469727, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Horizontal", - "OutEditMode": "Horizontal", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } + "TargetParentOrChildId": "e179735f-2a45-4086-9c1a-5add14b87b8c", + "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" }, { - "InstanceId": "f762f5ce-bfd8-4acd-866a-bff0d6f8f002", - "InputId": "313596cc-3854-436b-89da-5fd40164ce76", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 2.5, - "Value": 0.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 2.8125, - "Value": 0.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 5.6, - "Value": 0.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Horizontal", - "OutEditMode": "Horizontal", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } + "SourceParentOrChildId": "9c257d30-71ae-4f88-8514-613c2529f1e1", + "SourceSlotId": "df388f27-f5b6-417b-87a7-a6a59b625128", + "TargetParentOrChildId": "e3f8f294-7190-4aaf-a34f-4ff95c2ac292", + "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" }, { - "InstanceId": "c27f55d8-0664-4c8a-ba87-64d1ad32872a", - "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", + "SourceParentOrChildId": "e3f8f294-7190-4aaf-a34f-4ff95c2ac292", + "SourceSlotId": "e4a8d926-7abd-4d2a-82a1-b7d140cb457f", + "TargetParentOrChildId": "e4fef484-22e3-461e-8677-e1ffabcb87b1", + "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" + }, + { + "SourceParentOrChildId": "41797226-faa3-4870-ba62-0b8fda93384c", + "SourceSlotId": "e4a8d926-7abd-4d2a-82a1-b7d140cb457f", + "TargetParentOrChildId": "e4fef484-22e3-461e-8677-e1ffabcb87b1", + "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" + }, + { + "SourceParentOrChildId": "954bcc9a-1c74-492a-80fd-5abea51f54a1", + "SourceSlotId": "3f8b20a7-c8b8-45ab-86a1-0efcd927358e", + "TargetParentOrChildId": "e4fef484-22e3-461e-8677-e1ffabcb87b1", + "TargetSlotId": "5d73ebe6-9aa0-471a-ae6b-3f5bfd5a0f9c" + } + ], + "Animator": [ + { + "InstanceId": "74332040-0f1d-4031-953b-799c210b8d07", + "InputId": "28f85ae9-ebae-4300-8aa0-738c6327cc44", "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", "Keys": [ { - "Time": 2.8719, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 2.9309, - "Value": 1.0, + "Time": -1.4564, + "Value": -1.0, "InType": "Linear", "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 + "InTangentAngle": 0.6123644150663141, + "OutTangentAngle": 3.7539570686561072 }, { - "Time": 4.5625, - "Value": 1.0, + "Time": 0.0, + "Value": 0.02303958267925732, "InType": "Linear", "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 + "InTangentAngle": 0.6123644150663141, + "OutTangentAngle": 3.24590643015761 }, { - "Time": 6.0, - "Value": 1.0, + "Time": 1.6165, + "Value": 0.19227709324510353, "InType": "Linear", "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 + "InTangentAngle": 0.10431377656781704, + "OutTangentAngle": 3.15654618892032 }, { - "Time": 7.1, - "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } - }, - { - "InstanceId": "266bee6f-50a4-4fed-af73-049434a90287", - "InputId": "e92432c8-6ceb-494b-9cf4-b21191567b29", - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 2.8713, - "Value": 1.0, + "Time": 6.0, + "Value": 0.2578308015552926, "InType": "Linear", "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 + "InTangentAngle": 0.014953535330526568, + "OutTangentAngle": 3.874186179941759 }, { - "Time": 4.725, + "Time": 6.825, "Value": 1.0, "InType": "Spline", "OutType": "Spline", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 + "InTangentAngle": 0.7325935263519661, + "OutTangentAngle": -2.408999127237827 } ] } @@ -1844,7 +892,6 @@ { "InstanceId": "5a5eff1a-1f54-40fc-882b-99117d0c4037", "InputId": "b4a8c16d-5a0f-4867-ae03-92a675abe709", - "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", @@ -1875,7 +922,6 @@ { "InstanceId": "9fdbfd1b-5f4c-4291-ad62-2d2725b4c113", "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", @@ -1916,7 +962,6 @@ { "InstanceId": "e179735f-2a45-4086-9c1a-5add14b87b8c", "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", @@ -1947,30 +992,29 @@ { "InstanceId": "a20d2377-e158-4e94-aae3-4d2de084f52e", "InputId": "abf3456d-35bc-49ec-9aa6-c5571fbb209a", - "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", "Keys": [ { "Time": 3.451, - "Value": 0.0, + "Value": -0.5, "InType": "Spline", "OutType": "Spline", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 + "InTangentAngle": 0.299504542816746, + "OutTangentAngle": 3.441097196406539 }, { "Time": 6.7, - "Value": 0.0, + "Value": 0.5032699704170227, "InType": "Spline", "OutType": "Spline", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 + "InTangentAngle": 0.299504542816746, + "OutTangentAngle": -2.842088110773047 } ] } @@ -1978,7 +1022,6 @@ { "InstanceId": "41797226-faa3-4870-ba62-0b8fda93384c", "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", @@ -2007,138 +1050,14 @@ } }, { - "InstanceId": "954bcc9a-1c74-492a-80fd-5abea51f54a1", - "InputId": "0e5f05b4-5e8a-4f6d-8cac-03b04649eb67", - "Index": 1, - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 5.4862, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 6.1282, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Horizontal", - "OutEditMode": "Horizontal", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 7.7132, - "Value": 1.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Horizontal", - "OutEditMode": "Horizontal", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 7.8784, - "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } - }, - { - "InstanceId": "29975a4f-8675-4294-81eb-51094d0a6a50", - "InputId": "abf3456d-35bc-49ec-9aa6-c5571fbb209a", - "Index": 1, - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 2.3875, - "Value": 0.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 3.1295, - "Value": 0.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Horizontal", - "OutEditMode": "Horizontal", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } - }, - { - "InstanceId": "f762f5ce-bfd8-4acd-866a-bff0d6f8f002", - "InputId": "313596cc-3854-436b-89da-5fd40164ce76", - "Index": 1, - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 2.5, - "Value": 0.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 2.8125, - "Value": 0.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 5.6, - "Value": 0.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Horizontal", - "OutEditMode": "Horizontal", - "InTangentAngle": 0.0, - "OutTangentAngle": -3.141592653589793 - } - ] - } - }, - { - "InstanceId": "c27f55d8-0664-4c8a-ba87-64d1ad32872a", - "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Index": 1, + "InstanceId": "954bcc9a-1c74-492a-80fd-5abea51f54a1", + "InputId": "0e5f05b4-5e8a-4f6d-8cac-03b04649eb67", "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", "Keys": [ { - "Time": 2.8719, + "Time": 5.4862, "Value": 1.0, "InType": "Spline", "OutType": "Spline", @@ -2148,37 +1067,27 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 2.9309, - "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.0, - "OutTangentAngle": 3.141592653589793 - }, - { - "Time": 4.5625, + "Time": 6.1282, "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", + "InType": "Spline", + "OutType": "Spline", + "InEditMode": "Horizontal", + "OutEditMode": "Horizontal", "InTangentAngle": 0.0, "OutTangentAngle": 3.141592653589793 }, { - "Time": 6.0, + "Time": 7.7132, "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", + "InType": "Spline", + "OutType": "Spline", + "InEditMode": "Horizontal", + "OutEditMode": "Horizontal", "InTangentAngle": 0.0, "OutTangentAngle": 3.141592653589793 }, { - "Time": 7.1, + "Time": 7.8784, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -2191,30 +1100,39 @@ } }, { - "InstanceId": "266bee6f-50a4-4fed-af73-049434a90287", - "InputId": "e92432c8-6ceb-494b-9cf4-b21191567b29", - "Index": 1, + "InstanceId": "8b161a5a-09ea-4b49-a9ff-dc46b96d44a9", + "InputId": "51621e59-9bdd-4004-a053-d4637278bd92", "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", "Keys": [ { - "Time": 2.8713, - "Value": 0.9999899864196777, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", + "Time": 0.0, + "Value": 1.0, + "InType": "Constant", + "OutType": "Constant", + "InEditMode": "Constant", + "OutEditMode": "Constant", "InTangentAngle": 0.0, "OutTangentAngle": 3.141592653589793 }, { - "Time": 4.725, - "Value": 0.9999899864196777, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", + "Time": 0.09, + "Value": 0.0, + "InType": "Constant", + "OutType": "Constant", + "InEditMode": "Constant", + "OutEditMode": "Constant", + "InTangentAngle": 0.0, + "OutTangentAngle": 3.141592653589793 + }, + { + "Time": 0.825, + "Value": 0.0, + "InType": "Constant", + "OutType": "Constant", + "InEditMode": "Constant", + "OutEditMode": "Constant", "InTangentAngle": 0.0, "OutTangentAngle": -3.141592653589793 } @@ -2224,24 +1142,24 @@ { "InstanceId": "5a5eff1a-1f54-40fc-882b-99117d0c4037", "InputId": "b4a8c16d-5a0f-4867-ae03-92a675abe709", - "Index": 2, + "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", "Keys": [ { "Time": 0.0713, - "Value": 1.4773343801498413, + "Value": 0.0, "InType": "Spline", "OutType": "Spline", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": -0.08426748650009852, - "OutTangentAngle": 3.0573251670896946 + "InTangentAngle": 0.0, + "OutTangentAngle": 3.141592653589793 }, { "Time": 5.7224, - "Value": 1.0, + "Value": 0.0, "InType": "Spline", "OutType": "Spline", "InEditMode": "Horizontal", @@ -2255,7 +1173,7 @@ { "InstanceId": "9fdbfd1b-5f4c-4291-ad62-2d2725b4c113", "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Index": 2, + "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", @@ -2296,7 +1214,7 @@ { "InstanceId": "e179735f-2a45-4086-9c1a-5add14b87b8c", "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Index": 2, + "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", @@ -2324,10 +1242,41 @@ ] } }, + { + "InstanceId": "a20d2377-e158-4e94-aae3-4d2de084f52e", + "InputId": "abf3456d-35bc-49ec-9aa6-c5571fbb209a", + "Index": 1, + "Curve": { + "PreCurve": "Constant", + "PostCurve": "Constant", + "Keys": [ + { + "Time": 3.451, + "Value": 0.0, + "InType": "Spline", + "OutType": "Spline", + "InEditMode": "Linear", + "OutEditMode": "Linear", + "InTangentAngle": 0.0, + "OutTangentAngle": 3.141592653589793 + }, + { + "Time": 6.7, + "Value": 0.0, + "InType": "Spline", + "OutType": "Spline", + "InEditMode": "Linear", + "OutEditMode": "Linear", + "InTangentAngle": 0.0, + "OutTangentAngle": -3.141592653589793 + } + ] + } + }, { "InstanceId": "41797226-faa3-4870-ba62-0b8fda93384c", "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Index": 2, + "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", @@ -2358,7 +1307,7 @@ { "InstanceId": "954bcc9a-1c74-492a-80fd-5abea51f54a1", "InputId": "0e5f05b4-5e8a-4f6d-8cac-03b04649eb67", - "Index": 2, + "Index": 1, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", @@ -2407,36 +1356,26 @@ } }, { - "InstanceId": "f762f5ce-bfd8-4acd-866a-bff0d6f8f002", - "InputId": "313596cc-3854-436b-89da-5fd40164ce76", + "InstanceId": "5a5eff1a-1f54-40fc-882b-99117d0c4037", + "InputId": "b4a8c16d-5a0f-4867-ae03-92a675abe709", "Index": 2, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", "Keys": [ { - "Time": 2.5, - "Value": 1.7899999618530273, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 0.5916859122386131, - "OutTangentAngle": 3.7332785658284062 - }, - { - "Time": 2.8125, - "Value": 2.0, + "Time": 0.0713, + "Value": 1.4773343801498413, "InType": "Spline", "OutType": "Spline", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 0.591685912238613, - "OutTangentAngle": 3.3190774250845028 + "InTangentAngle": -0.08426748650009852, + "OutTangentAngle": 3.0573251670896946 }, { - "Time": 5.6, - "Value": 2.5, + "Time": 5.7224, + "Value": 1.0, "InType": "Spline", "OutType": "Spline", "InEditMode": "Horizontal", @@ -2448,7 +1387,7 @@ } }, { - "InstanceId": "c27f55d8-0664-4c8a-ba87-64d1ad32872a", + "InstanceId": "9fdbfd1b-5f4c-4291-ad62-2d2725b4c113", "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", "Index": 2, "Curve": { @@ -2456,7 +1395,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 2.8719, + "Time": 1.8335, "Value": 1.0, "InType": "Spline", "OutType": "Spline", @@ -2466,7 +1405,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 2.9309, + "Time": 5.348, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -2476,27 +1415,69 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 4.5625, + "Time": 5.7397, "Value": 1.0, "InType": "Linear", "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", "InTangentAngle": 0.0, + "OutTangentAngle": -3.141592653589793 + } + ] + } + }, + { + "InstanceId": "e179735f-2a45-4086-9c1a-5add14b87b8c", + "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", + "Index": 2, + "Curve": { + "PreCurve": "Constant", + "PostCurve": "Constant", + "Keys": [ + { + "Time": 5.6095, + "Value": 1.0, + "InType": "Spline", + "OutType": "Spline", + "InEditMode": "Linear", + "OutEditMode": "Linear", + "InTangentAngle": 0.0, "OutTangentAngle": 3.141592653589793 }, { - "Time": 6.0, + "Time": 6.2171, "Value": 1.0, "InType": "Linear", "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", "InTangentAngle": 0.0, + "OutTangentAngle": -3.141592653589793 + } + ] + } + }, + { + "InstanceId": "41797226-faa3-4870-ba62-0b8fda93384c", + "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", + "Index": 2, + "Curve": { + "PreCurve": "Constant", + "PostCurve": "Constant", + "Keys": [ + { + "Time": 7.5, + "Value": 1.0, + "InType": "Spline", + "OutType": "Spline", + "InEditMode": "Linear", + "OutEditMode": "Linear", + "InTangentAngle": 0.0, "OutTangentAngle": 3.141592653589793 }, { - "Time": 7.1, + "Time": 7.9, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -2509,28 +1490,48 @@ } }, { - "InstanceId": "266bee6f-50a4-4fed-af73-049434a90287", - "InputId": "e92432c8-6ceb-494b-9cf4-b21191567b29", + "InstanceId": "954bcc9a-1c74-492a-80fd-5abea51f54a1", + "InputId": "0e5f05b4-5e8a-4f6d-8cac-03b04649eb67", "Index": 2, "Curve": { "PreCurve": "Constant", "PostCurve": "Constant", "Keys": [ { - "Time": 2.8713, - "Value": 0.9999899864196777, - "InType": "Linear", - "OutType": "Linear", + "Time": 5.4862, + "Value": 1.0, + "InType": "Spline", + "OutType": "Spline", "InEditMode": "Linear", "OutEditMode": "Linear", "InTangentAngle": 0.0, "OutTangentAngle": 3.141592653589793 }, { - "Time": 4.725, - "Value": 0.9999899864196777, + "Time": 6.1282, + "Value": 1.0, + "InType": "Spline", + "OutType": "Spline", + "InEditMode": "Horizontal", + "OutEditMode": "Horizontal", + "InTangentAngle": 0.0, + "OutTangentAngle": 3.141592653589793 + }, + { + "Time": 7.7132, + "Value": 1.0, "InType": "Spline", "OutType": "Spline", + "InEditMode": "Horizontal", + "OutEditMode": "Horizontal", + "InTangentAngle": 0.0, + "OutTangentAngle": 3.141592653589793 + }, + { + "Time": 7.8784, + "Value": 1.0, + "InType": "Linear", + "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", "InTangentAngle": 0.0, @@ -2692,98 +1693,6 @@ } ] } - }, - { - "InstanceId": "c27f55d8-0664-4c8a-ba87-64d1ad32872a", - "InputId": "ed4f8c30-7b71-4649-97e6-710a718039b0", - "Index": 3, - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 2.8719, - "Value": 0.8899999856948853, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 1.078482791398459, - "OutTangentAngle": 4.220075444988252 - }, - { - "Time": 2.9309, - "Value": 1.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": 1.078482791398459, - "OutTangentAngle": 2.9835685230060056 - }, - { - "Time": 4.5625, - "Value": 0.7400000095367432, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": -0.1580241305837875, - "OutTangentAngle": 2.8068558162729786 - }, - { - "Time": 6.0, - "Value": 0.24000000953674316, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": -0.3347368373168147, - "OutTangentAngle": 2.9267772449123237 - }, - { - "Time": 7.1, - "Value": 0.0, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": -0.2148154086774694, - "OutTangentAngle": -3.3564080622672625 - } - ] - } - }, - { - "InstanceId": "266bee6f-50a4-4fed-af73-049434a90287", - "InputId": "e92432c8-6ceb-494b-9cf4-b21191567b29", - "Index": 3, - "Curve": { - "PreCurve": "Constant", - "PostCurve": "Constant", - "Keys": [ - { - "Time": 2.8713, - "Value": 0.46000000834465027, - "InType": "Linear", - "OutType": "Linear", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": -0.24323894239931398, - "OutTangentAngle": 2.898353711190479 - }, - { - "Time": 4.725, - "Value": 0.0, - "InType": "Spline", - "OutType": "Spline", - "InEditMode": "Linear", - "OutEditMode": "Linear", - "InTangentAngle": -0.24323894239931443, - "OutTangentAngle": -3.3848315959891075 - } - ] - } } ] } \ No newline at end of file diff --git a/Operators/Types/user/pixtur/examples/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3ui b/Operators/Types/user/pixtur/examples/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3ui index 936d33b3b9..1c7b6c2e52 100644 --- a/Operators/Types/user/pixtur/examples/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3ui +++ b/Operators/Types/user/pixtur/examples/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3ui @@ -6,21 +6,21 @@ { "ChildId": "74332040-0f1d-4031-953b-799c210b8d07"/*DrawLines*/, "Position": { - "X": 428.0415, - "Y": 60.239716 + "X": 578.0415, + "Y": 87.239716 } }, { "ChildId": "d54f20b9-404a-421d-b898-6040cdb5454a"/*LinearGradient*/, "Position": { - "X": 179.39569, - "Y": 266.54858 + "X": 428.0415, + "Y": 280.23972 } }, { "ChildId": "65d81281-ac06-4089-8bdb-5d95aa576465"/*RenderTarget*/, "Position": { - "X": 878.0415, + "X": 1028.0415, "Y": 4.2397156 } }, @@ -34,7 +34,7 @@ { "ChildId": "5a5eff1a-1f54-40fc-882b-99117d0c4037"/*Transform*/, "Position": { - "X": 728.0415, + "X": 878.0415, "Y": 4.2397156 } }, @@ -48,7 +48,7 @@ { "ChildId": "e179735f-2a45-4086-9c1a-5add14b87b8c"/*Layer2d*/, "Position": { - "X": 1028.0415, + "X": 1178.0415, "Y": 4.2397156 } }, @@ -62,42 +62,42 @@ { "ChildId": "13c6661e-158f-41f2-8b37-f7f5757bf360"/*ListToBuffer*/, "Position": { - "X": 278.0415, - "Y": 60.239716 + "X": 428.0415, + "Y": 98.239716 } }, { "ChildId": "017c0340-18d4-48ea-9c74-870f3209da99"/*LoadSvg*/, "Position": { - "X": -21.958496, - "Y": 60.239716 + "X": 128.0415, + "Y": 87.239716 } }, { "ChildId": "ccb235a2-9a5d-4046-a503-808d212ab6a2"/*PrepareSvgLineTransition*/, "Position": { - "X": 128.0415, - "Y": 60.239716 + "X": 278.0415, + "Y": 87.239716 } }, { "ChildId": "54dbf23d-70a7-413b-95dc-e56e61f129c4"/*LoadImage*/, "Position": { - "X": 26.516434, - "Y": 510.20758 + "X": 278.0415, + "Y": 44.239716 } }, { "ChildId": "9fdbfd1b-5f4c-4291-ad62-2d2725b4c113"/*Layer2d*/, "Position": { - "X": 410.19644, - "Y": 431.9317 + "X": 578.0415, + "Y": 4.2397156 } }, { "ChildId": "bc669038-58d7-4438-b6a0-479245473ecc"/*Execute*/, "Position": { - "X": 578.0415, + "X": 728.0415, "Y": 4.2397156 } }, @@ -118,22 +118,22 @@ { "ChildId": "7adf0c05-6be9-4472-a171-6470b0ab59ea"/*RenderTarget*/, "Position": { - "X": 2258.047, - "Y": 35.249023 + "X": 2228.0415, + "Y": 4.2397156 } }, { "ChildId": "b6deb84a-1081-4813-9c07-ca4d40779adf"/*BlurWithMask*/, "Position": { - "X": 1781.0725, - "Y": 233.9515 + "X": 1778.0415, + "Y": 523.23975 } }, { "ChildId": "a20d2377-e158-4e94-aae3-4d2de084f52e"/*LinearGradient*/, "Position": { - "X": 1199.9109, - "Y": 383.35193 + "X": 1628.0415, + "Y": 523.23975 } }, { @@ -146,148 +146,22 @@ { "ChildId": "41797226-faa3-4870-ba62-0b8fda93384c"/*Layer2d*/, "Position": { - "X": 1931.0725, - "Y": 233.9515 + "X": 1928.0415, + "Y": 523.23975 } }, { "ChildId": "365d216c-06b4-4c5f-a7db-c14d63bb2bf3"/*Crop*/, "Position": { - "X": 176.51643, - "Y": 510.20758 + "X": 428.0415, + "Y": 44.239716 } }, { "ChildId": "954bcc9a-1c74-492a-80fd-5abea51f54a1"/*Text*/, "Position": { - "X": 1912.6792, - "Y": 467.94385 - } - }, - { - "ChildId": "55ed6a86-631d-46b9-b387-9df1a0de39f6"/*DetectEdges*/, - "Position": { - "X": 2420.6597, - "Y": -51.93091 - } - }, - { - "ChildId": "d01aa3f5-89c7-40b6-83f1-5a8d09adc62d"/*RenderTarget*/, - "Position": { - "X": 2306.3774, - "Y": 982.7835 - } - }, - { - "ChildId": "dbdf0a88-3a43-4bde-915f-c99f7085e1b3"/*LoadImage*/, - "Position": { - "X": 1138.2631, - "Y": 993.5437 - } - }, - { - "ChildId": "1c5a9fae-fdc0-4a2b-84a1-7b4eecc40bbb"/*Crop*/, - "Position": { - "X": 1288.2631, - "Y": 993.5437 - } - }, - { - "ChildId": "c27f55d8-0664-4c8a-ba87-64d1ad32872a"/*Layer2d*/, - "Position": { - "X": 1588.2631, - "Y": 993.5437 - } - }, - { - "ChildId": "213d8d2c-8302-4914-9076-44e04e46de5f"/*Grain*/, - "Position": { - "X": 2905.294, - "Y": 844.1579 - } - }, - { - "ChildId": "485cbaff-86d3-482c-bb88-742e2060be8c"/*ColorGrade*/, - "Position": { - "X": 2681.1394, - "Y": 982.7835 - } - }, - { - "ChildId": "6a410b3d-a129-4238-bcb4-199a5e745517"/*BlurWithMask*/, - "Position": { - "X": 1438.2631, - "Y": 993.5437 - } - }, - { - "ChildId": "29975a4f-8675-4294-81eb-51094d0a6a50"/*LinearGradient*/, - "Position": { - "X": 1285.7968, - "Y": 1105.5679 - } - }, - { - "ChildId": "3c141524-9b1a-4a4c-8971-743cdb213c03"/*Execute*/, - "Position": { - "X": 1888.2631, - "Y": 993.5437 - } - }, - { - "ChildId": "f762f5ce-bfd8-4acd-866a-bff0d6f8f002"/*Camera*/, - "Position": { - "X": 2038.2631, - "Y": 993.5437 - } - }, - { - "ChildId": "266bee6f-50a4-4fed-af73-049434a90287"/*DustParticles*/, - "Position": { - "X": 1588.2631, - "Y": 1135.5437 - } - }, - { - "ChildId": "bc840e96-6675-4add-8a9b-d0e9de734d3d"/*SetFog*/, - "Position": { - "X": 1738.2631, - "Y": 1135.5437 - } - }, - { - "ChildId": "ce6c111f-cfe0-488e-be45-2e5b2c072962"/*Grain*/, - "Position": { - "X": 2541.3906, - "Y": 1187.827 - } - }, - { - "ChildId": "25bd2f25-ea61-448e-b594-191af16b8489"/*WaveForm2*/, - "Position": { - "X": 2898.797, - "Y": 1229.8855 - } - }, - { - "ChildId": "4dc12b23-60fe-4e64-8a45-992ac57f07bc"/*ImageLevels*/, - "Position": { - "X": 2955.324, - "Y": 991.6649 - } - }, - { - "ChildId": "c12d9089-9edf-418c-8121-478c50ff2d7e"/*LinearGradient*/, - "Position": { - "X": 2707.7559, - "Y": 620.5015 - } - }, - { - "ChildId": "0791be4c-dfcf-4444-a5af-1ac1edfb03de"/*ColorGrade*/, - "Position": { - "X": 2652.5635, - "Y": 797.6701 + "X": 1928.0415, + "Y": 612.23975 } } ], @@ -295,8 +169,8 @@ { "OutputId": "80df5695-1d1e-46f3-ac5f-89a4294317d7"/*ColorBuffer*/, "Position": { - "X": 2668.047, - "Y": 245.8255 + "X": 2378.0415, + "Y": 4.2397156 } } ] diff --git a/Operators/Types/user/pixtur/learning/cs/05-physarum/Physarum02_796a66ff-93e7-4bf7-81c0-0fee903262b8.t3 b/Operators/Types/user/pixtur/learning/cs/05-physarum/Physarum02_796a66ff-93e7-4bf7-81c0-0fee903262b8.t3 index 23a8df7fd5..0798957ca0 100644 --- a/Operators/Types/user/pixtur/learning/cs/05-physarum/Physarum02_796a66ff-93e7-4bf7-81c0-0fee903262b8.t3 +++ b/Operators/Types/user/pixtur/learning/cs/05-physarum/Physarum02_796a66ff-93e7-4bf7-81c0-0fee903262b8.t3 @@ -26,12 +26,12 @@ { "Id": "e3395a18-619b-4fcc-b16c-c04d1df8afd9"/*Contrast*/, "Type": "System.Single", - "Value": -0.81 + "Value": -0.62 }, { "Id": "f6753ecc-a97e-4854-9f27-09bb9000858c"/*Saturation*/, "Type": "System.Single", - "Value": 0.66 + "Value": 0.78 }, { "Id": "008b025e-64eb-44c3-8959-dc8ac5dc2cbb"/*PreventClamping*/, @@ -74,7 +74,7 @@ { "Id": "351eb848-829d-48cb-96c3-16c00366d34f"/*AgentCount*/, "Type": "System.Int32", - "Value": 1000 + "Value": 10003 }, { "Id": "2b19f72d-db37-4e02-a780-2bb82adb1b54"/*ComputeSteps*/, @@ -98,6 +98,11 @@ "Width": 2, "Height": 2 } + }, + { + "Id": "b3c90262-6b98-476b-a2a1-f8b3d00d9bb5"/*AngleLockFactor*/, + "Type": "System.Single", + "Value": 0.95 } ], "Outputs": [] @@ -110,8 +115,8 @@ "Id": "8c4e188c-18ab-4f69-a60a-14a8e5a12f91"/*ComfortZones*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.06, - "Y": 0.23, + "X": 0.0, + "Y": 0.95, "Z": 0.0, "W": 0.0 } @@ -120,8 +125,8 @@ "Id": "9a4d8846-6b46-4a4b-a8d3-97f3f9eaf8db"/*Emit*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 1.56, - "Y": 0.0, + "X": 19.4, + "Y": 20.0, "Z": 0.0, "W": 1.0 } @@ -129,37 +134,37 @@ { "Id": "4dd19c0b-10c1-43fa-a3e2-970b4f9c6162"/*SideAngle*/, "Type": "System.Single", - "Value": 46.4 + "Value": 28.0 }, { "Id": "11ba5bbc-4873-489f-85b7-35080f0988cf"/*SideRadius*/, "Type": "System.Single", - "Value": 52.31 + "Value": 132.0 }, { "Id": "e95c5f4d-df12-42f6-a879-8e26540b03ac"/*FrontRadius*/, "Type": "System.Single", - "Value": 82.0 + "Value": 100.0 }, { "Id": "6eb81dc2-88b5-4ba7-9f82-fe2389dc2926"/*BaseMovement*/, "Type": "System.Single", - "Value": -3.8999999 + "Value": 31.0 }, { "Id": "e9fd2c91-7cee-481e-933b-a40a27da15dc"/*BaseRotation*/, "Type": "System.Single", - "Value": 5.2 + "Value": 0.03 }, { "Id": "211fd6ee-26a9-4e15-85ba-4a22e865545d"/*MoveToComfort*/, "Type": "System.Single", - "Value": 28.8 + "Value": -0.2999997 }, { "Id": "8367cbad-6214-4167-855b-9f704bb46ac3"/*RotateToComfort*/, "Type": "System.Single", - "Value": 115.0 + "Value": 340.0 } ], "Outputs": [] @@ -525,60 +530,40 @@ "Id": "2d8836cb-6bd4-4877-a04c-9c45915d8ddb"/*_SpeciesDefinition*/, "SymbolId": "924b8cc0-5b4b-41d0-a71b-b26465683910", "InputValues": [ - { - "Id": "8c4e188c-18ab-4f69-a60a-14a8e5a12f91"/*ComfortZones*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.0, - "Y": 0.95, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Id": "9a4d8846-6b46-4a4b-a8d3-97f3f9eaf8db"/*Emit*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 19.4, - "Y": 20.0, - "Z": 0.0, - "W": 1.0 - } - }, { "Id": "4dd19c0b-10c1-43fa-a3e2-970b4f9c6162"/*SideAngle*/, "Type": "System.Single", - "Value": 28.0 + "Value": 3.3 }, { "Id": "11ba5bbc-4873-489f-85b7-35080f0988cf"/*SideRadius*/, "Type": "System.Single", - "Value": 132.0 + "Value": -40.0 }, { "Id": "e95c5f4d-df12-42f6-a879-8e26540b03ac"/*FrontRadius*/, "Type": "System.Single", - "Value": 100.0 + "Value": 23.7 }, { "Id": "6eb81dc2-88b5-4ba7-9f82-fe2389dc2926"/*BaseMovement*/, "Type": "System.Single", - "Value": 31.0 + "Value": 6.5 }, { "Id": "e9fd2c91-7cee-481e-933b-a40a27da15dc"/*BaseRotation*/, "Type": "System.Single", - "Value": 0.03 + "Value": 3.58 }, { "Id": "211fd6ee-26a9-4e15-85ba-4a22e865545d"/*MoveToComfort*/, "Type": "System.Single", - "Value": -0.2999997 + "Value": 0.09 }, { "Id": "8367cbad-6214-4167-855b-9f704bb46ac3"/*RotateToComfort*/, "Type": "System.Single", - "Value": 340.0 + "Value": -230.0 } ], "Outputs": [] @@ -652,25 +637,38 @@ { "Id": "0212bfb2-9f5f-4d60-aab0-3f9525bd7bfc"/*Specularity*/, "Type": "System.Single", - "Value": -1.3999999 + "Value": 0.24 }, { "Id": "4aa128ab-d0a8-42d5-800f-6992959bd0cf"/*Shade*/, "Type": "System.Single", - "Value": 0.48 + "Value": 0.5 + }, + { + "Id": "7f0c127b-ee60-44c8-8490-2d3599cde4a2"/*Twist*/, + "Type": "System.Single", + "Value": 10.0 + }, + { + "Id": "03298545-a5d6-44d5-bb7c-4747172d2667"/*Direction*/, + "Type": "System.Numerics.Vector2", + "Value": { + "X": -0.13, + "Y": -0.29 + } }, { "Id": "767ddbe0-202f-4d0b-9aa1-9a22d61a2d40"/*Amount*/, "Type": "System.Single", - "Value": 1.0 + "Value": 0.86 }, { "Id": "9d5e3055-c17e-4013-963d-e17c76b707c1"/*HighlightColor*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 2.1488311, - "Y": 2.197133, - "Z": 2.2, + "X": 11.518268, + "Y": 11.518268, + "Z": 11.518268, "W": 1.0 } }, @@ -678,21 +676,21 @@ "Id": "9c9e9e49-2f3a-4746-ac1f-c5fb1b3dd96b"/*MidColor*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.25069895, - "Y": 0.2541304, - "Z": 0.6157205, + "X": 0.25538662, + "Y": 0.2597321, + "Z": 0.61572045, "W": 0.0 } }, { "Id": "d162a7e1-1906-45bc-a896-10ee2c2483fe"/*BlurRadius*/, "Type": "System.Single", - "Value": 0.23 + "Value": 0.04 }, { "Id": "f93db0c6-c5ed-40da-9677-0c284618f5bb"/*SampleRadius*/, "Type": "System.Single", - "Value": -4.8 + "Value": 1.3 } ], "Outputs": [] @@ -715,9 +713,9 @@ "Id": "de54f18b-6a1e-4610-8d6d-58897df6959b"/*Background*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.48528373, - "Y": 0.4852838, - "Z": 0.4852786, + "X": 0.025281321, + "Y": 0.025281325, + "Z": 0.025281055, "W": 1.0 } }, @@ -781,9 +779,9 @@ "Id": "de54f18b-6a1e-4610-8d6d-58897df6959b"/*Background*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.06109723, - "Y": 0.30711663, - "Z": 0.3886463, + "X": 0.031210445, + "Y": 0.15688509, + "Z": 0.19853309, "W": 1.0 } }, @@ -816,7 +814,7 @@ { "Id": "579e72d6-638e-4b17-bb4e-88a55e3a1d4d"/*X*/, "Type": "System.Int32", - "Value": 1 + "Value": 7 }, { "Id": "53602af2-48d9-42ab-80c3-ae1f1e600d28"/*Y*/, @@ -833,7 +831,7 @@ { "Id": "3332b1e1-282d-4c41-9fe3-e609611ade51"/*LineWidth*/, "Type": "System.Single", - "Value": 0.02 + "Value": 0.01 } ], "Outputs": [] @@ -1128,194 +1126,6 @@ } ], "Outputs": [] - }, - { - "Id": "31de3226-c8ea-4749-935c-3107cc1abf79"/*_MovingAgents02*/, - "SymbolId": "4edc34ed-36f4-4f24-837f-4cc5696b2baa", - "InputValues": [ - { - "Id": "f333dbce-cc54-43ba-99b0-065426820f36"/*RestoreLayout*/, - "Type": "System.Single", - "Value": 0.0019999999 - }, - { - "Id": "8ba49b49-8eee-461b-acd8-ba6bc21ba866"/*RestoreLayoutEnabled*/, - "Type": "System.Boolean", - "Value": false - }, - { - "Id": "3b2e07ad-8218-4740-9e3e-17949ed5fca6"/*ShowAgents*/, - "Type": "System.Boolean", - "Value": false - }, - { - "Id": "693957bc-5364-404d-84cd-0248fc609eca"/*Resolution*/, - "Type": "SharpDX.Size2", - "Value": { - "Width": 0, - "Height": 0 - } - }, - { - "Id": "351eb848-829d-48cb-96c3-16c00366d34f"/*AgentCount*/, - "Type": "System.Int32", - "Value": 10000 - }, - { - "Id": "2b19f72d-db37-4e02-a780-2bb82adb1b54"/*ComputeSteps*/, - "Type": "System.Int32", - "Value": 2 - }, - { - "Id": "9c6960f3-ac8d-4ab7-a34e-e24a6217b092"/*DecayRatio*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.97, - "Y": 0.98, - "Z": 0.99, - "W": 1.0 - } - }, - { - "Id": "ad6beaae-4d4b-4f3b-ad7b-7d6389789610"/*BlockCount*/, - "Type": "SharpDX.Size2", - "Value": { - "Width": 2, - "Height": 2 - } - } - ], - "Outputs": [] - }, - { - "Id": "792d29fe-88d8-4fa2-a0e8-6bb0ad60f236"/*_SpeciesDefinition*/, - "SymbolId": "924b8cc0-5b4b-41d0-a71b-b26465683910", - "InputValues": [ - { - "Id": "8c4e188c-18ab-4f69-a60a-14a8e5a12f91"/*ComfortZones*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.41355875, - "Y": -9.979009, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Id": "9a4d8846-6b46-4a4b-a8d3-97f3f9eaf8db"/*Emit*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 1.56, - "Y": 0.0, - "Z": 0.0, - "W": 1.0 - } - }, - { - "Id": "4dd19c0b-10c1-43fa-a3e2-970b4f9c6162"/*SideAngle*/, - "Type": "System.Single", - "Value": 68.99081 - }, - { - "Id": "11ba5bbc-4873-489f-85b7-35080f0988cf"/*SideRadius*/, - "Type": "System.Single", - "Value": -0.47933006 - }, - { - "Id": "e95c5f4d-df12-42f6-a879-8e26540b03ac"/*FrontRadius*/, - "Type": "System.Single", - "Value": -40.714344 - }, - { - "Id": "6eb81dc2-88b5-4ba7-9f82-fe2389dc2926"/*BaseMovement*/, - "Type": "System.Single", - "Value": 0.2850805 - }, - { - "Id": "e9fd2c91-7cee-481e-933b-a40a27da15dc"/*BaseRotation*/, - "Type": "System.Single", - "Value": -0.52092314 - }, - { - "Id": "211fd6ee-26a9-4e15-85ba-4a22e865545d"/*MoveToComfort*/, - "Type": "System.Single", - "Value": -13.523927 - }, - { - "Id": "8367cbad-6214-4167-855b-9f704bb46ac3"/*RotateToComfort*/, - "Type": "System.Single", - "Value": 168.16774 - } - ], - "Outputs": [] - }, - { - "Id": "1a32791d-fda4-4261-a7cd-2b358fda9f1f"/*ListToBuffer*/, - "SymbolId": "7e28c796-85e7-47ee-99bb-9599284dbeeb", - "InputValues": [], - "Outputs": [] - }, - { - "Id": "7dd5a720-b79c-463a-a8b4-e7ca96cdfe55"/*_SpeciesDefinition*/, - "SymbolId": "924b8cc0-5b4b-41d0-a71b-b26465683910", - "InputValues": [ - { - "Id": "8c4e188c-18ab-4f69-a60a-14a8e5a12f91"/*ComfortZones*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 0.0, - "Y": 0.95, - "Z": 0.0, - "W": 0.0 - } - }, - { - "Id": "9a4d8846-6b46-4a4b-a8d3-97f3f9eaf8db"/*Emit*/, - "Type": "System.Numerics.Vector4", - "Value": { - "X": 19.4, - "Y": 20.0, - "Z": 0.0, - "W": 1.0 - } - }, - { - "Id": "4dd19c0b-10c1-43fa-a3e2-970b4f9c6162"/*SideAngle*/, - "Type": "System.Single", - "Value": 28.0 - }, - { - "Id": "11ba5bbc-4873-489f-85b7-35080f0988cf"/*SideRadius*/, - "Type": "System.Single", - "Value": 132.0 - }, - { - "Id": "e95c5f4d-df12-42f6-a879-8e26540b03ac"/*FrontRadius*/, - "Type": "System.Single", - "Value": 4.0 - }, - { - "Id": "6eb81dc2-88b5-4ba7-9f82-fe2389dc2926"/*BaseMovement*/, - "Type": "System.Single", - "Value": 0.39999998 - }, - { - "Id": "e9fd2c91-7cee-481e-933b-a40a27da15dc"/*BaseRotation*/, - "Type": "System.Single", - "Value": 22.8 - }, - { - "Id": "211fd6ee-26a9-4e15-85ba-4a22e865545d"/*MoveToComfort*/, - "Type": "System.Single", - "Value": -0.2999997 - }, - { - "Id": "8367cbad-6214-4167-855b-9f704bb46ac3"/*RotateToComfort*/, - "Type": "System.Single", - "Value": 340.0 - } - ], - "Outputs": [] } ], "Connections": [ @@ -1361,18 +1171,6 @@ "TargetParentOrChildId": "0fa800e0-917c-4f18-b4e1-113cedba3c9e", "TargetSlotId": "08f181bb-9777-497c-871d-bcc1ff252f2f" }, - { - "SourceParentOrChildId": "792d29fe-88d8-4fa2-a0e8-6bb0ad60f236", - "SourceSlotId": "55498833-ff69-489f-afe6-d54150920c56", - "TargetParentOrChildId": "1a32791d-fda4-4261-a7cd-2b358fda9f1f", - "TargetSlotId": "08f181bb-9777-497c-871d-bcc1ff252f2f" - }, - { - "SourceParentOrChildId": "7dd5a720-b79c-463a-a8b4-e7ca96cdfe55", - "SourceSlotId": "55498833-ff69-489f-afe6-d54150920c56", - "TargetParentOrChildId": "1a32791d-fda4-4261-a7cd-2b358fda9f1f", - "TargetSlotId": "08f181bb-9777-497c-871d-bcc1ff252f2f" - }, { "SourceParentOrChildId": "31f65cc8-e258-45e9-ad76-dbccbf19c142", "SourceSlotId": "8e34259f-c017-474a-aac6-d21accbad23e", @@ -1415,12 +1213,6 @@ "TargetParentOrChildId": "2d73bd79-a8e8-4ed0-8f5e-abebbf01534c", "TargetSlotId": "e618891e-2cdb-4464-8f72-577a11b0bb14" }, - { - "SourceParentOrChildId": "1a32791d-fda4-4261-a7cd-2b358fda9f1f", - "SourceSlotId": "c52dfa83-9820-4a54-b90b-62278dc8fe3f", - "TargetParentOrChildId": "31de3226-c8ea-4749-935c-3107cc1abf79", - "TargetSlotId": "ae4938aa-43c2-443b-8ace-9dbd2045b448" - }, { "SourceParentOrChildId": "8cc7c04d-5e2e-43ad-b9c2-50290fbe1344", "SourceSlotId": "db1073a1-b9d8-4d52-bc5c-7ae8c0ee1ac3", diff --git a/Operators/Types/user/pixtur/learning/cs/05-physarum/Physarum02_796a66ff-93e7-4bf7-81c0-0fee903262b8.t3ui b/Operators/Types/user/pixtur/learning/cs/05-physarum/Physarum02_796a66ff-93e7-4bf7-81c0-0fee903262b8.t3ui index 3f91b06038..54553acb3f 100644 --- a/Operators/Types/user/pixtur/learning/cs/05-physarum/Physarum02_796a66ff-93e7-4bf7-81c0-0fee903262b8.t3ui +++ b/Operators/Types/user/pixtur/learning/cs/05-physarum/Physarum02_796a66ff-93e7-4bf7-81c0-0fee903262b8.t3ui @@ -18,22 +18,22 @@ "Y": 71.24774 }, "Position": { - "X": 1466.2412, - "Y": 1381.8705 + "X": 1537.2754, + "Y": 1416.477 } }, { "ChildId": "db822aaf-0697-4fbe-bf9e-eafa3a068212"/*_SpeciesDefinition*/, "Position": { - "X": 974.3872, - "Y": 1381.8705 + "X": 1237.2754, + "Y": 1416.477 } }, { "ChildId": "0fa800e0-917c-4f18-b4e1-113cedba3c9e"/*ListToBuffer*/, "Position": { - "X": 1124.3872, - "Y": 1381.8705 + "X": 1387.2754, + "Y": 1416.477 } }, { @@ -95,8 +95,8 @@ { "ChildId": "2d8836cb-6bd4-4877-a04c-9c45915d8ddb"/*_SpeciesDefinition*/, "Position": { - "X": 974.3872, - "Y": 1424.8705 + "X": 1237.2754, + "Y": 1459.477 } }, { @@ -116,209 +116,176 @@ { "ChildId": "ed04d5e7-ccd5-48ed-8747-a68a03ea21f3"/*_BlobOld*/, "Position": { - "X": 1588.5448, - "Y": 1620.5255 + "X": 1586.7881, + "Y": 1777.7535 } }, { "ChildId": "b4e7aeb0-5913-48b5-92e4-81c565611047"/*_BlobOld*/, "Position": { - "X": 1738.5448, - "Y": 1620.5255 + "X": 1736.7881, + "Y": 1777.7535 } }, { "ChildId": "18a60e9d-6740-4838-88fe-5aff5c76afeb"/*Divisions*/, "Position": { - "X": 87.49933, - "Y": 1686.0367 + "X": 1184.4534, + "Y": 1170.9985 } }, { "ChildId": "2d73bd79-a8e8-4ed0-8f5e-abebbf01534c"/*_SubdivsionRaster*/, "Position": { - "X": 2300.2249, - "Y": 1554.9548 + "X": 2093.8013, + "Y": 1574.6865 } }, { "ChildId": "9b2f78e7-534f-46ff-b6f9-c6b80eb9bdc3"/*MouseInput*/, "Position": { - "X": 463.7389, - "Y": 548.03436 + "X": 1893.758, + "Y": 630.2738 } }, { "ChildId": "4b5a30f7-3e80-4a13-b076-a8e9b3e33ed9"/*Vector2ToFloat2*/, "Position": { - "X": 593.7389, - "Y": 548.03436 + "X": 2023.7579, + "Y": 630.2738 } }, { "ChildId": "71c9ef43-284a-4a25-86f8-200954dce6ee"/*_BlobOld*/, "Position": { - "X": 1725.8585, - "Y": 498.71106 + "X": 3155.878, + "Y": 580.95044 } }, { "ChildId": "1fbf47a2-82b2-45d1-829a-13e513273380"/*Float2ToVector2*/, "Position": { - "X": 1533.5135, - "Y": 505.39038 + "X": 2963.5332, + "Y": 587.6299 } }, { "ChildId": "c3c11f39-d666-4f20-9572-3e8069e14de5"/*Remap*/, "Position": { - "X": 1403.5135, - "Y": 505.39038 + "X": 2833.5322, + "Y": 587.6299 } }, { "ChildId": "08ae3e6d-d3e7-4b7d-a07b-c1d870698c86"/*Remap*/, "Position": { - "X": 1426.4037, - "Y": 598.78015 + "X": 2856.4224, + "Y": 681.01953 } }, { "ChildId": "31f65cc8-e258-45e9-ad76-dbccbf19c142"/*RequestedResolution*/, "Position": { - "X": 504.7072, - "Y": 358.42035 + "X": 1934.7263, + "Y": 440.6598 } }, { "ChildId": "8cc7c04d-5e2e-43ad-b9c2-50290fbe1344"/*IntToFloat*/, "Position": { - "X": 634.7072, - "Y": 358.42035 + "X": 2064.7266, + "Y": 440.6598 } }, { "ChildId": "1cb519be-57bc-4ea7-9482-2bbab654781f"/*IntToFloat*/, "Position": { - "X": 634.7072, - "Y": 414.42035 + "X": 2064.7266, + "Y": 496.6598 } }, { "ChildId": "3c66d278-ee91-4c02-b567-e7e8bbb90f52"/*Div*/, "Position": { - "X": 784.7072, - "Y": 358.42035 + "X": 2214.726, + "Y": 440.6598 } }, { "ChildId": "d108dcee-be25-4f49-9e3d-dcab8456bd4e"/*Multiply*/, "Position": { - "X": 1160.7076, - "Y": 383.98602 + "X": 2590.7266, + "Y": 466.22546 } }, { "ChildId": "f6901ec8-87da-44fd-84fb-7be77c24d922"/*Multiply*/, "Position": { - "X": 934.7072, - "Y": 358.42035 + "X": 2364.726, + "Y": 440.6598 } }, { "ChildId": "ff79b624-4b4e-4d31-886f-3079e6b970e4"/*Round*/, "Position": { - "X": 953.95306, - "Y": 525.2094 + "X": 2383.9717, + "Y": 607.44885 } }, { "ChildId": "0e0c1462-c0ee-4876-8e9a-dc577f43c209"/*Round*/, "Position": { - "X": 953.95306, - "Y": 594.2094 + "X": 2383.9717, + "Y": 676.44885 } }, { "ChildId": "958a7623-16c5-418c-a441-d091312ccbef"/*Int2ToVector2*/, "Position": { - "X": 463.7389, - "Y": 604.0343 + "X": 1893.758, + "Y": 686.2737 } }, { "ChildId": "f288d28e-1083-47c2-9fd7-40a86a0aeb25"/*Vector2ToFloat2*/, "Position": { - "X": 593.7389, - "Y": 604.0343 + "X": 2023.7579, + "Y": 686.2737 } }, { "ChildId": "3f1bc393-b569-4096-bcac-727b6d33b484"/*Add*/, "Position": { - "X": 790.4591, - "Y": 522.87006 + "X": 2220.478, + "Y": 605.1095 } }, { "ChildId": "457f1cea-31f2-4775-ab2d-076ab3c55d01"/*Add*/, "Position": { - "X": 795.57227, - "Y": 617.7296 + "X": 2225.5908, + "Y": 699.969 } }, { "ChildId": "a9dee7b9-113e-4a2b-bb24-432f8a37361b"/*Add*/, "Position": { - "X": 1156.7902, - "Y": 600.6222 + "X": 2586.809, + "Y": 682.8616 } }, { "ChildId": "22bed472-19a7-4ad0-9131-57a89ac601f5"/*Add*/, "Position": { - "X": 1156.7902, - "Y": 544.62225 + "X": 2586.809, + "Y": 626.8617 } }, { "ChildId": "3fc17658-23a3-4511-9020-97e2c6d12d0a"/*_SpeciesDefinition*/, "Position": { - "X": 969.2186, - "Y": 1481.2314 - } - }, - { - "ChildId": "31de3226-c8ea-4749-935c-3107cc1abf79"/*_MovingAgents02*/, - "Style": "Resizable", - "Size": { - "X": 171.854, - "Y": 71.24774 - }, - "Position": { - "X": 2139.085, - "Y": 1471.9218 - } - }, - { - "ChildId": "792d29fe-88d8-4fa2-a0e8-6bb0ad60f236"/*_SpeciesDefinition*/, - "Position": { - "X": 1647.2311, - "Y": 1471.9218 - } - }, - { - "ChildId": "1a32791d-fda4-4261-a7cd-2b358fda9f1f"/*ListToBuffer*/, - "Position": { - "X": 1797.2311, - "Y": 1471.9218 - } - }, - { - "ChildId": "7dd5a720-b79c-463a-a8b4-e7ca96cdfe55"/*_SpeciesDefinition*/, - "Position": { - "X": 1647.2311, - "Y": 1514.9218 + "X": 1232.1068, + "Y": 1515.838 } } ], @@ -342,8 +309,8 @@ "W": 1.0 }, "Position": { - "X": 403.7389, - "Y": 298.42035 + "X": 1833.758, + "Y": 380.6598 }, "Size": { "X": 1492.1201, diff --git a/Operators/Types/user/pixtur/project/climatewatch/ClimateWatch_2442724b-5db8-4d3f-a888-9473070e4173.t3 b/Operators/Types/user/pixtur/project/climatewatch/ClimateWatch_2442724b-5db8-4d3f-a888-9473070e4173.t3 index 30afece5a5..efbd2e5770 100644 --- a/Operators/Types/user/pixtur/project/climatewatch/ClimateWatch_2442724b-5db8-4d3f-a888-9473070e4173.t3 +++ b/Operators/Types/user/pixtur/project/climatewatch/ClimateWatch_2442724b-5db8-4d3f-a888-9473070e4173.t3 @@ -616,7 +616,7 @@ "Id": "de0fed7d-d2af-4424-baf3-81606e26559f"/*Position*/, "Type": "System.Numerics.Vector2", "Value": { - "X": 0.32006526, + "X": 0.3161594, "Y": 0.81425893 } }, @@ -633,7 +633,7 @@ { "Id": "835d7f17-9de4-4612-a2f0-01c1346cdf1a"/*Spacing*/, "Type": "System.Single", - "Value": 16.5 + "Value": 35.7 } ], "Outputs": [] @@ -659,8 +659,8 @@ "Id": "de0fed7d-d2af-4424-baf3-81606e26559f"/*Position*/, "Type": "System.Numerics.Vector2", "Value": { - "X": 0.43544492, - "Y": -0.7084849 + "X": 0.4159153, + "Y": -0.706528 } }, { @@ -676,7 +676,7 @@ { "Id": "835d7f17-9de4-4612-a2f0-01c1346cdf1a"/*Spacing*/, "Type": "System.Single", - "Value": 6.8 + "Value": 11.9 } ], "Outputs": [] @@ -713,8 +713,8 @@ "Id": "b4a8c16d-5a0f-4867-ae03-92a675abe709"/*Translation*/, "Type": "System.Numerics.Vector3", "Value": { - "X": -0.031379327, - "Y": -0.16474184, + "X": -0.011849761, + "Y": -0.17255384, "Z": 0.0 } } @@ -1238,7 +1238,7 @@ { "Id": "5af4a05f-72dc-4c0d-a728-309bf3a1b1b9"/*Format*/, "Type": "System.String", - "Value": "dd.MM.yyyy" + "Value": "dd MM yyyy" } ], "Outputs": [] @@ -2512,7 +2512,7 @@ "Id": "de0fed7d-d2af-4424-baf3-81606e26559f"/*Position*/, "Type": "System.Numerics.Vector2", "Value": { - "X": -0.180296, + "X": -0.21154323, "Y": -0.7081214 } }, @@ -2565,8 +2565,8 @@ "Id": "de0fed7d-d2af-4424-baf3-81606e26559f"/*Position*/, "Type": "System.Numerics.Vector2", "Value": { - "X": 0.10709182, - "Y": -0.7081214 + "X": 0.07779786, + "Y": -0.7061692 } }, { @@ -2582,7 +2582,7 @@ { "Id": "835d7f17-9de4-4612-a2f0-01c1346cdf1a"/*Spacing*/, "Type": "System.Single", - "Value": 10.6 + "Value": 18.4 } ], "Outputs": [] @@ -2599,7 +2599,7 @@ { "Id": "9cb908ad-0800-4b88-b256-c6cc2b84ab6c"/*FragmentStart*/, "Type": "System.Int32", - "Value": -8 + "Value": -4 }, { "Id": "7520db6d-7855-40e1-bb81-ead290815435"/*FragmentCount*/, diff --git a/Operators/Types/user/pixtur/project/climatewatch/ClimateWatch_2442724b-5db8-4d3f-a888-9473070e4173.t3ui b/Operators/Types/user/pixtur/project/climatewatch/ClimateWatch_2442724b-5db8-4d3f-a888-9473070e4173.t3ui index aeeec6593c..5e95fd0094 100644 --- a/Operators/Types/user/pixtur/project/climatewatch/ClimateWatch_2442724b-5db8-4d3f-a888-9473070e4173.t3ui +++ b/Operators/Types/user/pixtur/project/climatewatch/ClimateWatch_2442724b-5db8-4d3f-a888-9473070e4173.t3ui @@ -292,7 +292,7 @@ "ChildId": "827a4b68-4e22-4bc0-ab69-71fe8c98207a"/*Time*/, "Position": { "X": 266.60248, - "Y": 30.743055 + "Y": 54.743057 } }, { diff --git a/Operators/Types/user/pixtur/research/_SubdivsionRaster_f15cc064-1d70-4945-ae60-35d884788c0f.t3 b/Operators/Types/user/pixtur/research/_SubdivsionRaster_f15cc064-1d70-4945-ae60-35d884788c0f.t3 index c20b55208c..2403744ed9 100644 --- a/Operators/Types/user/pixtur/research/_SubdivsionRaster_f15cc064-1d70-4945-ae60-35d884788c0f.t3 +++ b/Operators/Types/user/pixtur/research/_SubdivsionRaster_f15cc064-1d70-4945-ae60-35d884788c0f.t3 @@ -32,9 +32,9 @@ "Id": "a4350111-7ca8-4ce7-b494-3e82cc679999"/*Fill*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.0, - "Y": 0.0, - "Z": 0.0, + "X": 0.24, + "Y": 0.24, + "Z": 0.24, "W": 1.0 } }, diff --git a/Operators/Types/user/still/katsu/Katsumaki_bfa5b00c-e1f3-4b15-8fec-859156facfce.t3 b/Operators/Types/user/still/katsu/Katsumaki_bfa5b00c-e1f3-4b15-8fec-859156facfce.t3 index 1ae3811b90..c058d4d8c2 100644 --- a/Operators/Types/user/still/katsu/Katsumaki_bfa5b00c-e1f3-4b15-8fec-859156facfce.t3 +++ b/Operators/Types/user/still/katsu/Katsumaki_bfa5b00c-e1f3-4b15-8fec-859156facfce.t3 @@ -3071,15 +3071,30 @@ "W": 1.0 } }, + { + "Id": "2c91c306-1815-4b22-a70f-746232f024d7"/*EmissiveColor*/, + "Type": "System.Numerics.Vector4", + "Value": { + "X": 0.0, + "Y": 0.0, + "Z": 0.0, + "W": 1.0 + } + }, + { + "Id": "9d5ca726-28b0-4f3d-a5aa-f0ae3e2043a9"/*Specular*/, + "Type": "System.Single", + "Value": -2.0 + }, { "Id": "e14dcc43-7c18-4ed7-ad39-dfeab10e3d33"/*Roughness*/, "Type": "System.Single", - "Value": 0.128 + "Value": 0.0 }, { "Id": "108ff533-f205-4989-b894-acf48e3cc1db"/*Metal*/, "Type": "System.Single", - "Value": 0.96 + "Value": 0.7 } ], "Outputs": [] @@ -3101,7 +3116,7 @@ { "Id": "96094239-9d82-4a32-bbb0-e9da7f6501da"/*BackgroundBlur*/, "Type": "System.Single", - "Value": 0.11 + "Value": 0.16 }, { "Id": "650aa9a6-4aa6-4928-be76-3f1f825aa773"/*BackgroundColor*/, @@ -3644,6 +3659,11 @@ "Z": 0.30324584 } }, + { + "Id": "98155900-1bb9-427a-9c4e-0988fec806cd"/*Intensity*/, + "Type": "System.Single", + "Value": 64.0 + }, { "Id": "ff3442c5-95c8-4bd6-a492-cb4a9a597ea1"/*Color*/, "Type": "System.Numerics.Vector4", @@ -5728,12 +5748,6 @@ "TargetParentOrChildId": "88f406bd-100a-4282-9bad-21cc98362580", "TargetSlotId": "777b2c27-a3c8-40d0-a196-80a08af51296" }, - { - "SourceParentOrChildId": "31cfa3fd-fb55-4202-9c03-fefb290998ec", - "SourceSlotId": "ae4addf0-08cf-4b25-9515-4fef9359d183", - "TargetParentOrChildId": "89048db6-1e2b-49bc-b271-48c2f508d945", - "TargetSlotId": "cf741b95-e3d1-4f43-99e9-15fcdaa6b648" - }, { "SourceParentOrChildId": "9f3f735f-e106-4434-8871-85613c986705", "SourceSlotId": "2451ea62-9915-4ec1-a65e-4d44a3758fa8", @@ -6447,12 +6461,6 @@ "SourceSlotId": "f83f1835-477e-4bb6-93f0-14bf273b8e94", "TargetParentOrChildId": "fe666bdf-de61-4486-93c7-32d1faea7aa3", "TargetSlotId": "e0f4333d-8bee-4f9e-bb29-9f76bd72e61f" - }, - { - "SourceParentOrChildId": "815b83f7-ad0d-4875-8d7e-a801395d8fcd", - "SourceSlotId": "ae4addf0-08cf-4b25-9515-4fef9359d183", - "TargetParentOrChildId": "fff2e5bf-6798-411d-ad2a-d8ba8a7c732b", - "TargetSlotId": "cf741b95-e3d1-4f43-99e9-15fcdaa6b648" } ], "PlaybackSettings": { diff --git a/Operators/Types/user/still/worksforeverybody/WFE_RoughtCut_edc5e1e6-b850-485a-99e1-7eaa070cc301.t3 b/Operators/Types/user/still/worksforeverybody/WFE_RoughtCut_edc5e1e6-b850-485a-99e1-7eaa070cc301.t3 index 71e80effd2..ee73eb8996 100644 --- a/Operators/Types/user/still/worksforeverybody/WFE_RoughtCut_edc5e1e6-b850-485a-99e1-7eaa070cc301.t3 +++ b/Operators/Types/user/still/worksforeverybody/WFE_RoughtCut_edc5e1e6-b850-485a-99e1-7eaa070cc301.t3 @@ -643,7 +643,12 @@ "SymbolId": "a3f64d34-1fab-4230-86b3-1c3deba3f90b", "Name": "Interactions", "InputValues": [], - "Outputs": [] + "Outputs": [ + { + "Id": "977ca2f4-cddb-4b9a-82b2-ff66453bbf9b"/*Interactions*/, + "IsDisabled": true + } + ] }, { "Id": "7132a5f4-1ee7-4c39-902f-8847d40c144d"/*_WFE_MainPart1*/, diff --git a/Operators/Types/user/still/worksforeverybody/elements/_T3LogoAnimation_37b19195-5781-4f8d-af7b-c9ef6a4d146d.t3 b/Operators/Types/user/still/worksforeverybody/elements/_T3LogoAnimation_37b19195-5781-4f8d-af7b-c9ef6a4d146d.t3 index 026222f974..05ae798352 100644 --- a/Operators/Types/user/still/worksforeverybody/elements/_T3LogoAnimation_37b19195-5781-4f8d-af7b-c9ef6a4d146d.t3 +++ b/Operators/Types/user/still/worksforeverybody/elements/_T3LogoAnimation_37b19195-5781-4f8d-af7b-c9ef6a4d146d.t3 @@ -372,6 +372,11 @@ "Z": 0.0 } }, + { + "Id": "af75835a-04c9-4721-8c7a-a31ef8012f06"/*Pivot*/, + "Type": "System.Single", + "Value": -0.04 + }, { "Id": "208b724d-c5d7-4eaa-94a1-e1f045f14969"/*OrientationAngle*/, "Type": "System.Single", diff --git a/Operators/Types/user/still/worksforeverybody/scenes/_WfeFinalPart_1026538b-f021-43f0-b6bd-dda89c57de94.t3 b/Operators/Types/user/still/worksforeverybody/scenes/_WfeFinalPart_1026538b-f021-43f0-b6bd-dda89c57de94.t3 index 60c3c93f43..1a54efd24b 100644 --- a/Operators/Types/user/still/worksforeverybody/scenes/_WfeFinalPart_1026538b-f021-43f0-b6bd-dda89c57de94.t3 +++ b/Operators/Types/user/still/worksforeverybody/scenes/_WfeFinalPart_1026538b-f021-43f0-b6bd-dda89c57de94.t3 @@ -1972,7 +1972,7 @@ "Id": "2d59d002-838e-4150-ae8f-ff97bb19bd78"/*Translation*/, "Type": "System.Numerics.Vector3", "Value": { - "X": 0.0, + "X": -0.6, "Y": 0.0, "Z": 0.0 } diff --git a/Operators/Types/user/t3/HomeCanvas_dab61a12-9996-401e-9aa6-328dd6292beb.t3ui b/Operators/Types/user/t3/HomeCanvas_dab61a12-9996-401e-9aa6-328dd6292beb.t3ui index acd12ed376..c305943009 100644 --- a/Operators/Types/user/t3/HomeCanvas_dab61a12-9996-401e-9aa6-328dd6292beb.t3ui +++ b/Operators/Types/user/t3/HomeCanvas_dab61a12-9996-401e-9aa6-328dd6292beb.t3ui @@ -185,21 +185,21 @@ "Id": "fa46757f-62c7-4121-ab5c-c148b1da656f", "Title": "15min Introduction", "Description": "A short video tutorial that will guide you through the user interface.", - "LinkUrl": "https://tooll.io", + "LinkUrl": "https://youtu.be/_zvzX0fZ8sc?feature=shared", "LinkType": "TutorialVideo" }, { "Id": "f6ab2a6b-4627-48bc-95ae-3906563435a6", "Title": "Documentation", "Description": "A documentation on Toolls homepage.", - "LinkUrl": "https://tooll.io", + "LinkUrl": "https://github.com/tooll3/t3/wiki", "LinkType": "Documentation" }, { "Id": "9a34d3da-4b02-4e28-8b84-9f4525514ef3", "Title": "Discord", "Description": "You can always visit our discord channel.", - "LinkUrl": "https://tooll.io", + "LinkUrl": "https://discord.gg/YmSyQdeH3S", "LinkType": "Other" } ] diff --git a/Operators/Types/user/wake/mary/MaryTest2_ba2a8670-e0c3-4e7b-9382-d1c0938ba2b3.t3 b/Operators/Types/user/wake/mary/MaryTest2_ba2a8670-e0c3-4e7b-9382-d1c0938ba2b3.t3 index 4233428797..2747e73073 100644 --- a/Operators/Types/user/wake/mary/MaryTest2_ba2a8670-e0c3-4e7b-9382-d1c0938ba2b3.t3 +++ b/Operators/Types/user/wake/mary/MaryTest2_ba2a8670-e0c3-4e7b-9382-d1c0938ba2b3.t3 @@ -120,12 +120,12 @@ { "Id": "e14dcc43-7c18-4ed7-ad39-dfeab10e3d33"/*Roughness*/, "Type": "System.Single", - "Value": 0.16 + "Value": 0.01 }, { "Id": "108ff533-f205-4989-b894-acf48e3cc1db"/*Metal*/, "Type": "System.Single", - "Value": 0.12 + "Value": 0.06 } ], "Outputs": [] @@ -273,23 +273,6 @@ ], "Outputs": [] }, - { - "Id": "92e6fea4-33c7-47f2-8523-5d6cdda3b5a3"/*FractalNoise*/, - "SymbolId": "97eb35ec-2825-4f63-8fdf-3fe38fa9e652", - "InputValues": [ - { - "Id": "59bde7a3-0952-46a8-8285-40f0a00488e6"/*Scale*/, - "Type": "System.Single", - "Value": 0.92 - }, - { - "Id": "4de046cc-26d7-466f-90b4-3a3bdd59acb3"/*Phase*/, - "Type": "System.Single", - "Value": 14.8 - } - ], - "Outputs": [] - }, { "Id": "8aa6e814-ab29-4406-8796-3db9fb6bb2f3"/*NormalMap*/, "SymbolId": "01458940-287f-4d31-9906-998efa9a2641", @@ -967,12 +950,6 @@ ], "Outputs": [] }, - { - "Id": "b50d3b52-d87f-4e80-bfd0-2be82ec1fefb"/*CubeMesh*/, - "SymbolId": "c47ab830-aae7-4f8f-b67c-9119bcbaf7df", - "InputValues": [], - "Outputs": [] - }, { "Id": "dc8c953d-99e1-474c-bece-0204714c76e2"/*FlickerLight*/, "SymbolId": "436e93a8-03c0-4366-8d9a-2245e5bcaa6c", @@ -1584,7 +1561,12 @@ } } ], - "Outputs": [] + "Outputs": [ + { + "Id": "27af7a2d-8bef-413f-9b41-381a3c9022de"/*LenseFlareSetup*/, + "IsDisabled": true + } + ] }, { "Id": "51614ca2-72e7-4f06-86e0-a54e10f6a780"/*TransformMeshUVs*/, @@ -1852,7 +1834,7 @@ { "Id": "d41169ee-4e53-4198-b56a-b4b771cc3dfd"/*Width*/, "Type": "System.Single", - "Value": 0.007 + "Value": 0.0031 } ], "Outputs": [] @@ -2607,6 +2589,28 @@ "SymbolId": "936e4324-bea2-463a-b196-6064a2d8a6b2", "InputValues": [], "Outputs": [] + }, + { + "Id": "482c0811-a36f-4b6a-b45d-9e674b9500c7"/*Glow*/, + "SymbolId": "d392d4af-4c78-4f4a-bc3f-4c54c8c73538", + "InputValues": [ + { + "Id": "57968725-0a45-44f9-a9a2-f74c10b728e8"/*BlurRadius*/, + "Type": "System.Single", + "Value": 2.93 + }, + { + "Id": "4927a3fc-87ff-44e7-88c0-499e3efcca55"/*GlowAmount*/, + "Type": "System.Single", + "Value": 0.94 + }, + { + "Id": "4c9b9135-f27b-414e-bed7-f9e5640dc526"/*Offset*/, + "Type": "System.Single", + "Value": -0.04 + } + ], + "Outputs": [] } ], "Connections": [ @@ -2838,6 +2842,12 @@ "TargetParentOrChildId": "4792423a-9df8-47a5-8035-2f433e24d7d2", "TargetSlotId": "372288fa-3794-47ba-9f91-59240513217a" }, + { + "SourceParentOrChildId": "332ffc57-b1ff-4e30-bcb0-931fea28c36b", + "SourceSlotId": "df388f27-f5b6-417b-87a7-a6a59b625128", + "TargetParentOrChildId": "482c0811-a36f-4b6a-b45d-9e674b9500c7", + "TargetSlotId": "f6bdd487-c16e-4fb0-bfba-b3801f121314" + }, { "SourceParentOrChildId": "9340607b-0261-4a72-8951-ea54c99a06ea", "SourceSlotId": "e011dd8c-1b9c-458f-8960-e6c38e83ca74", @@ -2941,8 +2951,8 @@ "TargetSlotId": "f6d96a01-dc90-49c7-9152-a6a42bb05218" }, { - "SourceParentOrChildId": "332ffc57-b1ff-4e30-bcb0-931fea28c36b", - "SourceSlotId": "df388f27-f5b6-417b-87a7-a6a59b625128", + "SourceParentOrChildId": "482c0811-a36f-4b6a-b45d-9e674b9500c7", + "SourceSlotId": "2ce1453b-432b-4d12-8fb7-d883e3d0c136", "TargetParentOrChildId": "72447ffb-5700-43ad-a0c1-07891650ccfa", "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" }, diff --git a/Operators/Types/user/wake/mary/MaryTest2_ba2a8670-e0c3-4e7b-9382-d1c0938ba2b3.t3ui b/Operators/Types/user/wake/mary/MaryTest2_ba2a8670-e0c3-4e7b-9382-d1c0938ba2b3.t3ui index 9821513c3d..7cf2c206f7 100644 --- a/Operators/Types/user/wake/mary/MaryTest2_ba2a8670-e0c3-4e7b-9382-d1c0938ba2b3.t3ui +++ b/Operators/Types/user/wake/mary/MaryTest2_ba2a8670-e0c3-4e7b-9382-d1c0938ba2b3.t3ui @@ -112,13 +112,6 @@ "Y": -1147.6814 } }, - { - "ChildId": "92e6fea4-33c7-47f2-8523-5d6cdda3b5a3"/*FractalNoise*/, - "Position": { - "X": -470.07333, - "Y": -1949.1157 - } - }, { "ChildId": "8aa6e814-ab29-4406-8796-3db9fb6bb2f3"/*NormalMap*/, "Position": { @@ -341,13 +334,6 @@ "Y": -807.68726 } }, - { - "ChildId": "b50d3b52-d87f-4e80-bfd0-2be82ec1fefb"/*CubeMesh*/, - "Position": { - "X": -1087.9429, - "Y": -2010.5573 - } - }, { "ChildId": "dc8c953d-99e1-474c-bece-0204714c76e2"/*FlickerLight*/, "Position": { @@ -379,8 +365,8 @@ { "ChildId": "332ffc57-b1ff-4e30-bcb0-931fea28c36b"/*Grain*/, "Position": { - "X": 812.329, - "Y": -1394.8118 + "X": 830.8434, + "Y": -1424.8518 } }, { @@ -898,7 +884,7 @@ "ChildId": "52c08f2e-a603-4003-a8d5-36899e5c9efc"/*TransformPoints*/, "Position": { "X": -1589.1442, - "Y": 341.376 + "Y": 352.376 } }, { @@ -977,6 +963,13 @@ "X": 1056.7904, "Y": -1085.3877 } + }, + { + "ChildId": "482c0811-a36f-4b6a-b45d-9e674b9500c7"/*Glow*/, + "Position": { + "X": 980.8434, + "Y": -1424.8518 + } } ], "OutputUis": [ diff --git a/Resources/lib/3d/mesh/mesh-RecomputeNormals.hlsl b/Resources/lib/3d/mesh/mesh-RecomputeNormals.hlsl index 1121154728..1d9b06eb52 100644 --- a/Resources/lib/3d/mesh/mesh-RecomputeNormals.hlsl +++ b/Resources/lib/3d/mesh/mesh-RecomputeNormals.hlsl @@ -5,11 +5,14 @@ cbuffer Params : register(b0) float Amount; } +static const int IndicesCount = 15; + struct FaceCount { int Count; - int Indices[7]; + int Indices[IndicesCount]; }; + StructuredBuffer SourceVertices : register(t0); StructuredBuffer SourceFaces : register(t1); @@ -21,7 +24,7 @@ void clear(uint3 i : SV_DispatchThreadID) { uint gi = i.x; VertexFaces[gi].Count = 0; - for(int index=0; index < 7; ++index) + for(int index=0; index < IndicesCount; ++index) { VertexFaces[gi].Indices[index] = 0; } @@ -44,7 +47,7 @@ void registerFaceVertices(uint3 i : SV_DispatchThreadID) int vIndex = verticeIndices[side]; int orgValue = VertexFaces[vIndex].Count; InterlockedAdd( VertexFaces[vIndex].Count, 1, orgValue); - if(orgValue > 7) + if(orgValue > IndicesCount) return; VertexFaces[vIndex].Indices[orgValue]= faceIndex; @@ -70,7 +73,7 @@ void computeNormal(uint3 i : SV_DispatchThreadID) float3 sidePositions[2]; - for(int face=0; face < faceCount && face <= 7; ++face) + for(int face=0; face < faceCount && face <= IndicesCount; ++face) { uint faceIndex = VertexFaces[gi].Indices[face]; uint3 faceVertexIndices = SourceFaces[faceIndex]; diff --git a/Resources/lib/points/combine/PairPointsForSplines.hlsl b/Resources/lib/points/combine/PairPointsForSplines.hlsl index e0cd58c749..6b03b649d9 100644 --- a/Resources/lib/points/combine/PairPointsForSplines.hlsl +++ b/Resources/lib/points/combine/PairPointsForSplines.hlsl @@ -11,12 +11,26 @@ cbuffer Params : register(b0) float TangentA_WFactor; float TangentB; float TangentB_WFactor; + + float Debug; } StructuredBuffer PointsA : t0; // input StructuredBuffer PointsB : t1; // input RWStructuredBuffer ResultPoints : u0; // output +inline float3 Interpolate(float t, float3 pA, float3 tA, float3 tB, float3 pB) +{ + float t2 = t * t; + float t3 = t2 * t; + + return (2 * t3 - 3 * t2 + 1) * pA + + (t3 - 2 * t2 + t) * tA + + (-2 * t3 + 3 * t2) * pB + + (t3 - t2) * -tB; +} + + [numthreads(64, 1, 1)] void main(uint3 i : SV_DispatchThreadID) { @@ -25,9 +39,6 @@ RWStructuredBuffer ResultPoints : u0; // output PointsA.GetDimensions(countA, stride); PointsB.GetDimensions(countB, stride); - // if (i.x >= resultCount) - // return; - int segmentCount = (int)(SegmentCount + 0.5); int pointsPerSegment = segmentCount ; @@ -54,28 +65,15 @@ RWStructuredBuffer ResultPoints : u0; // output float3 tA = rotate_vector(forward, PointsA[indexA].rotation) * (TangentA + paW * TangentA_WFactor); float3 tB = rotate_vector(forward, PointsB[indexB].rotation) * (TangentB + pbW * TangentB_WFactor); - float3 v0 = pA1; - float3 v1 = pA1 + tA; - float3 v2 = pB1 + tB; - float3 v3 = pB1; - - float t = f; - float t2 = t * t; - float t3 = t2 * t; - - float3 pF = (2 * t3 - 3 * t2 + 1) * v0 + - (t3 - 2 * t2 + t) * tA + - (-2 * t3 + 3 * t2) * v3 + - (t3 - t2) * -tB; + float3 pF = Interpolate(f, pA1, tA, tB, pB1); ResultPoints[i.x].position = pF; - ResultPoints[i.x].rotation = float4(1, 0, 0, 1); - - + float3 pF2 = Interpolate(f+0.001, pA1, tA, tB, pB1); + float3 forward2= normalize(pF-pF2); + float3 up = float3(0,0,1); + float fade = 1-abs(dot(up,forward2)); + float3 refUp = lerp(tA, tB, f); + ResultPoints[i.x].rotation = q_look_at(forward2, refUp); float w = isnan(paW) || isnan(paW) ? sqrt(-1) : 1; - ResultPoints[i.x].w = InitWTo01 > 0.5 ? t : w; - // ResultPoints[i.x] = PointsA[0]; - - // if(InitWTo01 > 0.5) - // ResultPoints[i.x].w = f; + ResultPoints[i.x].w = InitWTo01 > 0.5 ? f : w; } diff --git a/Resources/lib/points/draw/DrawTubes.hlsl b/Resources/lib/points/draw/DrawTubes.hlsl index 2a7cf59b27..b401033a19 100644 --- a/Resources/lib/points/draw/DrawTubes.hlsl +++ b/Resources/lib/points/draw/DrawTubes.hlsl @@ -123,9 +123,9 @@ psInput vsMain(uint id: SV_VertexID) float3 radiusOffset = rotate_vector(side, pointRotation) * Width * WidthFactor; float3 pInObject = p.position + radiusOffset; - float3 normalTwisted = float3(0, cos(spinRad + 3.141578/2), sin(spinRad + 3.141578/2)); - float3 normal = normalize(rotate_vector(normalTwisted, pointRotation)); - float4 normalInScreen = mul(float4(normal,0), ObjectToClipSpace); + //float3 normalTwisted = float3(0, cos(spinRad + 3.141578/2), sin(spinRad + 3.141578/2)); + //float3 normal = normalize(rotate_vector(normalTwisted, pointRotation)); + //float4 normalInScreen = mul(float4(normal,0), ObjectToClipSpace); output.texCoord = float2( f * (TextureRange.y - TextureRange.x) + TextureRange.x, @@ -134,11 +134,11 @@ psInput vsMain(uint id: SV_VertexID) // Pass tangent space basis vectors (for normal mapping). float3x3 TBN = float3x3( + normalize(radiusOffset), // vertex.Bitangent, normalize(rotate_vector(float3(1,0,0), pointRotation)), // vertex.Bitangent, - side, - normal + normalize(rotate_vector(float3(1,0,0), pointRotation)) // vertex.Bitangent, ); - TBN = mul(TBN, (float3x3)ObjectToWorld); + //TBN = mul(TBN, (float3x3)ObjectToWorld); output.tbnToWorld = TBN; output.worldPosition = mul(float4(pInObject,0), ObjectToWorld); @@ -146,7 +146,7 @@ psInput vsMain(uint id: SV_VertexID) float4 pInScreen = mul(float4(pInObject,1), ObjectToClipSpace); float3 lightDirection = float3(1.2, 1, -0.1); - float phong = pow( abs(dot(normal,lightDirection )),1); + //float phong = pow( abs(dot(normal,lightDirection )),1); output.pixelPosition = pInScreen; @@ -176,6 +176,8 @@ float4 psMain(psInput pin) : SV_TARGET //return float4(pin.tbnToWorld[0],1); N = normalize(mul(N,pin.tbnToWorld)); + return float4(N.xyz,1); + float isFrontSide = dot(N, Lo)/10; if( isFrontSide < -0.1)