Skip to content

Commit b60fdc8

Browse files
alelievralelievr
committed
Merge master
2 parents a18640e + 52d501e commit b60fdc8

12 files changed

Lines changed: 204 additions & 174 deletions

File tree

‎Assets/Examples/CustomOutputExample.asset‎

Lines changed: 12 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -14,86 +14,30 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
serializedNodes:
1616
- type: PrintNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
17-
jsonDatas: '{"GUID":"ad1673a8-dc56-4495-84fa-6cd5c52f247f","computeOrder":6,"canProcess":true,"position":{"serializedVersion":"2","x":673.8209228515625,"y":130.5613555908203,"width":72.0,"height":96.0},"expanded":false,"debug":false,"nodeLock":false}'
17+
jsonDatas: '{"GUID":"ad1673a8-dc56-4495-84fa-6cd5c52f247f","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":673.8209228515625,"y":130.5613555908203,"width":72.0,"height":96.0},"expanded":false,"debug":false,"nodeLock":false}'
1818
- type: FloatNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
1919
jsonDatas: '{"GUID":"4ddedc62-453d-4d18-81bb-0b8cdb80556d","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":47.82987594604492,"y":346.8563537597656,"width":74.0,"height":101.0},"expanded":false,"debug":false,"nodeLock":false,"output":5.0}'
2020
- type: FloatNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
2121
jsonDatas: '{"GUID":"54814e54-d849-427c-bd54-4f84921ddb9a","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":60.04347229003906,"y":103.82608795166016,"width":73.0,"height":101.0},"expanded":false,"debug":false,"nodeLock":false,"output":42.0}'
2222
- type: CustomPortsNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
23-
jsonDatas: '{"GUID":"3042d8e2-86c8-46bd-8773-a23db56c259d","computeOrder":5,"canProcess":true,"position":{"serializedVersion":"2","x":371.74102783203127,"y":188.7609405517578,"width":128.0,"height":220.99996948242188},"expanded":false,"debug":false,"nodeLock":false,"inputs":[],"outputs":[],"portCount":7}'
23+
jsonDatas: '{"GUID":"3042d8e2-86c8-46bd-8773-a23db56c259d","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":355.5000305175781,"y":208.1000213623047,"width":128.0,"height":221.00003051757813},"expanded":false,"debug":false,"nodeLock":false,"inputs":[],"outputs":[],"portCount":7}'
2424
- type: FloatNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
2525
jsonDatas: '{"GUID":"d110a426-a040-4a9c-94f9-00c59e4f5a87","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":55.0,"y":207.0,"width":73.0,"height":101.0},"expanded":false,"debug":false,"nodeLock":false,"output":0.0}'
2626
- type: CircleRadians, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
27-
jsonDatas: '{"GUID":"344fdef8-b64e-4059-9aad-c59d868c421d","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":25.35000228881836,"y":449.7000427246094,"width":116.00001525878906,"height":95.00000762939453},"expanded":true,"debug":false,"nodeLock":false,"outputRadians":[0.0]}'
27+
jsonDatas: '{"GUID":"344fdef8-b64e-4059-9aad-c59d868c421d","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":25.35000228881836,"y":449.7000427246094,"width":116.00001525878906,"height":95.00000762939453},"expanded":true,"debug":false,"nodeLock":false,"outputRadians":[]}'
2828
- type: AbstractNodeChild1, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
2929
jsonDatas: '{"GUID":"a0cd8589-db49-45a9-95f0-b8a563fa3872","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":285.0,"y":558.1600341796875,"width":121.0,"height":95.0},"expanded":false,"debug":false,"nodeLock":false,"input":0.0,"output":0.0}'
3030
- type: AbstractNodeChild2, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
31-
jsonDatas: '{"GUID":"20c41dd3-8def-4ccc-8983-5b20912544c3","computeOrder":2,"canProcess":true,"position":{"serializedVersion":"2","x":457.0,"y":553.0,"width":121.0,"height":95.0},"expanded":false,"debug":false,"nodeLock":false,"input":0.0,"output":0.0}'
31+
jsonDatas: '{"GUID":"20c41dd3-8def-4ccc-8983-5b20912544c3","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":457.0,"y":553.0,"width":121.0,"height":95.0},"expanded":false,"debug":false,"nodeLock":false,"input":0.0,"output":0.0}'
3232
- type: PrintNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
33-
jsonDatas: '{"GUID":"88150667-ebd8-4c1f-b50a-a26ee09c79cb","computeOrder":6,"canProcess":true,"position":{"serializedVersion":"2","x":679.0,"y":338.0,"width":71.0,"height":95.0},"expanded":false,"debug":false,"nodeLock":false}'
34-
edges:
35-
- GUID: ebd06ea1-7594-4624-ab83-881c693bd21e
36-
owner: {fileID: 11400000}
37-
inputNodeGUID: 3042d8e2-86c8-46bd-8773-a23db56c259d
38-
outputNodeGUID: 54814e54-d849-427c-bd54-4f84921ddb9a
39-
inputFieldName: inputs
40-
outputFieldName: output
41-
inputPortIdentifier: 2
42-
outputPortIdentifier:
43-
- GUID: b3e20920-3c5f-432f-8bac-468cdaa5f891
44-
owner: {fileID: 11400000}
45-
inputNodeGUID: 3042d8e2-86c8-46bd-8773-a23db56c259d
46-
outputNodeGUID: d110a426-a040-4a9c-94f9-00c59e4f5a87
47-
inputFieldName: inputs
48-
outputFieldName: output
49-
inputPortIdentifier: 3
50-
outputPortIdentifier:
51-
- GUID: 2b951f2e-0851-4e8a-a417-33bcd3bd6e44
52-
owner: {fileID: 11400000}
53-
inputNodeGUID: 3042d8e2-86c8-46bd-8773-a23db56c259d
54-
outputNodeGUID: 4ddedc62-453d-4d18-81bb-0b8cdb80556d
55-
inputFieldName: inputs
56-
outputFieldName: output
57-
inputPortIdentifier: 0
58-
outputPortIdentifier:
59-
- GUID: 95d766fb-64c1-4377-b033-0a95f0a62604
60-
owner: {fileID: 11400000}
61-
inputNodeGUID: 3042d8e2-86c8-46bd-8773-a23db56c259d
62-
outputNodeGUID: 344fdef8-b64e-4059-9aad-c59d868c421d
63-
inputFieldName: inputs
64-
outputFieldName: outputRadians
65-
inputPortIdentifier: 5
66-
outputPortIdentifier:
67-
- GUID: e53b279d-0b82-4a67-b56d-66ed275df2f7
68-
owner: {fileID: 11400000}
69-
inputNodeGUID: 20c41dd3-8def-4ccc-8983-5b20912544c3
70-
outputNodeGUID: a0cd8589-db49-45a9-95f0-b8a563fa3872
71-
inputFieldName: input
72-
outputFieldName: output
73-
inputPortIdentifier:
74-
outputPortIdentifier:
75-
- GUID: e9448aaa-a4db-43cb-882f-c7f96fa70711
76-
owner: {fileID: 11400000}
77-
inputNodeGUID: 88150667-ebd8-4c1f-b50a-a26ee09c79cb
78-
outputNodeGUID: 3042d8e2-86c8-46bd-8773-a23db56c259d
79-
inputFieldName: obj
80-
outputFieldName: outputs
81-
inputPortIdentifier:
82-
outputPortIdentifier:
83-
- GUID: 96ee8372-ca8f-44f6-b6bf-48d21e39e784
84-
owner: {fileID: 11400000}
85-
inputNodeGUID: ad1673a8-dc56-4495-84fa-6cd5c52f247f
86-
outputNodeGUID: 3042d8e2-86c8-46bd-8773-a23db56c259d
87-
inputFieldName: obj
88-
outputFieldName: outputs
89-
inputPortIdentifier:
90-
outputPortIdentifier:
33+
jsonDatas: '{"GUID":"88150667-ebd8-4c1f-b50a-a26ee09c79cb","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":679.0,"y":338.0,"width":71.0,"height":95.0},"expanded":false,"debug":false,"nodeLock":false}'
34+
edges: []
9135
commentBlocks: []
9236
pinnedElements:
9337
- position:
9438
serializedVersion: 2
9539
x: 0
96-
y: 0
40+
y: 18
9741
width: 150
9842
height: 200
9943
opened: 1
@@ -102,14 +46,14 @@ MonoBehaviour:
10246
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
10347
- position:
10448
serializedVersion: 2
105-
x: 0
106-
y: 246
49+
x: 1042
50+
y: 296
10751
width: 150
10852
height: 200
109-
opened: 1
53+
opened: 0
11054
editorType:
11155
serializedType: GraphProcessor.ProcessorView, com.alelievr.NodeGraphProcessor,
11256
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
11357
exposedParameters: []
114-
position: {x: 170, y: 3.9999993, z: 0}
115-
scale: {x: 0.57175326, y: 0.57175326, z: 1}
58+
position: {x: 208, y: 72, z: 0}
59+
scale: {x: 0.65751624, y: 0.65751624, z: 1}

‎Assets/Examples/ExposedPropertiesExample.asset‎

Lines changed: 43 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,58 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
serializedNodes:
1616
- type: PrintNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
17-
jsonDatas: '{"GUID":"39fdf09f-b7ff-49f5-bfe5-c59e221c30b6","computeOrder":2,"canProcess":true,"position":{"serializedVersion":"2","x":227.00003051757813,"y":445.00006103515627,"width":72.0,"height":95.0},"expanded":true,"debug":false,"nodeLock":false}'
18-
- type: PrintNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
19-
jsonDatas: '{"GUID":"bd6e5486-333b-4d08-b049-1103e9b1dc20","computeOrder":2,"canProcess":true,"position":{"serializedVersion":"2","x":216.17015075683595,"y":572.4877319335938,"width":72.0,"height":95.0},"expanded":false,"debug":false,"nodeLock":false}'
20-
- type: ParameterNode, com.alelievr.NodeGraphProcessor, Version=0.0.0.0, Culture=neutral,
21-
PublicKeyToken=null
22-
jsonDatas: '{"GUID":"8bd321f8-b93c-4360-8b0c-d004d3604e97","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":45.368614196777347,"y":641.9660034179688,"width":100.0,"height":100.0},"expanded":false,"debug":false,"nodeLock":false,"parameterGUID":"fc2400e0-1461-4ba2-9d60-9533b6417d88"}'
23-
- type: ParameterNode, com.alelievr.NodeGraphProcessor, Version=0.0.0.0, Culture=neutral,
24-
PublicKeyToken=null
25-
jsonDatas: '{"GUID":"dab6d88a-b3dc-4dc9-bd5f-1240771222bf","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":46.88090133666992,"y":519.470703125,"width":100.0,"height":100.0},"expanded":false,"debug":false,"nodeLock":false,"parameterGUID":"9ae7b637-72eb-4fcf-90d9-c9bd11336a2b"}'
17+
jsonDatas: '{"GUID":"39fdf09f-b7ff-49f5-bfe5-c59e221c30b6","computeOrder":2,"canProcess":true,"position":{"serializedVersion":"2","x":415.0,"y":101.0,"width":72.0,"height":95.0},"expanded":true,"debug":false,"nodeLock":false}'
18+
- type: GraphProcessor.ParameterNode, com.alelievr.NodeGraphProcessor, Version=0.0.0.0,
19+
Culture=neutral, PublicKeyToken=null
20+
jsonDatas: '{"GUID":"e04c1751-9d7c-42c1-b140-77cf41fad3a9","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":255.0,"y":108.0,"width":73.0,"height":97.0},"expanded":false,"debug":false,"nodeLock":false,"parameterGUID":"hguieowhg","accessor":0}'
21+
- type: GraphProcessor.ParameterNode, com.alelievr.NodeGraphProcessor, Version=0.0.0.0,
22+
Culture=neutral, PublicKeyToken=null
23+
jsonDatas: '{"GUID":"3fd26d08-2596-42f5-996e-94c034f5a10b","computeOrder":4,"canProcess":true,"position":{"serializedVersion":"2","x":417.0,"y":248.0,"width":83.0,"height":97.0},"expanded":false,"debug":false,"nodeLock":false,"parameterGUID":"9ae7b637-72eb-4fcf-90d9-c9bd11336a2b","accessor":1}'
24+
- type: SubNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
25+
jsonDatas: '{"GUID":"1327efdb-6d08-421e-a601-67e39e1c4073","computeOrder":3,"canProcess":true,"position":{"serializedVersion":"2","x":292.0,"y":271.0,"width":98.0,"height":101.0},"expanded":false,"debug":false,"nodeLock":false,"inputA":42.0,"inputB":12.0,"output":30.0}'
26+
- type: FloatNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
27+
jsonDatas: '{"GUID":"47e80399-61e7-4350-9ff3-aa91b54eabe3","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":191.0,"y":223.0,"width":73.0,"height":101.0},"expanded":false,"debug":false,"nodeLock":false,"output":42.0}'
28+
- type: FloatNode, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
29+
jsonDatas: '{"GUID":"5a439c2f-4655-43ed-a6ae-e142b92b25ce","computeOrder":1,"canProcess":true,"position":{"serializedVersion":"2","x":193.0,"y":326.0,"width":73.0,"height":101.0},"expanded":false,"debug":false,"nodeLock":false,"output":12.0}'
2630
edges:
27-
- GUID: 33779579-bb15-444c-ad93-9cdb4ddc8ea0
31+
- GUID: 9da87722-5b0e-491d-af10-63206a3ca74e
2832
owner: {fileID: 11400000}
29-
inputNodeGUID: bd6e5486-333b-4d08-b049-1103e9b1dc20
30-
outputNodeGUID: 8bd321f8-b93c-4360-8b0c-d004d3604e97
31-
inputFieldName: obj
33+
inputNodeGUID: 1327efdb-6d08-421e-a601-67e39e1c4073
34+
outputNodeGUID: 5a439c2f-4655-43ed-a6ae-e142b92b25ce
35+
inputFieldName: inputB
3236
outputFieldName: output
3337
inputPortIdentifier:
34-
outputPortIdentifier: output
35-
- GUID: 3cab5bf1-528f-4325-849e-d82233fc7f62
38+
outputPortIdentifier:
39+
- GUID: cd6d29b2-5895-4265-bac2-12c7726ae674
40+
owner: {fileID: 11400000}
41+
inputNodeGUID: 1327efdb-6d08-421e-a601-67e39e1c4073
42+
outputNodeGUID: 47e80399-61e7-4350-9ff3-aa91b54eabe3
43+
inputFieldName: inputA
44+
outputFieldName: output
45+
inputPortIdentifier:
46+
outputPortIdentifier:
47+
- GUID: a8e11523-8a1b-4eb6-9aba-d35c0138a3da
3648
owner: {fileID: 11400000}
3749
inputNodeGUID: 39fdf09f-b7ff-49f5-bfe5-c59e221c30b6
38-
outputNodeGUID: dab6d88a-b3dc-4dc9-bd5f-1240771222bf
50+
outputNodeGUID: e04c1751-9d7c-42c1-b140-77cf41fad3a9
3951
inputFieldName: obj
4052
outputFieldName: output
4153
inputPortIdentifier:
4254
outputPortIdentifier: output
55+
- GUID: e3be1318-1249-4949-a2c9-1cacdd595afe
56+
owner: {fileID: 11400000}
57+
inputNodeGUID: 3fd26d08-2596-42f5-996e-94c034f5a10b
58+
outputNodeGUID: 1327efdb-6d08-421e-a601-67e39e1c4073
59+
inputFieldName: input
60+
outputFieldName: output
61+
inputPortIdentifier: input
62+
outputPortIdentifier:
4363
commentBlocks: []
4464
pinnedElements:
4565
- position:
4666
serializedVersion: 2
47-
x: 0
48-
y: 79
67+
x: 6
68+
y: 43
4969
width: 150
5070
height: 200
5171
opened: 1
@@ -54,8 +74,8 @@ MonoBehaviour:
5474
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
5575
- position:
5676
serializedVersion: 2
57-
x: 822
58-
y: 322
77+
x: 0
78+
y: 226
5979
width: 150
6080
height: 200
6181
opened: 1
@@ -77,7 +97,7 @@ MonoBehaviour:
7797
serializedValue:
7898
serializedType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
7999
serializedName:
80-
serializedValue: 21
100+
serializedValue: 30
81101
input: 1
82102
- guid: fc2400e0-1461-4ba2-9d60-9533b6417d88
83103
name: New ColorParam
@@ -89,5 +109,5 @@ MonoBehaviour:
89109
serializedName:
90110
serializedValue: '{"r":1.0,"g":0.0,"b":0.0,"a":0.0}'
91111
input: 1
92-
position: {x: -105.5, y: -880.5, z: 0}
93-
scale: {x: 2, y: 2, z: 1}
112+
position: {x: 8, y: -51, z: 0}
113+
scale: {x: 1, y: 1, z: 1}

0 commit comments

Comments
 (0)