Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Editor/Program.cs
#	Install/default-layouts/layout0.json
  • Loading branch information
pixtur committed Dec 11, 2022
2 parents 991d8d8 + a4427e2 commit 61d254c
Show file tree
Hide file tree
Showing 477 changed files with 14,270 additions and 6,311 deletions.
8 changes: 4 additions & 4 deletions .Variations/1fec51bc-4de7-400a-8910-db39f4129579.var
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"ActivationIndex": 2,
"Title": "Highlights",
"PosOnCanvas": {
"X": 326.0,
"Y": 0.0
"X": 0.0,
"Y": 93.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
Expand Down Expand Up @@ -106,8 +106,8 @@
"ActivationIndex": 3,
"Title": "Cyber",
"PosOnCanvas": {
"X": 489.0,
"Y": 0.0
"X": 162.99998,
"Y": 93.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
Expand Down
132 changes: 114 additions & 18 deletions .Variations/3352d3a1-ab04-4d0a-bb43-da69095b73fd.var
Original file line number Diff line number Diff line change
Expand Up @@ -21,55 +21,151 @@
}
},
{
"Id": "ef392fc8-b2fc-4ed2-8cfe-fef8f70472a8",
"Id": "c0b4d85d-a8b7-431e-ad8e-596f0daed065",
"IsPreset": true,
"ActivationIndex": 2,
"Title": "untitled",
"ActivationIndex": 3,
"Title": "100 y",
"PosOnCanvas": {
"X": 163.0,
"Y": 93.0
"X": 0.0,
"Y": 0.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b654ffe2-d46e-4a62-89b3-a9692d5c6481": 100,
"acce4779-56d6-47c4-9c52-874fca91a3a1": 1.0,
"13cbb509-f90c-4ae7-a9d3-a8fc907794e3": 0.0,
"5a3347a2-ba87-4b38-a1a8-94bd0ef70f48": 0.0,
"94b2a118-f760-4043-933c-31283e6e7006": 1.0
"6df5829e-a534-4620-bcd5-9324f94b4f54": {
"X": 0.0,
"Y": 1.0,
"Z": 0.0
}
}
}
},
{
"Id": "c0b4d85d-a8b7-431e-ad8e-596f0daed065",
"Id": "0248c8e3-15ab-4244-93f9-f5f2fdbea8c6",
"IsPreset": true,
"ActivationIndex": 3,
"Title": "untitled",
"ActivationIndex": 5,
"Title": "Ring XY tangential",
"PosOnCanvas": {
"X": 0.0,
"X": 163.0,
"Y": 0.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b654ffe2-d46e-4a62-89b3-a9692d5c6481": 7,
"6df5829e-a534-4620-bcd5-9324f94b4f54": {
"X": 0.0,
"Y": 1.0,
"Z": 0.0
}
},
"01a62754-7629-487d-a43a-f0cd2fbfafce": {
"X": 1.0,
"Y": 0.0,
"Z": 0.0
},
"cd917c3d-489e-4e4d-b5dc-eacc846d82ef": 90.0
}
}
},
{
"Id": "0248c8e3-15ab-4244-93f9-f5f2fdbea8c6",
"Id": "18b2a6d5-e8a5-4728-be11-c1c704ce2003",
"IsPreset": true,
"ActivationIndex": 4,
"Title": "Double Helix",
"PosOnCanvas": {
"X": 163.0,
"Y": 93.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b654ffe2-d46e-4a62-89b3-a9692d5c6481": 2000,
"f6986f68-851b-4cd1-ae59-bf189aa1698e": {
"X": 0.0,
"Y": 0.0,
"Z": -2.0
},
"94b2a118-f760-4043-933c-31283e6e7006": 1000.0
}
}
},
{
"Id": "18398976-8779-4d7b-8998-43415c5d14d0",
"IsPreset": true,
"ActivationIndex": 5,
"Title": "Ring XY",
"Title": "Spring",
"PosOnCanvas": {
"X": 0.0,
"Y": 186.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b654ffe2-d46e-4a62-89b3-a9692d5c6481": 2000,
"f6986f68-851b-4cd1-ae59-bf189aa1698e": {
"X": 0.0,
"Y": 0.0,
"Z": -2.0
},
"94b2a118-f760-4043-933c-31283e6e7006": 5.0
}
}
},
{
"Id": "5d233ce7-1d75-40e7-8be8-1570bd57f985",
"IsPreset": true,
"ActivationIndex": 6,
"Title": "Tornado",
"PosOnCanvas": {
"X": 163.0,
"Y": 186.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b654ffe2-d46e-4a62-89b3-a9692d5c6481": 20000,
"acce4779-56d6-47c4-9c52-874fca91a3a1": 0.0,
"13cbb509-f90c-4ae7-a9d3-a8fc907794e3": 1.5,
"ca84209e-d821-40c6-b23c-38fc4bbd47b0": {
"X": 0.0,
"Y": 0.0,
"Z": 0.0
},
"f6986f68-851b-4cd1-ae59-bf189aa1698e": {
"X": 0.0,
"Y": 4.5,
"Z": 0.0
},
"94b2a118-f760-4043-933c-31283e6e7006": 20.0,
"6df5829e-a534-4620-bcd5-9324f94b4f54": {
"X": 0.0,
"Y": 1.0,
"Z": 0.0
},
"526cf26b-6cf6-4cba-be2a-4819c2a422bf": 1.0
}
}
},
{
"Id": "f6e43534-5e41-4793-8059-5b9ddbdd8711",
"IsPreset": true,
"ActivationIndex": 7,
"Title": "untitled",
"PosOnCanvas": {
"X": 0.0,
"Y": 0.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b654ffe2-d46e-4a62-89b3-a9692d5c6481": 7,
"b654ffe2-d46e-4a62-89b3-a9692d5c6481": 20000,
"acce4779-56d6-47c4-9c52-874fca91a3a1": 0.0,
"13cbb509-f90c-4ae7-a9d3-a8fc907794e3": 0.0,
"ca84209e-d821-40c6-b23c-38fc4bbd47b0": {
"X": 0.0,
"Y": 0.0,
"Z": 0.0
},
"f6986f68-851b-4cd1-ae59-bf189aa1698e": {
"X": 0.0,
"Y": 4.5,
"Z": 0.0
},
"94b2a118-f760-4043-933c-31283e6e7006": 10.0,
"6df5829e-a534-4620-bcd5-9324f94b4f54": {
"X": 0.0,
"Y": 1.0,
Expand Down
155 changes: 155 additions & 0 deletions .Variations/72e627e9-f570-4936-92b1-b12ed8d6004e.var
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
{
"Id": "72e627e9-f570-4936-92b1-b12ed8d6004e",
"Variations": [
{
"Id": "dc6212a0-a4eb-44ed-8c5a-14f837488b34",
"IsPreset": true,
"ActivationIndex": 1,
"Title": "Default",
"PosOnCanvas": {
"X": 0.0,
"Y": 0.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {}
}
},
{
"Id": "bbde927d-4503-48c8-8a3d-a112b17cbfe8",
"IsPreset": true,
"ActivationIndex": 2,
"Title": "Slit",
"PosOnCanvas": {
"X": 162.99998,
"Y": 0.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b77a3329-c938-4dd3-bf3b-8774db187ef5": 0.02,
"b465481c-8b5d-4c6d-a659-6f51135b86fa": 0.0
}
}
},
{
"Id": "b51d25cc-912d-49a0-9736-188207520ec6",
"IsPreset": true,
"ActivationIndex": 3,
"Title": "Scanner",
"PosOnCanvas": {
"X": 326.00003,
"Y": 0.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b9859a88-4dd1-4221-9884-0a6e8cec9da4": {
"X": 1.0,
"Y": 0.99999,
"Z": 0.99999,
"W": 1.0
},
"b77a3329-c938-4dd3-bf3b-8774db187ef5": 0.02,
"b465481c-8b5d-4c6d-a659-6f51135b86fa": 0.0
}
}
},
{
"Id": "3b388b1f-e9a9-4bdf-af78-3297b58dbbe4",
"IsPreset": true,
"ActivationIndex": 4,
"Title": "Consider this",
"PosOnCanvas": {
"X": 0.0,
"Y": 93.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b9859a88-4dd1-4221-9884-0a6e8cec9da4": {
"X": 1.0,
"Y": 0.99999,
"Z": 0.99999,
"W": 1.0
},
"549020f5-e405-4f78-a973-9e9fb3c9c25e": {
"X": 0.0,
"Y": 0.0,
"Z": 0.0,
"W": 1.0
},
"b77a3329-c938-4dd3-bf3b-8774db187ef5": 0.12,
"b465481c-8b5d-4c6d-a659-6f51135b86fa": 90.0,
"881e04f7-1014-4e87-81c9-f4791086e57d": 3.3000002
}
}
},
{
"Id": "ff39a6f2-8487-4981-ba8d-bdb1758a841f",
"IsPreset": true,
"ActivationIndex": 5,
"Title": "Cutout",
"PosOnCanvas": {
"X": 163.0,
"Y": 93.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"b9859a88-4dd1-4221-9884-0a6e8cec9da4": {
"X": 1.0,
"Y": 0.99999,
"Z": 0.99999,
"W": 0.0
},
"549020f5-e405-4f78-a973-9e9fb3c9c25e": {
"X": 0.0,
"Y": 0.0,
"Z": 0.0,
"W": 1.0
},
"b77a3329-c938-4dd3-bf3b-8774db187ef5": 0.02,
"b465481c-8b5d-4c6d-a659-6f51135b86fa": 90.0,
"0f597b6c-eec8-4b06-92de-28f7cbe2243a": -6.2,
"881e04f7-1014-4e87-81c9-f4791086e57d": 3.3000002,
"3acc47a3-83a8-4994-8456-e365595ed38c": -1.38,
"294af91e-65f2-4e2c-8bd2-0896019f8e65": -0.19999981
}
}
},
{
"Id": "35181933-7e27-4e55-b8dc-2bb0da3ee253",
"IsPreset": true,
"ActivationIndex": 6,
"Title": "Mind the gap",
"PosOnCanvas": {
"X": 326.0,
"Y": 93.0
},
"ParameterSetsForChildIds": {
"00000000-0000-0000-0000-000000000000": {
"35e6faff-7e13-4fa8-8aca-32efc02f29e0": {
"X": 1.0,
"Y": 1.0,
"Z": 1.0,
"W": 0.0
},
"b9859a88-4dd1-4221-9884-0a6e8cec9da4": {
"X": 1.0,
"Y": 0.99999,
"Z": 0.99999,
"W": 1.0
},
"549020f5-e405-4f78-a973-9e9fb3c9c25e": {
"X": 1.0,
"Y": 0.073311746,
"Z": 0.0,
"W": 1.0
},
"b77a3329-c938-4dd3-bf3b-8774db187ef5": 0.05,
"b465481c-8b5d-4c6d-a659-6f51135b86fa": 90.0,
"0f597b6c-eec8-4b06-92de-28f7cbe2243a": -6.2,
"881e04f7-1014-4e87-81c9-f4791086e57d": 3.3000002,
"3acc47a3-83a8-4994-8456-e365595ed38c": -1.38,
"294af91e-65f2-4e2c-8bd2-0896019f8e65": -0.19999981
}
}
}
]
}
Loading

0 comments on commit 61d254c

Please sign in to comment.