Skip to content

[HDRP][Template] Normals fix #3006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 7, 2021
Merged

[HDRP][Template] Normals fix #3006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
075f68c
[CI] Updated pinned editor versions
Dec 25, 2020
39ef4bf
Merge branch 'master' into ci/editor-pinning
Dec 26, 2020
a1765fb
Merge branch 'master' into ci/editor-pinning
Dec 27, 2020
8a7bb47
fixed normals, rebaked lighting, added Receive SSR/SSGI for "Wood Cou…
Jan 6, 2021
62233e9
rebaked (removed plant pots from GI), enabled Receive SSR/SSGI on mor…
pierre-unity Jan 6, 2021
4a64c2f
enable ssr/ssgi on brass material
pierre-unity Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions com.unity.template-hd/Assets/Art/Materials/General/Aluminium_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Aluminium_Mat
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _DISABLE_SSR _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT
_MATERIAL_FEATURE_IRIDESCENCE _NORMALMAP _NORMALMAP_TANGENT_SPACE
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _MATERIAL_FEATURE_IRIDESCENCE
_NORMALMAP _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -122,6 +122,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down Expand Up @@ -211,7 +212,7 @@ Material:
- _PPDPrimitiveWidth: 1
- _PreRefractionPass: 0
- _RayTracing: 0
- _ReceivesSSR: 0
- _ReceivesSSR: 1
- _ReceivesSSRTransparent: 0
- _RefractionMode: 0
- _RefractionModel: 0
Expand All @@ -226,10 +227,10 @@ Material:
- _SpecularOcclusionMode: 1
- _SrcBlend: 1
- _StencilRef: 0
- _StencilRefDepth: 0
- _StencilRefDepth: 8
- _StencilRefDistortionVec: 4
- _StencilRefGBuffer: 2
- _StencilRefMV: 32
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDistortionVec: 4
Expand Down
15 changes: 15 additions & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/Bamboo_A.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,19 @@ Material:
m_Texture: {fileID: 0}
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:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down Expand Up @@ -187,6 +200,8 @@ Material:
- _LinkDetailsWithBase: 1
- _MaterialID: 1
- _Metallic: 1
- _MetallicRemapMax: 1
- _MetallicRemapMin: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _OpaqueCullMode: 2
Expand Down
3 changes: 3 additions & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/Bamboo_Leaf_A.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down Expand Up @@ -215,6 +216,8 @@ Material:
- _LinkDetailsWithBase: 1
- _MaterialID: 0
- _Metallic: 1
- _MetallicRemapMax: 1
- _MetallicRemapMin: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _OpaqueCullMode: 2
Expand Down
15 changes: 8 additions & 7 deletions com.unity.template-hd/Assets/Art/Materials/General/Brass_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Brass_Mat
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _DISABLE_SSR _DISABLE_SSR_TRANSPARENT _DISPLACEMENT_LOCK_TILING_SCALE
_DOUBLESIDED_ON _MASKMAP _MATERIAL_FEATURE_CLEAR_COAT _MATERIAL_FEATURE_IRIDESCENCE
_NORMALMAP _NORMALMAP_TANGENT_SPACE _PIXEL_DISPLACEMENT _PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _DISPLACEMENT_LOCK_TILING_SCALE _DOUBLESIDED_ON
_MASKMAP _MATERIAL_FEATURE_CLEAR_COAT _MATERIAL_FEATURE_IRIDESCENCE _NORMALMAP
_NORMALMAP_TANGENT_SPACE _PIXEL_DISPLACEMENT _PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
Expand Down Expand Up @@ -123,6 +123,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down Expand Up @@ -212,7 +213,7 @@ Material:
- _PPDPrimitiveWidth: 1
- _PreRefractionPass: 0
- _RayTracing: 0
- _ReceivesSSR: 0
- _ReceivesSSR: 1
- _ReceivesSSRTransparent: 0
- _RefractionMode: 0
- _RefractionModel: 0
Expand All @@ -227,10 +228,10 @@ Material:
- _SpecularOcclusionMode: 1
- _SrcBlend: 1
- _StencilRef: 0
- _StencilRefDepth: 0
- _StencilRefDepth: 8
- _StencilRefDistortionVec: 4
- _StencilRefGBuffer: 2
- _StencilRefMV: 32
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDistortionVec: 4
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/Bush_01_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/Collision_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/ConcreteCyan_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/ConcreteHoles_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/ConcreteMatteGrey_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/ConcretePolished_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 0.99999994
- _AORemapMin: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/ConcreteRough_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
11 changes: 6 additions & 5 deletions com.unity.template-hd/Assets/Art/Materials/General/ConcreteSmooth_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: ConcreteSmooth_Mat
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _DISABLE_SSR _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down Expand Up @@ -216,7 +217,7 @@ Material:
- _PPDPrimitiveLength: 1
- _PPDPrimitiveWidth: 1
- _RayTracing: 0
- _ReceivesSSR: 0
- _ReceivesSSR: 1
- _ReceivesSSRTransparent: 0
- _RefractionModel: 0
- _SSRefractionProjectionModel: 0
Expand All @@ -228,10 +229,10 @@ Material:
- _SpecularOcclusionMode: 1
- _SrcBlend: 1
- _StencilRef: 0
- _StencilRefDepth: 0
- _StencilRefDepth: 8
- _StencilRefDistortionVec: 4
- _StencilRefGBuffer: 2
- _StencilRefMV: 32
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDistortionVec: 4
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/ConcreteTaupe_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
3 changes: 3 additions & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/DecalPuddle_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AO: 1
- _AORemapMax: 0
Expand Down Expand Up @@ -144,7 +145,9 @@ Material:
- _DecalColorMask3: 0
- _DecalLayerMaskFromDecal: 1
- _DecalMaskMapBlueScale: 1
- _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
- _DecalMeshViewBias: 0
- _DecalStencilRef: 16
- _DecalStencilWriteMask: 16
- _DepthOffsetEnable: 0
Expand Down
3 changes: 3 additions & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/DecalWear_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AO: 1
- _AORemapMax: 1
Expand Down Expand Up @@ -156,7 +157,9 @@ Material:
- _DecalColorMask2: 3
- _DecalColorMask3: 0
- _DecalMaskMapBlueScale: 1
- _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
- _DecalMeshViewBias: 0
- _DecalStencilRef: 16
- _DecalStencilWriteMask: 16
- _DepthOffsetEnable: 0
Expand Down
3 changes: 3 additions & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/Decal_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AO: 1
- _AORemapMax: 0
Expand Down Expand Up @@ -143,7 +144,9 @@ Material:
- _DecalColorMask3: 0
- _DecalLayerMaskFromDecal: 1
- _DecalMaskMapBlueScale: 1
- _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
- _DecalMeshViewBias: 0
- _DecalStencilRef: 16
- _DecalStencilWriteMask: 16
- _DepthOffsetEnable: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/EmissiveBulb_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/EmissiveStripLight_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/Fabric_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
1 change: 1 addition & 0 deletions com.unity.template-hd/Assets/Art/Materials/General/Fern_01_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
Expand Down
15 changes: 7 additions & 8 deletions com.unity.template-hd/Assets/Art/Materials/General/GlassDark_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: GlassDark_Mat
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
_DOUBLESIDED_ON _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE _REFRACTION_THIN
_SURFACE_TYPE_TRANSPARENT
m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DOUBLESIDED_ON
_ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE _REFRACTION_THIN _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
Expand All @@ -35,7 +34,6 @@ Material:
disabledShaderPasses:
- MOTIONVECTORS
- DistortionVectors
- TransparentDepthPrepass
- TransparentDepthPostpass
- RayTracingPrepass
m_SavedProperties:
Expand Down Expand Up @@ -141,6 +139,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Boolean_2C24E89C: 0
- Boolean_3C080546: 0
Expand Down Expand Up @@ -240,7 +239,7 @@ Material:
- _PPDPrimitiveWidth: 1
- _RayTracing: 0
- _ReceivesSSR: 1
- _ReceivesSSRTransparent: 0
- _ReceivesSSRTransparent: 1
- _RefractionModel: 3
- _RenderQueueType: 5
- _RequireSplitLighting: 0
Expand All @@ -253,10 +252,10 @@ Material:
- _SpecularOcclusionMode: 1
- _SrcBlend: 1
- _StencilRef: 0
- _StencilRefDepth: 0
- _StencilRefDepth: 8
- _StencilRefDistortionVec: 4
- _StencilRefGBuffer: 2
- _StencilRefMV: 32
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDistortionVec: 4
Expand Down
Loading