fly/fgdata
1
0
Fork 0
Code Activity

Migrate to Gijs' new gui

Browse source 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
This commit is contained in:
Vivian Meazza 2011-12-01 21:47:42 +00:00
parent 746b38ca9c
commit 8d36139f22
15 changed files with 227 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Effects/bumpspec.eff
View file

@ -59,7 +59,7 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
<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><use>texture[1]/internal-format</use></internal-format> <internal-format><use>texture[0]/internal-format</use></internal-format>
</texture-unit> </texture-unit>
<texture-unit> <texture-unit>
<unit>1</unit> <unit>1</unit>
@ -70,8 +70,8 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
<internal-format><use>texture[2]/internal-format</use></internal-format> <internal-format><use>texture[2]/internal-format</use></internal-format>
</texture-unit> </texture-unit>
<program> <program>
<vertex-shader n="0">Shaders/bumpspec.vert</vertex-shader> <vertex-shader n="1">Shaders/bumpspec.vert</vertex-shader>
<fragment-shader n="0">Shaders/bumpspec.frag</fragment-shader> <fragment-shader n="1">Shaders/bumpspec.frag</fragment-shader>
<attribute> <attribute>
<name>tangent</name> <name>tangent</name>
<index>6</index> <index>6</index>

2
Effects/cloud-models.eff
View file

@ -10,7 +10,7 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/quality-level</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

2
Effects/clouds-box.eff
View file

@ -8,7 +8,7 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/quality-level</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>

2
Effects/clouds-layered.eff
View file

@ -8,7 +8,7 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/quality-level</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>

2
Effects/clouds-thick.eff
View file

@ -8,7 +8,7 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/quality-level</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>

2
Effects/clouds-thin.eff
View file

@ -8,7 +8,7 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/quality-level</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>

2
Effects/clouds-thinlayer.eff
View file

@ -8,7 +8,7 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/quality-level</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>

5
Effects/crop.eff
View file

@ -16,13 +16,12 @@
<wrap-s>mirror</wrap-s> <wrap-s>mirror</wrap-s>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<snow-level><use>/sim/rendering/snow-level-m</use></snow-level> <snow-level><use>/environment/snow-level-m</use></snow-level>
</parameters> </parameters>
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/crop-shader</property> <property>/sim/rendering/shaders/crop</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>

2
Effects/cropgrass.eff
View file

@ -16,6 +16,6 @@
<wrap-s>mirror</wrap-s> <wrap-s>mirror</wrap-s>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<snow-level><use>/sim/rendering/snow-level-m</use></snow-level> <snow-level><use>/environment/snow-level-m</use></snow-level>
</parameters> </parameters>
</PropertyList> </PropertyList>

7
Effects/forest.eff
View file

@ -30,10 +30,10 @@
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<snow-level><use>/sim/rendering/snow-level-m</use></snow-level> <snow-level><use>/environment/snow-level-m</use></snow-level>
<depth-factor type="float">0.04</depth-factor> <depth-factor type="float">0.04</depth-factor>
<canopy-height type="float">15.0</canopy-height> <canopy-height type="float">15.0</canopy-height>
<quality-level><use>/sim/rendering/quality-level</use></quality-level> <quality-level><use>/sim/rendering/shaders/transition</use></quality-level>
<!-- sets the season color --> <!-- sets the season color -->
<season-red type="float">0.12</season-red> <season-red type="float">0.12</season-red>
@ -49,8 +49,7 @@
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/transition-shader</property> <property>/sim/rendering/shaders/transition</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>

7
Effects/glacier.eff
View file

@ -30,10 +30,10 @@
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<snow-level><use>/sim/rendering/snow-level-m</use></snow-level> <snow-level><use>/environment/snow-level-m</use></snow-level>
<depth-factor type="float">0.01</depth-factor> <depth-factor type="float">0.01</depth-factor>
<canopy-height type="float">15.0</canopy-height> <canopy-height type="float">15.0</canopy-height>
<quality-level><use>/sim/rendering/quality-level</use></quality-level> <quality-level><use>/sim/rendering/shaders/transition</use></quality-level>
<!-- sets the season color --> <!-- sets the season color -->
<season-red type="float">0.12</season-red> <season-red type="float">0.12</season-red>
@ -49,8 +49,7 @@
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/transition-shader</property> <property>/sim/rendering/shaders/transition</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>

7
Effects/herbtundra.eff
View file

@ -30,7 +30,7 @@
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<snow-level><use>/sim/rendering/snow-level-m</use></snow-level> <snow-level><use>/environment/snow-level-m</use></snow-level>
<depth-factor type="float">0.01</depth-factor> <depth-factor type="float">0.01</depth-factor>
<canopy-height type="float">15.0</canopy-height> <canopy-height type="float">15.0</canopy-height>
@ -40,7 +40,7 @@
<season-blue type="float">0.22</season-blue> <season-blue type="float">0.22</season-blue>
<!-- end season color --> <!-- end season color -->
<quality-level><use>/sim/rendering/quality-level</use></quality-level> <quality-level><use>/sim/rendering/shaders/transition</use></quality-level>
</parameters> </parameters>
<generate> <generate>
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
@ -49,8 +49,7 @@
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/transition-shader</property> <property>/sim/rendering/shaders/transition</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>

63
Effects/terrain-default.eff
View file

@ -35,6 +35,24 @@
<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>
<use>/environment/ground-visibility-m</use>
</visibility>
<avisibility>
<use>/environment/visibility-m</use>
</avisibility>
<lthickness>
<use>/environment/ground-haze-thickness-m</use>
</lthickness>
<scattering>
<use>/rendering/scene/scattering</use>
</scattering>
<terminator>
<use>/environment/terminator-relative-position-m</use>
</terminator>
<fogtype>
<use>/sim/rendering/scattering-shader</use>
</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. -->
@ -85,6 +103,7 @@
</internal-format> </internal-format>
</texture-unit> </texture-unit>
<program> <program>
<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/terrain-nocolor.frag</fragment-shader>
</program> </program>
@ -124,9 +143,53 @@
</internal-format> </internal-format>
</texture-unit> </texture-unit>
<program> <program>
<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/default.frag</fragment-shader> <fragment-shader>Shaders/default.frag</fragment-shader>
<fragment-shader>Shaders/include_fog.frag</fragment-shader>
</program> </program>
<uniform>
<name>visibility</name>
<type>float</type>
<value>
<use>visibility</use>
</value>
</uniform>
<uniform>
<name>avisibility</name>
<type>float</type>
<value>
<use>avisibility</use>
</value>
</uniform>
<uniform>
<name>hazeLayerAltitude</name>
<type>float</type>
<value>
<use>lthickness</use>
</value>
</uniform>
<uniform>
<name>scattering</name>
<type>float</type>
<value>
<use>scattering</use>
</value>
</uniform>
<uniform>
<name>terminator</name>
<type>float</type>
<value>
<use>terminator</use>
</value>
</uniform>
<uniform>
<name>fogType</name>
<type>int</type>
<value>
<use>fogtype</use>
</value>
</uniform>
<uniform> <uniform>
<name>texture</name> <name>texture</name>
<type>sampler-2d</type> <type>sampler-2d</type>

144
Effects/test.eff
View file

@ -1,62 +1,72 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PropertyList> <PropertyList>
<name>Effects/test</name> <name>Effects/test</name>
<parameters> <parameters>
<texture n ="0"> <texture n ="0">
</texture> </texture>
</parameters> </parameters>
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>
</less-equal> </less-equal>
</and> </and>
</predicate> </predicate>
<pass n="0"> <pass n="0">
<!-- This is apparently not used, so maybe we'll blow it way soon. --> <!-- This is apparently not used, so maybe we'll blow it way soon. -->
<lighting>true</lighting> <lighting>true</lighting>
<material> <material>
<ambient type="vec4d">0.5 0.5 0.5 1.0</ambient> <ambient type="vec4d">0.5 0.5 0.5 1.0</ambient>
<diffuse type="vec4d">0.5 0.5 0.5 1.0</diffuse> <diffuse type="vec4d">0.5 0.5 0.5 1.0</diffuse>
<color-mode>off</color-mode> <color-mode>off</color-mode>
</material> </material>
<alpha-test> <alpha-test>
<comparison>greater</comparison> <comparison>greater</comparison>
<reference type="float">0.01</reference> <reference type="float">0.01</reference>
</alpha-test> </alpha-test>
<shade-model>smooth</shade-model> <shade-model>smooth</shade-model>
<blend> <blend>
<source>src-alpha</source> <source>src-alpha</source>
<destination>one-minus-src-alpha</destination> <destination>one-minus-src-alpha</destination>
</blend> </blend>
<depth> <depth>
<write-mask>false</write-mask> <write-mask>false</write-mask>
</depth> </depth>
<render-bin> <render-bin>
<bin-number>10</bin-number> <bin-number>10</bin-number>
<bin-name>DepthSortedBin</bin-name> <bin-name>DepthSortedBin</bin-name>
</render-bin> </render-bin>
<texture-unit> <texture-unit>
<unit>0</unit> <unit>0</unit>
<type><use>texture[0]/type</use></type> <type>
<image><use>texture[0]/image</use></image> <use>texture[0]/type</use>
<filter><use>texture[0]/filter</use></filter> </type>
<wrap-s><use>texture[0]/wrap-s</use></wrap-s> <image>
<wrap-t><use>texture[0]/wrap-t</use></wrap-t> <use>texture[0]/image</use>
<!--<wrap-s>clamp</wrap-s> </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>
<!--<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>--> <wrap-t>clamp</wrap-t>-->
</texture-unit> </texture-unit>
<!--<attribute> <!--<attribute>
<mypars type="vec3">0 0 0</mypars> <mypars type="vec3">0 0 0</mypars>
<value type="int">10</value> <value type="int">10</value>
</attribute>--> </attribute>-->
<program> <program>
<vertex-shader>Shaders/test.vert</vertex-shader> <vertex-shader>Shaders/test.vert</vertex-shader>
<fragment-shader>Shaders/test.frag</fragment-shader> <fragment-shader>Shaders/test.frag</fragment-shader>
<!--<attribute> <!--<attribute>
<name>usrAttr3</name> <name>usrAttr3</name>
<index>10</index> <index>10</index>
</attribute> </attribute>
@ -64,18 +74,18 @@
<name>usrAttr4</name> <name>usrAttr4</name>
<index>11</index> <index>11</index>
</attribute>--> </attribute>-->
</program> </program>
<uniform> <uniform>
<name>baseTexture</name> <name>baseTexture</name>
<type>sampler-2d</type> <type>sampler-2d</type>
<value type="int">0</value> <value type="int">0</value>
</uniform> </uniform>
<uniform> <uniform>
<name>shading</name> <name>shading</name>
<type>float</type> <type>float</type>
<value type="float">0.5</value> <value type="float">0.5</value>
</uniform> </uniform>
<vertex-program-two-side>true</vertex-program-two-side> <vertex-program-two-side>true</vertex-program-two-side>
</pass> </pass>
</technique> </technique>
</PropertyList> </PropertyList>

67
Effects/water-inland.eff
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PropertyList> <PropertyList>
<name>Effects/water-inland</name> <name>Effects/water</name>
<inherits-from>Effects/terrain-default</inherits-from> <inherits-from>Effects/terrain-default</inherits-from>
<parameters> <parameters>
<texture n="0"> <texture n="0">
@ -49,6 +49,26 @@
<cloud-cover4> <cloud-cover4>
<use>/environment/clouds/layer[4]/coverage-type</use> <use>/environment/clouds/layer[4]/coverage-type</use>
</cloud-cover4> </cloud-cover4>
<!-- fog include -->
<visibility>
<use>/environment/ground-visibility-m</use>
</visibility>
<avisibility>
<use>/environment/visibility-m</use>
</avisibility>
<lthickness>
<use>/environment/ground-haze-thickness-m</use>
</lthickness>
<scattering>
<use>/rendering/scene/scattering</use>
</scattering>
<terminator>
<use>/environment/terminator-relative-position-m</use>
</terminator>
<fogtype>
<use>/sim/rendering/scattering-shader</use>
</fogtype>
<!-- END fog include -->
</parameters> </parameters>
<technique n="8"> <technique n="8">
<predicate> <predicate>
@ -176,6 +196,7 @@
</internal-format> </internal-format>
</texture-unit> </texture-unit>
<program> <program>
<vertex-shader>Shaders/include_fog.vert</vertex-shader>
<vertex-shader>Shaders/water.vert</vertex-shader> <vertex-shader>Shaders/water.vert</vertex-shader>
<fragment-shader>Shaders/water-inland.frag</fragment-shader> <fragment-shader>Shaders/water-inland.frag</fragment-shader>
</program> </program>
@ -240,6 +261,50 @@
<use>cloud-cover4</use> <use>cloud-cover4</use>
</value> </value>
</uniform> </uniform>
<!-- BEGIN fog include -->
<uniform>
<name>visibility</name>
<type>float</type>
<value>
<use>visibility</use>
</value>
</uniform>
<uniform>
<name>avisibility</name>
<type>float</type>
<value>
<use>avisibility</use>
</value>
</uniform>
<uniform>
<name>hazeLayerAltitude</name>
<type>float</type>
<value>
<use>lthickness</use>
</value>
</uniform>
<uniform>
<name>scattering</name>
<type>float</type>
<value>
<use>scattering</use>
</value>
</uniform>
<uniform>
<name>terminator</name>
<type>float</type>
<value>
<use>terminator</use>
</value>
</uniform>
<uniform>
<name>fogType</name>
<type>int</type>
<value>
<use>fogtype</use>
</value>
</uniform>
<!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="9"> <technique n="9">