浏览代码

PR Ground Shader

Several updates to address odd visual artifacts on texture edges.

Use maximum instead of add, only one noise channel, multiply and clamp vertex color.
/devlogs-3-input
Dane Byrd 3 年前
当前提交
9bcf2bfc
共有 9 个文件被更改,包括 1313 次插入253 次删除
  1. 26
      UOP1_Project/Assets/Ground Shader Test/Ground Shader Test.mat
  2. 138
      UOP1_Project/Assets/Ground Shader Test/Toon_Ground.shadergraph
  3. 325
      UOP1_Project/Assets/Shaders/SubGraphs/Ground.shadersubgraph
  4. 144
      UOP1_Project/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph
  5. 463
      UOP1_Project/Assets/Ground Shader Test/PerlinNoise.png
  6. 92
      UOP1_Project/Assets/Ground Shader Test/PerlinNoise.png.meta
  7. 286
      UOP1_Project/Assets/Ground Shader Test/SimplexNoise.png
  8. 92
      UOP1_Project/Assets/Ground Shader Test/SimplexNoise.png.meta

26
UOP1_Project/Assets/Ground Shader Test/Ground Shader Test.mat


m_Name: Ground Shader Test
m_Shader: {fileID: -6465566751694194690, guid: 189926528b3c623439062b1257f63248,
type: 3}
m_ShaderKeywords: BOOLEAN_DEBUG_VERTEX_COLOR_ON
m_ShaderKeywords: BOOLEAN_DEBUG_VERTEX_COLOR_ON _DEBUG_VERTEX_COLOR_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTexture:
m_Texture: {fileID: 2800000, guid: 96ab8aaf88568ee4794911ece12a8fdb, type: 3}
m_Texture: {fileID: 2800000, guid: e11d5218a0f9cb448b20a4dd10a50cf1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:

- _SecondTexture:
m_Texture: {fileID: 2800000, guid: cc83e3fb0ff712f4aa2bca127f6def52, type: 3}
m_Texture: {fileID: 2800000, guid: ec2fb5adbeccb9b439efa9d7af165ef8, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:

- _ThirdTexture:
m_Texture: {fileID: 2800000, guid: ec2fb5adbeccb9b439efa9d7af165ef8, type: 3}
m_Texture: {fileID: 2800000, guid: cc83e3fb0ff712f4aa2bca127f6def52, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ToonShading_4BDB5446_Texture2D75C45C06_1004932281:

m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ToonShading_DA1DB061_Texture2D75C45C06_1004932281:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Triplanar_422AA52B_Texture_1:
m_Texture: {fileID: 2800000, guid: 151291731a3e75844bc6112551a3d7d7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Triplanar_72076AC2_Texture_1:
m_Texture: {fileID: 2800000, guid: 1198d0d0538c98743b1e14694580a2c4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- LIGHTMAP: 0
- _AlphaClip: 0
- _BOOLEAN_DEBUG_VERTEX_COLOR: 0
- _Blend: 0

- _DEBUG_VERTEX_COLOR: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _FourthTextureScale: 0.2

- _MainTextureScale: 0.2
- _Metallic: 0
- _NoiseScale: 0.2
- _NoiseScale: 0.5
- _OcclusionStrength: 1
- _QueueOffset: 0
- _ReceiveShadows: 1

- _ZWrite: 1
m_Colors:
- Color_C05E8F5A: {r: 0, g: 0, b: 1, a: 1}
- Vector3_A60AD52C: {r: 0, g: 0, b: 0, a: 0}
- _VertexColor_ChannelMixer: {r: 1, g: 1, b: 1, a: 0}

138
UOP1_Project/Assets/Ground Shader Test/Toon_Ground.shadergraph
文件差异内容过多而无法显示
查看文件

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

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

463
UOP1_Project/Assets/Ground Shader Test/PerlinNoise.png

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

92
UOP1_Project/Assets/Ground Shader Test/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/Ground Shader Test/SimplexNoise.png

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

92
UOP1_Project/Assets/Ground Shader Test/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:

部分文件因为文件数量过多而无法显示

正在加载...
取消
保存