1
0
Fork 0

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

This commit is contained in:
Vivian Meazza 2011-08-05 14:03:13 +01:00
commit 2593829ac3
29 changed files with 53481 additions and 52901 deletions

View file

@ -22,6 +22,7 @@ var tr_node = props.globals.initNode("instrumentation/comm/SCR-522C/tr", 0, "INT
props.globals.initNode("instrumentation/comm/SCR-522C/frequencies/channel", "", "STRING");
props.globals.initNode("instrumentation/comm/SCR-522C/mask", 0, "BOOL");
props.globals.initNode("instrumentation/comm/SCR-522C/tr-lock", 0, "BOOL");
props.globals.initNode("instrumentation/comm/SCR-522C/remote-pushed", 0, "BOOL");
# turn the radio off
props.globals.initNode("instrumentation/comm/serviceable", 0, "BOOL");
@ -52,6 +53,7 @@ controls.ptt = func {
setprop("instrumentation/comm/ptt", arg[0]); # let remote ptt control transmitter
else # otherwise
setprop("instrumentation/comm/ptt", 0); # the remote ptt does nothing
setprop("instrumentation/comm/SCR-522C/remote-pushed", arg[0]); # use to animate remote ptt button
}
# =============================== listeners ===============================

View file

@ -1,8 +1,8 @@
To enable full functionality of the SCR-522C/TR1133 radio there are several things
that you will need to do.
that need to be done.
First you will need to change the <nasal> section of your *set.xml file so that it
looks like the following.
First change the <nasal> section of your *set.xml file so that it looks like the
following.
<nasal>
<!-- your other nasal files -->
@ -12,13 +12,17 @@ looks like the following.
</SCR_522C>
</nasal>
This will enable the F12 key to bring up the frequencies dialog. It will also over ride the
Equipment --> radios menu item so that it brings up the correct menu for the SCR-522C/TR1133
radios. This also implements other radio features like support for a remote TR switch, the
TR switch on the BC-602-A control box, TR switch lock, channel switching, power switch and
so on.
Menu:
For dark conditions when cabin/cockpit illumination is used all of the radio models object
The above will enable the F12 key to bring up the SCR-522C specific frequencies dialog. It
will also over ride the Equipment --> radios menu item so that it brings up the correct
menu for the SCR-522C/TR1133 radios. This also implements other radio features like support
for a remote TR switch, the TR switch on the BC-602-A control box, TR switch lock, channel
switching, power switch and so on.
Animation:
For dark conditions when cabin/cockpit illumination is used all of the radio models objects
are illuminated in response to
<property>/controls/lighting/cabin-norm</property>
@ -26,4 +30,26 @@ are illuminated in response to
If you are using a different property for your cabin/cockpit lights you will need to map your
lighting property to /controls/lighting/cabin-norm.
If your aircraft needs remote ptt button animation this should be linked to
instrumentation/comm/SCR-522C/remote-pushed
Since the Nasal script reimplements controls.ptt() and instrumentation/comm/ptt only becomes true
if the radio is turned on. Using the property above to control the animation of the remote ptt
button will result in the botton moving when ever the user pushes what ever key/button they have
setup to call controls.ptt(). An example of what this might look like is:
<animation>
<type>translate</type>
<object-name>MicButton</object-name>
<property>instrumentation/comm/SCR-522C/remote-pushed</property>
<factor>-0.007</factor>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
</animation>

View file

@ -0,0 +1,479 @@
AC3Db
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0 0 0 shi 10 trans 0
MATERIAL "ac3dmat3" rgb 1 0 0 amb 1 0 0 emis 0 0 0 spec 0 0 0 shi 10 trans 0
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0 0 0 shi 128 trans 1
OBJECT world
kids 2
OBJECT group
name "egt"
loc 0.00108333 -0.00211694 -0.00299342
kids 4
OBJECT poly
name "Knob"
loc 0.00141667 -0.00554903 0.00299342
crease 45.000000
numvert 25
0.00257786 0 0
-0.00257786 -1.86265e-09 0.0025
-0.00257786 -0.00125 0.00216506
-0.00257786 -0.00216506 0.00125
-0.00257786 -0.0025 0
-0.00257786 -0.00216506 -0.00125
-0.00257786 -0.00125 -0.00216506
-0.00257786 0 -0.0025
-0.00257786 0.00125 -0.00216506
-0.00257786 0.00216506 -0.00125
-0.00257786 0.0025 0
-0.00257786 0.00216506 0.00125
-0.00257786 0.00125 0.00216506
0.00257786 -1.86265e-09 0.0025
0.00257786 -0.00125 0.00216506
0.00257786 -0.00216506 0.00125
0.00257786 -0.0025 0
0.00257786 -0.00216506 -0.00125
0.00257786 -0.00125 -0.00216506
0.00257786 0 -0.0025
0.00257786 0.00125 -0.00216506
0.00257786 0.00216506 -0.00125
0.00257786 0.0025 0
0.00257786 0.00216506 0.00125
0.00257786 0.00125 0.00216506
numsurf 24
SURF 0x10
mat 1
refs 3
0 0 0
24 0 0
13 0 0
SURF 0x10
mat 1
refs 3
0 0 0
13 0 0
14 0 0
SURF 0x10
mat 1
refs 3
0 0 0
14 0 0
15 0 0
SURF 0x10
mat 1
refs 3
0 0 0
15 0 0
16 0 0
SURF 0x10
mat 1
refs 3
0 0 0
16 0 0
17 0 0
SURF 0x10
mat 1
refs 3
0 0 0
17 0 0
18 0 0
SURF 0x10
mat 1
refs 3
0 0 0
18 0 0
19 0 0
SURF 0x10
mat 1
refs 3
0 0 0
19 0 0
20 0 0
SURF 0x10
mat 1
refs 3
0 0 0
20 0 0
21 0 0
SURF 0x10
mat 1
refs 3
0 0 0
21 0 0
22 0 0
SURF 0x10
mat 1
refs 3
0 0 0
22 0 0
23 0 0
SURF 0x10
mat 1
refs 3
0 0 0
23 0 0
24 0 0
SURF 0x10
mat 1
refs 4
24 -2.98023e-08 1
12 -2.98023e-08 0
1 0.0833333 0
13 0.0833333 1
SURF 0x10
mat 1
refs 4
13 0.0833333 1
1 0.0833333 0
2 0.166667 0
14 0.166667 1
SURF 0x10
mat 1
refs 4
14 0.166667 1
2 0.166667 0
3 0.25 0
15 0.25 1
SURF 0x10
mat 1
refs 4
15 0.25 1
3 0.25 0
4 0.333333 0
16 0.333333 1
SURF 0x10
mat 1
refs 4
16 0.333333 1
4 0.333333 0
5 0.416667 0
17 0.416667 1
SURF 0x10
mat 1
refs 4
17 0.416667 1
5 0.416667 0
6 0.5 0
18 0.5 1
SURF 0x10
mat 1
refs 4
18 0.5 1
6 0.5 0
7 0.583333 0
19 0.583333 1
SURF 0x10
mat 1
refs 4
19 0.583333 1
7 0.583333 0
8 0.666667 0
20 0.666667 1
SURF 0x10
mat 1
refs 4
20 0.666667 1
8 0.666667 0
9 0.75 0
21 0.75 1
SURF 0x10
mat 1
refs 4
21 0.75 1
9 0.75 0
10 0.833333 0
22 0.833333 1
SURF 0x10
mat 1
refs 4
22 0.833333 1
10 0.833333 0
11 0.916667 0
23 0.916667 1
SURF 0x10
mat 1
refs 4
23 0.916667 1
11 0.916667 0
12 1 0
24 1 1
kids 0
OBJECT poly
name "Needle"
loc -0.00108333 0.00343209 -0.00598684
crease 45.000000
numvert 5
-0.001 0.00827315 0.0276479
-0.001 0.00968736 0.0262337
-0.001 -0.00827315 0.00827316
-0.001 -0.00968736 0.00968737
-0.001 0.00992145 0.027882
numsurf 1
SURF 0x0
mat 0
refs 5
3 0 0
2 1 0
1 1 1
4 0.5 1
0 0 1
kids 0
OBJECT poly
name "Bug"
loc -0.00158333 0.0034321 -0.00598683
crease 45.000000
numvert 5
-1.80444e-09 0.00992143 0.0278819
-1.74623e-10 -0.00915701 0.00915704
-1.74623e-10 -0.00880346 0.00880349
-1.68802e-09 0.00915702 0.026764
-1.80444e-09 0.00880346 0.0271175
numsurf 1
SURF 0x0
mat 1
refs 5
1 0 0
2 1 0
3 1 1
0 0.5 1
4 0 1
kids 0
OBJECT group
name "Pick"
loc 0.00141667 -0.00554903 0.00299342
kids 2
OBJECT poly
name "Knob.Pick.L"
crease 45.000000
numvert 15
0.00283564 0 0
-0.00283564 -2.32831e-09 0.003
-0.00283564 -0.0015 0.00259808
-0.00283564 -0.00259808 0.0015
-0.00283564 -0.003 0
-0.00283564 0.003 0
-0.00283564 0.00259808 0.0015
-0.00283564 0.0015 0.00259808
0.00283564 -2.32831e-09 0.003
0.00283564 -0.0015 0.00259808
0.00283564 -0.00259808 0.0015
0.00283564 -0.003 0
0.00283564 0.003 0
0.00283564 0.00259808 0.0015
0.00283564 0.0015 0.00259808
numsurf 12
SURF 0x10
mat 2
refs 3
0 0 0
14 0 0
8 0 0
SURF 0x10
mat 2
refs 3
0 0 0
8 0 0
9 0 0
SURF 0x10
mat 2
refs 3
0 0 0
9 0 0
10 0 0
SURF 0x10
mat 2
refs 3
0 0 0
10 0 0
11 0 0
SURF 0x10
mat 2
refs 3
0 0 0
12 0 0
13 0 0
SURF 0x10
mat 2
refs 3
0 0 0
13 0 0
14 0 0
SURF 0x10
mat 2
refs 4
14 -2.98023e-08 1
7 -2.98023e-08 0
1 0.0833333 0
8 0.0833333 1
SURF 0x10
mat 2
refs 4
8 0.0833333 1
1 0.0833333 0
2 0.166667 0
9 0.166667 1
SURF 0x10
mat 2
refs 4
9 0.166667 1
2 0.166667 0
3 0.25 0
10 0.25 1
SURF 0x10
mat 2
refs 4
10 0.25 1
3 0.25 0
4 0.333333 0
11 0.333333 1
SURF 0x10
mat 2
refs 4
12 0.833333 1
5 0.833333 0
6 0.916667 0
13 0.916667 1
SURF 0x10
mat 2
refs 4
13 0.916667 1
6 0.916667 0
7 1 0
14 1 1
kids 0
OBJECT poly
name "Knob.Pick.R"
crease 45.000000
numvert 15
0.00283564 0.003 0
0.00283564 0.00259808 -0.0015
0.00283564 0.0015 -0.00259808
0.00283564 0 -0.003
0.00283564 -0.0015 -0.00259808
0.00283564 -0.00259808 -0.0015
0.00283564 -0.003 0
-0.00283564 0.003 0
-0.00283564 0.00259808 -0.0015
-0.00283564 0.0015 -0.00259808
-0.00283564 0 -0.003
-0.00283564 -0.0015 -0.00259808
-0.00283564 -0.00259808 -0.0015
-0.00283564 -0.003 0
0.00283564 0 0
numsurf 12
SURF 0x10
mat 2
refs 4
1 0.75 1
8 0.75 0
7 0.833333 0
0 0.833333 1
SURF 0x10
mat 2
refs 4
2 0.666667 1
9 0.666667 0
8 0.75 0
1 0.75 1
SURF 0x10
mat 2
refs 4
3 0.583333 1
10 0.583333 0
9 0.666667 0
2 0.666667 1
SURF 0x10
mat 2
refs 4
4 0.5 1
11 0.5 0
10 0.583333 0
3 0.583333 1
SURF 0x10
mat 2
refs 4
5 0.416667 1
12 0.416667 0
11 0.5 0
4 0.5 1
SURF 0x10
mat 2
refs 4
6 0.333333 1
13 0.333333 0
12 0.416667 0
5 0.416667 1
SURF 0x10
mat 2
refs 3
14 0 0
1 0 0
0 0 0
SURF 0x10
mat 2
refs 3
14 0 0
2 0 0
1 0 0
SURF 0x10
mat 2
refs 3
14 0 0
3 0 0
2 0 0
SURF 0x10
mat 2
refs 3
14 0 0
4 0 0
3 0 0
SURF 0x10
mat 2
refs 3
14 0 0
5 0 0
4 0 0
SURF 0x10
mat 2
refs 3
14 0 0
6 0 0
5 0 0
kids 0
OBJECT poly
name "Face"
loc -0.001 0 0
texture "EGT.png"
crease 45.000000
numvert 10
0.000999999 -0.025 -0.025
0.000999999 -0.025 0.025
0.000999999 -9.31323e-10 0.025
0.000999999 -9.31323e-10 -0.025
-0.000999999 -9.31323e-10 -0.025
-0.000999999 -9.31323e-10 0.025
-0.000999999 -0.025 0.025
-0.000999999 -0.025 -0.025
-0.000999999 0.025 -0.025
-0.000999999 0.025 0.025
numsurf 3
SURF 0x0
mat 0
refs 4
2 0 0.245003
1 0 -0.117118
0 1 -0.117118
3 1 0.245003
SURF 0x0
mat 0
refs 4
5 0 0.214422
6 0 0
7 1 0
4 1 0.214422
SURF 0x0
mat 0
refs 4
4 1 0
8 1 1
9 0 1
5 0 0
kids 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View file

@ -0,0 +1,162 @@
<?xml version="1.0" ?>
<!--
This file is part of FlightGear, the free flight simulator
http://www.flightgear.org/
Copyright (C) 2009 Torsten Dreyer, Torsten (at) t3r _dot_ de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-->
<PropertyList>
<path>EGT.ac</path>
<params>
<value>engines/engine[0]/egt-norm</value>
<bug>engines/engine[0]/egt-bug-norm</bug>
</params>
<animation>
<type>range</type>
<min-m>0</min-m>
<max-m>10</max-m>
</animation>
<animation>
<type>material</type>
<object-name>egt</object-name>
<emission>
<red-prop>sim/model/instrument-lighting/emission/red</red-prop>
<green-prop>sim/model/instrument-lighting/emission/green</green-prop>
<blue-prop>sim/model/instrument-lighting/emission/blue</blue-prop>
<factor-prop>controls/lighting/instruments-norm</factor-prop>
</emission>
</animation>
<animation>
<type>rotate</type>
<object-name>Needle</object-name>
<property alias="../../params/value"/>
<factor>-90.0</factor>
<axis>
<x>1.0</x>
<y>0.0</y>
<z>0.0</z>
</axis>
<center>
<x-m>-0.0015</x-m>
<y-m>0</y-m>
<z-m>-0.00766508</z-m>
</center>
</animation>
<animation>
<type>rotate</type>
<object-name>Bug</object-name>
<property alias="../../params/bug"/>
<factor>-90.0</factor>
<axis>
<x>1.0</x>
<y>0.0</y>
<z>0.0</z>
</axis>
<center>
<x-m>-0.0015</x-m>
<y-m>0</y-m>
<z-m>-0.00766508</z-m>
</center>
</animation>
<animation>
<type>pick</type>
<object-name>Knob.Pick.L</object-name>
<visible>false</visible>
<action>
<button>0</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property alias="../../../../params/bug"/>
<step>-0.01</step>
<min>0.0</min>
<max>1.0</max>
<wrap>0</wrap>
</binding>
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property alias="../../../../params/bug"/>
<step>-0.1</step>
<min>0.0</min>
<max>1.0</max>
<wrap>0</wrap>
</binding>
</action>
<action>
<button>3</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property alias="../../../../params/bug"/>
<step>-0.01</step>
<min>0.0</min>
<max>1.0</max>
<wrap>0</wrap>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>Knob.Pick.R</object-name>
<visible>false</visible>
<action>
<button>0</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property alias="../../../../params/bug"/>
<step>0.01</step>
<min>0.0</min>
<max>1.0</max>
<wrap>0</wrap>
</binding>
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property alias="../../../../params/bug"/>
<step>0.1</step>
<min>0.0</min>
<max>1.0</max>
<wrap>0</wrap>
</binding>
</action>
<action>
<button>4</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property alias="../../../../params/bug"/>
<step>0.01</step>
<min>0.0</min>
<max>1.0</max>
<wrap>0</wrap>
</binding>
</action>
</animation>
</PropertyList>

File diff suppressed because it is too large Load diff

View file

@ -172,6 +172,16 @@
</offsets>
</model>
<model>
<name>EGT</name>
<path>Aircraft/c172p/Instruments/EGT/EGT.xml</path>
<offsets>
<x-m>-0.368996</x-m>
<y-m>-0.131332</y-m>
<z-m>-0.140618</z-m>
</offsets>
</model>
<model>
<name>hi</name>
<path>Aircraft/c172p/Instruments/hi/hi.xml</path>

View file

@ -37,5 +37,22 @@
<output>instrumentation/nav[1]/filtered-gsNAV1-deflection</output>
</filter>
<filter>
<name>EGT lowpass</name>
<debug>false</debug>
<type>exponential</type>
<filter-time>4.0</filter-time>
<input>
<property>engines/engine[0]/egt-degf</property>
<!-- 1200 * scale + offset = 0.0
1700 * scale + offset = 1.0 -->
<scale>0.002</scale>
<offset>-2.4</offset>
</input>
<output>engines/engine[0]/egt-norm</output>
<min>0.0</min>
<max>1.0</max>
</filter>
</PropertyList>

View file

@ -184,6 +184,7 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<file>Aircraft/c172p/Nasal/ki266.nas</file>
<script><![CDATA[
ki266.new(0);
aircraft.data.add( "engines/engine[0]/egt-bug-norm" );
]]></script>
</c172p>

View file

@ -1,4 +1,4 @@
Document started 27/01/2008 by Tiago Gusmão
Document started 27/01/2008 by Tiago Gusmão
Updated 02/02/2008 to reflect syntax changes
Updated 03/02/2008 to add trails (connected particles)

View file

@ -126,6 +126,22 @@
<filter-time>5</filter-time>
</filter>
<filter>
<name>EnvironmentInterpolator:wind-from-down</name>
<input>
<expression>
<sum>
<property>/environment/thermal-lift-fps</property>
<property>/environment/ridge-lift-fps</property>
<property>/environment/local-weather-lift-fps</property>
</sum>
</expression>
</input>
<output>/environment/wind-from-down-fps</output>
<type>exponential</type>
<filter-time>0.5</filter-time>
</filter>
<filter>
<name>EnvironmentInterpolator:turbulence-raw-magnitude</name>
<enable>

View file

@ -15,21 +15,21 @@
### This class specifies the offsets used when converting static jetways using the STG converter ###
var Static_jetway =
[
# Models/Airport/jetway-movable.ac
# Models/Airport/jetway-movable.xml
# Models/Airport/jetway-movable-2.ac
# Models/Airport/jetway-movable-2.xml
# Models/Airport/jetway-movable-3.ac
# Models/Airport/jetway-movable-3.xml
# Models/Airport/Jetway/jetway-movable.ac
# Models/Airport/Jetway/jetway-movable.xml
# Models/Airport/Jetway/jetway-movable-2.ac
# Models/Airport/Jetway/jetway-movable-2.xml
# Models/Airport/Jetway/jetway-movable-3.ac
# Models/Airport/Jetway/jetway-movable-3.xml
{
models:
[
"Models/Airport/jetway-movable.ac",
"Models/Airport/jetway-movable.xml",
"Models/Airport/jetway-movable-2.ac",
"Models/Airport/jetway-movable-2.xml",
"Models/Airport/jetway-movable-3.ac",
"Models/Airport/jetway-movable-3.xml"
"Models/Airport/Jetway/jetway-movable.ac",
"Models/Airport/Jetway/jetway-movable.xml",
"Models/Airport/Jetway/jetway-movable-2.ac",
"Models/Airport/Jetway/jetway-movable-2.xml",
"Models/Airport/Jetway/jetway-movable-3.ac",
"Models/Airport/Jetway/jetway-movable-3.xml"
],
offsets:
{
@ -48,15 +48,15 @@ var Static_jetway =
model: "generic",
airline: "None"
},
# Models/Airport/jetway.xml
# Models/Airport/jetway-ba.ac
# Models/Airport/jetway-ba.xml
# Models/Airport/Jetway/jetway.xml
# Models/Airport/Jetway/jetway-ba.ac
# Models/Airport/Jetway/jetway-ba.xml
{
models:
[
"Models/Airport/jetway.xml",
"Models/Airport/jetway-ba.ac",
"Models/Airport/jetway-ba.xml"
"Models/Airport/Jetway/jetway.xml",
"Models/Airport/Jetway/jetway-ba.ac",
"Models/Airport/Jetway/jetway-ba.xml"
],
offsets:
{
@ -75,13 +75,13 @@ var Static_jetway =
model: "generic",
airline: "None"
},
# Models/Airport/jetway-737-ba.ac
# Models/Airport/jetway-737-ba.xml
# Models/Airport/Jetway/jetway-737-ba.ac
# Models/Airport/Jetway/jetway-737-ba.xml
{
models:
[
"Models/Airport/jetway-737-ba.ac",
"Models/Airport/jetway-737-ba.xml"
"Models/Airport/Jetway/jetway-737-ba.ac",
"Models/Airport/Jetway/jetway-737-ba.xml"
],
offsets:
{
@ -100,13 +100,13 @@ var Static_jetway =
model: "generic",
airline: "None"
},
# Models/Airport/jetway-747-ba.ac
# Models/Airport/jetway-747-ba.xml
# Models/Airport/Jetway/jetway-747-ba.ac
# Models/Airport/Jetway/jetway-747-ba.xml
{
models:
[
"Models/Airport/jetway-747-ba.ac",
"Models/Airport/jetway-747-ba.xml"
"Models/Airport/Jetway/jetway-747-ba.ac",
"Models/Airport/Jetway/jetway-747-ba.xml"
],
offsets:
{
@ -125,13 +125,13 @@ var Static_jetway =
model: "generic",
airline: "None"
},
# Models/Airport/jetway-a320-ba.ac
# Models/Airport/jetway-a320-ba.xml
# Models/Airport/Jetway/jetway-a320-ba.ac
# Models/Airport/Jetway/jetway-a320-ba.xml
{
models:
[
"Models/Airport/jetway-a320-ba.ac",
"Models/Airport/jetway-a320-ba.xml"
"Models/Airport/Jetway/jetway-a320-ba.ac",
"Models/Airport/Jetway/jetway-a320-ba.xml"
],
offsets:
{
@ -150,13 +150,13 @@ var Static_jetway =
model: "generic",
airline: "None"
},
# Models/Airport/AutoGate-ba.ac
# Models/Airport/AutoGate.xml
# Models/Airport/Jetway/AutoGate-ba.ac
# Models/Airport/Jetway/AutoGate.xml
{
models:
[
"Models/Airport/AutoGate-ba.ac",
"Models/Airport/AutoGate.xml"
"Models/Airport/Jetway/AutoGate-ba.ac",
"Models/Airport/Jetway/AutoGate.xml"
],
offsets:
{
@ -175,13 +175,13 @@ var Static_jetway =
model: "generic",
airline: "None"
},
# Models/Airport/DockingGate-ba.ac
# Models/Airport/DockingGate.xml
# Models/Airport/Jetway/DockingGate-ba.ac
# Models/Airport/Jetway/DockingGate.xml
{
models:
[
"Models/Airport/DockingGate-ba.ac",
"Models/Airport/DockingGate.xml"
"Models/Airport/Jetway/DockingGate-ba.ac",
"Models/Airport/Jetway/DockingGate.xml"
],
offsets:
{
@ -224,6 +224,7 @@ var click = func(pos)
}
elsif (kbd_shift.getBoolValue())
{
if (selected_jetway != nil) selected_jetway._edit = 0;
selected_jetway = nil;
}
elsif (kbd_ctrl.getBoolValue())
@ -466,7 +467,7 @@ var convert_stg = func
append(jetway_array, hash);
}
var airport = getprop("/sim/jetways/closest-airport-id");
var airport = getprop("/sim/airport/closest-airport-id");
if (airport == "") return;
var i = 0;
var loop = func

View file

@ -226,11 +226,7 @@ settimer( func {visibility_loop(); },0);
####################################
var setLift = func (lift) {
if (features.can_disable_environment == 1)
{
setprop("/environment/wind-from-down-fps",lift);
}
setprop("/environment/local-weather-lift-fps",lift);
}
####################################

View file

@ -6,8 +6,6 @@ varying vec3 VTangent;
varying vec3 VBinormal;
varying vec3 VNormal;
varying vec3 Normal;
varying float bump;
varying float fogCoord;
uniform sampler3D NoiseTex;
uniform sampler2D SampleTex;
@ -61,6 +59,7 @@ float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds)
void main (void)
{
float bump = 1.0;
if ( quality_level >= 3.5 ) {
linear_search_steps = 20;
@ -100,6 +99,7 @@ void main (void)
float vegetationlevel = (rawpos.z)+nvL[2]*3000.0;
const float LOG2 = 1.442695;
float fogCoord = abs(ecPosition.z / ecPosition.w);
float fogFactor = exp(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord);
float biasFactor = exp2(-0.00000002 * fogCoord * fogCoord * LOG2);

View file

@ -5,8 +5,6 @@ varying vec3 VTangent;
varying vec3 VBinormal;
varying vec3 Normal;
varying vec4 constantColor;
varying float bump;
varying float fogCoord;
attribute vec3 tangent;
attribute vec3 binormal;
@ -19,14 +17,10 @@ void main(void)
VNormal = gl_NormalMatrix * gl_Normal;
VTangent = gl_NormalMatrix * tangent;
VBinormal = gl_NormalMatrix * binormal;
bump = 1.0;
gl_FrontColor = gl_Color;
constantColor = gl_FrontMaterial.emission
+ gl_FrontColor * (gl_LightModel.ambient + gl_LightSource[0].ambient);
gl_Position = ftransform();
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
fogCoord = abs(ecPosition.z / ecPosition.w);
}

View file

@ -7,7 +7,6 @@ varying vec3 VTangent;
varying vec3 VBinormal;
varying vec3 Normal;
varying vec4 constantColor;
varying float bump;
uniform sampler3D NoiseTex;
uniform sampler2D BaseTex;
@ -55,17 +54,23 @@ float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds)
void main (void)
{
if ( quality_level >= 3.5 ) {
float bump = 1.0;
if ( quality_level >= 3.0 ) {
linear_search_steps = 20;
}
vec2 uv, dp, ds;
vec2 uv, dp = vec2(0, 0), ds = vec2(0, 0);
vec3 N;
float d;
if ( bump > 0.9 && quality_level >= 2.0 )
float d = 0;
if ( bump > 0.9 && quality_level >= 2.0 && quality_level < 3.5)
{
vec3 V = normalize(ecPosition.xyz);
float a = dot(VNormal, -V);
vec2 s = vec2(dot(V, VTangent), dot(V, VBinormal));
// prevent a divide by zero
if (a > -1e-3 && a < 1e-3) a = 1e-3;
s *= depth_factor / a;
ds = s;
dp = gl_TexCoord[0].st;

View file

@ -5,7 +5,6 @@ varying vec3 VTangent;
varying vec3 VBinormal;
varying vec3 Normal;
varying vec4 constantColor;
varying float bump;
attribute vec3 tangent;
attribute vec3 binormal;
@ -18,7 +17,6 @@ void main(void)
VNormal = gl_NormalMatrix * gl_Normal;
VTangent = gl_NormalMatrix * tangent;
VBinormal = gl_NormalMatrix * binormal;
bump = 1.0;
gl_FrontColor = gl_Color;
constantColor = gl_FrontMaterial.emission

Binary file not shown.

After

Width:  |  Height:  |  Size: 971 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 916 B

View file

@ -166,7 +166,9 @@
<carrier-desc>Specify starting position on an AI carrier</carrier-desc>
<parkpos-desc>Specify which starting position on an AI carrier (must also specify a carrier)</parkpos-desc>
<vor-desc>Specify starting position relative to a VOR</vor-desc>
<vor-freq-desc>Specify the frequency of the VOR. Use with --vor=ID</vor-freq-desc>
<ndb-desc>Specify starting position relative to an NDB</ndb-desc>
<ndb-freq-desc>Specify the frequency of the NDB. Use with --ndb=ID</ndb-freq-desc>
<fix-desc>Specify starting position relative to a fix</fix-desc>
<runway-no-desc>Specify starting runway (must also specify an airport)</runway-no-desc>
<offset-distance-desc>Specify distance to reference point (statute miles)</offset-distance-desc>

View file

@ -45,7 +45,7 @@
<checkbox>
<halign>left</halign>
<label>Show worst-case frame latency</label>
<label>Show frame spacing</label>
<property>/sim/rendering/frame-latency-display</property>
<binding>
<command>dialog-apply</command>

View file

@ -73,64 +73,64 @@
</checkbox>
<!--
<group>
<layout>hbox</layout>
<text>
<label>Lighting</label>
<halign>left</halign>
</text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<group>
<layout>hbox</layout>
<text>
<label>Lighting</label>
<halign>left</halign>
</text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<checkbox>
<halign>left</halign>
<label>Sun/Moon horizon effect</label>
<property>/sim/rendering/horizon-effect</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
<checkbox>
<halign>left</halign>
<label>Sun/Moon horizon effect</label>
<property>/sim/rendering/horizon-effect</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Use point sprites for runway lights (requires restart)</label>
<property>/sim/rendering/point-sprites</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Use point sprites for runway lights</label>
<property>/sim/rendering/point-sprites</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<!--
<checkbox>
<halign>left</halign>
<label>Enhanced runway lighting</label>
<property>/sim/rendering/enhanced-lighting</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Enhanced runway lighting</label>
<property>/sim/rendering/enhanced-lighting</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Runway light distance attenuation</label>
<property>/sim/rendering/distance-attenuation</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Runway light distance attenuation</label>
<property>/sim/rendering/distance-attenuation</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Specular reflections on objects</label>
<property>/sim/rendering/specular-highlight</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
<checkbox>
<halign>left</halign>
<label>Specular reflections on objects</label>
<property>/sim/rendering/specular-highlight</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
<group>
<layout>hbox</layout>
@ -167,16 +167,16 @@
<!--
<checkbox>
<halign>left</halign>
<label>Lightning</label>
<property>/sim/rendering/lightning-enable</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Lightning</label>
<property>/sim/rendering/lightning-enable</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
-->
<checkbox>
<halign>left</halign>
@ -207,16 +207,16 @@
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Animated jetways</label>
<name>jetways</name>
<property>/sim/jetways/enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>jetways</object-name>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Animated jetways</label>
<name>jetways</name>
<property>/sim/jetways/enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>jetways</object-name>
</binding>
</checkbox>
<group>
<layout>hbox</layout>
@ -231,16 +231,16 @@
<!--
<checkbox>
<halign>left</halign>
<label>2D clouds</label>
<property>/sim/rendering/bump-mapping</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>2D clouds</label>
<property>/sim/rendering/bump-mapping</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
-->
<checkbox>
<halign>left</halign>
@ -690,8 +690,6 @@
</text>
</group>
</group>
</group>

View file

@ -77,7 +77,7 @@
</slider>
<text>
<label>12345678</label>
<format>%.2f</format>
<format>%.2f m</format>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/screen-distance</property>
</text>
@ -98,7 +98,7 @@
</slider>
<text>
<label>12345678</label>
<format>%.2f</format>
<format>%.2f m</format>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/eye-separation</property>
</text>

View file

@ -338,9 +338,8 @@ top down before the key bindings are parsed.
<desc>Display a dialog relevant to the tuned in ATC service (if any)</desc>
<binding>
<!-- At the moment, we have no working interactive ATC, so this is
disabled for v2.2.0.
disabled for v2.2.0. -->
<command>ATC-dialog</command>
-->
</binding>
</key>

View file

@ -3332,4 +3332,26 @@ Shared parameters for various materials.
</emissive>
</material>
<material>
<name>UnidirectionalTaper</name>
<texture>Symbols/unidirectional.png</texture>
<emissive>
<r>0.92157</r>
<g>0.92157</g>
<b>0.76471</b>
<a>1.0</a>
</emissive>
</material>
<material>
<name>BidirectionalTaper</name>
<texture>Symbols/bidirectional.png</texture>
<emissive>
<r>0.92157</r>
<g>0.92157</g>
<b>0.76471</b>
<a>1.0</a>
</emissive>
</material>
</PropertyList>

View file

@ -675,12 +675,24 @@
<description>strings/vor-desc</description>
</option>
<option>
<name>vor-frequency</name>
<arg>frequency</arg>
<description>strings/vor-freq-desc</description>
</option>
<option>
<name>ndb</name>
<arg>ID</arg>
<description>strings/ndb-desc</description>
</option>
<option>
<name>ndb-frequency</name>
<arg>frequency</arg>
<description>strings/ndb-freq-desc</description>
</option>
<option>
<name>fix</name>
<arg>ID</arg>

View file

@ -1 +1 @@
2.3.0
2.5.0