Merge branch 'master' of https://github.com/JakobS1n/unityTest

1 files changed, 0 insertions, 145 deletions

diff --git a/exampleProject/New Unity Project/Assets/Materials/water.mat b/exampleProject/New Unity Project/Assets/Materials/water.mat
deleted file mode 100644
index 5c1c558..0000000
--- a/exampleProject/New Unity Project/Assets/Materials/water.mat
+++ /dev/null
@@ -1,145 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: water
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ColorControl:
-        m_Texture: {fileID: 2800000, guid: f15241bc5a839ea46bf857431081d715, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _Fresnel:
-        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}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ReflectionTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ReflectiveColor:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _RefractionTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ShoreTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _Amount: 0
-    - _Amplitude: 1
-    - _BumpScale: 1
-    - _Cutoff: 0.672
-    - _CutoutThresh: 0.2
-    - _DetailNormalMapScale: 1
-    - _Distance: 1
-    - _DstBlend: 10
-    - _FresnelScale: 0.75
-    - _GerstnerIntensity: 1
-    - _GlossMapScale: 0.086
-    - _Glossiness: 1
-    - _GlossyReflections: 1
-    - _InvFade: 1
-    - _Metallic: 0
-    - _Mode: 3
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _RandomHeight: 0.5
-    - _RandomSpeed: 0.5
-    - _ReflDistort: 0.44
-    - _RefrDistort: 0.4
-    - _Shininess: 0.026
-    - _SmoothnessTextureChannel: 1
-    - _SpecularHighlights: 1
-    - _Speed: 1
-    - _SrcBlend: 1
-    - _Transparency: 0.25
-    - _UVSec: 0
-    - _WaveHeight: 0.5
-    - _WaveLength: 0.5
-    - _WaveScale: 0.0235
-    - _WaveSpeed: 1
-    - _ZWrite: 0
-    m_Colors:
-    - WaveSpeed: {r: 19, g: 9, b: -16, a: -7}
-    - _AnimationDirection: {r: 1, g: 1, b: 1, a: 1}
-    - _AnimationTiling: {r: 2.2, g: 2.2, b: -1.1, a: -1.1}
-    - _BaseColor: {r: 0.54, g: 0.95, b: 0.99, a: 0.5}
-    - _BumpDirection: {r: 1, g: 1, b: -1, a: 1}
-    - _BumpTiling: {r: 1, g: 1, b: -2, a: 3}
-    - _Color: {r: 0.10786115, g: 0.97794116, b: 0.97794116, a: 0.384}
-    - _DistortParams: {r: 1, g: 1, b: 2, a: 1.15}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _Foam: {r: 0.1, g: 0.375, b: 0, a: 0}
-    - _GAmplitude: {r: 0.3, g: 0.35, b: 0.25, a: 0.25}
-    - _GDirectionAB: {r: 0.3, g: 0.85, b: 0.85, a: 0.25}
-    - _GDirectionCD: {r: 0.1, g: 0.9, b: 0.5, a: 0.5}
-    - _GFrequency: {r: 1.3, g: 1.35, b: 1.25, a: 1.25}
-    - _GSpeed: {r: 1.2, g: 1.375, b: 1.1, a: 1.5}
-    - _GSteepness: {r: 1, g: 1, b: 1, a: 1}
-    - _HorizonColor: {r: 0.172, g: 0.463, b: 0.435, a: 1}
-    - _InvFadeParemeter: {r: 0.15, g: 0.15, b: 0.5, a: 1}
-    - _ReflectionColor: {r: 0.54, g: 0.95, b: 0.99, a: 0.5}
-    - _RefrColor: {r: 0.34, g: 0.85, b: 0.92, a: 1}
-    - _SpecColor: {r: 0, g: 0.7931032, b: 1, a: 1}
-    - _SpecularColor: {r: 0.72, g: 0.72, b: 0.72, a: 1}
-    - _TintColor: {r: 1, g: 1, b: 1, a: 1}
-    - _WorldLightDir: {r: 0, g: 0.1, b: -0.5, a: 0}
-    - _horizonColor: {r: 0.172, g: 0.463, b: 0.435, a: 0}