Update

Author: ENDERMANYK

shaders/lang/en_US.lang

@@ -14,11 +14,15 @@ option.WavingLeaves=WavingLeaves
 option.WavingLeavesSpeed=WavingLeavesSpeed
 option.WaterWave=WaterWave
 option.UnderWaterCaustics=UnderWaterCaustics
+option.Water_Red=Red
+option.Water_Green=Green
+option.Water_Blue=Blue
 screen.CREDIT=CREDIT
 screen.CREDIT.comment=Thanks for the jebbyk's code contribution https://github.com/Open4Es/Open4Es-Shader-IOS
 screen.INFO=Open4ES-Shader-IOS
 screen.INFO.comment=Made by: §5@ENDERMANYK§r
 screen.WorldColor=WorldColor
+screen.WaterColor=WaterColor
 screen.Postprocessing=PostProcessing
 screen.ShadowSettings=ShadowSettings
 screen.WavingSettings=WavingSettings

shaders/lang/zh_CN.lang

@@ -14,13 +14,17 @@ option.WavingLeaves=树叶晃动
 option.WavingLeavesSpeed=树叶晃动速度
 option.WaterWave=水体晃动
 option.UnderWaterCaustics=水下焦散
+option.Water_Red=红色
+option.Water_Green=绿色
+option.Water_Blue=红色
 
-screen.CREDIT=CREDIT
+screen.CREDIT=鸣谢
 screen.CREDIT.comment=Thanks for the jebbyk's code contribution https://github.com/Open4Es/Open4Es-Shader-IOS
-screen.INFO=Open4ES-Shader-IOS
+screen.INFO=信息
 screen.INFO.comment=Made by: §5@ENDERMANYK§r
 screen.WorldColor=全局颜色
-screen.Postprocessing=后期处理
+screen.WaterColor=水体颜色
+screen.PostProcessing=后期处理
 screen.ShadowSettings=阴影设置
 screen.WavingSettings=晃动设置
 screen.WavingPlants=植物晃动

shaders/shaders.properties

@@ -4,10 +4,11 @@ screen.CREDIT=CREDIT
 screen.WavingSettings=[WavingPlants] <empty> [WavingLeaves] <empty> [WavingWater]
 screen.PostProcessing =[WorldColor] Brightness Bloom BloomQuality ChromaticAberration ChromaticAberrationQuality
 screen.WorldColor=Red Green Blue
-screen.WavingWater=WaterWave UnderWaterCaustics
+screen.WavingWater=WaterWave UnderWaterCaustics [WaterColor]
+screen.WaterColor=Water_Red Water_Green Water_Blue
 screen.ShadowSettings=ShadowMapping ShadowSamples
 screen.WavingPlants=WavingPlants WavingPlantsSpeed
 screen.WavingLeaves=WavingLeaves WavingLeavesSpeed
-sliders=WavingLeavesSpeed WavingPlantsSpeed ShadowSamples BloomQuality ChromaticAberrationQuality Red Green Blue Brightness
+sliders=WavingLeavesSpeed WavingPlantsSpeed ShadowSamples BloomQuality ChromaticAberrationQuality Red Green Blue Brightness Water_Red Water_Green Water_Blue
 screen.columns=1
 screen.WavingSettings.columns=1

shaders/world0/composite.fsh

@@ -1,4 +1,4 @@
-#version 120
+#version 130
 
 #include "/lib/lib.glsl"
 #define SHADOW_MAP_BIAS 0.85
@@ -11,6 +11,11 @@ uniform sampler2D gcolor;
 uniform sampler2D gnormal;
 uniform sampler2D shadow;
 uniform sampler2D depthtex0;
+uniform sampler2D depthtex1;
+uniform sampler2D shadowtex1;
+uniform sampler2D gtexture;
+uniform sampler2D colortex4;
+uniform sampler2D noisetex;
 uniform vec3 sunPosition;
 uniform vec3 moonPosition;
 uniform float rainStrength;
@@ -22,9 +27,6 @@ varying vec2 lmcoord;
 varying vec2 texcoord;
 varying float extShadow;
 varying vec3 lightPosition;
-varying vec3 mySunColor;
-varying vec3 mySkyColor;
-varying vec4 positionInViewCoord;
 
 uniform vec3 cameraPosition;
 uniform vec3 fogColor;
@@ -56,49 +58,72 @@ vec2 rand2d(highp  vec2 coord)
     return vec2(x, y);
 }
 
+vec3 normalDecode(vec2 enc) {
+    vec4 nn = vec4(2.0 * enc - 1.0, 1.0, -1.0);
+    float l = dot(nn.xyz,-nn.xyw);
+    nn.z = l;
+    nn.xy *= sqrt(l);
+    return nn.xyz * 2.0 + vec3(0.0, 0.0, -1.0);
+}
+
 #ifdef ShadowMapping
-float shadowMapping(vec4 worldPosition, float dist) {
-    if(dist > 0.9) //distance
+float shadowMapping(vec4 worldPosition, float dist, vec3 normal, float alpha){
+    if(dist > 0.9)
         return extShadow;
     float shade = 0.0;
-    vec4 shadowposition = shadowModelView * worldPosition;
-    shadowposition = shadowProjection * shadowposition;
-    float distb = sqrt(shadowposition.x * shadowposition.x + shadowposition.y * shadowposition.y);
-    float distortFactor = (1.0 - SHADOW_MAP_BIAS) + distb * SHADOW_MAP_BIAS;
-    shadowposition.xy /= distortFactor;
-    shadowposition /= shadowposition.w;
-    shadowposition = shadowposition * 0.5 + 0.5;
-   
-    float shadowSamplesRadius = 0.001;
-
-    for(float i = 1.0; i <= ShadowSamples; i += 1.0)
+    float angle = dot(lightPosition, normal);
+    if(angle <= 0.1 && alpha > 0.99)
+    {
+        shade = 1.0;
+    }
+    else
     {
+        vec4 shadowposition = shadowModelView * worldPosition;
+        shadowposition = shadowProjection * shadowposition;
+        float distb = sqrt(shadowposition.x * shadowposition.x + shadowposition.y * shadowposition.y);
+        float distortFactor = (1.0 - SHADOW_MAP_BIAS) + distb * SHADOW_MAP_BIAS;
+        shadowposition.xy /= distortFactor;
+        shadowposition /= shadowposition.w;
+        shadowposition = shadowposition * 0.5 + 0.5;
+        float shadowSamplesRadius = 0.001;
+
+        for(float i = 1.0; i <= ShadowSamples; i += 1.0){
         vec2 sampleCoord = rand2d(shadowposition.xy * i) - 0.5;
         float shadowDepth = texture2D(shadow, shadowposition.st + sampleCoord * shadowSamplesRadius).z;
-        if(shadowDepth + 0.0005 < shadowposition.z ){
+        if(shadowDepth + 0.0003 < shadowposition.z ){
             shade += 1.0;
-        }
+        }if(angle < 0.2 && alpha > 0.99)
+            shade = max(shade, 1.0 - (angle - 0.1) * 10.0);}
+        shade /= ShadowSamples;
     }
-    shade /= ShadowSamples;
-    
     shade -= clamp((dist - 0.7) * 5.0, 0.0, 1.0);
-    shade = clamp(shade, 0.0, 1.0); 
+    shade = clamp(shade, 0.0, 1.0);
     return max(shade, extShadow);
 }
 #endif
+
 void main() {
+
 vec4 color = texture2D(gcolor, texcoord.st);
+vec3 normal = normalDecode(texture2D(gnormal, texcoord.st).rg);
 #ifdef ShadowMapping
 float indoor=smoothstep(.95,1.,lmcoord.y);
 float cave=smoothstep(.7,1.,lmcoord.y);
 float day=saturate(skyColor.r*2.);
 float sunset=saturate((fogColor.r-.1)-fogColor.b);
-float depth = texture2D(depthtex0, texcoord.st).x;
-vec4 viewPosition = gbufferProjectionInverse * vec4(texcoord.s * 2.0 - 1.0, texcoord.t * 2.0 - 1.0, 2.0 * depth - 1.0, 1.0f);
-viewPosition /= viewPosition.w;
-vec4 worldPosition = gbufferModelViewInverse * viewPosition;
-float dist = length(worldPosition.xyz) / far;
-float shade = shadowMapping(worldPosition, dist);
+
+float depth0 = texture2D(depthtex0, texcoord.st).x;
+vec4 viewPosition0 = gbufferProjectionInverse * vec4(texcoord.s * 2.0 - 1.0, texcoord.t * 2.0 - 1.0, 2.0 * depth0 - 1.0, 1.0f);
+viewPosition0 /= viewPosition0.w;
+vec4 worldPosition0 = gbufferModelViewInverse * viewPosition0;
+
+/*float depth1 = texture2D(depthtex1, texcoord.st).x;
+vec4 viewPosition1 = gbufferProjectionInverse * vec4(texcoord.s * 2.0 - 1.0, texcoord.t * 2.0 - 1.0, 2.0 * depth1 - 1.0, 1.0f);
+viewPosition1 /= viewPosition1.w;
+vec4 worldPosition1 = gbufferModelViewInverse * viewPosition1;*/
+
+float dist = length(worldPosition0.xyz) / far;
+float shade = shadowMapping(worldPosition0, dist, normal, color.a);
 if(12000<worldTime && worldTime<13000) {
 color.rgb *=(1.0 - shade *0.5*(1.0-rainStrength*0.8)*(1.0-lmcoord.x*0.4)); // dusk
 }
@@ -120,5 +145,4 @@ return;
 /* DRAWBUFFERS:0 */
 gl_FragData[0] = color;
 
-
 }

shaders/world0/final.fsh

@@ -11,10 +11,13 @@
 #define ChromaticAberrationQuality 1.0 //[1.0 2.0 4.0 8.0]
 
 uniform sampler2D gcolor;
+uniform sampler2D colortex4;
+uniform sampler2D depthtex0;
 uniform float rainStrength;
 uniform float aspectRatio;
 uniform int worldTime;
 varying vec2 texcoord;
+
 
 float A = 0.2;
 float B = 0.50;

shaders/world0/final.vsh

@@ -1,10 +1,11 @@
 #version 120
 
 varying vec2 texcoord;
- 
+
 void main() {
      vec4 position = gl_ModelViewMatrix * gl_Vertex;
 	gl_Position = gl_ProjectionMatrix * position;
 
      texcoord = gl_MultiTexCoord0.st;
+     
 }

shaders/world0/gbuffers_basic.fsh

@@ -1,9 +1,10 @@
 #version 120
 
 varying vec4 color;
+varying vec2 normal;
 
-/* DRAWBUFFERS:0 */
+/* DRAWBUFFERS:02 */
 void main() {
 	gl_FragData[0] = color;
-
+	gl_FragData[1] = vec4(normal, 0.0, 1.0);
 }

shaders/world0/gbuffers_basic.vsh

@@ -1,10 +1,18 @@
 #version 120
 
 varying vec4 color;
+varying vec2 normal;
+ 
+vec2 normalEncode(vec3 n) {
+    vec2 enc = normalize(n.xy) * (sqrt(-n.z*0.5+0.5));
+    enc = enc*0.5+0.5;
+    return enc;
+}
 
 void main() {
 
 	vec4 position = gl_ModelViewMatrix * gl_Vertex;
 	gl_Position = gl_ProjectionMatrix * position;
+	normal = normalEncode(gl_NormalMatrix * gl_Normal);
 	color = gl_Color;
 }

shaders/world0/gbuffers_clouds.fsh

@@ -10,13 +10,15 @@ varying vec2 texcoord;
 varying vec3 cPos;
 varying vec3 wPos;
 varying vec4 glcolor;
-
-/* DRAWBUFFERS:0 */
+varying vec2 normal;
+ 
+/* DRAWBUFFERS:02 */
 void main(){
     #ifdef VANILLA_CLOUDS
     vec4 color=texture(gtexture,texcoord)*glcolor;
     color.rgb=mix(color.rgb,fogColor,smoothstep(0.,far,length(wPos.xz)));
     gl_FragData[0]=color;
+    gl_FragData[1] = vec4(normal, 0.0, 1.0);
     #else
         discard;
     #endif

shaders/world0/gbuffers_clouds.vsh

@@ -9,10 +9,18 @@ varying vec2 texcoord;
 varying vec3 cPos;
 varying vec3 wPos;
 varying vec4 glcolor;
+varying vec2 normal;
+ 
+vec2 normalEncode(vec3 n) {
+    vec2 enc = normalize(n.xy) * (sqrt(-n.z*0.5+0.5));
+    enc = enc*0.5+0.5;
+    return enc;
+}
 
 void main(){
     vec4 position = gl_ModelViewMatrix * gl_Vertex;
     gl_Position = gl_ProjectionMatrix * position;
+    normal = normalEncode(gl_NormalMatrix * gl_Normal);
     texcoord=(gl_TextureMatrix[0]*gl_MultiTexCoord0).xy;
     glcolor=gl_Color;
     vec4 pos=gbufferModelViewInverse*gl_ModelViewMatrix*gl_Vertex;