game: terrain shader

GameData/Materials/TownforgeTerrain.xml

@@ -1,21 +1,21 @@
 <material>
-    <technique name="Techniques/TownforgeTerrainLowQuality.xml" loddistance="2500" />
     <technique name="Techniques/TownforgeTerrain.xml" loddistance="0" />
-    <texture unit="1" name="Textures/aerial_ground_rock_diff_2k-tiling.dds" />
-    <texture unit="2" name="Textures/stone063.dds" />
-    <texture unit="3" name="Textures/Grass-0467-tiling2k.dds" />
-    <texture unit="4" name="Textures/snowy-grass-texturelib.dds" />
+    <texture unit="1" name="Textures/Enviroment/DeadGrass.dds" />
+    <texture unit="2" name="Textures/Enviroment/Ground.dds" />
+    <texture unit="3" name="Textures/Enviroment/Grass.dds" />
+    <texture unit="4" name="Textures/Enviroment/snowOverlay.dds" />
     <texture unit="5" />
-    <texture unit="6" name="Textures/pure-white-snow-surface-final-blurred.dds" />
-
-    <parameter name="MatSpecColor" value="0.25 0.25 0.25 16" />
-    <parameter name="DetailTiling" value="4 4" />
+    <texture unit="6" name="Textures/Enviroment/snow.dds" />
+    <texture unit="7" name="Textures/Enviroment/cliff.dds" />
+    
+    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="DetailTiling" value="1 1" />
     <parameter name="Temperature" value="0.0" />
     <parameter name="SnowinessMinTemperature" value="-10.0" />
     <parameter name="SnowinessMaxTemperature" value="2.0" />
     <parameter name="TemperatureAltitudeFloor" value="0.0" />
     <parameter name="TemperatureAltitudeDecrease" value="0.0" />
-    <parameter name="MaxSnowDepth" value="0.9" />
-    <parameter name="SnowDarkening" value="0.85" />
+    <parameter name="MaxSnowDepth" value="1.0" />
+    <parameter name="SnowDarkening" value="0.75" />
     <parameter name="HighlightColor" value="0 0 0 1" />
-</material>
+</material>

GameData/Materials/TownforgeTerrainNoSnow.xml

@@ -1,22 +1,22 @@
 <material>
-    <technique name="Techniques/TownforgeTerrainLowQuality.xml" loddistance="2500" />
-    <technique name="Techniques/TownforgeTerrainNoSnow.xml" loddistance="0" />
-    <texture unit="1" name="Textures/aerial_ground_rock_diff_2k-tiling.dds" />
-    <texture unit="2" name="Textures/stone063.dds" />
-    <texture unit="3" name="Textures/Grass-0467-tiling2k.dds" />
-    <texture unit="4" name="Textures/snowy-grass-texturelib.dds" />
+    <technique name="Techniques/TownforgeTerrainNoSnow.xml" />
+    <texture unit="1" name="Textures/Enviroment/DeadGrass.dds" />
+    <texture unit="2" name="Textures/Enviroment/Ground.dds" />
+    <texture unit="3" name="Textures/Enviroment/Grass.dds" />
+    <texture unit="4" name="Textures/Enviroment/snowOverlay.dds" />
     <texture unit="5" />
-    <texture unit="6" name="Textures/pure-white-snow-surface-final-blurred.dds" />
+    <texture unit="6" name="Textures/Enviroment/snow.dds" />
+    <texture unit="7" name="Textures/Enviroment/cliff.dds" />
 
-    <parameter name="MatSpecColor" value="0.25 0.25 0.25 16" />
-    <parameter name="DetailTiling" value="4 4" />
+    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="DetailTiling" value="1 1" />
     <parameter name="Temperature" value="0.0" />
     <parameter name="EnableSnow" value="1" />
     <parameter name="SnowinessMinTemperature" value="-10.0" />
     <parameter name="SnowinessMaxTemperature" value="2.0" />
     <parameter name="TemperatureAltitudeFloor" value="0.0" />
     <parameter name="TemperatureAltitudeDecrease" value="0.0" />
-    <parameter name="MaxSnowDepth" value="0.9" />
-    <parameter name="SnowDarkening" value="0.85" />
+    <parameter name="MaxSnowDepth" value="1.0" />
+    <parameter name="SnowDarkening" value="0.75" />
     <parameter name="HighlightColor" value="0 0 0 1" />
-</material>
+</material>

GameData/Materials/material_OakPainted_Dark.xml

@@ -1,7 +1,7 @@
 <material>
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/OakPainted.dds" />
-    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="MatSpecColor" value=".5 .5 .5 16" />
     <parameter name="MatDiffColor" value=".259 .203 .01 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />

GameData/Materials/material_OakPainted_DarkPurple.xml

@@ -1,7 +1,7 @@
 <material>
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/OakPainted.dds" />
-    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="MatSpecColor" value=".5 .5 .5 16" />
     <parameter name="MatDiffColor" value=".299 .054 .292 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />

GameData/Materials/material_OakPainted_DarkReddish.xml

@@ -1,7 +1,7 @@
 <material>
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/OakPainted.dds" />
-    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="MatSpecColor" value=".5 .5 .5 16" />
     <parameter name="MatDiffColor" value=".356 .225 .225 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />

GameData/Materials/material_OakPainted_Greenish.xml

@@ -1,7 +1,7 @@
 <material>
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/OakPainted.dds" />
-    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="MatSpecColor" value=".5 .5 .5 16" />
     <parameter name="MatDiffColor" value=".423 .604 .381 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />

GameData/Materials/material_OakPainted_Grey.xml

@@ -1,7 +1,7 @@
 <material>
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/OakPainted.dds" />
-    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="MatSpecColor" value=".5 .5 .5 16" />
     <parameter name="MatDiffColor" value=".233 .461 .550 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />

GameData/Materials/material_OakPainted_Honey.xml

@@ -1,7 +1,7 @@
 <material>
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/OakPainted.dds" />
-    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="MatSpecColor" value=".5 .5 .5 16" />
     <parameter name="MatDiffColor" value=".766 .728 0 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />

GameData/Materials/material_OakPainted_LightGrey.xml

@@ -1,7 +1,7 @@
 <material>
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/OakPainted.dds" />
-    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="MatSpecColor" value=".5 .5 .5 16" />
     <parameter name="MatDiffColor" value=".685 .911 1 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />

GameData/Materials/material_OakPainted_Pink.xml

@@ -1,7 +1,7 @@
 <material>
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/OakPainted.dds" />
-    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="MatSpecColor" value=".5 .5 .5 16" />
     <parameter name="MatDiffColor" value=".835 .454 .824 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />

GameData/Materials/material_OakPainted_RichYellowBrown.xml

@@ -1,7 +1,7 @@
 <material>
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/OakPainted.dds" />
-    <parameter name="MatSpecColor" value="1 1 1 16" />
+    <parameter name="MatSpecColor" value=".5 .5 .5 16" />
     <parameter name="MatDiffColor" value=".83 .848 .248 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />

GameData/Materials/material_SandstoneCobblestonesRough.xml

@@ -2,7 +2,7 @@
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/SandstoneRoughCobblestone.dds" />
     <parameter name="MatSpecColor" value="2 2 2 16" />
-    <parameter name="MatDiffColor" value="1 1 1 1" />
+    <parameter name="MatDiffColor" value=".9 .9 .9 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".3" />
     <parameter name="SpecContrastL" value="1" />

GameData/Materials/material_SandstoneRaw.xml

@@ -2,7 +2,7 @@
     <technique name="Techniques/TF_cubes.xml" />
     <texture unit="diffuse" name="Textures/Cubes/SandstoneRaw.dds" />
     <parameter name="MatSpecColor" value="3 3 3 16" />
-    <parameter name="MatDiffColor" value="1 1 1 1" />
+    <parameter name="MatDiffColor" value=".8 .8 .8 1" />
     <parameter name="TextureTiles" value="7" />
     <parameter name="SpecContrastD" value=".45" />
     <parameter name="SpecContrastL" value="1" />

GameData/Shaders/GLSL/TF_cubes.glsl

@@ -41,6 +41,12 @@ varying vec4 vWorldPos;
     #endif
 #endif
 
+#ifndef GL_ES
+varying vec4 vEyeVec;
+#else
+varying highp vec4 vEyeVec;
+#endif
+
 uniform float cSpecContrastD;
 uniform float cSpecContrastL;
 
@@ -51,6 +57,8 @@ void VS()
     gl_Position = GetClipPos(worldPos);
     vNormal = GetWorldNormal(modelMatrix);
     vWorldPos = vec4(worldPos, GetDepth(gl_Position));
+    vEyeVec = vec4(cCameraPos - worldPos, GetDepth(gl_Position));
+
 
     #ifdef VERTEXCOLOR
         vColor = iColor;
@@ -109,6 +117,8 @@ void VS()
 
 void PS()
 {
+    float fresnel = pow(1.0 - clamp(dot(normalize(vEyeVec.xyz), vNormal), 0.0, 1.0), 4.0);
+    
     #ifdef DIFFMAP
         vec3 albedo = texture2D(sDiffMap, vTexCoord.xy).rgb;
         
@@ -128,11 +138,13 @@ void PS()
     #endif
     
     #ifdef SPECMAP
-        vec3 specColor = cMatSpecColor.rgb * smoothstep(cSpecContrastD, cSpecContrastL, albedo.b);
+        vec3 specColor = cMatSpecColor.rgb * smoothstep(cSpecContrastD, cSpecContrastL, albedo.b) * mix(.8, 10.0, fresnel);
     #else
         vec3 specColor = cMatSpecColor.rgb;
     #endif
 
+    diffColor = diffColor * mix(1.1, .8, fresnel);
+
     // Get normal
     #ifdef NORMALMAP
         mat3 tbn = mat3(vTangent.xyz, vec3(vTexCoord.zw, vTangent.w), vNormal);

GameData/Shaders/GLSL/TownforgeTerrain.glsl

@@ -4,6 +4,7 @@
 #include "ScreenPos.glsl"
 #include "Lighting.glsl"
 #include "Fog.glsl"
+#include "PostProcess.glsl"
 
 varying vec2 vTexCoord;
 
@@ -51,48 +52,46 @@ uniform sampler2D sHighlightMap5;
 uniform sampler2D sSnowMap6;
 #endif
 #endif
+uniform sampler2D sDetailMap7;
 
 #ifndef GL_ES
 uniform vec2 cDetailTiling;
+varying vec4 vEyeVec;
 #else
 uniform mediump vec2 cDetailTiling;
+varying highp vec4 vEyeVec;
 #endif
 
 #ifndef NOSNOW
 #
-uniform float cTemperature;
 uniform float cSnowinessMinTemperature;
 uniform float cSnowinessMaxTemperature;
-uniform float cTemperatureAltitudeFloor;
-uniform float cTemperatureAltitudeDecrease;
 uniform float cMaxSnowDepth;
 
 const float min_snow_threshold = 0.25;
 const float max_snow_threshold = 0.95;
 const float snow_saturation = 0.15;
 uniform float cSnowDarkening;
-#ifndef SNOWTEXTURE
-const vec4 snowColor = vec4(184.0 / 255.0, 183.0 / 255.0, 209 / 255.0, 1.0);
-#endif
-
+varying float snow_depth;
+varying float snowiness;
 #endif
 
 uniform vec4 cHighlightColor;
 
-#ifndef NOSNOW
-varying float snowiness;
-varying float snow_depth;
+uniform float cTemperature;
+varying float grassiness;
+uniform float cTemperatureAltitudeDecrease;
+uniform float cTemperatureAltitudeFloor;
 
-float GetSnowinessAtHeight(float height)
+const float ambientMultiplier = 1.5;
+
+float GetTemperatureAtHeight(float height)
 {
   height = max(height - cTemperatureAltitudeFloor, 0.0);
   float temperature = cTemperature - height * cTemperatureAltitudeDecrease;
   temperature -= height * cTemperatureAltitudeDecrease;
-  temperature = max(temperature, cSnowinessMinTemperature);
-  temperature = min(temperature, cSnowinessMaxTemperature);
-  return (cSnowinessMaxTemperature - temperature) / (cSnowinessMaxTemperature - cSnowinessMinTemperature);
+  return temperature;
 }
-#endif
 
 void VS()
 {
@@ -103,6 +102,8 @@ void VS()
     vWorldPos = vec4(worldPos, GetDepth(gl_Position));
     vTexCoord = GetTexCoord(iTexCoord);
     vDetailTexCoord = cDetailTiling * vTexCoord;
+    vEyeVec = vec4(cCameraPos - worldPos, GetDepth(gl_Position));
+
 
     #ifdef PERPIXEL
         // Per-pixel forward lighting
@@ -145,8 +146,15 @@ void VS()
         #endif
     #endif
 
+    float posTemperature = GetTemperatureAtHeight(vWorldPos.y);
+    grassiness = max(cTemperature, -2.0);
+    grassiness = min(grassiness, 10.0);
+    grassiness = (grassiness + 2.0) / (10.0);
+
     #ifndef NOSNOW
-        snowiness = GetSnowinessAtHeight(vWorldPos.y);
+        snowiness = max(posTemperature, cSnowinessMinTemperature);
+        snowiness = min(snowiness, cSnowinessMaxTemperature);
+        snowiness = (cSnowinessMaxTemperature - snowiness) / (cSnowinessMaxTemperature - cSnowinessMinTemperature);
         float snow_threshold = min_snow_threshold * snowiness + max_snow_threshold * (1.0 - snowiness);
         float upness = min((max(2.0 * snowiness * dot(vNormal, vec3(0.0, 1.0, 0.0)), snow_threshold) - snow_threshold) / (1.0 + snow_saturation - snow_threshold), 1.0);
         snow_depth = snowiness * max((upness - 0.5), 0.0) * 2;
@@ -156,24 +164,45 @@ void VS()
 
 void PS()
 {
-    // Get material diffuse albedo
+    // // Weights
     vec3 weights = texture2D(sWeightMap0, vTexCoord).rgb;
     float sumWeights = weights.r + weights.g + weights.b;
     weights /= sumWeights;
-    vec4 diffColor = cMatDiffColor * (
-#ifdef NOSNOW
-        weights.r * texture2D(sDetailMap1, vDetailTexCoord) +
-#else
-        weights.r * texture2D(sDetailMap1, vDetailTexCoord) * (1.0 - snowiness) +
-        weights.r * texture2D(sDetailMap4, vDetailTexCoord) * snowiness +
-#endif
-        weights.g * texture2D(sDetailMap2, vDetailTexCoord) + 
-        weights.b * texture2D(sDetailMap3, vDetailTexCoord)
+    float weightsCr = max(weights.b, weights.r);
+
+    // // Textures
+    vec4 tGrass = texture2D(sDetailMap3, vDetailTexCoord) * .1 + texture2D(sDetailMap3, vDetailTexCoord * 20) * .8;
+    vec4 tDeadGrass = texture2D(sDetailMap1, vDetailTexCoord) * .1 + texture2D(sDetailMap1, vDetailTexCoord * 20);
+    vec4 tGround = texture2D(sDetailMap2, vDetailTexCoord) * .1 + texture2D(sDetailMap2, vDetailTexCoord * 20) * .8;
+    vec4 dtGrass = mix(tDeadGrass, tGrass , grassiness);
+    vec4 tMountain = texture2D(sDetailMap7, vDetailTexCoord)  * .4 + texture2D(sDetailMap7, vDetailTexCoord * 4) * .6;
+
+    // // Mix Diffuse
+    vec4 diffColor = (
+        ((weights.r * tGround * mix(.8, 1.0, grassiness) +
+        weights.b * tGrass) * weightsCr +
+        (1.0 - weightsCr) * dtGrass) *
+        (1.0 - weights.g) + tMountain * weights.g * .8
     );
+    
+    // Get material specular from diffuse
+    vec3 specColor = cMatSpecColor.rgb * (diffColor.g - .4);
+    
+    // Add Snow
+    #ifndef NOSNOW
+        vec4 tSnowOverlay = texture2D(sDetailMap4, vDetailTexCoord) * (1.0 - texture2D(sDetailMap4, vDetailTexCoord * 5));
+        vec4 tSnow = (texture2D(sSnowMap6, vTexCoord) * .8 + texture2D(sSnowMap6, vTexCoord * 4) * .2)  * cSnowDarkening;
+        if (snowiness != .0 && snow_depth != 1.0)
+            diffColor = diffColor * (1.0 - tSnowOverlay * (1.0 - weights.g) * (1.0 - weights.r * .5) * snowiness) +
+            tSnowOverlay * .4 * (1.0 - weights.g) * (1.0 - weights.r * .7);
+            
+        if (snow_depth != .0)
+            diffColor = diffColor * (1.0 - snow_depth) + tSnow * snow_depth * .7;
+    #endif
 
-    // Get material specular albedo
-    vec3 specColor = cMatSpecColor.rgb;
-
+    float fresnel = pow(1.0 - clamp(dot(normalize(vEyeVec.xyz), vNormal), 0.0, 1.0), 4.0);
+    diffColor = diffColor * mix(1.1, .8, fresnel);
+    
     // Get normal
     #ifdef APPROXIMATENORMAL
     vec3 normal = vNormal;
@@ -181,13 +210,6 @@ void PS()
     vec3 normal = normalize(vNormal);
     #endif
 
-    #ifndef NOSNOW
-        #ifdef SNOWTEXTURE
-            vec4 snowColor = texture2D(sSnowMap6, vTexCoord * 2) * cSnowDarkening;
-        #endif
-        diffColor = diffColor * (1.0 - snow_depth) + snowColor * snow_depth * cSnowDarkening;
-    #endif
-
     // Get fog factor
     #ifdef HEIGHTFOG
         float fogFactor = GetHeightFogFactor(vWorldPos.w, vWorldPos.y);
@@ -223,7 +245,7 @@ void PS()
         #endif
 
         #ifdef AMBIENT
-            finalColor += cAmbientColor.rgb * diffColor.rgb;
+            finalColor += cAmbientColor.rgb * diffColor.rgb * ambientMultiplier;
             finalColor += cMatEmissiveColor;
             gl_FragColor = vec4(GetFog(finalColor, fogFactor), diffColor.a);
         #else
@@ -246,7 +268,7 @@ void PS()
         gl_FragData[3] = vec4(EncodeDepth(vWorldPos.w), 0.0);
     #else
         // Ambient & per-vertex lighting
-        vec3 finalColor = vVertexLight * diffColor.rgb;
+        vec3 finalColor = vVertexLight * diffColor.rgb * ambientMultiplier;
 
         #ifdef MATERIAL
             // Add light pre-pass accumulation result

src/game/main-urho3d.cc

@@ -2867,7 +2867,7 @@ void CryptoCityUrho3D::UpdateSky()
   const float interp = fmax(sin_timeOfDay, 0.0f);
   const float night_interp = fmax(sin_timeOfDay * -1, .0f);
   const float late_interp = fmin(1.0f, interp * 2.5f);
-  const float ambient_intensity = Lerp(.3f, .8f, interp);
+  const float ambient_intensity = Lerp(.4f, .7f, interp);
   float sunset_reddening = 4 * fmax((cos(M_PI * 1.0f + timeOfDay) - .75f), 0.0f);
   //float evening = fmax(cos(M_PI * .55f + timeOfDay), 0);