Index: materials.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/materials.xml,v retrieving revision 1.107 diff -u -p -r1.107 materials.xml --- materials.xml 15 Jul 2009 22:50:03 -0000 1.107 +++ materials.xml 30 Jul 2009 19:54:45 -0000 @@ -675,6 +675,7 @@ Shared parameters for various materials. EvergreenBroadCover Island Default + Effects/landmass Terrain/forest1a.png Terrain/forest1b.png Terrain/forest1c.png @@ -698,6 +699,7 @@ Shared parameters for various materials. summer + Effects/landmass DeciduousBroadCover Bog Terrain/deciduous1.png @@ -723,6 +725,7 @@ Shared parameters for various materials. summer + Effects/landmass MixedForestCover Terrain/mixedforest.png Terrain/mixedforest2.png @@ -747,6 +750,7 @@ Shared parameters for various materials. summer + Effects/landmass EvergreenNeedleCover WoodedTundraCover Terrain/evergreen.png @@ -770,6 +774,7 @@ Shared parameters for various materials. summer + Effects/landmass DeciduousNeedleCover Terrain/dec_evergreen.png 1000 @@ -812,6 +817,7 @@ Shared parameters for various materials. summer + Effects/landmass ShrubCover ShrubGrassCover ScrubCover @@ -996,6 +1002,7 @@ Shared parameters for various materials. summer + Effects/water Lake Pond Reservoir @@ -1221,6 +1228,7 @@ Shared parameters for various materials. summer + Effects/crop MixedCropPastureCover Terrain/mixedcrop1.png Terrain/mixedcrop4.png @@ -1279,6 +1287,7 @@ Shared parameters for various materials. summer + Effects/crop IrrCropPastureCover Terrain/irrcrop1.png Terrain/irrcrop2.png @@ -1337,6 +1346,7 @@ Shared parameters for various materials. summer + Effects/crop DryCropPastureCover Terrain/drycrop1.png Terrain/drycrop2.png @@ -1396,6 +1406,7 @@ Shared parameters for various materials. summer + Effects/crop CropGrassCover Terrain/cropgrass1.png Terrain/cropgrass2.png @@ -1437,6 +1448,7 @@ Shared parameters for various materials. CropWoodCover + Effects/landmass Terrain/cropwood.png 2000 2000 @@ -2303,6 +2315,7 @@ Shared parameters for various materials. Ocean + Effects/water Terrain/water.png 400 400 Index: Shaders/crop.frag =================================================================== RCS file: Shaders/crop.frag diff -N Shaders/crop.frag --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Shaders/crop.frag 30 Jul 2009 19:54:45 -0000 @@ -0,0 +1,133 @@ +#version 120 + +varying vec4 rawpos; +varying vec4 ecPosition; +varying vec3 VNormal; +varying vec3 Normal; + +uniform sampler3D NoiseTex; +uniform sampler2D SampleTex; +uniform sampler1D ColorsTex; + +const float scale = 1.0; + +const vec4 red = vec4(1.0, 0.0, 0.0, 1.0); +const vec4 green = vec4(0.0, 1.0, 0.0, 1.0); +const vec4 blue = vec4(0.0, 0.0, 1.0, 1.0); +const vec4 yellow = vec4(1.0, 1.0, 0.0, 1.0); + +#define CD 1 +#define BLA 1 +#define BLA2 0 + +void main (void) +{ + const float snowlevel=2000.0; + + vec4 vbasec = texture3D(NoiseTex, texture2D(SampleTex, (rawpos.xy)*0.00019531).rgb*0.09); + float basec = vbasec.r*2.1; + basec = smoothstep(0.44, 0.547, basec); + //vec4 basec = smoothstep(0.0, 0.7, texture3D(NoiseTex, rawpos.xyz*0.01)*1.0); + vec4 basecolor = texture1D(ColorsTex, basec); +#if BLA + basecolor = texture2D(SampleTex, rawpos.xy*0.000144); + basecolor = texture1D(ColorsTex, basecolor.r+0.00); +#endif +#if BLA2 + vec4 nv = texture3D(NoiseTex, abs(rawpos.xyz)*0.000593)*6.0; + basecolor = vec4(nv.r, nv.r, nv.r, 1.0); + + basecolor = texture2D(SampleTex, vec2(nv.r, nv.g)+(rawpos.xy)*0.00019531*0.0); + basecolor = texture1D(ColorsTex, basecolor.r+0.00); +#endif + +// basecolor=vec4(basec, basec, basec, 1.0); +// vec4 basecolor = texture1D(ColorsTex, 0.5); + + vec4 noisevec = texture3D(NoiseTex, (rawpos.xyz)*0.01*scale); + + vec4 nvL = texture3D(NoiseTex, (rawpos.xyz)*0.00066*scale); + vec4 km = floor((rawpos)/1000.0); + +// vec4 noisevec = texture3D(NoiseTex, (km.xyz)*0.1); +// vec4 nvL = texture3D(NoiseTex, (km.xyz)*0.1*scale); + + float fogFactor; + float fogCoord = ecPosition.z; + const float LOG2 = 1.442695; + 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 n=0.06; + n += nvL[0]*0.4; + n += nvL[1]*0.6; + n += nvL[2]*2.0; + n += nvL[3]*4.0; + n += noisevec[0]*0.1; + n += noisevec[1]*0.4; + + n += noisevec[2]*0.8; + n += noisevec[3]*2.1; + n = mix(0.6, n, biasFactor); + + // good + vec4 c1; + c1 = basecolor * vec4(smoothstep(0.0, 1.15, n), smoothstep(0.0, 1.2, n), smoothstep(0.1, 1.3, n), 1.0); +/* + if(rawpos.x < 0.0) + c1 += vec4(0.2, 0.0, 0.0, 1.0); + if(rawpos.y < 0.0) + c1 += vec4(0.0, 0.2, 0.0, 1.0); +*/ +/* + if(rawpos.x > 6000.0) + c1 += vec4(0.0, 0.0, 0.2, 1.0); +*/ +// c1 = mix(vec4(smoothstep(0.0, 1.88, n), smoothstep(0.0, 1.8, n), smoothstep(0.1, 2.0, n), 1.0), basecolor, 0.7); +// c1 = vec4(basec.r, basec.r, basec.r, 1.0); +// c1 = basecolor; +// c1 = vec4(noise2(rawpos.xy)*20.0, 0.0, 1.0); +// if(fract(gl_TexCoord[0].x) > 0.95 || fract(gl_TexCoord[0].y) > 0.95) +// c1 = vec4(0.0); +// if(fract(gl_TexCoord[0].x) < 0.05 || fract(gl_TexCoord[0].y) < 0.05) +// c1 = vec4(0.0); + //brown + //c1 = mix(c1, vec4(n-0.46, n-0.45, n-0.55, 1.0), smoothstep(0.50, 0.61, nvL[2]*6.5)); + //rocks + //c1 = mix(c1, vec3(nvL[3]*12.0+noisevec[3]*6.0,nvL[3]*11.5+noisevec[3]*6.0,nvL[3]*11.0+noisevec[3]*6.0), smoothstep(0.64, 0.66, nvL[3]*11.7+noisevec[3]*5.2)*biasFactor); +/* + c1 = mix(c1, vec4( + nvL[3]*12.0+noisevec[1]*1.0, + nvL[3]*11.5+noisevec[1]*1.0, + nvL[3]*11.0+noisevec[1]*1.0, 1.0), + smoothstep(0.548, 0.549, nvL[1]*3.13+noisevec[1]*0.17)*biasFactor); +*/ + //"steep = gray" + c1 = mix(vec4(n-0.42, n-0.44, n-0.51, 1.0), c1, smoothstep(0.970, 0.990, abs(normalize(Normal).z)+nvL[2]*1.3)); + //c1 = mix(vec4(n-0.30, n-0.29, n-0.33, 1.0), c1, smoothstep(1.030, 1.035, abs(normalize(Normal).z)+nvL[2]*1.1)); + /* debug normals */ + //c1 = reflect(normalize(vec3(1,1,1)), normalize(Normal)); + //"snow" + //c1 = mix(c1, vec4(1.0), smoothstep(0.5, 0.55, (rawpos.z*0.001)+nvL[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)); + +// c1 = mix(c1, vec4(0.6), smoothstep(0.200, 0.230, abs(normalize(Normal).z))); +// c1 = normalize(Normal)*0.5+0.5; + +// c1 = mix(vec4(0.25f, 0.30f, 0.19f, 1.0f), c1, biasFactor); + + + vec3 diffuse = gl_FrontMaterial.diffuse.rgb * max(0.0, dot(VNormal, gl_LightSource[0].position.xyz)); + vec4 ambientColor = gl_FrontLightModelProduct.sceneColor + gl_LightSource[0].ambient * gl_FrontMaterial.ambient; +// ambientColor = vec4(0.01); + vec4 ambient_light = ambientColor + gl_LightSource[0].diffuse * vec4(diffuse, 1.0); + + c1 *= ambient_light; + vec4 finalColor = c1; + + if(gl_Fog.density == 1.0) + fogFactor=1.0; + + gl_FragColor = mix(gl_Fog.color ,finalColor, fogFactor); +} Index: Shaders/crop.vert =================================================================== RCS file: Shaders/crop.vert diff -N Shaders/crop.vert --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Shaders/crop.vert 30 Jul 2009 19:54:45 -0000 @@ -0,0 +1,20 @@ +#version 120 + +varying vec4 rawpos; +varying vec4 ecPosition; +varying vec3 VNormal; +varying vec3 Normal; +centroid varying vec4 ipos; + +void main(void) +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + + rawpos = gl_Vertex; + ipos = gl_Vertex; + ecPosition = gl_ModelViewMatrix * gl_Vertex; + VNormal = normalize(gl_NormalMatrix * gl_Normal); + Normal = normalize(gl_Normal); + + gl_Position = ftransform(); +} Index: Shaders/landmass.frag =================================================================== RCS file: Shaders/landmass.frag diff -N Shaders/landmass.frag --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Shaders/landmass.frag 30 Jul 2009 19:54:45 -0000 @@ -0,0 +1,83 @@ +#version 120 + +varying vec4 rawpos; +varying vec4 ecPosition; +varying vec3 VNormal; +varying vec3 Normal; + +uniform sampler3D NoiseTex; + +const float scale = 1.0; + +void main (void) +{ + const float snowlevel=2000.0; + vec4 noisevec = texture3D(NoiseTex, (rawpos.xyz)*0.01*scale); + vec4 nvL = texture3D(NoiseTex, (rawpos.xyz)*0.00066*scale); + + float fogFactor; + float fogCoord = ecPosition.z; + const float LOG2 = 1.442695; + 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 n=0.06; + n += nvL[0]*0.4; + n += nvL[1]*0.6; + n += nvL[2]*2.0; + n += nvL[3]*4.0; + n += noisevec[0]*0.1; + n += noisevec[1]*0.4; + + n += noisevec[2]*0.8; + n += noisevec[3]*2.1; + n = mix(0.6, n, biasFactor); +// n+=0.8-biasFactor; + +// n = clamp(n, 0.0, 1.0); + // good + vec4 c1; + //c1 = vec3(smoothstep(-0.0, 1.6, n), smoothstep(-0.0, 1.44, n), smoothstep(0.1, 1.8, n)); + c1 = vec4(smoothstep(-0.0, 2.1, n), smoothstep(-0.0, 1.93, n), smoothstep(0.1, 2.3, n), 1.0); + //brown + //c1 = mix(c1, vec3(n-0.3, n-0.3, n-0.5), smoothstep(0.47, 0.51, 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)); + //rocks + //c1 = mix(c1, vec3(nvL[3]*12.0+noisevec[3]*6.0,nvL[3]*11.5+noisevec[3]*6.0,nvL[3]*11.0+noisevec[3]*6.0), smoothstep(0.64, 0.66, nvL[3]*11.7+noisevec[3]*5.2)*biasFactor); + +/* + c1 = mix(c1, vec4( + nvL[3]*12.0+noisevec[1]*1.0, + nvL[3]*11.5+noisevec[1]*1.0, + nvL[3]*11.0+noisevec[1]*1.0, 1.0), + smoothstep(0.548, 0.549, nvL[1]*3.13+noisevec[1]*0.17)*biasFactor); +*/ + //"steep = gray" + c1 = mix(vec4(n-0.30, n-0.29, n-0.37, 1.0), c1, smoothstep(0.970, 0.990, abs(normalize(Normal).z)+nvL[2]*1.3)); + //c1 = mix(vec4(n-0.30, n-0.29, n-0.33, 1.0), c1, smoothstep(1.030, 1.035, abs(normalize(Normal).z)+nvL[2]*1.1)); + /* debug normals */ + //c1 = reflect(normalize(vec3(1,1,1)), normalize(Normal)); + //"snow" + //c1 = mix(c1, vec4(1.0), smoothstep(0.5, 0.55, (rawpos.z*0.001)+nvL[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)); + +// c1 = mix(c1, vec4(0.6), smoothstep(0.200, 0.230, abs(normalize(Normal).z))); +// c1 = normalize(Normal)*0.5+0.5; + +// c1 = mix(vec4(0.25f, 0.30f, 0.19f, 1.0f), c1, biasFactor); + + + vec3 diffuse = gl_FrontMaterial.diffuse.rgb * max(0.0, dot(VNormal, gl_LightSource[0].position.xyz)); + vec4 ambientColor = gl_FrontLightModelProduct.sceneColor + gl_LightSource[0].ambient * gl_FrontMaterial.ambient; +// ambientColor = vec4(0.01); + vec4 ambient_light = ambientColor + gl_LightSource[0].diffuse * vec4(diffuse, 1.0); + + c1 *= ambient_light; + vec4 finalColor = c1; + + if(gl_Fog.density == 1.0) + fogFactor=1.0; + + gl_FragColor = mix(gl_Fog.color ,finalColor, fogFactor); +} Index: Shaders/landmass.vert =================================================================== RCS file: Shaders/landmass.vert diff -N Shaders/landmass.vert --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Shaders/landmass.vert 30 Jul 2009 19:54:45 -0000 @@ -0,0 +1,14 @@ +varying vec4 rawpos; +varying vec4 ecPosition; +varying vec3 VNormal; +varying vec3 Normal; + +void main(void) +{ + rawpos = gl_Vertex; + ecPosition = gl_ModelViewMatrix * gl_Vertex; + VNormal = normalize(gl_NormalMatrix * gl_Normal); + Normal = normalize(gl_Normal); + + gl_Position = ftransform(); +} Index: Shaders/water.frag =================================================================== RCS file: Shaders/water.frag diff -N Shaders/water.frag --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Shaders/water.frag 30 Jul 2009 19:54:45 -0000 @@ -0,0 +1,102 @@ +#version 120 + +varying vec4 rawpos; +varying vec4 ecPosition; +varying vec3 VNormal; +varying vec3 Normal; +varying vec3 lightVec; + +uniform sampler3D NoiseTex; +uniform float osg_SimulationTime; + +const float scale = 1.0; + +void main (void) +{ + const float snowlevel=2000.0; + vec4 noisevecS = texture3D(NoiseTex, (rawpos.xyz)*0.0126); + vec4 nvLS = texture3D(NoiseTex, (rawpos.xyz)*-0.0003323417); + + vec4 noisevec = texture3D(NoiseTex, (rawpos.xyz)*0.00423+vec3(0.0,0.0,osg_SimulationTime*0.035217)); + vec4 nvL = texture3D(NoiseTex, (rawpos.xyz)*0.001223417+(0.0,0.0,osg_SimulationTime*-0.0212)); + + float fogFactor; + float fogCoord = ecPosition.z; + const float LOG2 = 1.442695; + fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2); + float biasFactor = exp2(-0.00000002 * fogCoord * fogCoord * LOG2); + fogFactor = clamp(fogFactor, 0.0, 1.0); + + float a=1.0; + float n=0.00; + n += nvLS[0]*a; + a/=2.0; + n += nvLS[1]*a; + a/=2.0; + n += nvLS[2]*a; + a/=2.0; + n += nvLS[3]*a; + + a=4.0; + float na=n; + na += nvL[0]*1.1; + a*=1.2; + na += nvL[1]*a; + a*=1.2; + na += nvL[2]*a; + a*=1.2; + na += nvL[3]*a; + a=2.0; + na += noisevec[0]*a*0.2; + a*=1.2; + na += noisevec[1]*a; + a*=1.2; + na += noisevec[2]*a; + a*=1.2; + na += noisevec[3]*a; + +// GOOD + + vec4 c1; + c1 = vec4(smoothstep(0.0, 2.2, n), smoothstep(-0.1, 2.10, n), smoothstep(-0.2, 2.0, n), 1.0); +/* + +vec3 Reflected = normalize(reflect(-normalize(lightVec), normalize(VNormal+nvL[2]*0.8))); +vec3 bump = normalize(VNormal+vec3(0.0, 0.0, nvL[0]*1.4+nvL[1]*6.4+nvL[2]*16+noisevec[3]*3.3)*2.0-1.4); +vec3 bumped = max(dot(normalize(Normal), normalize(bump)), 0.0); +bumped=max(normalize(refract(lightVec, normalize(bump), 0.3)), 0.0); +*/ +vec3 Eye = normalize(-ecPosition.xyz); +vec3 Reflected = normalize(reflect(-normalize(lightVec), normalize(VNormal+vec3(0.0,0.0,na*0.10-0.24)))); +//Reflected = normalize(reflect(-normalize(lightVec), normalize(VNormal))); +vec3 bump = normalize(VNormal+vec3(0.0, 0.0, na)-0.9); +vec3 bumped; +// = max(dot(normalize(Normal.xyz), normalize(bump)), vec3(0.0, 0.0, 0.0)); +bumped=max(normalize(refract(lightVec, normalize(bump), 0.16)), 0.0); + +vec4 ambientColor = gl_LightSource[0].ambient; +vec4 light = ambientColor; +c1 *= light; + + +// c1 += gl_LightSource[0].diffuse*0.5 * pow(max(dot(Reflected, Eye), 0.0), 2.0/*gl_FrontMaterial.shininess*/); +// c1 *= pow(max(Reflected.x+Reflected.y+Reflected.z, 0.0), 1.0/*gl_FrontMaterial.shininess*/); +// c1 *= 0.3; +// c1 = vec4(0.0); +// c1 = vec4(0.0); + //c1 += (vec3(0.0, 0.01, 0.01)*n) * pow(max(Reflected.x+Reflected.y+Reflected.z, 0.0), 9.0/*gl_FrontMaterial.shininess*/); +// c1 += gl_LightSource[0].specular*2.0 * pow(max(dot(bumped, Eye), 0.3), 89.0)/*gl_FrontMaterial.shininess*/; + + +// HERE IS GOOD + + c1 += (vec4(0.3, 0.34, 0.4, 1.0)-0.1)*gl_LightSource[0].diffuse * (bumped.r+bumped.g+bumped.b); +// c1 = bumped; + c1 += gl_LightSource[0].specular*2.0 * pow(max(dot(Reflected, Eye), 0.0), 90.0/*gl_FrontMaterial.shininess*/); + vec4 finalColor = c1; + + if(gl_Fog.density == 1.0) + fogFactor=1.0; + + gl_FragColor = mix(gl_Fog.color ,finalColor, fogFactor); +} Index: Shaders/water.vert =================================================================== RCS file: Shaders/water.vert diff -N Shaders/water.vert --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Shaders/water.vert 30 Jul 2009 19:54:45 -0000 @@ -0,0 +1,15 @@ +varying vec4 rawpos; +varying vec4 ecPosition; +varying vec3 VNormal; +varying vec3 Normal; +varying vec3 lightVec; + +void main(void) +{ + rawpos = gl_Vertex; + ecPosition = gl_ModelViewMatrix * gl_Vertex; + VNormal = normalize(gl_NormalMatrix * gl_Normal); + Normal = normalize(gl_Normal); + lightVec = normalize(gl_LightSource[0].position.xyz/* - ecPosition*/); + gl_Position = ftransform(); +} Index: Effects/crop.eff =================================================================== RCS file: Effects/crop.eff diff -N Effects/crop.eff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Effects/crop.eff 30 Jul 2009 19:54:45 -0000 @@ -0,0 +1,167 @@ + + + Effects/crop + + + + + 0.2 .2 0.2 1.0 + + + .8 .8 .8 1.0 + + + 0.0 0.0 0.0 1.0 + + + 0.0 0.0 0.0 1.0 + + 1.2 + + + fg:noise3d + linear + mirror + mirror + mirror + normalized + + + Textures/Terrain/crop.png + linear-mipmap-linear + repeat + repeat + normalized + + + 1d + Textures/Terrain/cropcolors.png + linear-mipmap-linear + mirror + normalized + + false + + 0 + RenderBin + + + + + + /sim/rendering/shader-effects + + + 2.0 + + + + GL_ARB_shader_objects + GL_ARB_shading_language_100 + GL_ARB_vertex_shader + GL_ARB_fragment_shader + + + + + + true + + material/ambient + material/diffuse + material/specular + ambient-and-diffuse + + transparent + transparent + smooth + back + + render-bin/bin-number + render-bin/bin-name + + + 0 + texture[0]/image + texture[0]/filter + texture[0]/wrap-s + texture[0]/wrap-t + texture[0]/wrap-r + + texture[0]/internal-format + + + + 1 + texture[1]/image + texture[1]/filter + texture[1]/wrap-s + texture[1]/wrap-t + + texture[1]/internal-format + + + + 2 + texture[2]/type + texture[2]/image + texture[2]/filter + texture[2]/wrap-s + + texture[2]/internal-format + + + + Shaders/crop.vert + Shaders/crop.frag + + + NoiseTex + sampler-3d + 0 + + + SampleTex + sampler-2d + 1 + + + ColorsTex + sampler-1d + 2 + + + + + + true + + material/ambient + material/diffuse + material/specular + ambient-and-diffuse + + transparent + transparent + smooth + back + + render-bin/bin-number + render-bin/bin-name + + + 0 + texture[0]/image + texture[0]/filter + texture[0]/wrap-s + texture[0]/wrap-t + + texture[0]/internal-format + + + modulate + + + + + Index: Effects/landmass.eff =================================================================== RCS file: Effects/landmass.eff diff -N Effects/landmass.eff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Effects/landmass.eff 30 Jul 2009 19:54:45 -0000 @@ -0,0 +1,127 @@ + + + Effects/landmass + + + + + 0.2 .2 0.2 1.0 + + + .8 .8 .8 1.0 + + + 0.0 0.0 0.0 1.0 + + + 0.0 0.0 0.0 1.0 + + 1.2 + + + fg:noise3d + linear + + mirror + mirror + mirror + + + normalized + + false + + 0 + RenderBin + + + + + + /sim/rendering/shader-effects + + + 2.0 + + + + GL_ARB_shader_objects + GL_ARB_shading_language_100 + GL_ARB_vertex_shader + GL_ARB_fragment_shader + + + + + + true + + material/ambient + material/diffuse + material/specular + ambient-and-diffuse + + transparent + transparent + smooth + back + + render-bin/bin-number + render-bin/bin-name + + + 0 + texture[0]/image + texture[0]/filter + texture[0]/wrap-s + texture[0]/wrap-t + texture[0]/wrap-r + + texture[0]/internal-format + + + + Shaders/landmass.vert + Shaders/landmass.frag + + + texture + sampler-3d + 0 + + + + + true + + material/ambient + material/diffuse + material/specular + ambient-and-diffuse + + transparent + transparent + smooth + back + + render-bin/bin-number + render-bin/bin-name + + + 0 + texture[0]/image + texture[0]/filter + texture[0]/wrap-s + texture[0]/wrap-t + + texture[0]/internal-format + + + modulate + + + + + Index: Effects/terrain-default.eff =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Effects/terrain-default.eff,v retrieving revision 1.4 diff -u -p -r1.4 terrain-default.eff --- Effects/terrain-default.eff 15 Jul 2009 22:49:53 -0000 1.4 +++ Effects/terrain-default.eff 30 Jul 2009 19:54:45 -0000 @@ -19,7 +19,6 @@ 1.2 - Textures/Terrain/unknown.png linear-mipmap-linear @@ -30,7 +29,6 @@ --> normalized - false @@ -74,15 +72,13 @@ 0 - texture[0]/texture2d - texture[0]/texture2d/image - texture[0]/texture2d/filter - texture[0]/texture2d/wrap-s - texture[0]/texture2d/wrap-t + texture[0]/image + texture[0]/filter + texture[0]/wrap-s + texture[0]/wrap-t - texture[0]/texture2d/internal-format + texture[0]/internal-format - Shaders/default.vert @@ -90,7 +86,7 @@ texture - sampler-2d + sampler-3d 0 @@ -113,15 +109,13 @@ 0 - texture[0]/texture2d - texture[0]/texture2d/image - texture[0]/texture2d/filter - texture[0]/texture2d/wrap-s - texture[0]/texture2d/wrap-t + texture[0]/texture/image + texture[0]/texture/filter + texture[0]/texture/wrap-s + texture[0]/texture/wrap-t - texture[0]/texture2d/internal-format + texture[0]/texture/internal-format - modulate Index: Effects/water.eff =================================================================== RCS file: Effects/water.eff diff -N Effects/water.eff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Effects/water.eff 30 Jul 2009 19:54:45 -0000 @@ -0,0 +1,127 @@ + + + Effects/water + + + + + 0.2 .2 0.2 1.0 + + + .8 .8 .8 1.0 + + + 0.0 0.0 0.0 1.0 + + + 0.0 0.0 0.0 1.0 + + 1.2 + + + fg:noise3d + linear + + mirror + mirror + mirror + + + normalized + + false + + 0 + RenderBin + + + + + + /sim/rendering/shader-effects + + + 2.0 + + + + GL_ARB_shader_objects + GL_ARB_shading_language_100 + GL_ARB_vertex_shader + GL_ARB_fragment_shader + + + + + + true + + material/ambient + material/diffuse + material/specular + ambient-and-diffuse + + transparent + transparent + smooth + back + + render-bin/bin-number + render-bin/bin-name + + + 0 + texture[1]/image + texture[1]/filter + texture[1]/wrap-s + texture[1]/wrap-t + texture[1]/wrap-r + + texture[1]/internal-format + + + + Shaders/water.vert + Shaders/water.frag + + + texture + sampler-3d + 0 + + + + + true + + material/ambient + material/diffuse + material/specular + ambient-and-diffuse + + transparent + transparent + smooth + back + + render-bin/bin-number + render-bin/bin-name + + + 0 + texture[0]/image + texture[0]/filter + texture[0]/wrap-s + texture[0]/wrap-t + + texture[0]/internal-format + + + modulate + + + + +