Skip to content

Commit ff8af16

Browse files
committed
Instanced Terrain
- Re enabled instanced terrain, allows offloading all terrain tools and rendering to the GPU. - Changed water terrain over to the new TransparentDiffuse Shader.
1 parent a16b133 commit ff8af16

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

Assets/Resources/Materials/Water.mat

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Water
11-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _GLOSSYREFLECTIONS_OFF _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
11+
m_Shader: {fileID: 4800000, guid: 663c5869691e3624391cd8cd28896134, type: 3}
12+
m_ShaderKeywords: _ALPHABLEND_ON _GLOSSYREFLECTIONS_OFF _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
1313
_SPECULARHIGHLIGHTS_OFF
1414
m_LightmapFlags: 4
1515
m_EnableInstancingVariants: 1
1616
m_DoubleSidedGI: 0
17-
m_CustomRenderQueue: 3000
18-
stringTagMap:
19-
RenderType: Transparent
17+
m_CustomRenderQueue: -1
18+
stringTagMap: {}
2019
disabledShaderPasses: []
2120
m_SavedProperties:
2221
serializedVersion: 3
@@ -74,13 +73,13 @@ Material:
7473
- _Glossiness: 0.5
7574
- _GlossyReflections: 0
7675
- _Metallic: 0
77-
- _Mode: 3
76+
- _Mode: 2
7877
- _OcclusionStrength: 1
7978
- _Parallax: 0.02
8079
- _Shininess: 0.05
8180
- _SmoothnessTextureChannel: 1
8281
- _SpecularHighlights: 0
83-
- _SrcBlend: 1
82+
- _SrcBlend: 5
8483
- _UVSec: 0
8584
- _ZWrite: 0
8685
m_Colors:

Assets/Resources/land.asset

257 KB
Binary file not shown.

Assets/Resources/water.asset

0 Bytes
Binary file not shown.

Assets/Scenes/Editor.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ Terrain:
496496
m_HeightmapMaximumLOD: 0
497497
m_ShadowCastingMode: 0
498498
m_DrawHeightmap: 1
499-
m_DrawInstanced: 0
499+
m_DrawInstanced: 1
500500
m_DrawTreesAndFoliage: 0
501501
m_ReflectionProbeUsage: 0
502502
m_MaterialTemplate: {fileID: 10650, guid: 0000000000000000f000000000000000, type: 0}
@@ -586,7 +586,7 @@ Terrain:
586586
m_HeightmapMaximumLOD: 0
587587
m_ShadowCastingMode: 0
588588
m_DrawHeightmap: 1
589-
m_DrawInstanced: 0
589+
m_DrawInstanced: 1
590590
m_DrawTreesAndFoliage: 0
591591
m_ReflectionProbeUsage: 0
592592
m_MaterialTemplate: {fileID: 2100000, guid: 49df9a9fa69740e4782b406d0c541009, type: 2}

0 commit comments

Comments
 (0)