From 1f2134f49709b351f6bef0b2f2696306578c1aed Mon Sep 17 00:00:00 2001 From: JiepengTan Date: Sun, 29 Apr 2018 13:21:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=91=BD=E5=90=8D=20shader=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0link=20=E5=88=B0=E9=A1=B9=E7=9B=AE=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FishManShaderTutorial_Rain.mat | Bin .../FishManShaderTutorial_Rain.mat.meta | 0 .../Scene/{Voronoi.unity => 23 Voronoi.unity} | Bin ...ronoi.unity.meta => 23 Voronoi.unity.meta} | 0 .../Scene/{23 Rain.unity => 24 Rain.unity} | Bin ...{23 Rain.unity.meta => 24 Rain.unity.meta} | 0 .../{221 Caustic.unity => 26 Caustic.unity} | Bin ...ustic.unity.meta => 26 Caustic.unity.meta} | 0 .../{221 2DRain.unity => 27 2DRain.unity} | Bin ...2DRain.unity.meta => 27 2DRain.unity.meta} | 0 .../{GameHPUI.unity => 28 GameHPUI.unity} | Bin 15040 -> 15040 bytes ...HPUI.unity.meta => 28 GameHPUI.unity.meta} | 0 Assets/FishManShaderTutorial/Shaders/2D.meta | 9 --------- .../Shaders/2DCloudSea.shader | 1 + .../Shaders/2DFireParticle.shader | 1 + .../Shaders/2DLava.shader | 1 + .../Shaders/2DRain.shader | 1 + .../Shaders/2DSnow.shader | 1 + .../Shaders/BaseMath.shader | 1 + .../Shaders/Caustic_RotateMin.shader | 6 +++++- .../Shaders/Caustic_TriTwist.shader | 1 + .../Shaders/Caustic_Voronoi.shader | 1 + .../Shaders/Cloud.shader | 4 +++- .../Shaders/Desert.shader | 3 +++ .../FishManShaderTutorial/Shaders/Fog.shader | 5 +++-- .../Shaders/GameHPUI.shader | 5 +++-- .../Shaders/HighlandLake.shader | 4 +++- .../FishManShaderTutorial/Shaders/Lake.shader | 1 + .../Shaders/LightScanWithDepthTexture.shader | 5 ++++- .../Shaders/Mountain.shader | 3 +++ .../FishManShaderTutorial/Shaders/Rain.shader | 1 + .../Shaders/RayMarchFramework.shader | 1 + .../Shaders/RayMarchSimpleScene.shader | 1 + .../Shaders/RaymarchExample.shader | 1 + .../Shaders/RaymarchMergeRaster.shader | 1 + .../Shaders/Ripple.shader | 4 ++-- .../FishManShaderTutorial/Shaders/SDF.shader | 3 ++- .../Shaders/SDFBouncedBall.shader | 3 ++- .../FishManShaderTutorial/Shaders/Sea2.shader | 4 +++- .../Shaders/ShaderLibs/Common.cginc | 1 + .../Shaders/ShaderLibs/FBM.cginc | 1 + .../Shaders/ShaderLibs/Feature.cginc | 1 + .../Shaders/ShaderLibs/Framework2D.cginc | 1 + .../Shaders/ShaderLibs/Framework3D.cginc | 1 + .../Framework3D_DefaultRender.cginc | 1 + .../ShaderLibs/Framework3D_Terrain.cginc | 1 + .../Shaders/ShaderLibs/Hash.cginc | 3 ++- .../Shaders/ShaderLibs/Math.cginc | 1 + .../Shaders/ShaderLibs/Noise.cginc | 3 ++- .../Shaders/ShaderLibs/SDF.cginc | 1 + .../FishManShaderTutorial/Shaders/Sky.shader | 4 +++- .../Shaders/Stars.shader | 4 +++- .../Shaders/TerrianMap.shader | 4 +++- .../FishManShaderTutorial/Shaders/Test.meta | 9 --------- .../Shaders/Voronoi.shader | 4 +++- 55 files changed, 75 insertions(+), 37 deletions(-) rename Assets/FishManShaderTutorial/{Shaders => Materials}/FishManShaderTutorial_Rain.mat (100%) rename Assets/FishManShaderTutorial/{Shaders => Materials}/FishManShaderTutorial_Rain.mat.meta (100%) rename Assets/FishManShaderTutorial/Scene/{Voronoi.unity => 23 Voronoi.unity} (100%) rename Assets/FishManShaderTutorial/Scene/{Voronoi.unity.meta => 23 Voronoi.unity.meta} (100%) rename Assets/FishManShaderTutorial/Scene/{23 Rain.unity => 24 Rain.unity} (100%) rename Assets/FishManShaderTutorial/Scene/{23 Rain.unity.meta => 24 Rain.unity.meta} (100%) rename Assets/FishManShaderTutorial/Scene/{221 Caustic.unity => 26 Caustic.unity} (100%) rename Assets/FishManShaderTutorial/Scene/{221 Caustic.unity.meta => 26 Caustic.unity.meta} (100%) rename Assets/FishManShaderTutorial/Scene/{221 2DRain.unity => 27 2DRain.unity} (100%) rename Assets/FishManShaderTutorial/Scene/{221 2DRain.unity.meta => 27 2DRain.unity.meta} (100%) rename Assets/FishManShaderTutorial/Scene/{GameHPUI.unity => 28 GameHPUI.unity} (99%) rename Assets/FishManShaderTutorial/Scene/{GameHPUI.unity.meta => 28 GameHPUI.unity.meta} (100%) delete mode 100644 Assets/FishManShaderTutorial/Shaders/2D.meta delete mode 100644 Assets/FishManShaderTutorial/Shaders/Test.meta 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/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 ad2de6ce298f7f6fde7d5a8762452b11cab0378c..44093ea190d8231d6897fd1dba236de9eabf8a3b 100644 GIT binary patch delta 25 hcmX?5dZ2Vefdxq3XaUp*YJFaBV+xyHhU2>`7`42A#z delta 25 hcmX?5dZ2Vefdx<7xvBQmpFA92wDQ_-uCZ`o0sx~y3sV39 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..3175138 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" {} diff --git a/Assets/FishManShaderTutorial/Shaders/Rain.shader b/Assets/FishManShaderTutorial/Shaders/Rain.shader index 343733e..43f1e5d 100644 --- a/Assets/FishManShaderTutorial/Shaders/Rain.shader +++ b/Assets/FishManShaderTutorial/Shaders/Rain.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date: 2018-04-16 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/Rain" { diff --git a/Assets/FishManShaderTutorial/Shaders/RayMarchFramework.shader b/Assets/FishManShaderTutorial/Shaders/RayMarchFramework.shader index c57858b..828de46 100644 --- a/Assets/FishManShaderTutorial/Shaders/RayMarchFramework.shader +++ b/Assets/FishManShaderTutorial/Shaders/RayMarchFramework.shader @@ -1,4 +1,5 @@ //// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial //// date:2018-04-12 //// email: jiepengtan@gmail.com Shader "FishManShaderTutorial/RayMarchFramework" { diff --git a/Assets/FishManShaderTutorial/Shaders/RayMarchSimpleScene.shader b/Assets/FishManShaderTutorial/Shaders/RayMarchSimpleScene.shader index f213df6..8d5fc19 100644 --- a/Assets/FishManShaderTutorial/Shaders/RayMarchSimpleScene.shader +++ b/Assets/FishManShaderTutorial/Shaders/RayMarchSimpleScene.shader @@ -1,4 +1,5 @@ // create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // date:2018-04-12 // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/RayMarchSimpleScene" diff --git a/Assets/FishManShaderTutorial/Shaders/RaymarchExample.shader b/Assets/FishManShaderTutorial/Shaders/RaymarchExample.shader index 7e4d94a..b5e3655 100644 --- a/Assets/FishManShaderTutorial/Shaders/RaymarchExample.shader +++ b/Assets/FishManShaderTutorial/Shaders/RaymarchExample.shader @@ -1,4 +1,5 @@ //// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial //// date:2018-04-12 //// email: jiepengtan@gmail.com Shader "FishManShaderTutorial/RaymarchMergeExample" { diff --git a/Assets/FishManShaderTutorial/Shaders/RaymarchMergeRaster.shader b/Assets/FishManShaderTutorial/Shaders/RaymarchMergeRaster.shader index 919e90c..06e558b 100644 --- a/Assets/FishManShaderTutorial/Shaders/RaymarchMergeRaster.shader +++ b/Assets/FishManShaderTutorial/Shaders/RaymarchMergeRaster.shader @@ -1,4 +1,5 @@ //// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial //// date:2018-04-12 //// email: jiepengtan@gmail.com Shader "FishManShaderTutorial/RaymarchMergeRaster" { diff --git a/Assets/FishManShaderTutorial/Shaders/Ripple.shader b/Assets/FishManShaderTutorial/Shaders/Ripple.shader index 8669876..4645829 100644 --- a/Assets/FishManShaderTutorial/Shaders/Ripple.shader +++ b/Assets/FishManShaderTutorial/Shaders/Ripple.shader @@ -1,6 +1,6 @@ -// create by JiepengTan 2018-04-12 email: jiepengtan@gmail.com +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // all right reserve -// the base idea is come from https://www.shadertoy.com/view/ldfyzl Shader "FishManShaderTutorial/Ripple" { Properties diff --git a/Assets/FishManShaderTutorial/Shaders/SDF.shader b/Assets/FishManShaderTutorial/Shaders/SDF.shader index e5eab7b..1a00395 100644 --- a/Assets/FishManShaderTutorial/Shaders/SDF.shader +++ b/Assets/FishManShaderTutorial/Shaders/SDF.shader @@ -1,4 +1,5 @@ -// create by JiepengTan 2018-04-13 +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/SDF" { Properties{ diff --git a/Assets/FishManShaderTutorial/Shaders/SDFBouncedBall.shader b/Assets/FishManShaderTutorial/Shaders/SDFBouncedBall.shader index 4d2801f..0841303 100644 --- a/Assets/FishManShaderTutorial/Shaders/SDFBouncedBall.shader +++ b/Assets/FishManShaderTutorial/Shaders/SDFBouncedBall.shader @@ -1,4 +1,5 @@ -// create by JiepengTan 2018-04-14 +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial // email: jiepengtan@gmail.com Shader "FishManShaderTutorial/SDFBouncedBall" { Properties{ diff --git a/Assets/FishManShaderTutorial/Shaders/Sea2.shader b/Assets/FishManShaderTutorial/Shaders/Sea2.shader index 6f39803..4f6bbf6 100644 --- a/Assets/FishManShaderTutorial/Shaders/Sea2.shader +++ b/Assets/FishManShaderTutorial/Shaders/Sea2.shader @@ -1,4 +1,6 @@ -// create by JiepengTan email: jiepengtan@gmail.com +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// email: jiepengtan@gmail.com // 2018-04-13 diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Common.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Common.cginc index 7c29302..fdc6ee7 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Common.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Common.cginc @@ -1,4 +1,5 @@ // Create by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-03-27 #ifndef FMST_COMMOM #define FMST_COMMOM diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/FBM.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/FBM.cginc index e86b48a..8241b4d 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/FBM.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/FBM.cginc @@ -1,4 +1,5 @@ // Create by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-03-27 #ifndef FMST_FBM #define FMST_FBM diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Feature.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Feature.cginc index f35cd22..c23507d 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Feature.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Feature.cginc @@ -1,4 +1,5 @@ // Create by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-03-27 #ifndef FMST_FEATURE #define FMST_FEATURE diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework2D.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework2D.cginc index 4f60cc3..afa3616 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework2D.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework2D.cginc @@ -1,4 +1,5 @@ // Create by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-03-27 #include "FBM.cginc" #include "Feature.cginc" diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D.cginc index 7765d5e..fdb2e0f 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D.cginc @@ -1,4 +1,5 @@ // Create by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-03-27 #ifndef FRAMEWORK_3D #define FRAMEWORK_3D diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D_DefaultRender.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D_DefaultRender.cginc index 5754042..f8c9128 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D_DefaultRender.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D_DefaultRender.cginc @@ -1,4 +1,5 @@ // Create by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-04-24 #ifndef FRAMEWORK_3D_DEFAULT_SCENE #define FRAMEWORK_3D_DEFAULT_SCENE diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D_Terrain.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D_Terrain.cginc index 3f7302d..b770f2b 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D_Terrain.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Framework3D_Terrain.cginc @@ -1,4 +1,5 @@ // Create by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-04-24 #ifndef FRAMEWORK_3D_DEFAULT_SCENE #define FRAMEWORK_3D_DEFAULT_SCENE diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Hash.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Hash.cginc index 8b0ea3d..4f6ba19 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Hash.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Hash.cginc @@ -1,4 +1,5 @@ -// Merge by JiepengTan@gmail.com +// Merge by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-03-27 #ifndef FMST_HASH #define FMST_HASH diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Math.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Math.cginc index d51c8a3..00d6578 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Math.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Math.cginc @@ -1,4 +1,5 @@ // Create by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-03-27 #ifndef FMST_MATH #define FMST_MATH diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Noise.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Noise.cginc index 0893a18..a7ae3f2 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Noise.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/Noise.cginc @@ -1,4 +1,5 @@ -// Merge by JiepengTan@gmail.com +// Merge by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-03-27 #ifndef FMST_NOISE #define FMST_NOISE diff --git a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/SDF.cginc b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/SDF.cginc index f4247b2..ef9e9a6 100644 --- a/Assets/FishManShaderTutorial/Shaders/ShaderLibs/SDF.cginc +++ b/Assets/FishManShaderTutorial/Shaders/ShaderLibs/SDF.cginc @@ -1,4 +1,5 @@ // Create by JiepengTan@gmail.com +// https://github.com/JiepengTan/FishManShaderTutorial // 2018-03-27 #ifndef FMST_SDF #define FMST_SDF diff --git a/Assets/FishManShaderTutorial/Shaders/Sky.shader b/Assets/FishManShaderTutorial/Shaders/Sky.shader index 3622f3a..8509173 100644 --- a/Assets/FishManShaderTutorial/Shaders/Sky.shader +++ b/Assets/FishManShaderTutorial/Shaders/Sky.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/Mountain" { Properties{ _MainTex("Base (RGB)", 2D) = "white" {} diff --git a/Assets/FishManShaderTutorial/Shaders/Stars.shader b/Assets/FishManShaderTutorial/Shaders/Stars.shader index e6a0c43..d247a1a 100644 --- a/Assets/FishManShaderTutorial/Shaders/Stars.shader +++ b/Assets/FishManShaderTutorial/Shaders/Stars.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/Stars" { Properties{ _MainTex("Base (RGB)", 2D) = "white" {} diff --git a/Assets/FishManShaderTutorial/Shaders/TerrianMap.shader b/Assets/FishManShaderTutorial/Shaders/TerrianMap.shader index ae23ba4..fd30131 100644 --- a/Assets/FishManShaderTutorial/Shaders/TerrianMap.shader +++ b/Assets/FishManShaderTutorial/Shaders/TerrianMap.shader @@ -1,4 +1,6 @@ -// create by JiepengTan 2018-04-12 email: jiepengtan@gmail.com +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// 2018-04-12 email: jiepengtan@gmail.com // all right reserve Shader "FishManShaderTutorial/Ripple" { diff --git a/Assets/FishManShaderTutorial/Shaders/Test.meta b/Assets/FishManShaderTutorial/Shaders/Test.meta deleted file mode 100644 index 35cdce5..0000000 --- a/Assets/FishManShaderTutorial/Shaders/Test.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 20a7e5bc2283fd3448ef632e1118c5ed -folderAsset: yes -timeCreated: 1523791955 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FishManShaderTutorial/Shaders/Voronoi.shader b/Assets/FishManShaderTutorial/Shaders/Voronoi.shader index 4c59ab8..73062b0 100644 --- a/Assets/FishManShaderTutorial/Shaders/Voronoi.shader +++ b/Assets/FishManShaderTutorial/Shaders/Voronoi.shader @@ -1,4 +1,6 @@ -// create by JiepengTan 2018-04-12 email: jiepengtan@gmail.com +// create by JiepengTan +// https://github.com/JiepengTan/FishManShaderTutorial +// 2018-04-12 email: jiepengtan@gmail.com Shader "FishManShaderTutorial/Voronoi" { Properties From 9d3727599f11d207ccc17285e9c0fa2ba592192e Mon Sep 17 00:00:00 2001 From: JiepengTan Date: Mon, 30 Apr 2018 22:04:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20mountain=20=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=20=20noise=20=E4=BD=BF=E7=94=A8VNoise=20=E8=A1=A8?= =?UTF-8?q?=E7=8E=B0=E6=9B=B4=E4=BD=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scene/15 Mountain.unity | Bin 20112 -> 20112 bytes .../Shaders/Mountain.shader | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/FishManShaderTutorial/Scene/15 Mountain.unity b/Assets/FishManShaderTutorial/Scene/15 Mountain.unity index 6497df8fa46cf53059be62888fe7298a7c181c91..37042f7a585b7ac49d3df2542d93561e9ca31798 100644 GIT binary patch delta 25 hcmbO*mvO>e#tm%VTqm3u7#i#u7*05C7VvIh1^{hU2h0Ef delta 18 acmbO*mvO>e#tm%VliztrZC3CuU Date: Wed, 2 May 2018 12:27:36 +0800 Subject: [PATCH 3/6] add qq link --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a583dd8..52a6936 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,8 @@ mathjax: true - 如果想学习哪种类型的shader，可以在[这里][1]留言,我优先出留言中的shader的教程 +**shader技术交流qq群:299080901** + ### **1.内容**： >1. 教程中会讲解在编写shader的常用技巧，以及在项目中如何使用这些shader >2. 大量的实例如水，火，粒子，海洋，山脉，闪电等 From 82052a4eab655ce76772095d613b5edfd7764362 Mon Sep 17 00:00:00 2001 From: JiepengTan Date: Fri, 4 May 2018 15:06:27 +0800 Subject: [PATCH 4/6] remove star --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 52a6936..577e808 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ mathjax: true # FishMan Shader Tutorial ### **0.说在前面** -如果你觉得本教程有用，就去[github][1]中给我颗星星⭐吧. - [本教程配套blog ][1] - [本教程配套项目源码 ][2] From dcbb95306aea6dca3c981c7d4e81d012d6e057e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=94=E5=A4=AB?= Date: Mon, 23 Mar 2020 13:39:02 +0800 Subject: [PATCH 5/6] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改视频链接 --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 577e808..4021250 100644 --- a/README.md +++ b/README.md @@ -16,15 +16,13 @@ mathjax: true ### **0.说在前面** +- [**配套视频**][2] - [本教程配套blog ][1] -- [本教程配套项目源码 ][2] - [教程中抽取的RayMarching框架][3] - [本人shadertoy地址 ][25] - [第一时间更新blog地址][26] -- 如果想学习哪种类型的shader，可以在[这里][1]留言,我优先出留言中的shader的教程 -**shader技术交流qq群:299080901** ### **1.内容**： >1. 教程中会讲解在编写shader的常用技巧，以及在项目中如何使用这些shader @@ -120,7 +118,7 @@ mathjax: true [1]: https://blog.csdn.net/tjw02241035621611/article/details/80038608 - [2]: https://github.com/JiepengTan/FishManShaderTutorial + [2]: https://space.bilibili.com/308864667/channel/detail?cid=112754 [3]: https://github.com/JiepengTan/Unity-Raymarching-Framework [4]: https://blog.csdn.net/tjw02241035621611/article/details/80041397 [5]: https://blog.csdn.net/tjw02241035621611/article/details/80043469 From 6f44d0a2648377cc6b2a763eeba6d6c6f6cd9af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=94=E5=A4=AB?= Date: Mon, 23 Mar 2020 13:43:16 +0800 Subject: [PATCH 6/6] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加视频链接 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4021250..b4800b9 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,10 @@ mathjax: true # FishMan Shader Tutorial +## [**配套视频**][2] + ### **0.说在前面** -- [**配套视频**][2] - [本教程配套blog ][1] - [教程中抽取的RayMarching框架][3] - [本人shadertoy地址 ][25]