Merge branch 'master' of git://gitorious.org/fg/fgdata
Erik Hofman
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 9 KiB After Width: | Height: | Size: 43 KiB |
BIN
Aircraft/Generic/Logos/ducky.png
Normal file
|
After Width: | Height: | Size: 47 KiB |
12
Aircraft/Generic/Logos/ducky.xml
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
<sim>
|
||||
<model>
|
||||
<logo>
|
||||
<name type="string">Ducky</name>
|
||||
<texture>../../Generic/Logos/ducky.png</texture>
|
||||
</logo>
|
||||
</model>
|
||||
</sim>
|
||||
</PropertyList>
|
||||
BIN
Aircraft/Generic/Logos/evileyes.png
Normal file
|
After Width: | Height: | Size: 29 KiB |
12
Aircraft/Generic/Logos/evileyes.xml
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
<sim>
|
||||
<model>
|
||||
<logo>
|
||||
<name type="string">EvilEyes</name>
|
||||
<texture>../../Generic/Logos/evileyes.png</texture>
|
||||
</logo>
|
||||
</model>
|
||||
</sim>
|
||||
</PropertyList>
|
||||
|
|
@ -1,59 +1,8 @@
|
|||
AC3Db
|
||||
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
|
||||
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
|
||||
OBJECT world
|
||||
kids 3
|
||||
OBJECT poly
|
||||
name "lower"
|
||||
data 5
|
||||
Plane
|
||||
texture "fgshield.png"
|
||||
texrep 1 1
|
||||
crease 30.000000
|
||||
numvert 4
|
||||
0.5 -0.5 0
|
||||
-0.5 -0.5 0
|
||||
-0.5 -0.166667 0
|
||||
0.5 -0.166667 0
|
||||
numsurf 2
|
||||
SURF 0x00
|
||||
mat 0
|
||||
refs 3
|
||||
1 0.00952526926994 0.00821056962013
|
||||
0 0.993104100227 0.00821056962013
|
||||
2 0.00952526926994 0.336069941521
|
||||
SURF 0x00
|
||||
mat 0
|
||||
refs 3
|
||||
0 0.993104100227 0.00821056962013
|
||||
3 0.993104100227 0.336069822311
|
||||
2 0.00952526926994 0.336069941521
|
||||
kids 0
|
||||
OBJECT poly
|
||||
name "middle"
|
||||
data 9
|
||||
Plane.002
|
||||
texture "fgshield.png"
|
||||
texrep 1 1
|
||||
crease 30.000000
|
||||
numvert 4
|
||||
0.5 -0.166667 0
|
||||
-0.5 -0.166667 0
|
||||
0.5 0.166666 0
|
||||
-0.5 0.166666 0
|
||||
numsurf 2
|
||||
SURF 0x00
|
||||
mat 0
|
||||
refs 3
|
||||
1 0.00952526926994 0.336069941521
|
||||
0 0.993104100227 0.336069822311
|
||||
3 0.00952535867691 0.663929283619
|
||||
SURF 0x00
|
||||
mat 0
|
||||
refs 3
|
||||
0 0.993104100227 0.336069822311
|
||||
2 0.993104100227 0.6639290452
|
||||
3 0.00952535867691 0.663929283619
|
||||
kids 0
|
||||
kids 1
|
||||
OBJECT poly
|
||||
name "upper"
|
||||
data 9
|
||||
|
|
@ -68,15 +17,15 @@ numvert 4
|
|||
0.5 0.5 0
|
||||
numsurf 2
|
||||
SURF 0x00
|
||||
mat 0
|
||||
mat 1
|
||||
refs 3
|
||||
0 0.993104100227 0.6639290452
|
||||
3 0.993104100227 0.991789221764
|
||||
1 0.00952535867691 0.663929283619
|
||||
0 0.497209429741 0.6639290452
|
||||
3 0.497209429741 0.991789221764
|
||||
1 0.00542005896568 0.663929283619
|
||||
SURF 0x00
|
||||
mat 0
|
||||
mat 1
|
||||
refs 3
|
||||
2 0.0095254778862 0.991789460182
|
||||
1 0.00952535867691 0.663929283619
|
||||
3 0.993104100227 0.991789221764
|
||||
2 0.00542011857033 0.991789460182
|
||||
1 0.00542005896568 0.663929283619
|
||||
3 0.497209429741 0.991789221764
|
||||
kids 0
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 65 KiB |
|
|
@ -76,7 +76,7 @@
|
|||
<input>/environment/config/interpolated/visibility-m</input>
|
||||
<output>/environment/visibility-m</output>
|
||||
<type>exponential</type>
|
||||
<filter-time>10</filter-time>
|
||||
<filter-time>2</filter-time>
|
||||
</filter>
|
||||
|
||||
<!--
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@
|
|||
-->
|
||||
<name>MetarController:visibility-m</name>
|
||||
<type>exponential</type>
|
||||
<filter-time>30</filter-time>
|
||||
<filter-time>5</filter-time>
|
||||
<enable>
|
||||
<condition>
|
||||
<property>/environment/metar/valid</property>
|
||||
|
|
|
|||
|
|
@ -994,9 +994,9 @@
|
|||
setprop("sim/gui/dialogs/weather-scenario/metar", metar );
|
||||
});
|
||||
|
||||
var metarListener = setlistener( "environment/metar/data", func(n) {
|
||||
var metar = n.getValue();
|
||||
if( metar == nil ) metar = "";
|
||||
var metarListener = setlistener( "environment/metar/valid", func(n) {
|
||||
var metar = getprop("environment/metar/data");
|
||||
if( metar == nil or metar == "" ) metar = "NIL";
|
||||
metar = normalize_string(metar);
|
||||
setprop("sim/gui/dialogs/weather-scenario/metar", metar );
|
||||
gui.dialog_update( "weather", "metar" );
|
||||
|
|
|
|||