diff --git a/Assets/Materials/Brushes/Fog Tint.mat b/Assets/Materials/Brushes/Fog Tint.mat index e8fb9d952..5bdd53629 100644 --- a/Assets/Materials/Brushes/Fog Tint.mat +++ b/Assets/Materials/Brushes/Fog Tint.mat @@ -70,7 +70,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _Phase: 0 - - _Power: 64 + - _Power: 16 - _SinePower: 1.25 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/Assets/Materials/Gas Giant.mat b/Assets/Materials/Gas Giant.mat index 2550f56ee..af91b1d97 100644 --- a/Assets/Materials/Gas Giant.mat +++ b/Assets/Materials/Gas Giant.mat @@ -73,13 +73,13 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DensityAlbedoExponent: 3 - - _DensityDepthExponent: 1.85 + - _DensityDepthExponent: 2 - _DepthBoost: 0.5 - _DepthBoostPower: 0.68 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EdgeTransparency: 1 - - _Emission: 100 + - _Emission: 50 - _EmissionFadePower: 2 - _FadePower: 1 - _FirstOffsetDepthExponent: 4 @@ -90,7 +90,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _LightingAmbient: 0.01 + - _LightingAmbient: 50 - _LightingPower: 8.158 - _LightingWrap: 1 - _LimbDarkening: 0.1 @@ -103,7 +103,7 @@ Material: - _OffsetDistance: 0.2 - _OffsetFadePower: -0.75 - _Parallax: 0.02 - - _RayStepSize: -0.00625 + - _RayStepSize: -0.003125 - _SecondOffsetDepthExponent: -2 - _SecondOffsetDistance: -0.05 - _SecondOffsetFadePower: -8 diff --git a/Assets/Materials/Planet.mat b/Assets/Materials/Planet.mat index 535e6b305..6bd7e6900 100644 --- a/Assets/Materials/Planet.mat +++ b/Assets/Materials/Planet.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Planet - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.331 - _GlossyReflections: 1 @@ -75,6 +82,7 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat index db78352ae..e9e86e3a2 100644 --- a/Assets/Materials/UI/Map Gravity Lines.mat +++ b/Assets/Materials/UI/Map Gravity Lines.mat @@ -86,7 +86,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Scale: 0.575 + - _Scale: 4.5182247 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v01.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v01.mat index 128366872..cb3fb3a40 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v01.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v01.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v01 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 670381f97d08b3f4d9e9e30ecd4f2297, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 9b1cf41ecaf631c41b6fbbab353f0f09, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2.0235295, g: 2.2117648, b: 4, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v02.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v02.mat index 9b94f649f..1587fbad5 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v02.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v02.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v02 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 89eaa42d785ac7047aabec294654cb65, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 9eb848f3a26faae4c9aebae76cd92c6c, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v03.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v03.mat index 200460a1d..0bf451bec 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v03.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v03.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v03 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 4bc01b9e4a9d55d48a9cc4cc9d8db96c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: c3b5f273773b30441aefdd8106bf2cc4, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v04.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v04.mat index 91098ab88..ad87f8438 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v04.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v04.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v04 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: b2d9f57a5763e584fabb1c1fd9c810fc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: e7a5d2d496bc41745b06a1c7997dc956, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.4790578, g: 1.5000007, b: 0.6986807, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v05.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v05.mat index b20e82468..1efc5a6ee 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v05.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v05.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v05 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 98cb5638b982d374d9ad9812db068dc1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 16673553f7652d04088975d4e89c582e, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v06.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v06.mat index 65b6d20bb..59d174738 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v06.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v06.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v06 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 50e8f4f4fa063084a88b02312dff885c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 8143f772a24c4e04b99294dea4e96caa, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v07.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v07.mat index a4fa77dbc..65f7f7130 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v07.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v07.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v07 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 564caa14610b15441bd1012770596625, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 5813220ada97bbd46aa00009aa3fe5e1, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v08.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v08.mat index 343d22a93..60880c269 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v08.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v08.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v08 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 2fe8a8862233b68408d6d057c05b4da3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 2bd0ce00a6fbe6d40b1027517b711925, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v09.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v09.mat index ebf47f99c..c9f06327f 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v09.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v09.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v09 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 50dcd3b31d2b9bd41becb7dbb6e10578, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 736c35cad1c98e343843958d464ff531, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.3764706, g: 0.4117647, b: 0.7490196, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v10.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v10.mat index 902c4026f..4eff102dc 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v10.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v10.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v10 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 13b64f9b55ce98543b78a9b6f21e15cb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 45c93a187b69e454babb5faa072ff2ee, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v11.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v11.mat index c1a2ab281..19dafdd03 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v11.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v11.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v11 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: e034df9c9d0902f43ac533a1f64a24e5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 498a311fa2241a34d9a7268abe490f18, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v12.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v12.mat index 586b0a413..c07576ef2 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v12.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v12.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v12 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 5c1ebf916768580428f85758697b2dbb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: addc9b1cc263d4147a85492b65383840, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v13.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v13.mat index 9069bdea7..336b1ab14 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v13.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v13.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v13 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: d318fb2ab7689aa46b3d4bf3c57e94cd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 2c75d4cd8b4dc4643a24658ff0b76b82, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v14.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v14.mat index b8180199f..c95ec48a2 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v14.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v14.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v14 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 2ef45f69b275ef442aa27cec0ca37c8b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 6f11a8478f1f4a344a3c726e5bd451da, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v15.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v15.mat index 091103a52..57568bc3f 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v15.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Huge_v15.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Huge_v15 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 222bd5ea092bc9a449e45a904d884a5e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 8fff35addacc4634b89c3d75999168d7, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v01.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v01.mat index e8d975070..520359688 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v01.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v01.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v01 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: bf5f0ff87688fd04387814d1c4142e17, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 39818e852b31426458c6b83c6c3fb402, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v02.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v02.mat index f8f84e953..8f0478361 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v02.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v02.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v02 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 4ec0666d45f899840967e9a0d97afd95, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: d75bd42c4d6e5374f826c79decc8ac1d, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v03.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v03.mat index c4c9f147c..c86e3986b 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v03.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v03.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v03 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 43a3623c8a1c9ad4095d66ce1f370623, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 9041ee3dcce8973489ed70e80f8bc09c, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v04.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v04.mat index 047f1c417..1afe1fef6 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v04.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v04.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v04 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 42eca62ccfc46334992dcb870302d0e6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: c35afc7b080721a46832f21c79ef0948, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v05.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v05.mat index 579077b99..7ae3eb716 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v05.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v05.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v05 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 2ae2181889a58cc42be75f12c0f8961b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: e09fbc5be392f1049b38bb940d600e80, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v06.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v06.mat index cfef4e50c..67ae3d318 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v06.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v06.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v06 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 6cc73b8d55353a7448f4e819fc5dd9d8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 9d6aca523f5fde84691e3987298d9644, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v07.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v07.mat index d273e1ddd..3aba075ca 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v07.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v07.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v07 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 2748762a1378a07408f090e3d76c7283, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: ac80bdccef3d82240ad7dc5b6a0effc7, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v08.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v08.mat index db59aa1b7..5790b336c 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v08.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v08.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v08 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: c6892a69fb781a0429ee470864b78ab5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 0712c6fbae5b0f2429873c5a864f7ccc, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v09.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v09.mat index a3b634485..271200930 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v09.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v09.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v09 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: f55dfacecf45e5b46a47eca4b8721c49, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 9fc2648a6cf672a41a6f4e6031ab976e, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v10.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v10.mat index 86734270a..8635bce2e 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v10.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v10.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v10 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 6a221c76022345d48a2e1983d9edbe2b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 4a4154141c9719b4880a40f73da6a86b, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v11.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v11.mat index 261699ba9..7efd3674a 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v11.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v11.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v11 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 23a639f98130fb9418e0d53974a3205e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 4888fb2c8daee1449adceb801340edb5, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v12.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v12.mat index a0dbbad31..ae8bbf5df 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v12.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v12.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v12 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 09dc335b8e25f54459d1d97df020eb49, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 09b1d4eb16450694291183395002d12c, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v13.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v13.mat index 33bed6c12..61dd2cba6 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v13.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v13.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v13 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: f8722d0b069328f4ea23b59845fa0943, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 5f59e2d1032105a4f8e321e6467c41c3, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v14.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v14.mat index 349bafb81..63665efc3 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v14.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v14.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v14 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 930276b3f87df3542a716b80c25a5ba9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: acf438ba234a9f3499133a97bb256429, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v15.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v15.mat index 79e02edf4..f1069667d 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v15.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Medium_v15.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Medium_v15 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 5a586b76c2da8db4cb2eed2acbf9f9ee, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: c624305cbfe3b244589d9a87b6be1a17, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v01.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v01.mat index a2c3a2d02..ea49eccb0 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v01.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v01.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v01 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: d9da3912e809644468ea0bd58e88b63b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: d0f6adb5d3b9a0942b8bc799fda0a392, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2.0026195, g: 2.1730552, b: 4.005239, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v02.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v02.mat index 12c8fb74a..d8e681342 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v02.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v02.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v02 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 81688986328c752498989cd460e5464f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 9133a5be13555404eacf5b6771a504fb, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v03.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v03.mat index 19243499f..a8b4fce73 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v03.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v03.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v03 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: de8c64863520ce2419db91c0438c7f04, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 9795aba7074ebc240acbe131b562f873, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v04.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v04.mat index 3ae7e2645..54fb1a8dc 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v04.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v04.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v04 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 0d7c692ec06ba264981671a41dd41713, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: c119536618e434c47ab9013082cb97ce, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v05.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v05.mat index 2db26c6bd..afd446925 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v05.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v05.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v05 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: fd32acf9cf7018b4d8d11591d6000947, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: b1aea75c23b5e914a8bff72440d0b11d, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v06.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v06.mat index be92197c9..9570f22fc 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v06.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v06.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v06 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: e42fc470f32d9a647a1ee853a97cc8b5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: c6cc35dec69c15f4eaeb2a67a981b7d2, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v07.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v07.mat index f26cc7b52..c062ec2d0 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v07.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v07.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v07 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 31a799f0dc7486c408a7af965a78ae69, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 45ac6d8570fc55346b0797456f31ecc1, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v08.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v08.mat index 8b84d486d..f683f0cc2 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v08.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v08.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v08 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 97ce814ca77c84944a33c60ef836aff3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 9502c0a5a2f8a3c4fbc49c21c5e4655e, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v09.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v09.mat index 9a68b9a87..76f33f158 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v09.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v09.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v09 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 09d7701929dfae447bcf3351907ee3d4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 39be0dc57070b4d4099883835d6a7b29, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v10.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v10.mat index 0eee68557..9a60ef6b0 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v10.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v10.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v10 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: a1e18a891afbed3459ef7269a8dd34ce, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: a7a256d6f018ba5478d70244cc08aace, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v11.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v11.mat index 0e0b5cf90..0983389ae 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v11.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v11.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v11 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 490b267ef18e76940bde90a6c9f5b820, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 3ff10388028892d4db987ebec5d32c56, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v12.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v12.mat index fe8f142f5..397b8d482 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v12.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v12.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v12 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: cac6125c6f87fa04b8a4278e0cd35a56, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 91914d4bf697da24f89b75b3edd2a9c5, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v13.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v13.mat index e7ec78763..7aee42a48 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v13.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v13.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v13 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 1b1ff2f1b442f9749ab0333a36a984cd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 127896ea0cb79ca458a6084f6b1510b9, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v14.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v14.mat index b5ec35664..74bbd319b 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v14.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v14.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v14 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 6811f1596b9bf1444a79f141d707fde9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: d9068b34c7b618f4bbd48d58b7849d49, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v15.mat b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v15.mat index d4a7ba82d..ad4b79804 100644 --- a/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v15.mat +++ b/Assets/Plugins/LowPoly_AsteroidsPack/Materials/Small_v15.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Small_v15 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ddff0b48b92c991499817d2a0f5d5059, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -39,6 +39,10 @@ Material: m_Texture: {fileID: 2800000, guid: 1a90e7f18923f4d40bfd42d3d2dd3c69, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 7955e6042bd0d72458c1b4332b355207, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +64,9 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fade: 1 + - _FadeEdge: 1 + - _FadeSharpness: 1 - _GlossMapScale: 1 - _Glossiness: 0.299 - _GlossyReflections: 1 @@ -74,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.5, g: 1.6344824, b: 3, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/RPG/Planets/Gas Giant.prefab b/Assets/Prefabs/RPG/Planets/Gas Giant.prefab index eb58d6b0a..93ff3c81e 100644 --- a/Assets/Prefabs/RPG/Planets/Gas Giant.prefab +++ b/Assets/Prefabs/RPG/Planets/Gas Giant.prefab @@ -405,9 +405,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SpeedMultiplier: 0.005 - FirstOffsetDomainRotationSpeed: 5 + FirstOffsetDomainRotationSpeed: 1 FirstOffsetRotationSpeed: 20 - SecondOffsetDomainRotationSpeed: 10 - SecondOffsetRotationSpeed: -50 - AlbedoRotationSpeed: 15 - LightingDirection: {x: 1, y: 0, z: 1} + SecondOffsetDomainRotationSpeed: -2 + SecondOffsetRotationSpeed: 10 + AlbedoRotationSpeed: -3 + LightingDirection: {x: -0.9826859, y: 0, z: -0.18527949} diff --git a/Assets/Prefabs/RPG/Planets/Sun.prefab b/Assets/Prefabs/RPG/Planets/Sun.prefab index d8dea790e..b6ae42f25 100644 --- a/Assets/Prefabs/RPG/Planets/Sun.prefab +++ b/Assets/Prefabs/RPG/Planets/Sun.prefab @@ -508,7 +508,7 @@ Light: m_Type: 2 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 + m_Intensity: 0.75 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 diff --git a/Assets/Resources/Settings.asset b/Assets/Resources/Settings.asset index f7605db74..55c405b38 100644 --- a/Assets/Resources/Settings.asset +++ b/Assets/Resources/Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88d8042dd05cfe0050cf14ea021e963aedd57160dcc8d00b60bd6a5eb7e2c345 -size 13119 +oid sha256:b3f7911e94bcd25ea0278f9dba69b2d106c9612023a509baf524e75272957186 +size 13221 diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index 0ae96d9c2..1dbf21b3b 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -30748,7 +30748,7 @@ Camera: m_CullingMask: serializedVersion: 2 m_Bits: 2097185 - m_RenderingPath: 1 + m_RenderingPath: 3 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 m_TargetEye: 3 diff --git a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile.asset b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile.asset index 81cb135b1..bd9d9aaa4 100644 --- a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile.asset +++ b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a96181c8e491f441ffad52d8bca3719667c5e58cc3f4050caab6833d044c3ff -size 27005 +oid sha256:41f6f01317fe6d368cad7e729ebf88224a9c067e0869a7af3d91a2e47eaefc39 +size 27819 diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index fbcd8dc4d..5a7d896f5 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -1234,12 +1234,12 @@ Camera: m_CullingMask: serializedVersion: 2 m_Bits: 1 - m_RenderingPath: 1 + m_RenderingPath: 3 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 - m_AllowMSAA: 1 + m_AllowMSAA: 0 m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 @@ -1289,7 +1289,7 @@ MonoBehaviour: fastMode: 0 keepAlpha: 0 fog: - enabled: 1 + enabled: 0 excludeSkybox: 1 debugLayer: lightMeter: @@ -1352,7 +1352,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: downSample: 0 - quality: 2 + quality: 1 cloudShader: {fileID: 4800000, guid: 84e97169589c5e94e8521fe4deb2e3f8, type: 3} --- !u!4 &971662241 stripped Transform: @@ -2439,7 +2439,7 @@ PrefabInstance: - target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 60.98 objectReference: {fileID: 0} - target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99, type: 3} @@ -2464,7 +2464,7 @@ PrefabInstance: - target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 55.675 objectReference: {fileID: 0} - target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99, type: 3} diff --git a/Assets/Scripts/ServerShared/Environment.cs b/Assets/Scripts/ServerShared/Environment.cs index 646d93a23..20ddc0f8e 100644 --- a/Assets/Scripts/ServerShared/Environment.cs +++ b/Assets/Scripts/ServerShared/Environment.cs @@ -31,6 +31,10 @@ public class NebulaSettings [JsonProperty("tintExponent"), Key(8)] public float TintExponent; [JsonProperty("tintLodExponent"), Key(9)] public float TintLodExponent; [JsonProperty("safetyDistance"), Key(10)] public float SafetyDistance; + [JsonProperty("dynamicSkyBoost"), Key(14)] public float DynamicSkyBoost; + [JsonProperty("dynamicLodRange"), Key(15)] public float DynamicLodRange; + [JsonProperty("dynamicLodBias"), Key(16)] public float DynamicLodBias; + [JsonProperty("dynamicIntensity"), Key(17)] public float DynamicIntensity; } [Serializable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] diff --git a/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs b/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs index 952998e59..689af861c 100644 --- a/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs +++ b/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs @@ -40,7 +40,7 @@ public enum Quality /// /// Cloud renderer post processing. /// -[ImageEffectAllowedInSceneView] +//[ImageEffectAllowedInSceneView] [ExecuteInEditMode,RequireComponent(typeof(Camera))] [ImageEffectOpaque] public class VolumeCloudRenderer : EffectBase diff --git a/Assets/Scripts/Zone Display/VolumeSampling.cs b/Assets/Scripts/Zone Display/VolumeSampling.cs index cb0d55c04..cc3bafe6c 100644 --- a/Assets/Scripts/Zone Display/VolumeSampling.cs +++ b/Assets/Scripts/Zone Display/VolumeSampling.cs @@ -31,6 +31,7 @@ public class VolumeSampling : MonoBehaviour public RenderTexture NebulaPatchHeight; public RenderTexture NebulaPatch; public RenderTexture NebulaTint; + private Camera _camera; public bool EnableDepth { get; set; } = true; @@ -38,7 +39,7 @@ public class VolumeSampling : MonoBehaviour private void Start() { //Debug.Log($"Supported MRT count: {SystemInfo.supportedRenderTargetCount}"); - // _camera = GetComponent(); + _camera = GetComponent(); // _mrt = new RenderBuffer[2]; //_blurMask = new RenderTexture(Screen.width, Screen.height, 0, GraphicsFormat.R8_UNorm); _blurMask = Color.white.ToTexture(); @@ -61,8 +62,8 @@ public class VolumeSampling : MonoBehaviour Shader.SetGlobalVector("_GridTransform", new Vector4(GridTransform.position.x,GridTransform.position.z,GridTransform.localScale.x)); // // Shader needs this matrix to generate world space rays - // Shader.SetGlobalMatrix("_CamProj", (Camera.current.projectionMatrix * Camera.current.worldToCameraMatrix).inverse); - // Shader.SetGlobalMatrix("_CamInvProj", (Camera.current.projectionMatrix * Camera.current.worldToCameraMatrix).inverse); + Shader.SetGlobalMatrix("_CamProj", (_camera.projectionMatrix * _camera.worldToCameraMatrix).inverse); + Shader.SetGlobalMatrix("_CamInvProj", (_camera.projectionMatrix * _camera.worldToCameraMatrix).inverse); // _mrt[0] = destination.colorBuffer; // _mrt[1] = _blurMask.colorBuffer; // @@ -97,11 +98,15 @@ public class VolumeSampling : MonoBehaviour Shader.SetGlobalFloat("_TintExponent", Settings.DefaultEnvironment.Nebula.TintExponent); Shader.SetGlobalFloat("_TintLodExponent", Settings.DefaultEnvironment.Nebula.TintLodExponent); Shader.SetGlobalFloat("_SafetyDistance", Settings.DefaultEnvironment.Nebula.SafetyDistance); + Shader.SetGlobalFloat("_DynamicSkyBoost", Settings.DefaultEnvironment.Nebula.DynamicSkyBoost); + Shader.SetGlobalFloat("_DynamicLodRange", Settings.DefaultEnvironment.Nebula.DynamicLodRange); + Shader.SetGlobalFloat("_DynamicLodBias", Settings.DefaultEnvironment.Nebula.DynamicLodBias); + Shader.SetGlobalFloat("_DynamicIntensity", Settings.DefaultEnvironment.Nebula.DynamicIntensity); - Shader.SetGlobalFloat("_NoiseScale", Settings.DefaultEnvironment.Noise.Scale); - Shader.SetGlobalFloat("_NoiseExponent", Settings.DefaultEnvironment.Noise.Exponent); - Shader.SetGlobalFloat("_NoiseAmplitude", Settings.DefaultEnvironment.Noise.Amplitude); - Shader.SetGlobalFloat("_NoiseSpeed", Settings.DefaultEnvironment.Noise.Speed); + Shader.SetGlobalFloat("_NebulaNoiseScale", Settings.DefaultEnvironment.Noise.Scale); + Shader.SetGlobalFloat("_NebulaNoiseExponent", Settings.DefaultEnvironment.Noise.Exponent); + Shader.SetGlobalFloat("_NebulaNoiseAmplitude", Settings.DefaultEnvironment.Noise.Amplitude); + Shader.SetGlobalFloat("_NebulaNoiseSpeed", Settings.DefaultEnvironment.Noise.Speed); Shader.SetGlobalFloat("_FlowScale", Settings.DefaultEnvironment.Flow.Scale); Shader.SetGlobalFloat("_FlowAmplitude", Settings.DefaultEnvironment.Flow.Amplitude); diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 3149354aa..c89c105f0 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -362,11 +362,11 @@ public class ZoneRenderer : MonoBehaviour var gas = (GasGiantObject) planet; var gasGiant = Zone.PlanetInstances[planetData.ID] as GasGiant; gasGiantData.Colors.Subscribe(c => gas.Body.material.SetTexture("_ColorRamp", c.ToGradient(!(planetData is SunData)).ToTexture())); - gasGiantData.AlbedoRotationSpeed.Subscribe(f => gas.SunMaterial.AlbedoRotationSpeed = f); - gasGiantData.FirstOffsetRotationSpeed.Subscribe(f => gas.SunMaterial.FirstOffsetRotationSpeed = f); - gasGiantData.SecondOffsetRotationSpeed.Subscribe(f => gas.SunMaterial.SecondOffsetRotationSpeed = f); - gasGiantData.FirstOffsetDomainRotationSpeed.Subscribe(f => gas.SunMaterial.FirstOffsetDomainRotationSpeed = f); - gasGiantData.SecondOffsetDomainRotationSpeed.Subscribe(f => gas.SunMaterial.SecondOffsetDomainRotationSpeed = f); + // gasGiantData.AlbedoRotationSpeed.Subscribe(f => gas.SunMaterial.AlbedoRotationSpeed = f); + // gasGiantData.FirstOffsetRotationSpeed.Subscribe(f => gas.SunMaterial.FirstOffsetRotationSpeed = f); + // gasGiantData.SecondOffsetRotationSpeed.Subscribe(f => gas.SunMaterial.SecondOffsetRotationSpeed = f); + // gasGiantData.FirstOffsetDomainRotationSpeed.Subscribe(f => gas.SunMaterial.FirstOffsetDomainRotationSpeed = f); + // gasGiantData.SecondOffsetDomainRotationSpeed.Subscribe(f => gas.SunMaterial.SecondOffsetDomainRotationSpeed = f); gasGiant.GravityWavesRadius.Subscribe(f => gas.GravityWaves.transform.localScale = f * Vector3.one); gasGiant.GravityWavesDepth.Subscribe(f => gas.GravityWaves.material.SetFloat("_Depth", f)); planetData.Mass.Subscribe(f => gas.GravityWaves.material.SetFloat("_Frequency", Settings.PlanetSettings.WaveFrequency.Evaluate(f))); diff --git a/Assets/Shaders/GlowFade.shader b/Assets/Shaders/GlowFade.shader index 1c9b06fca..c81aec2cf 100644 --- a/Assets/Shaders/GlowFade.shader +++ b/Assets/Shaders/GlowFade.shader @@ -61,15 +61,6 @@ Shader "Aetheria/GlowFade" float3 ambientColor; }; - float4 VolumeSampleColorSimple(float3 pos, float3 normal) - { - float d = density(pos); - float2 uv = getUV(pos); - const float lodRange = 3; - float3 tint = tex2Dlod(_NebulaTint, float4(uv.x, uv.y, 0, 3 + lodRange + dot(normal, float3(0,1,0))*lodRange)); - return float4(tint, d); - } - void vert (inout appdata_full v, out Input o) { UNITY_INITIALIZE_OUTPUT(Input,o); float3 worldPos = mul(unity_ObjectToWorld, v.vertex); @@ -87,7 +78,7 @@ Shader "Aetheria/GlowFade" void surf (Input IN, inout SurfaceOutputStandard o) { - half f = tex2D (_FadeTex, IN.uv_FadeTex).r + (1-_FadeEdge - UNITY_ACCESS_INSTANCED_PROP(_Fade_arr, _Fade)); + half f = tex2D (_FadeTex, IN.uv_FadeTex).r + (1-_FadeEdge - UNITY_ACCESS_INSTANCED_PROP(Props, _Fade)); // Apply screen space dithering float2 screenUV = IN.screenPos.xy / IN.screenPos.w; diff --git a/Assets/Shaders/Raymarching/CloudShader.shader b/Assets/Shaders/Raymarching/CloudShader.shader index 05807e6f6..4073108a9 100644 --- a/Assets/Shaders/Raymarching/CloudShader.shader +++ b/Assets/Shaders/Raymarching/CloudShader.shader @@ -42,6 +42,8 @@ Shader "Aetheria/CloudShader" float4 _ProjectionExtents; sampler2D _DitheringTex; float4 _DitheringCoords; + uniform float4x4 _CamProj; + uniform float4x4 _CamInvProj; struct appdata { @@ -64,6 +66,19 @@ Shader "Aetheria/CloudShader" o.vsray = (2.0 * v.uv - 1.0) * _ProjectionExtents.xy + _ProjectionExtents.zw; return o; } + + float3 DepthToWorld(float2 uv, float depth) { + float z = (1-depth) * 2.0 - 1.0; + + float4 clipSpacePosition = float4(uv * 2.0 - 1.0, z, 1.0); + + float4 viewSpacePosition = mul(_CamInvProj,clipSpacePosition); + viewSpacePosition /= viewSpacePosition.w; + + float4 worldSpacePosition = mul(unity_ObjectToWorld,viewSpacePosition); + + return worldSpacePosition.xyz; + } float GetRaymarchEndFromSceneDepth(float sceneDepth, out float raymarchEnd) { raymarchEnd = sceneDepth * _ProjectionParams.z; //raymarch to scene depth. @@ -75,28 +90,26 @@ Shader "Aetheria/CloudShader" float3 vspos = float3(i.vsray, 1.0); float4 worldPos = mul(unity_CameraToWorld,float4(vspos,1.0)); worldPos /= worldPos.w; + float4 screenPos = UNITY_PROJ_COORD( i.screenPos ); + float depthSample = tex2Dproj( _CameraDepthTexture, screenPos ).r; + float3 worldDepth = DepthToWorld(screenPos, depthSample); + float raymarchEnd = length(worldDepth-worldPos.xyz); - float sceneDepth = Linear01Depth(tex2Dproj(_CameraDepthTexture, UNITY_PROJ_COORD(i.screenPos)).r); - float raymarchEnd; - bool occluded = GetRaymarchEndFromSceneDepth(sceneDepth, raymarchEnd); + float sceneDepth = Linear01Depth(depthSample); + //bool occluded = GetRaymarchEndFromSceneDepth(sceneDepth, raymarchEnd); float3 viewDir = normalize(worldPos.xyz - _WorldSpaceCameraPos); - float2 screenPos = i.screenPos.xy / i.screenPos.w; + float2 screenUV = i.screenPos.xy / i.screenPos.w; //float blue = tex2D(_DitheringTex, screenPos * _DitheringCoords.xy + _DitheringCoords.zw).r; - float dither = tex2D(_DitheringTex, screenPos * _DitheringCoords.xy).r; + float dither = tex2D(_DitheringTex, screenUV * _DitheringCoords.xy).r; float offset = -fmod(_RaymarchOffset + dither, 1.0f); //final offset combined. The value will be multiplied by sample step in GetDensity. float3 intensity; float distance; //TODO: sceneDepth here is distance in camera z-axis, but the parameter should be radial distance. -#if USE_HI_HEIGHT - int iteration_count; - float density = HierarchicalRaymarch(worldPos, viewDir, raymarchEnd, offset, /*out*/intensity, /*out*/distance, /*out*/iteration_count); -#else float density = GetDensity(_WorldSpaceCameraPos, viewDir, raymarchEnd, offset, /*out*/intensity, /*out*/distance); -#endif - if(!occluded) density = 1; + if(depthSample > .99) density = 1; return float4(intensity, pack(distance, density)); } @@ -259,9 +272,7 @@ Shader "Aetheria/CloudShader" struct v2f { float2 uv : TEXCOORD0; - float4 screenPos : TEXCOORD1; float4 vertex : SV_POSITION; - float2 vsray : TEXCOORD2; }; v2f vert(appdata v) @@ -269,15 +280,12 @@ Shader "Aetheria/CloudShader" v2f o; o.vertex = UnityObjectToClipPos(v.vertex); o.uv = v.uv; - o.screenPos = ComputeScreenPos(o.vertex); - o.vsray = (2.0 * v.uv - 1.0) * _ProjectionExtents.xy + _ProjectionExtents.zw; return o; } - half4 frag(v2f i) : SV_Target { - float3 vspos = float3(i.vsray, 1.0); + //float3 vspos = float3(i.vsray, 1.0); //float4 worldPos = mul(unity_CameraToWorld,float4(vspos,1.0)); half4 mcol = tex2D(_MainTex,i.uv); diff --git a/Assets/Shaders/Raymarching/VolumeJupiter.shader b/Assets/Shaders/Raymarching/VolumeJupiter.shader index bd7183891..3aed9b63d 100644 --- a/Assets/Shaders/Raymarching/VolumeJupiter.shader +++ b/Assets/Shaders/Raymarching/VolumeJupiter.shader @@ -37,10 +37,11 @@ Shader "Aetheria/Volume Jupiter" CGPROGRAM - #pragma surface surf Standard vertex:vert NoLighting noambient noforwardadd + #pragma surface surf Lambert vertex:vert noambient #pragma target 3.0 #include "UnityPBSLighting.cginc" #include "Assets/Shaders/Dither Functions.cginc" + #include "Assets/Shaders/Volumetric.cginc" sampler2D _ColorRamp; samplerCUBE _Offset; @@ -50,7 +51,7 @@ Shader "Aetheria/Volume Jupiter" float4 screenPos; float3 worldNormal; float3 viewDir; - float3 objPos; + float3 ambientColor; }; half _Glossiness; @@ -85,7 +86,9 @@ Shader "Aetheria/Volume Jupiter" void vert (inout appdata_full v, out Input o) { UNITY_INITIALIZE_OUTPUT(Input,o); - o.objPos = v.vertex; + float3 worldPos = mul(unity_ObjectToWorld, v.vertex); + float3 worldNormal = UnityObjectToWorldNormal(v.normal); + o.ambientColor = VolumeSampleColorSimple(worldPos, worldNormal).rgb * 10; } // #define UINT_MAXF 4294967290.0f @@ -107,30 +110,34 @@ Shader "Aetheria/Volume Jupiter" // return (float)rngState / UINT_MAXF; // } - float tri(in float x){return abs(frac(x)-.5);} - float3 tri3(in float3 p){return float3( tri(p.z+tri(p.y*1.)), tri(p.z+tri(p.x*1.)), tri(p.y+tri(p.x*1.)));} - - float triNoise3d(in float3 p, in float spd) - { - float z=1.4; - float rz = 0.; - float3 bp = p; - for (float i=0.; i<=2.; i++ ) - { - float3 dg = tri3(bp*2.); - p += (dg+_Time.y*spd); - - bp *= 1.8; - z *= 1.5; - p *= 1.2; - - rz+= (tri(p.z+tri(p.x+tri(p.y))))/z; - bp += 0.14; - } - return rz; - } + // float tri(in float x){return abs(frac(x)-.5);} + // float3 tri3(in float3 p){return float3( tri(p.z+tri(p.y*1.)), tri(p.z+tri(p.x*1.)), tri(p.y+tri(p.x*1.)));} + // + // float triNoise3d(in float3 p, in float spd) + // { + // float z=1.4; + // float rz = 0.; + // float3 bp = p; + // for (float i=0.; i<=2.; i++ ) + // { + // float3 dg = tri3(bp*2.); + // p += (dg+_Time.y*spd); + // + // bp *= 1.8; + // z *= 1.5; + // p *= 1.2; + // + // rz+= (tri(p.z+tri(p.x+tri(p.y))))/z; + // bp += 0.14; + // } + // return rz; + // } + // void modifyColor (Input IN, SurfaceOutput o, inout fixed4 color) + // { + // color *= _ColorTint; + // } - void surf (Input IN, inout SurfaceOutputStandard o) + void surf (Input IN, inout SurfaceOutput o) { float rim = saturate(dot(IN.viewDir,IN.worldNormal)); float2 screenPos = IN.screenPos.xy / IN.screenPos.w; @@ -157,21 +164,19 @@ Shader "Aetheria/Volume Jupiter" _SecondOffsetDistance * (pow(length(rayPos),_SecondOffsetDepthExponent)) * turbulence; // float gradientPos = Random(((rayPos + offset).y+1)*_Striations+_StriationOffset); - float albedo = texCUBElod (_Albedo, float4(mul((float3x3)_AlbedoRotation,normalize(rayPos + offset2)) ,i/4)).x; - float noise = triNoise3d(firstSamplePosition * _NoiseFrequency, _NoiseSpeed) * _NoiseAmplitude; + float albedo = texCUBElod (_Albedo, float4(mul((float3x3)_AlbedoRotation,normalize(rayPos + offset2)) ,i/8)).x; + //float noise = triNoise3d(firstSamplePosition * _NoiseFrequency, _NoiseSpeed) * _NoiseAmplitude; - float density = pow(max(depth,0),_DensityDepthExponent) * pow(albedo,_DensityAlbedoExponent) * max(1 - noise,0.01); - float lighting = pow(saturate(dot(normalize(rayPos),_LightingDirection)+_LightingWrap),_LightingPower) + _LightingAmbient; + float density = pow(max(depth,0),_DensityDepthExponent) * pow(albedo,_DensityAlbedoExponent);// * max(1 - noise,0.01); alphaAccum += density; - accum += tex2D(_ColorRamp, secondSamplePosition.y+.5f) * lighting * density / depth; + accum += tex2D(_ColorRamp, secondSamplePosition.y+.5f) * density / depth; rayPos += rayStep; } ditherClip(screenPos, alphaAccum * _Alpha); - o.Smoothness = _Glossiness; - o.Albedo = o.Emission = accum*_Emission; - o.Metallic = _Metallic; + o.Albedo = accum * _Emission; + o.Emission = accum * IN.ambientColor * _LightingAmbient; // float4 envSample = UNITY_SAMPLE_TEXCUBE(unity_SpecCube0, IN.worldNormal); // float3 spec = DecodeHDR(envSample, unity_SpecCube0_HDR).rgb; //o.Emission = lerp(envSample.rgb,accum*_Emission,saturate(length(accum)*_AlphaPower)); diff --git a/Assets/Shaders/Raymarching/VolumeSun.shader b/Assets/Shaders/Raymarching/VolumeSun.shader index 5c44b16e2..9e47b83d2 100644 --- a/Assets/Shaders/Raymarching/VolumeSun.shader +++ b/Assets/Shaders/Raymarching/VolumeSun.shader @@ -44,7 +44,6 @@ Shader "Aetheria/Volume Sun" float4 screenPos; float3 worldNormal; float3 viewDir; - float3 objPos; }; half _Glossiness; @@ -75,7 +74,6 @@ Shader "Aetheria/Volume Sun" void vert (inout appdata_full v, out Input o) { UNITY_INITIALIZE_OUTPUT(Input,o); - o.objPos = v.vertex; } float tri(in float x){return abs(frac(x)-.5);} diff --git a/Assets/Shaders/Shield.shader b/Assets/Shaders/Shield.shader index fe20284f2..7c75db42c 100644 --- a/Assets/Shaders/Shield.shader +++ b/Assets/Shaders/Shield.shader @@ -58,7 +58,7 @@ Shader "Aetheria/Shield" float tri(in float x){return abs(frac(x)-.5);} float3 tri3(in float3 p){return float3( tri(p.z+tri(p.y*1.)), tri(p.z+tri(p.x*1.)), tri(p.y+tri(p.x*1.)));} - float triNoise3d(in float3 p, in float spd) + float volumeNoise(in float3 p, in float spd) { float z=1.4; float rz = 0.; @@ -105,7 +105,7 @@ Shader "Aetheria/Shield" float a = pow(tex2D (_MainTex, IN.uv_MainTex).a, _TextureGamma);// * _Color * IN.color; float3 pos = normalize(IN.objectPos); - float noise = triNoise3d(pos*_NoiseScale, _NoiseSpeed) * _NoiseAmplitude; + float noise = volumeNoise(pos*_NoiseScale, _NoiseSpeed) * _NoiseAmplitude; float3 offset = normalize(texCUBElod(_Offset, float4(pos + noise, 0)).rgb - float3(.5,.5,.5)); float albedo = pow(texCUBElod (_Albedo, float4(pos + offset * _OffsetSize, 0)).x, _AlbedoGamma); diff --git a/Assets/Shaders/Volumetric.cginc b/Assets/Shaders/Volumetric.cginc index 3993ebdba..e0c8b839e 100644 --- a/Assets/Shaders/Volumetric.cginc +++ b/Assets/Shaders/Volumetric.cginc @@ -57,15 +57,19 @@ uniform half _NebulaFillDensity, _NebulaLuminance, _TintExponent, _TintLodExponent, - _NoiseScale, - _NoiseExponent, - _NoiseAmplitude, - _NoiseSpeed, + _NebulaNoiseScale, + _NebulaNoiseExponent, + _NebulaNoiseAmplitude, + _NebulaNoiseSpeed, _FlowScale, _FlowAmplitude, _FlowScroll, _FlowSpeed, - _SafetyDistance; + _SafetyDistance, + _DynamicLodRange, + _DynamicLodBias, + _DynamicIntensity, + _DynamicSkyBoost; float tri(in float x){return abs(frac(x)-.5);} float3 tri3(in float3 p){return float3( tri(p.z+tri(p.y*1.)), tri(p.z+tri(p.x*1.)), tri(p.y+tri(p.x*1.)));} @@ -78,7 +82,7 @@ float triNoise3d(in float3 p) for (float i=0.; i<=1.; i++ ) { float3 dg = tri3(bp * 2.); - p += dg + _Time.y * _NoiseSpeed; + p += dg + _Time.y * _NebulaNoiseSpeed; bp *= 1.8; z *= 1.5; @@ -137,13 +141,13 @@ float density(float3 pos) const float3 fl = flow(pos, noise); const float lerp1 = frac(_Time.x * _FlowSpeed + noise); const float lerp2 = frac(_Time.x * _FlowSpeed + .5 + noise); - const float noise1 = pow(triNoise3d((pos+fl * lerp1) / _NoiseScale),_NoiseExponent) * _NoiseAmplitude * tri2(lerp1); - const float noise2 = pow(triNoise3d((pos+fl * lerp2) / _NoiseScale),_NoiseExponent) * _NoiseAmplitude * tri2(lerp2); + const float noise1 = pow(triNoise3d((pos+fl * lerp1) / _NebulaNoiseScale),_NebulaNoiseExponent) * _NebulaNoiseAmplitude * tri2(lerp1); + const float noise2 = pow(triNoise3d((pos+fl * lerp2) / _NebulaNoiseScale),_NebulaNoiseExponent) * _NebulaNoiseAmplitude * tri2(lerp2); pos.y += (noise1 + noise2) * heightFade; const float lerp3 = frac(_Time.x * _FlowSpeed * 2); const float lerp4 = frac(_Time.x * _FlowSpeed * 2 + .5); - const float noise3 = pow(triNoise3d((pos+fl * lerp3) / _NoiseScale * 8), _NoiseExponent) * _NoiseAmplitude * tri2(lerp3) / 2; - const float noise4 = pow(triNoise3d((pos+fl * lerp4) / _NoiseScale * 8), _NoiseExponent) * _NoiseAmplitude * tri2(lerp4) / 2; + const float noise3 = pow(triNoise3d((pos+fl * lerp3) / _NebulaNoiseScale * 8), _NebulaNoiseExponent) * _NebulaNoiseAmplitude * tri2(lerp3) / 2; + const float noise4 = pow(triNoise3d((pos+fl * lerp4) / _NebulaNoiseScale * 8), _NebulaNoiseExponent) * _NebulaNoiseAmplitude * tri2(lerp4) / 2; pos.y -= (noise3 + noise4) * heightFade; d += cloudDensity(pos, surfaceDisp); } @@ -158,3 +162,21 @@ float4 VolumeSampleColor(float3 pos) const float albedo = smoothstep(0,-250,pos.y) * pow(max(.1,d), _TintExponent) * _NebulaLuminance; return float4(albedo*tint, d); } + +float2 tintGradient (float2 uv) +{ + return float2( + length(tex2Dlod(_NebulaTint, float4(uv.x + _NebulaTint_TexelSize.x, uv.y, 0, 0))) - length(tex2Dlod(_NebulaTint, float4(uv.x - _NebulaTint_TexelSize.x, uv.y, 0, 0))), + length(tex2Dlod(_NebulaTint, float4(uv.x, uv.y + _NebulaTint_TexelSize.y, 0, 0))) - length(tex2Dlod(_NebulaTint, float4(uv.x, uv.y - _NebulaTint_TexelSize.y, 0, 0))) + ); +} + +float3 VolumeSampleColorSimple(float3 pos, float3 normal) +{ + float2 uv = getUV(pos); + float3 low = tex2Dlod(_NebulaTint, float4(uv.x, uv.y, 0, _DynamicLodBias)).rgb; + float3 high = tex2Dlod(_NebulaTint, float4(uv.x, uv.y, 0, _DynamicLodBias + _DynamicLodRange)).rgb * _DynamicSkyBoost; + float upness = dot(normal, float3(0,1,0)); + //float lambert = 2 - dot(normalize(normal.xz), normalize(tintGradient(uv))); + return lerp(low,high,(upness+1)/2) * _DynamicIntensity / (density(pos)+1); +} diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack index 88608b67d..df9970d13 100644 --- a/GameData/PlayerSettings.msgpack +++ b/GameData/PlayerSettings.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5e03ff137015e92d309e751d010e384b13c0a4b09cd6e579646299e3776c5ef -size 28351 +oid sha256:8dda3e784f2710e3701d28ccde3aa4eb49dd00c531dd2611f27f43217063203c +size 55896 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 16eaf808c..942eb32b5 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1d38a92c7675d7c6c551289e4b4ce6b50ae04ecd0b0bb643655f83fbc83d802 +oid sha256:f253c7f983785fb34a264fa16966fd40851a687e31c5e25e7dd2438d09e25ae2 size 1454