diff --git a/Assets/FishManShaderTutorial/Shaders/FishManShaderTutorial_Rain.mat b/Assets/FishManShaderTutorial/Materials/FishManShaderTutorial_Rain.mat similarity index 100% rename from Assets/FishManShaderTutorial/Shaders/FishManShaderTutorial_Rain.mat rename to Assets/FishManShaderTutorial/Materials/FishManShaderTutorial_Rain.mat diff --git a/Assets/FishManShaderTutorial/Shaders/FishManShaderTutorial_Rain.mat.meta b/Assets/FishManShaderTutorial/Materials/FishManShaderTutorial_Rain.mat.meta similarity index 100% rename from Assets/FishManShaderTutorial/Shaders/FishManShaderTutorial_Rain.mat.meta rename to Assets/FishManShaderTutorial/Materials/FishManShaderTutorial_Rain.mat.meta diff --git a/Assets/FishManShaderTutorial/Scene/15 Mountain.unity b/Assets/FishManShaderTutorial/Scene/15 Mountain.unity index 6497df8..37042f7 100644 Binary files a/Assets/FishManShaderTutorial/Scene/15 Mountain.unity and b/Assets/FishManShaderTutorial/Scene/15 Mountain.unity differ diff --git a/Assets/FishManShaderTutorial/Scene/Voronoi.unity b/Assets/FishManShaderTutorial/Scene/23 Voronoi.unity similarity index 100% rename from Assets/FishManShaderTutorial/Scene/Voronoi.unity rename to Assets/FishManShaderTutorial/Scene/23 Voronoi.unity diff --git a/Assets/FishManShaderTutorial/Scene/Voronoi.unity.meta b/Assets/FishManShaderTutorial/Scene/23 Voronoi.unity.meta similarity index 100% rename from Assets/FishManShaderTutorial/Scene/Voronoi.unity.meta rename to Assets/FishManShaderTutorial/Scene/23 Voronoi.unity.meta diff --git a/Assets/FishManShaderTutorial/Scene/23 Rain.unity b/Assets/FishManShaderTutorial/Scene/24 Rain.unity similarity index 100% rename from Assets/FishManShaderTutorial/Scene/23 Rain.unity rename to Assets/FishManShaderTutorial/Scene/24 Rain.unity diff --git a/Assets/FishManShaderTutorial/Scene/23 Rain.unity.meta b/Assets/FishManShaderTutorial/Scene/24 Rain.unity.meta similarity index 100% rename from Assets/FishManShaderTutorial/Scene/23 Rain.unity.meta rename to Assets/FishManShaderTutorial/Scene/24 Rain.unity.meta diff --git a/Assets/FishManShaderTutorial/Scene/221 Caustic.unity b/Assets/FishManShaderTutorial/Scene/26 Caustic.unity similarity index 100% rename from Assets/FishManShaderTutorial/Scene/221 Caustic.unity rename to Assets/FishManShaderTutorial/Scene/26 Caustic.unity diff --git a/Assets/FishManShaderTutorial/Scene/221 Caustic.unity.meta b/Assets/FishManShaderTutorial/Scene/26 Caustic.unity.meta similarity index 100% rename from Assets/FishManShaderTutorial/Scene/221 Caustic.unity.meta rename to Assets/FishManShaderTutorial/Scene/26 Caustic.unity.meta diff --git a/Assets/FishManShaderTutorial/Scene/221 2DRain.unity b/Assets/FishManShaderTutorial/Scene/27 2DRain.unity similarity index 100% rename from Assets/FishManShaderTutorial/Scene/221 2DRain.unity rename to Assets/FishManShaderTutorial/Scene/27 2DRain.unity diff --git a/Assets/FishManShaderTutorial/Scene/221 2DRain.unity.meta b/Assets/FishManShaderTutorial/Scene/27 2DRain.unity.meta similarity index 100% rename from Assets/FishManShaderTutorial/Scene/221 2DRain.unity.meta rename to Assets/FishManShaderTutorial/Scene/27 2DRain.unity.meta diff --git a/Assets/FishManShaderTutorial/Scene/GameHPUI.unity b/Assets/FishManShaderTutorial/Scene/28 GameHPUI.unity similarity index 99% rename from Assets/FishManShaderTutorial/Scene/GameHPUI.unity rename to Assets/FishManShaderTutorial/Scene/28 GameHPUI.unity index ad2de6c..44093ea 100644 Binary files a/Assets/FishManShaderTutorial/Scene/GameHPUI.unity and b/Assets/FishManShaderTutorial/Scene/28 GameHPUI.unity differ diff --git a/Assets/FishManShaderTutorial/Scene/GameHPUI.unity.meta b/Assets/FishManShaderTutorial/Scene/28 GameHPUI.unity.meta similarity index 100% rename from Assets/FishManShaderTutorial/Scene/GameHPUI.unity.meta rename to Assets/FishManShaderTutorial/Scene/28 GameHPUI.unity.meta diff --git a/Assets/FishManShaderTutorial/Shaders/2D.meta b/Assets/FishManShaderTutorial/Shaders/2D.meta deleted file mode 100644 index 8a28634..0000000 --- a/Assets/FishManShaderTutorial/Shaders/2D.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 0850765d93f677942acd2fcdc91048fa -folderAsset: yes -timeCreated: 1523791966 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FishManShaderTutorial/Shaders/2DCloudSea.shader b/Assets/FishManShaderTutorial/Shaders/2DCloudSea.shader index e3cd791..718eaa0 100644 --- a/Assets/FishManShaderTutorial/Shaders/2DCloudSea.shader +++ b/Assets/FishManShaderTutorial/Shaders/2DCloudSea.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-03-27 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/2DCloudSea"{ diff --git a/Assets/FishManShaderTutorial/Shaders/2DFireParticle.shader b/Assets/FishManShaderTutorial/Shaders/2DFireParticle.shader index ebcd64d..cfc4a74 100644 --- a/Assets/FishManShaderTutorial/Shaders/2DFireParticle.shader +++ b/Assets/FishManShaderTutorial/Shaders/2DFireParticle.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-03-27 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/2DFireParticle"{ diff --git a/Assets/FishManShaderTutorial/Shaders/2DLava.shader b/Assets/FishManShaderTutorial/Shaders/2DLava.shader index 8c24478..4c52f14 100644 --- a/Assets/FishManShaderTutorial/Shaders/2DLava.shader +++ b/Assets/FishManShaderTutorial/Shaders/2DLava.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-03-27 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/2DLava"{ diff --git a/Assets/FishManShaderTutorial/Shaders/2DRain.shader b/Assets/FishManShaderTutorial/Shaders/2DRain.shader index 953b150..be0f35f 100644 --- a/Assets/FishManShaderTutorial/Shaders/2DRain.shader +++ b/Assets/FishManShaderTutorial/Shaders/2DRain.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-03-27 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/2DRain"{ diff --git a/Assets/FishManShaderTutorial/Shaders/2DSnow.shader b/Assets/FishManShaderTutorial/Shaders/2DSnow.shader index 62a7378..264bcb7 100644 --- a/Assets/FishManShaderTutorial/Shaders/2DSnow.shader +++ b/Assets/FishManShaderTutorial/Shaders/2DSnow.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-03-27 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/2DSnow"{ diff --git a/Assets/FishManShaderTutorial/Shaders/BaseMath.shader b/Assets/FishManShaderTutorial/Shaders/BaseMath.shader index 9c2b57d..fb7cf8a 100644 --- a/Assets/FishManShaderTutorial/Shaders/BaseMath.shader +++ b/Assets/FishManShaderTutorial/Shaders/BaseMath.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-03-27 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/BaseMath"{ diff --git a/Assets/FishManShaderTutorial/Shaders/Caustic_RotateMin.shader b/Assets/FishManShaderTutorial/Shaders/Caustic_RotateMin.shader index e09d1c6..f256cac 100644 --- a/Assets/FishManShaderTutorial/Shaders/Caustic_RotateMin.shader +++ b/Assets/FishManShaderTutorial/Shaders/Caustic_RotateMin.shader @@ -1,4 +1,8 @@ -Shader "FishManShaderTutorial/Caustic_RotateMin"{ +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// date: 2018-03-27 +// email: jiepengtan@gmail.com +Shader "FishManShaderTutorial/Caustic_RotateMin"{ Properties{ _MainTex ("Texture", 2D) = "white" {} _TileNum ("TileNum", float) = 1 diff --git a/Assets/FishManShaderTutorial/Shaders/Caustic_TriTwist.shader b/Assets/FishManShaderTutorial/Shaders/Caustic_TriTwist.shader index 1115365..71ae826 100644 --- a/Assets/FishManShaderTutorial/Shaders/Caustic_TriTwist.shader +++ b/Assets/FishManShaderTutorial/Shaders/Caustic_TriTwist.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-04-11 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/Caustic_TriTwist"{ diff --git a/Assets/FishManShaderTutorial/Shaders/Caustic_Voronoi.shader b/Assets/FishManShaderTutorial/Shaders/Caustic_Voronoi.shader index 9974e3b..96ec3ec 100644 --- a/Assets/FishManShaderTutorial/Shaders/Caustic_Voronoi.shader +++ b/Assets/FishManShaderTutorial/Shaders/Caustic_Voronoi.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-04-11 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/Caustic_Voronoi"{ diff --git a/Assets/FishManShaderTutorial/Shaders/Cloud.shader b/Assets/FishManShaderTutorial/Shaders/Cloud.shader index 6ab3d91..5bef33f 100644 --- a/Assets/FishManShaderTutorial/Shaders/Cloud.shader +++ b/Assets/FishManShaderTutorial/Shaders/Cloud.shader @@ -1,4 +1,6 @@ -// create by JiepengTan 2018-04-13 email: jiepengtan@gmail.com +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// 2018-04-13 email: jiepengtan@gmail.com Shader "FishManShaderTutorial/Cloud" { Properties{ _MainTex("Base (RGB)", 2D) = "white" {} diff --git a/Assets/FishManShaderTutorial/Shaders/Desert.shader b/Assets/FishManShaderTutorial/Shaders/Desert.shader index 6f79a29..5652253 100644 --- a/Assets/FishManShaderTutorial/Shaders/Desert.shader +++ b/Assets/FishManShaderTutorial/Shaders/Desert.shader @@ -1,3 +1,6 @@ +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// 2018-04-13 email: jiepengtan@gmail.com Shader "FishManShaderTutorial/Desert" { Properties{ _MainTex("Base (RGB)", 2D) = "white" {} diff --git a/Assets/FishManShaderTutorial/Shaders/Fog.shader b/Assets/FishManShaderTutorial/Shaders/Fog.shader index c163579..358c2e7 100644 --- a/Assets/FishManShaderTutorial/Shaders/Fog.shader +++ b/Assets/FishManShaderTutorial/Shaders/Fog.shader @@ -1,5 +1,6 @@ -// create by JiepengTan 2018-04-13 -// email: jiepengtan@gmail.com +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// 2018-04-13 email: jiepengtan@gmail.com Shader "FishManShaderTutorial/Fog" { Properties{ _MainTex("Base (RGB)", 2D) = "white" {} diff --git a/Assets/FishManShaderTutorial/Shaders/GameHPUI.shader b/Assets/FishManShaderTutorial/Shaders/GameHPUI.shader index 7a1efc7..a982890 100644 --- a/Assets/FishManShaderTutorial/Shaders/GameHPUI.shader +++ b/Assets/FishManShaderTutorial/Shaders/GameHPUI.shader @@ -1,5 +1,6 @@ -// create by JiepengTan 2018-03-25 email: jiepengtan@gmail.com - +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// 2018-04-13 email: jiepengtan@gmail.com Shader "FishManShaderTutorial/GameHPUI" { Properties{ _MainTex("Base (RGB)", 2D) = "white" {} diff --git a/Assets/FishManShaderTutorial/Shaders/HighlandLake.shader b/Assets/FishManShaderTutorial/Shaders/HighlandLake.shader index 28f6123..e6f3c3c 100644 --- a/Assets/FishManShaderTutorial/Shaders/HighlandLake.shader +++ b/Assets/FishManShaderTutorial/Shaders/HighlandLake.shader @@ -1,4 +1,6 @@ -// create by JiepengTan 2018-04-16 email: jiepengtan@gmail.com +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// 2018-04-13 email: jiepengtan@gmail.com Shader "FishManShaderTutorial/HighlandLake" { Properties{ _MainTex("Base (RGB)", 2D) = "white" {} diff --git a/Assets/FishManShaderTutorial/Shaders/Lake.shader b/Assets/FishManShaderTutorial/Shaders/Lake.shader index 2fb3414..699d66a 100644 --- a/Assets/FishManShaderTutorial/Shaders/Lake.shader +++ b/Assets/FishManShaderTutorial/Shaders/Lake.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-04-16 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/Lake" { diff --git a/Assets/FishManShaderTutorial/Shaders/LightScanWithDepthTexture.shader b/Assets/FishManShaderTutorial/Shaders/LightScanWithDepthTexture.shader index 21f4ff3..0144fd1 100644 --- a/Assets/FishManShaderTutorial/Shaders/LightScanWithDepthTexture.shader +++ b/Assets/FishManShaderTutorial/Shaders/LightScanWithDepthTexture.shader @@ -1,4 +1,7 @@ -Shader "Unity Shaders Book/Chapter 13/Fog With Depth Texture" { +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// 2018-04-13 email: jiepengtan@gmail.com +Shader "Unity Shaders Book/Chapter 13/Fog With Depth Texture" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} _SrcCenterPos("_SrcCenterPos", Vector) = (1, 1, 1, 1) diff --git a/Assets/FishManShaderTutorial/Shaders/Mountain.shader b/Assets/FishManShaderTutorial/Shaders/Mountain.shader index df3c306..d64c2fe 100644 --- a/Assets/FishManShaderTutorial/Shaders/Mountain.shader +++ b/Assets/FishManShaderTutorial/Shaders/Mountain.shader @@ -1,3 +1,6 @@ +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// 2018-04-13 email: jiepengtan@gmail.com Shader "FishManShaderTutorial/Mountain" { Properties{ _MainTex("Base (RGB)", 2D) = "white" {} @@ -9,6 +12,7 @@ Shader "FishManShaderTutorial/Mountain" { ZTest Always Cull Off ZWrite Off CGPROGRAM +#define USING_VALUE_NOISE 1 #pragma vertex vert #pragma fragment frag #include "ShaderLibs/Framework3D_Terrain.cginc" @@ -20,7 +24,7 @@ Shader "FishManShaderTutorial/Mountain" { float b = 0.491;\ float2 d = float2(0.0,0.);\ for( int i=0; i