diff --git a/.gitignore b/.gitignore index 9b430aea7..b1508228f 100644 --- a/.gitignore +++ b/.gitignore @@ -275,3 +275,4 @@ Resources/user/pixtur/VJ/Faces Resources/user/pixtur/VJ/PillowFight/sountrack/pillow-fight-01.mp3.waveform.png Resources/user/ff/persona Resources/user/wake/Revision2021-Wake/PhotoWall +Resources/user/wake/proj-mary/geometry/mary-200k-smooth.obj diff --git a/Install/default-layouts/layout1.json b/Install/default-layouts/layout1.json index a0a71ca9f..297f81b78 100644 --- a/Install/default-layouts/layout1.json +++ b/Install/default-layouts/layout1.json @@ -4,11 +4,11 @@ "Visible": true, "Position": { "X": 0.001171875, - "Y": 0.017642908 + "Y": 0.017361112 }, "Size": { "X": 0.39765626, - "Y": 0.98517996 + "Y": 0.9847222 } }, { @@ -28,11 +28,11 @@ "Visible": true, "Position": { "X": 0.39882812, - "Y": 0.017642908 + "Y": 0.017361112 }, "Size": { - "X": 0.12929687, - "Y": 0.6506704 + "X": 0.12890625, + "Y": 0.65 } }, { @@ -64,11 +64,11 @@ "Visible": true, "Position": { "X": 0.39882812, - "Y": 0.66972476 + "Y": 0.66944444 }, "Size": { - "X": 0.12851563, - "Y": 0.33168668 + "X": 0.12890625, + "Y": 0.33125 } }, { @@ -76,11 +76,11 @@ "Visible": true, "Position": { "X": 0.5277344, - "Y": 0.017642908 + "Y": 0.017361112 }, "Size": { "X": 0.47226563, - "Y": 0.49117854 + "Y": 0.49097222 } }, { @@ -100,11 +100,11 @@ "Visible": true, "Position": { "X": 0.5277344, - "Y": 0.5088214 + "Y": 0.5083333 }, "Size": { "X": 0.47226563, - "Y": 0.49117854 + "Y": 0.49097222 } }, { diff --git a/Install/default-layouts/layout4.json b/Install/default-layouts/layout4.json index 39be34ddb..49026962c 100644 --- a/Install/default-layouts/layout4.json +++ b/Install/default-layouts/layout4.json @@ -3,36 +3,36 @@ "Title": "Graph##1", "Visible": true, "Position": { - "X": 0.002734375, - "Y": 0.01693719 + "X": 0.0, + "Y": 0.48819444 }, "Size": { - "X": 0.66914064, - "Y": 0.98517996 + "X": 0.553125, + "Y": 0.51319444 } }, { "Title": "Settings", "Visible": false, "Position": { - "X": 0.8027344, - "Y": 0.022582922 + "X": 0.8023437, + "Y": 0.021877205 }, "Size": { "X": 0.19960937, - "Y": 0.17078334 + "Y": 0.07480593 } }, { "Title": "Parameters##1", "Visible": true, "Position": { - "X": 0.67226565, - "Y": 0.37332392 + "X": 0.553125, + "Y": 0.4888889 }, "Size": { - "X": 0.19765624, - "Y": 0.41848975 + "X": 0.234375, + "Y": 0.5069444 } }, { @@ -40,47 +40,47 @@ "Visible": false, "Position": { "X": 0.6078125, - "Y": 0.4474929 + "Y": 0.44318983 }, "Size": { - "X": 0.16927083, - "Y": 0.46168402 + "X": 0.16875, + "Y": 0.45800987 } }, { "Title": "Explore Variations", - "Visible": false, + "Visible": true, "Position": { - "X": 0.0, - "Y": 0.0 + "X": 0.00078125, + "Y": 0.022916667 }, "Size": { - "X": 0.3, - "Y": 0.2 + "X": 0.55195314, + "Y": 0.46319443 } }, { "Title": "Variations", "Visible": true, "Position": { - "X": 0.8695313, - "Y": 0.3726182 + "X": 0.7867187, + "Y": 0.48819444 }, "Size": { - "X": 0.12773438, - "Y": 0.41919547 + "X": 0.21171875, + "Y": 0.5069444 } }, { "Title": "Output##0", "Visible": true, "Position": { - "X": 0.6742188, - "Y": 0.01693719 + "X": 0.5527344, + "Y": 0.017361112 }, "Size": { - "X": 0.325, - "Y": 0.34932956 + "X": 0.4453125, + "Y": 0.47013888 } }, { @@ -123,48 +123,48 @@ "Title": "Output##4", "Visible": false, "Position": { - "X": 0.6088542, - "Y": 0.024597919 + "X": 0.6078125, + "Y": 0.020465773 }, "Size": { "X": 0.3859375, - "Y": 0.4219489 + "Y": 0.41848975 } }, { "Title": "Output##5", "Visible": false, "Position": { - "X": 0.3816406, - "Y": 0.016231475 + "X": 0.60234374, + "Y": 0.017361112 }, "Size": { - "X": 0.38046876, - "Y": 0.44954127 + "X": 0.39765626, + "Y": 0.4486111 } }, { "Title": "Console", - "Visible": true, + "Visible": false, "Position": { - "X": 0.67265624, - "Y": 0.79463655 + "X": 0.5972656, + "Y": 0.9188426 }, "Size": { - "X": 0.3265625, - "Y": 0.20254058 + "X": 0.40234375, + "Y": 0.06986591 } }, { "Title": "Symbol Library", "Visible": false, "Position": { - "X": 0.00234375, - "Y": 0.029640084 + "X": 0.8197917, + "Y": 0.018921476 }, "Size": { - "X": 0.14765625, - "Y": 0.9654199 + "X": 0.16770834, + "Y": 0.23368023 } }, { diff --git a/Install/default-layouts/layout5.json b/Install/default-layouts/layout5.json index e5e5c2967..2964c3516 100644 --- a/Install/default-layouts/layout5.json +++ b/Install/default-layouts/layout5.json @@ -3,36 +3,36 @@ "Title": "Graph##1", "Visible": true, "Position": { - "X": 0.0, - "Y": 0.48835567 + "X": 0.13789062, + "Y": 0.46319443 }, "Size": { - "X": 0.553125, - "Y": 0.51376146 + "X": 0.47382814, + "Y": 0.5375 } }, { "Title": "Settings", "Visible": false, "Position": { - "X": 0.8023437, - "Y": 0.021877205 + "X": 0.8027344, + "Y": 0.022582922 }, "Size": { "X": 0.19960937, - "Y": 0.07480593 + "Y": 0.17078334 } }, { "Title": "Parameters##1", "Visible": true, "Position": { - "X": 0.553125, - "Y": 0.4890614 + "X": 0.41445312, + "Y": 0.018055556 }, "Size": { - "X": 0.234375, - "Y": 0.50741005 + "X": 0.19765624, + "Y": 0.30625 } }, { @@ -40,47 +40,47 @@ "Visible": false, "Position": { "X": 0.6078125, - "Y": 0.44318983 + "Y": 0.4474929 }, "Size": { - "X": 0.16875, - "Y": 0.45800987 + "X": 0.16927083, + "Y": 0.46168402 } }, { "Title": "Explore Variations", - "Visible": true, + "Visible": false, "Position": { - "X": 0.00078125, - "Y": 0.023288637 + "X": 0.0, + "Y": 0.0 }, "Size": { - "X": 0.55195314, - "Y": 0.46365562 + "X": 0.3, + "Y": 0.2 } }, { "Title": "Variations", "Visible": true, "Position": { - "X": 0.7867187, - "Y": 0.48835567 + "X": 0.41445312, + "Y": 0.3236111 }, "Size": { - "X": 0.21171875, - "Y": 0.50741005 + "X": 0.19726562, + "Y": 0.1375 } }, { "Title": "Output##0", "Visible": true, "Position": { - "X": 0.5527344, - "Y": 0.017642908 + "X": 0.13789062, + "Y": 0.018055556 }, "Size": { - "X": 0.4453125, - "Y": 0.47071278 + "X": 0.27695313, + "Y": 0.44305557 } }, { @@ -123,48 +123,48 @@ "Title": "Output##4", "Visible": false, "Position": { - "X": 0.6078125, - "Y": 0.020465773 + "X": 0.6088542, + "Y": 0.024597919 }, "Size": { "X": 0.3859375, - "Y": 0.41848975 + "Y": 0.4219489 } }, { "Title": "Output##5", "Visible": false, "Position": { - "X": 0.60234374, - "Y": 0.017361112 + "X": 0.3816406, + "Y": 0.016231475 }, "Size": { - "X": 0.39765626, - "Y": 0.4486111 + "X": 0.38046876, + "Y": 0.44954127 } }, { "Title": "Console", - "Visible": false, + "Visible": true, "Position": { - "X": 0.5972656, - "Y": 0.9188426 + "X": 0.6113281, + "Y": 0.017361112 }, "Size": { - "X": 0.40234375, - "Y": 0.06986591 + "X": 0.38554686, + "Y": 0.98055553 } }, { "Title": "Symbol Library", - "Visible": false, + "Visible": true, "Position": { - "X": 0.8197917, - "Y": 0.018921476 + "X": 0.0, + "Y": 0.015972223 }, "Size": { - "X": 0.16770834, - "Y": 0.23368023 + "X": 0.13828126, + "Y": 0.9861111 } }, { diff --git a/Install/default-layouts/layout7.json b/Install/default-layouts/layout7.json index 3c7f0e068..49f62f2f5 100644 --- a/Install/default-layouts/layout7.json +++ b/Install/default-layouts/layout7.json @@ -4,11 +4,11 @@ "Visible": true, "Position": { "X": 0.0, - "Y": 0.3542696 + "Y": 0.35416666 }, "Size": { "X": 0.6375, - "Y": 0.44036698 + "Y": 0.44027779 } }, { @@ -28,11 +28,11 @@ "Visible": true, "Position": { "X": 0.63671875, - "Y": 0.3542696 + "Y": 0.35416666 }, "Size": { "X": 0.359375, - "Y": 0.44036698 + "Y": 0.44027779 } }, { @@ -63,12 +63,12 @@ "Title": "Variations", "Visible": true, "Position": { - "X": 0.6382812, - "Y": 0.016231475 + "X": 0.63671875, + "Y": 0.015972223 }, "Size": { - "X": 0.35859376, - "Y": 0.3373324 + "X": 0.36015624, + "Y": 0.33680555 } }, { @@ -76,11 +76,11 @@ "Visible": true, "Position": { "X": 0.0015625, - "Y": 0.01693719 + "Y": 0.016666668 }, "Size": { - "X": 0.63671875, - "Y": 0.34932956 + "X": 0.6347656, + "Y": 0.3361111 } }, { @@ -148,11 +148,11 @@ "Visible": true, "Position": { "X": 0.00078125, - "Y": 0.7967537 + "Y": 0.7965278 }, "Size": { "X": 0.9984375, - "Y": 0.20042343 + "Y": 0.2 } }, { diff --git a/Operators/Types/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3 b/Operators/Types/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3 index dcc231143..f82e3fb30 100644 --- a/Operators/Types/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3 +++ b/Operators/Types/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3 @@ -690,9 +690,9 @@ "Id": "8bb4a4e5-0c88-4d99-a5b2-2c9e22bd301f"/*ClearColor*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.09, - "Y": 0.09, - "Z": 0.09, + "X": 0.009534956, + "Y": 0.00955656, + "Z": 0.009579597, "W": 1.0 } } @@ -755,7 +755,7 @@ "X": 1.0, "Y": 1.0, "Z": 1.0, - "W": 0.89 + "W": 0.0 } }, { @@ -773,7 +773,7 @@ { "Id": "195da7e0-5279-4900-80cd-5635e96ab454"/*Amount*/, "Type": "System.Single", - "Value": 0.031 + "Value": 0.006 }, { "Id": "d24cce46-dd3f-4047-a33f-50abbca89cc4"/*Exponent*/, @@ -801,19 +801,19 @@ "Id": "4dc44a7b-fe7c-4807-aaaa-53fb553de017"/*Gain*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.4475559, - "Y": 0.46096388, - "Z": 0.46974808, - "W": 0.55 + "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.37468523, - "Y": 0.38603187, - "Z": 0.4449761, + "X": 0.51, + "Y": 0.51, + "Z": 0.51, "W": 0.496 } }, @@ -821,20 +821,20 @@ "Id": "e8cc8a26-313e-4399-b800-901019bbaa78"/*Lift*/, "Type": "System.Numerics.Vector4", "Value": { - "X": 0.6627091, - "Y": 0.63410753, - "Z": 0.5754509, - "W": 0.25 + "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.39907685, - "Y": 0.40591374, - "Z": 0.5167464, - "W": 0.51 + "X": 0.3367464, + "Y": 0.3367464, + "Z": 0.3367464, + "W": 0.0 } }, { @@ -870,7 +870,7 @@ { "Id": "25091e3d-36ef-4892-965c-b7d3c983da22"/*Samples*/, "Type": "System.Single", - "Value": 20.0 + "Value": 30.0 }, { "Id": "0623d858-8986-4058-b209-28b0649f1441"/*Color*/, @@ -1026,6 +1026,152 @@ } ], "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": [ @@ -1035,6 +1181,12 @@ "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", + "TargetSlotId": "777b2c27-a3c8-40d0-a196-80a08af51296" + }, { "SourceParentOrChildId": "8b161a5a-09ea-4b49-a9ff-dc46b96d44a9", "SourceSlotId": "b9baba42-18b6-4792-929d-bf628ce8a488", @@ -1054,11 +1206,17 @@ "TargetSlotId": "a7fff052-42c2-40fb-938e-9fb9b6cfa591" }, { - "SourceParentOrChildId": "d01aa3f5-89c7-40b6-83f1-5a8d09adc62d", - "SourceSlotId": "7a4c4feb-be2f-463e-96c6-cd9a6bad77a2", + "SourceParentOrChildId": "0791be4c-dfcf-4444-a5af-1ac1edfb03de", + "SourceSlotId": "1680781d-af5e-4b77-beb6-3e4a12d73d59", "TargetParentOrChildId": "213d8d2c-8302-4914-9076-44e04e46de5f", "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": "54dbf23d-70a7-413b-95dc-e56e61f129c4", "SourceSlotId": "e0c4fedd-5c2f-46c8-b67d-5667435fb037", @@ -1084,11 +1242,17 @@ "TargetSlotId": "2a95ac54-5ef7-4d3c-a90b-ecd5b422bddc" }, { - "SourceParentOrChildId": "213d8d2c-8302-4914-9076-44e04e46de5f", - "SourceSlotId": "df388f27-f5b6-417b-87a7-a6a59b625128", + "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": "485cbaff-86d3-482c-bb88-742e2060be8c", + "SourceSlotId": "1680781d-af5e-4b77-beb6-3e4a12d73d59", + "TargetParentOrChildId": "4dc12b23-60fe-4e64-8a45-992ac57f07bc", + "TargetSlotId": "f434bac8-b7d8-4787-adf2-1782d6588da8" + }, { "SourceParentOrChildId": "7adf0c05-6be9-4472-a171-6470b0ab59ea", "SourceSlotId": "7a4c4feb-be2f-463e-96c6-cd9a6bad77a2", @@ -1595,7 +1759,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.0, + "Time": 2.3875, "Value": -1.309999942779541, "InType": "Spline", "OutType": "Spline", @@ -1605,7 +1769,7 @@ "OutTangentAngle": 4.426036784745936 }, { - "Time": 0.742, + "Time": 3.1295, "Value": 1.2100000381469727, "InType": "Spline", "OutType": "Spline", @@ -1625,7 +1789,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.1125, + "Time": 2.5, "Value": 0.0, "InType": "Linear", "OutType": "Linear", @@ -1635,7 +1799,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 0.425, + "Time": 2.8125, "Value": 0.0, "InType": "Spline", "OutType": "Spline", @@ -1645,7 +1809,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 3.2125, + "Time": 5.6, "Value": 0.0, "InType": "Spline", "OutType": "Spline", @@ -1665,7 +1829,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.4844, + "Time": 2.8719, "Value": 1.0, "InType": "Spline", "OutType": "Spline", @@ -1675,7 +1839,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 0.5434, + "Time": 2.9309, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -1685,7 +1849,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 2.175, + "Time": 4.5625, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -1695,7 +1859,17 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 3.6125, + "Time": 6.0, + "Value": 1.0, + "InType": "Linear", + "OutType": "Linear", + "InEditMode": "Linear", + "OutEditMode": "Linear", + "InTangentAngle": 0.0, + "OutTangentAngle": 3.141592653589793 + }, + { + "Time": 7.1, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -1715,7 +1889,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.4838, + "Time": 2.8713, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -1725,7 +1899,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 0.9407, + "Time": 4.725, "Value": 1.0, "InType": "Spline", "OutType": "Spline", @@ -2034,7 +2208,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.0, + "Time": 2.3875, "Value": 0.0, "InType": "Spline", "OutType": "Spline", @@ -2044,7 +2218,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 0.742, + "Time": 3.1295, "Value": 0.0, "InType": "Spline", "OutType": "Spline", @@ -2065,7 +2239,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.1125, + "Time": 2.5, "Value": 0.0, "InType": "Linear", "OutType": "Linear", @@ -2075,7 +2249,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 0.425, + "Time": 2.8125, "Value": 0.0, "InType": "Spline", "OutType": "Spline", @@ -2085,7 +2259,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 3.2125, + "Time": 5.6, "Value": 0.0, "InType": "Spline", "OutType": "Spline", @@ -2106,7 +2280,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.4844, + "Time": 2.8719, "Value": 1.0, "InType": "Spline", "OutType": "Spline", @@ -2116,7 +2290,17 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 0.5434, + "Time": 2.9309, + "Value": 1.0, + "InType": "Linear", + "OutType": "Linear", + "InEditMode": "Linear", + "OutEditMode": "Linear", + "InTangentAngle": 0.0, + "OutTangentAngle": 3.141592653589793 + }, + { + "Time": 4.5625, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -2126,7 +2310,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 2.175, + "Time": 6.0, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -2136,7 +2320,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 3.6125, + "Time": 7.1, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -2157,7 +2341,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.4838, + "Time": 2.8713, "Value": 0.9999899864196777, "InType": "Linear", "OutType": "Linear", @@ -2167,7 +2351,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 0.9407, + "Time": 4.725, "Value": 0.9999899864196777, "InType": "Spline", "OutType": "Spline", @@ -2445,7 +2629,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.1125, + "Time": 2.5, "Value": 1.7899999618530273, "InType": "Linear", "OutType": "Linear", @@ -2455,7 +2639,7 @@ "OutTangentAngle": 3.7332785658284062 }, { - "Time": 0.425, + "Time": 2.8125, "Value": 2.0, "InType": "Spline", "OutType": "Spline", @@ -2465,7 +2649,7 @@ "OutTangentAngle": 3.3190774250845028 }, { - "Time": 3.2125, + "Time": 5.6, "Value": 2.5, "InType": "Spline", "OutType": "Spline", @@ -2486,7 +2670,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.4844, + "Time": 2.8719, "Value": 1.0, "InType": "Spline", "OutType": "Spline", @@ -2496,7 +2680,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 0.5434, + "Time": 2.9309, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -2506,7 +2690,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 2.175, + "Time": 4.5625, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -2516,7 +2700,17 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 3.6125, + "Time": 6.0, + "Value": 1.0, + "InType": "Linear", + "OutType": "Linear", + "InEditMode": "Linear", + "OutEditMode": "Linear", + "InTangentAngle": 0.0, + "OutTangentAngle": 3.141592653589793 + }, + { + "Time": 7.1, "Value": 1.0, "InType": "Linear", "OutType": "Linear", @@ -2537,7 +2731,7 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.4838, + "Time": 2.8713, "Value": 0.9999899864196777, "InType": "Linear", "OutType": "Linear", @@ -2547,7 +2741,7 @@ "OutTangentAngle": 3.141592653589793 }, { - "Time": 0.9407, + "Time": 4.725, "Value": 0.9999899864196777, "InType": "Spline", "OutType": "Spline", @@ -2763,27 +2957,27 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.4844, + "Time": 2.8719, "Value": 0.8899999856948853, "InType": "Spline", "OutType": "Spline", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 1.0784827913984572, - "OutTangentAngle": 4.22007544498825 + "InTangentAngle": 1.078482791398459, + "OutTangentAngle": 4.220075444988252 }, { - "Time": 0.5434, + "Time": 2.9309, "Value": 1.0, "InType": "Linear", "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": 1.078482791398457, + "InTangentAngle": 1.078482791398459, "OutTangentAngle": 2.9835685230060056 }, { - "Time": 2.175, + "Time": 4.5625, "Value": 0.7400000095367432, "InType": "Linear", "OutType": "Linear", @@ -2793,14 +2987,24 @@ "OutTangentAngle": 2.8068558162729786 }, { - "Time": 3.6125, + "Time": 6.0, "Value": 0.24000000953674316, "InType": "Linear", "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", "InTangentAngle": -0.3347368373168147, - "OutTangentAngle": -3.4763294909066076 + "OutTangentAngle": 2.9267772449123237 + }, + { + "Time": 7.1, + "Value": 0.0, + "InType": "Linear", + "OutType": "Linear", + "InEditMode": "Linear", + "OutEditMode": "Linear", + "InTangentAngle": -0.2148154086774694, + "OutTangentAngle": -3.3564080622672625 } ] } @@ -2814,24 +3018,24 @@ "PostCurve": "Constant", "Keys": [ { - "Time": 0.4838, + "Time": 2.8713, "Value": 0.46000000834465027, "InType": "Linear", "OutType": "Linear", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": -0.7887791171596032, - "OutTangentAngle": 2.35281353643019 + "InTangentAngle": -0.24323894239931398, + "OutTangentAngle": 2.898353711190479 }, { - "Time": 0.9407, + "Time": 4.725, "Value": 0.0, "InType": "Spline", "OutType": "Spline", "InEditMode": "Linear", "OutEditMode": "Linear", - "InTangentAngle": -0.7887791171596032, - "OutTangentAngle": -3.9303717707493964 + "InTangentAngle": -0.24323894239931443, + "OutTangentAngle": -3.3848315959891075 } ] } diff --git a/Operators/Types/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3ui b/Operators/Types/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3ui index d130f08d3..fb613bf49 100644 --- a/Operators/Types/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3ui +++ b/Operators/Types/FluidFireLogo_cf1fdb46-72c0-4e3c-a00d-edef25ae955a.t3ui @@ -274,8 +274,8 @@ "Y": 36.0 }, "Position": { - "X": 2193.2695, - "Y": 992.92334 + "X": 2306.3774, + "Y": 982.7835 } }, { @@ -318,8 +318,8 @@ "Y": 36.0 }, "Position": { - "X": 2343.2695, - "Y": 992.92334 + "X": 2905.294, + "Y": 844.1579 } }, { @@ -329,8 +329,8 @@ "Y": 36.0 }, "Position": { - "X": 2493.2695, - "Y": 992.92334 + "X": 2681.1394, + "Y": 982.7835 } }, { @@ -398,6 +398,61 @@ "X": 1738.2631, "Y": 1135.5437 } + }, + { + "ChildId": "ce6c111f-cfe0-488e-be45-2e5b2c072962"/*Grain*/, + "Size": { + "X": 110.0, + "Y": 23.0 + }, + "Position": { + "X": 2541.3906, + "Y": 1187.827 + } + }, + { + "ChildId": "25bd2f25-ea61-448e-b594-191af16b8489"/*WaveForm2*/, + "Size": { + "X": 110.0, + "Y": 36.0 + }, + "Position": { + "X": 2898.797, + "Y": 1229.8855 + } + }, + { + "ChildId": "4dc12b23-60fe-4e64-8a45-992ac57f07bc"/*ImageLevels*/, + "Size": { + "X": 110.0, + "Y": 36.0 + }, + "Position": { + "X": 2955.324, + "Y": 991.6649 + } + }, + { + "ChildId": "c12d9089-9edf-418c-8121-478c50ff2d7e"/*LinearGradient*/, + "Size": { + "X": 110.0, + "Y": 23.0 + }, + "Position": { + "X": 2707.7559, + "Y": 620.5015 + } + }, + { + "ChildId": "0791be4c-dfcf-4444-a5af-1ac1edfb03de"/*ColorGrade*/, + "Size": { + "X": 110.0, + "Y": 36.0 + }, + "Position": { + "X": 2652.5635, + "Y": 797.6701 + } } ], "OutputUis": [