diff --git a/Aircraft/Generic/Effects/fgfs-sky2/1.png b/Aircraft/Generic/Effects/fgfs-sky2/1.png new file mode 100644 index 000000000..d2f28518e Binary files /dev/null and b/Aircraft/Generic/Effects/fgfs-sky2/1.png differ diff --git a/Aircraft/Generic/Effects/fgfs-sky2/2.png b/Aircraft/Generic/Effects/fgfs-sky2/2.png new file mode 100644 index 000000000..1da47cccd Binary files /dev/null and b/Aircraft/Generic/Effects/fgfs-sky2/2.png differ diff --git a/Aircraft/Generic/Effects/fgfs-sky2/3.png b/Aircraft/Generic/Effects/fgfs-sky2/3.png new file mode 100644 index 000000000..7e9a01120 Binary files /dev/null and b/Aircraft/Generic/Effects/fgfs-sky2/3.png differ diff --git a/Aircraft/Generic/Effects/fgfs-sky2/4.png b/Aircraft/Generic/Effects/fgfs-sky2/4.png new file mode 100644 index 000000000..4fb3c2a1d Binary files /dev/null and b/Aircraft/Generic/Effects/fgfs-sky2/4.png differ diff --git a/Aircraft/Generic/Effects/fgfs-sky2/5.png b/Aircraft/Generic/Effects/fgfs-sky2/5.png new file mode 100644 index 000000000..7a1c5fca4 Binary files /dev/null and b/Aircraft/Generic/Effects/fgfs-sky2/5.png differ diff --git a/Aircraft/Generic/Effects/fgfs-sky2/6.png b/Aircraft/Generic/Effects/fgfs-sky2/6.png new file mode 100644 index 000000000..c284e6dbe Binary files /dev/null and b/Aircraft/Generic/Effects/fgfs-sky2/6.png differ diff --git a/Aircraft/Generic/Logos/dragon.xml b/Aircraft/Generic/Logos/dragon.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/SCR-522C/Dialogs/radios.xml b/Aircraft/Instruments-3d/SCR-522C/Dialogs/radios.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/flaps/flaps.ac b/Aircraft/Instruments-3d/flaps/flaps.ac old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/flaps/flaps.xml b/Aircraft/Instruments-3d/flaps/flaps.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/GNUmakefile b/Aircraft/Instruments-3d/mk-viii/GNUmakefile old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/README b/Aircraft/Instruments-3d/mk-viii/README old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/caution-off.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/caution-off.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/caution-on.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/caution-on.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/flap-override-off.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/flap-override-off.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/flap-override-on.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/flap-override-on.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/glideslope-cancelled-off.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/glideslope-cancelled-off.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/glideslope-cancelled-on.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/glideslope-cancelled-on.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/inhibit-off.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/inhibit-off.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/inhibit-on.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/inhibit-on.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/inop-off.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/inop-off.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/inop-on.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/inop-on.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/steep-approach-off.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/steep-approach-off.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/steep-approach-on.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/steep-approach-on.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/terrain-fail-off.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/terrain-fail-off.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/terrain-fail-on.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/terrain-fail-on.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/terrain-inhibit-off.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/terrain-inhibit-off.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/terrain-inhibit-on.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/terrain-inhibit-on.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/warning-off.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/warning-off.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/warning-on.rgb b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/warning-on.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/caution-off.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/caution-off.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/caution-on.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/caution-on.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/flap-override-off.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/flap-override-off.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/flap-override-on.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/flap-override-on.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/glideslope-cancelled-off.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/glideslope-cancelled-off.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/glideslope-cancelled-on.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/glideslope-cancelled-on.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/inhibit-off.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/inhibit-off.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/inhibit-on.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/inhibit-on.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/inop-off.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/inop-off.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/inop-on.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/inop-on.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/steep-approach-off.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/steep-approach-off.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/steep-approach-on.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/steep-approach-on.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/terrain-fail-off.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/terrain-fail-off.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/terrain-fail-on.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/terrain-fail-on.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/terrain-inhibit-off.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/terrain-inhibit-off.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/terrain-inhibit-on.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/terrain-inhibit-on.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/warning-off.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/warning-off.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/warning-on.xcf b/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf/warning-on.xcf old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/assembly.rgb b/Aircraft/Instruments-3d/mk-viii/assembly.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/assembly/README b/Aircraft/Instruments-3d/mk-viii/assembly/README old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/assembly/assembly.ac b/Aircraft/Instruments-3d/mk-viii/assembly/assembly.ac old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/assembly/assembly.rgb b/Aircraft/Instruments-3d/mk-viii/assembly/assembly.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/assembly/assembly.xsl b/Aircraft/Instruments-3d/mk-viii/assembly/assembly.xsl old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/assembly/transparent-bg.rgb b/Aircraft/Instruments-3d/mk-viii/assembly/transparent-bg.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/caution0-actions.xml b/Aircraft/Instruments-3d/mk-viii/caution0-actions.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/caution0.xml b/Aircraft/Instruments-3d/mk-viii/caution0.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/caution1-actions.xml b/Aircraft/Instruments-3d/mk-viii/caution1-actions.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/caution1.xml b/Aircraft/Instruments-3d/mk-viii/caution1.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/flap-override-actions.xml b/Aircraft/Instruments-3d/mk-viii/flap-override-actions.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/flap-override.xml b/Aircraft/Instruments-3d/mk-viii/flap-override.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/glideslope-cancelled.xml b/Aircraft/Instruments-3d/mk-viii/glideslope-cancelled.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/inhibit-actions.xml b/Aircraft/Instruments-3d/mk-viii/inhibit-actions.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/inhibit.xml b/Aircraft/Instruments-3d/mk-viii/inhibit.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/inop.xml b/Aircraft/Instruments-3d/mk-viii/inop.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/mk-viii.xml b/Aircraft/Instruments-3d/mk-viii/mk-viii.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/steep-approach-actions.xml b/Aircraft/Instruments-3d/mk-viii/steep-approach-actions.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/steep-approach.xml b/Aircraft/Instruments-3d/mk-viii/steep-approach.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/terrain-fail.xml b/Aircraft/Instruments-3d/mk-viii/terrain-fail.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/terrain-inhibit-actions.xml b/Aircraft/Instruments-3d/mk-viii/terrain-inhibit-actions.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/terrain-inhibit.xml b/Aircraft/Instruments-3d/mk-viii/terrain-inhibit.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/warning0-actions.xml b/Aircraft/Instruments-3d/mk-viii/warning0-actions.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/warning0.xml b/Aircraft/Instruments-3d/mk-viii/warning0.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/warning1-actions.xml b/Aircraft/Instruments-3d/mk-viii/warning1-actions.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/mk-viii/warning1.xml b/Aircraft/Instruments-3d/mk-viii/warning1.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/pedals/pedals.ac b/Aircraft/Instruments-3d/pedals/pedals.ac old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/pedals/pedals.rgb b/Aircraft/Instruments-3d/pedals/pedals.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/pedals/pedals.xml b/Aircraft/Instruments-3d/pedals/pedals.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/quadrant/quadrant.ac b/Aircraft/Instruments-3d/quadrant/quadrant.ac old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/quadrant/quadrant.rgb b/Aircraft/Instruments-3d/quadrant/quadrant.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/quadrant/quadrant.xml b/Aircraft/Instruments-3d/quadrant/quadrant.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/radio_stack/panel-tex02.rgb b/Aircraft/Instruments-3d/radio_stack/panel-tex02.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/radio_stack/transparent-bg.rgb b/Aircraft/Instruments-3d/radio_stack/transparent-bg.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/trim/trimwheel.ac b/Aircraft/Instruments-3d/trim/trimwheel.ac old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/trim/trimwheel.rgb b/Aircraft/Instruments-3d/trim/trimwheel.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/trim/trimwheel.xml b/Aircraft/Instruments-3d/trim/trimwheel.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/yoke/yoke.ac b/Aircraft/Instruments-3d/yoke/yoke.ac old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/yoke/yoke.rgb b/Aircraft/Instruments-3d/yoke/yoke.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments-3d/yoke/yoke.xml b/Aircraft/Instruments-3d/yoke/yoke.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments/Textures/FuelOilAmps.png b/Aircraft/Instruments/Textures/FuelOilAmps.png new file mode 100644 index 000000000..280b3025a Binary files /dev/null and b/Aircraft/Instruments/Textures/FuelOilAmps.png differ diff --git a/Aircraft/Instruments/Textures/battery-c172p.rgb b/Aircraft/Instruments/Textures/battery-c172p.rgb new file mode 100644 index 000000000..527fb8f98 Binary files /dev/null and b/Aircraft/Instruments/Textures/battery-c172p.rgb differ diff --git a/Aircraft/Instruments/Textures/plusminus.rgb b/Aircraft/Instruments/Textures/plusminus.rgb old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments/aoaL.xml b/Aircraft/Instruments/aoaL.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments/asi-1k-knot.xml b/Aircraft/Instruments/asi-1k-knot.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments/asi-590-knot-a4c.xml b/Aircraft/Instruments/asi-590-knot-a4c.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments/battery-c172p.xml b/Aircraft/Instruments/battery-c172p.xml new file mode 100644 index 000000000..9579e2097 --- /dev/null +++ b/Aircraft/Instruments/battery-c172p.xml @@ -0,0 +1,160 @@ + + + + + + + Battery Gauge + 512 + 512 + + /systems/electrical/volts + /systems/electrical/amps + + + + + + Backplate + 292 + 456 + + Aircraft/Instruments/Textures/battery-c172p.rgb + 0.0 + 0.570312 + 0.109375 + 1.0 + + + + + Volt Needle + 148 + 32 + + Aircraft/Instruments/Textures/misc2.rgb + 0.0 + 0.289062 + 0.554688 + 0.617188 + + + + x-shift + -142 + + + rotation + + -40.0 + 40.0 + -1.375005 + 0 + + + x-shift + 78 + + + + + + AMP Needle + 148 + 32 + + Aircraft/Instruments/Textures/misc2.rgb + 0.0 + 0.289062 + 0.554688 + 0.617188 + + + + x-shift + 142 + + + rotation + + 0.0 + 40.0 + 2.7 + 126 + + + x-shift + 78 + + + + + + Foreground + 512 + 512 + + Aircraft/Instruments/Textures/smlf.rgb + 0.0 + 1.0 + 0.0 + 1.0 + + + + + AMP label + 32 + 120 + + Aircraft/Instruments/Textures/misc2.rgb + 0.640625 + 0.703125 + 0.53125 + 0.765625 + + + x-shift + -145 + + + y-shift + 2 + + + + + + Volt label + 52 + 52 + + Aircraft/Instruments/Textures/misc2.rgb + 0.640625 + 0.703125 + 0.94 + 1.0 + + + + x-shift + 150 + + + y-shift + -1 + + + + + + + diff --git a/Aircraft/Instruments/fps.xml b/Aircraft/Instruments/fps.xml new file mode 100644 index 000000000..c30844352 --- /dev/null +++ b/Aircraft/Instruments/fps.xml @@ -0,0 +1,32 @@ + + + + + frames per second + 50 + 50 + + + + + counter + text + led + 6.5 + + 1.0 + 0.5 + 0.0 + + + + number-value + /sim/frame-rate + %.0f + + + + + + + diff --git a/Aircraft/Instruments/fuel-c172p.xml b/Aircraft/Instruments/fuel-c172p.xml new file mode 100644 index 000000000..869413c8c --- /dev/null +++ b/Aircraft/Instruments/fuel-c172p.xml @@ -0,0 +1,143 @@ + + + + + Fuel + 100 + 100 + + + /consumables/fuel/tank[0]/level-gal_us + /consumables/fuel/tank[1]/level-gal_us + + + + + + Fuel1 + 20 + 100 + + Aircraft/Instruments/Textures/FuelOilAmps.png + 0.0 + 0.5 + 0.50 + 0.75 + + + + x-shift + -10 + + + + + + Fuel2 + 20 + 100 + + Aircraft/Instruments/Textures/FuelOilAmps.png + 0.0 + 0.5 + 0.50 + 0.75 + + + + x-shift + 10 + + + + + + FuelNeedle1 + 3 + 96 + + + Aircraft/Instruments/Textures/misc1.rgb + 0.71875 + 0.828125 + 0.46875 + 1.0 + + + + + x-shift + -10 + + + y-shift + -110 + + + rotation + + + + 0 + -30 + + + 61.5 + 30 + + + + + y-shift + 120 + + + + + + FuelNeedle2 + 3 + 96 + + + Aircraft/Instruments/Textures/misc1.rgb + 0.71875 + 0.828125 + 0.46875 + 1.0 + + + + + x-shift + 10 + + + y-shift + -110 + + + rotation + + + + 0 + -30 + + + 61.5 + 30 + + + + + y-shift + 120 + + + + + + + diff --git a/Aircraft/Instruments/jet-throttle-quadrant.xml b/Aircraft/Instruments/jet-throttle-quadrant.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments/oil-c172p.xml b/Aircraft/Instruments/oil-c172p.xml new file mode 100644 index 000000000..8146fb083 --- /dev/null +++ b/Aircraft/Instruments/oil-c172p.xml @@ -0,0 +1,154 @@ + + + + + Oil + 100 + 100 + + + engines/engine[0]/oil-temperature-degf + /engines/engine[0]/oil-pressure-psi + + + + + OilTemp + 20 + 100 + + Aircraft/Instruments/Textures/FuelOilAmps.png + 0.5 + 1.0 + 0.25 + 0.50 + + + + x-shift + -10 + + + + + + OilPress + 20 + 100 + + Aircraft/Instruments/Textures/FuelOilAmps.png + 0.0 + 0.5 + 0.25 + 0.50 + + + + x-shift + 10 + + + + + + OTNeedle + 3 + 96 + + + Aircraft/Instruments/Textures/misc1.rgb + 0.71875 + 0.828125 + 0.46875 + 1.0 + + + + + x-shift + -10 + + + y-shift + -110 + + + rotation + + + + 75 + -30 + + + 180 + 5 + + + 240 + 30 + + + + + y-shift + 120 + + + + + + OPNeedle + 3 + 96 + + + Aircraft/Instruments/Textures/misc1.rgb + 0.71875 + 0.828125 + 0.46875 + 1.0 + + + + + x-shift + 10 + + + y-shift + -110 + + + rotation + + + + 10 + -30 + + + 30 + -15 + + + 80 + 15 + + + 100 + 30 + + + + + y-shift + 120 + + + + + + + diff --git a/Aircraft/Instruments/pilot-g.xml b/Aircraft/Instruments/pilot-g.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments/three-step-flap-quadrant.xml b/Aircraft/Instruments/three-step-flap-quadrant.xml old mode 100755 new mode 100644 diff --git a/Aircraft/Instruments/vertical1k.xml b/Aircraft/Instruments/vertical1k.xml old mode 100755 new mode 100644 diff --git a/Aircraft/c172p/Panels/FGPanel_Protocol_c172p.xml b/Aircraft/c172p/Panels/FGPanel_Protocol_c172p.xml new file mode 100644 index 000000000..b87491b81 --- /dev/null +++ b/Aircraft/c172p/Panels/FGPanel_Protocol_c172p.xml @@ -0,0 +1,445 @@ + + + + + ,,34200,udp,../Aircraft/c172p/Panels/FGPanel_Protocol_c172p + ]]> + + + + + + newline + , + + + float + %.2f + /position/altitude-agl-ft + + + + float + %.2f + /instrumentation/attitude-indicator/indicated-roll-deg + + + + float + %.2f + /instrumentation/attitude-indicator/indicated-pitch-deg + + + + float + %.2f + /instrumentation/attitude-indicator/horizon-offset-deg + + + + float + %.4e + /instrumentation/attitude-indicator/spin + + + + bool + %d + /instrumentation/attitude-indicator/caged-flag + + + + float + %.2f + /instrumentation/airspeed-indicator/tas-face-rotation + + + + float + %.2f + /instrumentation/airspeed-indicator/indicated-speed-kt + + + + float + %.3f + /instrumentation/altimeter/setting-inhg + + + + float + %.2f + /instrumentation/radar-altimeter/decision-height + + + + float + %.2f + /instrumentation/altimeter/indicated-altitude-ft + + + + float + %.4e + /instrumentation/adf[0]/rotation-deg + + + + float + %.2f + /instrumentation/adf[0]/indicated-bearing-deg + + + + float + %.3f + /instrumentation/slip-skid-ball/indicated-slip-skid + + + + float + %.2f + /instrumentation/turn-indicator/indicated-turn-rate + + + + float + %.4f + /instrumentation/kcs55/ki525/gs-deflection + + + + float + %.4e + /instrumentation/nav[0]/heading-needle-deflection + + + + float + %.4e + /instrumentation/nav[0]/radials/selected-deg + + + + float + %.4e + /instrumentation/nav[0]/to-flag + + + + float + %.4e + /instrumentation/nav[0]/from-flag + + + + float + %.4e + /instrumentation/nav[0]/in-range + + + + int + %d + /instrumentation/nav[0]/has-gs + + + + float + %.4e + instrumentation/heading-indicator/indicated-heading-deg + + + + float + %.4e + instrumentation/kcs55/kg102/flag-norm + + + + float + %.4e + instrumentation/kcs55/ki525/selected-heading-deg + + + + float + %.4e + autopilot/settings/heading-bug-deg + + + + float + %.4e + /instrumentation/vertical-speed-indicator/indicated-speed-fpm + + + + + float + %.4e + /instrumentation/nav[1]/to-flag + + + + float + %.4e + /instrumentation/nav[1]/from-flag + + + + float + %.4e + /instrumentation/nav[1]/radials/selected-deg + + + + float + %.4e + /instrumentation/nav[1]/heading-needle-deflection + + + + int + %d + /instrumentation/nav[1]/in-range + + + + int + %d + /autopilot/CENTURYIII/settings/gs-captured + + + + int + %d + /controls/lighting/gs-captured-light-test + + + + int + %d + /gear/in-transit + + + + float + %.4e + /systems/electrical/amps + + + + float + %.4e + /systems/electrical/volts + + + + float + %.4e + /engines/engine[0]/cht-degf + + + + float + %.4e + /engines/engine[0]/oil-temperature-degf + + + + float + %.4e + /engines/engine[0]/oil-pressure-psi + + + + float + %.4e + /consumables/fuel/tank[0]/level-gal_us + + + + float + %.4e + /engines/engine[1]/cht-degf + + + + float + %.4e + /engines/engine[1]/oil-temperature-degf + + + + float + %.4e + /engines/engine[1]/oil-pressure-psi + + + + float + %.4e + /consumables/fuel/tank[1]/level-gal_us + + + + string + %s + instrumentation/clock/indicated-string + + + + + + float + %.4e + /instrumentation/nav[1]/to-flag + + + + float + %.4e + /instrumentation/nav[1]/from-flag + + + + float + %.4e + /instrumentation/nav[1]/radials/selected-deg + + + + float + %.4e + /instrumentation/nav[1]/heading-needle-deflection + + + + float + %.4e + /instrumentation/nav[1]/in-range + + + + int + %d + /instrumentation/vacuum/inoperative[0] + + + + int + %d + /instrumentation/vacuum/inoperative[1] + + + + float + %.3e + /instrumentation/vacuum/suction-inhg + + + + float + %.4e + /engines/engine[0]/rpm + + + + float + %.4e + /engines/engine[0]/mp-osi-filtered + + + + float + %.4e + engines/engine[0]/egt-degf + + + + float + %.4e + /engines/engine[0]/fuel-flow-gph + + + + + bool + %d + instrumentation/annunciator/test + + + + bool + %d + instrumentation/annunciator/fuelpump[0] + + + + bool + %d + instrumentation/annunciator/fuelpump[1] + + + + bool + %d + instrumentation/annunciator/overboost[0] + + + + bool + %d + instrumentation/annunciator/overboost[1] + + + + bool + %d + instrumentation/annunciator/oil + + + + bool + %d + instrumentation/annunciator/vacuum + + + + bool + %d + instrumentation/annunciator/alt + + + + float + %.4e + /controls/flight/rudder-trim + + + + float + %.4e + /controls/flight/elevator-trim + + + + float + %.4e + /surface-positions/flap-pos-norm + + + + float + %.4e + /systems/electrical/outputs/turn-coordinator + + + + + + + diff --git a/Aircraft/c172p/Panels/FGPanel_c172p.xml b/Aircraft/c172p/Panels/FGPanel_c172p.xml new file mode 100644 index 000000000..011247821 --- /dev/null +++ b/Aircraft/c172p/Panels/FGPanel_c172p.xml @@ -0,0 +1,42 @@ + + + + ,,34200,udp,../Aircraft/c172p/Panels/FGPanel_Protocol_c172p + ]]> + + + true + + + + + + false + true + + 30 + + true + + + + + + 0.0.0.0 + 34200 + + + + + + + + diff --git a/Aircraft/c172p/Panels/FGPanel_instruments.xml b/Aircraft/c172p/Panels/FGPanel_instruments.xml new file mode 100644 index 000000000..4a39ba48c --- /dev/null +++ b/Aircraft/c172p/Panels/FGPanel_instruments.xml @@ -0,0 +1,227 @@ + + + + + + 242 + 146 + 71 + 50 + + 35 + 116 + 202 + 288 + 383 + + 95 + 52 + + D-GEAR + + + c172p IFR Panel + + + + + + 430 + 353 + + + + frames per second + 10 + 340 + 40 + 40 + + + + callsign + 133 + 302 + 100 + 20 + + + + Airspeed Indicator + + + + + + + + Attitude Gyro + + + + + + + + Altimeter + + + + + + + + Turn Coordinator + + + + + + + + HDG + + + + + + + + Vertical Velocity Indicator + + + + + + + + + clock + 45 + 248 + + + + + + Gyro Pressure Gauge + 20 + 203 + 35 + 35 + + + + Fuel + + 163 + 165 + 20 + + + + Oil + + engines/engine[0]/oil-temperature-degf + /engines/engine[0]/oil-pressure-psi + + + 124 + 165 + 20 + + + + VoltAmps + + /systems/electrical/amps + /systems/electrical/volts + + + 20 + 50 + 50 + + + + + EGT Gauge + + engines/engine[0]/egt-degf + + + + + + + + + + VOR 2 Gauge + + /instrumentation/nav[0]/from-flag + /instrumentation/nav[0]/to-flag + /instrumentation/nav[0]/radials/selected-deg + /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/heading-needle-deflection + /sim/instrument-options/nav[0]/has-gs-needle + /sim/instrument-options/nav[0]/needles-pivot + + + + + + + + + VOR 2 Gauge + + /instrumentation/nav[1]/from-flag + /instrumentation/nav[1]/to-flag + /instrumentation/nav[1]/radials/selected-deg + /instrumentation/nav[1]/gs-needle-deflection + /instrumentation/nav[1]/heading-needle-deflection + /sim/instrument-options/nav[1]/has-gs-needle + /sim/instrument-options/nav[1]/needles-pivot + + + + + + + + + ADF + + /instrumentation/adf[0]/rotation-deg + /instrumentation/adf[0]/indicated-bearing-deg + + + + + + + + + + + RPM Gauge + + /engines/engine[0]/rpm + + + + + + + + + + + diff --git a/Aircraft/c172p/Panels/callsign.xml b/Aircraft/c172p/Panels/callsign.xml new file mode 100644 index 000000000..60c19a9fc --- /dev/null +++ b/Aircraft/c172p/Panels/callsign.xml @@ -0,0 +1,38 @@ + + + + + callsign + 280 + 20 + + + + + 240 + 20 + callsign + text + helvetica_bold + Helvetica + lucida + 24 + + 1.0 + 1.0 + 1.0 + + + + literal + D-GEAR + + + + + + + + diff --git a/Effects/reflect-bump-spec.eff b/Effects/reflect-bump-spec.eff index fb230aed7..e062b0f12 100644 --- a/Effects/reflect-bump-spec.eff +++ b/Effects/reflect-bump-spec.eff @@ -107,6 +107,24 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model 0.05 0 0 + + /environment/ground-visibility-m + + + /environment/visibility-m + + + /environment/ground-haze-thickness-m + + + /rendering/scene/scattering + + + /environment/terminator-relative-position-m + + + /sim/rendering/scattering-shader + @@ -296,7 +314,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model + Shaders/include_fog.vert Shaders/reflect-bump-spec.vert + Shaders/include_fog.frag Shaders/reflect-bump-spec.frag tangent @@ -415,6 +435,48 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model + + visibility + float + + visibility + + + + avisibility + float + + avisibility + + + + hazeLayerAltitude + float + + lthickness + + + + scattering + float + + scattering + + + + terminator + float + + terminator + + + + fogType + int + + fogtype + + \ No newline at end of file diff --git a/Effects/runway.eff b/Effects/runway.eff new file mode 100644 index 000000000..e027a5c02 --- /dev/null +++ b/Effects/runway.eff @@ -0,0 +1,381 @@ + + + Effects/runway + Effects/terrain-default + + + Textures.high/Runway/rwy-normalmap.dds + linear-mipmap-linear + repeat + repeat + normalized + + + cubemap + + + + + + Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_px.png + Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nx.png + Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_py.png + Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_ny.png + Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_pz.png + Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nz.png + + + + + Aircraft/Generic/Effects/Rainbow.png + linear-mipmap-linear + repeat + repeat + normalized + + + Aircraft/Generic/Effects/FresnelLookUp.png + linear-mipmap-linear + repeat + repeat + normalized + + + Textures.high/Runway/rwy-reflect.png + linear-mipmap-linear + repeat + repeat + normalized + + transparent + smooth + 0.01 + 0.01 + 0.01 + + 0.01 + 1 + 1 + false + + /environment/rain-norm + + + + /environment/ground-visibility-m + + + /environment/visibility-m + + + /environment/ground-haze-thickness-m + + + /rendering/scene/scattering + + + /environment/terminator-relative-position-m + + + /sim/rendering/scattering-shader + + + + + 6 + 7 + + + + + /sim/rendering/shader-effects + + + 2.0 + + + + GL_ARB_shader_objects + GL_ARB_shading_language_100 + GL_ARB_vertex_shader + GL_ARB_fragment_shader + + + + + + + 0 + texture[0]/image + texture[0]/filter + texture[0]/wrap-s + texture[0]/wrap-t + texture[1]/internal-format + + + 4 + + texture[4]/image + + + texture[4]/filter + + + texture[4]/wrap-s + + + texture[4]/wrap-t + + + texture[4]/internal-format + + + + + 5 + + texture[5]/type + + + + + + + + texture[5]/images + + + + + 6 + + texture[6]/type + + + texture[6]/image + + + texture[6]/filter + + + texture[6]/wrap-s + + + texture[6]/wrap-t + + + + + 7 + + texture[7]/type + + + texture[7]/image + + + texture[7]/filter + + + texture[7]/wrap-s + + + texture[7]/wrap-t + + + + + 8 + + texture[8]/image + + + texture[8]/filter + + + texture[8]/wrap-s + + + texture[8]/wrap-t + + + texture[0]/internal-format + + + + + 9 + noise + + + vertex-program-two-side + + + Shaders/include_fog.vert + Shaders/reflect-bump-spec.vert + Shaders/include_fog.frag + Shaders/runway-reflect-bump-spec.frag + + tangent + 6 + + + binormal + 7 + + + + + BaseTex + sampler-2d + 0 + + + + NormalTex + sampler-2d + 4 + + + + Environment + sampler-cube + 5 + + + + Rainbow + sampler-2d + 6 + + + + Fresnel + sampler-2d + 7 + + + + Map + sampler-2d + 8 + + + + Noise + sampler-3d + 9 + + + + + rainbowiness + float + + rainbowiness + + + + + + fresneliness + float + + fresneliness + + + + + + noisiness + float + + noisiness + + + + + + spec_adjust + float + + wetness + + + + + + ambient_correction + float + + ambient_correction + + + + + + reflect_map + float + + reflect_map + + + + + + normalmap_dds + float + + normalmap_dds + + + + + visibility + float + + visibility + + + + avisibility + float + + avisibility + + + + hazeLayerAltitude + float + + lthickness + + + + scattering + float + + scattering + + + + terminator + float + + terminator + + + + fogType + int + + fogtype + + + + + diff --git a/Shaders/include_fog.frag b/Shaders/include_fog.frag new file mode 100644 index 000000000..bb8b2bdc7 --- /dev/null +++ b/Shaders/include_fog.frag @@ -0,0 +1,19 @@ +//#define FOG_FUNCTION +//default fog +//varying float fogCoord; +varying vec3 PointPos; +//varying vec4 EyePos; + +vec3 fog_Func(vec3 color, int type) +{ + //if (type == 0){ + const float LOG2 = 1.442695; + //vec3 EyePos = vec3(0.0); + float fogCoord =length(PointPos); + float fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2); + + if(gl_Fog.density == 1.0) + fogFactor=1.0; + + return mix(gl_Fog.color.rgb, color, fogFactor); +} \ No newline at end of file diff --git a/Shaders/include_fog.vert b/Shaders/include_fog.vert new file mode 100644 index 000000000..2286437ab --- /dev/null +++ b/Shaders/include_fog.vert @@ -0,0 +1,11 @@ +//varying float fogCoord; +varying vec3 PointPos; +//varying vec4 EyePos; + +void fog_func(int type) +{ + PointPos = (gl_ModelViewMatrix * gl_Vertex).xyz; + //PointPos = gl_Vertex; + //EyePos = gl_ModelViewMatrixInverse * vec4(0.0,0.0,0.0,1.0); + //fogCoord = abs(ecPosition.z); +} diff --git a/Shaders/runway-reflect-bump-spec.frag b/Shaders/runway-reflect-bump-spec.frag new file mode 100644 index 000000000..fbf2ce46d --- /dev/null +++ b/Shaders/runway-reflect-bump-spec.frag @@ -0,0 +1,139 @@ +// -*- mode: C; -*- +// Licence: GPL v2 +// Author: Vivian Meazza. + +#version 120 + +varying vec3 rawpos; +varying vec3 VNormal; +varying vec3 VTangent; +varying vec3 VBinormal; +varying vec3 Normal; +varying vec3 vViewVec; +varying vec3 reflVec; + +varying vec4 Diffuse; +varying float alpha; +varying float fogCoord; + +uniform samplerCube Environment; +uniform sampler2D Rainbow; +uniform sampler2D BaseTex; +uniform sampler2D Fresnel; +uniform sampler2D Map; +uniform sampler2D NormalTex; +uniform sampler3D Noise; + +uniform float spec_adjust; +uniform float rainbowiness; +uniform float fresneliness; +uniform float noisiness; +uniform float ambient_correction; +uniform float reflect_map; +uniform float normalmap_dds; + +uniform int fogType; + +vec3 fog_Func(vec3 color, int type); + +void main (void) +{ + vec3 halfV; + float NdotL, NdotHV; + + vec3 lightDir = gl_LightSource[0].position.xyz; + vec3 halfVector = gl_LightSource[0].halfVector.xyz; + + + vec4 color = gl_Color; + vec4 specular = vec4(0.0); + vec4 ns = texture2D(NormalTex, gl_TexCoord[0].st * 16.0); + vec3 n = ns.rgb * 2.0 - 1.0; + 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 + if (NdotL > 0.0) { + color += Diffuse * NdotL; + halfV = normalize(halfVector); + NdotHV = max(dot(n, halfV), 0.0); + if (gl_FrontMaterial.shininess > 0.0) + specular.rgb = (gl_FrontMaterial.specular.rgb * ns.a + * gl_LightSource[0].specular.rgb + * pow(NdotHV, gl_FrontMaterial.shininess + 128 * spec_adjust)); + } + + //color.a = alpha; + vec4 texel = texture2D(BaseTex, gl_TexCoord[0].st); + //vec4 texelcolor = color * texel + specular; + color.a = texel.a * alpha; + 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); + + // Map a rainbowish color + float v = dot(viewVec, normal); + vec4 rainbow = texture2D(Rainbow, vec2(v, 0.0)); + + // Map a fresnel effect + vec4 fresnel = texture2D(Fresnel, vec2(v, 0.0)); + + // map the refection of the environment + vec4 reflection = textureCube(Environment, reflVec); + + float refl_correction = spec_adjust * 1.7 - 1.0; + // set the user shininess offset + float transparency_offset = clamp(refl_correction, -1.0, 1.0); + float reflFactor = 0.0; + + vec4 map = texture2D(Map, gl_TexCoord[0].st * 8.0); + 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); + + // set ambient adjustment to remove bluiness with user input + 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 ; + 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 + vec4 reflcolor = mix(reflection, rainbow, rainbowiness * v); + vec4 reflfrescolor = mix(reflcolor, fresnel, fresneliness * v); + vec4 noisecolor = mix(reflfrescolor, noisevec, noisiness); + vec4 raincolor = vec4(noisecolor.rgb * reflFactor, 1.0); + + vec4 mixedcolor = mix(texel, raincolor, reflFactor); + + // the final reflection + vec4 reflColor = vec4(color.rgb * mixedcolor.rgb + specular.rgb + ambient_Correction.rgb, color.a); + + reflColor = clamp(reflColor, 0.0, 1.0); + vec4 fragColor = reflColor; + fragColor.rgb = fog_Func(fragColor.rgb, fogType); + gl_FragColor = fragColor; +} \ No newline at end of file