diff --git a/README.md.backup b/README.md.backup deleted file mode 100644 index a964e061d6f0552a4578817dbab944beddeab466..0000000000000000000000000000000000000000 --- a/README.md.backup +++ /dev/null @@ -1,19 +0,0 @@ -## Terrain (HDRP) - -Builds up a terrain using PDOK BGT information. - - -### Dependencies (GIT Pacakages) -- geotiff -- utils - -### Usage: - -Sweep the BuildTerrain prefab into the Hierarchy and press 'Build' on the BuildTerrain script. - -``` - - -``` - -### Important: diff --git a/Runtime/Layers/GroenLicht.terrainlayer b/Runtime/Layers/GroenLicht.terrainlayer new file mode 100644 index 0000000000000000000000000000000000000000..5c5bfd93e23de18284a8fac4ddceddb16b4d9c18 --- /dev/null +++ b/Runtime/Layers/GroenLicht.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GroenLicht + m_DiffuseTexture: {fileID: 2800000, guid: 1186476173fcd994d9df404282debc6f, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: ad1a47e882294db49b1056ec466b8be9, type: 3} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 2, y: 2} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Runtime/Layers/GroenLicht.terrainlayer.meta b/Runtime/Layers/GroenLicht.terrainlayer.meta new file mode 100644 index 0000000000000000000000000000000000000000..4caa2852f47798fe6fa6c204f6073fb97b9b2b01 --- /dev/null +++ b/Runtime/Layers/GroenLicht.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8f4323a2d7fc5a4980be7d0b9db0f78 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Layers/Grond.terrainlayer b/Runtime/Layers/Grond.terrainlayer new file mode 100644 index 0000000000000000000000000000000000000000..26af01cce604013aeef54f3055343c898e87cd24 --- /dev/null +++ b/Runtime/Layers/Grond.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Grond + m_DiffuseTexture: {fileID: 2800000, guid: 46c9b2c471a59f24cbe88eae93a32f60, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: ad1a47e882294db49b1056ec466b8be9, type: 3} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 2, y: 2} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Runtime/Layers/Grond.terrainlayer.meta b/Runtime/Layers/Grond.terrainlayer.meta new file mode 100644 index 0000000000000000000000000000000000000000..132342ec284cc55d6af8d90e29d8cb58e6d62bea --- /dev/null +++ b/Runtime/Layers/Grond.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee6c4ea23d51df947b0aaa766f11cac6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Layers/Pand.terrainlayer b/Runtime/Layers/Pand.terrainlayer new file mode 100644 index 0000000000000000000000000000000000000000..39c9e8025c0a7499082682d51f59dbdeb3bc0c7e --- /dev/null +++ b/Runtime/Layers/Pand.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pand + m_DiffuseTexture: {fileID: 2800000, guid: 34625fdce6a77a543804361b473cd27b, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: 8b589c0aa03487043aabae92daac584a, type: 3} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 2, y: 2} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Runtime/Layers/Pand.terrainlayer.meta b/Runtime/Layers/Pand.terrainlayer.meta new file mode 100644 index 0000000000000000000000000000000000000000..ab24362692ddaa5352b200cf2c20f1eea816794b --- /dev/null +++ b/Runtime/Layers/Pand.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c813be5c284dbb4ca974391b442db2c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Layers/Zand.terrainlayer b/Runtime/Layers/Zand.terrainlayer new file mode 100644 index 0000000000000000000000000000000000000000..c1191e2dc672b896fe7c1424bb0a8ad10bb91269 --- /dev/null +++ b/Runtime/Layers/Zand.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Zand + m_DiffuseTexture: {fileID: 2800000, guid: 133dc91bc0027424f846f4cff389cb9f, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: 2161ba133e4339643a2a41e132531c56, type: 3} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 2, y: 2} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Runtime/Layers/Zand.terrainlayer.meta b/Runtime/Layers/Zand.terrainlayer.meta new file mode 100644 index 0000000000000000000000000000000000000000..5229a9962c40749bf2492d0b4c179e2e09ad6822 --- /dev/null +++ b/Runtime/Layers/Zand.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60085e35e8e4b114cae3ce971378231a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Shaders/LayerSwitch8.shadersubgraph b/Runtime/Shaders/LayerSwitch8.shadersubgraph index ef73ba7cc83d358d9cfa988bb6886a79af2a89c6..9910b017cd84054a68c9a9e025337ef71e7d46cc 100644 --- a/Runtime/Shaders/LayerSwitch8.shadersubgraph +++ b/Runtime/Shaders/LayerSwitch8.shadersubgraph @@ -206,12 +206,6 @@ }, { "m_Id": "61c65efd79854eff8758fea3fbd2ef31" - }, - { - "m_Id": "c5a4de9846ad4a0b9592773a21844b9e" - }, - { - "m_Id": "783434aec6c5496cb268d8342d0753f1" } ], "m_GroupDatas": [], @@ -3225,31 +3219,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "574f4bfcd3fa405ba1278c893a606206", - "m_Id": 0, - "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_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -3554,21 +3523,6 @@ "m_PositionSource": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "62a7b633912e4fe4b05c01590822eee7", - "m_Id": 1, - "m_DisplayName": "X", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "X", - "m_StageCapability": 3, - "m_Value": 0.5, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -4002,43 +3956,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.UVNode", - "m_ObjectId": "783434aec6c5496cb268d8342d0753f1", - "m_Group": { - "m_Id": "" - }, - "m_Name": "UV", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2797.0, - "y": -972.0000610351563, - "width": 208.0, - "height": 313.0 - } - }, - "m_Slots": [ - { - "m_Id": "574f4bfcd3fa405ba1278c893a606206" - } - ], - "synonyms": [ - "texcoords", - "coords", - "coordinates" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_OutputChannel": 0 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5669,53 +5586,6 @@ "m_DefaultType": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2Node", - "m_ObjectId": "c5a4de9846ad4a0b9592773a21844b9e", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Vector 2", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -3060.150390625, - "y": -829.1500854492188, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "62a7b633912e4fe4b05c01590822eee7" - }, - { - "m_Id": "f0c0377fb37f4b6eae86748acd119f16" - }, - { - "m_Id": "df4790427b804e17b448babc58b357dd" - } - ], - "synonyms": [ - "2", - "v2", - "vec2", - "float2" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Value": { - "x": 0.0, - "y": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ComparisonNode", @@ -6277,27 +6147,6 @@ "m_ComparisonType": 2 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "df4790427b804e17b448babc58b357dd", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -6816,23 +6665,6 @@ "m_DefaultType": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "f0c0377fb37f4b6eae86748acd119f16", - "m_Id": 2, - "m_DisplayName": "Y", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Y", - "m_StageCapability": 3, - "m_Value": 0.5, - "m_DefaultValue": 0.0, - "m_Labels": [ - "Y" - ] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", diff --git a/Runtime/Shaders/TerrainMaterial.mat b/Runtime/Shaders/TerrainMaterial4.mat similarity index 99% rename from Runtime/Shaders/TerrainMaterial.mat rename to Runtime/Shaders/TerrainMaterial4.mat index 6019cba48031e5534d3652fbf4314e83e01b0a31..d22af8d706f5ee7c9f4364b92bd8a5f5582bd611 100644 --- a/Runtime/Shaders/TerrainMaterial.mat +++ b/Runtime/Shaders/TerrainMaterial4.mat @@ -23,7 +23,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: TerrainMaterial + m_Name: TerrainMaterial4 m_Shader: {fileID: -6465566751694194690, guid: a5dd71e70127f7749a88744b32ca8625, type: 3} m_ValidKeywords: diff --git a/README.md.backup.meta b/Runtime/Shaders/TerrainMaterial4.mat.meta similarity index 52% rename from README.md.backup.meta rename to Runtime/Shaders/TerrainMaterial4.mat.meta index 24fb8c731b1af1fa69d83b2c64f288b1609f6d6f..4e74c20e064979c3227d9afb611220770e83bd04 100644 --- a/README.md.backup.meta +++ b/Runtime/Shaders/TerrainMaterial4.mat.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 761d989a739682f4a9b2fe516f37d3f4 -DefaultImporter: +guid: bd83ae6778c76cb45b79b1e65bacc725 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Runtime/Shaders/TerrainMaterial8.mat b/Runtime/Shaders/TerrainMaterial8.mat new file mode 100644 index 0000000000000000000000000000000000000000..086e30504b7cf032319957fc6e5ea983f5bf8931 --- /dev/null +++ b/Runtime/Shaders/TerrainMaterial8.mat @@ -0,0 +1,201 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5815873368556989248 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: da692e001514ec24dbc4cca1949ff7e8, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TerrainMaterial8 + m_Shader: {fileID: -6465566751694194690, guid: a5dd71e70127f7749a88744b32ca8625, + type: 3} + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2225 + stringTagMap: + MotionVector: User + disabledShaderPasses: + - TransparentDepthPrepass + - TransparentDepthPostpass + - TransparentBackface + - RayTracingPrepass + - MOTIONVECTORS + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - Albedo0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Albedo1: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Albedo2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Albedo3: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Albedo4: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Albedo5: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Albedo6: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Albedo7: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - AlbedoMaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - ControlTexture: + m_Texture: {fileID: 2800000, guid: 41328c44ccd76e649bf625b65348de33, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - NormalMaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - TextureArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LayerSwitch8_4052c0fd07c144c1bde8ca59237d2ea4_Layer0_3448404434: + m_Texture: {fileID: 2800000, guid: 1d14b82f535e85643a6e5e7a878951c8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LayerSwitch8_4052c0fd07c144c1bde8ca59237d2ea4_Layer1_639724348: + m_Texture: {fileID: 2800000, guid: 48c4ea7be45675946b46e29b46cd45fe, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LayerSwitch8_4052c0fd07c144c1bde8ca59237d2ea4_Layer2_302572172: + m_Texture: {fileID: 2800000, guid: 2e00baf0337133c408ba69ca99b5fe16, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LayerSwitch8_4052c0fd07c144c1bde8ca59237d2ea4_Layer3_96624699: + m_Texture: {fileID: 2800000, guid: ccdccdad117eec447a3acfc62d7d7630, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LayerSwitch8_4052c0fd07c144c1bde8ca59237d2ea4_Layer4_4022424670: + m_Texture: {fileID: 2800000, guid: 8a3ef1722a8fd3a4c8353e18116e7a19, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LayerSwitch8_4052c0fd07c144c1bde8ca59237d2ea4_Layer5_3068449993: + m_Texture: {fileID: 2800000, guid: 1ec47b3300477f040b5d59f8fc7497dc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LayerSwitch8_4052c0fd07c144c1bde8ca59237d2ea4_Layer6_2127586102: + m_Texture: {fileID: 2800000, guid: aa9dea029b072b042bf02fc464e0b12f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LayerSwitch8_4052c0fd07c144c1bde8ca59237d2ea4_Layer7_1873519753: + m_Texture: {fileID: 2800000, guid: 133dc91bc0027424f846f4cff389cb9f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaCutoffEnable: 0 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 + - _BlendMode: 0 + - _ConservativeDepthOffsetEnable: 0 + - _CullMode: 2 + - _CullModeForward: 2 + - _DepthOffsetEnable: 0 + - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 + - _DoubleSidedNormalMode: 2 + - _DstBlend: 0 + - _EnableBlendModePreserveSpecularLighting: 1 + - _EnableFogOnTransparent: 1 + - _OpaqueCullMode: 2 + - _RayTracing: 0 + - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 + - _RefractionModel: 0 + - _RenderQueueType: 1 + - _RequireSplitLighting: 0 + - _SrcBlend: 1 + - _StencilRef: 0 + - _StencilRefDepth: 8 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 10 + - _StencilRefMV: 40 + - _StencilWriteMask: 6 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 + - _StencilWriteMaskMV: 40 + - _SupportDecals: 1 + - _SurfaceType: 0 + - _TesselationFactor: 40 + - _TessellationBackFaceCullEpsilon: -0.25 + - _TessellationFactorMaxDistance: 300 + - _TessellationFactorMinDistance: 0 + - _TessellationFactorTriangleSize: 1 + - _TessellationMaxDisplacement: 10 + - _TessellationMode: 0 + - _TessellationShapeFactor: 0.75 + - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 + - _TransparentDepthPostpassEnable: 0 + - _TransparentDepthPrepassEnable: 0 + - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 + - _UseShadowThreshold: 0 + - _ZTestDepthEqualForOpaque: 3 + - _ZTestGBuffer: 4 + - _ZTestTransparent: 4 + - _ZWrite: 1 + m_Colors: + - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Runtime/Shaders/TerrainMaterial.mat.meta b/Runtime/Shaders/TerrainMaterial8.mat.meta similarity index 100% rename from Runtime/Shaders/TerrainMaterial.mat.meta rename to Runtime/Shaders/TerrainMaterial8.mat.meta diff --git a/Runtime/Shaders/TerrainShader.shadergraph b/Runtime/Shaders/TerrainShader8.shadergraph similarity index 65% rename from Runtime/Shaders/TerrainShader.shadergraph rename to Runtime/Shaders/TerrainShader8.shadergraph index 75c398f486b6c5d62c4f182028490013a12fbed5..30833452561f0ee04d7d24ae53bdd2dbd57ba38e 100644 --- a/Runtime/Shaders/TerrainShader.shadergraph +++ b/Runtime/Shaders/TerrainShader8.shadergraph @@ -4,16 +4,34 @@ "m_ObjectId": "28d9a97add384a76a8d0691ee0df31d0", "m_Properties": [ { - "m_Id": "11b0ff6b29654ac8a7f9b9c87e890f4b" + "m_Id": "8eb7760c2637485c86a6905014ae7124" }, { - "m_Id": "8eb7760c2637485c86a6905014ae7124" + "m_Id": "54741ff16be64e9298f325336d5087f7" }, { - "m_Id": "f43f72d4fadf4cee9906f6d87b7b8eb1" + "m_Id": "6cbec72d7d5f4bca9bb9ac5d44a74188" }, { - "m_Id": "54741ff16be64e9298f325336d5087f7" + "m_Id": "ef09beda3e4647c887e86b7e4e2abc27" + }, + { + "m_Id": "1146296e58324b5bbd416e0893ffb633" + }, + { + "m_Id": "ea6dc68006944ed5a3dabe00258a2a39" + }, + { + "m_Id": "e0ae08eea5e74a5bb85d544b2efbb7a2" + }, + { + "m_Id": "f06dde9d2375440da601e0925701ca47" + }, + { + "m_Id": "ab95c558ffe149cf82054e08167814ef" + }, + { + "m_Id": "9ac26edbdd214d8ca171d1e8baed7143" } ], "m_Keywords": [], @@ -64,46 +82,46 @@ "m_Id": "8771c86891434b9797b7706e33f89a88" }, { - "m_Id": "8a3fe49805e74f6bb5725e115f9066c2" + "m_Id": "a7d09cf893934a218bd4a9192e8d9006" }, { - "m_Id": "49a6adff6af64e0d996c816be7eaae67" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, { - "m_Id": "e2786ab655ca48da9fcae3265030b6b2" + "m_Id": "5654f7bf29d44ffc86f5ea86b8e04549" }, { - "m_Id": "c0dd0bdcf81848a9b26b337fbd4cb603" + "m_Id": "e3bbfa4bdfae4949aef3892fb1cc1e86" }, { - "m_Id": "548578852b554959a2b908f39b74aeae" + "m_Id": "4a9322a942b34ab38db9bf7c71bd8446" }, { - "m_Id": "a2fbc6c786cf4c4f82d200e2d1a350f4" + "m_Id": "6740e111e16e41a9851af1511d473765" }, { - "m_Id": "0df2c23edb2b4006bf51165771e7dded" + "m_Id": "b949932f02934e55b2c286d6a9dc3d7b" }, { - "m_Id": "9ea35b645e794e2ab6606f3b26f51794" + "m_Id": "cd4a97f85b734874bf79f02251caefb7" }, { - "m_Id": "36015f0619d34e7a858cc616bd93c2e4" + "m_Id": "3ff3b934ab0c48cfa980f7cf70efe0aa" }, { - "m_Id": "566b779b7bea46668aa10e6ceee7d3f3" + "m_Id": "769d3037376541238d614c6e094c7e1d" }, { - "m_Id": "a3101fca94c8490b8a8859de9bc199d1" + "m_Id": "49c96dd4c8a8427f9edf02c538679c95" }, { - "m_Id": "ea58207dc436404db462b0164f3c3e24" + "m_Id": "594b9ba3a1084eedbfea35db29be6be6" }, { - "m_Id": "eedf4caad4124e11b7e0a674c97ac3da" + "m_Id": "90b188bbe8894ecb882dbb314fa1063c" }, { - "m_Id": "a7d09cf893934a218bd4a9192e8d9006" + "m_Id": "b5e6eada9cbb47d4aaed63b185bdc6e0" } ], "m_GroupDatas": [], @@ -112,37 +130,23 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "0df2c23edb2b4006bf51165771e7dded" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "9ea35b645e794e2ab6606f3b26f51794" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "36015f0619d34e7a858cc616bd93c2e4" + "m_Id": "3ff3b934ab0c48cfa980f7cf70efe0aa" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "49a6adff6af64e0d996c816be7eaae67" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 3 + "m_SlotId": 302572172 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "49a6adff6af64e0d996c816be7eaae67" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 0 + "m_SlotId": 1 }, "m_InputSlot": { "m_Node": { @@ -154,41 +158,41 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "548578852b554959a2b908f39b74aeae" + "m_Id": "49c96dd4c8a8427f9edf02c538679c95" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "c0dd0bdcf81848a9b26b337fbd4cb603" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 3 + "m_SlotId": -272542626 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "566b779b7bea46668aa10e6ceee7d3f3" + "m_Id": "4a9322a942b34ab38db9bf7c71bd8446" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "a3101fca94c8490b8a8859de9bc199d1" + "m_Id": "e3bbfa4bdfae4949aef3892fb1cc1e86" }, - "m_SlotId": 0 + "m_SlotId": 3 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "8a3fe49805e74f6bb5725e115f9066c2" + "m_Id": "5654f7bf29d44ffc86f5ea86b8e04549" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "49a6adff6af64e0d996c816be7eaae67" + "m_Id": "e3bbfa4bdfae4949aef3892fb1cc1e86" }, "m_SlotId": 1 } @@ -196,57 +200,57 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "9ea35b645e794e2ab6606f3b26f51794" + "m_Id": "594b9ba3a1084eedbfea35db29be6be6" }, - "m_SlotId": 1 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "49a6adff6af64e0d996c816be7eaae67" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 8 + "m_SlotId": -1226517303 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "a2fbc6c786cf4c4f82d200e2d1a350f4" + "m_Id": "6740e111e16e41a9851af1511d473765" }, - "m_SlotId": 2 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "0df2c23edb2b4006bf51165771e7dded" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 0 + "m_SlotId": 491763191 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "a3101fca94c8490b8a8859de9bc199d1" + "m_Id": "769d3037376541238d614c6e094c7e1d" }, - "m_SlotId": 1 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "ea58207dc436404db462b0164f3c3e24" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 0 + "m_SlotId": 96624699 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "a3101fca94c8490b8a8859de9bc199d1" + "m_Id": "90b188bbe8894ecb882dbb314fa1063c" }, - "m_SlotId": 3 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "ea58207dc436404db462b0164f3c3e24" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 1 + "m_SlotId": 2127586102 } }, { @@ -266,57 +270,57 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "c0dd0bdcf81848a9b26b337fbd4cb603" + "m_Id": "b5e6eada9cbb47d4aaed63b185bdc6e0" }, - "m_SlotId": 5 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "a2fbc6c786cf4c4f82d200e2d1a350f4" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 0 + "m_SlotId": 1873519753 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "e2786ab655ca48da9fcae3265030b6b2" + "m_Id": "b949932f02934e55b2c286d6a9dc3d7b" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "c0dd0bdcf81848a9b26b337fbd4cb603" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 1 + "m_SlotId": -846562862 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "ea58207dc436404db462b0164f3c3e24" + "m_Id": "cd4a97f85b734874bf79f02251caefb7" }, - "m_SlotId": 6 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "eedf4caad4124e11b7e0a674c97ac3da" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 0 + "m_SlotId": 639724348 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "eedf4caad4124e11b7e0a674c97ac3da" + "m_Id": "e3bbfa4bdfae4949aef3892fb1cc1e86" }, - "m_SlotId": 1 + "m_SlotId": 4 }, "m_InputSlot": { "m_Node": { - "m_Id": "49a6adff6af64e0d996c816be7eaae67" + "m_Id": "4052c0fd07c144c1bde8ca59237d2ea4" }, - "m_SlotId": 2 + "m_SlotId": -1047416526 } } ], @@ -395,21 +399,6 @@ ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "00f1c2746f9443e9b3c338380f4d734b", - "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.BlockNode", @@ -445,121 +434,47 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "0d18323409d3440b87bc45838b1e50d4", - "m_Id": 0, - "m_DisplayName": "R", + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "0799a82ce3e34aa9b6f6064b2a6535e5", + "m_Id": -272542626, + "m_DisplayName": "Layer4", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.AddNode", - "m_ObjectId": "0df2c23edb2b4006bf51165771e7dded", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Add", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -3396.000244140625, - "y": 238.99996948242188, - "width": 208.0, - "height": 302.0000305175781 - } + "m_ShaderOutputName": "_Layer4", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"8a3ef1722a8fd3a4c8353e18116e7a19\",\"type\":3}}", + "m_Guid": "" }, - "m_Slots": [ - { - "m_Id": "cfb55732fd094b0ab19a399c6729addd" - }, - { - "m_Id": "3070f516410045ab9037ed23400866ea" - }, - { - "m_Id": "e600a7b45ba2410a9508e517b48785cc" - } - ], - "synonyms": [ - "addition", - "sum", - "plus" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } + "m_DefaultType": 0 } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "0f234546318d4a1e8d3b9b776c174612", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "0e0422ba1d6343b996a69a317635b975", + "m_Id": 0, + "m_DisplayName": "Albedo6", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "B", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, - "m_Value": { - "e00": 255.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_BareResource": false } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DArrayShaderProperty", - "m_ObjectId": "11b0ff6b29654ac8a7f9b9c87e890f4b", + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "1146296e58324b5bbd416e0893ffb633", "m_Guid": { - "m_GuidSerialized": "02447ce3-390d-481a-8cf2-2c677466d10c" + "m_GuidSerialized": "880ff745-d0b4-4010-92fe-f1919097c93b" }, - "m_Name": "AlbedoMaps", + "m_Name": "Albedo3", "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "AlbedoMaps", - "m_DefaultReferenceName": "_AlbedoMaps", - "m_OverrideReferenceName": "AlbedoMaps", + "m_RefNameGeneratedByDisplayName": "Albedo3", + "m_DefaultReferenceName": "_Albedo3", + "m_OverrideReferenceName": "Albedo3", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", @@ -568,35 +483,31 @@ "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, - "m_Modifiable": true + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "13cee968a80f4c5da2b8ee3038d90ec2", - "m_Id": 0, - "m_DisplayName": "RGBA", - "m_SlotType": 1, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "14a1cb77857f445d8dd6a39c2b7f1ae5", + "m_Id": 1873519753, + "m_DisplayName": "Layer7", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "RGBA", - "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_ShaderOutputName": "_Layer7", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"133dc91bc0027424f846f4cff389cb9f\",\"type\":3}}", + "m_Guid": "" }, - "m_Labels": [] + "m_DefaultType": 0 } { @@ -616,41 +527,59 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "18a622c24c024bf39c675613cb1f19e3", + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "167b809781294f37bc2eba941a701918", "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, + "m_DisplayName": "Albedo2", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "In", + "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_BareResource": false } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "1a735a9e74d94aa48a3a954418e82cfc", - "m_Id": 2, - "m_DisplayName": "G", + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "175ef5305d224d9aa4c30c904f4f9fb0", + "m_Id": 0, + "m_DisplayName": "Albedo0", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "G", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "17c273ec5ce447a39a0cc0dc160796b4", + "m_Id": 96624699, + "m_DisplayName": "Layer3", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Layer3", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"ccdccdad117eec447a3acfc62d7d7630\",\"type\":3}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "1998278066ab424f8c98a08aa9a28f03", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false } { @@ -683,19 +612,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", - "m_ObjectId": "1da06164a69c4280b758a56ec2300295", - "m_Id": 0, - "m_DisplayName": "ControlTexture", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_BareResource": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDLitData", @@ -708,28 +624,6 @@ "m_ClearCoat": false } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "2217a91456b742979a67931fe5866efc", - "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.Rendering.HighDefinition.ShaderGraph.LightingData", @@ -746,30 +640,51 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "238bd40f2b00478391e44ef5ca3b9c38", - "m_Id": 2, - "m_DisplayName": "UV", + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "229010c9165c4e63bd3e6ba1e93775f6", + "m_Id": 643772488, + "m_DisplayName": "Invalid", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "UV", - "m_StageCapability": 3, + "m_ShaderOutputName": "_Invalid", + "m_StageCapability": 2, "m_Value": { - "x": 0.0, - "y": 0.0 + "x": 1.0, + "y": 0.0, + "z": 0.8475146293640137, + "w": 1.0 }, "m_DefaultValue": { "x": 0.0, - "y": 0.0 + "y": 0.0, + "z": 0.0, + "w": 0.0 }, - "m_Labels": [], - "m_Channel": 0 + "m_Labels": [] } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "280a2584a2ab49beb325a8277ac749c4", + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "246b8ea527e04bc7a77fe770e7eef220", + "m_Id": -846562862, + "m_DisplayName": "Layer0", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Layer0", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"1d14b82f535e85643a6e5e7a878951c8\",\"type\":3}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "280a2584a2ab49beb325a8277ac749c4", "m_Id": 0, "m_DisplayName": "Emission", "m_SlotType": 0, @@ -798,13 +713,13 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "2a8722ca912940a797df34e95ff145b2", - "m_Id": 3, - "m_DisplayName": "Sampler", - "m_SlotType": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "28fc3f70708b44e5935c45f849333ee7", + "m_Id": 0, + "m_DisplayName": "Albedo7", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "Sampler", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_BareResource": false } @@ -812,7 +727,7 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "2c522b487f0f4f318a71fa3fb8c45b7c", + "m_ObjectId": "31496fba92eb4ce4a542d3840e97bfad", "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, @@ -824,30 +739,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "3070f516410045ab9037ed23400866ea", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "x": 0.5, - "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", @@ -865,25 +756,38 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateNode", - "m_ObjectId": "36015f0619d34e7a858cc616bd93c2e4", + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "38faa786e4da4a6c91dc0abe74c1468b", + "m_Id": 491763191, + "m_DisplayName": "LayerSampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "LayerSampler", + "m_StageCapability": 2, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "3ff3b934ab0c48cfa980f7cf70efe0aa", "m_Group": { "m_Id": "" }, - "m_Name": "Sampler State", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2945.0, - "y": 34.00000762939453, - "width": 145.0, - "height": 138.0 + "x": -2853.000244140625, + "y": 38.00002670288086, + "width": 127.0, + "height": 34.000003814697269 } }, "m_Slots": [ { - "m_Id": "f3e4d4f9e53c40e2acfbee1dd8545800" + "m_Id": "167b809781294f37bc2eba941a701918" } ], "synonyms": [], @@ -893,120 +797,173 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_filter": 2, - "m_wrap": 0, - "m_aniso": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "39670d1de2134aefa25e540013e56664", - "m_Id": 8, - "m_DisplayName": "Index", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Index", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "3cb91fcb3b58481fa1ebc19a41582a44", - "m_Id": 7, - "m_DisplayName": "B", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "45e1345248fb4c33acb00fa59f05303d", - "m_Id": 6, - "m_DisplayName": "RG", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "RG", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] + "m_Property": { + "m_Id": "ef09beda3e4647c887e86b7e4e2abc27" + } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DArrayNode", - "m_ObjectId": "49a6adff6af64e0d996c816be7eaae67", + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "4052c0fd07c144c1bde8ca59237d2ea4", "m_Group": { "m_Id": "" }, - "m_Name": "Sample Texture 2D Array", + "m_Name": "LayerSwitch8", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2608.000244140625, - "y": -37.00006103515625, + "x": -2562.0, + "y": 7.000010967254639, "width": 219.0, - "height": 374.0000305175781 + "height": 517.9999389648438 } }, "m_Slots": [ { - "m_Id": "6346bcc6dea94d9f8b9ada23a8f25e82" + "m_Id": "246b8ea527e04bc7a77fe770e7eef220" + }, + { + "m_Id": "942091e9c509492984c42f7b852e67f4" + }, + { + "m_Id": "d3b4ee846a8d404ba4743daf07e2a731" + }, + { + "m_Id": "17c273ec5ce447a39a0cc0dc160796b4" }, { - "m_Id": "5052c9ba32784b94a1b142a8249571f1" + "m_Id": "0799a82ce3e34aa9b6f6064b2a6535e5" }, { - "m_Id": "2c522b487f0f4f318a71fa3fb8c45b7c" + "m_Id": "b591e5a4b18d49e2b2d9fc6df295ae98" }, { - "m_Id": "b61d2d6e8daf43f7b6af83374b92238c" + "m_Id": "a1a33c5ead2845ab8c4fb6eaccabe2a8" }, { - "m_Id": "00f1c2746f9443e9b3c338380f4d734b" + "m_Id": "14a1cb77857f445d8dd6a39c2b7f1ae5" }, { - "m_Id": "735cfdbecc8242858e0c9450c9ec2bf2" + "m_Id": "af93f80a531a433186e43372007be367" }, { - "m_Id": "39670d1de2134aefa25e540013e56664" + "m_Id": "38faa786e4da4a6c91dc0abe74c1468b" }, { - "m_Id": "2217a91456b742979a67931fe5866efc" + "m_Id": "229010c9165c4e63bd3e6ba1e93775f6" }, { - "m_Id": "2a8722ca912940a797df34e95ff145b2" + "m_Id": "9d7594ad37bd45819df711cf8c24e444" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"24ef6d560004648438ebd8f85d0dc331\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "53599c3b-9a59-48f0-a6c8-f3f516b7d023", + "1386876d-fed7-41f7-9798-d10d118a8179", + "97ca2ada-5dd6-4347-b7a1-33a43734b662", + "57841b73-1402-4086-8b94-7622c1fbb630", + "3302e20e-44dd-49ed-bd5c-dae530aef470", + "cf879c25-7a64-4da5-97db-84c01fe942f4", + "6ed70a7e-69aa-40d3-bce1-4aa55ee19ef5", + "f32da0b6-f87b-4a06-bd93-f9c3f96f7915", + "71b21a08-90b9-4b63-98dd-91931be6d168", + "22468938-8f1d-49b0-9629-9fa1449a26d7", + "d7cde703-663a-481c-92e6-1355e3579dec" + ], + "m_PropertyIds": [ + -846562862, + 639724348, + 302572172, + 96624699, + -272542626, + -1226517303, + 2127586102, + 1873519753, + -1047416526, + 491763191, + 643772488 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "49c96dd4c8a8427f9edf02c538679c95", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2854.000244140625, + "y": 135.00001525878907, + "width": 128.0, + "height": 34.000030517578128 + } + }, + "m_Slots": [ + { + "m_Id": "de02b6f933094d9ebdc11e10a4a41c28" } ], - "synonyms": [ - "stack", - "pile" + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "ea6dc68006944ed5a3dabe00258a2a39" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateNode", + "m_ObjectId": "4a9322a942b34ab38db9bf7c71bd8446", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sampler State", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3499.0, + "y": -17.99998664855957, + "width": 145.0, + "height": 137.99998474121095 + } + }, + "m_Slots": [ + { + "m_Id": "8db0326c1d454c12ba33fbc0301133e2" + } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, - "m_EnableGlobalMipBias": false + "m_filter": 1, + "m_wrap": 1, + "m_aniso": 0 } { @@ -1024,21 +981,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "5052c9ba32784b94a1b142a8249571f1", - "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": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -1068,88 +1010,59 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateNode", - "m_ObjectId": "548578852b554959a2b908f39b74aeae", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Sampler State", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -4451.0, - "y": 258.0, - "width": 145.0, - "height": 137.99996948242188 - } - }, - "m_Slots": [ - { - "m_Id": "db064453b7234b818c70cab0e18e6d64" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_filter": 1, - "m_wrap": 1, - "m_aniso": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "555828949bc740528db9f2c8d79e3d7e", - "m_Id": 3, - "m_DisplayName": "A", + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "5643042a975c43ce915692c912abbd5e", + "m_Id": 2, + "m_DisplayName": "UV", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "A", + "m_ShaderOutputName": "UV", "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "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.PositionNode", - "m_ObjectId": "566b779b7bea46668aa10e6ceee7d3f3", + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "5654f7bf29d44ffc86f5ea86b8e04549", "m_Group": { "m_Id": "" }, - "m_Name": "Position", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3786.999755859375, - "y": -286.9999694824219, - "width": 208.0, - "height": 315.0 + "x": -3435.0, + "y": -83.00001525878906, + "width": 163.0, + "height": 34.000003814697269 } }, "m_Slots": [ { - "m_Id": "e4fdfb70309f4c219e661c56b87b92cb" + "m_Id": "c5b36e67988740f39e9981b8ca291ef6" } ], - "synonyms": [ - "location" - ], - "m_Precision": 1, + "synonyms": [], + "m_Precision": 0, "m_PreviewExpanded": true, - "m_PreviewMode": 2, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, - "m_Space": 2, - "m_PositionSource": 0 + "m_Property": { + "m_Id": "8eb7760c2637485c86a6905014ae7124" + } } { @@ -1187,52 +1100,54 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "5dd145ebfcab4ef3954606c0477e8456", - "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_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "594b9ba3a1084eedbfea35db29be6be6", + "m_Group": { + "m_Id": "" }, - "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_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2854.000244140625, + "y": 169.0000457763672, + "width": 128.0, + "height": 33.999969482421878 + } + }, + "m_Slots": [ + { + "m_Id": "ff06e8d131494286bfffe0e23f18360c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "e0ae08eea5e74a5bb85d544b2efbb7a2" } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5ae4e5d9576241eca37203c402fb017d", + "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.PositionMaterialSlot", @@ -1257,31 +1172,6 @@ "m_Space": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "6346bcc6dea94d9f8b9ada23a8f25e82", - "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.Rendering.HighDefinition.ShaderGraph.SystemData", @@ -1314,6 +1204,41 @@ "inspectorFoldoutMask": 9 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateNode", + "m_ObjectId": "6740e111e16e41a9851af1511d473765", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sampler State", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2825.0, + "y": 384.00006103515627, + "width": 145.0, + "height": 137.99993896484376 + } + }, + "m_Slots": [ + { + "m_Id": "bef0d7e2e6dd47d1b64f7a77e07cba5b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_filter": 2, + "m_wrap": 0, + "m_aniso": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.BuiltinData", @@ -1336,165 +1261,54 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "6af88fdb878c42f7902dcc09498a1280", - "m_Id": 0, - "m_DisplayName": "", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "6cbec72d7d5f4bca9bb9ac5d44a74188", + "m_Guid": { + "m_GuidSerialized": "72a332ce-aca1-4d5d-9cc8-c3f1ae4e4b38" }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "706ed217656a4572a0edf9e6582bf602", - "m_Id": 2, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DArrayInputMaterialSlot", - "m_ObjectId": "735cfdbecc8242858e0c9450c9ec2bf2", - "m_Id": 1, - "m_DisplayName": "Texture Array", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Texture Array", - "m_StageCapability": 3, - "m_BareResource": false, - "m_TextureArray": { - "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", - "m_Guid": "" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "7372c4d4a8ff42a8a8709d7a7e4a3ca1", - "m_Id": 4, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "789542e490004ae096bbc67d75d5bb38", - "m_Id": 1, - "m_DisplayName": "", - "m_SlotType": 1, + "m_Name": "Albedo1", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Albedo1", + "m_DefaultReferenceName": "_Albedo1", + "m_OverrideReferenceName": "Albedo1", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, - "m_ShaderOutputName": "", - "m_StageCapability": 3, "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "7d19b1a8e11a4f0cb532bfa54350fdd9", - "m_Id": 6, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "85931a7818364fffb293bb6d0ecc5a4c", - "m_Id": 4, - "m_DisplayName": "LOD", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "LOD", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "86c59cdd71cf420b8e2ee625bef8f2e5", - "m_Id": 8, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "8771c86891434b9797b7706e33f89a88", + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "769d3037376541238d614c6e094c7e1d", "m_Group": { "m_Id": "" }, - "m_Name": "VertexDescription.TessellationDisplacement", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": -2854.000244140625, + "y": 72.00003051757813, + "width": 128.0, + "height": 34.0 } }, "m_Slots": [ { - "m_Id": "c716425cc62a439d81e96f3adc2d146d" + "m_Id": "77a332dc63c44089898d440e60a14f76" } ], "synonyms": [], @@ -1504,30 +1318,45 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_SerializedDescriptor": "VertexDescription.TessellationDisplacement" + "m_Property": { + "m_Id": "1146296e58324b5bbd416e0893ffb633" + } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "8a3fe49805e74f6bb5725e115f9066c2", + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "77a332dc63c44089898d440e60a14f76", + "m_Id": 0, + "m_DisplayName": "Albedo3", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "8771c86891434b9797b7706e33f89a88", "m_Group": { "m_Id": "" }, - "m_Name": "Property", + "m_Name": "VertexDescription.TessellationDisplacement", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2955.0, - "y": -36.9999885559082, - "width": 178.0, - "height": 33.99998092651367 + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 } }, "m_Slots": [ { - "m_Id": "9a6d2c8cceb845aa9caea9793b7c87da" + "m_Id": "c716425cc62a439d81e96f3adc2d146d" } ], "synonyms": [], @@ -1537,24 +1366,7 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_Property": { - "m_Id": "11b0ff6b29654ac8a7f9b9c87e890f4b" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "8b27936ad87c41a88a8ced51162c2537", - "m_Id": 3, - "m_DisplayName": "B", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_SerializedDescriptor": "VertexDescription.TessellationDisplacement" } { @@ -1590,6 +1402,19 @@ "m_SerializedDescriptor": "SurfaceDescription.BaseColor" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "8db0326c1d454c12ba33fbc0301133e2", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -1610,36 +1435,69 @@ "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"7568014b8b52d5546bcd367749860d00\",\"type\":3}}", "m_Guid": "" }, - "isMainTexture": false, - "useTilingAndOffset": false, - "m_Modifiable": true, - "m_DefaultType": 5 + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 5 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "8fd372895ab34b6c8bfc556bda66305e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.TessellationFactor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "162f0ba8b5cf42358cc5e83bdac40091" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.TessellationFactor" } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "8fd372895ab34b6c8bfc556bda66305e", + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "90b188bbe8894ecb882dbb314fa1063c", "m_Group": { "m_Id": "" }, - "m_Name": "VertexDescription.TessellationFactor", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": -2854.000244140625, + "y": 203.00001525878907, + "width": 128.0, + "height": 34.00004577636719 } }, "m_Slots": [ { - "m_Id": "162f0ba8b5cf42358cc5e83bdac40091" + "m_Id": "0e0422ba1d6343b996a69a317635b975" } ], "synonyms": [], @@ -1649,7 +1507,27 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_SerializedDescriptor": "VertexDescription.TessellationFactor" + "m_Property": { + "m_Id": "f06dde9d2375440da601e0925701ca47" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "942091e9c509492984c42f7b852e67f4", + "m_Id": 639724348, + "m_DisplayName": "Layer1", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Layer1", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"48c4ea7be45675946b46e29b46cd45fe\",\"type\":3}}", + "m_Guid": "" + }, + "m_DefaultType": 0 } { @@ -1665,10 +1543,28 @@ "m_Id": "8eb7760c2637485c86a6905014ae7124" }, { - "m_Id": "11b0ff6b29654ac8a7f9b9c87e890f4b" + "m_Id": "9ac26edbdd214d8ca171d1e8baed7143" + }, + { + "m_Id": "6cbec72d7d5f4bca9bb9ac5d44a74188" + }, + { + "m_Id": "ef09beda3e4647c887e86b7e4e2abc27" + }, + { + "m_Id": "1146296e58324b5bbd416e0893ffb633" + }, + { + "m_Id": "ea6dc68006944ed5a3dabe00258a2a39" + }, + { + "m_Id": "e0ae08eea5e74a5bb85d544b2efbb7a2" + }, + { + "m_Id": "f06dde9d2375440da601e0925701ca47" }, { - "m_Id": "f43f72d4fadf4cee9906f6d87b7b8eb1" + "m_Id": "ab95c558ffe149cf82054e08167814ef" } ] } @@ -1765,55 +1661,31 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "97e9479dd9f04c00ba96b22b0870beb6", - "m_Id": 1, - "m_DisplayName": "G", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "99f4f34fc5cf41d796d3bf251f6d7447", - "m_Id": 4, - "m_DisplayName": "RGBA", - "m_SlotType": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "9ac26edbdd214d8ca171d1e8baed7143", + "m_Guid": { + "m_GuidSerialized": "664b37fb-d2c1-40dd-b22b-c24a4a00d591" + }, + "m_Name": "Albedo0", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Albedo0", + "m_DefaultReferenceName": "_Albedo0", + "m_OverrideReferenceName": "Albedo0", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, - "m_ShaderOutputName": "RGBA", - "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_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DArrayMaterialSlot", - "m_ObjectId": "9a6d2c8cceb845aa9caea9793b7c87da", - "m_Id": 0, - "m_DisplayName": "AlbedoMaps", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_BareResource": false + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 } { @@ -1848,154 +1720,14 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "9d45e2597c0b4d3688f2403d3b91c343", + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "9d7594ad37bd45819df711cf8c24e444", "m_Id": 1, - "m_DisplayName": "R", + "m_DisplayName": "Albedo", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.FloorNode", - "m_ObjectId": "9ea35b645e794e2ab6606f3b26f51794", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Floor", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -3102.000244140625, - "y": 234.00001525878907, - "width": 208.0, - "height": 277.9998779296875 - } - }, - "m_Slots": [ - { - "m_Id": "18a622c24c024bf39c675613cb1f19e3" - }, - { - "m_Id": "a7a095f17f0c4208b0accebcec0f3c1b" - } - ], - "synonyms": [ - "down" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "a2fbc6c786cf4c4f82d200e2d1a350f4", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -3736.0, - "y": 239.00001525878907, - "width": 208.0, - "height": 302.0 - } - }, - "m_Slots": [ - { - "m_Id": "cf2a011f0506434c8717e0befd4a0fbf" - }, - { - "m_Id": "0f234546318d4a1e8d3b9b776c174612" - }, - { - "m_Id": "5dd145ebfcab4ef3954606c0477e8456" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SplitNode", - "m_ObjectId": "a3101fca94c8490b8a8859de9bc199d1", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Split", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -3527.999755859375, - "y": -286.9999694824219, - "width": 120.0, - "height": 149.00001525878907 - } - }, - "m_Slots": [ - { - "m_Id": "a50e851754c34b3488eb255159e9418c" - }, - { - "m_Id": "9d45e2597c0b4d3688f2403d3b91c343" - }, - { - "m_Id": "1a735a9e74d94aa48a3a954418e82cfc" - }, - { - "m_Id": "8b27936ad87c41a88a8ced51162c2537" - }, - { - "m_Id": "7372c4d4a8ff42a8a8709d7a7e4a3ca1" - } - ], - "synonyms": [ - "separate" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "a50e851754c34b3488eb255159e9418c", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, + "m_ShaderOutputName": "Albedo", + "m_StageCapability": 2, "m_Value": { "x": 0.0, "y": 0.0, @@ -2007,31 +1739,26 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "a7a095f17f0c4208b0accebcec0f3c1b", - "m_Id": 1, - "m_DisplayName": "Out", - "m_SlotType": 1, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "a1a33c5ead2845ab8c4fb6eaccabe2a8", + "m_Id": 2127586102, + "m_DisplayName": "Layer6", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 + "m_ShaderOutputName": "_Layer6", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"aa9dea029b072b042bf02fc464e0b12f\",\"type\":3}}", + "m_Guid": "" }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } + "m_DefaultType": 0 } { @@ -2046,10 +1773,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2158.0, - "y": -101.00000762939453, - "width": 169.0, - "height": 34.000022888183597 + "x": -2012.0001220703125, + "y": -88.0, + "width": 169.0001220703125, + "height": 34.0 } }, "m_Slots": [ @@ -2071,17 +1798,31 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "a90aaaa6ddb14bd28aba4ec7c0d22c3d", - "m_Id": 5, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "ab95c558ffe149cf82054e08167814ef", + "m_Guid": { + "m_GuidSerialized": "bb95f9e7-1f31-4caf-b7b6-2af720fbe65a" + }, + "m_Name": "Albedo7", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Albedo7", + "m_DefaultReferenceName": "_Albedo7", + "m_OverrideReferenceName": "Albedo7", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 } { @@ -2143,76 +1884,83 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "b07a009d51c54f43bdcfeb948b3e6815", - "m_Id": 3, - "m_DisplayName": "Sampler", + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "af93f80a531a433186e43372007be367", + "m_Id": -1047416526, + "m_DisplayName": "TexIndex", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3, - "m_BareResource": false + "m_ShaderOutputName": "_TexIndex", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "b3003fca3b82428f8a84b2d05079d8f2", - "m_Id": 5, - "m_DisplayName": "RGB", + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "b420d2776e144bf1b6e962a39d64bbc8", + "m_Id": 0, + "m_DisplayName": "RGBA", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "RGB", - "m_StageCapability": 3, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, "m_Value": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "w": 0.0 }, "m_DefaultValue": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "w": 0.0 }, "m_Labels": [] } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "b61d2d6e8daf43f7b6af83374b92238c", - "m_Id": 6, - "m_DisplayName": "B", - "m_SlotType": 1, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "b591e5a4b18d49e2b2d9fc6df295ae98", + "m_Id": -1226517303, + "m_DisplayName": "Layer5", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "B", + "m_ShaderOutputName": "_Layer5", "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"1ec47b3300477f040b5d59f8fc7497dc\",\"type\":3}}", + "m_Guid": "" + }, + "m_DefaultType": 0 } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "bc6a39a6f4614fbe98638250cefd1eb6", + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "b5e6eada9cbb47d4aaed63b185bdc6e0", "m_Group": { "m_Id": "" }, - "m_Name": "SurfaceDescription.Occlusion", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": -2854.000244140625, + "y": 237.00006103515626, + "width": 127.0, + "height": 33.999969482421878 } }, "m_Slots": [ { - "m_Id": "4ffd66ad262042629b31b76793ee0ec4" + "m_Id": "28fc3f70708b44e5935c45f849333ee7" } ], "synonyms": [], @@ -2222,54 +1970,85 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_SerializedDescriptor": "SurfaceDescription.Occlusion" + "m_Property": { + "m_Id": "ab95c558ffe149cf82054e08167814ef" + } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DLODNode", - "m_ObjectId": "c0dd0bdcf81848a9b26b337fbd4cb603", + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "b949932f02934e55b2c286d6a9dc3d7b", "m_Group": { "m_Id": "" }, - "m_Name": "Sample Texture 2D LOD", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -4099.0, - "y": 219.00001525878907, - "width": 208.0, - "height": 435.0 + "x": -2856.000244140625, + "y": -29.999975204467775, + "width": 128.0, + "height": 34.0 } }, "m_Slots": [ { - "m_Id": "13cee968a80f4c5da2b8ee3038d90ec2" - }, - { - "m_Id": "a90aaaa6ddb14bd28aba4ec7c0d22c3d" - }, - { - "m_Id": "7d19b1a8e11a4f0cb532bfa54350fdd9" - }, - { - "m_Id": "3cb91fcb3b58481fa1ebc19a41582a44" - }, - { - "m_Id": "86c59cdd71cf420b8e2ee625bef8f2e5" - }, - { - "m_Id": "d805db2e88544c7eb1b732c1863c3d5b" - }, - { - "m_Id": "238bd40f2b00478391e44ef5ca3b9c38" - }, - { - "m_Id": "b07a009d51c54f43bdcfeb948b3e6815" - }, + "m_Id": "175ef5305d224d9aa4c30c904f4f9fb0" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "9ac26edbdd214d8ca171d1e8baed7143" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "bb2269ea9c2e46179abb7875a46a21a9", + "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": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "bc6a39a6f4614fbe98638250cefd1eb6", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ { - "m_Id": "85931a7818364fffb293bb6d0ecc5a4c" + "m_Id": "4ffd66ad262042629b31b76793ee0ec4" } ], "synonyms": [], @@ -2279,8 +2058,33 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "bef0d7e2e6dd47d1b64f7a77e07cba5b", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "c5b36e67988740f39e9981b8ca291ef6", + "m_Id": 0, + "m_DisplayName": "ControlTexture", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2332,52 +2136,54 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "cf2a011f0506434c8717e0befd4a0fbf", - "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_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "cd4a97f85b734874bf79f02251caefb7", + "m_Group": { + "m_Id": "" }, - "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_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2854.000244140625, + "y": 4.000025272369385, + "width": 126.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "ea3f614ca7dd479194dcce5949707027" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "6cbec72d7d5f4bca9bb9ac5d44a74188" } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "cf5ae3b0a4d749cc9e821cf6d5468197", + "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.BlockNode", @@ -2413,26 +2219,20 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "cfb55732fd094b0ab19a399c6729addd", - "m_Id": 0, - "m_DisplayName": "A", + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "d3b4ee846a8d404ba4743daf07e2a731", + "m_Id": 302572172, + "m_DisplayName": "Layer2", "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_ShaderOutputName": "_Layer2", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"2e00baf0337133c408ba69ca99b5fe16\",\"type\":3}}", + "m_Guid": "" }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } + "m_DefaultType": 0 } { @@ -2443,47 +2243,29 @@ "m_Id": "e722fbe87ae34ce1bdc6ddb7fb1adfe6" }, "m_Datas": [ - { - "m_Id": "2004def300dd4dee878677e12a87150f" - }, - { - "m_Id": "68187decefb34598a1b703fb2942fe22" - }, - { - "m_Id": "225f6ce4b4cd4721a56a3430485b0ce2" - }, - { - "m_Id": "651d32e5f52b4cbfa51f25516f716c1d" - } - ], - "m_CustomEditorGUI": "", - "m_SupportVFX": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", - "m_ObjectId": "d805db2e88544c7eb1b732c1863c3d5b", - "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": "{\"texture\":{\"instanceID\":0}}", - "m_Guid": "" - }, - "m_DefaultType": 0 + { + "m_Id": "2004def300dd4dee878677e12a87150f" + }, + { + "m_Id": "68187decefb34598a1b703fb2942fe22" + }, + { + "m_Id": "225f6ce4b4cd4721a56a3430485b0ce2" + }, + { + "m_Id": "651d32e5f52b4cbfa51f25516f716c1d" + } + ], + "m_CustomEditorGUI": "", + "m_SupportVFX": false } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "db064453b7234b818c70cab0e18e6d64", + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "de02b6f933094d9ebdc11e10a4a41c28", "m_Id": 0, - "m_DisplayName": "Out", + "m_DisplayName": "Albedo4", "m_SlotType": 1, "m_Hidden": false, "m_ShaderOutputName": "Out", @@ -2493,37 +2275,31 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "e2786ab655ca48da9fcae3265030b6b2", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -4442.0, - "y": 202.0, - "width": 163.0, - "height": 34.00001525878906 - } + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "e0ae08eea5e74a5bb85d544b2efbb7a2", + "m_Guid": { + "m_GuidSerialized": "e52f988e-f728-4292-9807-12a94a6f07ec" }, - "m_Slots": [ - { - "m_Id": "1da06164a69c4280b758a56ec2300295" - } - ], - "synonyms": [], + "m_Name": "Albedo5", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Albedo5", + "m_DefaultReferenceName": "_Albedo5", + "m_OverrideReferenceName": "Albedo5", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" }, - "m_Property": { - "m_Id": "8eb7760c2637485c86a6905014ae7124" - } + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 } { @@ -2594,142 +2370,179 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "e4fdfb70309f4c219e661c56b87b92cb", - "m_Id": 0, - "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.DynamicVectorMaterialSlot", - "m_ObjectId": "e600a7b45ba2410a9508e517b48785cc", - "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.Rendering.HighDefinition.ShaderGraph.HDLitSubTarget", - "m_ObjectId": "e722fbe87ae34ce1bdc6ddb7fb1adfe6" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CombineNode", - "m_ObjectId": "ea58207dc436404db462b0164f3c3e24", + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "e3bbfa4bdfae4949aef3892fb1cc1e86", "m_Group": { "m_Id": "" }, - "m_Name": "Combine", + "m_Name": "Sample Texture 2D", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3291.999755859375, - "y": -286.9999694824219, + "x": -3250.0, + "y": -66.0, "width": 208.0, - "height": 350.0 + "height": 435.0000305175781 } }, "m_Slots": [ { - "m_Id": "0d18323409d3440b87bc45838b1e50d4" + "m_Id": "b420d2776e144bf1b6e962a39d64bbc8" + }, + { + "m_Id": "cf5ae3b0a4d749cc9e821cf6d5468197" }, { - "m_Id": "97e9479dd9f04c00ba96b22b0870beb6" + "m_Id": "31496fba92eb4ce4a542d3840e97bfad" }, { - "m_Id": "706ed217656a4572a0edf9e6582bf602" + "m_Id": "e6f263fad3894e67a622ca9d061a17bd" }, { - "m_Id": "555828949bc740528db9f2c8d79e3d7e" + "m_Id": "5ae4e5d9576241eca37203c402fb017d" }, { - "m_Id": "99f4f34fc5cf41d796d3bf251f6d7447" + "m_Id": "bb2269ea9c2e46179abb7875a46a21a9" }, { - "m_Id": "b3003fca3b82428f8a84b2d05079d8f2" + "m_Id": "5643042a975c43ce915692c912abbd5e" }, { - "m_Id": "45e1345248fb4c33acb00fa59f05303d" + "m_Id": "1998278066ab424f8c98a08aa9a28f03" } ], - "synonyms": [ - "append" - ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - } + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", - "m_ObjectId": "eedf4caad4124e11b7e0a674c97ac3da", - "m_Group": { - "m_Id": "" + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e6f263fad3894e67a622ca9d061a17bd", + "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.Rendering.HighDefinition.ShaderGraph.HDLitSubTarget", + "m_ObjectId": "e722fbe87ae34ce1bdc6ddb7fb1adfe6" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "ea3f614ca7dd479194dcce5949707027", + "m_Id": 0, + "m_DisplayName": "Albedo1", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "ea6dc68006944ed5a3dabe00258a2a39", + "m_Guid": { + "m_GuidSerialized": "cff0192a-5166-4909-b2ea-bd38b4b853dc" }, - "m_Name": "Redirect Node", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2716.999755859375, - "y": -194.0, - "width": 56.0, - "height": 24.000015258789064 - } + "m_Name": "Albedo4", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Albedo4", + "m_DefaultReferenceName": "_Albedo4", + "m_OverrideReferenceName": "Albedo4", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" }, - "m_Slots": [ - { - "m_Id": "6af88fdb878c42f7902dcc09498a1280" - }, - { - "m_Id": "789542e490004ae096bbc67d75d5bb38" - } - ], - "synonyms": [], + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "ef09beda3e4647c887e86b7e4e2abc27", + "m_Guid": { + "m_GuidSerialized": "ab76781e-f720-44bd-a704-650d718fe2cb" + }, + "m_Name": "Albedo2", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Albedo2", + "m_DefaultReferenceName": "_Albedo2", + "m_OverrideReferenceName": "Albedo2", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "f06dde9d2375440da601e0925701ca47", + "m_Guid": { + "m_GuidSerialized": "7f6ab97e-07e7-45a5-a51f-532f6d5302fe" + }, + "m_Name": "Albedo6", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Albedo6", + "m_DefaultReferenceName": "_Albedo6", + "m_OverrideReferenceName": "Albedo6", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 } { @@ -2780,19 +2593,6 @@ "m_SerializedDescriptor": "SurfaceDescription.Alpha" } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "f3e4d4f9e53c40e2acfbee1dd8545800", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_BareResource": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", @@ -2819,27 +2619,14 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DArrayShaderProperty", - "m_ObjectId": "f43f72d4fadf4cee9906f6d87b7b8eb1", - "m_Guid": { - "m_GuidSerialized": "67f1462d-468b-4782-ac77-0446f8b80c09" - }, - "m_Name": "NormalMaps", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "NormalMaps", - "m_DefaultReferenceName": "_NormalMaps", - "m_OverrideReferenceName": "NormalMaps", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "ff06e8d131494286bfffe0e23f18360c", + "m_Id": 0, + "m_DisplayName": "Albedo5", + "m_SlotType": 1, "m_Hidden": false, - "m_Value": { - "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", - "m_Guid": "" - }, - "m_Modifiable": true + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false } diff --git a/Runtime/Shaders/TerrainShader.shadergraph.meta b/Runtime/Shaders/TerrainShader8.shadergraph.meta similarity index 100% rename from Runtime/Shaders/TerrainShader.shadergraph.meta rename to Runtime/Shaders/TerrainShader8.shadergraph.meta diff --git a/Runtime/TerrainBuilder.cs b/Runtime/TerrainBuilder.cs index a96d27b88df3ada4972e3a7ff3de92ed7ad73888..9d064a017a1c8b3072165271ac379893fa86d561 100644 --- a/Runtime/TerrainBuilder.cs +++ b/Runtime/TerrainBuilder.cs @@ -22,7 +22,7 @@ namespace Wander public struct TerrainLayer2 { public TerrainLayer layer; - public Color color; + public Color [] colors; } [ExecuteAlways()] @@ -97,12 +97,15 @@ namespace Wander { terrainData = new TerrainData(); terrainData.size = adjustedSize; + GameObject go = new GameObject("GeneratedTerrain"); terrain = go.AddComponent<Terrain>(); - go.AddComponent<TerrainCollider>(); + terrain.terrainData = terrainData; terrain.materialTemplate = terrainMat; terrainData.terrainLayers = layers.Select( l => l.layer ).ToArray(); + + go.AddComponent<TerrainCollider>().terrainData = terrainData; } internal void SyncLayersToMaterial() { diff --git a/Runtime/Textures/test_input.png b/Runtime/Textures/test_input.png new file mode 100644 index 0000000000000000000000000000000000000000..86807055b26f0cbf38a9e027ef2ecc17107ee5fc --- /dev/null +++ b/Runtime/Textures/test_input.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3606173f672569d6c4b9cc6558b63a907b047b6045d40843746f41d5a60680fd +size 903 diff --git a/Runtime/Textures/test_input.png.meta b/Runtime/Textures/test_input.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..fb915d76e219db7018824e5385e5a49c3abba0b9 --- /dev/null +++ b/Runtime/Textures/test_input.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 7568014b8b52d5546bcd367749860d00 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 3 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TerrainBuilder.prefab b/TerrainBuilder.prefab index ef62dd5957ba9de240720fee813933f5c55e132c..0751771ab7bed20c05c54429cde99431356c27fd 100644 --- a/TerrainBuilder.prefab +++ b/TerrainBuilder.prefab @@ -46,9 +46,28 @@ MonoBehaviour: m_EditorClassIdentifier: layers: - layer: {fileID: 8574412962073106934, guid: f963e57374ac1ff44b017a60c3f8ad82, type: 2} - color: {r: 0.28366074, g: 0.90588236, b: 0.082352914, a: 0} - - layer: {fileID: 8574412962073106934, guid: d246e87b3079621499653fbc3124273c, type: 2} - color: {r: 0.9056604, g: 0.08116765, b: 0.08116765, a: 0} + colors: + - {r: 0.54901963, g: 0.65882355, b: 0, a: 0} + - layer: {fileID: 8574412962073106934, guid: a8f4323a2d7fc5a4980be7d0b9db0f78, type: 2} + colors: + - {r: 0.78823537, g: 0.9215687, b: 0.43921572, a: 0} + - {r: 0.78823537, g: 0.9215687, b: 0.43921572, a: 0} + - layer: {fileID: 8574412962073106934, guid: 18e099679d7c2e441b23ddbab4283f49, type: 2} + colors: + - {r: 1, g: 1, b: 1, a: 0} + - layer: {fileID: 8574412962073106934, guid: c039e30a40d38fb46bae1836a8fe2289, type: 2} + colors: + - {r: 0.45098042, g: 0.91372555, b: 1, a: 0} + - {r: 0.74509805, g: 0.909804, b: 1, a: 0} + - layer: {fileID: 8574412962073106934, guid: ee6c4ea23d51df947b0aaa766f11cac6, type: 2} + colors: + - {r: 1, g: 1, b: 0.8000001, a: 0} + - layer: {fileID: 8574412962073106934, guid: 2c813be5c284dbb4ca974391b442db2c, type: 2} + colors: + - {r: 0.8000001, g: 0, b: 0, a: 0} + - layer: {fileID: 8574412962073106934, guid: 60085e35e8e4b114cae3ce971378231a, type: 2} + colors: + - {r: 0.95294124, g: 0.9607844, b: 0.96470594, a: 0} mapType: 0 runOnStart: 0 terrainMat: {fileID: 2100000, guid: 8179da2b0897196479bec0f26c2c46e7, type: 2}