fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
BARANGER Emmanuel 2013-08-25 03:35:38 +02:00
commit a938e3505d
4 changed files with 35 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Aircraft/Instruments-3d/kt76a/KT76A.ac → Aircraft/Instruments-3d/kt76a/kt76a.ac
View file

@ -8,7 +8,7 @@ name "Dial1"
loc 0 0 -0
data 5
Dial1
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 24
@ -147,7 +147,7 @@ name "Dial10"
loc 0 0 -0
data 6
Dial10
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 24
@ -286,7 +286,7 @@ name "Dial100"
loc 0 0 -0
data 7
Dial100
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 24
@ -425,7 +425,7 @@ name "Dial1000"
loc 0 0 -0
data 8
Dial1000
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 24
@ -564,7 +564,7 @@ name "Front"
loc 0 0 -0
data 5
Front
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 62
@ -756,7 +756,7 @@ name "Ident"
loc 0 0 -0
data 5
Ident
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 49
@ -1024,7 +1024,7 @@ name "Ident-light"
loc 0 0 -0
data 11
Ident-light
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 24
@ -1101,7 +1101,7 @@ name "Knob1"
loc 0 0 -0
data 5
Knob1
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 257
@ -2201,7 +2201,7 @@ name "Knob10"
loc 0 0 -0
data 6
Knob10
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 257
@ -3301,7 +3301,7 @@ name "Knob100"
loc 0 0 -0
data 7
Knob100
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 257
@ -4401,7 +4401,7 @@ name "Knob1000"
loc 0 0 -0
data 8
Knob1000
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 257
@ -5501,7 +5501,7 @@ name "Border"
loc 0 0 -0
data 8
Border
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 120
@ -6052,7 +6052,7 @@ name "KnobMode"
loc 0 0 -0
data 8
KnobMode
texture "KT76A.png"
texture "kt76a.png"
texrep 1 1
crease 30.000001
numvert 257

0
Aircraft/Instruments-3d/kt76a/KT76A.png → Aircraft/Instruments-3d/kt76a/kt76a.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 151 KiB

72
Aircraft/Instruments-3d/kt76a/KT76A.xml → Aircraft/Instruments-3d/kt76a/kt76a.xml
View file

@ -10,7 +10,7 @@
<PropertyList>
<path>KT76A.ac</path>
<path>kt76a.ac</path>
<params>
<serviceable>instrumentation/transponder/serviceable</serviceable>
@ -27,57 +27,38 @@
</params>
<animation>
<object-name>KnobMode</object-name>
<object-name>ModeUp</object-name>
<object-name>ModeDn</object-name>
<object-name>Ident</object-name>
<object-name>Dial1</object-name>
<object-name>Knob1</object-name>
<object-name>1Dn</object-name>
<object-name>1Up</object-name>
<object-name>Dial10</object-name>
<object-name>Knob10</object-name>
<object-name>10Dn</object-name>
<object-name>10Up</object-name>
<object-name>Dial100</object-name>
<object-name>Knob100</object-name>
<object-name>100Dn</object-name>
<object-name>100Up</object-name>
<object-name>Dial1000</object-name>
<object-name>Knob1000</object-name>
<object-name>1000Dn</object-name>
<object-name>1000Up</object-name>
<object-name>Front</object-name>
<object-name>Ident</object-name>
<object-name>Ident-light</object-name>
<object-name>Knob1</object-name>
<object-name>Knob10</object-name>
<object-name>Knob100</object-name>
<object-name>Knob1000</object-name>
<object-name>Border</object-name>
<object-name>KnobMode</object-name>
<object-name>vitre</object-name>
</animation>
<animation>
<type>material</type>
<object-name>KnobMode</object-name>
<object-name>ModeUp</object-name>
<object-name>ModeDn</object-name>
<object-name>Ident</object-name>
<object-name>Dial1</object-name>
<object-name>Knob1</object-name>
<object-name>1Dn</object-name>
<object-name>1Up</object-name>
<object-name>Dial10</object-name>
<object-name>Knob10</object-name>
<object-name>10Dn</object-name>
<object-name>10Up</object-name>
<object-name>Dial100</object-name>
<object-name>Knob100</object-name>
<object-name>100Dn</object-name>
<object-name>100Up</object-name>
<object-name>Dial1000</object-name>
<object-name>Knob1000</object-name>
<object-name>1000Dn</object-name>
<object-name>1000Up</object-name>
<object-name>Front</object-name>
<object-name>Ident</object-name>
<object-name>Ident-light</object-name>
<object-name>Knob1</object-name>
<object-name>Knob10</object-name>
<object-name>Knob100</object-name>
<object-name>Knob1000</object-name>
<object-name>Border</object-name>
<object-name>KnobMode</object-name>
<object-name>vitre</object-name>
<property-base>/instrumentation/transponder</property-base>
<texture-prop>texture-file</texture-prop>
@ -85,30 +66,19 @@
<animation>
<type>material</type>
<object-name>KnobMode</object-name>
<object-name>ModeUp</object-name>
<object-name>ModeDn</object-name>
<object-name>Ident</object-name>
<object-name>Dial1</object-name>
<object-name>Knob1</object-name>
<object-name>1Dn</object-name>
<object-name>1Up</object-name>
<object-name>Dial10</object-name>
<object-name>Knob10</object-name>
<object-name>10Dn</object-name>
<object-name>10Up</object-name>
<object-name>Dial100</object-name>
<object-name>Knob100</object-name>
<object-name>100Dn</object-name>
<object-name>100Up</object-name>
<object-name>Dial1000</object-name>
<object-name>Knob1000</object-name>
<object-name>1000Dn</object-name>
<object-name>1000Up</object-name>
<object-name>Front</object-name>
<object-name>Ident</object-name>
<object-name>Ident-light</object-name>
<object-name>Knob1</object-name>
<object-name>Knob10</object-name>
<object-name>Knob100</object-name>
<object-name>Knob1000</object-name>
<object-name>Border</object-name>
<object-name>KnobMode</object-name>
<object-name>vitre</object-name>
<condition>
<not><property>sim/rendering/rembrandt/enabled</property></not>

2
gui/dialogs/sound.xml
View file

@ -359,7 +359,7 @@
if(getprop("/sim/fgcom/enabled")) {
setprop("/sim/fgcom/enabled", 0);
settimer( func { fgcommand("reinit", props.Node.new({ "subsystem" : "sound" })); }, 0.5 );
settimer( func { setprop("/sim/fgcom/enabled", 1); print("enable fgcom");}, 1 );
settimer( func { setprop("/sim/fgcom/enabled", 1); }, 1 );
} else {
fgcommand("reinit", props.Node.new({ "subsystem" : "sound" }));
}