diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs index 6ba99e4d2..f9cf47e42 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs @@ -1,8 +1,7 @@ namespace UniGLTF { /// - /// 指定の index の glTFMaterial から Import できる Material の生成情報を生成する。 - /// glTFMaterial と Unity Material は 1:1 対応する。 + /// generate a unity Material from a glTFMaterial. /// public interface IMaterialDescriptorGenerator { diff --git a/Assets/VRM10_Samples/VRM10Viewer/Assets/PostProcess Profile.asset b/Assets/VRM10_Samples/VRM10Viewer/Assets/PostProcess Profile.asset index 8e3c91d76..8311d90c1 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/Assets/PostProcess Profile.asset +++ b/Assets/VRM10_Samples/VRM10Viewer/Assets/PostProcess Profile.asset @@ -31,11 +31,11 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 1 threshold: - m_OverrideState: 0 - m_Value: 0.9 + m_OverrideState: 1 + m_Value: 1 intensity: - m_OverrideState: 0 - m_Value: 0 + m_OverrideState: 1 + m_Value: 1 scatter: m_OverrideState: 0 m_Value: 0.7 diff --git a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToonAlphaBlend.shadergraph b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToonAlphaBlend.shadergraph index f8cf167e4..999910b99 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToonAlphaBlend.shadergraph +++ b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToonAlphaBlend.shadergraph @@ -26,6 +26,12 @@ }, { "m_Id": "0742cd72e9334a03a596f3bf845e52cf" + }, + { + "m_Id": "974a754cac90444da383dd520d43725f" + }, + { + "m_Id": "732138fff95a49b4ac254e0ddf11bc94" } ], "m_Keywords": [], @@ -77,6 +83,12 @@ }, { "m_Id": "4ca5e0de823c4b5f890216a9a1d28ced" + }, + { + "m_Id": "bea6ff10b4da44caa50af89cba32211e" + }, + { + "m_Id": "70539d01b9d6429691a5db24f5e65c7d" } ], "m_GroupDatas": [], @@ -152,6 +164,20 @@ "m_SlotId": 490756011 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "70539d01b9d6429691a5db24f5e65c7d" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "0776e82cf5bc4372962108bf3847d1d0" + }, + "m_SlotId": 889685277 + } + }, { "m_OutputSlot": { "m_Node": { @@ -194,6 +220,20 @@ "m_SlotId": 1340748427 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "bea6ff10b4da44caa50af89cba32211e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "0776e82cf5bc4372962108bf3847d1d0" + }, + "m_SlotId": -2125782034 + } + }, { "m_OutputSlot": { "m_Node": { @@ -311,6 +351,24 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "0127c13240d544acbd50c531c02d37dc", + "m_Id": 889685277, + "m_DisplayName": "EmissionMap", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_EmissionMap", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -459,6 +517,12 @@ { "m_Id": "102c2a8fcff94efdad15054c1e4a4392" }, + { + "m_Id": "3d07bb566f064af3859a145f3ba3c45a" + }, + { + "m_Id": "0127c13240d544acbd50c531c02d37dc" + }, { "m_Id": "e6c1845b1ff7420192f4e36917f71689" }, @@ -487,7 +551,9 @@ "d3263a66-e96d-45f6-bbbd-9b3869d2008d", "23fc4c5e-606f-4623-9fc8-c425baf7c621", "fc02a70c-3be1-403c-8f2b-a3d7b2f6bd7a", - "7739fffb-53c8-4ab8-b490-2f422c6bee62" + "7739fffb-53c8-4ab8-b490-2f422c6bee62", + "317ea6aa-c51a-4f75-976a-f291c92ab26e", + "4771a75d-cc06-4d5b-afd1-6afbe93f47c4" ], "m_PropertyIds": [ 1340748427, @@ -498,7 +564,9 @@ 592166105, 1641878292, 287326672, - 490756011 + 490756011, + -2125782034, + 889685277 ], "m_Dropdowns": [], "m_DropdownSelectedEntries": [] @@ -641,6 +709,31 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "3d07bb566f064af3859a145f3ba3c45a", + "m_Id": -2125782034, + "m_DisplayName": "EmissionColor", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_EmissionColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -889,6 +982,72 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "70539d01b9d6429691a5db24f5e65c7d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 6.666666507720947, + "y": 402.0000305175781, + "width": 154.0, + "height": 35.999969482421878 + } + }, + "m_Slots": [ + { + "m_Id": "f4e7136123c9483cb7d91305c33ddbd1" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "732138fff95a49b4ac254e0ddf11bc94" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "732138fff95a49b4ac254e0ddf11bc94", + "m_Guid": { + "m_GuidSerialized": "370eb310-6a74-497d-99d7-55d5e9f7683e" + }, + "m_Name": "EmissionMap", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "EmissionMap", + "m_DefaultReferenceName": "_EmissionMap", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"09e6225be3a2a43489e11a41cb198377\",\"type\":3}}", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -970,6 +1129,12 @@ }, { "m_Id": "0742cd72e9334a03a596f3bf845e52cf" + }, + { + "m_Id": "974a754cac90444da383dd520d43725f" + }, + { + "m_Id": "732138fff95a49b4ac254e0ddf11bc94" } ] } @@ -1046,6 +1211,36 @@ "m_Labels": [] } +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "974a754cac90444da383dd520d43725f", + "m_Guid": { + "m_GuidSerialized": "5952bd85-d232-41b9-a39b-8dfad6219580" + }, + "m_Name": "EmissionColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "EmissionColor", + "m_DefaultReferenceName": "_EmissionColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 1 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -1234,6 +1429,42 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "bea6ff10b4da44caa50af89cba32211e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 8.000003814697266, + "y": 366.0000305175781, + "width": 152.6666717529297, + "height": 36.0 + } + }, + "m_Slots": [ + { + "m_Id": "ec80a33b78a3474cbdfd861f8ed21802" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "974a754cac90444da383dd520d43725f" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -1294,7 +1525,7 @@ "r": 1.0, "g": 1.0, "b": 1.0, - "a": 0.0 + "a": 1.0 }, "isMainColor": true, "m_ColorMode": 0 @@ -1528,6 +1759,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "ec80a33b78a3474cbdfd861f8ed21802", + "m_Id": 0, + "m_DisplayName": "EmissionColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", @@ -1552,6 +1808,19 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "f4e7136123c9483cb7d91305c33ddbd1", + "m_Id": 0, + "m_DisplayName": "EmissionMap", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", diff --git a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToonOpaque.shadergraph b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToonOpaque.shadergraph index 18f51158f..7d244214c 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToonOpaque.shadergraph +++ b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToonOpaque.shadergraph @@ -32,6 +32,12 @@ }, { "m_Id": "b1faea9e904b4eab8c5266d6c0565f0d" + }, + { + "m_Id": "708e3009785c4aa69f6e0985da3b277d" + }, + { + "m_Id": "a70c5ed980b14805943aca6a4dac34d0" } ], "m_Keywords": [], @@ -95,6 +101,12 @@ }, { "m_Id": "4ad616c1aab04122abdd5700f5e65735" + }, + { + "m_Id": "fe0e2c9b1312432cbe511bdccc98a1dc" + }, + { + "m_Id": "0167e9468c5d410d961d2b009ad33255" } ], "m_GroupDatas": [], @@ -114,6 +126,20 @@ "m_SlotId": -643094866 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "0167e9468c5d410d961d2b009ad33255" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "0776e82cf5bc4372962108bf3847d1d0" + }, + "m_SlotId": -2125782034 + } + }, { "m_OutputSlot": { "m_Node": { @@ -281,6 +307,20 @@ }, "m_SlotId": 1 } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "fe0e2c9b1312432cbe511bdccc98a1dc" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "0776e82cf5bc4372962108bf3847d1d0" + }, + "m_SlotId": 889685277 + } } ], "m_VertexContext": { @@ -374,6 +414,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "0167e9468c5d410d961d2b009ad33255", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 8.0, + "y": 366.0, + "width": 152.66668701171876, + "height": 36.0 + } + }, + "m_Slots": [ + { + "m_Id": "d09ad54764c84f3aab56efa384981cea" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "708e3009785c4aa69f6e0985da3b277d" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -528,6 +604,12 @@ { "m_Id": "4afd8280877340cf8f37960bba00cd70" }, + { + "m_Id": "a6126f44bb5c428fb710bb2cd7d6587f" + }, + { + "m_Id": "a73f6944d5794d408169a6ae86da40ce" + }, { "m_Id": "7207d851d0d54d9dbec558d8350cbcf5" }, @@ -556,7 +638,9 @@ "d3263a66-e96d-45f6-bbbd-9b3869d2008d", "23fc4c5e-606f-4623-9fc8-c425baf7c621", "fc02a70c-3be1-403c-8f2b-a3d7b2f6bd7a", - "7739fffb-53c8-4ab8-b490-2f422c6bee62" + "7739fffb-53c8-4ab8-b490-2f422c6bee62", + "317ea6aa-c51a-4f75-976a-f291c92ab26e", + "4771a75d-cc06-4d5b-afd1-6afbe93f47c4" ], "m_PropertyIds": [ 1340748427, @@ -567,7 +651,9 @@ 592166105, 1641878292, 287326672, - 490756011 + 490756011, + -2125782034, + 889685277 ], "m_Dropdowns": [], "m_DropdownSelectedEntries": [] @@ -1042,6 +1128,36 @@ "m_SerializedDescriptor": "SurfaceDescription.Alpha" } +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "708e3009785c4aa69f6e0985da3b277d", + "m_Guid": { + "m_GuidSerialized": "9212fba3-cb0b-4fc7-80f7-cba5204379dd" + }, + "m_Name": "EmissionColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "EmissionColor", + "m_DefaultReferenceName": "_EmissionColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 1 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", @@ -1246,6 +1362,12 @@ }, { "m_Id": "b1faea9e904b4eab8c5266d6c0565f0d" + }, + { + "m_Id": "708e3009785c4aa69f6e0985da3b277d" + }, + { + "m_Id": "a70c5ed980b14805943aca6a4dac34d0" } ] } @@ -1452,6 +1574,79 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "a6126f44bb5c428fb710bb2cd7d6587f", + "m_Id": -2125782034, + "m_DisplayName": "EmissionColor", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_EmissionColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "a70c5ed980b14805943aca6a4dac34d0", + "m_Guid": { + "m_GuidSerialized": "384f5731-3f0b-49cf-9452-a49898a1db5f" + }, + "m_Name": "EmissionMap", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "EmissionMap", + "m_DefaultReferenceName": "_EmissionMap", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"09e6225be3a2a43489e11a41cb198377\",\"type\":3}}", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "a73f6944d5794d408169a6ae86da40ce", + "m_Id": 889685277, + "m_DisplayName": "EmissionMap", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_EmissionMap", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1639,7 +1834,7 @@ "r": 1.0, "g": 1.0, "b": 1.0, - "a": 0.0 + "a": 1.0 }, "isMainColor": true, "m_ColorMode": 0 @@ -1703,6 +1898,19 @@ "m_SupportVFX": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "cd0a74ac28974fdead1bf17f9d8a7751", + "m_Id": 0, + "m_DisplayName": "EmissionMap", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 2, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", @@ -1724,6 +1932,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "d09ad54764c84f3aab56efa384981cea", + "m_Id": 0, + "m_DisplayName": "EmissionColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -1979,3 +2212,39 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "fe0e2c9b1312432cbe511bdccc98a1dc", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 6.6666717529296879, + "y": 402.0, + "width": 154.00001525878907, + "height": 36.0 + } + }, + "m_Slots": [ + { + "m_Id": "cd0a74ac28974fdead1bf17f9d8a7751" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a70c5ed980b14805943aca6a4dac34d0" + } +} + diff --git a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToon_SubGraph.shadersubgraph b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToon_SubGraph.shadersubgraph index 44d0e1c34..3f3e63b53 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToon_SubGraph.shadersubgraph +++ b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyMToon_SubGraph.shadersubgraph @@ -26,6 +26,12 @@ }, { "m_Id": "2e2ceb974f5b4c829366c88514f74c46" + }, + { + "m_Id": "21a9aae9b5764a25996c4db9113b01a8" + }, + { + "m_Id": "9283ec1a1dd24b3b905fa64aeb451295" } ], "m_Keywords": [], @@ -116,6 +122,21 @@ }, { "m_Id": "33b1b5fde65e408db84dc8b2041d1f96" + }, + { + "m_Id": "25269285c9b544969a3690ac48194e8f" + }, + { + "m_Id": "528bfcabf30e4aa5b664cebd5172b79a" + }, + { + "m_Id": "c4b56b3a517448c7958db7acb0aca67a" + }, + { + "m_Id": "324d4e7e67db46f19b82f83d5d11bf31" + }, + { + "m_Id": "d50c97dd3c324b959458d512f51d5024" } ], "m_GroupDatas": [], @@ -135,6 +156,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "25269285c9b544969a3690ac48194e8f" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d50c97dd3c324b959458d512f51d5024" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -149,6 +184,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "324d4e7e67db46f19b82f83d5d11bf31" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "25269285c9b544969a3690ac48194e8f" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -233,6 +282,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "528bfcabf30e4aa5b664cebd5172b79a" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "324d4e7e67db46f19b82f83d5d11bf31" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -382,9 +445,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "e14d05fc892148ad9baf9d7558e2cb5a" + "m_Id": "d50c97dd3c324b959458d512f51d5024" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -401,6 +464,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c4b56b3a517448c7958db7acb0aca67a" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "25269285c9b544969a3690ac48194e8f" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -485,6 +562,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d50c97dd3c324b959458d512f51d5024" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e14d05fc892148ad9baf9d7558e2cb5a" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -587,6 +678,24 @@ "m_ActiveTargets": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "06adf733b79c4db1a4f520425ec78c8c", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -743,6 +852,45 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "1b9eb67026d94c05b291aa278dcf6e79", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "1c46ed8b238344cbaf1f06214775f449", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -781,6 +929,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "200a2d12772a4be99acb3b79635016dd", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -817,6 +989,36 @@ "m_BareResource": false } +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "21a9aae9b5764a25996c4db9113b01a8", + "m_Guid": { + "m_GuidSerialized": "317ea6aa-c51a-4f75-976a-f291c92ab26e" + }, + "m_Name": "EmissionColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "EmissionColor", + "m_DefaultReferenceName": "_EmissionColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -868,6 +1070,49 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "25269285c9b544969a3690ac48194e8f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 744.6665649414063, + "y": 128.66665649414063, + "width": 209.33331298828126, + "height": 304.0 + } + }, + "m_Slots": [ + { + "m_Id": "e4c63d5bd4a74dd99b49586c54e51114" + }, + { + "m_Id": "34fac29a29ce4637b03b69d8b2b9cd80" + }, + { + "m_Id": "a9812c2c078e43f0995ff7d99c9c9af4" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", @@ -896,6 +1141,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "269c31d2473a4316ae01db3ad32ecf77", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1136,6 +1396,66 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "324d4e7e67db46f19b82f83d5d11bf31", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": 531.9999389648438, + "y": 128.66665649414063, + "width": 182.0001220703125, + "height": 157.33328247070313 + } + }, + "m_Slots": [ + { + "m_Id": "3a5f7dd7df4e4f2283ae645991a95fe6" + }, + { + "m_Id": "269c31d2473a4316ae01db3ad32ecf77" + }, + { + "m_Id": "1c46ed8b238344cbaf1f06214775f449" + }, + { + "m_Id": "a72f683783f3403686e3df672e47744b" + }, + { + "m_Id": "d6846e47db7c4e5a9e01e55b5aa86b44" + }, + { + "m_Id": "06adf733b79c4db1a4f520425ec78c8c" + }, + { + "m_Id": "7ed1d6f1cff142c9ba18a7d237791baa" + }, + { + "m_Id": "fc668553d3f145bf9dcca58208602109" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -1202,6 +1522,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "34fac29a29ce4637b03b69d8b2b9cd80", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1289,6 +1657,31 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "3a5f7dd7df4e4f2283ae645991a95fe6", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -1301,10 +1694,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -250.0, - "y": -129.3333740234375, - "width": 148.6666259765625, - "height": 35.99998474121094 + "x": -398.6666564941406, + "y": -162.00003051757813, + "width": 148.6667022705078, + "height": 36.000022888183597 } }, "m_Slots": [ @@ -1568,10 +1961,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 29.33331871032715, - "y": -714.666748046875, - "width": 129.33334350585938, - "height": 126.66668701171875 + "x": -119.33338165283203, + "y": -747.3333740234375, + "width": 129.3333740234375, + "height": 126.6666259765625 } }, "m_Slots": [ @@ -1637,10 +2030,52 @@ }, { "m_Id": "80d7033fb26d4150afc7e381325e548b" + }, + { + "m_Id": "21a9aae9b5764a25996c4db9113b01a8" + }, + { + "m_Id": "9283ec1a1dd24b3b905fa64aeb451295" } ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "528bfcabf30e4aa5b664cebd5172b79a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 338.66668701171877, + "y": 168.66664123535157, + "width": 153.99996948242188, + "height": 36.00001525878906 + } + }, + "m_Slots": [ + { + "m_Id": "9bf595e3b8a54631af32ea69b6284f78" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "9283ec1a1dd24b3b905fa64aeb451295" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.AddNode", @@ -1795,6 +2230,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5d93dfc32bb54c279421d10a134c5e8e", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -1963,10 +2422,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -42.66670608520508, - "y": -420.66668701171877, - "width": 184.66665649414063, - "height": 254.6667022705078 + "x": -191.33331298828126, + "y": -453.3333740234375, + "width": 184.66661071777345, + "height": 254.66665649414063 } }, "m_Slots": [ @@ -2069,6 +2528,28 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "7ed1d6f1cff142c9ba18a7d237791baa", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -2109,10 +2590,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 180.0, - "y": -660.0, - "width": 209.33328247070313, - "height": 303.99993896484377 + "x": 110.66669464111328, + "y": -692.6666870117188, + "width": 209.33331298828126, + "height": 303.9999694824219 } }, "m_Slots": [ @@ -2276,6 +2757,36 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "9283ec1a1dd24b3b905fa64aeb451295", + "m_Guid": { + "m_GuidSerialized": "4771a75d-cc06-4d5b-afd1-6afbe93f47c4" + }, + "m_Name": "EmissionMap", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "EmissionMap", + "m_DefaultReferenceName": "_EmissionMap", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", @@ -2328,6 +2839,19 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "9bf595e3b8a54631af32ea69b6284f78", + "m_Id": 0, + "m_DisplayName": "EmissionMap", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2416,6 +2940,31 @@ "m_FunctionBody": "Out = saturate( ( t - a ) / ( b - a ) );" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "9f3deceed8cf4669ba2dafa7ab4c2b76", + "m_Id": 0, + "m_DisplayName": "EmissionColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", @@ -2428,10 +2977,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -26.000001907348634, - "y": -93.33338928222656, - "width": 184.66665649414063, - "height": 254.66668701171876 + "x": -174.6666259765625, + "y": -126.00000762939453, + "width": 184.66661071777345, + "height": 254.66665649414063 } }, "m_Slots": [ @@ -2476,6 +3025,21 @@ "m_MipSamplingMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a72f683783f3403686e3df672e47744b", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", @@ -2525,6 +3089,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "a9812c2c078e43f0995ff7d99c9c9af4", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -2599,10 +3211,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 443.3333435058594, - "y": -192.66668701171876, - "width": 209.33328247070313, - "height": 327.99993896484377 + "x": 294.6666564941406, + "y": -225.33340454101563, + "width": 209.33331298828126, + "height": 328.0000305175781 } }, "m_Slots": [ @@ -2735,10 +3347,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 180.0, - "y": -168.6667022705078, - "width": 209.33328247070313, - "height": 303.99993896484377 + "x": 31.333293914794923, + "y": -201.33334350585938, + "width": 209.33331298828126, + "height": 303.9999694824219 } }, "m_Slots": [ @@ -2814,6 +3426,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "c4b56b3a517448c7958db7acb0aca67a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 340.0, + "y": 204.66665649414063, + "width": 152.66665649414063, + "height": 36.000030517578128 + } + }, + "m_Slots": [ + { + "m_Id": "9f3deceed8cf4669ba2dafa7ab4c2b76" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "21a9aae9b5764a25996c4db9113b01a8" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2970,10 +3618,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -125.33336639404297, - "y": -735.3333740234375, - "width": 120.66670989990235, - "height": 150.66668701171876 + "x": -274.0, + "y": -768.0, + "width": 120.66668701171875, + "height": 150.6666259765625 } }, "m_Slots": [ @@ -3047,10 +3695,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -289.3334045410156, - "y": -696.0000610351563, - "width": 132.00006103515626, - "height": 36.00006103515625 + "x": -437.9999694824219, + "y": -728.6666870117188, + "width": 132.0, + "height": 36.0 } }, "m_Slots": [ @@ -3110,6 +3758,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "d50c97dd3c324b959458d512f51d5024", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 531.9999389648438, + "y": -225.33340454101563, + "width": 131.3333740234375, + "height": 120.00003814697266 + } + }, + "m_Slots": [ + { + "m_Id": "200a2d12772a4be99acb3b79635016dd" + }, + { + "m_Id": "1b9eb67026d94c05b291aa278dcf6e79" + }, + { + "m_Id": "5d93dfc32bb54c279421d10a134c5e8e" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -3128,6 +3819,21 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d6846e47db7c4e5a9e01e55b5aa86b44", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3164,10 +3870,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -250.0, - "y": -81.3333969116211, - "width": 177.9999542236328, - "height": 35.99997329711914 + "x": -398.6666564941406, + "y": -114.00003814697266, + "width": 178.00001525878907, + "height": 36.00001525878906 } }, "m_Slots": [ @@ -3235,29 +3941,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "da1f526e56c749649fdde4460e6ab70e", - "m_Id": 3, - "m_DisplayName": "Normal", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Normal", - "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": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", @@ -3478,21 +4161,18 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 724.0000610351563, - "y": -192.66668701171876, - "width": 110.0, - "height": 126.66663360595703 + "x": 739.3333129882813, + "y": -225.33340454101563, + "width": 109.99993896484375, + "height": 126.66674041748047 } }, "m_Slots": [ - { - "m_Id": "5b947c35e0f3453e887c550f2ec5bfdf" - }, { "m_Id": "eb34d529e298407aa3606f9cbcdc7819" }, { - "m_Id": "da1f526e56c749649fdde4460e6ab70e" + "m_Id": "5b947c35e0f3453e887c550f2ec5bfdf" } ], "synonyms": [], @@ -3506,6 +4186,54 @@ "IsFirstSlotValid": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "e4c63d5bd4a74dd99b49586c54e51114", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -3622,9 +4350,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -290.66668701171877, - "y": -392.00006103515627, - "width": 133.33334350585938, + "x": -439.3333435058594, + "y": -424.6667175292969, + "width": 133.3333740234375, "height": 36.0 } }, @@ -3673,10 +4401,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 259.33331298828127, - "y": -342.6666564941406, - "width": 127.33328247070313, - "height": 119.99992370605469 + "x": 110.66669464111328, + "y": -375.33331298828127, + "width": 127.3332748413086, + "height": 119.99993896484375 } }, "m_Slots": [ @@ -3758,3 +4486,16 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "fc668553d3f145bf9dcca58208602109", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + diff --git a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbrAlphaBlend.shadergraph b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbrAlphaBlend.shadergraph index f25a42259..06bf1c361 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbrAlphaBlend.shadergraph +++ b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbrAlphaBlend.shadergraph @@ -502,10 +502,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -780.0000610351563, - "y": 222.66671752929688, - "width": 132.00006103515626, - "height": 36.000030517578128 + "x": -610.0, + "y": 180.0, + "width": 132.00003051757813, + "height": 36.0 } }, "m_Slots": [ @@ -726,9 +726,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -780.0, - "y": 330.666748046875, - "width": 159.33331298828126, + "x": -637.3333129882813, + "y": 288.0, + "width": 159.33334350585938, "height": 36.0 } }, @@ -901,10 +901,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -780.0000610351563, - "y": 258.666748046875, - "width": 133.33331298828126, - "height": 35.999908447265628 + "x": -610.0, + "y": 216.0, + "width": 133.33334350585938, + "height": 35.99998474121094 } }, "m_Slots": [ @@ -981,10 +981,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -780.0, - "y": 294.6667175292969, - "width": 172.66668701171876, - "height": 36.000030517578128 + "x": -650.6666870117188, + "y": 251.99998474121095, + "width": 172.66671752929688, + "height": 36.00001525878906 } }, "m_Slots": [ @@ -1302,9 +1302,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -780.0, - "y": 474.6666564941406, - "width": 138.0, + "x": -616.0, + "y": 432.0, + "width": 138.00003051757813, "height": 36.0 } }, @@ -1495,10 +1495,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -779.3333129882813, - "y": 402.66668701171877, - "width": 117.33331298828125, - "height": 36.0 + "x": -595.3333129882813, + "y": 360.0000305175781, + "width": 117.33334350585938, + "height": 35.999969482421878 } }, "m_Slots": [ @@ -1692,10 +1692,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -780.0, - "y": 546.6666259765625, - "width": 152.66668701171876, - "height": 36.0 + "x": -630.6666870117188, + "y": 504.0000305175781, + "width": 152.66671752929688, + "height": 35.999969482421878 } }, "m_Slots": [ @@ -1783,10 +1783,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -779.3333129882813, - "y": 366.66668701171877, - "width": 134.0, - "height": 36.0 + "x": -612.0, + "y": 324.0, + "width": 134.00003051757813, + "height": 36.000030517578128 } }, "m_Slots": [ @@ -1864,10 +1864,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -779.3333129882813, - "y": 438.66668701171877, + "x": -698.0, + "y": 396.0, "width": 206.0, - "height": 35.999969482421878 + "height": 36.0 } }, "m_Slots": [ @@ -1900,10 +1900,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -779.3333129882813, - "y": 510.6666564941406, - "width": 134.6666259765625, - "height": 35.999969482421878 + "x": -612.6666870117188, + "y": 468.0, + "width": 134.66671752929688, + "height": 36.000030517578128 } }, "m_Slots": [ @@ -1931,7 +1931,7 @@ "m_Group": { "m_Id": "" }, - "m_Name": "TinyPbr", + "m_Name": "TinyPbr_SubGraph", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -2151,7 +2151,7 @@ "r": 1.0, "g": 1.0, "b": 1.0, - "a": 0.0 + "a": 1.0 }, "isMainColor": false, "m_ColorMode": 0 @@ -2286,10 +2286,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -779.3333129882813, - "y": 582.6666259765625, - "width": 154.0, - "height": 35.99993896484375 + "x": -630.6666870117188, + "y": 540.0, + "width": 154.00003051757813, + "height": 36.0 } }, "m_Slots": [ diff --git a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbrOpaque.shadergraph b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbrOpaque.shadergraph index a4bf22ab9..f38f08b81 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbrOpaque.shadergraph +++ b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbrOpaque.shadergraph @@ -2451,7 +2451,7 @@ "r": 1.0, "g": 1.0, "b": 1.0, - "a": 0.0 + "a": 1.0 }, "isMainColor": false, "m_ColorMode": 0 diff --git a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbr_SubGraph.shadersubgraph b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbr_SubGraph.shadersubgraph index 06a421e45..38ffca101 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbr_SubGraph.shadersubgraph +++ b/Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbr_SubGraph.shadersubgraph @@ -125,6 +125,9 @@ }, { "m_Id": "3fba216a7770483ebd8ffef83f8d0793" + }, + { + "m_Id": "de30d6b26ca94bb29eb937897d6e59f0" } ], "m_GroupDatas": [], @@ -326,6 +329,20 @@ "m_SlotId": 3 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5eef577c98e34954bf04a2dd7c871f75" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "de30d6b26ca94bb29eb937897d6e59f0" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -475,9 +492,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "95965af48a8849339faf1a291c791faf" + "m_Id": "de30d6b26ca94bb29eb937897d6e59f0" }, - "m_SlotId": 2 + "m_SlotId": 1 } }, { @@ -508,6 +525,20 @@ "m_SlotId": 3 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "de30d6b26ca94bb29eb937897d6e59f0" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "95965af48a8849339faf1a291c791faf" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1701,6 +1732,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "435429e6f47e4728b418862d9fb72ba3", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1934,7 +2013,7 @@ }, "m_Name": "Sample Texture 2D", "m_DrawState": { - "m_Expanded": true, + "m_Expanded": false, "m_Position": { "serializedVersion": "2", "x": -166.0, @@ -2287,6 +2366,54 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "6c552ae7139a472abc1dd448779f258c", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -3416,6 +3543,54 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "b6816faafcfa4ebea46328c930b2be6c", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3667,6 +3842,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "de30d6b26ca94bb29eb937897d6e59f0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 254.0, + "y": -192.66661071777345, + "width": 127.3333740234375, + "height": 119.99995422363281 + } + }, + "m_Slots": [ + { + "m_Id": "b6816faafcfa4ebea46328c930b2be6c" + }, + { + "m_Id": "435429e6f47e4728b418862d9fb72ba3" + }, + { + "m_Id": "6c552ae7139a472abc1dd448779f258c" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3741,10 +3959,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 253.9999237060547, - "y": -385.9999694824219, - "width": 209.33335876464845, - "height": 303.9999694824219 + "x": 254.0, + "y": -509.3332214355469, + "width": 209.33334350585938, + "height": 303.99993896484377 } }, "m_Slots": [