diff --git a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
index b3901a3fe..29904b28d 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
@@ -5,7 +5,7 @@ namespace UniGLTF
{
public const int MAJOR = 0;
public const int MINOR = 128;
- public const int PATCH = 2;
- public const string VERSION = "0.128.2";
+ public const int PATCH = 3;
+ public const string VERSION = "0.128.3";
}
}
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
index d29b6b80e..5ecb86e7f 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
@@ -5,7 +5,7 @@ namespace UniGLTF
{
public const int MAJOR = 2;
public const int MINOR = 64;
- public const int PATCH = 2;
- public const string VERSION = "2.64.2";
+ public const int PATCH = 3;
+ public const string VERSION = "2.64.3";
}
}
diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json
index 4c24033e7..5eca2fb7e 100644
--- a/Assets/UniGLTF/package.json
+++ b/Assets/UniGLTF/package.json
@@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
- "version": "0.128.2",
+ "version": "0.128.3",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2021.3",
diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json
index 49b2d9548..eee465bca 100644
--- a/Assets/VRM/package.json
+++ b/Assets/VRM/package.json
@@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
- "version": "0.128.2",
+ "version": "0.128.3",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2021.3",
@@ -14,7 +14,7 @@
"name": "VRM Consortium"
},
"dependencies": {
- "com.vrmc.gltf": "0.128.2",
+ "com.vrmc.gltf": "0.128.3",
"com.unity.ugui": "1.0.0"
},
"samples": [
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/Assets/PostProcess Profile.asset b/Assets/VRM10/Samples~/VRM10Viewer/Assets/PostProcess Profile.asset
new file mode 100644
index 000000000..8311d90c1
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/Assets/PostProcess Profile.asset
@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
+ m_Name: PostProcess Profile
+ m_EditorClassIdentifier:
+ components:
+ - {fileID: 4092932147052232957}
+--- !u!114 &4092932147052232957
+MonoBehaviour:
+ m_ObjectHideFlags: 3
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
+ m_Name: Bloom
+ m_EditorClassIdentifier:
+ active: 1
+ skipIterations:
+ m_OverrideState: 0
+ m_Value: 1
+ threshold:
+ m_OverrideState: 1
+ m_Value: 1
+ intensity:
+ m_OverrideState: 1
+ m_Value: 1
+ scatter:
+ m_OverrideState: 0
+ m_Value: 0.7
+ clamp:
+ m_OverrideState: 0
+ m_Value: 65472
+ tint:
+ m_OverrideState: 0
+ m_Value: {r: 1, g: 1, b: 1, a: 1}
+ highQualityFiltering:
+ m_OverrideState: 0
+ m_Value: 0
+ downscale:
+ m_OverrideState: 0
+ m_Value: 0
+ maxIterations:
+ m_OverrideState: 0
+ m_Value: 6
+ dirtTexture:
+ m_OverrideState: 0
+ m_Value: {fileID: 0}
+ dimension: 1
+ dirtIntensity:
+ m_OverrideState: 0
+ m_Value: 0
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/Assets/PostProcess Profile.asset.meta b/Assets/VRM10/Samples~/VRM10Viewer/Assets/PostProcess Profile.asset.meta
new file mode 100644
index 000000000..b750f3872
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/Assets/PostProcess Profile.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 74977177c881c8a449d9f981e53acc0c
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/Assets/TinyMToonAlphaBlend.shadergraph b/Assets/VRM10/Samples~/VRM10Viewer/Assets/TinyMToonAlphaBlend.shadergraph
index 146731b20..999910b99 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/Assets/TinyMToonAlphaBlend.shadergraph
+++ b/Assets/VRM10/Samples~/VRM10Viewer/Assets/TinyMToonAlphaBlend.shadergraph
@@ -17,6 +17,21 @@
},
{
"m_Id": "025d73c9fe2e47b3853bf9a00d126af4"
+ },
+ {
+ "m_Id": "245594752a2f40a9a0b592ea1d772667"
+ },
+ {
+ "m_Id": "562743730bee4e7d884999358d07eff8"
+ },
+ {
+ "m_Id": "0742cd72e9334a03a596f3bf845e52cf"
+ },
+ {
+ "m_Id": "974a754cac90444da383dd520d43725f"
+ },
+ {
+ "m_Id": "732138fff95a49b4ac254e0ddf11bc94"
}
],
"m_Keywords": [],
@@ -59,6 +74,21 @@
},
{
"m_Id": "df96d56bdf664324a1b96c21e76b4a17"
+ },
+ {
+ "m_Id": "9e996b1a054f4a0caf78c639f3d104ac"
+ },
+ {
+ "m_Id": "d60c8ebae6a34276a9c940ce0c22e7f1"
+ },
+ {
+ "m_Id": "4ca5e0de823c4b5f890216a9a1d28ced"
+ },
+ {
+ "m_Id": "bea6ff10b4da44caa50af89cba32211e"
+ },
+ {
+ "m_Id": "70539d01b9d6429691a5db24f5e65c7d"
}
],
"m_GroupDatas": [],
@@ -120,6 +150,34 @@
"m_SlotId": -1559276299
}
},
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "4ca5e0de823c4b5f890216a9a1d28ced"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "0776e82cf5bc4372962108bf3847d1d0"
+ },
+ "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": {
@@ -134,6 +192,20 @@
"m_SlotId": 2016068918
}
},
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "9e996b1a054f4a0caf78c639f3d104ac"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "0776e82cf5bc4372962108bf3847d1d0"
+ },
+ "m_SlotId": 592166105
+ }
+ },
{
"m_OutputSlot": {
"m_Node": {
@@ -148,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": {
@@ -161,6 +247,20 @@
},
"m_SlotId": 1221667242
}
+ },
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "d60c8ebae6a34276a9c940ce0c22e7f1"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "0776e82cf5bc4372962108bf3847d1d0"
+ },
+ "m_SlotId": 287326672
+ }
}
],
"m_VertexContext": {
@@ -251,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",
@@ -328,6 +446,34 @@
}
}
+{
+ "m_SGVersion": 1,
+ "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+ "m_ObjectId": "0742cd72e9334a03a596f3bf845e52cf",
+ "m_Guid": {
+ "m_GuidSerialized": "cd38a38b-22cd-403b-92df-6fccc9a67d6b"
+ },
+ "m_Name": "BumpScale",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "BumpScale",
+ "m_DefaultReferenceName": "_BumpScale",
+ "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": 0.0,
+ "m_FloatType": 0,
+ "m_RangeValues": {
+ "x": 0.0,
+ "y": 1.0
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
@@ -362,11 +508,29 @@
{
"m_Id": "ead31769aa464a4e8aae7a3cfa026b2c"
},
+ {
+ "m_Id": "5fe8cab7980244fcaefd3eaf8f1b4057"
+ },
+ {
+ "m_Id": "e55ec74ec60f474d9580d5ed52bfb4aa"
+ },
+ {
+ "m_Id": "102c2a8fcff94efdad15054c1e4a4392"
+ },
+ {
+ "m_Id": "3d07bb566f064af3859a145f3ba3c45a"
+ },
+ {
+ "m_Id": "0127c13240d544acbd50c531c02d37dc"
+ },
{
"m_Id": "e6c1845b1ff7420192f4e36917f71689"
},
{
"m_Id": "5411d859ca084103badb8b7863988cb2"
+ },
+ {
+ "m_Id": "a835f0ec85a0423d8d95a4c24e21c10b"
}
],
"synonyms": [],
@@ -383,19 +547,46 @@
"d2495ca0-f5eb-484a-bd18-dca0589774e3",
"916faab9-cc1c-4621-84b8-9c47171bf8e8",
"ad5cc3fe-a5f8-4a48-9956-35d13519f07e",
- "fa354438-5a66-4424-a53f-da950e75c488"
+ "fa354438-5a66-4424-a53f-da950e75c488",
+ "d3263a66-e96d-45f6-bbbd-9b3869d2008d",
+ "23fc4c5e-606f-4623-9fc8-c425baf7c621",
+ "fc02a70c-3be1-403c-8f2b-a3d7b2f6bd7a",
+ "7739fffb-53c8-4ab8-b490-2f422c6bee62",
+ "317ea6aa-c51a-4f75-976a-f291c92ab26e",
+ "4771a75d-cc06-4d5b-afd1-6afbe93f47c4"
],
"m_PropertyIds": [
1340748427,
-643094866,
2016068918,
1221667242,
- -1559276299
+ -1559276299,
+ 592166105,
+ 1641878292,
+ 287326672,
+ 490756011,
+ -2125782034,
+ 889685277
],
"m_Dropdowns": [],
"m_DropdownSelectedEntries": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "102c2a8fcff94efdad15054c1e4a4392",
+ "m_Id": 287326672,
+ "m_DisplayName": "NormalStrength",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "_NormalStrength",
+ "m_StageCapability": 2,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -432,6 +623,47 @@
}
}
+{
+ "m_SGVersion": 1,
+ "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+ "m_ObjectId": "245594752a2f40a9a0b592ea1d772667",
+ "m_Guid": {
+ "m_GuidSerialized": "8664794b-d0c4-43d3-831d-d05580ae7250"
+ },
+ "m_Name": "ShadingShiftFactor",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "ShadingShiftFactor",
+ "m_DefaultReferenceName": "_ShadingShiftFactor",
+ "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": 0.0,
+ "m_FloatType": 0,
+ "m_RangeValues": {
+ "x": 0.0,
+ "y": 1.0
+ }
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
+ "m_ObjectId": "2b256c71e9934914bee19f91ac9400a9",
+ "m_Id": 0,
+ "m_DisplayName": "BumpMap",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_BareResource": false
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -477,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",
@@ -554,6 +811,42 @@
"m_BareResource": false
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "4ca5e0de823c4b5f890216a9a1d28ced",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 22.666664123535158,
+ "y": 294.0,
+ "width": 138.0,
+ "height": 36.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "2b256c71e9934914bee19f91ac9400a9"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "562743730bee4e7d884999358d07eff8"
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
@@ -599,6 +892,36 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
+ "m_ObjectId": "562743730bee4e7d884999358d07eff8",
+ "m_Guid": {
+ "m_GuidSerialized": "dcb3e785-f2ae-444a-a6c2-35c400d8b8fe"
+ },
+ "m_Name": "BumpMap",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "BumpMap",
+ "m_DefaultReferenceName": "_BumpMap",
+ "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": 3
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
@@ -629,6 +952,21 @@
"m_DefaultType": 0
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "5fe8cab7980244fcaefd3eaf8f1b4057",
+ "m_Id": 592166105,
+ "m_DisplayName": "ShadingShiftFactor",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "_ShadingShiftFactor",
+ "m_StageCapability": 2,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -644,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",
@@ -716,6 +1120,21 @@
},
{
"m_Id": "025d73c9fe2e47b3853bf9a00d126af4"
+ },
+ {
+ "m_Id": "245594752a2f40a9a0b592ea1d772667"
+ },
+ {
+ "m_Id": "562743730bee4e7d884999358d07eff8"
+ },
+ {
+ "m_Id": "0742cd72e9334a03a596f3bf845e52cf"
+ },
+ {
+ "m_Id": "974a754cac90444da383dd520d43725f"
+ },
+ {
+ "m_Id": "732138fff95a49b4ac254e0ddf11bc94"
}
]
}
@@ -792,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",
@@ -846,6 +1295,80 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "9e996b1a054f4a0caf78c639f3d104ac",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -16.0,
+ "y": 258.0,
+ "width": 176.66668701171876,
+ "height": 36.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "ac0a28cfdb9d4ec78f68744c66110f8d"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "245594752a2f40a9a0b592ea1d772667"
+ }
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+ "m_ObjectId": "a835f0ec85a0423d8d95a4c24e21c10b",
+ "m_Id": 3,
+ "m_DisplayName": "Normal",
+ "m_SlotType": 1,
+ "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.Vector1MaterialSlot",
+ "m_ObjectId": "ac0a28cfdb9d4ec78f68744c66110f8d",
+ "m_Id": 0,
+ "m_DisplayName": "ShadingShiftFactor",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -906,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",
@@ -966,7 +1525,7 @@
"r": 1.0,
"g": 1.0,
"b": 1.0,
- "a": 0.0
+ "a": 1.0
},
"isMainColor": true,
"m_ColorMode": 0
@@ -1025,6 +1584,57 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "d60c8ebae6a34276a9c940ce0c22e7f1",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 26.0,
+ "y": 330.0,
+ "width": 134.6666717529297,
+ "height": 36.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "d8f073174a9440d4b4b45d696b8f81d0"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "0742cd72e9334a03a596f3bf845e52cf"
+ }
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "d8f073174a9440d4b4b45d696b8f81d0",
+ "m_Id": 0,
+ "m_DisplayName": "BumpScale",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -1093,6 +1703,24 @@
"m_SerializedDescriptor": "SurfaceDescription.BaseColor"
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
+ "m_ObjectId": "e55ec74ec60f474d9580d5ed52bfb4aa",
+ "m_Id": 490756011,
+ "m_DisplayName": "NormalMap",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "_NormalMap",
+ "m_StageCapability": 2,
+ "m_BareResource": false,
+ "m_Texture": {
+ "m_SerializedTexture": "",
+ "m_Guid": ""
+ },
+ "m_DefaultType": 0
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -1131,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",
@@ -1155,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 6bcdfb896..7d244214c 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/Assets/TinyMToonOpaque.shadergraph
+++ b/Assets/VRM10/Samples~/VRM10Viewer/Assets/TinyMToonOpaque.shadergraph
@@ -23,6 +23,21 @@
},
{
"m_Id": "d39873e6759a47c2a923dde640e6f4f6"
+ },
+ {
+ "m_Id": "f0d45de1f0c94cd794a750a329950f35"
+ },
+ {
+ "m_Id": "768ef8d819804d919b966c240e815700"
+ },
+ {
+ "m_Id": "b1faea9e904b4eab8c5266d6c0565f0d"
+ },
+ {
+ "m_Id": "708e3009785c4aa69f6e0985da3b277d"
+ },
+ {
+ "m_Id": "a70c5ed980b14805943aca6a4dac34d0"
}
],
"m_Keywords": [],
@@ -77,6 +92,21 @@
},
{
"m_Id": "9096c7ad43b94e54b6b3240398f1dab5"
+ },
+ {
+ "m_Id": "2f23a09054324cf1aaa3cf24eb9c7df9"
+ },
+ {
+ "m_Id": "730d19702af74ab0a460870e52ee93b1"
+ },
+ {
+ "m_Id": "4ad616c1aab04122abdd5700f5e65735"
+ },
+ {
+ "m_Id": "fe0e2c9b1312432cbe511bdccc98a1dc"
+ },
+ {
+ "m_Id": "0167e9468c5d410d961d2b009ad33255"
}
],
"m_GroupDatas": [],
@@ -96,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": {
@@ -152,6 +196,48 @@
"m_SlotId": -1559276299
}
},
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "2f23a09054324cf1aaa3cf24eb9c7df9"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "0776e82cf5bc4372962108bf3847d1d0"
+ },
+ "m_SlotId": 592166105
+ }
+ },
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "4ad616c1aab04122abdd5700f5e65735"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "0776e82cf5bc4372962108bf3847d1d0"
+ },
+ "m_SlotId": 490756011
+ }
+ },
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "730d19702af74ab0a460870e52ee93b1"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "0776e82cf5bc4372962108bf3847d1d0"
+ },
+ "m_SlotId": 287326672
+ }
+ },
{
"m_OutputSlot": {
"m_Node": {
@@ -221,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": {
@@ -314,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",
@@ -437,10 +573,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": 240.66665649414063,
- "y": 95.33334350585938,
- "width": 265.3334045410156,
- "height": 377.3332824707031
+ "x": 231.33335876464845,
+ "y": 77.33333587646485,
+ "width": 265.33331298828127,
+ "height": 401.33331298828127
}
},
"m_Slots": [
@@ -459,11 +595,29 @@
{
"m_Id": "ead31769aa464a4e8aae7a3cfa026b2c"
},
+ {
+ "m_Id": "7392f5e248684e5c93520870021f5631"
+ },
+ {
+ "m_Id": "d8c467fa94be4293a923f302733693da"
+ },
+ {
+ "m_Id": "4afd8280877340cf8f37960bba00cd70"
+ },
+ {
+ "m_Id": "a6126f44bb5c428fb710bb2cd7d6587f"
+ },
+ {
+ "m_Id": "a73f6944d5794d408169a6ae86da40ce"
+ },
{
"m_Id": "7207d851d0d54d9dbec558d8350cbcf5"
},
{
"m_Id": "8dee648ae25449838a2cc7261ec55970"
+ },
+ {
+ "m_Id": "3e70c875940e45098805f075861a86a2"
}
],
"synonyms": [],
@@ -480,14 +634,26 @@
"d2495ca0-f5eb-484a-bd18-dca0589774e3",
"916faab9-cc1c-4621-84b8-9c47171bf8e8",
"ad5cc3fe-a5f8-4a48-9956-35d13519f07e",
- "fa354438-5a66-4424-a53f-da950e75c488"
+ "fa354438-5a66-4424-a53f-da950e75c488",
+ "d3263a66-e96d-45f6-bbbd-9b3869d2008d",
+ "23fc4c5e-606f-4623-9fc8-c425baf7c621",
+ "fc02a70c-3be1-403c-8f2b-a3d7b2f6bd7a",
+ "7739fffb-53c8-4ab8-b490-2f422c6bee62",
+ "317ea6aa-c51a-4f75-976a-f291c92ab26e",
+ "4771a75d-cc06-4d5b-afd1-6afbe93f47c4"
],
"m_PropertyIds": [
1340748427,
-643094866,
2016068918,
1221667242,
- -1559276299
+ -1559276299,
+ 592166105,
+ 1641878292,
+ 287326672,
+ 490756011,
+ -2125782034,
+ 889685277
],
"m_Dropdowns": [],
"m_DropdownSelectedEntries": []
@@ -594,6 +760,42 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "2f23a09054324cf1aaa3cf24eb9c7df9",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -16.0,
+ "y": 258.0,
+ "width": 176.6666717529297,
+ "height": 36.00006103515625
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "d053c162e1e64e7b8ff3f91b45ecc824"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "f0d45de1f0c94cd794a750a329950f35"
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
@@ -624,6 +826,29 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+ "m_ObjectId": "3e70c875940e45098805f075861a86a2",
+ "m_Id": 3,
+ "m_DisplayName": "Normal",
+ "m_SlotType": 1,
+ "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": 3,
"m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
@@ -696,6 +921,42 @@
"m_DefaultValue": false
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "4ad616c1aab04122abdd5700f5e65735",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 22.666664123535158,
+ "y": 293.9999694824219,
+ "width": 138.00003051757813,
+ "height": 36.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "70a8e0bdfe3e4717a57111e48e056afc"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "768ef8d819804d919b966c240e815700"
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -730,6 +991,21 @@
"m_SerializedDescriptor": "VertexDescription.Tangent"
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "4afd8280877340cf8f37960bba00cd70",
+ "m_Id": 287326672,
+ "m_DisplayName": "NormalStrength",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "_NormalStrength",
+ "m_StageCapability": 2,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
@@ -852,6 +1128,49 @@
"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",
+ "m_ObjectId": "70a8e0bdfe3e4717a57111e48e056afc",
+ "m_Id": 0,
+ "m_DisplayName": "BumpMap",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_BareResource": false
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -875,6 +1194,87 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "730d19702af74ab0a460870e52ee93b1",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 27.333335876464845,
+ "y": 329.9999694824219,
+ "width": 134.66665649414063,
+ "height": 36.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "a5c728807e084c5d9adba57613ac10b3"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "b1faea9e904b4eab8c5266d6c0565f0d"
+ }
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "7392f5e248684e5c93520870021f5631",
+ "m_Id": 592166105,
+ "m_DisplayName": "ShadingShiftFactor",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "_ShadingShiftFactor",
+ "m_StageCapability": 2,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "m_Labels": []
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
+ "m_ObjectId": "768ef8d819804d919b966c240e815700",
+ "m_Guid": {
+ "m_GuidSerialized": "f652e6b3-5210-4d68-aef2-ffe08a7be1e4"
+ },
+ "m_Name": "BumpMap",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "BumpMap",
+ "m_DefaultReferenceName": "_BumpMap",
+ "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": 3
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
@@ -953,6 +1353,21 @@
},
{
"m_Id": "d39873e6759a47c2a923dde640e6f4f6"
+ },
+ {
+ "m_Id": "f0d45de1f0c94cd794a750a329950f35"
+ },
+ {
+ "m_Id": "768ef8d819804d919b966c240e815700"
+ },
+ {
+ "m_Id": "b1faea9e904b4eab8c5266d6c0565f0d"
+ },
+ {
+ "m_Id": "708e3009785c4aa69f6e0985da3b277d"
+ },
+ {
+ "m_Id": "a70c5ed980b14805943aca6a4dac34d0"
}
]
}
@@ -1144,6 +1559,94 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "a5c728807e084c5d9adba57613ac10b3",
+ "m_Id": 0,
+ "m_DisplayName": "BumpScale",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "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",
@@ -1168,6 +1671,34 @@
}
}
+{
+ "m_SGVersion": 1,
+ "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+ "m_ObjectId": "b1faea9e904b4eab8c5266d6c0565f0d",
+ "m_Guid": {
+ "m_GuidSerialized": "58bcb52a-51f5-424c-9517-b18584cbb4c3"
+ },
+ "m_Name": "BumpScale",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "BumpScale",
+ "m_DefaultReferenceName": "_BumpScale",
+ "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": 0.0,
+ "m_FloatType": 0,
+ "m_RangeValues": {
+ "x": 0.0,
+ "y": 1.0
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -1303,7 +1834,7 @@
"r": 1.0,
"g": 1.0,
"b": 1.0,
- "a": 0.0
+ "a": 1.0
},
"isMainColor": true,
"m_ColorMode": 0
@@ -1367,12 +1898,65 @@
"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",
"m_ObjectId": "cd81c525151142c89a6af7f574fd628b"
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "d053c162e1e64e7b8ff3f91b45ecc824",
+ "m_Id": 0,
+ "m_DisplayName": "ShadingShiftFactor",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "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",
@@ -1421,6 +2005,24 @@
"m_Value": false
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
+ "m_ObjectId": "d8c467fa94be4293a923f302733693da",
+ "m_Id": 490756011,
+ "m_DisplayName": "NormalMap",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "_NormalMap",
+ "m_StageCapability": 2,
+ "m_BareResource": false,
+ "m_Texture": {
+ "m_SerializedTexture": "",
+ "m_Guid": ""
+ },
+ "m_DefaultType": 0
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -1533,6 +2135,34 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 1,
+ "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+ "m_ObjectId": "f0d45de1f0c94cd794a750a329950f35",
+ "m_Guid": {
+ "m_GuidSerialized": "d7b412ec-0586-4bd1-ad66-16ccf23249fb"
+ },
+ "m_Name": "ShadingShiftFactor",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "ShadingShiftFactor",
+ "m_DefaultReferenceName": "_ShadingShiftFactor",
+ "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": 0.0,
+ "m_FloatType": 0,
+ "m_RangeValues": {
+ "x": 0.0,
+ "y": 1.0
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
@@ -1582,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 462a1b670..3f3e63b53 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/Assets/TinyMToon_SubGraph.shadersubgraph
+++ b/Assets/VRM10/Samples~/VRM10Viewer/Assets/TinyMToon_SubGraph.shadersubgraph
@@ -17,6 +17,21 @@
},
{
"m_Id": "22a4bb49b85e452a8db5595bcbeb91c5"
+ },
+ {
+ "m_Id": "7e09a1dd20fa45cfb744461ff4274fe3"
+ },
+ {
+ "m_Id": "80d7033fb26d4150afc7e381325e548b"
+ },
+ {
+ "m_Id": "2e2ceb974f5b4c829366c88514f74c46"
+ },
+ {
+ "m_Id": "21a9aae9b5764a25996c4db9113b01a8"
+ },
+ {
+ "m_Id": "9283ec1a1dd24b3b905fa64aeb451295"
}
],
"m_Keywords": [],
@@ -86,6 +101,42 @@
},
{
"m_Id": "4efbc3bbf016413e94e4c9ac65dd4789"
+ },
+ {
+ "m_Id": "564e3bc994554c0895bbd2cba3c0915d"
+ },
+ {
+ "m_Id": "e97ebd89b37649bbbbb6bce779b31161"
+ },
+ {
+ "m_Id": "2dca18a425c24ef996f41d99f41f944f"
+ },
+ {
+ "m_Id": "4cd8ff51123a4571aec4742c647d03e2"
+ },
+ {
+ "m_Id": "a9167087f1b545f493408946cc06fa67"
+ },
+ {
+ "m_Id": "de30e03340034417b8e6ae35c3fe8445"
+ },
+ {
+ "m_Id": "33b1b5fde65e408db84dc8b2041d1f96"
+ },
+ {
+ "m_Id": "25269285c9b544969a3690ac48194e8f"
+ },
+ {
+ "m_Id": "528bfcabf30e4aa5b664cebd5172b79a"
+ },
+ {
+ "m_Id": "c4b56b3a517448c7958db7acb0aca67a"
+ },
+ {
+ "m_Id": "324d4e7e67db46f19b82f83d5d11bf31"
+ },
+ {
+ "m_Id": "d50c97dd3c324b959458d512f51d5024"
}
],
"m_GroupDatas": [],
@@ -100,7 +151,21 @@
},
"m_InputSlot": {
"m_Node": {
- "m_Id": "9e8ee3e30f75499087e513eaac81b463"
+ "m_Id": "564e3bc994554c0895bbd2cba3c0915d"
+ },
+ "m_SlotId": 0
+ }
+ },
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "25269285c9b544969a3690ac48194e8f"
+ },
+ "m_SlotId": 2
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "d50c97dd3c324b959458d512f51d5024"
},
"m_SlotId": 1
}
@@ -108,17 +173,45 @@
{
"m_OutputSlot": {
"m_Node": {
- "m_Id": "193173a2eded42af802f4085a1ba700a"
+ "m_Id": "2dca18a425c24ef996f41d99f41f944f"
+ },
+ "m_SlotId": 2
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "4157f6d98e8f4cff8948bb4a108c6c31"
+ },
+ "m_SlotId": 1
+ }
+ },
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "324d4e7e67db46f19b82f83d5d11bf31"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
- "m_Id": "ac0d7130cca947dfa64b9b4e4869b270"
+ "m_Id": "25269285c9b544969a3690ac48194e8f"
},
"m_SlotId": 0
}
},
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "33b1b5fde65e408db84dc8b2041d1f96"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "de30e03340034417b8e6ae35c3fe8445"
+ },
+ "m_SlotId": 1
+ }
+ },
{
"m_OutputSlot": {
"m_Node": {
@@ -161,6 +254,20 @@
"m_SlotId": 2
}
},
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "4cd8ff51123a4571aec4742c647d03e2"
+ },
+ "m_SlotId": 2
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "2dca18a425c24ef996f41d99f41f944f"
+ },
+ "m_SlotId": 1
+ }
+ },
{
"m_OutputSlot": {
"m_Node": {
@@ -175,6 +282,48 @@
"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": {
+ "m_Id": "564e3bc994554c0895bbd2cba3c0915d"
+ },
+ "m_SlotId": 2
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "9e8ee3e30f75499087e513eaac81b463"
+ },
+ "m_SlotId": 1
+ }
+ },
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "564e3bc994554c0895bbd2cba3c0915d"
+ },
+ "m_SlotId": 2
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "ac0d7130cca947dfa64b9b4e4869b270"
+ },
+ "m_SlotId": 0
+ }
+ },
{
"m_OutputSlot": {
"m_Node": {
@@ -184,9 +333,9 @@
},
"m_InputSlot": {
"m_Node": {
- "m_Id": "4157f6d98e8f4cff8948bb4a108c6c31"
+ "m_Id": "2dca18a425c24ef996f41d99f41f944f"
},
- "m_SlotId": 1
+ "m_SlotId": 0
}
},
{
@@ -259,6 +408,20 @@
"m_SlotId": 1
}
},
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "a9167087f1b545f493408946cc06fa67"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "4cd8ff51123a4571aec4742c647d03e2"
+ },
+ "m_SlotId": 1
+ }
+ },
{
"m_OutputSlot": {
"m_Node": {
@@ -282,9 +445,9 @@
},
"m_InputSlot": {
"m_Node": {
- "m_Id": "e14d05fc892148ad9baf9d7558e2cb5a"
+ "m_Id": "d50c97dd3c324b959458d512f51d5024"
},
- "m_SlotId": 1
+ "m_SlotId": 0
}
},
{
@@ -301,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": {
@@ -385,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": {
@@ -399,6 +590,34 @@
"m_SlotId": 1
}
},
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "de30e03340034417b8e6ae35c3fe8445"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "4cd8ff51123a4571aec4742c647d03e2"
+ },
+ "m_SlotId": 0
+ }
+ },
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "e97ebd89b37649bbbbb6bce779b31161"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "564e3bc994554c0895bbd2cba3c0915d"
+ },
+ "m_SlotId": 1
+ }
+ },
{
"m_OutputSlot": {
"m_Node": {
@@ -459,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",
@@ -591,10 +828,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -241.3332977294922,
- "y": 66.00003051757813,
- "width": 185.33326721191407,
- "height": 36.000022888183597
+ "x": -352.0,
+ "y": 290.6667175292969,
+ "width": 185.33334350585938,
+ "height": 35.999969482421878
}
},
"m_Slots": [
@@ -615,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",
@@ -638,6 +914,111 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "1ef8e98871764425805d3d5d00cafd2c",
+ "m_Id": 0,
+ "m_DisplayName": "NormalStrength",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "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",
+ "m_ObjectId": "20e1731fba3c4e4abbcceaca20e43546",
+ "m_Id": 0,
+ "m_DisplayName": "In",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "In",
+ "m_StageCapability": 3,
+ "m_Value": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 1.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_Labels": []
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
+ "m_ObjectId": "2172df51dc264e95a47d86247aeb738b",
+ "m_Id": 0,
+ "m_DisplayName": "NormalMap",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "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",
@@ -689,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",
@@ -717,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",
@@ -874,6 +1313,149 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.NormalBlendNode",
+ "m_ObjectId": "2dca18a425c24ef996f41d99f41f944f",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Normal Blend",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -517.3333129882813,
+ "y": 455.3333435058594,
+ "width": 209.33331298828126,
+ "height": 340.0000305175781
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "6cc074d28a2248ec94c00b73180098ed"
+ },
+ {
+ "m_Id": "abc7ac9e69c2400d907864143f74f526"
+ },
+ {
+ "m_Id": "d8b989079b4b416e96bad77427cfc855"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_BlendMode": 0
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
+ "m_ObjectId": "2e2ceb974f5b4c829366c88514f74c46",
+ "m_Guid": {
+ "m_GuidSerialized": "7739fffb-53c8-4ab8-b490-2f422c6bee62"
+ },
+ "m_Name": "NormalMap",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "NormalMap",
+ "m_DefaultReferenceName": "_NormalMap",
+ "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.SamplerStateMaterialSlot",
+ "m_ObjectId": "30ae7f93002e407386dbdc4f76bf9d08",
+ "m_Id": 3,
+ "m_DisplayName": "Sampler",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Sampler",
+ "m_StageCapability": 3,
+ "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",
@@ -904,6 +1486,90 @@
"m_ColorMode": 0
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "33b1b5fde65e408db84dc8b2041d1f96",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -1214.6666259765625,
+ "y": 536.6665649414063,
+ "width": 145.333251953125,
+ "height": 36.00006103515625
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "2172df51dc264e95a47d86247aeb738b"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "2e2ceb974f5b4c829366c88514f74c46"
+ }
+}
+
+{
+ "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",
@@ -919,6 +1585,30 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+ "m_ObjectId": "365fece80463494f884dfba1ea141896",
+ "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.DynamicValueMaterialSlot",
@@ -967,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",
@@ -979,10 +1694,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -241.3332977294922,
- "y": -6.000007152557373,
- "width": 148.66659545898438,
- "height": 36.00001907348633
+ "x": -398.6666564941406,
+ "y": -162.00003051757813,
+ "width": 148.6667022705078,
+ "height": 36.000022888183597
}
},
"m_Slots": [
@@ -1097,6 +1812,21 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "4842fbf2d7044c75a39ca30c7d366a77",
+ "m_Id": 1,
+ "m_DisplayName": "Strength",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Strength",
+ "m_StageCapability": 3,
+ "m_Value": 1.0,
+ "m_DefaultValue": 1.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -1136,6 +1866,47 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.NormalStrengthNode",
+ "m_ObjectId": "4cd8ff51123a4571aec4742c647d03e2",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Normal Strength",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -788.0,
+ "y": 497.33331298828127,
+ "width": 209.333251953125,
+ "height": 304.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "20e1731fba3c4e4abbcceaca20e43546"
+ },
+ {
+ "m_Id": "4842fbf2d7044c75a39ca30c7d366a77"
+ },
+ {
+ "m_Id": "59f25b85991649f591b5ef62203138c8"
+ }
+ ],
+ "synonyms": [
+ "intensity"
+ ],
+ "m_Precision": 0,
+ "m_PreviewExpanded": false,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
@@ -1190,10 +1961,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": 41.33331298828125,
- "y": -774.6666870117188,
- "width": 129.33340454101563,
- "height": 126.66668701171875
+ "x": -119.33338165283203,
+ "y": -747.3333740234375,
+ "width": 129.3333740234375,
+ "height": 126.6666259765625
}
},
"m_Slots": [
@@ -1250,10 +2021,104 @@
},
{
"m_Id": "22a4bb49b85e452a8db5595bcbeb91c5"
+ },
+ {
+ "m_Id": "7e09a1dd20fa45cfb744461ff4274fe3"
+ },
+ {
+ "m_Id": "2e2ceb974f5b4c829366c88514f74c46"
+ },
+ {
+ "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",
+ "m_ObjectId": "564e3bc994554c0895bbd2cba3c0915d",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Add",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -131.99998474121095,
+ "y": 266.6667175292969,
+ "width": 127.33331298828125,
+ "height": 120.00003051757813
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "365fece80463494f884dfba1ea141896"
+ },
+ {
+ "m_Id": "9809a78c448345959ba93247b69dd7bc"
+ },
+ {
+ "m_Id": "d43d943ea3ac4cf3955a6aff64035bcc"
+ }
+ ],
+ "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.Vector4MaterialSlot",
@@ -1279,6 +2144,44 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "588c76b41cf84cb6a672821bc73de249",
+ "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.Vector3MaterialSlot",
+ "m_ObjectId": "59f25b85991649f591b5ef62203138c8",
+ "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
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -1327,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",
@@ -1409,6 +2336,44 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+ "m_ObjectId": "6cc074d28a2248ec94c00b73180098ed",
+ "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": 1.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_Labels": []
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "6f6041b20d494af4ac63813f1711fb75",
+ "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.NormalVectorNode",
@@ -1421,10 +2386,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -517.3333129882813,
- "y": 478.0000915527344,
- "width": 209.33334350585938,
- "height": 318.6664733886719
+ "x": -823.3333740234375,
+ "y": 326.66668701171877,
+ "width": 207.3333740234375,
+ "height": 134.66671752929688
}
},
"m_Slots": [
@@ -1436,7 +2401,7 @@
"surface direction"
],
"m_Precision": 0,
- "m_PreviewExpanded": true,
+ "m_PreviewExpanded": false,
"m_DismissedVersion": 0,
"m_PreviewMode": 2,
"m_CustomColors": {
@@ -1457,9 +2422,9 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -30.666671752929689,
- "y": -480.6666259765625,
- "width": 184.66668701171876,
+ "x": -191.33331298828126,
+ "y": -453.3333740234375,
+ "width": 184.66661071777345,
"height": 254.66665649414063
}
},
@@ -1535,6 +2500,84 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 1,
+ "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+ "m_ObjectId": "7e09a1dd20fa45cfb744461ff4274fe3",
+ "m_Guid": {
+ "m_GuidSerialized": "d3263a66-e96d-45f6-bbbd-9b3869d2008d"
+ },
+ "m_Name": "ShadingShiftFactor",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "ShadingShiftFactor",
+ "m_DefaultReferenceName": "_ShadingShiftFactor",
+ "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": 0.0,
+ "m_FloatType": 0,
+ "m_RangeValues": {
+ "x": 0.0,
+ "y": 1.0
+ }
+}
+
+{
+ "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",
+ "m_ObjectId": "80d7033fb26d4150afc7e381325e548b",
+ "m_Guid": {
+ "m_GuidSerialized": "fc02a70c-3be1-403c-8f2b-a3d7b2f6bd7a"
+ },
+ "m_Name": "NormalStrength",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "NormalStrength",
+ "m_DefaultReferenceName": "_NormalStrength",
+ "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": 0.0,
+ "m_FloatType": 0,
+ "m_RangeValues": {
+ "x": 0.0,
+ "y": 1.0
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@@ -1547,10 +2590,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": 191.83334350585938,
- "y": -719.625,
- "width": 209.33334350585938,
- "height": 304.0
+ "x": 110.66669464111328,
+ "y": -692.6666870117188,
+ "width": 209.33331298828126,
+ "height": 303.9999694824219
}
},
"m_Slots": [
@@ -1641,6 +2684,31 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+ "m_ObjectId": "8ab402d6dc9e49e7b456f140264432a3",
+ "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.DynamicValueMaterialSlot",
@@ -1689,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",
@@ -1717,6 +2815,43 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+ "m_ObjectId": "9809a78c448345959ba93247b69dd7bc",
+ "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.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",
@@ -1805,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",
@@ -1817,10 +2977,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -16.666717529296876,
- "y": -131.99996948242188,
- "width": 184.66671752929688,
- "height": 254.6666717529297
+ "x": -174.6666259765625,
+ "y": -126.00000762939453,
+ "width": 184.66661071777345,
+ "height": 254.66665649414063
}
},
"m_Slots": [
@@ -1865,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",
@@ -1878,6 +3053,113 @@
"m_BareResource": false
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "a9167087f1b545f493408946cc06fa67",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -1214.6666259765625,
+ "y": 581.3333129882813,
+ "width": 159.333251953125,
+ "height": 35.99993896484375
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "1ef8e98871764425805d3d5d00cafd2c"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "80d7033fb26d4150afc7e381325e548b"
+ }
+}
+
+{
+ "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",
+ "m_ObjectId": "abc7ac9e69c2400d907864143f74f526",
+ "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": 1.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.NegateNode",
@@ -1890,10 +3172,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": 38.66663360595703,
- "y": 242.66673278808595,
- "width": 129.3333740234375,
- "height": 95.99998474121094
+ "x": 38.666690826416019,
+ "y": 194.66668701171876,
+ "width": 129.33331298828126,
+ "height": 96.00003051757813
}
},
"m_Slots": [
@@ -1929,9 +3211,9 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": 445.9999694824219,
- "y": -225.99998474121095,
- "width": 209.33328247070313,
+ "x": 294.6666564941406,
+ "y": -225.33340454101563,
+ "width": 209.33331298828126,
"height": 328.0000305175781
}
},
@@ -2065,10 +3347,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": 189.33331298828126,
- "y": -207.33331298828126,
+ "x": 31.333293914794923,
+ "y": -201.33334350585938,
"width": 209.33331298828126,
- "height": 304.0
+ "height": 303.9999694824219
}
},
"m_Slots": [
@@ -2144,6 +3426,57 @@
}
}
+{
+ "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",
+ "m_ObjectId": "c586599eb94844e8852ace67749001b7",
+ "m_Id": 0,
+ "m_DisplayName": "ShadingShiftFactor",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MainLightDirectionNode",
@@ -2179,6 +3512,28 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
+ "m_ObjectId": "c9ac6a4a126c410098a495cd60816b70",
+ "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": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -2263,10 +3618,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -113.33329010009766,
- "y": -795.3333740234375,
- "width": 120.66663360595703,
- "height": 150.66668701171876
+ "x": -274.0,
+ "y": -768.0,
+ "width": 120.66668701171875,
+ "height": 150.6666259765625
}
},
"m_Slots": [
@@ -2313,6 +3668,21 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "cffab61eda8744239e70de29379c6ade",
+ "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.PropertyNode",
@@ -2325,9 +3695,9 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -277.33331298828127,
- "y": -756.0,
- "width": 132.00001525878907,
+ "x": -437.9999694824219,
+ "y": -728.6666870117188,
+ "width": 132.0,
"height": 36.0
}
},
@@ -2349,6 +3719,121 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "d39135f347fc40a6b5bfa35ddcc61bde",
+ "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",
+ "m_ObjectId": "d43d943ea3ac4cf3955a6aff64035bcc",
+ "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": 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",
+ "m_ObjectId": "d65f1545e6c64629a81b1ef5f473aadb",
+ "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",
+ "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",
@@ -2385,9 +3870,9 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -241.3332977294922,
- "y": 30.00001335144043,
- "width": 177.99990844726563,
+ "x": -398.6666564941406,
+ "y": -114.00003814697266,
+ "width": 178.00001525878907,
"height": 36.00001525878906
}
},
@@ -2433,6 +3918,29 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+ "m_ObjectId": "d8b989079b4b416e96bad77427cfc855",
+ "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
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
@@ -2494,6 +4002,66 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
+ "m_ObjectId": "de30e03340034417b8e6ae35c3fe8445",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Sample Texture 2D",
+ "m_DrawState": {
+ "m_Expanded": false,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -1005.3333129882813,
+ "y": 497.3333435058594,
+ "width": 182.0,
+ "height": 158.66665649414063
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "8ab402d6dc9e49e7b456f140264432a3"
+ },
+ {
+ "m_Id": "588c76b41cf84cb6a672821bc73de249"
+ },
+ {
+ "m_Id": "6f6041b20d494af4ac63813f1711fb75"
+ },
+ {
+ "m_Id": "cffab61eda8744239e70de29379c6ade"
+ },
+ {
+ "m_Id": "d39135f347fc40a6b5bfa35ddcc61bde"
+ },
+ {
+ "m_Id": "d65f1545e6c64629a81b1ef5f473aadb"
+ },
+ {
+ "m_Id": "c9ac6a4a126c410098a495cd60816b70"
+ },
+ {
+ "m_Id": "30ae7f93002e407386dbdc4f76bf9d08"
+ }
+ ],
+ "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": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -2593,18 +4161,18 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": 714.6666870117188,
- "y": -428.6665954589844,
- "width": 110.00006103515625,
- "height": 102.6666259765625
+ "x": 739.3333129882813,
+ "y": -225.33340454101563,
+ "width": 109.99993896484375,
+ "height": 126.66674041748047
}
},
"m_Slots": [
{
- "m_Id": "5b947c35e0f3453e887c550f2ec5bfdf"
+ "m_Id": "eb34d529e298407aa3606f9cbcdc7819"
},
{
- "m_Id": "eb34d529e298407aa3606f9cbcdc7819"
+ "m_Id": "5b947c35e0f3453e887c550f2ec5bfdf"
}
],
"synonyms": [],
@@ -2618,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",
@@ -2686,6 +4302,42 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "e97ebd89b37649bbbbb6bce779b31161",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -352.0,
+ "y": 326.66668701171877,
+ "width": 102.66665649414063,
+ "height": 36.000030517578128
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "c586599eb94844e8852ace67749001b7"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "7e09a1dd20fa45cfb744461ff4274fe3"
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -2698,9 +4350,9 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -278.6666259765625,
- "y": -451.9999694824219,
- "width": 133.33328247070313,
+ "x": -439.3333435058594,
+ "y": -424.6667175292969,
+ "width": 133.3333740234375,
"height": 36.0
}
},
@@ -2749,10 +4401,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": 271.3333435058594,
- "y": -402.6666259765625,
- "width": 127.33328247070313,
- "height": 120.00003051757813
+ "x": 110.66669464111328,
+ "y": -375.33331298828127,
+ "width": 127.3332748413086,
+ "height": 119.99993896484375
}
},
"m_Slots": [
@@ -2834,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": [
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter.meta
new file mode 100644
index 000000000..1ab0d09b3
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: da380cc015227a946a8a8ccd61811b82
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/IMaterialImporter.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/IMaterialImporter.cs
similarity index 100%
rename from Assets/VRM10/Samples~/VRM10Viewer/IMaterialImporter.cs
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/IMaterialImporter.cs
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/IMaterialImporter.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/IMaterialImporter.cs.meta
similarity index 100%
rename from Assets/VRM10/Samples~/VRM10Viewer/IMaterialImporter.cs.meta
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/IMaterialImporter.cs.meta
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/OrderedMaterialDescriptorGenerator.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/OrderedMaterialDescriptorGenerator.cs
new file mode 100644
index 000000000..e16f48447
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/OrderedMaterialDescriptorGenerator.cs
@@ -0,0 +1,88 @@
+using System.Collections.Generic;
+using UniGLTF;
+
+namespace UniVRM10.VRM10Viewer
+{
+ ///
+ /// Importersに格納したを順番に試行して成功したらそれを採用する。
+ /// mtoon, unlit, pbr の順に試行することを想定。
+ ///
+ public sealed class OrderedMaterialDescriptorGenerator : IMaterialDescriptorGenerator
+ {
+ public readonly List Importers = new();
+
+ public delegate MaterialDescriptor MakeDefaultMaterialDescriptor(string materialName);
+
+ private readonly MakeDefaultMaterialDescriptor _makeDefault;
+
+ ///
+ /// 順に TryCreateParam を実行して最初に成功したら終わる。
+ /// 全て失敗したら UrpGltfDefaultMaterialImporter を実行する。
+ /// 通常 vrm-1.0, unlit, pbr の順に試行する。
+ ///
+ ///
+ public OrderedMaterialDescriptorGenerator(MakeDefaultMaterialDescriptor makeDefault, params IMaterialImporter[] importers)
+ {
+ _makeDefault = makeDefault;
+ Importers.AddRange(importers);
+ }
+
+ public static OrderedMaterialDescriptorGenerator CreateCustomGenerator(
+ IMaterialImporter customPbr,
+ IMaterialImporter customMToonImporter = null)
+ {
+
+ var generator = new OrderedMaterialDescriptorGenerator((new UrpGltfDefaultMaterialImporter()).CreateParam);
+
+ // 最初にMToonの分岐
+ // generator.Importers は前から順に処理します
+ if (customMToonImporter != null)
+ {
+ // TinyMToon(WebGL 向け) を使う例
+ generator.Importers.Add(customMToonImporter);
+ }
+ else
+ {
+ // VRM10/Universal Render Pipeline/MToon10 を使う例
+ generator.Importers.Add(new UrpMToonMaterialImporter());
+ }
+
+ // 次に unlit の分岐
+ generator.Importers.Add(new UnlitMaterialImporter());
+
+ // 次に pbr の分岐
+ if (customPbr != null)
+ {
+ // TinyPbr を使う例
+ generator.Importers.Add(customPbr);
+ }
+ else
+ {
+ // Universal Render Pipeline/Lit を使う例
+ // AlwaysIncludedShaders に登録すると、Variant が多すぎてビルドが終わらない問題があります。
+ generator.Importers.Add(new UrpPbrMaterialImporter());
+ }
+
+ return generator;
+ }
+
+ public MaterialDescriptor Get(GltfData data, int i)
+ {
+ foreach (var importer in Importers)
+ {
+ if (importer.TryCreateParam(data, i, out var param))
+ {
+ return param;
+ }
+ }
+ // NOTE: Fallback to default material
+ if (Symbols.VRM_DEVELOP)
+ {
+ UniGLTFLogger.Warning($"material: {i} out of range. fallback");
+ }
+ return GetGltfDefault(GltfMaterialImportUtils.ImportMaterialName(i, null));
+ }
+
+ public MaterialDescriptor GetGltfDefault(string materialName = null) => _makeDefault(materialName);
+ }
+}
\ No newline at end of file
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/OrderedMaterialDescriptorGenerator.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/OrderedMaterialDescriptorGenerator.cs.meta
similarity index 100%
rename from Assets/VRM10/Samples~/VRM10Viewer/OrderedMaterialDescriptorGenerator.cs.meta
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/OrderedMaterialDescriptorGenerator.cs.meta
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialContext.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialContext.cs
similarity index 93%
rename from Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialContext.cs
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialContext.cs
index d74440732..09c162aab 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialContext.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialContext.cs
@@ -22,6 +22,7 @@ namespace UniVRM10.VRM10Viewer
private static readonly int ShadingColorFactorProp = Shader.PropertyToID("_ShadingColor");
private static readonly int ShadingMapProp = Shader.PropertyToID("_ShadingMap");
private static readonly int ShadingToonyFactorProp = Shader.PropertyToID("_ShadingToonyFactor");
+ private static readonly int ShadingShiftFactorProp = Shader.PropertyToID("_ShadingShiftFactor");
///
/// float = 1.0
@@ -92,6 +93,11 @@ namespace UniVRM10.VRM10Viewer
get => Material.GetFloat(ShadingToonyFactorProp);
set => Material.SetFloat(ShadingToonyFactorProp, value);
}
+ public float ShadingShiftFactor
+ {
+ get => Material.GetFloat(ShadingShiftFactorProp);
+ set => Material.SetFloat(ShadingShiftFactorProp, value);
+ }
public float BumpScale
{
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialContext.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialContext.cs.meta
similarity index 100%
rename from Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialContext.cs.meta
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialContext.cs.meta
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialImporter.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialImporter.cs
similarity index 86%
rename from Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialImporter.cs
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialImporter.cs
index bd467cd5d..062c6138e 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialImporter.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialImporter.cs
@@ -36,12 +36,6 @@ namespace UniVRM10.VRM10Viewer
matDesc = new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, src),
src.alphaMode == "BLEND" ? m_alphablend.shader : m_opaque.shader,
- null,
- new Dictionary(),
- new Dictionary(),
- new Dictionary(),
- new Dictionary(),
- new List>(),
new[] { (MaterialDescriptor.MaterialGenerateAsyncFunc)AsyncAction }
);
return true;
@@ -55,9 +49,7 @@ namespace UniVRM10.VRM10Viewer
ImportSurfaceSettings(src, context);
await ImportBaseShadeColorAsync(data, src, mtoon, context, getTextureAsync, awaitCaller);
- // await ImportMetallicRoughnessAsync(data, src, context, getTextureAsync, awaitCaller);
- // await ImportOcclusionAsync(data, src, context, getTextureAsync, awaitCaller);
- // await ImportNormalAsync(data, src, context, getTextureAsync, awaitCaller);
+ await ImportNormalAsync(data, src, context, getTextureAsync, awaitCaller);
// await ImportEmissionAsync(data, src, context, getTextureAsync, awaitCaller);
// context.Validate();
@@ -101,6 +93,7 @@ namespace UniVRM10.VRM10Viewer
}
context.ShadingToonyFactor = mtoon.ShadingToonyFactor.GetValueOrDefault();
+ context.ShadingShiftFactor = mtoon.ShadingToonyFactor.GetValueOrDefault();
var shadeColor = mtoon.ShadeColorFactor?.ToColor3(UniGLTF.ColorSpace.Linear, UniGLTF.ColorSpace.sRGB);
context.ShadingColorFactorSrgb = shadeColor.GetValueOrDefault(Color.white);
if (mtoon is { ShadeMultiplyTexture: { Index: >= 0 } })
@@ -111,5 +104,17 @@ namespace UniVRM10.VRM10Viewer
}
}
}
+
+ private static async Task ImportNormalAsync(GltfData data, glTFMaterial src, TinyMToonMaterialContext context, GetTextureAsyncFunc getTextureAsync, IAwaitCaller awaitCaller)
+ {
+ if (src.normalTexture is { index: >= 0 })
+ {
+ if (GltfPbrTextureImporter.TryNormalTexture(data, src, out _, out var desc))
+ {
+ context.BumpMap = await getTextureAsync(desc, awaitCaller);
+ context.BumpScale = src.normalTexture.scale;
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialImporter.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialImporter.cs.meta
similarity index 100%
rename from Assets/VRM10/Samples~/VRM10Viewer/TinyMToonMaterialImporter.cs.meta
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyMToonMaterialImporter.cs.meta
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/TinyPbrMaterialContext.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyPbrMaterialContext.cs
similarity index 100%
rename from Assets/VRM10/Samples~/VRM10Viewer/TinyPbrMaterialContext.cs
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyPbrMaterialContext.cs
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/TinyPbrMaterialContext.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyPbrMaterialContext.cs.meta
similarity index 100%
rename from Assets/VRM10/Samples~/VRM10Viewer/TinyPbrMaterialContext.cs.meta
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyPbrMaterialContext.cs.meta
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/TinyPbrMaterialImporter.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyPbrMaterialImporter.cs
similarity index 96%
rename from Assets/VRM10/Samples~/VRM10Viewer/TinyPbrMaterialImporter.cs
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyPbrMaterialImporter.cs
index 35f137a28..0f055cf48 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/TinyPbrMaterialImporter.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyPbrMaterialImporter.cs
@@ -32,12 +32,6 @@ namespace UniVRM10.VRM10Viewer
matDesc = new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, src),
src.alphaMode == "BLEND" ? m_alphablend.shader : m_opaque.shader,
- null,
- new Dictionary(),
- new Dictionary(),
- new Dictionary(),
- new Dictionary(),
- new List>(),
new[] { (MaterialDescriptor.MaterialGenerateAsyncFunc)AsyncAction }
);
return true;
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/TinyPbrMaterialImporter.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyPbrMaterialImporter.cs.meta
similarity index 100%
rename from Assets/VRM10/Samples~/VRM10Viewer/TinyPbrMaterialImporter.cs.meta
rename to Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/TinyPbrMaterialImporter.cs.meta
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs
new file mode 100644
index 000000000..feffbc680
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs
@@ -0,0 +1,12 @@
+using UniGLTF;
+
+namespace UniVRM10.VRM10Viewer
+{
+ class UnlitMaterialImporter : IMaterialImporter
+ {
+ bool IMaterialImporter.TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc)
+ {
+ return BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs.meta
new file mode 100644
index 000000000..e7c1d3ea9
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f3cabd0c7193c374bbeb7db075c3479b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs
new file mode 100644
index 000000000..b0b04f5c1
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs
@@ -0,0 +1,19 @@
+using UniGLTF;
+
+namespace UniVRM10.VRM10Viewer
+{
+ ///
+ /// VRM10/Universal Render Pipeline/MToon10
+ ///
+ public class UrpMToonMaterialImporter : IMaterialImporter
+ {
+ public bool TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc)
+ {
+ if (UrpVrm10MToonMaterialImporter.TryCreateParam(data, i, out matDesc))
+ {
+ return true;
+ }
+ return false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs.meta
new file mode 100644
index 000000000..0dcc56742
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c97cb941cc7451b49b9d347de508bdbd
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpPbrMaterialImporter.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpPbrMaterialImporter.cs
new file mode 100644
index 000000000..a6df0407c
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpPbrMaterialImporter.cs
@@ -0,0 +1,18 @@
+using UniGLTF;
+
+namespace UniVRM10.VRM10Viewer
+{
+ public class UrpPbrMaterialImporter : IMaterialImporter
+ {
+ public UrpGltfPbrMaterialImporter PbrMaterialImporter { get; } = new();
+
+ public bool TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc)
+ {
+ if (PbrMaterialImporter.TryCreateParam(data, i, out matDesc))
+ {
+ return true;
+ }
+ return false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpPbrMaterialImporter.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpPbrMaterialImporter.cs.meta
new file mode 100644
index 000000000..de35a2e2e
--- /dev/null
+++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpPbrMaterialImporter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5541a21c1ccebff4e9d222a059c90c57
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/OrderedMaterialDescriptorGenerator.cs b/Assets/VRM10/Samples~/VRM10Viewer/OrderedMaterialDescriptorGenerator.cs
deleted file mode 100644
index e8d644d30..000000000
--- a/Assets/VRM10/Samples~/VRM10Viewer/OrderedMaterialDescriptorGenerator.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using UniGLTF;
-
-namespace UniVRM10.VRM10Viewer
-{
- public sealed class OrderedMaterialDescriptorGenerator : IMaterialDescriptorGenerator
- {
- private IMaterialImporter[] _importers;
-
- public UrpGltfDefaultMaterialImporter DefaultMaterialImporter { get; } = new();
-
- ///
- /// 順に TryCreateParam を実行して最初に成功したら終わる。
- /// 全て失敗したら UrpGltfDefaultMaterialImporter を実行する。
- /// 通常 vrm-1.0, unlit, pbr の順に試行する。
- ///
- ///
- public OrderedMaterialDescriptorGenerator(params IMaterialImporter[] importers)
- {
- _importers = importers;
- }
-
- public MaterialDescriptor Get(GltfData data, int i)
- {
- foreach (var importer in _importers)
- {
- if (importer.TryCreateParam(data, i, out var param))
- {
- return param;
- }
- }
- // NOTE: Fallback to default material
- if (Symbols.VRM_DEVELOP)
- {
- UniGLTFLogger.Warning($"material: {i} out of range. fallback");
- }
- return GetGltfDefault(GltfMaterialImportUtils.ImportMaterialName(i, null));
- }
-
- public MaterialDescriptor GetGltfDefault(string materialName = null) => DefaultMaterialImporter.CreateParam(materialName);
- }
-}
\ No newline at end of file
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs
index 9311c436f..7ee334b1f 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs
@@ -24,13 +24,16 @@ namespace UniVRM10.VRM10Viewer
while (true)
{
- angle += m_angularVelocity * Time.deltaTime * Mathf.Deg2Rad;
+ if (this.enabled)
+ {
+ angle += m_angularVelocity * Time.deltaTime * Mathf.Deg2Rad;
- var x = Mathf.Cos(angle) * m_radius;
- var z = Mathf.Sin(angle) * m_radius;
- var y = m_y + m_height * Mathf.Cos(angle / 3);
+ var x = Mathf.Cos(angle) * m_radius;
+ var z = Mathf.Sin(angle) * m_radius;
+ var y = m_y + m_height * Mathf.Cos(angle / 3);
- transform.localPosition = new Vector3(x, y, z);
+ transform.localPosition = new Vector3(x, y, z);
+ }
yield return null;
}
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity
index dc470aae5..b78f34c9f 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity
@@ -4931,6 +4931,7 @@ RectTransform:
- {fileID: 1767706907}
- {fileID: 1621794411}
- {fileID: 731212245}
+ - {fileID: 358762027}
- {fileID: 2009818432}
- {fileID: 103723704}
- {fileID: 602093298}
@@ -5130,6 +5131,92 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
+--- !u!1 &358762026
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 358762027}
+ - component: {fileID: 358762028}
+ m_Layer: 5
+ m_Name: UseCustomMToorMaterial
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &358762027
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 358762026}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 2090176800}
+ - {fileID: 1405688945}
+ m_Father: {fileID: 339774397}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &358762028
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 358762026}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Highlighted
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 2090176801}
+ toggleTransition: 1
+ graphic: {fileID: 379278027}
+ m_Group: {fileID: 0}
+ onValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_IsOn: 0
--- !u!1 &364098868
GameObject:
m_ObjectHideFlags: 0
@@ -5464,6 +5551,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 377012217}
m_CullTransparentMesh: 1
+--- !u!1 &379278025
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 379278026}
+ - component: {fileID: 379278028}
+ - component: {fileID: 379278027}
+ m_Layer: 5
+ m_Name: Checkmark
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &379278026
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 379278025}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2090176800}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 20, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &379278027
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 379278025}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &379278028
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 379278025}
+ m_CullTransparentMesh: 0
--- !u!1 &381534432
GameObject:
m_ObjectHideFlags: 0
@@ -5651,7 +5813,9 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: Use CustomMaterial
+ m_Text: 'Use CustomPbrMaterial
+
+'
--- !u!222 &390989033
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -12326,7 +12490,7 @@ GameObject:
- component: {fileID: 731212245}
- component: {fileID: 731212246}
m_Layer: 5
- m_Name: UseCustomMaterial
+ m_Name: UseCustomPbrMaterial
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -23821,6 +23985,87 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 28}
m_Pivot: {x: 0.5, y: 1}
+--- !u!1 &1405688944
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1405688945}
+ - component: {fileID: 1405688947}
+ - component: {fileID: 1405688946}
+ m_Layer: 5
+ m_Name: Label
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1405688945
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1405688944}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 358762027}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 9, y: -0.5}
+ m_SizeDelta: {x: -28, y: -3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1405688946
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1405688944}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: 'Use CustomMToonMaterial
+
+'
+--- !u!222 &1405688947
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1405688944}
+ m_CullTransparentMesh: 0
--- !u!1 &1406385458
GameObject:
m_ObjectHideFlags: 0
@@ -30646,7 +30891,8 @@ MonoBehaviour:
type: 3}
m_mtoonMaterialAlphaBlend: {fileID: -876546973899608171, guid: 6b60fe85d745eda4281e3278fcb0657c,
type: 3}
- m_useCustomMaterial: {fileID: 731212246}
+ m_useCustomPbrMaterial: {fileID: 731212246}
+ m_useCustomMToonMaterial: {fileID: 358762028}
m_openModel: {fileID: 2009818433}
m_openMotion: {fileID: 168425996}
m_pastePose: {fileID: 1307084564}
@@ -35733,6 +35979,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2085434813}
m_CullTransparentMesh: 1
+--- !u!1 &2090176799
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2090176800}
+ - component: {fileID: 2090176802}
+ - component: {fileID: 2090176801}
+ m_Layer: 5
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2090176800
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2090176799}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 379278026}
+ m_Father: {fileID: 358762027}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 10, y: -10}
+ m_SizeDelta: {x: 20, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2090176801
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2090176799}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &2090176802
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2090176799}
+ m_CullTransparentMesh: 0
--- !u!1 &2092455692
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
index 87193c97e..fdce9a9ad 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
using UniGLTF;
using UniGLTF.SpringBoneJobs.Blittables;
using UnityEngine;
+using UnityEngine.Rendering;
using UnityEngine.UI;
namespace UniVRM10.VRM10Viewer
@@ -34,7 +35,9 @@ namespace UniVRM10.VRM10Viewer
[Header("UI")]
[SerializeField]
- Toggle m_useCustomMaterial = default;
+ Toggle m_useCustomPbrMaterial = default;
+ [SerializeField]
+ Toggle m_useCustomMToonMaterial = default;
[SerializeField]
Button m_openModel = default;
@@ -378,7 +381,8 @@ namespace UniVRM10.VRM10Viewer
{
var map = new ObjectMap(gameObject);
Root = map.Objects["Root"];
- m_useCustomMaterial = map.Get("CustomMaterial");
+ m_useCustomPbrMaterial = map.Get("CustomPbrMaterial");
+ m_useCustomMToonMaterial = map.Get("CustomMToonMaterial");
m_openModel = map.Get