bugfix
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
This commit is contained in:
Vivian Meazza
parent
86f9ffac79
commit
8a8e229e21
1 changed files with 250 additions and 176 deletions
|
|
@ -1,40 +1,40 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<PropertyList>
|
<PropertyList>
|
||||||
<name>Effects/terrain-default</name>
|
<name>Effects/terrain-default</name>
|
||||||
<!-- <inherits-from>another-effect</inherits-from> -->
|
<!-- <inherits-from>another-effect</inherits-from> -->
|
||||||
<parameters>
|
<parameters>
|
||||||
<material>
|
<material>
|
||||||
<ambient type="vec4d">
|
<ambient type="vec4d">
|
||||||
0.2 .2 0.2 1.0
|
0.2 .2 0.2 1.0
|
||||||
</ambient>
|
</ambient>
|
||||||
<diffuse type="vec4d">
|
<diffuse type="vec4d">
|
||||||
.8 .8 .8 1.0
|
.8 .8 .8 1.0
|
||||||
</diffuse>
|
</diffuse>
|
||||||
<specular type="vec4d">
|
<specular type="vec4d">
|
||||||
0.0 0.0 0.0 1.0
|
0.0 0.0 0.0 1.0
|
||||||
</specular>
|
</specular>
|
||||||
<emissive type="vec4d">
|
<emissive type="vec4d">
|
||||||
0.0 0.0 0.0 1.0
|
0.0 0.0 0.0 1.0
|
||||||
</emissive>
|
</emissive>
|
||||||
<shininess>1.2</shininess>
|
<shininess>1.2</shininess>
|
||||||
</material>
|
</material>
|
||||||
<texture n="0">
|
<texture n="0">
|
||||||
<image>Textures/Terrain/unknown.png</image>
|
<image>Textures/Terrain/unknown.png</image>
|
||||||
<filter>linear-mipmap-linear</filter>
|
<filter>linear-mipmap-linear</filter>
|
||||||
<!-- also repeat -->
|
<!-- also repeat -->
|
||||||
<wrap-s>repeat</wrap-s>
|
<wrap-s>repeat</wrap-s>
|
||||||
<wrap-t>repeat</wrap-t>
|
<wrap-t>repeat</wrap-t>
|
||||||
<!--
|
<!--
|
||||||
<wrap-r>clamp-to-border</wrap-r>
|
<wrap-r>clamp-to-border</wrap-r>
|
||||||
-->
|
-->
|
||||||
<!-- float, signed-integer, integer -->
|
<!-- float, signed-integer, integer -->
|
||||||
<internal-format>normalized</internal-format>
|
<internal-format>normalized</internal-format>
|
||||||
</texture>
|
</texture>
|
||||||
<transparent>false</transparent>
|
<transparent>false</transparent>
|
||||||
<render-bin>
|
<render-bin>
|
||||||
<bin-number>0</bin-number>
|
<bin-number>0</bin-number>
|
||||||
<bin-name>RenderBin</bin-name>
|
<bin-name>RenderBin</bin-name>
|
||||||
</render-bin>
|
</render-bin>
|
||||||
<visibility>
|
<visibility>
|
||||||
<use>/environment/ground-visibility-m</use>
|
<use>/environment/ground-visibility-m</use>
|
||||||
</visibility>
|
</visibility>
|
||||||
|
|
@ -53,101 +53,148 @@
|
||||||
<fogtype>
|
<fogtype>
|
||||||
<use>/sim/rendering/scattering-shader</use>
|
<use>/sim/rendering/scattering-shader</use>
|
||||||
</fogtype>
|
</fogtype>
|
||||||
</parameters>
|
</parameters>
|
||||||
<!-- put techniques at a "high" index to allow derived effects to
|
<!-- put techniques at a "high" index to allow derived effects to
|
||||||
insert their own techniques first. -->
|
insert their own techniques first. -->
|
||||||
<technique n="10">
|
<technique n="10">
|
||||||
<predicate>
|
<predicate>
|
||||||
<and>
|
<and>
|
||||||
<property>/sim/rendering/shader-effects</property>
|
<property>/sim/rendering/shader-effects</property>
|
||||||
|
|
||||||
<or>
|
<or>
|
||||||
<less-equal>
|
<less-equal>
|
||||||
<value type="float">2.0</value>
|
<value type="float">2.0</value>
|
||||||
<glversion/>
|
<glversion/>
|
||||||
</less-equal>
|
</less-equal>
|
||||||
<and>
|
<and>
|
||||||
<extension-supported>GL_ARB_shader_objects</extension-supported>
|
<extension-supported>GL_ARB_shader_objects</extension-supported>
|
||||||
<extension-supported>GL_ARB_shading_language_100</extension-supported>
|
<extension-supported>GL_ARB_shading_language_100</extension-supported>
|
||||||
<extension-supported>GL_ARB_vertex_shader</extension-supported>
|
<extension-supported>GL_ARB_vertex_shader</extension-supported>
|
||||||
<extension-supported>GL_ARB_fragment_shader</extension-supported>
|
<extension-supported>GL_ARB_fragment_shader</extension-supported>
|
||||||
</and>
|
</and>
|
||||||
</or>
|
</or>
|
||||||
</and>
|
</and>
|
||||||
</predicate>
|
</predicate>
|
||||||
<pass>
|
<pass>
|
||||||
<lighting>true</lighting>
|
<lighting>true</lighting>
|
||||||
<material>
|
<material>
|
||||||
<ambient><use>material/ambient</use></ambient>
|
<ambient>
|
||||||
<diffuse><use>material/diffuse</use></diffuse>
|
<use>material/ambient</use>
|
||||||
<specular><use>material/specular</use></specular>
|
</ambient>
|
||||||
<emissive><use>material/emissive</use></emissive>
|
<diffuse>
|
||||||
<shininess><use>material/shininess</use></shininess>
|
<use>material/diffuse</use>
|
||||||
<color-mode>ambient-and-diffuse</color-mode>
|
</diffuse>
|
||||||
</material>
|
<specular>
|
||||||
<alpha-test><use>transparent</use></alpha-test>
|
<use>material/specular</use>
|
||||||
<shade-model>smooth</shade-model>
|
</specular>
|
||||||
<cull-face>back</cull-face>
|
<emissive>
|
||||||
<render-bin>
|
<use>material/emissive</use>
|
||||||
<bin-number>-1</bin-number>
|
</emissive>
|
||||||
<bin-name>RenderBin</bin-name>
|
<shininess>
|
||||||
</render-bin>
|
<use>material/shininess</use>
|
||||||
<texture-unit>
|
</shininess>
|
||||||
<unit>0</unit>
|
<color-mode>ambient-and-diffuse</color-mode>
|
||||||
<image><use>texture[0]/image</use></image>
|
</material>
|
||||||
<filter><use>texture[0]/filter</use></filter>
|
<alpha-test>
|
||||||
<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
|
<use>transparent</use>
|
||||||
<wrap-t><use>texture[0]/wrap-t</use></wrap-t>
|
</alpha-test>
|
||||||
<internal-format>
|
<shade-model>smooth</shade-model>
|
||||||
<use>texture[0]/internal-format</use>
|
<cull-face>back</cull-face>
|
||||||
</internal-format>
|
<render-bin>
|
||||||
</texture-unit>
|
<bin-number>-1</bin-number>
|
||||||
<program>
|
<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>
|
||||||
|
</texture-unit>
|
||||||
|
<program>
|
||||||
|
<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
|
||||||
|
<vertex-shader n="1">Shaders/default.vert</vertex-shader>
|
||||||
|
<vertex-shader n="0">Shaders/include_fog.frag</vertex-shader>
|
||||||
|
<fragment-shader n="1">Shaders/terrain-nocolor.frag</fragment-shader>
|
||||||
|
</program>
|
||||||
|
<uniform>
|
||||||
|
<name>texture</name>
|
||||||
|
<type>sampler-2d</type>
|
||||||
|
<value type="int">0</value>
|
||||||
|
</uniform>
|
||||||
|
<color-mask type="vec4d">0 0 0 0</color-mask>
|
||||||
|
</pass>
|
||||||
|
<pass>
|
||||||
|
<lighting>true</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>
|
||||||
|
<use>transparent</use>
|
||||||
|
</blend>
|
||||||
|
<alpha-test>
|
||||||
|
<use>transparent</use>
|
||||||
|
</alpha-test>
|
||||||
|
<shade-model>smooth</shade-model>
|
||||||
|
<cull-face>back</cull-face>
|
||||||
|
<render-bin>
|
||||||
|
<bin-number>
|
||||||
|
<use>render-bin/bin-number</use>
|
||||||
|
</bin-number>
|
||||||
|
<bin-name>
|
||||||
|
<use>render-bin/bin-name</use>
|
||||||
|
</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>
|
||||||
|
</texture-unit>
|
||||||
|
<program>
|
||||||
<vertex-shader>Shaders/include_fog.vert</vertex-shader>
|
<vertex-shader>Shaders/include_fog.vert</vertex-shader>
|
||||||
<vertex-shader>Shaders/default.vert</vertex-shader>
|
<vertex-shader>Shaders/default.vert</vertex-shader>
|
||||||
<fragment-shader>Shaders/terrain-nocolor.frag</fragment-shader>
|
<fragment-shader>Shaders/default.frag</fragment-shader>
|
||||||
</program>
|
|
||||||
<uniform>
|
|
||||||
<name>texture</name>
|
|
||||||
<type>sampler-2d</type>
|
|
||||||
<value type="int">0</value>
|
|
||||||
</uniform>
|
|
||||||
<color-mask type="vec4d">0 0 0 0</color-mask>
|
|
||||||
</pass>
|
|
||||||
<pass>
|
|
||||||
<lighting>true</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><use>transparent</use></blend>
|
|
||||||
<alpha-test><use>transparent</use></alpha-test>
|
|
||||||
<shade-model>smooth</shade-model>
|
|
||||||
<cull-face>back</cull-face>
|
|
||||||
<render-bin>
|
|
||||||
<bin-number><use>render-bin/bin-number</use></bin-number>
|
|
||||||
<bin-name><use>render-bin/bin-name</use></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>
|
|
||||||
</texture-unit>
|
|
||||||
<program>
|
|
||||||
<vertex-shader>Shaders/include_fog.vert</vertex-shader>
|
|
||||||
<vertex-shader>Shaders/default.vert</vertex-shader>
|
|
||||||
<fragment-shader>Shaders/default.frag</fragment-shader>
|
|
||||||
<fragment-shader>Shaders/include_fog.frag</fragment-shader>
|
<fragment-shader>Shaders/include_fog.frag</fragment-shader>
|
||||||
</program>
|
</program>
|
||||||
<uniform>
|
<uniform>
|
||||||
<name>visibility</name>
|
<name>visibility</name>
|
||||||
<type>float</type>
|
<type>float</type>
|
||||||
|
|
@ -188,56 +235,83 @@
|
||||||
<type>int</type>
|
<type>int</type>
|
||||||
<value>
|
<value>
|
||||||
<use>fogtype</use>
|
<use>fogtype</use>
|
||||||
</value>
|
</value>
|
||||||
</uniform>
|
</uniform>
|
||||||
<uniform>
|
<uniform>
|
||||||
<name>texture</name>
|
<name>texture</name>
|
||||||
<type>sampler-2d</type>
|
<type>sampler-2d</type>
|
||||||
<value type="int">0</value>
|
<value type="int">0</value>
|
||||||
</uniform>
|
</uniform>
|
||||||
<uniform>
|
<uniform>
|
||||||
<name>colorMode</name>
|
<name>colorMode</name>
|
||||||
<type>int</type>
|
<type>int</type>
|
||||||
<value>2</value> <!-- AMBIENT_AND_DIFFUSE -->
|
<value>2</value>
|
||||||
</uniform>
|
<!-- AMBIENT_AND_DIFFUSE -->
|
||||||
<depth>
|
</uniform>
|
||||||
<function>lequal</function>
|
<depth>
|
||||||
<write-mask type="bool">false</write-mask>
|
<function>lequal</function>
|
||||||
</depth>
|
<write-mask type="bool">false</write-mask>
|
||||||
</pass>
|
</depth>
|
||||||
</technique>
|
</pass>
|
||||||
<technique n="11">
|
</technique>
|
||||||
<pass>
|
<technique n="11">
|
||||||
<lighting>true</lighting>
|
<pass>
|
||||||
<material>
|
<lighting>true</lighting>
|
||||||
<ambient><use>material/ambient</use></ambient>
|
<material>
|
||||||
<diffuse><use>material/diffuse</use></diffuse>
|
<ambient>
|
||||||
<specular><use>material/specular</use></specular>
|
<use>material/ambient</use>
|
||||||
<emissive><use>material/emissive</use></emissive>
|
</ambient>
|
||||||
<shininess><use>material/shininess</use></shininess>
|
<diffuse>
|
||||||
<color-mode>ambient-and-diffuse</color-mode>
|
<use>material/diffuse</use>
|
||||||
</material>
|
</diffuse>
|
||||||
<blend><use>transparent</use></blend>
|
<specular>
|
||||||
<alpha-test><use>transparent</use></alpha-test>
|
<use>material/specular</use>
|
||||||
<shade-model>smooth</shade-model>
|
</specular>
|
||||||
<cull-face>back</cull-face>
|
<emissive>
|
||||||
<render-bin>
|
<use>material/emissive</use>
|
||||||
<bin-number><use>render-bin/bin-number</use></bin-number>
|
</emissive>
|
||||||
<bin-name><use>render-bin/bin-name</use></bin-name>
|
<shininess>
|
||||||
</render-bin>
|
<use>material/shininess</use>
|
||||||
<texture-unit>
|
</shininess>
|
||||||
<unit>0</unit>
|
<color-mode>ambient-and-diffuse</color-mode>
|
||||||
<image><use>texture[0]/image</use></image>
|
</material>
|
||||||
<filter><use>texture[0]/filter</use></filter>
|
<blend>
|
||||||
<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
|
<use>transparent</use>
|
||||||
<wrap-t><use>texture[0]/wrap-t</use></wrap-t>
|
</blend>
|
||||||
<internal-format>
|
<alpha-test>
|
||||||
<use>texture[0]/internal-format</use>
|
<use>transparent</use>
|
||||||
</internal-format>
|
</alpha-test>
|
||||||
<environment>
|
<shade-model>smooth</shade-model>
|
||||||
<mode>modulate</mode>
|
<cull-face>back</cull-face>
|
||||||
</environment>
|
<render-bin>
|
||||||
</texture-unit>
|
<bin-number>
|
||||||
</pass>
|
<use>render-bin/bin-number</use>
|
||||||
</technique>
|
</bin-number>
|
||||||
|
<bin-name>
|
||||||
|
<use>render-bin/bin-name</use>
|
||||||
|
</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>
|
||||||
|
</pass>
|
||||||
|
</technique>
|
||||||
</PropertyList>
|
</PropertyList>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue