浏览代码

Improvements to vertex ground shader

Now world-space coordinates
/main
Ciro Continisio 4 年前
当前提交
5636f0a4
共有 15 个文件被更改,包括 3482 次插入2005 次删除
  1. 6
      UOP1_Project/Assets/WIP/Materials/Ground_ProbuilderMeshes_Beach.mat
  2. 8
      UOP1_Project/Assets/Art/Textures.meta
  3. 1001
      UOP1_Project/Assets/Shaders/SubGraphs/VertexColourTextureBlend.shadersubgraph
  4. 526
      UOP1_Project/Assets/Shaders/SubGraphs/XZ_WorldPos_AsUVs.shadersubgraph
  5. 10
      UOP1_Project/Assets/Shaders/SubGraphs/XZ_WorldPos_AsUVs.shadersubgraph.meta
  6. 1001
      UOP1_Project/Assets/Shaders/Toon_Ground_VertexColour.shadergraph
  7. 463
      UOP1_Project/Assets/Art/Textures/PerlinNoise.png
  8. 92
      UOP1_Project/Assets/Art/Textures/PerlinNoise.png.meta
  9. 286
      UOP1_Project/Assets/Art/Textures/SimplexNoise.png
  10. 92
      UOP1_Project/Assets/Art/Textures/SimplexNoise.png.meta
  11. 1001
      UOP1_Project/Assets/Shaders/SubGraphs/Ground.shadersubgraph
  12. 1001
      UOP1_Project/Assets/Shaders/Toon_Ground.shadergraph
  13. 0
      /UOP1_Project/Assets/Shaders/SubGraphs/VertexColourTextureBlend.shadersubgraph.meta
  14. 0
      /UOP1_Project/Assets/Shaders/Toon_Ground_VertexColour.shadergraph.meta

6
UOP1_Project/Assets/WIP/Materials/Ground_ProbuilderMeshes_Beach.mat


- _DEBUG_VERTEX_COLOR: 0
- _DstBlend: 0
- _EnvironmentReflections: 1
- _FourthTextureScale: 0.19
- _FourthTextureScale: 0.1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0

- _OutlineThickness: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SecondTextureScale: 1
- _SecondTextureScale: 0.1
- _Smoothness: 0
- _Smoothness1: 0.5
- _SmoothnessTextureChannel: 0

- _ThirdTextureScale: 1
- _ThirdTextureScale: 0.1
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:

8
UOP1_Project/Assets/Art/Textures.meta


fileFormatVersion: 2
guid: 117a7d325f5202a41bdead09424049f5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1001
UOP1_Project/Assets/Shaders/SubGraphs/VertexColourTextureBlend.shadersubgraph
文件差异内容过多而无法显示
查看文件

526
UOP1_Project/Assets/Shaders/SubGraphs/XZ_WorldPos_AsUVs.shadersubgraph


{
"m_SGVersion": 2,
"m_Type": "UnityEditor.ShaderGraph.GraphData",
"m_ObjectId": "90963e34db5f4d7b90e4d605491594c4",
"m_Properties": [],
"m_Keywords": [],
"m_Nodes": [
{
"m_Id": "598c5dae9fd846549b73e57e4e8b1bf8"
},
{
"m_Id": "0d81b4d3b9c046a09567cdf9558c1f33"
},
{
"m_Id": "56cf72a079e1447a90c1f7721db7f732"
},
{
"m_Id": "193712e086ee47d095dd946670507fae"
}
],
"m_GroupDatas": [],
"m_StickyNoteDatas": [],
"m_Edges": [
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "0d81b4d3b9c046a09567cdf9558c1f33"
},
"m_SlotId": 1
},
"m_InputSlot": {
"m_Node": {
"m_Id": "56cf72a079e1447a90c1f7721db7f732"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "0d81b4d3b9c046a09567cdf9558c1f33"
},
"m_SlotId": 3
},
"m_InputSlot": {
"m_Node": {
"m_Id": "56cf72a079e1447a90c1f7721db7f732"
},
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "193712e086ee47d095dd946670507fae"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "0d81b4d3b9c046a09567cdf9558c1f33"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "56cf72a079e1447a90c1f7721db7f732"
},
"m_SlotId": 6
},
"m_InputSlot": {
"m_Node": {
"m_Id": "598c5dae9fd846549b73e57e4e8b1bf8"
},
"m_SlotId": 1
}
}
],
"m_VertexContext": {
"m_Position": {
"x": 0.0,
"y": 0.0
},
"m_Blocks": []
},
"m_FragmentContext": {
"m_Position": {
"x": 0.0,
"y": 0.0
},
"m_Blocks": []
},
"m_PreviewData": {
"serializedMesh": {
"m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
"m_Guid": ""
}
},
"m_Path": "Sub Graphs",
"m_ConcretePrecision": 0,
"m_PreviewMode": 2,
"m_OutputNode": {
"m_Id": "598c5dae9fd846549b73e57e4e8b1bf8"
},
"m_ActiveTargets": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SplitNode",
"m_ObjectId": "0d81b4d3b9c046a09567cdf9558c1f33",
"m_Group": {
"m_Id": ""
},
"m_Name": "Split",
"m_DrawState": {
"m_Expanded": false,
"m_Position": {
"serializedVersion": "2",
"x": -38.4000244140625,
"y": -58.0,
"width": 119.2000732421875,
"height": 100.80000305175781
}
},
"m_Slots": [
{
"m_Id": "252a6a9cbd5a4d9185b13b67a4834049"
},
{
"m_Id": "6a00efc24e2345bbaac49d70bc2d986b"
},
{
"m_Id": "ae6a4a0152164061bfbb0e07293817be"
},
{
"m_Id": "98835ed675e0477ab0fc3a38781c3172"
},
{
"m_Id": "44fbbf97264f456ea164652fa728c538"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "18aaca7aa814464c9f5aed91cdb5889c",
"m_Id": 0,
"m_DisplayName": "R",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "R",
"m_StageCapability": 3,
"m_Value": 0.0,
"m_DefaultValue": 0.0,
"m_Labels": []
}
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.PositionNode",
"m_ObjectId": "193712e086ee47d095dd946670507fae",
"m_Group": {
"m_Id": ""
},
"m_Name": "Position",
"m_DrawState": {
"m_Expanded": false,
"m_Position": {
"serializedVersion": "2",
"x": -270.4000244140625,
"y": -58.0,
"width": 205.5999755859375,
"height": 131.1999969482422
}
},
"m_Slots": [
{
"m_Id": "9baf72ed353049c4a31f7869cf373dad"
}
],
"synonyms": [],
"m_Precision": 1,
"m_PreviewExpanded": false,
"m_PreviewMode": 2,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Space": 4
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "252a6a9cbd5a4d9185b13b67a4834049",
"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": 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": "3eee1fb3e0e44f079c808b608a2bfe4c",
"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.Vector1MaterialSlot",
"m_ObjectId": "44fbbf97264f456ea164652fa728c538",
"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.Vector3MaterialSlot",
"m_ObjectId": "4be71c4d420c4e4090d6a9b068d33ac9",
"m_Id": 5,
"m_DisplayName": "RGB",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "RGB",
"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.CombineNode",
"m_ObjectId": "56cf72a079e1447a90c1f7721db7f732",
"m_Group": {
"m_Id": ""
},
"m_Name": "Combine",
"m_DrawState": {
"m_Expanded": false,
"m_Position": {
"serializedVersion": "2",
"x": 104.800048828125,
"y": -58.0,
"width": 125.59998321533203,
"height": 118.39999389648438
}
},
"m_Slots": [
{
"m_Id": "18aaca7aa814464c9f5aed91cdb5889c"
},
{
"m_Id": "7385b7d8eead47378f6a320eb1f2b460"
},
{
"m_Id": "3eee1fb3e0e44f079c808b608a2bfe4c"
},
{
"m_Id": "e19315f6b51648f795827fa51523ccce"
},
{
"m_Id": "8940ccc311b749dfbc384b64b84d02c7"
},
{
"m_Id": "4be71c4d420c4e4090d6a9b068d33ac9"
},
{
"m_Id": "6188eb7de1f145caabd612c3c8d49248"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode",
"m_ObjectId": "598c5dae9fd846549b73e57e4e8b1bf8",
"m_Group": {
"m_Id": ""
},
"m_Name": "Output",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 367.60009765625,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "f9f97b12030f4b0db28ad30169212ce7"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"IsFirstSlotValid": true
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
"m_ObjectId": "6188eb7de1f145caabd612c3c8d49248",
"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_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "6a00efc24e2345bbaac49d70bc2d986b",
"m_Id": 1,
"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_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "7385b7d8eead47378f6a320eb1f2b460",
"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": "8940ccc311b749dfbc384b64b84d02c7",
"m_Id": 4,
"m_DisplayName": "RGBA",
"m_SlotType": 1,
"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_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "98835ed675e0477ab0fc3a38781c3172",
"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_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
"m_ObjectId": "9baf72ed353049c4a31f7869cf373dad",
"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.Vector1MaterialSlot",
"m_ObjectId": "ae6a4a0152164061bfbb0e07293817be",
"m_Id": 2,
"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": "e19315f6b51648f795827fa51523ccce",
"m_Id": 3,
"m_DisplayName": "A",
"m_SlotType": 0,
"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.Vector2MaterialSlot",
"m_ObjectId": "f9f97b12030f4b0db28ad30169212ce7",
"m_Id": 1,
"m_DisplayName": "Out_Vector2",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "OutVector2",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0
},
"m_Labels": []
}

10
UOP1_Project/Assets/Shaders/SubGraphs/XZ_WorldPos_AsUVs.shadersubgraph.meta


fileFormatVersion: 2
guid: 6e150aabac8801641b297874cacfcd7c
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}

1001
UOP1_Project/Assets/Shaders/Toon_Ground_VertexColour.shadergraph
文件差异内容过多而无法显示
查看文件

463
UOP1_Project/Assets/Art/Textures/PerlinNoise.png

之前 之后
宽度: 512  |  高度: 512  |  大小: 122 KiB

92
UOP1_Project/Assets/Art/Textures/PerlinNoise.png.meta


fileFormatVersion: 2
guid: 1198d0d0538c98743b1e14694580a2c4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
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: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

286
UOP1_Project/Assets/Art/Textures/SimplexNoise.png

之前 之后
宽度: 512  |  高度: 512  |  大小: 79 KiB

92
UOP1_Project/Assets/Art/Textures/SimplexNoise.png.meta


fileFormatVersion: 2
guid: e11d5218a0f9cb448b20a4dd10a50cf1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
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: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

1001
UOP1_Project/Assets/Shaders/SubGraphs/Ground.shadersubgraph
文件差异内容过多而无法显示
查看文件

1001
UOP1_Project/Assets/Shaders/Toon_Ground.shadergraph
文件差异内容过多而无法显示
查看文件

/UOP1_Project/Assets/Shaders/SubGraphs/Ground.shadersubgraph.meta → /UOP1_Project/Assets/Shaders/SubGraphs/VertexColourTextureBlend.shadersubgraph.meta

/UOP1_Project/Assets/Shaders/Toon_Ground.shadergraph.meta → /UOP1_Project/Assets/Shaders/Toon_Ground_VertexColour.shadergraph.meta

正在加载...
取消
保存