fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/fg/fgdata

Browse source 
Conflicts:
	Aircraft/R22/Models/Effects/skin-reflect.eff
This commit is contained in:
syd 2011-12-13 08:49:37 -07:00
commit ce78e5c0a9
35 changed files with 3548 additions and 3339 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
Aircraft/Generic/flightrecorder/components/kx165.xml Normal file
View file

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- flight recorder configuration -->
<!-- NAV/COMM radio, matches Aircraft/Instruments-3d/kx165 -->
<PropertyList>
<signal>
<type>bool</type>
<property type="string">/instrumentation/comm[%i]/serviceable</property>
</signal>
<signal>
<type>bool</type>
<property type="string">/instrumentation/nav[%i]/serviceable</property>
</signal>
<signal>
<type>bool</type>
<property type="string">/instrumentation/nav[%i]/power-btn</property>
</signal>
<signal>
<type>bool</type>
<property type="string">/instrumentation/comm[%i]/frq-swap-btn</property>
</signal>
<signal>
<type>float</type>
<property type="string">/instrumentation/comm[%i]/frequencies/selected-mhz</property>
</signal>
<signal>
<type>float</type>
<property type="string">/instrumentation/comm[%i]/frequencies/standby-mhz</property>
</signal>
<signal>
<type>float</type>
<property type="string">/instrumentation/comm[%i]/volume</property>
</signal>
<signal>
<type>bool</type>
<property type="string">/instrumentation/comm[%i]/test-btn</property>
</signal>
<signal>
<type>bool</type>
<property type="string">/instrumentation/nav[%i]/frq-swap-btn</property>
</signal>
<signal>
<type>float</type>
<property type="string">/instrumentation/nav[%i]/frequencies/selected-mhz</property>
</signal>
<signal>
<type>float</type>
<property type="string">/instrumentation/nav[%i]/frequencies/standby-mhz</property>
</signal>
<signal>
<type>float</type>
<property type="string">/instrumentation/nav[%i]/volume</property>
</signal>
<signal>
<type>bool</type>
<property type="string">/instrumentation/nav[%i]/audio-btn</property>
</signal>
<signal>
<type>float</type>
<property type="string">/instrumentation/comm[%i]/dimming-norm</property>
</signal>
</PropertyList>

6
Effects/bowwave.eff
View file

@ -109,7 +109,7 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
@ -117,10 +117,9 @@
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/water</property> <property>/sim/rendering/shaders/water</property>
<!--<property>/sim/rendering/shader-effects</property>-->
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>
<float-property>/sim/rendering/shaders/quality-level</float-property> <float-property>/sim/rendering/shaders/water</float-property>
</less-equal> </less-equal>
<or> <or>
<less-equal> <less-equal>
@ -492,7 +491,6 @@
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/water</property> <property>/sim/rendering/shaders/water</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/bumpspec.eff
View file

@ -37,7 +37,7 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/model</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

8
Effects/flutter.eff
View file

@ -41,7 +41,7 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
@ -49,11 +49,7 @@
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
<!--<property>/sim/rendering/shader-effects</property>--> <property>/sim/rendering/shaders/generic</property>
<less-equal>
<value type="float">3.0</value>
<float-property>/sim/rendering/shaders/quality-level</float-property>
</less-equal>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

8
Effects/landmass.eff
View file

@ -16,7 +16,7 @@
<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> <quality-level>
<use>/sim/rendering/shaders/quality-level</use> <use>/sim/rendering/shaders/landmass</use>
</quality-level> </quality-level>
</parameters> </parameters>
@ -37,7 +37,7 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
@ -50,8 +50,8 @@
<and> <and>
<property>/sim/rendering/shaders/landmass</property> <property>/sim/rendering/shaders/landmass</property>
<less-equal> <less-equal>
<value type="float">4.5</value> <value type="float">4.0</value>
<float-property>/sim/rendering/shaders/quality-level</float-property> <float-property>/sim/rendering/shaders/landmass</float-property>
</less-equal> </less-equal>
<or> <or>
<less-equal> <less-equal>

4
Effects/lightmap.eff
View file

@ -9,13 +9,13 @@
<material> <material>
<color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE --> <color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->
</material> </material>
<condition><use>/sim/rendering/shader-effects</use></condition> <condition><use>/sim/rendering/shader/generic</use></condition>
<factor>1</factor> <factor>1</factor>
</parameters> </parameters>
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/generic</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

142
Effects/model-combined.eff
View file

@ -12,8 +12,9 @@ please see Docs/README.model-combined.eff for documentation
<type>white</type> <type>white</type>
</texture> </texture>
<!-- Normal Map --> <!-- Normal Map -->
<normalmap_enabled type="int">0</normalmap_enabled> <normalmap-enabled type="int">0</normalmap-enabled>
<normalmap_dds type="int">0</normalmap_dds> <normalmap-dds type="int">0</normalmap-dds>
<normalmap-tiling type="float">1.0</normalmap-tiling>
<texture n="2"> <texture n="2">
<image>Aircraft/Generic/Effects/null_bumpspec.png</image> <image>Aircraft/Generic/Effects/null_bumpspec.png</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
@ -22,16 +23,16 @@ please see Docs/README.model-combined.eff for documentation
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<!-- Light Map --> <!-- Light Map -->
<lightmap_enabled type="int">0</lightmap_enabled> <lightmap-enabled type="int">0</lightmap-enabled>
<lightmap_multi type="int">0</lightmap_multi> <lightmap-multi type="int">0</lightmap-multi>
<lightmap_factor type="float" n="0">1.0</lightmap_factor> <lightmap-factor type="float" n="0">1.0</lightmap-factor>
<lightmap_color type="vec3d" n="0"> 1.0 1.0 1.0 </lightmap_color> <lightmap-color type="vec3d" n="0"> 1.0 1.0 1.0 </lightmap-color>
<lightmap_factor type="float" n="1">1.0</lightmap_factor> <lightmap-factor type="float" n="1">1.0</lightmap-factor>
<lightmap_color type="vec3d" n="1"> 1.0 1.0 1.0 </lightmap_color> <lightmap-color type="vec3d" n="1"> 1.0 1.0 1.0 </lightmap-color>
<lightmap_factor type="float" n="2">1.0</lightmap_factor> <lightmap-factor type="float" n="2">1.0</lightmap-factor>
<lightmap_color type="vec3d" n="2"> 1.0 1.0 1.0 </lightmap_color> <lightmap-color type="vec3d" n="2"> 1.0 1.0 1.0 </lightmap-color>
<lightmap_factor type="float" n="3">1.0</lightmap_factor> <lightmap-factor type="float" n="3">1.0</lightmap-factor>
<lightmap_color type="vec3d" n="3"> 1.0 1.0 1.0 </lightmap_color> <lightmap-color type="vec3d" n="3"> 1.0 1.0 1.0 </lightmap-color>
<texture n="3"> <texture n="3">
<image>Aircraft/Generic/Effects/greymap.png</image> <image>Aircraft/Generic/Effects/greymap.png</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
@ -40,10 +41,10 @@ please see Docs/README.model-combined.eff for documentation
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<!-- Reflection --> <!-- Reflection -->
<reflection_enabled type="int">0</reflection_enabled> <reflection-enabled type="int">0</reflection-enabled>
<reflection_correction type="float">0.0</reflection_correction> <reflection-correction type="float">0.0</reflection-correction>
<reflect_map_enabled type="int">0</reflect_map_enabled> <reflect-map-enabled type="int">0</reflect-map-enabled>
<reflection_dynamic type="int">0</reflection_dynamic> <reflection-dynamic type="int">0</reflection-dynamic>
<texture n="4"> <texture n="4">
<image>Aircraft/Generic/Effects/ReflectMaps/reflectmap.png</image> <image>Aircraft/Generic/Effects/ReflectMaps/reflectmap.png</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
@ -69,7 +70,7 @@ please see Docs/README.model-combined.eff for documentation
<!-- END 6 image cube map --> <!-- END 6 image cube map -->
</texture> </texture>
<!-- Reflection fresnel --> <!-- Reflection fresnel -->
<reflection_fresnel type="float">0.1</reflection_fresnel> <reflection-fresnel type="float">0.1</reflection-fresnel>
<texture n="6"> <texture n="6">
<image>Aircraft/Generic/Effects/FresnelLookUp.png</image> <image>Aircraft/Generic/Effects/FresnelLookUp.png</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
@ -78,7 +79,7 @@ please see Docs/README.model-combined.eff for documentation
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<!-- Reflection rainbow --> <!-- Reflection rainbow -->
<reflection_rainbow type="float">0.01</reflection_rainbow> <reflection-rainbow type="float">0.01</reflection-rainbow>
<texture n="7"> <texture n="7">
<image>Aircraft/Generic/Effects/Rainbow.png</image> <image>Aircraft/Generic/Effects/Rainbow.png</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
@ -86,12 +87,16 @@ please see Docs/README.model-combined.eff for documentation
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<reflection_noise type="float">0.25</reflection_noise> <reflection-noise type="float">0.25</reflection-noise>
<!-- END Reflection --> <!-- END Reflection -->
<!-- Dirt -->
<dirt-enabled type="int">0</dirt-enabled>
<dirt-color type="vec3d">0.0 0.0 0.0</dirt-color>
<dirt-factor type="float">0.0</dirt-factor>
<!-- ambient correction --> <!-- ambient correction -->
<ambient_correction type="float">0.05</ambient_correction> <ambient-correction type="float">0.05</ambient-correction>
<!-- quality slider --> <!-- quality slider -->
<shader_quality type="int">2</shader_quality> <shader-quality type="int">2</shader-quality>
<!--<use>/sim/rendering/shaders/model</use> <!--<use>/sim/rendering/shaders/model</use>
</quality>--> </quality>-->
<rendering-hint>opaque</rendering-hint> <rendering-hint>opaque</rendering-hint>
@ -102,15 +107,15 @@ please see Docs/README.model-combined.eff for documentation
</render-bin> </render-bin>
<!-- INTERNAL USE --> <!-- INTERNAL USE -->
<shade-model>smooth</shade-model> <shade-model>smooth</shade-model>
<model_hdg> <model-hdg>
<use>orientation/model/heading-deg</use> <use>orientation/model/heading-deg</use>
</model_hdg> </model-hdg>
<model_pitch> <model-pitch>
<use>orientation/model/pitch-deg</use> <use>orientation/model/pitch-deg</use>
</model_pitch> </model-pitch>
<model_roll> <model-roll>
<use>orientation/model/roll-deg</use> <use>orientation/model/roll-deg</use>
</model_roll> </model-roll>
<!-- fog include --> <!-- fog include -->
<visibility> <visibility>
<use>/environment/ground-visibility-m</use> <use>/environment/ground-visibility-m</use>
@ -128,7 +133,7 @@ please see Docs/README.model-combined.eff for documentation
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
@ -142,7 +147,6 @@ please see Docs/README.model-combined.eff for documentation
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/model</property> <property>/sim/rendering/shaders/model</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>
@ -424,7 +428,7 @@ please see Docs/README.model-combined.eff for documentation
<name>nmap_enabled</name> <name>nmap_enabled</name>
<type>int</type> <type>int</type>
<value> <value>
<use>normalmap_enabled</use> <use>normalmap-enabled</use>
</value> </value>
</uniform> </uniform>
@ -433,7 +437,15 @@ please see Docs/README.model-combined.eff for documentation
<name>nmap_dds</name> <name>nmap_dds</name>
<type>int</type> <type>int</type>
<value> <value>
<use>normalmap_dds</use> <use>normalmap-dds</use>
</value>
</uniform>
<uniform>
<name>nmap_tile</name>
<type>int</type>
<value>
<use>normalmap-tiling</use>
</value> </value>
</uniform> </uniform>
@ -443,7 +455,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_enabled</name> <name>lightmap_enabled</name>
<type>int</type> <type>int</type>
<value> <value>
<use>lightmap_enabled</use> <use>lightmap-enabled</use>
</value> </value>
</uniform> </uniform>
<!-- lightmap is multichannel --> <!-- lightmap is multichannel -->
@ -451,7 +463,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_multi</name> <name>lightmap_multi</name>
<type>int</type> <type>int</type>
<value> <value>
<use>lightmap_multi</use> <use>lightmap-multi</use>
</value> </value>
</uniform> </uniform>
@ -459,7 +471,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_r_factor</name> <name>lightmap_r_factor</name>
<type>float</type> <type>float</type>
<value> <value>
<use>lightmap_factor[0]</use> <use>lightmap-factor[0]</use>
</value> </value>
</uniform> </uniform>
@ -467,7 +479,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_r_color</name> <name>lightmap_r_color</name>
<type>float-vec3</type> <type>float-vec3</type>
<value> <value>
<use>lightmap_color[0]</use> <use>lightmap-color[0]</use>
</value> </value>
</uniform> </uniform>
@ -475,7 +487,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_g_factor</name> <name>lightmap_g_factor</name>
<type>float</type> <type>float</type>
<value> <value>
<use>lightmap_factor[1]</use> <use>lightmap-factor[1]</use>
</value> </value>
</uniform> </uniform>
@ -483,7 +495,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_g_color</name> <name>lightmap_g_color</name>
<type>float-vec3</type> <type>float-vec3</type>
<value> <value>
<use>lightmap_color[1]</use> <use>lightmap-color[1]</use>
</value> </value>
</uniform> </uniform>
@ -491,7 +503,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_b_factor</name> <name>lightmap_b_factor</name>
<type>float</type> <type>float</type>
<value> <value>
<use>lightmap_factor[2]</use> <use>lightmap-factor[2]</use>
</value> </value>
</uniform> </uniform>
@ -499,7 +511,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_b_color</name> <name>lightmap_b_color</name>
<type>float-vec3</type> <type>float-vec3</type>
<value> <value>
<use>lightmap_color[2]</use> <use>lightmap-color[2]</use>
</value> </value>
</uniform> </uniform>
@ -507,7 +519,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_a_factor</name> <name>lightmap_a_factor</name>
<type>float</type> <type>float</type>
<value> <value>
<use>lightmap_factor[3]</use> <use>lightmap-factor[3]</use>
</value> </value>
</uniform> </uniform>
@ -515,7 +527,7 @@ please see Docs/README.model-combined.eff for documentation
<name>lightmap_a_color</name> <name>lightmap_a_color</name>
<type>float-vec3</type> <type>float-vec3</type>
<value> <value>
<use>lightmap_color[3]</use> <use>lightmap-color[3]</use>
</value> </value>
</uniform> </uniform>
@ -524,7 +536,7 @@ please see Docs/README.model-combined.eff for documentation
<name>refl_enabled</name> <name>refl_enabled</name>
<type>int</type> <type>int</type>
<value> <value>
<use>reflection_enabled</use> <use>reflection-enabled</use>
</value> </value>
</uniform> </uniform>
<!-- reflection correction --> <!-- reflection correction -->
@ -532,7 +544,7 @@ please see Docs/README.model-combined.eff for documentation
<name>refl_correction</name> <name>refl_correction</name>
<type>float</type> <type>float</type>
<value> <value>
<use>reflection_correction</use> <use>reflection-correction</use>
</value> </value>
</uniform> </uniform>
@ -541,7 +553,7 @@ please see Docs/README.model-combined.eff for documentation
<name>refl_map</name> <name>refl_map</name>
<type>int</type> <type>int</type>
<value> <value>
<use>reflect_map_enabled</use> <use>reflect-map-enabled</use>
</value> </value>
</uniform> </uniform>
<!-- reflection is dynamic --> <!-- reflection is dynamic -->
@ -549,7 +561,7 @@ please see Docs/README.model-combined.eff for documentation
<name>refl_dynamic</name> <name>refl_dynamic</name>
<type>int</type> <type>int</type>
<value> <value>
<use>reflection_dynamic</use> <use>reflection-dynamic</use>
</value> </value>
</uniform> </uniform>
@ -558,7 +570,7 @@ please see Docs/README.model-combined.eff for documentation
<name>refl_rainbow</name> <name>refl_rainbow</name>
<type>float</type> <type>float</type>
<value> <value>
<use>reflection_rainbow</use> <use>reflection-rainbow</use>
</value> </value>
</uniform> </uniform>
@ -567,7 +579,7 @@ please see Docs/README.model-combined.eff for documentation
<name>refl_fresnel</name> <name>refl_fresnel</name>
<type>float</type> <type>float</type>
<value> <value>
<use>reflection_fresnel</use> <use>reflection-fresnel</use>
</value> </value>
</uniform> </uniform>
@ -576,16 +588,40 @@ please see Docs/README.model-combined.eff for documentation
<name>refl_noise</name> <name>refl_noise</name>
<type>float</type> <type>float</type>
<value> <value>
<use>reflection_noise</use> <use>reflection-noise</use>
</value> </value>
</uniform> </uniform>
<!-- dirt -->
<uniform>
<name>dirt_enabled</name>
<type>int</type>
<value>
<use>dirt-enabled</use>
</value>
</uniform>
<uniform>
<name>dirt_color</name>
<type>float-vec3</type>
<value>
<use>dirt-color</use>
</value>
</uniform>
<uniform>
<name>dirt_factor</name>
<type>float</type>
<value>
<use>dirt-factor</use>
</value>
</uniform>
<!-- set the amount of ambient light correction 0.0 - 1.0 --> <!-- set the amount of ambient light correction 0.0 - 1.0 -->
<uniform> <uniform>
<name>amb_correction</name> <name>amb_correction</name>
<type>float</type> <type>float</type>
<value> <value>
<use>ambient_correction</use> <use>ambient-correction</use>
</value> </value>
</uniform> </uniform>
<!-- shader quality --> <!-- shader quality -->
@ -593,7 +629,7 @@ please see Docs/README.model-combined.eff for documentation
<name>shader_qual</name> <name>shader_qual</name>
<type>int</type> <type>int</type>
<value> <value>
<use>shader_quality</use> <use>shader-quality</use>
</value> </value>
</uniform> </uniform>
@ -601,7 +637,7 @@ please see Docs/README.model-combined.eff for documentation
<name>hdg</name> <name>hdg</name>
<type>float</type> <type>float</type>
<value> <value>
<use>model_hdg</use> <use>model-hdg</use>
</value> </value>
</uniform> </uniform>
@ -609,7 +645,7 @@ please see Docs/README.model-combined.eff for documentation
<name>pitch</name> <name>pitch</name>
<type>float</type> <type>float</type>
<value> <value>
<use>model_pitch</use> <use>model-pitch</use>
</value> </value>
</uniform> </uniform>
@ -617,7 +653,7 @@ please see Docs/README.model-combined.eff for documentation
<name>roll</name> <name>roll</name>
<type>float</type> <type>float</type>
<value> <value>
<use>model_roll</use> <use>model-roll</use>
</value> </value>
</uniform> </uniform>

4
Effects/model-default.eff
View file

@ -28,14 +28,14 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/generic</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

2
Effects/rain-layer.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/clouds3d-enable</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>

4
Effects/reflect-bump-spec.eff
View file

@ -123,7 +123,7 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
</parameters> </parameters>
@ -135,7 +135,7 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/model</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

2
Effects/reflect.eff
View file

@ -114,7 +114,7 @@
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/model</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

9
Effects/runway.eff
View file

@ -51,10 +51,9 @@
<shade-model>smooth</shade-model> <shade-model>smooth</shade-model>
<rainbowiness type="float">0.01</rainbowiness> <rainbowiness type="float">0.01</rainbowiness>
<fresneliness>0.01</fresneliness> <fresneliness>0.01</fresneliness>
<noisiness>0.01</noisiness> <noisiness>0.15</noisiness>
<!-- <refl_correction>0.0</refl_correction> --> <!-- <refl_correction>0.0</refl_correction> -->
<ambient_correction>0.01</ambient_correction> <ambient_correction>-0.15</ambient_correction>
<reflect_map>1</reflect_map>
<normalmap_dds>1</normalmap_dds> <normalmap_dds>1</normalmap_dds>
<vertex-program-two-side type="bool">false</vertex-program-two-side> <vertex-program-two-side type="bool">false</vertex-program-two-side>
<cull-face>back</cull-face> <cull-face>back</cull-face>
@ -79,7 +78,7 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
@ -90,7 +89,7 @@
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/generic</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

1
Effects/skydome.eff
View file

@ -36,7 +36,6 @@
<technique n="8"> <technique n="8">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
<or> <or>
<less-equal> <less-equal>

4
Effects/terrain-default.eff
View file

@ -51,7 +51,7 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</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
@ -59,7 +59,7 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shaders/generic</property>
<or> <or>
<less-equal> <less-equal>

2
Effects/test.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/generic</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>

3
Effects/transition.eff
View file

@ -80,7 +80,7 @@ parameters :
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
@ -94,7 +94,6 @@ parameters :
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/transition</property> <property>/sim/rendering/shaders/transition</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>

3
Effects/tree.eff
View file

@ -33,14 +33,13 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<!--<property>/sim/rendering/shader-effects</property>-->
<property>/sim/rendering/random-vegetation</property> <property>/sim/rendering/random-vegetation</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>

15
Effects/urban.eff
View file

@ -29,7 +29,7 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
@ -43,12 +43,10 @@
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/urban</property> <property>/sim/rendering/shaders/urban</property>
<property>/sim/rendering/shaders/quality-level</property>
<less-equal> <less-equal>
<value type="float">4.0</value> <value type="float">4.0</value>
<float-property>/sim/rendering/shaders/urban</float-property> <float-property>/sim/rendering/shaders/urban</float-property>
</less-equal> </less-equal>
<and>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>
@ -66,7 +64,6 @@
<extension-supported>GL_ARB_shader_texture_lod</extension-supported> <extension-supported>GL_ARB_shader_texture_lod</extension-supported>
</or> </or>
</and> </and>
</and>
</predicate> </predicate>
<pass> <pass>
<lighting>true</lighting> <lighting>true</lighting>
@ -290,12 +287,10 @@
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/urban</property> <property>/sim/rendering/shaders/urban</property>
<!--<property>/sim/rendering/shader-effects</property>-->
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>
<float-property>/sim/rendering/shaders/quality-level</float-property> <float-property>/sim/rendering/shaders/urban</float-property>
</less-equal> </less-equal>
<and>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>
@ -308,11 +303,7 @@
<extension-supported>GL_ARB_fragment_shader</extension-supported> <extension-supported>GL_ARB_fragment_shader</extension-supported>
</and> </and>
</or> </or>
<or> <!-- quality level below 4.0 doesn't require GL_ATI_shader_texture_lod or GL_ARB_shader_texture_lod -->
<extension-supported>GL_ATI_shader_texture_lod</extension-supported>
<extension-supported>GL_ARB_shader_texture_lod</extension-supported>
</or>
</and>
</and> </and>
</predicate> </predicate>
<pass> <pass>

10
Effects/water-inland.eff
View file

@ -66,18 +66,17 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
<technique n="8"> <technique n="8">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/water-shader</property> <property>/sim/rendering/shaders/water</property>
<property>/sim/rendering/shader-effects</property>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>
<float-property>/sim/rendering/quality-level</float-property> <float-property>/sim/rendering/shaders/water</float-property>
</less-equal> </less-equal>
<or> <or>
<less-equal> <less-equal>
@ -310,8 +309,7 @@
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/water-shader</property> <property>/sim/rendering/shaders/water</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/water.eff
View file

@ -125,7 +125,7 @@
<use>/environment/terminator-relative-position-m</use> <use>/environment/terminator-relative-position-m</use>
</terminator> </terminator>
<fogtype> <fogtype>
<use>/sim/rendering/scattering-shader</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>

1
Input/Joysticks/Accelerometers/accelerometers.xml
View file

@ -12,6 +12,7 @@ $Id$
<PropertyList> <PropertyList>
<name>applesmc</name>
<name>ST LIS3LV02DL Accelerometer</name> <name>ST LIS3LV02DL Accelerometer</name>
<name>ST LIS3L V02DL Accelerometer</name> <name>ST LIS3L V02DL Accelerometer</name>

4
Input/Joysticks/ThrustMaster/Warthog/README
View file

@ -101,8 +101,10 @@ via raw HID support.
$ mkdir -p ~/.fgfs/Nasal $ mkdir -p ~/.fgfs/Nasal
$ cp $FG_ROOT/Nasal/IOrules ~/.fgfs/Nasal $ cp $FG_ROOT/Nasal/IOrules ~/.fgfs/Nasal
Now add these two lines there: Now add these four lines there:
READ ALLOW /dev/input/hidraw/Thustmaster_Joystick_-_HOTAS_Warthog
READ ALLOW /dev/input/hidraw/Thrustmaster_Throttle_-_HOTAS_Warthog
WRITE ALLOW /dev/input/hidraw/Thustmaster_Joystick_-_HOTAS_Warthog WRITE ALLOW /dev/input/hidraw/Thustmaster_Joystick_-_HOTAS_Warthog
WRITE ALLOW /dev/input/hidraw/Thrustmaster_Throttle_-_HOTAS_Warthog WRITE ALLOW /dev/input/hidraw/Thrustmaster_Throttle_-_HOTAS_Warthog

6
Input/Joysticks/ThrustMaster/Warthog/Stick/stick_rotate.xml
View file

@ -9,10 +9,13 @@
<PropertyList> <PropertyList>
<nasal> <nasal>
<script> <script>
contains(caller(0)[0], "stick") and removelistener(stick.listener);
var stick = { var stick = {
init: func { init: func {
me.x = me.y = 0; me.x = me.y = 0;
jslistener("/input/joysticks/stick-angle", func(n) { var a = props.globals.initNode("/input/joysticks/stick-angle");
me.listener = setlistener(a, func(n) {
me.angle = n.getValue() * D2R; me.angle = n.getValue() * D2R;
me.sin = math.sin(me.angle); me.sin = math.sin(me.angle);
me.cos = math.cos(me.angle); me.cos = math.cos(me.angle);
@ -32,6 +35,7 @@
setprop("/controls/flight/elevator", me.y * me.cos - me.x * me.sin); setprop("/controls/flight/elevator", me.y * me.cos - me.x * me.sin);
}, },
}; };
stick.init(); stick.init();
</script> </script>
</nasal> </nasal>

16
Nasal/aircraft.nas
View file

@ -1034,9 +1034,15 @@ var HUD = {
init: func { init: func {
me.vis1N = props.globals.getNode("/sim/hud/visibility[1]", 1); me.vis1N = props.globals.getNode("/sim/hud/visibility[1]", 1);
me.currcolN = props.globals.getNode("/sim/hud/current-color", 1); me.currcolN = props.globals.getNode("/sim/hud/current-color", 1);
me.currentPathN = props.globals.getNode("/sim/hud/current-path", 1);
me.hudN = props.globals.getNode("/sim/hud", 1);
me.paletteN = props.globals.getNode("/sim/hud/palette", 1); me.paletteN = props.globals.getNode("/sim/hud/palette", 1);
me.brightnessN = props.globals.getNode("/sim/hud/color/brightness", 1); me.brightnessN = props.globals.getNode("/sim/hud/color/brightness", 1);
me.currentN = me.vis1N; me.currentN = me.vis1N;
# keep compatibility with earlier version of FG - hud/path[1] is
# the default Hud
me.currentPathN.setIntValue(1);
}, },
cycle_color: func { # h-key cycle_color: func { # h-key
if (!me.currentN.getBoolValue()) # if off, turn on if (!me.currentN.getBoolValue()) # if off, turn on
@ -1057,10 +1063,16 @@ var HUD = {
me.brightnessN.setValue(br > 0.01 ? br : 1); me.brightnessN.setValue(br > 0.01 ? br : 1);
}, },
normal_type: func { # i-key normal_type: func { # i-key
me.currentPathN.setIntValue(1);
}, },
cycle_type: func { # I-key cycle_type: func { # I-key
var i = me.currentPathN.getValue() + 1;
if (i < 1 or i > size(me.hudN.getChildren("path"))) {
# back to the start
me.currentPathN.setIntValue(1);
} else {
me.currentPathN.setIntValue(i);
}
}, },
is_active: func { is_active: func {
me.vis1N.getValue(); me.vis1N.getValue();

100
Shaders/runway-reflect-bump-spec.frag
View file

@ -8,7 +8,6 @@ varying vec3 rawpos;
varying vec3 VNormal; varying vec3 VNormal;
varying vec3 VTangent; varying vec3 VTangent;
varying vec3 VBinormal; varying vec3 VBinormal;
varying vec3 Normal;
varying vec3 vViewVec; varying vec3 vViewVec;
varying vec3 reflVec; varying vec3 reflVec;
@ -29,7 +28,6 @@ uniform float rainbowiness;
uniform float fresneliness; uniform float fresneliness;
uniform float noisiness; uniform float noisiness;
uniform float ambient_correction; uniform float ambient_correction;
uniform float reflect_map;
uniform float normalmap_dds; uniform float normalmap_dds;
//uniform int fogType; //uniform int fogType;
@ -44,102 +42,98 @@ vec3 fog_Func(vec3 color, int type);
void main (void) void main (void)
{ {
vec3 halfV; //vec3 halfV;
float NdotL, NdotHV; //float NdotL, NdotHV;
vec4 texel = texture2D(BaseTex, gl_TexCoord[0].st);
vec4 nmap = texture2D(NormalTex, gl_TexCoord[0].st * 8.0);
vec4 map = texture2D(Map, gl_TexCoord[0].st * 8.0);
vec4 specNoise = texture3D(Noise, rawpos.xyz * 0.0045);
vec4 noisevec = texture3D(Noise, rawpos.xyz);
vec3 lightDir = gl_LightSource[0].position.xyz; vec3 lightDir = gl_LightSource[0].position.xyz;
vec3 halfVector = gl_LightSource[0].halfVector.xyz; vec3 halfVector = gl_LightSource[0].halfVector.xyz;
vec3 N;
float pf;
// vec4 color = gl_Color;
//vec4 specular = vec4(0.0);
vec4 color = gl_Color; N = nmap.rgb * 2.0 - 1.0;
vec4 specular = vec4(0.0); N = normalize(N.x * VTangent + N.y * VBinormal + N.z * VNormal);
vec4 ns = texture2D(NormalTex, gl_TexCoord[0].st * 16.0); if (normalmap_dds > 0)
vec3 n = ns.rgb * 2.0 - 1.0; N = -N;
n = normalize(n.x * VTangent + n.y * VBinormal + n.z * VNormal);
//fix dds normal
if (normalmap_dds > 0.0) {
n = -n;
}
NdotL = max(0.0, dot(n, lightDir));
// calculate the specular light // calculate the specular light
if (NdotL > 0.0) { float refl_correction = spec_adjust * 1.9 - 1.0;
color += Diffuse * NdotL; float shininess = max (0.35, refl_correction);
halfV = normalize(halfVector); float nDotVP = max(0.0, dot(N, normalize(gl_LightSource[0].position.xyz)));
NdotHV = max(dot(n, halfV), 0.0); float nDotHV = max(0.0, dot(N, normalize(gl_LightSource[0].halfVector.xyz)));
if (gl_FrontMaterial.shininess > 0.0)
specular.rgb = (gl_FrontMaterial.specular.rgb * ns.a if (nDotVP == 0.0)
* gl_LightSource[0].specular.rgb pf = 0.0;
* pow(NdotHV, gl_FrontMaterial.shininess + 128 * spec_adjust)); else
} pf = pow(nDotHV, /*gl_FrontMaterial.*/shininess);
vec4 Diffuse = gl_LightSource[0].diffuse * nDotVP;
vec4 Specular = /*gl_FrontMaterial.specular*/ vec4(vec3(0.5*shininess), 1.0)* gl_LightSource[0].specular * pf;
vec4 color = gl_Color + Diffuse * gl_FrontMaterial.diffuse;
color += Specular * /*gl_FrontMaterial.specular*/ vec4(vec3(0.5*shininess), 1.0) * nmap.a;
//color.a = alpha; //color.a = alpha;
vec4 texel = texture2D(BaseTex, gl_TexCoord[0].st);
//vec4 texelcolor = color * texel + specular; //vec4 texelcolor = color * texel + specular;
color.a = texel.a * alpha; color.a = texel.a * alpha;
color = clamp(color, 0.0, 1.0); color = clamp(color, 0.0, 1.0);
// calculate the fog factor
//const float LOG2 = 1.442695;
//float fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2);
//fogFactor = clamp(fogFactor, 0.0, 1.0);
//if(gl_Fog.density == 1.0)
// fogFactor=1.0;
vec3 normal = normalize(VNormal);
vec3 viewVec = normalize(vViewVec); vec3 viewVec = normalize(vViewVec);
// Map a rainbowish color // Map a rainbowish color
float v = dot(viewVec, normal); float v = dot(viewVec, normalize(VNormal));
vec4 rainbow = texture2D(Rainbow, vec2(v, 0.0)); vec4 rainbow = texture2D(Rainbow, vec2(v, 0.0));
// Map a fresnel effect // Map a fresnel effect
vec4 fresnel = texture2D(Fresnel, vec2(v, 0.0)); vec4 fresnel = texture2D(Fresnel, vec2(v, 0.0));
// map the refection of the environment // map the refection of the environment
vec4 reflection = textureCube(Environment, reflVec); vec4 reflection = textureCube(Environment, reflVec * dot(N,VNormal));
float refl_correction = spec_adjust * 1.7 - 1.0;
// set the user shininess offset // set the user shininess offset
float transparency_offset = clamp(refl_correction, -1.0, 1.0); float transparency_offset = clamp(refl_correction, -1.0, 1.0);
float reflFactor = 0.0; float reflFactor = 0.0;
vec4 map = texture2D(Map, gl_TexCoord[0].st * 8.0); //vec4 specNoise1 = texture3D(Noise, rawpos.xyz*0.001);
if(reflect_map > 0.0){
// map the shininess of the object with user input
//float pam = (map.a * -2) + 1; //reverse map
reflFactor = map.a *(1.0- n.z) + transparency_offset;
} else {
// set the reflectivity proportional to shininess with user input
reflFactor = (gl_FrontMaterial.shininess / 128.0) + transparency_offset;
}
reflFactor = clamp(reflFactor, 0.0, 0.75); float MixFactor = specNoise.r * specNoise.g * specNoise.b * 350.0;
//MixFactor *= specNoise1.r;
MixFactor = 0.75 * smoothstep(0.0, 1.0, MixFactor);
reflFactor = max(map.a * (texel.r + texel.g), 1.0 - MixFactor) * (1.0- N.z) + transparency_offset ;
//reflFactor = clamp(reflFactor, 0.0, 0.75);
reflFactor =0.75 * smoothstep(0.05, 1.0, reflFactor);
// set ambient adjustment to remove bluiness with user input // set ambient adjustment to remove bluiness with user input
float ambient_offset = clamp(ambient_correction, -1.0, 1.0); float ambient_offset = clamp(ambient_correction, -1.0, 1.0);
vec4 ambient_Correction = vec4(gl_LightSource[0].ambient.rg, gl_LightSource[0].ambient.b * 0.6, 0.5) * ambient_offset ; vec4 ambient_Correction = vec4(gl_LightSource[0].ambient.rg, gl_LightSource[0].ambient.b * 0.6, 0.5) * ambient_offset ;
ambient_Correction = clamp(ambient_Correction, -1.0, 1.0); ambient_Correction = clamp(ambient_Correction, -1.0, 1.0);
// map noise vector
vec4 noisevec = texture3D(Noise, rawpos.xyz);
// add fringing fresnel and rainbow effects and modulate by reflection // add fringing fresnel and rainbow effects and modulate by reflection
vec4 reflcolor = mix(reflection, rainbow, rainbowiness * v); vec4 reflcolor = mix(reflection, rainbow, rainbowiness * v);
reflcolor += Specular * nmap.a;
vec4 reflfrescolor = mix(reflcolor, fresnel, fresneliness * v); vec4 reflfrescolor = mix(reflcolor, fresnel, fresneliness * v);
vec4 noisecolor = mix(reflfrescolor, noisevec, noisiness); vec4 noisecolor = mix(reflfrescolor, noisevec, noisiness);
vec4 raincolor = vec4(noisecolor.rgb * reflFactor, 1.0); vec4 raincolor = vec4(noisecolor.rgb * reflFactor, 1.0);
raincolor += Specular * nmap.a;
vec4 mixedcolor = mix(texel, raincolor, reflFactor); vec4 mixedcolor = mix(texel, raincolor, reflFactor);
// the final reflection // the final reflection
vec4 reflColor = vec4(color.rgb * mixedcolor.rgb + specular.rgb + ambient_Correction.rgb, color.a); vec4 fragColor = vec4(color.rgb * mixedcolor.rgb + ambient_Correction.rgb, color.a);
fragColor += Specular * nmap.a;
reflColor = clamp(reflColor, 0.0, 1.0);
vec4 fragColor = reflColor;
fragColor.rgb = fog_Func(fragColor.rgb, fogType); fragColor.rgb = fog_Func(fragColor.rgb, fogType);
gl_FragColor = fragColor; gl_FragColor = fragColor;
} }

37
Shaders/ubershader.frag
View file

@ -25,11 +25,13 @@ uniform sampler3D ReflNoiseTex;
uniform int nmap_enabled; uniform int nmap_enabled;
uniform int nmap_dds; uniform int nmap_dds;
uniform int nmap_tile;
uniform int refl_enabled; uniform int refl_enabled;
uniform int refl_map; uniform int refl_map;
uniform int lightmap_enabled; uniform int lightmap_enabled;
uniform int lightmap_multi; uniform int lightmap_multi;
uniform int shader_qual; uniform int shader_qual;
uniform int dirt_enabled;
uniform float lightmap_r_factor; uniform float lightmap_r_factor;
uniform float lightmap_g_factor; uniform float lightmap_g_factor;
@ -40,12 +42,15 @@ uniform float refl_fresnel;
uniform float refl_rainbow; uniform float refl_rainbow;
uniform float refl_noise; uniform float refl_noise;
uniform float amb_correction; uniform float amb_correction;
uniform float dirt_factor;
uniform vec3 lightmap_r_color; uniform vec3 lightmap_r_color;
uniform vec3 lightmap_g_color; uniform vec3 lightmap_g_color;
uniform vec3 lightmap_b_color; uniform vec3 lightmap_b_color;
uniform vec3 lightmap_a_color; uniform vec3 lightmap_a_color;
uniform vec3 dirt_color;
///fog include////////////////////// ///fog include//////////////////////
uniform int fogType; uniform int fogType;
vec3 fog_Func(vec3 color, int type); vec3 fog_Func(vec3 color, int type);
@ -54,10 +59,9 @@ vec3 fog_Func(vec3 color, int type);
void main (void) void main (void)
{ {
vec4 texel = texture2D(BaseTex, gl_TexCoord[0].st); vec4 texel = texture2D(BaseTex, gl_TexCoord[0].st);
vec4 nmap = texture2D(NormalTex, gl_TexCoord[0].st); vec4 nmap = texture2D(NormalTex, gl_TexCoord[0].st * nmap_tile);
vec4 reflmap = texture2D(ReflMapTex, gl_TexCoord[0].st); vec4 reflmap = texture2D(ReflMapTex, gl_TexCoord[0].st);
vec4 noisevec = texture3D(ReflNoiseTex, rawpos.xyz); vec4 noisevec = texture3D(ReflNoiseTex, rawpos.xyz);
vec4 reflection = textureCube(Environment, reflVec);
vec4 lightmapTexel = texture2D(LightMapTex, gl_TexCoord[0].st); vec4 lightmapTexel = texture2D(LightMapTex, gl_TexCoord[0].st);
vec3 mixedcolor; vec3 mixedcolor;
@ -74,6 +78,7 @@ void main (void)
N = normalize(VNormal); N = normalize(VNormal);
} }
///END bump ///END bump
vec4 reflection = textureCube(Environment, reflVec * dot(N,VNormal));
vec3 viewVec = normalize(vViewVec); vec3 viewVec = normalize(vViewVec);
float v = dot(viewVec, normalize(VNormal));// Map a rainbowish color float v = dot(viewVec, normalize(VNormal));// Map a rainbowish color
vec4 fresnel = texture2D(ReflFresnelTex, vec2(v, 0.0)); vec4 fresnel = texture2D(ReflFresnelTex, vec2(v, 0.0));
@ -81,6 +86,11 @@ void main (void)
float nDotVP = max(0.0, dot(N, normalize(gl_LightSource[0].position.xyz))); float nDotVP = max(0.0, dot(N, normalize(gl_LightSource[0].position.xyz)));
float nDotHV = max(0.0, dot(N, normalize(gl_LightSource[0].halfVector.xyz))); float nDotHV = max(0.0, dot(N, normalize(gl_LightSource[0].halfVector.xyz)));
//glare on the backside of tranparent objects
if ((gl_FrontMaterial.diffuse.a < 1.0 || texel.a < 1.0) && dot(N, normalize(gl_LightSource[0].position.xyz)) < 0.0) {
nDotVP = max(0.0, dot(-N, normalize(gl_LightSource[0].position.xyz)));
nDotHV = max(0.0, dot(-N, normalize(gl_LightSource[0].halfVector.xyz)));
}
if (nDotVP == 0.0) if (nDotVP == 0.0)
pf = 0.0; pf = 0.0;
@ -93,9 +103,10 @@ void main (void)
vec4 color = gl_Color + Diffuse * gl_FrontMaterial.diffuse; vec4 color = gl_Color + Diffuse * gl_FrontMaterial.diffuse;
color += Specular * gl_FrontMaterial.specular * nmap.a; color += Specular * gl_FrontMaterial.specular * nmap.a;
color = clamp( color, 0.0, 1.0 ); color = clamp( color, 0.0, 1.0 );
//////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
//BEGIN reflect //BEGIN reflect
////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
if (refl_enabled > 0 && shader_qual > 0){ if (refl_enabled > 0 && shader_qual > 0){
float reflFactor; float reflFactor;
float transparency_offset = clamp(refl_correction, -1.0, 1.0);// set the user shininess offset float transparency_offset = clamp(refl_correction, -1.0, 1.0);// set the user shininess offset
@ -124,9 +135,9 @@ void main (void)
} else { } else {
mixedcolor = texel.rgb; mixedcolor = texel.rgb;
} }
/////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
//END reflect //END reflect
/////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// set ambient adjustment to remove bluiness with user input // set ambient adjustment to remove bluiness with user input
float ambient_offset = clamp(amb_correction, -1.0, 1.0); float ambient_offset = clamp(amb_correction, -1.0, 1.0);
@ -135,6 +146,20 @@ void main (void)
color.a = texel.a * alpha; color.a = texel.a * alpha;
vec4 fragColor = vec4(color.rgb * mixedcolor + ambient_Correction.rgb, color.a); vec4 fragColor = vec4(color.rgb * mixedcolor + ambient_Correction.rgb, color.a);
//////////////////////////////////////////////////////////////////////
//begin DIRT
//////////////////////////////////////////////////////////////////////
if (dirt_enabled > 0.0){
vec3 dirtColor = dirt_color * noisevec.rgb;
float dirtFactor = reflmap.r * dirt_factor;
dirtFactor = smoothstep(0.0, 1.0, dirtFactor);
fragColor.rgb = mix(fragColor.rgb, dirtColor, dirtFactor);
}
//////////////////////////////////////////////////////////////////////
//END Dirt
//////////////////////////////////////////////////////////////////////
fragColor += Specular * nmap.a; fragColor += Specular * nmap.a;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

BIN
Sounds/avionics-400Hz.wav Normal file
View file

Binary file not shown.

1
Translations/strings-default.xml
View file

@ -309,5 +309,6 @@
<trace-read-desc>Trace the reads for a property;</trace-read-desc> <trace-read-desc>Trace the reads for a property;</trace-read-desc>
<trace-write-desc>Trace the writes for a property;</trace-write-desc> <trace-write-desc>Trace the writes for a property;</trace-write-desc>
<log-level-desc>Specify which logging level to use</log-level-desc> <log-level-desc>Specify which logging level to use</log-level-desc>
<log-class-desc>Specify which logging class(es) to use</log-class-desc>
</PropertyList> </PropertyList>

40
gui/dialogs/rendering.xml
View file

@ -171,7 +171,7 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Random objects (triggers scenery reload)</label> <label>Random objects</label>
<name>random-objects</name> <name>random-objects</name>
<property>/sim/rendering/random-objects</property> <property>/sim/rendering/random-objects</property>
<binding> <binding>
@ -342,6 +342,21 @@
</hrule> </hrule>
</group> </group>
<group>
<layout>vbox</layout>
<padding>4</padding>
<text>
<padding>0</padding>
<label>This slider overrides custom settings as set in</label>
<halign>left</halign>
</text>
<text>
<padding>0</padding>
<label>the (advanced) Shader Options dialog.</label>
<halign>left</halign>
</text>
</group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
@ -375,9 +390,6 @@
<layout>hbox</layout> <layout>hbox</layout>
<button> <button>
<legend>Shader Options</legend> <legend>Shader Options</legend>
<enable>
<property>/sim/rendering/shaders/quality-level</property>
</enable>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>shaders</dialog-name> <dialog-name>shaders</dialog-name>
@ -399,7 +411,6 @@
<green>0.6</green> <green>0.6</green>
<blue>0.6</blue> <blue>0.6</blue>
</color> </color>
</text> </text>
<text> <text>
<visible> <visible>
@ -604,6 +615,25 @@
<nasal> <nasal>
<open> <open>
gui.enable_widgets(cmdarg(), "shadows-debug", getprop("/sim/gui/devel-widgets")); gui.enable_widgets(cmdarg(), "shadows-debug", getprop("/sim/gui/devel-widgets"));
# overwrite custom shader settings on quality-slider input
_setlistener("/sim/rendering/shaders/quality-level", func {
var qualityLevel = getprop("/sim/rendering/shaders/quality-level");
setprop("/sim/rendering/shaders/landmass",qualityLevel);
setprop("/sim/rendering/shaders/urban",qualityLevel);
setprop("/sim/rendering/shaders/water",qualityLevel);
if (qualityLevel >= 1.0){
qualityLevel = 1.0;
}
else {
qualityLevel = 0.0;
}
setprop("/sim/rendering/shaders/contrails",qualityLevel);
setprop("/sim/rendering/shaders/crop",qualityLevel);
setprop("/sim/rendering/shaders/generic",qualityLevel);
setprop("/sim/rendering/shaders/model",qualityLevel);
setprop("/sim/rendering/shaders/transition",qualityLevel);
});
</open> </open>
</nasal> </nasal>
</PropertyList> </PropertyList>

38
gui/dialogs/shaders.xml
View file

@ -52,6 +52,14 @@
<layout>vbox</layout> <layout>vbox</layout>
<halign>left</halign> <halign>left</halign>
<text>
<halign>left</halign>
<label>Generic</label>
<enable>
<property>/sim/rendering/shaders/generic</property>
</enable>
</text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>Crop</label> <label>Crop</label>
@ -108,18 +116,32 @@
</enable> </enable>
</text> </text>
</group> </group>
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
<slider>
<name>generic</name>
<min>0.0</min>
<max>1.0</max>
<step>1.0</step>
<fraction>0.5</fraction>
<live>true</live>
<property>/sim/rendering/shaders/generic</property>
<binding>
<command>dialog-apply</command>
<object-name>generic</object-name>
</binding>
</slider>
<slider> <slider>
<name>crop</name> <name>crop</name>
<min>0.0</min> <min>0.0</min>
<max>1.0</max> <max>1.0</max>
<step>1.0</step> <step>1.0</step>
<fraction>0.5</fraction> <fraction>0.5</fraction>
<live>true</live>
<property>/sim/rendering/shaders/crop</property> <property>/sim/rendering/shaders/crop</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -130,9 +152,10 @@
<slider> <slider>
<name>landmass</name> <name>landmass</name>
<min>0.0</min> <min>0.0</min>
<max>1.0</max> <max>5.0</max>
<step>1.0</step> <step>1.0</step>
<fraction>0.5</fraction> <fraction>0.17</fraction>
<live>true</live>
<property>/sim/rendering/shaders/landmass</property> <property>/sim/rendering/shaders/landmass</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -146,6 +169,7 @@
<max>1.0</max> <max>1.0</max>
<step>1.0</step> <step>1.0</step>
<fraction>0.5</fraction> <fraction>0.5</fraction>
<live>true</live>
<property>/sim/rendering/shaders/contrails</property> <property>/sim/rendering/shaders/contrails</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -159,6 +183,7 @@
<max>1.0</max> <max>1.0</max>
<step>1.0</step> <step>1.0</step>
<fraction>0.5</fraction> <fraction>0.5</fraction>
<live>true</live>
<property>/sim/rendering/shaders/transition</property> <property>/sim/rendering/shaders/transition</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -169,9 +194,10 @@
<slider> <slider>
<name>model</name> <name>model</name>
<min>0.0</min> <min>0.0</min>
<max>1.0</max> <max>3.0</max>
<step>1.0</step> <step>1.0</step>
<fraction>0.5</fraction> <fraction>0.25</fraction>
<live>true</live>
<property>/sim/rendering/shaders/model</property> <property>/sim/rendering/shaders/model</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -185,6 +211,7 @@
<max>5.0</max> <max>5.0</max>
<step>1.0</step> <step>1.0</step>
<fraction>0.17</fraction> <fraction>0.17</fraction>
<live>true</live>
<property>/sim/rendering/shaders/urban</property> <property>/sim/rendering/shaders/urban</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -198,6 +225,7 @@
<max>5.0</max> <max>5.0</max>
<step>1.0</step> <step>1.0</step>
<fraction>0.17</fraction> <fraction>0.17</fraction>
<live>true</live>
<property>/sim/rendering/shaders/water</property> <property>/sim/rendering/shaders/water</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>

22
gui/dialogs/sound.xml
View file

@ -273,6 +273,28 @@
<property>/sim/sound/enabled</property> <property>/sim/sound/enabled</property>
</enable> </enable>
</checkbox> </checkbox>
<text>
<row>6</row>
<col>0</col>
<label>AI/MP</label>
<halign>left</halign>
<enable>
<property>/sim/sound/enabled</property>
</enable>
</text>
<checkbox>
<row>6</row>
<col>1</col>
<property>/sim/sound/aimodels/enabled</property>
<binding>
<command>dialog-apply</command>
</binding>
<enable>
<property>/sim/sound/enabled</property>
</enable>
</checkbox>
</group> </group>
<hrule/> <hrule/>

5
keyboard.xml
View file

@ -685,7 +685,6 @@ top down before the key bindings are parsed.
</binding> </binding>
</key> </key>
<!-- no longer used
<key n="73"> <key n="73">
<name>I</name> <name>I</name>
<desc>Switch to and toggle alternative HUD types</desc> <desc>Switch to and toggle alternative HUD types</desc>
@ -693,7 +692,7 @@ top down before the key bindings are parsed.
<command>nasal</command> <command>nasal</command>
<script>aircraft.HUD.cycle_type()</script> <script>aircraft.HUD.cycle_type()</script>
</binding> </binding>
</key> --> </key>
<key n="77"> <key n="77">
<name>M</name> <name>M</name>
@ -908,7 +907,6 @@ top down before the key bindings are parsed.
</binding> </binding>
</key> </key>
<!-- no longer used
<key n="105"> <key n="105">
<name>i</name> <name>i</name>
<desc>Normal HUD</desc> <desc>Normal HUD</desc>
@ -917,7 +915,6 @@ top down before the key bindings are parsed.
<script>aircraft.HUD.normal_type()</script> <script>aircraft.HUD.normal_type()</script>
</binding> </binding>
</key> </key>
-->
<key n="106"> <key n="106">
<name>j</name> <name>j</name>

36
materials-dds.xml
View file

@ -565,13 +565,23 @@ Shared parameters for various materials.
<material> <material>
<name>pc_taxiway</name> <name>pc_taxiway</name>
<name>dirt_rwytaxiway</name> <name>dirt_rwytaxiway</name>
<effect>Effects/runway</effect>
<shininess>
<use>/environment/rain-norm</use>
</shininess>
<texture>Runway/pc_taxiway.dds</texture> <texture>Runway/pc_taxiway.dds</texture>
</material> </material>
<material> <material>
<name>pc_tiedown</name> <name>pc_tiedown</name>
<name>dirt_rwytiedown</name> <name>dirt_rwytiedown</name>
<effect>Effects/runway</effect>
<shininess>
<use>/environment/rain-norm</use>
</shininess>
<texture>Runway/pc_tiedown.dds</texture> <texture>Runway/pc_tiedown.dds</texture>
<xsize>200</xsize>
<ysize>200</ysize>
</material> </material>
<material> <material>
@ -597,6 +607,10 @@ Shared parameters for various materials.
<material> <material>
<name>pc_threshold</name> <name>pc_threshold</name>
<name>dirt_rwythreshold</name> <name>dirt_rwythreshold</name>
<effect>Effects/runway</effect>
<shininess>
<use>/environment/rain-norm</use>
</shininess>
<texture>Runway/pc_threshold.dds</texture> <texture>Runway/pc_threshold.dds</texture>
<wrapu>false</wrapu> <wrapu>false</wrapu>
<wrapv>false</wrapv> <wrapv>false</wrapv>
@ -1015,9 +1029,6 @@ Shared parameters for various materials.
<b>0.1</b> <b>0.1</b>
<a>1.0</a> <a>1.0</a>
</specular> </specular>
<shininess>
<use>/environment/rain-norm</use>
</shininess>
<texture>Runway/pa_shoulder.dds</texture> <texture>Runway/pa_shoulder.dds</texture>
<ysize>5</ysize> <ysize>5</ysize>
<wrapu>false</wrapu> <wrapu>false</wrapu>
@ -1041,9 +1052,6 @@ Shared parameters for various materials.
<b>0.1</b> <b>0.1</b>
<a>1.0</a> <a>1.0</a>
</specular> </specular>
<shininess>
<use>/environment/rain-norm</use>
</shininess>
<texture>Runway/pc_shoulder.dds</texture> <texture>Runway/pc_shoulder.dds</texture>
<ysize>5</ysize> <ysize>5</ysize>
<wrapu>false</wrapu> <wrapu>false</wrapu>
@ -1067,9 +1075,6 @@ Shared parameters for various materials.
<b>0.1</b> <b>0.1</b>
<a>1.0</a> <a>1.0</a>
</specular> </specular>
<shininess>
<use>/environment/rain-norm</use>
</shininess>
<texture>Runway/pa_shoulder_f.dds</texture> <texture>Runway/pa_shoulder_f.dds</texture>
<ysize>5</ysize> <ysize>5</ysize>
<wrapu>false</wrapu> <wrapu>false</wrapu>
@ -1093,9 +1098,6 @@ Shared parameters for various materials.
<b>0.1</b> <b>0.1</b>
<a>1.0</a> <a>1.0</a>
</specular> </specular>
<shininess>
<use>/environment/rain-norm</use>
</shininess>
<texture>Runway/pc_shoulder_f.dds</texture> <texture>Runway/pc_shoulder_f.dds</texture>
<ysize>5</ysize> <ysize>5</ysize>
<wrapu>false</wrapu> <wrapu>false</wrapu>
@ -1320,7 +1322,7 @@ Shared parameters for various materials.
<property>sim/startup/season</property> <property>sim/startup/season</property>
<value>summer</value> <value>summer</value>
</equals> </equals>
<property>sim/rendering/urban-shader</property> <property>sim/rendering/shaders/urban</property>
</and> </and>
</condition> </condition>
<name>BuiltUpCover</name> <name>BuiltUpCover</name>
@ -1421,7 +1423,7 @@ Shared parameters for various materials.
<property>sim/startup/season</property> <property>sim/startup/season</property>
<value>summer</value> <value>summer</value>
</equals> </equals>
<property>sim/rendering/urban-shader</property> <property>sim/rendering/shaders/urban</property>
</and> </and>
</condition> </condition>
<!--<name>BuiltUpCover</name> <!--<name>BuiltUpCover</name>
@ -1514,7 +1516,7 @@ Shared parameters for various materials.
<value>summer</value> <value>summer</value>
</equals> </equals>
<not> <not>
<property>sim/rendering/urban-shader</property> <property>sim/rendering/shaders/urban</property>
</not> </not>
</condition> </condition>
<name>BuiltUpCover</name> <name>BuiltUpCover</name>
@ -1607,7 +1609,7 @@ Shared parameters for various materials.
<value>summer</value> <value>summer</value>
</equals> </equals>
<not> <not>
<property>sim/rendering/urban-shader</property> <property>sim/rendering/shaders/urban</property>
</not> </not>
</condition> </condition>
<name>Construction</name> <name>Construction</name>
@ -1829,7 +1831,6 @@ Shared parameters for various materials.
<bumpiness>0.6</bumpiness> <bumpiness>0.6</bumpiness>
</material> </material>
<material> <material>
<condition> <condition>
<equals> <equals>
@ -3667,7 +3668,6 @@ Shared parameters for various materials.
<!-- runway and taxiway signs --> <!-- runway and taxiway signs -->
<material> <material>
<name>YellowSign.unlighted</name> <name>YellowSign.unlighted</name>
<texture>Signs/yellow.dds</texture> <texture>Signs/yellow.dds</texture>

6
options.xml
View file

@ -1150,6 +1150,12 @@
<description>strings/log-level-desc</description> <description>strings/log-level-desc</description>
</option> </option>
<option>
<name>log-class</name>
<arg>[ai,environment,flight,general,io,network,sound,terrain,...]</arg>
<description>strings/log-class-desc</description>
</option>
<option> <option>
<name>trace-read</name> <name>trace-read</name>
<arg>property</arg> <arg>property</arg>

11
preferences.xml
View file

@ -68,10 +68,11 @@ Started September 2000 by David Megginson, david@megginson.com
<realism type="int">5</realism> <realism type="int">5</realism>
<filtering type="int">8</filtering> <filtering type="int">8</filtering>
<shaders> <shaders>
<model type="float" userarchive="y">1.0</model> <generic type="float" userarchive="y">1.0</generic>
<crop type="float" userarchive="y">1.0</crop>
<landmass type="float" userarchive="y">1.0</landmass> <landmass type="float" userarchive="y">1.0</landmass>
<model type="float" userarchive="y">1.0</model>
<contrails type="float" userarchive="y">1.0</contrails> <contrails type="float" userarchive="y">1.0</contrails>
<crop type="float" userarchive="y">1.0</crop>
<skydome type="bool" userarchive="y">false</skydome> <skydome type="bool" userarchive="y">false</skydome>
<transition type="float" userarchive="y">1.0</transition> <transition type="float" userarchive="y">1.0</transition>
<urban type="float" userarchive="y">1.0</urban> <urban type="float" userarchive="y">1.0</urban>
@ -305,6 +306,9 @@ Started September 2000 by David Megginson, david@megginson.com
<festival type="bool">true</festival> <festival type="bool">true</festival>
</voice> </voice>
</voices> </voices>
<aimodels>
<enabled type="bool" userarchive="y">false</enabled>
</aimodels>
</sound> </sound>
<speed-up type="double">1.0</speed-up> <speed-up type="double">1.0</speed-up>
<current-view> <current-view>
@ -324,6 +328,9 @@ Started September 2000 by David Megginson, david@megginson.com
</panel_2> </panel_2>
<hud> <hud>
<path n="1">Huds/default.xml</path> <path n="1">Huds/default.xml</path>
<path n="2">Huds/NTPS.xml</path>
<path n="3">Huds/minimal.xml</path>
<!-- new HUD --> <!-- new HUD -->
<visibility n="1" <visibility n="1"
type="bool">false</visibility> type="bool">false</visibility>