浏览代码

Update test scene and UI

/Yibing-Project-2
sebastienlagarde 7 年前
当前提交
af7905e4
共有 16 个文件被更改,包括 46 次插入19 次删除
  1. 6
      SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_Planar.mat
  2. 4
      SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_Red_0.3x6.mat
  3. 4
      SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Add.mat
  4. 4
      SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Add_NoFog.mat
  5. 4
      SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Alpha.mat
  6. 4
      SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Multiply.mat
  7. 6
      SampleScenes/HDTest/SkyFogTest/Lit_Transparent_PreMultipliedAlpha.mat
  8. 4
      SampleScenes/HDTest/SkyFogTest/Rough_Refraction_Transparent.mat
  9. 6
      SampleScenes/HDTest/SkyFogTest/Rough_Refraction_Transparent_No_Fog.mat
  10. 3
      SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Add.mat
  11. 1
      SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Add_NoFog.mat
  12. 3
      SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Alpha.mat
  13. 3
      SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Multiply.mat
  14. 3
      SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_PreMultipliedAlpha.mat
  15. 6
      ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
  16. 4
      ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/DefaultHDMaterial.mat

6
SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_Planar.mat


m_PrefabInternal: {fileID: 0}
m_Name: Grid_Planar
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _DOUBLESIDED_ON _ENABLE_TRANSPARENT_FOG
_MAPPING_TRIPLANAR _NORMALMAP_TANGENT_SPACE
m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DOUBLESIDED_ON _MAPPING_TRIPLANAR
_NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

4
SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_Red_0.3x6.mat


m_PrefabInternal: {fileID: 0}
m_Name: Grid_Red_0.3x6
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _ENABLE_TRANSPARENT_FOG _NORMALMAP_TANGENT_SPACE
m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

4
SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Add.mat


m_PrefabInternal: {fileID: 0}
m_Name: Lit_Transparent_Add
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _BLENDMODE_ADD _ENABLE_TRANSPARENT_FOG
m_ShaderKeywords: _BLENDMODE_ADD _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
_NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

4
SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Add_NoFog.mat


m_PrefabInternal: {fileID: 0}
m_Name: Lit_Transparent_Add_NoFog
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _BLENDMODE_ADD _ENABLETRANSPARENTFOG_OFF
m_ShaderKeywords: _BLENDMODE_ADD _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLEFOGONTRANSPARENT_OFF
_NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 0
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 0

4
SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Alpha.mat


m_PrefabInternal: {fileID: 0}
m_Name: Lit_Transparent_Alpha
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _BLENDMODE_ALPHA _ENABLE_TRANSPARENT_FOG
m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
_NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

4
SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Multiply.mat


m_PrefabInternal: {fileID: 0}
m_Name: Lit_Transparent_Multiply
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _BLENDMODE_MULTIPLY _ENABLE_TRANSPARENT_FOG
m_ShaderKeywords: _BLENDMODE_MULTIPLY _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
_NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

6
SampleScenes/HDTest/SkyFogTest/Lit_Transparent_PreMultipliedAlpha.mat


m_PrefabInternal: {fileID: 0}
m_Name: Lit_Transparent_PreMultipliedAlpha
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _BLENDMODE_PRE_MULTIPLY _ENABLE_TRANSPARENT_FOG
_NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _BLENDMODE_PRE_MULTIPLY
_ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

4
SampleScenes/HDTest/SkyFogTest/Rough_Refraction_Transparent.mat


m_PrefabInternal: {fileID: 0}
m_Name: Rough_Refraction_Transparent
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _BLENDMODE_ALPHA _ENABLE_TRANSPARENT_FOG
m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
_NORMALMAP_TANGENT_SPACE _REFRACTION_THICKPLANE _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

6
SampleScenes/HDTest/SkyFogTest/Rough_Refraction_Transparent_No_Fog.mat


m_PrefabInternal: {fileID: 0}
m_Name: Rough_Refraction_Transparent_No_Fog
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _BLENDMODE_ALPHA _NORMALMAP_TANGENT_SPACE
_REFRACTION_THICKPLANE _SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLEFOGONTRANSPARENT_OFF
_NORMALMAP_TANGENT_SPACE _REFRACTION_THICKPLANE _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 0
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 0

3
SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Add.mat


m_PrefabInternal: {fileID: 0}
m_Name: Unlit_Transparent_Add
m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
m_ShaderKeywords: _BLENDMODE_ADD _ENABLE_TRANSPARENT_FOG _SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _BLENDMODE_ADD _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableFog: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

1
SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Add_NoFog.mat


- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableFog: 0
- _EnableFogOnTransparent: 0
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 0

3
SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Alpha.mat


m_PrefabInternal: {fileID: 0}
m_Name: Unlit_Transparent_Alpha
m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
m_ShaderKeywords: _BLENDMODE_ALPHA _ENABLE_TRANSPARENT_FOG _SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _BLENDMODE_ALPHA _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableFog: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

3
SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Multiply.mat


m_PrefabInternal: {fileID: 0}
m_Name: Unlit_Transparent_Multiply
m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
m_ShaderKeywords: _BLENDMODE_MULTIPLY _ENABLE_TRANSPARENT_FOG _SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _BLENDMODE_MULTIPLY _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableFog: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

3
SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_PreMultipliedAlpha.mat


m_PrefabInternal: {fileID: 0}
m_Name: Unlit_Transparent_PreMultipliedAlpha
m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
m_ShaderKeywords: _BLENDMODE_PRE_MULTIPLY _ENABLE_TRANSPARENT_FOG _SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _BLENDMODE_PRE_MULTIPLY _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableFog: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

6
ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs


public static string InputsText = "Inputs";
public static GUIContent baseColorText = new GUIContent("Base Color + Opacity", "Albedo (RGB) and Opacity (A)");
public static GUIContent baseColorSmoothnessText = new GUIContent("Base Color + Smoothness", "Albedo (RGB) and Smoothness (A)");
public static GUIContent baseColorRefractionMaskText = new GUIContent("Base Color + RefractionMask", "Albedo (RGB) and Refraction mask (A)");
public static GUIContent smoothnessMapChannelText = new GUIContent("Smoothness Source", "Smoothness texture and channel");
public static GUIContent metallicText = new GUIContent("Metallic", "Metallic scale factor");

EditorGUI.indentLevel++;
m_MaterialEditor.TexturePropertySingleLine(Styles.baseColorText, baseColorMap[layerIndex], baseColor[layerIndex]);
bool refractionEnable = refractionMode.floatValue > 0.0f && preRefractionPass.floatValue == 0.0f;
m_MaterialEditor.TexturePropertySingleLine(refractionEnable ? Styles.baseColorRefractionMaskText : Styles.baseColorText, baseColorMap[layerIndex], baseColor[layerIndex]);
if ( materialID == null || // Will be the case for Layered materials where we only support standard and the parameter does not exist
(Lit.MaterialId)materialID.floatValue == Lit.MaterialId.LitStandard || (Lit.MaterialId)materialID.floatValue == Lit.MaterialId.LitAniso)

4
ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/DefaultHDMaterial.mat


m_PrefabInternal: {fileID: 0}
m_Name: DefaultHDMaterial
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ACCURATE_LIGHTING _ENABLE_TRANSPARENT_FOG _NORMALMAP_TANGENT_SPACE
m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _EnableBlendModeAccurateLighting: 1
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnablePerPixelDisplacement: 0
- _EnableSpecularOcclusion: 0
- _EnableTransparentFog: 1

正在加载...
取消
保存