fly/fgdata
1
0
Fork 0
Code Activity

Change default effects attached to terrain and models

Browse source 
Add a technique that initialize the buffers of the Rembrandt renderer
     (use Multi Render Target)
  Renumber techniques that depends on old technique 10 (now 11) of model-default
This commit is contained in:
Frederic Bouvier 2012-03-25 19:03:52 +02:00
parent 4334e98e1d
commit c4390ae31a
7 changed files with 178 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Effects/bowwave.eff
View file

@ -492,7 +492,7 @@
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="10"> <technique n="11"> <!-- FIXME: this technique number overlaps the one in model-default -->
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/water</property> <property>/sim/rendering/shaders/water</property>

2
Effects/bumpspec.eff
View file

@ -34,7 +34,7 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="10"> <technique n="11"> <!-- This number should be the same than the second technique in model-default -->
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/model</property> <property>/sim/rendering/shaders/model</property>

2
Effects/model-combined.eff
View file

@ -148,7 +148,7 @@ please see Docs/README.model-combined.eff for documentation
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate>--> </generate>-->
<technique n="10"> <technique n="11"> <!-- FIXME: this technique number overlaps the one in model-default -->
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/model</property> <property>/sim/rendering/shaders/model</property>

73
Effects/model-default.eff
View file

@ -11,6 +11,7 @@
<color-mode-uniform>1</color-mode-uniform> <color-mode-uniform>1</color-mode-uniform>
<!-- DIFFUSE --> <!-- DIFFUSE -->
</material> </material>
<material-id>0</material-id>
<!-- BEGIN fog include --> <!-- BEGIN fog include -->
<visibility> <visibility>
<use>/environment/ground-visibility-m</use> <use>/environment/ground-visibility-m</use>
@ -131,7 +132,75 @@
</pass> </pass>
</technique> </technique>
<technique n="10"> <technique n="10">
<predicate>
<and>
<property>/sim/rendering/rembrandt</property>
<or>
<less-equal>
<value type="float">2.0</value>
<glversion/>
</less-equal>
<and>
<extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
<extension-supported>GL_EXT_gpu_shader4</extension-supported>
<extension-supported>GL_ARB_texture_rg</extension-supported>
</and>
</predicate>
<pass>
<lighting>false</lighting>
<material>
<ambient><use>material/ambient</use></ambient>
<diffuse><use>material/diffuse</use></diffuse>
<specular><use>material/specular</use></specular>
<emissive><use>material/emissive</use></emissive>
<shininess><use>material/shininess</use></shininess>
<color-mode>ambient-and-diffuse</color-mode>
</material>
<blend>false</blend>
<alpha-test>true</alpha-test>
<shade-model>smooth</shade-model>
<cull-face>back</cull-face>
<render-bin>
<bin-number>1</bin-number>
<bin-name>RenderBin</bin-name>
</render-bin>
<texture-unit>
<unit>0</unit>
<image><use>texture[0]/image</use></image>
<filter><use>texture[0]/filter</use></filter>
<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
<wrap-t><use>texture[0]/wrap-t</use></wrap-t>
<internal-format>
<use>texture[0]/internal-format</use>
</internal-format>
<environment>
<mode>modulate</mode>
</environment>
</texture-unit>
<program>
<vertex-shader>Shaders/deferred-gbuffer.vert</vertex-shader>
<fragment-shader>Shaders/deferred-gbuffer.frag</fragment-shader>
</program>
<uniform>
<name>texture</name>
<type>sampler-2d</type>
<value type="int">0</value>
</uniform>
<!-- uniform>
<name>materialID</name>
<type>int</type>
<value><use>material-id</use></value>
</uniform -->
</pass>
</technique>
<technique n="11">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/generic</property> <property>/sim/rendering/shaders/generic</property>
@ -290,7 +359,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="11"> <technique n="12">
<pass> <pass>
<lighting>true</lighting> <lighting>true</lighting>
<material> <material>

71
Effects/terrain-default.eff
View file

@ -35,6 +35,7 @@
<bin-number>0</bin-number> <bin-number>0</bin-number>
<bin-name>RenderBin</bin-name> <bin-name>RenderBin</bin-name>
</render-bin> </render-bin>
<material-id>0</material-id>
<visibility><use>/environment/ground-visibility-m</use></visibility> <visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility> <avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness> <lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
@ -195,6 +196,74 @@
</technique> </technique>
<technique n="10"> <technique n="10">
<predicate>
<and>
<property>/sim/rendering/rembrandt</property>
<or>
<less-equal>
<value type="float">2.0</value>
<glversion/>
</less-equal>
<and>
<extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
<extension-supported>GL_EXT_gpu_shader4</extension-supported>
<extension-supported>GL_ARB_texture_rg</extension-supported>
</and>
</predicate>
<pass>
<lighting>false</lighting>
<material>
<ambient><use>material/ambient</use></ambient>
<diffuse><use>material/diffuse</use></diffuse>
<specular><use>material/specular</use></specular>
<emissive><use>material/emissive</use></emissive>
<shininess><use>material/shininess</use></shininess>
<color-mode>ambient-and-diffuse</color-mode>
</material>
<blend>false</blend>
<alpha-test>true</alpha-test>
<shade-model>smooth</shade-model>
<cull-face>back</cull-face>
<render-bin>
<bin-number>1</bin-number>
<bin-name>RenderBin</bin-name>
</render-bin>
<texture-unit>
<unit>0</unit>
<image><use>texture[0]/image</use></image>
<filter><use>texture[0]/filter</use></filter>
<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
<wrap-t><use>texture[0]/wrap-t</use></wrap-t>
<internal-format>
<use>texture[0]/internal-format</use>
</internal-format>
<environment>
<mode>modulate</mode>
</environment>
</texture-unit>
<program>
<vertex-shader>Shaders/deferred-gbuffer.vert</vertex-shader>
<fragment-shader>Shaders/deferred-gbuffer.frag</fragment-shader>
</program>
<uniform>
<name>texture</name>
<type>sampler-2d</type>
<value type="int">0</value>
</uniform>
<!-- uniform>
<name>materialID</name>
<type>int</type>
<value><use>material-id</use></value>
</uniform -->
</pass>
</technique>
<technique n="11">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/generic</property> <property>/sim/rendering/shaders/generic</property>
@ -394,7 +463,7 @@
</technique> </technique>
<technique n="11"> <technique n="12">
<pass> <pass>
<lighting>true</lighting> <lighting>true</lighting>
<material> <material>

21
Shaders/deferred-gbuffer.frag Normal file
View file

@ -0,0 +1,21 @@
#extension GL_EXT_gpu_shader4 : enable
//
// attachment 0: normal.x | normal.x | normal.y | normal.y
// attachment 1: diffuse.r | diffuse.g | diffuse.b | material Id
// attachment 2: specular.l | shininess | emission.l | unused
//
varying vec3 ecNormal;
varying vec4 color;
uniform int materialID;
uniform sampler2D texture;
void main() {
float specular = dot( gl_FrontMaterial.specular.rgb, vec3( 0.3, 0.59, 0.11 ) );
float shininess = gl_FrontMaterial.shininess;
float emission = dot( gl_FrontLightModelProduct.sceneColor.rgb, vec3( 0.3, 0.59, 0.11 ) );
vec4 texel = texture2D(texture, gl_TexCoord[0].st);
if (texel.a * color.a < 0.1)
discard;
gl_FragData[0] = vec4( ecNormal.xy, 0.0, 1.0 );
gl_FragData[1] = vec4( color.rgb * texel.rgb, float( materialID ) / 255.0 );
gl_FragData[2] = vec4( specular, shininess / 255.0, emission, 1.0 );
}

13
Shaders/deferred-gbuffer.vert Normal file
View file

@ -0,0 +1,13 @@
//
// attachment 0: normal.x | normal.x | normal.y | normal.y
// attachment 1: diffuse.r | diffuse.g | diffuse.b | material Id
// attachment 2: specular.l | shininess | emission.l | unused
//
varying vec3 ecNormal;
varying vec4 color;
void main() {
ecNormal = gl_NormalMatrix * gl_Normal;
gl_Position = ftransform();
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
color = gl_Color;
}