fly/fgdata
1
0
Fork 0
Code Activity

Add relief mapping to landmass effect

Browse source
This commit is contained in:
fredb 2010-03-28 17:00:19 +00:00
parent 2a99305a28
commit 24d8e9293c
3 changed files with 134 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Effects/landmass.eff
View file

@ -3,8 +3,19 @@
<name>Effects/landmass</name> <name>Effects/landmass</name>
<inherits-from>Effects/terrain-default</inherits-from> <inherits-from>Effects/terrain-default</inherits-from>
<parameters> <parameters>
<texture n="2">
<image>Textures.high/Terrain/forest-relief.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<snow-level><use>/sim/rendering/snow-level-m</use></snow-level> <snow-level><use>/sim/rendering/snow-level-m</use></snow-level>
</parameters> </parameters>
<generate>
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
@ -46,17 +57,35 @@
</texture-unit> </texture-unit>
<texture-unit> <texture-unit>
<unit>1</unit> <unit>1</unit>
<image><use>texture[0]/image</use></image> <image><use>texture[0]/image</use></image>
<filter><use>texture[0]/filter</use></filter> <filter><use>texture[0]/filter</use></filter>
<wrap-s><use>texture[0]/wrap-s</use></wrap-s> <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
<wrap-t><use>texture[0]/wrap-t</use></wrap-t> <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
<internal-format> <internal-format>
<use>texture[0]/internal-format</use> <use>texture[0]/internal-format</use>
</internal-format> </internal-format>
</texture-unit>
<texture-unit>
<unit>2</unit>
<image><use>texture[2]/image</use></image>
<filter><use>texture[2]/filter</use></filter>
<wrap-s><use>texture[2]/wrap-s</use></wrap-s>
<wrap-t><use>texture[2]/wrap-t</use></wrap-t>
<internal-format>
<use>texture[2]/internal-format</use>
</internal-format>
</texture-unit> </texture-unit>
<program> <program>
<vertex-shader>Shaders/landmass.vert</vertex-shader> <vertex-shader>Shaders/landmass.vert</vertex-shader>
<fragment-shader>Shaders/landmass.frag</fragment-shader> <fragment-shader>Shaders/landmass.frag</fragment-shader>
<attribute>
<name>tangent</name>
<index>6</index>
</attribute>
<attribute>
<name>binormal</name>
<index>7</index>
</attribute>
</program> </program>
<uniform> <uniform>
<name>NoiseTex</name> <name>NoiseTex</name>
@ -68,11 +97,21 @@
<type>sampler-2d</type> <type>sampler-2d</type>
<value type="int">1</value> <value type="int">1</value>
</uniform> </uniform>
<uniform>
<name>NormalTex</name>
<type>sampler-2d</type>
<value type="int">2</value>
</uniform>
<uniform>
<name>depth_factor</name>
<type>float</type>
<value type="float">0.01</value>
</uniform>
<uniform> <uniform>
<name>snowlevel</name> <name>snowlevel</name>
<type>float</type> <type>float</type>
<value type="float"> <value type="float">
<use>snow-level</use> <use>snow-level</use>
</value> </value>
</uniform> </uniform>
</pass> </pass>

77
Shaders/landmass.frag
View file

@ -3,18 +3,68 @@
varying vec4 rawpos; varying vec4 rawpos;
varying vec4 ecPosition; varying vec4 ecPosition;
varying vec3 VNormal; varying vec3 VNormal;
varying vec3 VTangent;
varying vec3 VBinormal;
varying vec3 Normal; varying vec3 Normal;
varying vec4 constantColor; varying vec4 constantColor;
uniform sampler3D NoiseTex; uniform sampler3D NoiseTex;
uniform sampler2D BaseTex; uniform sampler2D BaseTex;
uniform float snowlevel; uniform sampler2D NormalTex;
uniform float depth_factor;
uniform float snowlevel; // From /sim/rendering/snow-level-m
// From /sim/rendering/snow-level-m
const float scale = 1.0; const float scale = 1.0;
float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds)
{
const int linear_search_steps = 20;
float size = 1.0 / float(linear_search_steps);
float depth = 0.0;
float best_depth = 1.0;
for(int i = 0; i < linear_search_steps - 1; ++i)
{
depth += size;
float t = texture2D(reliefMap, dp + ds * depth).a;
if(best_depth > 0.996)
if(depth >= t)
best_depth = depth;
}
depth = best_depth;
const int binary_search_steps = 5;
for(int i = 0; i < binary_search_steps; ++i)
{
size *= 0.5;
float t = texture2D(reliefMap, dp + ds * depth).a;
if(depth >= t)
{
best_depth = depth;
depth -= 2.0 * size;
}
depth += size;
}
return(best_depth);
}
void main (void) void main (void)
{ {
vec3 V = normalize(ecPosition.xyz);
float a = dot(VNormal, -V);
vec2 s = vec2(dot(V, VTangent), dot(V, VBinormal));
s *= depth_factor / a;
vec2 ds = s;
vec2 dp = gl_TexCoord[0].st;
float d = ray_intersect(NormalTex, dp, ds);
vec2 uv = dp + ds * d;
vec3 N = texture2D(NormalTex, uv).xyz * 2.0 - 1.0;
vec4 noisevec = texture3D(NoiseTex, (rawpos.xyz)*0.01*scale); vec4 noisevec = texture3D(NoiseTex, (rawpos.xyz)*0.01*scale);
vec4 nvL = texture3D(NoiseTex, (rawpos.xyz)*0.00066*scale); vec4 nvL = texture3D(NoiseTex, (rawpos.xyz)*0.00066*scale);
@ -22,7 +72,6 @@ void main (void)
float fogCoord = ecPosition.z; float fogCoord = ecPosition.z;
const float LOG2 = 1.442695; const float LOG2 = 1.442695;
fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2); fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2);
// float biasFactor = exp2(-0.00000002 * fogCoord * fogCoord * LOG2);
float biasFactor = fogFactor = clamp(fogFactor, 0.0, 1.0); float biasFactor = fogFactor = clamp(fogFactor, 0.0, 1.0);
float n=0.06; float n=0.06;
@ -37,7 +86,7 @@ void main (void)
n += noisevec[3]*2.1; n += noisevec[3]*2.1;
n = mix(0.6, n, biasFactor); n = mix(0.6, n, biasFactor);
// good // good
vec4 c1 = texture2D(BaseTex, gl_TexCoord[0].st); vec4 c1 = texture2D(BaseTex, uv);
//brown //brown
//c1 = mix(c1, vec4(n-0.46, n-0.45, n-0.53, 1.0), smoothstep(0.50, 0.55, nvL[2]*6.6)); //c1 = mix(c1, vec4(n-0.46, n-0.45, n-0.53, 1.0), smoothstep(0.50, 0.55, nvL[2]*6.6));
//"steep = gray" //"steep = gray"
@ -45,8 +94,22 @@ void main (void)
//"snow" //"snow"
c1 = mix(c1, clamp(n+nvL[2]*4.1+vec4(0.1, 0.1, nvL[2]*2.2, 1.0), 0.7, 1.0), smoothstep(snowlevel+300.0, snowlevel+360.0, (rawpos.z)+nvL[1]*3000.0)); c1 = mix(c1, clamp(n+nvL[2]*4.1+vec4(0.1, 0.1, nvL[2]*2.2, 1.0), 0.7, 1.0), smoothstep(snowlevel+300.0, snowlevel+360.0, (rawpos.z)+nvL[1]*3000.0));
vec3 diffuse = gl_Color.rgb * max(0.0, dot(normalize(VNormal), gl_LightSource[0].position.xyz)); N = normalize(N.x * VTangent + N.y * VBinormal + N.z * VNormal);
vec4 ambient_light = constantColor + gl_LightSource[0].diffuse * vec4(diffuse, 1.0); vec3 l = gl_LightSource[0].position.xyz;
vec3 diffuse = gl_Color.rgb * max(0.0, dot(N, l));
// Shadow
dp += ds * d;
vec3 sl = normalize( vec3( dot( l, VTangent ), dot( l, VBinormal ), dot( -l, VNormal ) ) );
ds = sl.xy * depth_factor / sl.z;
dp -= ds * d;
float dl = ray_intersect(NormalTex, dp, ds);
float shadow_factor = 1.0;
if ( dl < d - 0.05 )
shadow_factor = dot( constantColor.xyz, vec3( 1.0, 1.0, 1.0 ) ) * 0.25;
// end shadow
vec4 ambient_light = constantColor + gl_LightSource[0].diffuse * shadow_factor * vec4(diffuse, 1.0);
c1 *= ambient_light; c1 *= ambient_light;
vec4 finalColor = c1; vec4 finalColor = c1;

27
Shaders/landmass.vert
View file

@ -1,19 +1,26 @@
varying vec4 rawpos; varying vec4 rawpos;
varying vec4 ecPosition; varying vec4 ecPosition;
varying vec3 VNormal; varying vec3 VNormal;
varying vec3 VTangent;
varying vec3 VBinormal;
varying vec3 Normal; varying vec3 Normal;
varying vec4 constantColor; varying vec4 constantColor;
attribute vec3 tangent;
attribute vec3 binormal;
void main(void) void main(void)
{ {
rawpos = gl_Vertex; rawpos = gl_Vertex;
ecPosition = gl_ModelViewMatrix * gl_Vertex; ecPosition = gl_ModelViewMatrix * rawpos;
VNormal = normalize(gl_NormalMatrix * gl_Normal); Normal = normalize(gl_Normal);
Normal = normalize(gl_Normal); VNormal = gl_NormalMatrix * gl_Normal;
VTangent = gl_NormalMatrix * tangent;
VBinormal = gl_NormalMatrix * binormal;
gl_FrontColor = gl_Color; gl_FrontColor = gl_Color;
constantColor = gl_FrontMaterial.emission constantColor = gl_FrontMaterial.emission
+ gl_Color * (gl_LightModel.ambient + gl_LightSource[0].ambient); + gl_FrontColor * (gl_LightModel.ambient + gl_LightSource[0].ambient);
gl_Position = ftransform(); gl_Position = ftransform();
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
} }