浏览代码
Merge pull request #297 from EvgeniiG/upstream
Merge pull request #297 from EvgeniiG/upstream
Merge branch 'upstream/Update-SSS' into upstream (without the reference mode)/RenderPassXR_Sandbox
GitHub
8 年前
当前提交
17c2ab06
共有 17 个文件被更改，包括 767 次插入 和 409 次删除
-
158Assets/GraphicsTests/RenderPipeline/HDRenderPipeline/SSSProfile/White furnace SSS 0.asset
-
158Assets/GraphicsTests/RenderPipeline/HDRenderPipeline/SSSProfile/White furnace SSS 1.asset
-
158Assets/GraphicsTests/RenderPipeline/HDRenderPipeline/SSSProfile/White furnace SSS 2.asset
-
158Assets/GraphicsTests/RenderPipeline/HDRenderPipeline/SSSProfile/White furnace SSS 3.asset
-
4Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
-
4Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/Deferred.shader
-
10Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Resources/CombineSubsurfaceScattering.shader
-
164Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/SSSProfile/SkinSSSProfile.asset
-
1Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/SubsurfaceScatteringProfile.cs
-
5Assets/ScriptableRenderPipeline/HDRenderPipeline/SceneSettings/Resources/DrawSssProfile.shader
-
2Assets/TestScenes/HDTest/GraphicTest/SSS/Materials/SSSHead.mat
-
100Assets/GraphicsTests/RenderPipeline/HDRenderPipeline/SSSProfile/Skin1 SSS Profile.asset
-
9Assets/GraphicsTests/RenderPipeline/HDRenderPipeline/SSSProfile/Skin1 SSS Profile.asset.meta
-
116Assets/GraphicsTests/RenderPipeline/HDRenderPipeline/SSSProfile/Skin2 SSS Profile.asset
-
9Assets/GraphicsTests/RenderPipeline/HDRenderPipeline/SSSProfile/Skin2 SSS Profile.asset.meta
-
120Assets/TestScenes/HDTest/GraphicTest/SSS/perry_normal.png.meta
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &11400000 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 0 |
|||
m_PrefabParentObject: {fileID: 0} |
|||
m_PrefabInternal: {fileID: 0} |
|||
m_GameObject: {fileID: 0} |
|||
m_Enabled: 1 |
|||
m_EditorHideFlags: 0 |
|||
m_Script: {fileID: 11500000, guid: a6e7465350bf0d248b4799d98e18cd24, type: 3} |
|||
m_Name: Skin1 SSS Profile |
|||
m_EditorClassIdentifier: |
|||
scatteringDistance: {r: 1.0448, g: 0.390174, b: 0.185954, a: 1} |
|||
transmissionTint: {r: 1, g: 1, b: 1, a: 1} |
|||
texturingMode: 0 |
|||
transmissionMode: 0 |
|||
thicknessRemap: {x: 0, y: 5} |
|||
worldScale: 1 |
|||
settingsIndex: 7 |
|||
m_ShapeParam: {x: 0.95712, y: 2.56296, z: 5.37767} |
|||
m_MaxRadius: 11.1595335 |
|||
m_FilterKernelNearField: |
|||
- {x: 0, y: 2} |
|||
- {x: 0.0368107, y: 2.0495338} |
|||
- {x: 0.07454177, y: 2.1012514} |
|||
- {x: 0.1132339, y: 2.155288} |
|||
- {x: 0.15293084, y: 2.2117906} |
|||
- {x: 0.19367853, y: 2.270917} |
|||
- {x: 0.23552656, y: 2.3328397} |
|||
- {x: 0.27852717, y: 2.397744} |
|||
- {x: 0.3227365, y: 2.4658322} |
|||
- {x: 0.36821437, y: 2.5373237} |
|||
- {x: 0.4150249, y: 2.612458} |
|||
- {x: 0.46323648, y: 2.6914957} |
|||
- {x: 0.5129228, y: 2.7747211} |
|||
- {x: 0.56416285, y: 2.8624468} |
|||
- {x: 0.61704105, y: 2.9550135} |
|||
- {x: 0.67164934, y: 3.0527968} |
|||
- {x: 0.728086, y: 3.15621} |
|||
- {x: 0.7864576, y: 3.2657087} |
|||
- {x: 0.846879, y: 3.3817954} |
|||
- {x: 0.9094753, y: 3.5050287} |
|||
- {x: 0.97438145, y: 3.6360261} |
|||
- {x: 1.0417455, y: 3.77548} |
|||
- {x: 1.1117276, y: 3.924159} |
|||
- {x: 1.1845033, y: 4.082926} |
|||
- {x: 1.2602648, y: 4.2527504} |
|||
- {x: 1.3392224, y: 4.434726} |
|||
- {x: 1.4216086, y: 4.6300907} |
|||
- {x: 1.5076787, y: 4.8402505} |
|||
- {x: 1.597717, y: 5.066814} |
|||
- {x: 1.6920372, y: 5.311621} |
|||
- {x: 1.79099, y: 5.576799} |
|||
- {x: 1.8949682, y: 5.8648133} |
|||
- {x: 2.004412, y: 6.1785398} |
|||
- {x: 2.1198184, y: 6.5213594} |
|||
- {x: 2.2417529, y: 6.897278} |
|||
- {x: 2.3708582, y: 7.3110695} |
|||
- {x: 2.507874, y: 7.7684956} |
|||
- {x: 2.6536553, y: 8.276559} |
|||
- {x: 2.8091986, y: 8.843883} |
|||
- {x: 2.9756749, y: 9.481201} |
|||
- {x: 3.1544747, y: 10.202079} |
|||
- {x: 3.3472705, y: 11.023917} |
|||
- {x: 3.5560925, y: 11.969418} |
|||
- {x: 3.7834525, y: 13.068829} |
|||
- {x: 4.032501, y: 14.363341} |
|||
- {x: 4.3072834, y: 15.910629} |
|||
- {x: 4.6130986, y: 17.793922} |
|||
- {x: 4.9571137, y: 20.138123} |
|||
- {x: 5.349353, y: 23.139519} |
|||
- {x: 5.8044677, y: 27.12527} |
|||
- {x: 6.345154, y: 32.684456} |
|||
- {x: 7.0093994, y: 40.995384} |
|||
- {x: 7.868383, y: 54.807762} |
|||
- {x: 9.081854, y: 82.37109} |
|||
- {x: 11.1595335, y: 164.93503} |
|||
m_FilterKernelFarField: |
|||
- {x: 0, y: 2} |
|||
- {x: 0.098377995, y: 2.1344202} |
|||
- {x: 0.20354068, y: 2.2854002} |
|||
- {x: 0.31634468, y: 2.455902} |
|||
- {x: 0.43780366, y: 2.6495914} |
|||
- {x: 0.56912684, y: 2.8710482} |
|||
- {x: 0.7117688, y: 3.1260638} |
|||
- {x: 0.86749625, y: 3.4220495} |
|||
- {x: 1.0384798, y: 3.7686365} |
|||
- {x: 1.227417, y: 4.1785474} |
|||
- {x: 1.4377106, y: 4.6689343} |
|||
- {x: 1.6737257, y: 5.2634907} |
|||
- {x: 1.941176, y: 5.995936} |
|||
- {x: 2.2477326, y: 6.916082} |
|||
- {x: 2.60403, y: 8.101087} |
|||
- {x: 3.0254362, y: 9.677963} |
|||
- {x: 3.5354505, y: 11.873286} |
|||
- {x: 4.1729255, y: 15.137774} |
|||
- {x: 5.0099154, y: 20.520834} |
|||
- {x: 6.206992, y: 31.170212} |
|||
- {x: 8.27454, y: 62.831852} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: b378ec8b14e770f48a085d537053adfe |
|||
timeCreated: 1497139184 |
|||
licenseType: Pro |
|||
NativeFormatImporter: |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &11400000 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 0 |
|||
m_PrefabParentObject: {fileID: 0} |
|||
m_PrefabInternal: {fileID: 0} |
|||
m_GameObject: {fileID: 0} |
|||
m_Enabled: 1 |
|||
m_EditorHideFlags: 0 |
|||
m_Script: {fileID: 11500000, guid: a6e7465350bf0d248b4799d98e18cd24, type: 3} |
|||
m_Name: Skin2 SSS Profile |
|||
m_EditorClassIdentifier: |
|||
scatteringDistance: {r: 1.0448, g: 0.390174, b: 0.185954, a: 1} |
|||
transmissionTint: {r: 1, g: 1, b: 1, a: 1} |
|||
texturingMode: 0 |
|||
transmissionMode: 0 |
|||
thicknessRemap: {x: 0, y: 5} |
|||
worldScale: 1 |
|||
settingsIndex: 7 |
|||
m_ShapeParam: {x: 0.95712, y: 2.56296, z: 5.37767} |
|||
m_MaxRadius: 11.1595335 |
|||
m_FilterKernelNearField: |
|||
- {x: 0, y: 2} |
|||
- {x: 0.0368107, y: 2.0495338} |
|||
- {x: 0.07454177, y: 2.1012514} |
|||
- {x: 0.1132339, y: 2.155288} |
|||
- {x: 0.15293084, y: 2.2117906} |
|||
- {x: 0.19367853, y: 2.270917} |
|||
- {x: 0.23552656, y: 2.3328397} |
|||
- {x: 0.27852717, y: 2.397744} |
|||
- {x: 0.3227365, y: 2.4658322} |
|||
- {x: 0.36821437, y: 2.5373237} |
|||
- {x: 0.4150249, y: 2.612458} |
|||
- {x: 0.46323648, y: 2.6914957} |
|||
- {x: 0.5129228, y: 2.7747211} |
|||
- {x: 0.56416285, y: 2.8624468} |
|||
- {x: 0.61704105, y: 2.9550135} |
|||
- {x: 0.67164934, y: 3.0527968} |
|||
- {x: 0.728086, y: 3.15621} |
|||
- {x: 0.7864576, y: 3.2657087} |
|||
- {x: 0.846879, y: 3.3817954} |
|||
- {x: 0.9094753, y: 3.5050287} |
|||
- {x: 0.97438145, y: 3.6360261} |
|||
- {x: 1.0417455, y: 3.77548} |
|||
- {x: 1.1117276, y: 3.924159} |
|||
- {x: 1.1845033, y: 4.082926} |
|||
- {x: 1.2602648, y: 4.2527504} |
|||
- {x: 1.3392224, y: 4.434726} |
|||
- {x: 1.4216086, y: 4.6300907} |
|||
- {x: 1.5076787, y: 4.8402505} |
|||
- {x: 1.597717, y: 5.066814} |
|||
- {x: 1.6920372, y: 5.311621} |
|||
- {x: 1.79099, y: 5.576799} |
|||
- {x: 1.8949682, y: 5.8648133} |
|||
- {x: 2.004412, y: 6.1785398} |
|||
- {x: 2.1198184, y: 6.5213594} |
|||
- {x: 2.2417529, y: 6.897278} |
|||
- {x: 2.3708582, y: 7.3110695} |
|||
- {x: 2.507874, y: 7.7684956} |
|||
- {x: 2.6536553, y: 8.276559} |
|||
- {x: 2.8091986, y: 8.843883} |
|||
- {x: 2.9756749, y: 9.481201} |
|||
- {x: 3.1544747, y: 10.202079} |
|||
- {x: 3.3472705, y: 11.023917} |
|||
- {x: 3.5560925, y: 11.969418} |
|||
- {x: 3.7834525, y: 13.068829} |
|||
- {x: 4.032501, y: 14.363341} |
|||
- {x: 4.3072834, y: 15.910629} |
|||
- {x: 4.6130986, y: 17.793922} |
|||
- {x: 4.9571137, y: 20.138123} |
|||
- {x: 5.349353, y: 23.139519} |
|||
- {x: 5.8044677, y: 27.12527} |
|||
- {x: 6.345154, y: 32.684456} |
|||
- {x: 7.0093994, y: 40.995384} |
|||
- {x: 7.868383, y: 54.807762} |
|||
- {x: 9.081854, y: 82.37109} |
|||
- {x: 11.1595335, y: 164.93503} |
|||
m_FilterKernelFarField: |
|||
- {x: 0, y: 2} |
|||
- {x: 0.098377995, y: 2.1344202} |
|||
- {x: 0.20354068, y: 2.2854002} |
|||
- {x: 0.31634468, y: 2.455902} |
|||
- {x: 0.43780366, y: 2.6495914} |
|||
- {x: 0.56912684, y: 2.8710482} |
|||
- {x: 0.7117688, y: 3.1260638} |
|||
- {x: 0.86749625, y: 3.4220495} |
|||
- {x: 1.0384798, y: 3.7686365} |
|||
- {x: 1.227417, y: 4.1785474} |
|||
- {x: 1.4377106, y: 4.6689343} |
|||
- {x: 1.6737257, y: 5.2634907} |
|||
- {x: 1.941176, y: 5.995936} |
|||
- {x: 2.2477326, y: 6.916082} |
|||
- {x: 2.60403, y: 8.101087} |
|||
- {x: 3.0254362, y: 9.677963} |
|||
- {x: 3.5354505, y: 11.873286} |
|||
- {x: 4.1729255, y: 15.137774} |
|||
- {x: 5.0099154, y: 20.520834} |
|||
- {x: 6.206992, y: 31.170212} |
|||
- {x: 8.27454, y: 62.831852} |
|||
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0} |
|||
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0} |
|||
lerpWeight: 1 |
|||
m_HalfRcpWeightedVariances: {x: 2, y: 2, z: 2, w: 2} |
|||
m_FilterKernelBasic: |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.000000054310398} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.12646659} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.26200095} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.42072836} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.64086443} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -1.5452611} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 0.12646668} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 0.26200095} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 0.42072836} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 0.64086443} |
|||
- {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 1.545263} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 02c3836a8d1b4544a97f00fa528bb487 |
|||
timeCreated: 1497139184 |
|||
licenseType: Pro |
|||
NativeFormatImporter: |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 1394e1f9623277f4a896da13c142cf51 |
|||
timeCreated: 1497214968 |
|||
licenseType: Pro |
|||
TextureImporter: |
|||
fileIDToRecycleName: {} |
|||
serializedVersion: 4 |
|||
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 |
|||
grayScaleToAlpha: 0 |
|||
generateCubemap: 6 |
|||
cubemapConvolution: 0 |
|||
seamlessCubemap: 0 |
|||
textureFormat: 1 |
|||
maxTextureSize: 2048 |
|||
textureSettings: |
|||
serializedVersion: 2 |
|||
filterMode: -1 |
|||
aniso: -1 |
|||
mipBias: -1 |
|||
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} |
|||
spriteBorder: {x: 0, y: 0, z: 0, w: 0} |
|||
spritePixelsToUnits: 100 |
|||
alphaUsage: 1 |
|||
alphaIsTransparency: 0 |
|||
spriteTessellationDetail: -1 |
|||
textureType: 1 |
|||
textureShape: 1 |
|||
maxTextureSizeSet: 0 |
|||
compressionQualitySet: 0 |
|||
textureFormatSet: 0 |
|||
platformSettings: |
|||
- buildTarget: DefaultTexturePlatform |
|||
maxTextureSize: 2048 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: -1 |
|||
textureCompression: 2 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
- buildTarget: Standalone |
|||
maxTextureSize: 2048 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: -1 |
|||
textureCompression: 2 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
- buildTarget: iPhone |
|||
maxTextureSize: 2048 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: -1 |
|||
textureCompression: 2 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
- buildTarget: tvOS |
|||
maxTextureSize: 2048 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: -1 |
|||
textureCompression: 2 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
- buildTarget: Windows Store Apps |
|||
maxTextureSize: 2048 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: -1 |
|||
textureCompression: 2 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
- buildTarget: WebGL |
|||
maxTextureSize: 2048 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: -1 |
|||
textureCompression: 2 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
spriteSheet: |
|||
serializedVersion: 2 |
|||
sprites: [] |
|||
outline: [] |
|||
physicsShape: [] |
|||
spritePackingTag: |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue