From 13f6da9437a085b9a1b6d1207965f337acf76727 Mon Sep 17 00:00:00 2001 From: max Date: Tue, 8 Dec 2020 17:34:59 +0100 Subject: [PATCH] WIP custom vector encoding. Co-Authored-By: Neeto-rzo <68438932+Neeto-rzo@users.noreply.github.com> --- .../Shaders/HLSL/VectorEncodingDecoding.hlsl | 28 + .../DecodeFloatToFloat3.shadersubgraph | 70 +-- .../EncodeFloat3ToFloat.shadersubgraph | 500 ++++++++++++++++++ .../EncodeFloat3ToFloat.shadersubgraph.meta | 10 + Runtime/TAO.VertexAnimation.asmdef | 3 +- THIRD PARTY NOTICES.md | 8 +- .../Shaders/EncodeDecodeTest.shadergraph | 226 +++++++- 7 files changed, 796 insertions(+), 49 deletions(-) create mode 100644 Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph create mode 100644 Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph.meta diff --git a/Runtime/Shaders/HLSL/VectorEncodingDecoding.hlsl b/Runtime/Shaders/HLSL/VectorEncodingDecoding.hlsl index 363215b..7df5ae8 100644 --- a/Runtime/Shaders/HLSL/VectorEncodingDecoding.hlsl +++ b/Runtime/Shaders/HLSL/VectorEncodingDecoding.hlsl @@ -52,6 +52,34 @@ void Decode2Float1ToFloat3_float(float f1, out float3 f3) } // Custom +// Encode float3 to 0..1 float. +void Float3ToFloat2_float(float3 f3, out float2 f2) +{ + //float3 rotation = normalize(float3(f3.x, 0, f3.y)); + float3 rotation = normalize(float3(f3.x, 0, f3.z)); + + f2.x = acos (dot(rotation, float3(1, 0, 0))) * sign(f3.z); + f2.x = ((f2.x / V_PI) + 1) * 0.5f; + + f2.y = acos(f3.y) / V_PI; + + f2 *= 15; + f2.x = round(f2.x); + f2.y = round(f2.y); +} + +void Float2ToFloat_float(float2 f2, out float f1) +{ + f1 = (f2.x + (16 * f2.y)) / 255; +} + +void Float3ToFloat_float(float3 f3, out float f1) +{ + float2 f2; + Float3ToFloat2_float(f3, f2); + Float2ToFloat_float(f2, f1); +} + // Decode 0..1 float. void FloatToFloat2_float(float f1, out float2 f2) { diff --git a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeFloatToFloat3.shadersubgraph b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeFloatToFloat3.shadersubgraph index b38365b..100bc80 100644 --- a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeFloatToFloat3.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeFloatToFloat3.shadersubgraph @@ -45,7 +45,7 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "5c342c9c5ab943a6ab1d9499425f19e0" + "m_Id": "95caa98ec1fe4b12be341a504a26521c" }, "m_SlotId": 1 }, @@ -113,6 +113,34 @@ "m_ActiveTargets": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "0cba0cf553074658b7a3602d4d7e647a", + "m_Id": 1, + "m_DisplayName": "Vector3", + "m_SlotType": 0, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "Vector3", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [ + "X", + "Y", + "Z" + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -171,8 +199,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -81.0, - "y": 325.0, + "x": -77.0, + "y": 288.0, "width": 208.0, "height": 278.0 } @@ -226,8 +254,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 157.0, - "y": 325.0, + "x": 154.0, + "y": 288.0, "width": 208.0, "height": 278.0 } @@ -358,7 +386,7 @@ }, "m_Slots": [ { - "m_Id": "b220757e741547ccaa7b90e39ecc4acb" + "m_Id": "0cba0cf553074658b7a3602d4d7e647a" } ], "m_Precision": 0, @@ -381,7 +409,7 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -219.0, + "x": -207.0, "y": 43.0, "width": 115.0, "height": 34.0 @@ -402,34 +430,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "b220757e741547ccaa7b90e39ecc4acb", - "m_Id": 1, - "m_DisplayName": "Out_Vector3", - "m_SlotType": 0, - "m_Priority": 2147483647, - "m_Hidden": false, - "m_ShaderOutputName": "OutVector3", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [ - "X", - "Y", - "Z" - ] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", diff --git a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph new file mode 100644 index 0000000..6026f00 --- /dev/null +++ b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph @@ -0,0 +1,500 @@ +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "a0a2fdc9c1a4498195631e1da43ae9d8", + "m_Properties": [ + { + "m_Id": "649381b2fbd64c65a3573245a307b86b" + } + ], + "m_Keywords": [], + "m_Nodes": [ + { + "m_Id": "966c13a2f0a94a189243c9f0d9524146" + }, + { + "m_Id": "95caa98ec1fe4b12be341a504a26521c" + }, + { + "m_Id": "263e3f691adc4e89ae69574634db2de6" + }, + { + "m_Id": "5c342c9c5ab943a6ab1d9499425f19e0" + }, + { + "m_Id": "6183ac8f11154a879a7de4bfc8588508" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5c342c9c5ab943a6ab1d9499425f19e0" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "263e3f691adc4e89ae69574634db2de6" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6183ac8f11154a879a7de4bfc8588508" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5c342c9c5ab943a6ab1d9499425f19e0" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6183ac8f11154a879a7de4bfc8588508" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "95caa98ec1fe4b12be341a504a26521c" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "95caa98ec1fe4b12be341a504a26521c" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "966c13a2f0a94a189243c9f0d9524146" + }, + "m_SlotId": 1 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + } + }, + "m_Path": "Sub Graphs", + "m_ConcretePrecision": 0, + "m_OutputNode": { + "m_Id": "966c13a2f0a94a189243c9f0d9524146" + }, + "m_ActiveTargets": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", + "m_ObjectId": "263e3f691adc4e89ae69574634db2de6", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Custom Function", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 159.0, + "y": 284.0, + "width": 208.0, + "height": 278.0 + } + }, + "m_Slots": [ + { + "m_Id": "492c77b84ba1476d91daa6e8ce7aa61f" + }, + { + "m_Id": "38ea28ce1d2946939f8da8a5a13dc271" + } + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SourceType": 0, + "m_FunctionName": "Float2ToFloat", + "m_FunctionSource": "02eb5540183369645883b2c6b33144dc", + "m_FunctionBody": "Enter function body here..." +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "38ea28ce1d2946939f8da8a5a13dc271", + "m_Id": 0, + "m_DisplayName": "f2", + "m_SlotType": 0, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "f2", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [ + "X", + "Y" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3a65985af2a3458999edd07eb7e7f94a", + "m_Id": 1, + "m_DisplayName": "Vector1", + "m_SlotType": 0, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "Vector1", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "X" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "3c2ce541348040bc84f367711eef6b0b", + "m_Id": 0, + "m_DisplayName": "f3", + "m_SlotType": 0, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "f3", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [ + "X", + "Y", + "Z" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "492c77b84ba1476d91daa6e8ce7aa61f", + "m_Id": 1, + "m_DisplayName": "f1", + "m_SlotType": 1, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "f1", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "X" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "59ce4677cbdc4d0ca5ebb874d5973974", + "m_Id": 1, + "m_DisplayName": "f1", + "m_SlotType": 1, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "f1", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "X" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", + "m_ObjectId": "5c342c9c5ab943a6ab1d9499425f19e0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Custom Function", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -75.0, + "y": 284.0, + "width": 208.0, + "height": 278.0 + } + }, + "m_Slots": [ + { + "m_Id": "9da8d016e02c4286951fc5db1131764e" + }, + { + "m_Id": "6083c1c5cfdb43a2b860d11819e18fee" + } + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SourceType": 0, + "m_FunctionName": "Float3ToFloat2", + "m_FunctionSource": "02eb5540183369645883b2c6b33144dc", + "m_FunctionBody": "Enter function body here..." +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "6083c1c5cfdb43a2b860d11819e18fee", + "m_Id": 0, + "m_DisplayName": "f3", + "m_SlotType": 0, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "f3", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [ + "X", + "Y", + "Z" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "6183ac8f11154a879a7de4bfc8588508", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -209.0, + "y": 43.0, + "width": 119.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "7b566bab9e1642b086248d23e428a2db" + } + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "649381b2fbd64c65a3573245a307b86b" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector3ShaderProperty", + "m_ObjectId": "649381b2fbd64c65a3573245a307b86b", + "m_Guid": { + "m_GuidSerialized": "7fd8d4b6-495e-4d11-8cef-b7ae110914a7" + }, + "m_Name": "Vector3", + "m_DefaultReferenceName": "Vector3_649381b2fbd64c65a3573245a307b86b", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "m_GPUInstanced": false, + "m_Hidden": false, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "7b566bab9e1642b086248d23e428a2db", + "m_Id": 0, + "m_DisplayName": "Vector3", + "m_SlotType": 1, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [ + "X", + "Y", + "Z" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", + "m_ObjectId": "95caa98ec1fe4b12be341a504a26521c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Custom Function", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -75.0, + "y": 3.0, + "width": 208.0, + "height": 278.0 + } + }, + "m_Slots": [ + { + "m_Id": "59ce4677cbdc4d0ca5ebb874d5973974" + }, + { + "m_Id": "3c2ce541348040bc84f367711eef6b0b" + } + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SourceType": 0, + "m_FunctionName": "Float3ToFloat", + "m_FunctionSource": "02eb5540183369645883b2c6b33144dc", + "m_FunctionBody": "Enter function body here..." +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode", + "m_ObjectId": "966c13a2f0a94a189243c9f0d9524146", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Output", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 536.0, + "y": 3.9999988079071047, + "width": 120.00000762939453, + "height": 77.00000762939453 + } + }, + "m_Slots": [ + { + "m_Id": "3a65985af2a3458999edd07eb7e7f94a" + } + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "IsFirstSlotValid": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "9da8d016e02c4286951fc5db1131764e", + "m_Id": 1, + "m_DisplayName": "f2", + "m_SlotType": 1, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "f2", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [ + "X", + "Y" + ] +} + diff --git a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph.meta b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph.meta new file mode 100644 index 0000000..736ce27 --- /dev/null +++ b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7fd72c46eb886a64ab5f345bbaa925ca +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3} diff --git a/Runtime/TAO.VertexAnimation.asmdef b/Runtime/TAO.VertexAnimation.asmdef index d576819..dfc4c45 100644 --- a/Runtime/TAO.VertexAnimation.asmdef +++ b/Runtime/TAO.VertexAnimation.asmdef @@ -5,7 +5,8 @@ "GUID:734d92eba21c94caba915361bd5ac177", "GUID:8819f35a0fc84499b990e90a4ca1911f", "GUID:7a450cf7ca9694b5a8bfa3fd83ec635a", - "GUID:a5baed0c9693541a5bd947d336ec7659" + "GUID:a5baed0c9693541a5bd947d336ec7659", + "GUID:d8b63aba1907145bea998dd612889d6b" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/THIRD PARTY NOTICES.md b/THIRD PARTY NOTICES.md index b2e48e3..424812a 100644 --- a/THIRD PARTY NOTICES.md +++ b/THIRD PARTY NOTICES.md @@ -1,6 +1,6 @@ This package borrows code from various different sources, including: -### SideFXLabs -- File: [VAT](/Runtime/Shaders/SideFXLabs/) -- Source: [Github](https://github.com/sideeffects/SideFXLabs) -- License: [LICENSE](/Runtime/Shaders/SideFXLabs/LICENSE.md) \ No newline at end of file +### Name +- File: []() +- Source: []() +- License: []() \ No newline at end of file diff --git a/Tests/Runtime/Shaders/EncodeDecodeTest.shadergraph b/Tests/Runtime/Shaders/EncodeDecodeTest.shadergraph index e74ae67..d9bdc0c 100644 --- a/Tests/Runtime/Shaders/EncodeDecodeTest.shadergraph +++ b/Tests/Runtime/Shaders/EncodeDecodeTest.shadergraph @@ -71,6 +71,12 @@ }, { "m_Id": "be7a8a9d9878441eaec283da2aaf8933" + }, + { + "m_Id": "65fe16af9bee40ed8630dcc9c3a9b2fa" + }, + { + "m_Id": "6684c8bf32864e0e85456a54532989ec" } ], "m_GroupDatas": [], @@ -118,6 +124,20 @@ "m_SlotId": -1980518314 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2143788c16a14946a554b2af5563b9a3" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "65fe16af9bee40ed8630dcc9c3a9b2fa" + }, + "m_SlotId": -2121885440 + } + }, { "m_OutputSlot": { "m_Node": { @@ -160,6 +180,20 @@ "m_SlotId": -1980518314 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "65fe16af9bee40ed8630dcc9c3a9b2fa" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6684c8bf32864e0e85456a54532989ec" + }, + "m_SlotId": 654627568 + } + }, { "m_OutputSlot": { "m_Node": { @@ -498,6 +532,34 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "1b766ed09ef44ab8b0288226230e5eda", + "m_Id": 1, + "m_DisplayName": "Vector3", + "m_SlotType": 1, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "Vector3", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [ + "X", + "Y", + "Z" + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -660,9 +722,9 @@ "m_GPUInstanced": false, "m_Hidden": false, "m_Value": { - "r": 0.2350783497095108, - "g": 0.8584905862808228, - "b": 0.1579298973083496, + "r": 0.8588235378265381, + "g": 0.6174580454826355, + "b": 0.15686270594596864, "a": 0.0 }, "m_ColorMode": 0 @@ -814,11 +876,11 @@ "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", "m_ObjectId": "5529db94ce71493980a6bcdb26f8bbb1", "m_Id": 1, - "m_DisplayName": "Out_Vector3", + "m_DisplayName": "Vector3", "m_SlotType": 1, "m_Priority": 2147483647, "m_Hidden": false, - "m_ShaderOutputName": "OutVector3", + "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, "m_Value": { "x": 0.0, @@ -866,6 +928,106 @@ "m_ColorMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "635a135da15845d6bf10300be4077229", + "m_Id": 1, + "m_DisplayName": "Vector1", + "m_SlotType": 1, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "Vector1", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "X" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "65fe16af9bee40ed8630dcc9c3a9b2fa", + "m_Group": { + "m_Id": "" + }, + "m_Name": "EncodeFloat3ToFloat", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -935.0, + "y": 1688.0, + "width": 208.0, + "height": 278.0 + } + }, + "m_Slots": [ + { + "m_Id": "eb5ae9834a4f43ba99d89163759a6845" + }, + { + "m_Id": "635a135da15845d6bf10300be4077229" + } + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"7fd72c46eb886a64ab5f345bbaa925ca\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "000a9ca6-880e-4eee-a436-af6921fc25b8", + "7fd8d4b6-495e-4d11-8cef-b7ae110914a7" + ], + "m_PropertyIds": [ + 654627568, + -2121885440 + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "6684c8bf32864e0e85456a54532989ec", + "m_Group": { + "m_Id": "" + }, + "m_Name": "DecodeFloatToFloat3", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -703.0000610351563, + "y": 1688.0, + "width": 208.0, + "height": 278.0 + } + }, + "m_Slots": [ + { + "m_Id": "9d933e4cc31f4bcaac664ce9c0143f86" + }, + { + "m_Id": "1b766ed09ef44ab8b0288226230e5eda" + } + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"18ce5782075ebe745a6c31bffe3ff85e\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "000a9ca6-880e-4eee-a436-af6921fc25b8" + ], + "m_PropertyIds": [ + 654627568 + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -999,8 +1161,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -944.0, - "y": 1389.0, + "x": -933.9999389648438, + "y": 1391.0, "width": 208.0, "height": 278.0 } @@ -1394,6 +1556,24 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9d933e4cc31f4bcaac664ce9c0143f86", + "m_Id": 654627568, + "m_DisplayName": "Vector1", + "m_SlotType": 0, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "Vector1_771ac3b08a1144b086078a0d07c220da", + "m_StageCapability": 3, + "m_Value": 0.23919999599456788, + "m_DefaultValue": 0.0, + "m_Labels": [ + "X" + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1564,8 +1744,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -682.0, - "y": 1389.0, + "x": -699.9999389648438, + "y": 1391.0, "width": 208.0, "height": 278.0 } @@ -1752,6 +1932,34 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "eb5ae9834a4f43ba99d89163759a6845", + "m_Id": -2121885440, + "m_DisplayName": "Vector3", + "m_SlotType": 0, + "m_Priority": 2147483647, + "m_Hidden": false, + "m_ShaderOutputName": "Vector3_649381b2fbd64c65a3573245a307b86b", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [ + "X", + "Y", + "Z" + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",