diff --git a/Assets/Examples/Realtime.asset b/Assets/Examples/Realtime.asset index 97325868..95660a05 100644 --- a/Assets/Examples/Realtime.asset +++ b/Assets/Examples/Realtime.asset @@ -33,10 +33,10 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _Channels: 0 - - _Frequency: 3 + - _Frequency: 2 - _Lacunarity: 2 - _Octaves: 4 - - _Persistance: 0.13793331 + - _Persistance: 0.00020801126 - _Seed: 42 - _TilingMode: 1 - _UVMode: 0 @@ -62,11 +62,6 @@ MonoBehaviour: - id: 2 - id: 3 - id: 4 - - id: 5 - - id: 6 - - id: 7 - - id: 8 - - id: 9 edges: - GUID: a036f0bd-ea59-43a6-849e-214a768ed5a4 owner: {fileID: 11400000} @@ -76,14 +71,6 @@ MonoBehaviour: outputFieldName: sinTime inputPortIdentifier: outputPortIdentifier: - - GUID: 75953af7-0f83-4c92-9f55-f90025360cb1 - owner: {fileID: 11400000} - inputNodeGUID: dfc885c4-25f9-483c-b217-26a7e7d1480a - outputNodeGUID: 45b55e43-50ed-49df-b940-105b197c4bb0 - inputFieldName: input - outputFieldName: output - inputPortIdentifier: 0 - outputPortIdentifier: output - GUID: d0200a7b-ddf5-414c-a11a-91f61abfdea3 owner: {fileID: 11400000} inputNodeGUID: 691aa737-9a89-40dd-b56d-201a248e396d @@ -92,46 +79,14 @@ MonoBehaviour: outputFieldName: output inputPortIdentifier: Main Texture outputPortIdentifier: 0 - - GUID: 7f159212-b8d4-4fc5-9529-ba4be932e9b8 - owner: {fileID: 11400000} - inputNodeGUID: bc5fb718-5d86-4634-8b61-c88e76bc7870 - outputNodeGUID: 0f096cfa-9d5f-4086-9aaa-b326aaf6027b - inputFieldName: input - outputFieldName: o - inputPortIdentifier: 0 - outputPortIdentifier: - - GUID: 83e6a9a6-0ea9-473c-b9d7-f0fea8a5419d - owner: {fileID: 11400000} - inputNodeGUID: 65dfbfd3-a672-4851-a9a9-029804d3a6eb - outputNodeGUID: 0f096cfa-9d5f-4086-9aaa-b326aaf6027b - inputFieldName: input - outputFieldName: o - inputPortIdentifier: 0 - outputPortIdentifier: - - GUID: 8b3044b7-b217-4b87-907f-d8dd033927c9 - owner: {fileID: 11400000} - inputNodeGUID: fb9d469b-6a7c-44c7-948f-7c3dfd72454f - outputNodeGUID: 0f096cfa-9d5f-4086-9aaa-b326aaf6027b - inputFieldName: input - outputFieldName: o - inputPortIdentifier: 0 - outputPortIdentifier: - - GUID: a6f81bf8-abd6-4a68-a429-284e87d8ee1f - owner: {fileID: 11400000} - inputNodeGUID: 049b3123-542a-4a2a-b7d7-a555b6d121fd - outputNodeGUID: 0f096cfa-9d5f-4086-9aaa-b326aaf6027b - inputFieldName: input - outputFieldName: o - inputPortIdentifier: 0 - outputPortIdentifier: - - GUID: 57118d4a-54e3-4191-b5eb-b8637dace28f + - GUID: 76114e24-b403-4111-be12-2af3703487ec owner: {fileID: 11400000} inputNodeGUID: 45b55e43-50ed-49df-b940-105b197c4bb0 - outputNodeGUID: 049b3123-542a-4a2a-b7d7-a555b6d121fd + outputNodeGUID: 0f096cfa-9d5f-4086-9aaa-b326aaf6027b inputFieldName: materialInputs - outputFieldName: output + outputFieldName: o inputPortIdentifier: _Persistance - outputPortIdentifier: 0 + outputPortIdentifier: groups: [] stackNodes: [] pinnedElements: @@ -139,21 +94,21 @@ MonoBehaviour: serializedVersion: 2 x: 27 y: 35 - width: 150 - height: 200 + width: 291 + height: 363 opened: 1 editorType: serializedType: Mixture.MixtureParameterView, Unity.ShaderGraph.GraphicsTests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null exposedParameters: - - id: 10 + - id: 5 serializedParameterList: [] stickyNotes: [] - position: {x: 791, y: 243, z: 0} - scale: {x: 1.15, y: 1.15, z: 1} + position: {x: 1039, y: 416, z: 0} + scale: {x: 0.7561437, y: 0.7561437, z: 1} version: 0 type: 1 - realtimePreview: 0 + realtimePreview: 1 isRealtime: 0 isParameterViewOpen: 1 embedInBuild: 0 @@ -171,7 +126,7 @@ MonoBehaviour: type: {class: OutputNode, ns: Mixture, asm: Mixture.Runtime} data: GUID: 691aa737-9a89-40dd-b56d-201a248e396d - computeOrder: 5 + computeOrder: 1 position: serializedVersion: 2 x: 162.25218 @@ -224,7 +179,7 @@ MonoBehaviour: type: {class: RidgedPerlinNoise, ns: Mixture, asm: Mixture.Runtime} data: GUID: 45b55e43-50ed-49df-b940-105b197c4bb0 - computeOrder: 3 + computeOrder: 4 position: serializedVersion: 2 x: -194.60869 @@ -331,7 +286,7 @@ MonoBehaviour: type: {class: TimeNode, ns: Mixture, asm: Mixture.Runtime} data: GUID: 3fd32b5b-8edd-4948-a1ef-e34f4d5d42dc - computeOrder: 0 + computeOrder: 2 position: serializedVersion: 2 x: -842.65234 @@ -372,7 +327,7 @@ MonoBehaviour: type: {class: VectorRemapNode, ns: Mixture, asm: Mixture.Runtime} data: GUID: 0f096cfa-9d5f-4086-9aaa-b326aaf6027b - computeOrder: 1 + computeOrder: 3 position: serializedVersion: 2 x: -705.6523 @@ -409,8 +364,8 @@ MonoBehaviour: previewEV100: 0 previewSlice: 0 isPinned: 0 - a: {x: -0.6059048, y: -0.6059048, z: -0.6059048, w: -0.6059048} - o: {x: 0.13793331, y: 0.13793331, z: 0.13793331, w: 0.13793331} + a: {x: -0.9994057, y: -0.9994057, z: -0.9994057, w: -0.9994057} + o: {x: 0.00020801126, y: 0.00020801126, z: 0.00020801126, w: 0.00020801126} inputMin: -1 inputMax: 1 outputMin: 0 @@ -419,7 +374,7 @@ MonoBehaviour: type: {class: RelayNode, ns: , asm: com.alelievr.NodeGraphProcessor.Runtime} data: GUID: dfc885c4-25f9-483c-b217-26a7e7d1480a - computeOrder: 4 + computeOrder: 0 position: serializedVersion: 2 x: 84.82607 @@ -431,92 +386,8 @@ MonoBehaviour: nodeLock: 0 unpackOutput: 0 packInput: 0 - inputEdgeCount: 1 + inputEdgeCount: 0 00000005: - type: {class: RelayNode, ns: , asm: com.alelievr.NodeGraphProcessor.Runtime} - data: - GUID: bc5fb718-5d86-4634-8b61-c88e76bc7870 - computeOrder: 6 - position: - serializedVersion: 2 - x: -366.95654 - y: 209.56523 - width: 200 - height: 200 - expanded: 0 - debug: 0 - nodeLock: 0 - unpackOutput: 0 - packInput: 0 - inputEdgeCount: 1 - 00000006: - type: {class: RelayNode, ns: , asm: com.alelievr.NodeGraphProcessor.Runtime} - data: - GUID: 65dfbfd3-a672-4851-a9a9-029804d3a6eb - computeOrder: 7 - position: - serializedVersion: 2 - x: -346.95654 - y: 229.56523 - width: 200 - height: 200 - expanded: 0 - debug: 0 - nodeLock: 0 - unpackOutput: 0 - packInput: 0 - inputEdgeCount: 1 - 00000007: - type: {class: RelayNode, ns: , asm: com.alelievr.NodeGraphProcessor.Runtime} - data: - GUID: fb9d469b-6a7c-44c7-948f-7c3dfd72454f - computeOrder: 8 - position: - serializedVersion: 2 - x: -326.95654 - y: 249.56523 - width: 200 - height: 200 - expanded: 0 - debug: 0 - nodeLock: 0 - unpackOutput: 0 - packInput: 0 - inputEdgeCount: 1 - 00000008: - type: {class: RelayNode, ns: , asm: com.alelievr.NodeGraphProcessor.Runtime} - data: - GUID: 049b3123-542a-4a2a-b7d7-a555b6d121fd - computeOrder: 2 - position: - serializedVersion: 2 - x: -306.95654 - y: 269.56525 - width: 200 - height: 200 - expanded: 0 - debug: 0 - nodeLock: 0 - unpackOutput: 0 - packInput: 0 - inputEdgeCount: 1 - 00000009: - type: {class: ParameterNode, ns: GraphProcessor, asm: com.alelievr.NodeGraphProcessor.Runtime} - data: - GUID: 67fab44d-4514-4fe9-810f-71a18446fcd8 - computeOrder: 9 - position: - serializedVersion: 2 - x: -565.2174 - y: 206.08696 - width: 100 - height: 100 - expanded: 0 - debug: 0 - nodeLock: 0 - parameterGUID: 80428b56-fbee-41f0-b28d-e77bb483e1bf - accessor: 0 - 0000000A: type: {class: IntParameter, ns: GraphProcessor, asm: com.alelievr.NodeGraphProcessor.Runtime} data: guid: 80428b56-fbee-41f0-b28d-e77bb483e1bf @@ -528,9 +399,9 @@ MonoBehaviour: serializedValue: input: 1 settings: - id: 11 - val: 4 - 0000000B: + id: 6 + val: 2 + 00000006: type: {class: IntParameter/IntSettings, ns: GraphProcessor, asm: com.alelievr.NodeGraphProcessor.Runtime} data: isHidden: 0 diff --git a/Packages/com.alelievr.mixture/Runtime/Nodes/OutputNode.cs b/Packages/com.alelievr.mixture/Runtime/Nodes/OutputNode.cs index 070cbe72..b8edd061 100644 --- a/Packages/com.alelievr.mixture/Runtime/Nodes/OutputNode.cs +++ b/Packages/com.alelievr.mixture/Runtime/Nodes/OutputNode.cs @@ -144,6 +144,9 @@ protected override void Disable() protected override bool ProcessNode(CommandBuffer cmd) { + if (graph == null) // Not good but, waiting to render graph refactor to clean up + return false; + if (graph.mainOutputTexture == null) { Debug.LogError("Output Node can't write to target texture, Graph references a null output texture"); diff --git a/Packages/manifest.json b/Packages/manifest.json index 683d888e..2372dc2b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -18,7 +18,9 @@ "com.unity.ide.rider": "3.0.4", "com.unity.ide.visualstudio": "2.0.7", "com.unity.ide.vscode": "1.2.3", + "com.unity.memoryprofiler": "0.2.9-preview.1", "com.unity.render-pipelines.high-definition": "10.4.0", + "com.unity.render-pipelines.universal": "10.4.0", "com.unity.test-framework": "1.1.22", "com.unity.testframework.graphics": "7.2.2-preview", "com.unity.modules.ai": "1.0.0",