Menu
▾
▴
[Flightgear-fgaddon-commitlogs] r5289 - trunk/Aircraft/Yak-18T: Yakovlev Yak 18T: Compatibility with Compositor.
|
From: <fli...@li...> - 2020-12-09 02:34:14
|
Revision: 5289
http://sourceforge.net/p/flightgear/fgaddon/5289
Author: helijah
Date: 2020-12-09 02:34:04 +0000 (Wed, 09 Dec 2020)
Log Message:
-----------
Yakovlev Yak 18T: Compatibility with Compositor. Fixed path error for windows.
Modified Paths:
--------------
trunk/Aircraft/Yak-18T/Dialogs/yak18t-menu.xml
trunk/Aircraft/Yak-18T/Models/Effects/cranking/cranking.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Clock/Clock.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/EGT-OAT/EGT-OAT.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/FuelGauge/FuelGauge.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Gear/gearlamp.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Gear/lever.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/MagneticCompass/MagneticCompass.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/OilGauge/OilGauge.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/altimeter/altimeter.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/asi/asi.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/audio-plug/audio-plug.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/carbtemp/carbtemp.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/divers/ajout.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/dme40/dme40.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/egt/egt.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/engine/man-gauge.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/engine/rpm-gauge.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/fuel2/fuel-select.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/gps/gps.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/hi/hi.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kap140/kap140-autopilot.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kap140/kap140.ac
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/ki206/ki206.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/ki252a/fd-annun.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/ki252a/ki252a.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kr87-adf/ki227-01.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kr87-adf/kr87.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kra10a/kra10a.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kt70/kt70.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kx165/kx165-1.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kx165/kx165-2.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kx165/kx165.ac
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/pkp/pkp.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/pm/magnetos.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/rpm/tach.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/vsi/vsi.xml
trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/warning/warning.xml
trunk/Aircraft/Yak-18T/Models/Interior/interior.xml
trunk/Aircraft/Yak-18T/Models/engines/blocpiston.xml
trunk/Aircraft/Yak-18T/Models/engines/engine.xml
trunk/Aircraft/Yak-18T/Models/light/GreenLight.ac
trunk/Aircraft/Yak-18T/Models/light/GreenLight.xml
trunk/Aircraft/Yak-18T/Models/light/RedLight.ac
trunk/Aircraft/Yak-18T/Models/light/RedLight.xml
trunk/Aircraft/Yak-18T/Models/light/StrobeLight.xml
trunk/Aircraft/Yak-18T/Models/light/WhiteLight.ac
trunk/Aircraft/Yak-18T/Models/light/WhiteLight.xml
trunk/Aircraft/Yak-18T/Models/light/beacon.xml
trunk/Aircraft/Yak-18T/Models/light/light-cone.xml
trunk/Aircraft/Yak-18T/Models/light/lights.png
trunk/Aircraft/Yak-18T/Models/shadow.xml
trunk/Aircraft/Yak-18T/Models/yak18t.xml
trunk/Aircraft/Yak-18T/Nasal/doors.nas
trunk/Aircraft/Yak-18T/Nasal/liveries.nas
trunk/Aircraft/Yak-18T/Nasal/system.nas
trunk/Aircraft/Yak-18T/Read-Me.txt
trunk/Aircraft/Yak-18T/Systems/controls.xml
trunk/Aircraft/Yak-18T/Systems/help.xml
trunk/Aircraft/Yak-18T/Systems/yak18t-base.xml
trunk/Aircraft/Yak-18T/Systems/yak18t-keyboard.xml
trunk/Aircraft/Yak-18T/Systems/yak18t-yasim.xml
trunk/Aircraft/Yak-18T/yak18t-set.xml
Added Paths:
-----------
trunk/Aircraft/Yak-18T/Nasal/convert.nas
Removed Paths:
-------------
trunk/Aircraft/Yak-18T/Models/light/StrobeGreen.xml
trunk/Aircraft/Yak-18T/Models/light/StrobeRed.xml
trunk/Aircraft/Yak-18T/Models/light/StrobeWhite.xml
Modified: trunk/Aircraft/Yak-18T/Dialogs/yak18t-menu.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Dialogs/yak18t-menu.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Dialogs/yak18t-menu.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<PropertyList>
@@ -78,17 +78,7 @@
<script>aircraft.livery.dialog.toggle()</script>
</binding>
</item>
-<!--
- <item>
- <label>Immatriculation</label>
- <binding>
- <command>nasal</command>
- <script>navion.immat_dialog.toggle()</script>
- </binding>
- </item>
--->
</menu>
</default>
</PropertyList>
-
Modified: trunk/Aircraft/Yak-18T/Models/Effects/cranking/cranking.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Effects/cranking/cranking.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Effects/cranking/cranking.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -100,4 +100,3 @@
</particlesystem>
</PropertyList>
-
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Clock/Clock.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Clock/Clock.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Clock/Clock.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -14,12 +14,27 @@
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>face</object-name>
+ <object-name>secondes</object-name>
+ <object-name>minutes</object-name>
+ <object-name>heures</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>face</object-name>
@@ -26,8 +41,11 @@
<object-name>secondes</object-name>
<object-name>minutes</object-name>
<object-name>heures</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/EGT-OAT/EGT-OAT.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/EGT-OAT/EGT-OAT.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/EGT-OAT/EGT-OAT.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -7,25 +7,42 @@
<animation>
<object-name>fond</object-name>
<object-name>face</object-name>
- <object-name>ptrL</object-name>
+ <object-name>ptrL</object-name>
<object-name>ptrR</object-name>
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>face</object-name>
+ <object-name>ptrL</object-name>
+ <object-name>ptrR</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>face</object-name>
- <object-name>ptrL</object-name>
+ <object-name>ptrL</object-name>
<object-name>ptrR</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
@@ -32,7 +49,7 @@
</emission>
</animation>
- <animation>
+ <animation>
<type>rotate</type>
<object-name>ptrL</object-name>
<property>instrumentation/engine/cht-degf</property>
@@ -43,16 +60,16 @@
<center>
<x-m> 0.00 </x-m>
<y-m> -0.02 </y-m>
- <z-m> 0.00 </z-m>
+ <z-m> 0.00 </z-m>
</center>
- <axis>
+ <axis>
<x> 1 </x>
<y> 0 </y>
<z> 0 </z>
</axis>
- </animation>
-
- <animation>
+ </animation>
+
+ <animation>
<type>rotate</type>
<object-name>ptrR</object-name>
<property>environment/temperature-degc</property>
@@ -66,13 +83,13 @@
<center>
<x-m> 0.00 </x-m>
<y-m> 0.02 </y-m>
- <z-m> 0.00 </z-m>
+ <z-m> 0.00 </z-m>
</center>
- <axis>
+ <axis>
<x> -1 </x>
<y> 0 </y>
<z> 0 </z>
</axis>
- </animation>
-
+ </animation>
+
</PropertyList>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/FuelGauge/FuelGauge.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/FuelGauge/FuelGauge.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/FuelGauge/FuelGauge.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -7,25 +7,42 @@
<animation>
<object-name>fond</object-name>
<object-name>face</object-name>
- <object-name>ptrL</object-name>
+ <object-name>ptrL</object-name>
<object-name>ptrR</object-name>
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>face</object-name>
+ <object-name>ptrL</object-name>
+ <object-name>ptrR</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>face</object-name>
- <object-name>ptrL</object-name>
+ <object-name>ptrL</object-name>
<object-name>ptrR</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Gear/gearlamp.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Gear/gearlamp.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Gear/gearlamp.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -13,12 +13,25 @@
</animation>
<animation>
+ <type>noshadow</type>
+ <object-name>GearCtrl</object-name>
+ <object-name>nose.lamp</object-name>
+ <object-name>LH.lamp</object-name>
+ <object-name>RH.lamp</object-name>
+ <object-name>Gear.unlocked</object-name>
+ </animation>
+
+ <animation>
<type>material</type>
<object-name>nose.lamp</object-name>
<object-name>LH.lamp</object-name>
<object-name>RH.lamp</object-name>
<object-name>Gear.unlocked</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 1 </red>
<green> 1 </green>
<blue> 1 </blue>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Gear/lever.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Gear/lever.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/Gear/lever.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -21,5 +21,3 @@
</animation>
</PropertyList>
-
-
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/MagneticCompass/MagneticCompass.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/MagneticCompass/MagneticCompass.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/MagneticCompass/MagneticCompass.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -10,17 +10,31 @@
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>Ball</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>Ball</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
@@ -35,7 +49,7 @@
<x-m> -0.022 </x-m>
<y-m> 0.000 </y-m>
<z-m> 0.000 </z-m>
- </center>
+ </center>
<axis>
<x> 0 </x>
<y> 0 </y>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/OilGauge/OilGauge.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/OilGauge/OilGauge.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/OilGauge/OilGauge.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -7,25 +7,42 @@
<animation>
<object-name>fond</object-name>
<object-name>face</object-name>
- <object-name>ptrL</object-name>
+ <object-name>ptrL</object-name>
<object-name>ptrR</object-name>
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>face</object-name>
+ <object-name>ptrL</object-name>
+ <object-name>ptrR</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>face</object-name>
- <object-name>ptrL</object-name>
+ <object-name>ptrL</object-name>
<object-name>ptrR</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
@@ -32,7 +49,7 @@
</emission>
</animation>
- <animation>
+ <animation>
<type>rotate</type>
<object-name>ptrL</object-name>
<property>instrumentation/engine/oil-temp</property>
@@ -45,16 +62,16 @@
<center>
<x-m> 0.00 </x-m>
<y-m> -0.02 </y-m>
- <z-m> 0.00 </z-m>
+ <z-m> 0.00 </z-m>
</center>
- <axis>
+ <axis>
<x> 1 </x>
<y> 0 </y>
<z> 0 </z>
</axis>
- </animation>
-
- <animation>
+ </animation>
+
+ <animation>
<type>rotate</type>
<object-name>ptrR</object-name>
<property>engines/engine/oil-pressure-psi</property>
@@ -66,13 +83,13 @@
<center>
<x-m> 0.00 </x-m>
<y-m> 0.02 </y-m>
- <z-m> 0.00 </z-m>
+ <z-m> 0.00 </z-m>
</center>
- <axis>
+ <axis>
<x> -1 </x>
<y> 0 </y>
<z> 0 </z>
</axis>
- </animation>
-
+ </animation>
+
</PropertyList>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/altimeter/altimeter.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/altimeter/altimeter.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/altimeter/altimeter.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<PropertyList>
-
+
<path>altimeter.ac</path>
<animation>
@@ -8,30 +8,54 @@
<object-name>mount</object-name>
<object-name>face</object-name>
<object-name>needle</object-name>
-
+
<object-name>knob</object-name>
<object-name>switch</object-name>
-
+
<object-name>drum-1</object-name>
<object-name>drum-2</object-name>
<object-name>drum-3</object-name>
-
+
<object-name>drum-inhg-1</object-name>
<object-name>drum-inhg-2</object-name>
<object-name>drum-inhg-3</object-name>
<object-name>drum-inhg-4</object-name>
-
+
<object-name>ingh-knob-left</object-name>
<object-name>ingh-knob-right</object-name>
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>mount</object-name>
+ <object-name>face</object-name>
+ <object-name>needle</object-name>
+ <object-name>knob</object-name>
+ <object-name>switch</object-name>
+ <object-name>drum-1</object-name>
+ <object-name>drum-2</object-name>
+ <object-name>drum-3</object-name>
+ <object-name>drum-inhg-1</object-name>
+ <object-name>drum-inhg-2</object-name>
+ <object-name>drum-inhg-3</object-name>
+ <object-name>drum-inhg-4</object-name>
+ <object-name>ingh-knob-left</object-name>
+ <object-name>ingh-knob-right</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<name>knobs</name>
<object-name>knob</object-name>
@@ -54,8 +78,11 @@
<object-name>face</object-name>
<object-name>drums</object-name>
<object-name>knobs</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
@@ -77,7 +104,7 @@
<type>rotate</type>
<object-name>needle</object-name>
<property>instrumentation/altimeter/indicated-altitude-ft</property>
- <factor> 0.36 </factor>
+ <factor> 0.36 </factor>
<axis>
<x> -1 </x>
<y> 0 </y>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/asi/asi.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/asi/asi.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/asi/asi.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -12,18 +12,34 @@
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>face</object-name>
+ <object-name>needle</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>face</object-name>
<object-name>needle</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/audio-plug/audio-plug.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/audio-plug/audio-plug.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/audio-plug/audio-plug.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -3,12 +3,17 @@
<PropertyList>
<path>audio-plug.ac</path>
-
+
<animation>
<object-name>audio</object-name>
</animation>
<animation>
+ <type>noshadow</type>
+ <object-name>audio</object-name>
+ </animation>
+
+ <animation>
<type>pick</type>
<object-name>audio</object-name>
<visible>true</visible>
@@ -54,4 +59,3 @@
</animation>
</PropertyList>
-
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/carbtemp/carbtemp.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/carbtemp/carbtemp.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/carbtemp/carbtemp.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -12,18 +12,34 @@
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>Carbtemp</object-name>
+ <object-name>Carbtemp.face</object-name>
+ <object-name>CARBneedle</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>Carbtemp.face</object-name>
<object-name>CARBneedle</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/divers/ajout.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/divers/ajout.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/divers/ajout.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<PropertyList>
@@ -8,4 +8,9 @@
<object-name>ajout</object-name>
</animation>
+ <animation>
+ <type>noshadow</type>
+ <object-name>ajout</object-name>
+ </animation>
+
</PropertyList>
\ No newline at end of file
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/dme40/dme40.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/dme40/dme40.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/dme40/dme40.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -24,6 +24,26 @@
</animation>
<animation>
+ <type>noshadow</type>
+ <object-name>DME</object-name>
+ <object-name>DME40.dim</object-name>
+ <object-name>DME40.test</object-name>
+ <object-name>DME40.knob1</object-name>
+ <object-name>DME40.knob2</object-name>
+ <object-name>DME.invalid</object-name>
+ <object-name>NM.1</object-name>
+ <object-name>NM1</object-name>
+ <object-name>NM10</object-name>
+ <object-name>NM100</object-name>
+ <object-name>min1</object-name>
+ <object-name>min10</object-name>
+ <object-name>min100</object-name>
+ <object-name>kt1</object-name>
+ <object-name>kt10</object-name>
+ <object-name>kt100</object-name>
+ </animation>
+
+ <animation>
<type>material</type>
<object-name>NM.1</object-name>
<object-name>NM1</object-name>
@@ -35,8 +55,11 @@
<object-name>kt1</object-name>
<object-name>kt10</object-name>
<object-name>kt100</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/egt/egt.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/egt/egt.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/egt/egt.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -14,18 +14,34 @@
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>face</object-name>
+ <object-name>needle</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>face</object-name>
<object-name>needle</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/engine/man-gauge.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/engine/man-gauge.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/engine/man-gauge.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -1,35 +1,51 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<PropertyList>
-
+
<path>man-gauge.ac</path>
-
+
<animation>
<object-name>fond</object-name>
<object-name>face</object-name>
<object-name>needle</object-name>
-
+
<object-name>vitre</object-name>
</animation>
-
- <!-- working for Rembrandt -->
+
+ <animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>face</object-name>
+ <object-name>needle</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>face</object-name>
<object-name>needle</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
</emission>
</animation>
-
+
<animation>
<type>rotate</type>
<object-name>needle</object-name>
@@ -46,5 +62,5 @@
<z> 0 </z>
</axis>
</animation>
-
+
</PropertyList>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/engine/rpm-gauge.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/engine/rpm-gauge.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/engine/rpm-gauge.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -12,18 +12,34 @@
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>face</object-name>
+ <object-name>needle</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>face</object-name>
<object-name>needle</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/fuel2/fuel-select.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/fuel2/fuel-select.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/fuel2/fuel-select.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -11,14 +11,21 @@
</animation>
<animation>
+ <type>noshadow</type>
+ <object-name>FuelSelect</object-name>
+ <object-name>Fuelswitch.LH</object-name>
+ <object-name>Fuelswitch.RH</object-name>
+ </animation>
+
+ <animation>
<type>rotate</type>
<object-name>FuelSelect</object-name>
<property>controls/fuel/switch-position</property>
<factor>90.0</factor>
<axis>
- <x>-1</x>
- <y>0</y>
- <z>0</z>
+ <x> -1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/gps/gps.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/gps/gps.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/gps/gps.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -10,10 +10,19 @@
</animation>
<animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>canvasCadre</object-name>
+ </animation>
+
+ <animation>
<type>material</type>
<object-name>canvasCadre</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
@@ -27,5 +36,5 @@
<property>controls/electric/battery-switch</property>
</condition>
</animation>
-
+
</PropertyList>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/hi/hi.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/hi/hi.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/hi/hi.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -19,18 +19,41 @@
<object-name>vitre</object-name>
</animation>
- <!-- working for Rembrandt -->
+ <animation>
+ <type>noshadow</type>
+ <object-name>fond</object-name>
+ <object-name>face</object-name>
+ <object-name>front</object-name>
+ <object-name>HdgBug</object-name>
+ <object-name>OBS-Knob</object-name>
+ <object-name>clic-offset-L</object-name>
+ <object-name>clic-offset-R</object-name>
+ <object-name>Hdg-Knob</object-name>
+ <object-name>clic-bug-L</object-name>
+ <object-name>clic-bug-R</object-name>
+ <object-name>vitre</object-name>
+ </animation>
+
+ <!-- working for Compositor -->
<effect>
<inherits-from>glass</inherits-from>
<object-name>vitre</object-name>
</effect>
-
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>vitre</object-name>
+ </effect>
+
<animation>
<type>material</type>
<object-name>front</object-name>
<object-name>HdgBug</object-name>
+ <condition>
+ <property>controls/electric/battery-switch</property>
+ </condition>
<emission>
- <factor-prop>/systems/electrical/outputs/instrument-lights-norm</factor-prop>
+ <factor-prop>controls/lighting/luminosite-lights</factor-prop>
<red> 0.50 </red>
<green> 0.40 </green>
<blue> 0.30 </blue>
@@ -115,7 +138,7 @@
<wrap>1</wrap>
</binding>
</action>
- </animation>
+ </animation>
<animation>
<type>pick</type>
@@ -147,7 +170,7 @@
<wrap>1</wrap>
</binding>
</action>
- </animation>
+ </animation>
<!-- Heading Offset -->
<animation>
@@ -166,7 +189,7 @@
<max>360</max>
<wrap>1</wrap>
</binding>
- </action>
+ </action>
<action>
<name>large decrease</name>
<button>1</button>
@@ -198,7 +221,7 @@
<max>360</max>
<wrap>1</wrap>
</binding>
- </action>
+ </action>
<action>
<name>large increase</name>
<button>1</button>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kap140/kap140-autopilot.xml
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kap140/kap140-autopilot.xml 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kap140/kap140-autopilot.xml 2020-12-09 02:34:04 UTC (rev 5289)
@@ -5,7 +5,7 @@
<!-- property names to pass the result of one component on to a subsequent -->
<!-- component. -->
<PropertyList>
-
+
<filter>
<name>heading bug error computer/normalizer</name>
<debug>false</debug>
@@ -24,7 +24,7 @@
</period>
<gain>1.0</gain>
</filter>
-
+
<filter>
<name>ils heading error computer/normalizer</name>
<debug>false</debug>
@@ -39,7 +39,7 @@
</greater-than>
</condition>
</enable>
-
+
<input>
<condition>
<equals>
@@ -61,7 +61,7 @@
<scale>-1.0</scale>
</offset>
</input>
-
+
<input>
<condition>
<equals>
@@ -84,7 +84,7 @@
<scale>-1.0</scale>
</offset>
</input>
-
+
<output>autopilot/internal/ils-error-deg</output>
<period>
<min>-180</min>
@@ -92,10 +92,13 @@
</period>
<gain>1.0</gain>
</filter>
-
- <!-- ===============================================================
- Roll Axis Modes
- =============================================================== -->
+
+<!--
+ ===============================================================
+ Roll Axis Modes
+ ===============================================================
+-->
+
<!-- Wing leveler (ROL) Mode -->
<pid-controller>
<name>Wing Leveler (ROL) Mode</name>
@@ -116,7 +119,7 @@
<beta>1.0</beta> <!-- input value weighing factor -->
<alpha>0.1</alpha> <!-- low pass filter weighing factor -->
<gamma>0.0</gamma> <!-- input value weighing factor for -->
- <!-- unfiltered derivative error -->
+ <!-- unfiltered derivative error -->
<Ti>15.0</Ti> <!-- integrator time -->
<Td>0.0</Td> <!-- derivator time -->
<u_min>-0.25</u_min> <!-- minimum output clamp -->
@@ -123,7 +126,7 @@
<u_max>0.25</u_max> <!-- maximum output clamp -->
</config>
</pid-controller>
-
+
<!-- Heading Select (HDG) Mode -->
<pid-controller>
<name>Heading Select (HDG) Mode</name>
@@ -136,7 +139,7 @@
</greater-than>
</condition>
</enable>
-
+
<input>
<condition>
<equals>
@@ -146,7 +149,7 @@
</condition>
<property>instrumentation/nav-source/course-error</property>
</input>
-
+
<input>
<condition>
<or>
@@ -162,11 +165,11 @@
</condition>
<property>autopilot/internal/ils-error-deg</property>
</input>
-
+
<input>
<property>autopilot/internal/heading-bug-error-deg</property>
</input>
-
+
<reference>autopilot/internal/target-intercept-angle</reference>
<output>autopilot/internal/target-roll-deg</output>
<config>
@@ -174,7 +177,7 @@
<beta>1.0</beta> <!-- input value weighing factor -->
<alpha>0.1</alpha> <!-- low pass filter weighing factor -->
<gamma>0.0</gamma> <!-- input value weighing factor for -->
- <!-- unfiltered derivative error -->
+ <!-- unfiltered derivative error -->
<Ti>30.0</Ti> <!-- integrator time -->
<Td>0.0</Td> <!-- derivator time -->
<u_min>-1.0</u_min> <!-- minimum output clamp -->
@@ -181,7 +184,7 @@
<u_max>1.0</u_max> <!-- maximum output clamp -->
</config>
</pid-controller>
-
+
<!-- Nav hold (NAV) Mode-->
<pid-controller>
<name>Nav hold (NAV) Mode</name>
@@ -202,7 +205,7 @@
<beta>1.0</beta> <!-- input value weighing factor -->
<alpha>0.1</alpha> <!-- low pass filter weighing factor -->
<gamma>0.0</gamma> <!-- input value weighing factor for -->
- <!-- unfiltered derivative error -->
+ <!-- unfiltered derivative error -->
<Ti>40.0</Ti> <!-- integrator time -->
<Td>0.0</Td> <!-- derivator time -->
<u_min>-45.0</u_min> <!-- minimum output clamp -->
@@ -209,7 +212,7 @@
<u_max>45.0</u_max> <!-- maximum output clamp -->
</config>
</pid-controller>
-
+
<!-- Approach hold (APR) Mode-->
<pid-controller>
<name>Approach hold (APR) Mode</name>
@@ -230,7 +233,7 @@
<beta>2.0</beta> <!-- input value weighing factor -->
<alpha>0.1</alpha> <!-- low pass filter weighing factor -->
<gamma>0.0</gamma> <!-- input value weighing factor for -->
- <!-- unfiltered derivative error -->
+ <!-- unfiltered derivative error -->
<Ti>20.0</Ti> <!-- integrator time -->
<Td>0.005</Td> <!-- derivator time -->
<u_min>-45.0</u_min> <!-- minimum output clamp -->
@@ -237,7 +240,7 @@
<u_max>45.0</u_max> <!-- maximum output clamp -->
</config>
</pid-controller>
-
+
<!-- Backcourse hold (REV) Mode-->
<pid-controller>
<name>Backcourse hold (REV) Mode</name>
@@ -261,7 +264,7 @@
<beta>2.0</beta> <!-- input value weighing factor -->
<alpha>0.1</alpha> <!-- low pass filter weighing factor -->
<gamma>0.0</gamma> <!-- input value weighing factor for -->
- <!-- unfiltered derivative error -->
+ <!-- unfiltered derivative error -->
<Ti>20.0</Ti> <!-- integrator time -->
<Td>0.001</Td> <!-- derivator time -->
<u_min>-45.0</u_min> <!-- minimum output clamp -->
@@ -268,10 +271,12 @@
<u_max>45.0</u_max> <!-- maximum output clamp -->
</config>
</pid-controller>
-
- <!-- ===============================================================
- Pitch Axis Modes
- =============================================================== -->
+
+<!--
+ ===============================================================
+ Pitch Axis Modes
+ ===============================================================
+-->
<!-- Vertical Speed (VS) Mode -->
<pid-controller>
<name>Vertical Speed (VS) Mode</name>
@@ -292,7 +297,7 @@
<beta>1.0</beta> <!-- input value weighing factor -->
<alpha>0.1</alpha> <!-- low pass filter weighing factor -->
<gamma>0.0</gamma> <!-- input value weighing factor for -->
- <!-- unfiltered derivative error -->
+ <!-- unfiltered derivative error -->
<Ti>20.0</Ti> <!-- integrator time -->
<Td>0.0</Td> <!-- derivator time -->
<u_min>-0.5</u_min> <!-- 0.25 minimum output clamp -->
@@ -299,7 +304,7 @@
<u_max>0.5</u_max> <!-- 0.25 maximum output clamp -->
</config>
</pid-controller>
-
+
<!-- Altitude Capture (ALT ARM) -->
<filter>
<name>slow down FPM while approaching ALT</name>
@@ -371,7 +376,7 @@
</input>
<output>autopilot/internal/target-climb-rate</output>
</filter>
-
+
<!-- Altitude Hold (ALT) Mode -->
<filter>
<name>Altitude Hold (ALT) Mode</name>
@@ -408,7 +413,7 @@
<min>-500</min>
<max>500</max>
</filter>
-
+
<!-- Glideslope Hold (GS) Mode -->
<filter>
<name>Glideslope Hold (GS) Mode</name>
@@ -432,10 +437,13 @@
</input>
<output>autopilot/internal/target-climb-rate</output>
</filter>
-
- <!-- ===============================================================
- Servos
- =============================================================== -->
+
+<!--
+ ===============================================================
+ Servos
+ ===============================================================
+-->
+
<filter>
<name>roll-servo change rate</name>
<debug>false</debug>
@@ -458,7 +466,7 @@
<input>100.0</input>
<output>autopilot/kap140/servo/aileron-rate</output>
</filter>
-
+
<filter>
<name>roll-servo</name>
<debug>false</debug>
@@ -484,7 +492,7 @@
<input>controls/flight/aileron</input>
<output>controls/flight/aileron</output>
</filter>
-
+
<filter>
<name>pitch-servo change rate</name>
<debug>false</debug>
@@ -507,7 +515,7 @@
<input>100.0</input>
<output>autopilot/kap140/servo/elevator-rate</output>
</filter>
-
+
<filter>
<name>pitch-servo</name>
<debug>false</debug>
@@ -533,5 +541,5 @@
<input>controls/flight/elevator</input>
<output>controls/flight/elevator</output>
</filter>
-
+
</PropertyList>
Modified: trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kap140/kap140.ac
===================================================================
--- trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kap140/kap140.ac 2020-12-07 13:47:37 UTC (rev 5288)
+++ trunk/Aircraft/Yak-18T/Models/Interior/Panel/Instruments/kap140/kap140.ac 2020-12-09 02:34:04 UTC (rev 5289)
@@ -1,7 +1,7 @@
AC3Db
-MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 1 1 1 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
+MATERIAL "glass-red" rgb 0.15 0.015 0.015 amb 1 1 1 emis 0 0 0 spec 0.15 0.015 0.015 shi 128 trans 0.85
MATERIAL "glass-white" rgb 0.3 0.3 0.3 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0.1
-MATERIAL "glass-red" rgb 0.15 0.015 0.015 amb 1 1 1 emis 0 0 0 spec 0.15 0.015 0.015 shi 128 trans 0.85
OBJECT world
kids 58
OBJECT poly
@@ -416,19 +416,12 @@
0 -0.002 -0.002
0 0.002 -0.002
0 0.002 0.002
-numsurf 2
+numsurf 1
SURF 0x10
mat 0
refs 4
3 0.065243676305 0.861699163914
-2 0.391787171364 0.861699163914
-1 0.391787171364 0.208613276482
0 0.065243676305 0.208613276482
-SURF 0x10
-mat 0
-refs 4
-3 0.065243676305 0.861699163914
-0 0.065243676305 0.208613276482
1 0.391787171364 0.208613276482
2 0.391787171364 0.861699163914
kids 0
@@ -445,19 +438,12 @@
0 -0.002 -0.002
0 0.002 -0.002
0 0.002 0.002
-numsurf 2
+numsurf 1
SURF 0x10
mat 0
refs 4
3 0.453370332718 0.847491800785
-2 0.760556697845 0.847491800785
-1 0.760556697845 0.233118504286
0 0.453370332718 0.233118504286
-SURF 0x10
-mat 0
-refs 4
-3 0.453370332718 0.847491800785
-0 0.453370332718 0.233118504286
1 0.760556697845 0.233118504286
2 0.760556697845 0.847491800785
kids 0
@@ -1267,7 +1253,7 @@
0.013 0.001235 0.070848
0.013 0.000586 0.070414
0.013 0.000152 0.069765
-0.013 -0 0.069
+0.013 0 0.069
0.013 0.000152 0.068235
0.013 0.000586 0.067586
0.013 0.001235 0.067152
@@ -2854,11 +2840,11 @@
0.0005 0.0188 -0.0783
0.0005 0.0196 -0.0775
0.0005 0.0191 -0.0775
--0 -0.0188 -0.0784
+0 -0.0188 -0.0784
0 0.0188 -0.0784
0 0.0197 -0.0775
0 0.019 -0.0775
--0 -0.0188 -0.0777
+0 -0.0188 -0.0777
0 0.0188 -0.0777
0.0005 0.019493 -0.0779
0.0005 0.0192 -0.078193
@@ -3641,11 +3627,11 @@
base-sensor
crease 30.000001
numvert 33
-0.0002 -0 -0.0013
+0.0002 0 -0.0013
0.0002 0.000497 -0.001201
0.0002 0.000919 -0.000919
0.0002 0.001201 -0.000497
-0.0002 0.0013 0
+0.0002 0.0013 -0
0.0002 0.001201 0.000497
0.0002 0.000919 0.000919
0.0002 0.000497 0.001201
@@ -3657,122 +3643,122 @@
0.0002 -0.001201 -0.000497
0.0002 -0.000919 -0.000919
0.0002 -0.000497 -0.001201
-0.0004 -0 -0
+0.0004 0 -0
0 0 -0.002
0 0.000765 -0.001848
0 0.001414 -0.001414
0 0.001848 -0.000765
-0 0.002 0
+0 0.002 -0
0 0.001848 0.000765
0 0.001414 0.001414
0 0.000765 0.001848
0 0 0.002
--0 -0.000765 0.001848
--0 -0.001414 0.001414
--0 -0.001848 0.000765
--0 -0.002 -0
--0 -0.001848 -0.000765
--0 -0.001414 -0.001414
--0 -0.000765 -0.001848
+0 -0.000765 0.001848
+0 -0.001414 0.001414
+0 -0.001848 0.000765
+0 -0.002 -0
+0 -0.001848 -0.000765
+0 -0.001414 -0.001414
+0 -0.000765 -0.001848
numsurf 32
SURF 0x10
-mat 1
+mat 2
refs 3
7 0.199738904834 0.624372243881
8 0.174999907613 0.5
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
15 0.80026113987 0.37562802434
0 0.825000107288 0.5
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
16 0.5 0.5
8 0.174999907613 0.5
9 0.199738904834 0.375627964735
SURF 0x10
-mat 1
+mat 2
refs 3
9 0.199738904834 0.375627964735
10 0.270189255476 0.270190417767
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
10 0.270189255476 0.270190417767
11 0.375627279282 0.199739202857
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
11 0.375627279282 0.199739202857
12 0.5 0.175000056624
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
12 0.5 0.175000056624
13 0.624372720718 0.199739202857
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
13 0.624372720718 0.199739202857
14 0.729810774326 0.270190417767
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
14 0.729810774326 0.270190417767
15 0.80026113987 0.37562802434
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
0 0.825000107288 0.5
1 0.80026113987 0.624372243881
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
1 0.80026113987 0.624372243881
2 0.729810774326 0.729809761047
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
2 0.729810774326 0.729809761047
3 0.624372720718 0.800260841846
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
3 0.624372720718 0.800260841846
4 0.5 0.824999928474
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
4 0.5 0.824999928474
5 0.375627279282 0.800260841846
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
5 0.375627279282 0.800260841846
6 0.270189255476 0.729809761047
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 3
6 0.270189255476 0.729809761047
7 0.199738904834 0.624372243881
16 0.5 0.5
SURF 0x10
-mat 1
+mat 2
refs 4
3 0.624372720718 0.800260841846
20 0.691341638565 0.961939752102
@@ -3779,7 +3765,7 @@
21 0.5 1
4 0.5 0.824999928474
SURF 0x10
-mat 1
+mat 2
refs 4
2 0.729810774326 0.729809761047
19 0.853555738926 0.853553414345
@@ -3786,7 +3772,7 @@
20 0.691341638565 0.961939752102
3 0.624372720718 0.800260841846
SURF 0x10
-mat 1
+mat 2
refs 4
1 0.80026113987 0.624372243881
18 0.961940646172 0.691341757774
@@ -3793,7 +3779,7 @@
19 0.853555738926 0.853553414345
2 0.729810774326 0.729809761047
SURF 0x10
-mat 1
+mat 2
refs 4
0 0.825000107288 0.5
17 1 0.5
@@ -3800,7 +3786,7 @@
18 0.961940646172 0.691341757774
1 0.80026113987 0.624372243881
SURF 0x10
-mat 1
+mat 2
refs 4
15 0.80026113987 0.37562802434
32 0.961940646172 0.308658510447
@@ -3807,7 +3793,7 @@
17 1 0.5
0 0.825000107288 0.5
SURF 0x10
-mat 1
+mat 2
refs 4
14 0.729810774326 0.270190417767
31 0.853555738926 0.146446734667
@@ -3814,7 +3800,7 @@
32 0.961940646172 0.308658510447
15 0.80026113987 0.37562802434
SURF 0x10
-mat 1
+mat 2
refs 4
13 0.624372720718 0.199739202857
30 0.691341638565 0.038060292602
@@ -3821,7 +3807,7 @@
31 0.853555738926 0.146446734667
14 0.729810774326 0.270190417767
SURF 0x10
-mat 1
+mat 2
refs 4
12 0.5 0.175000056624
29 0.5 0
@@ -3828,7 +3814,7 @@
30 0.691341638565 0.038060292602
13 0.624372720718 0.199739202857
SURF 0x10
-mat 1
+mat 2
refs 4
11 0.375627279282 0.199739202857
28 0.308656483889 0.038060236722
@@ -3835,7 +3821,7 @@
29 0.5 0
12 0.5 0.175000056624
SURF 0x10
-mat 1
+mat 2
refs 4
10 0.270189255476 0.270190417767
27 0.146444290876 0.146446734667
@@ -3842,7 +3828,7 @@
28 0.308656483889 0.038060236722
11 0.375627279282 0.199739202857
SURF 0x10
-mat 1
+mat 2
refs 4
9 0.199738904834 0.375627964735
26 0.038059331477 0.308658450842
@@ -3849,7 +3835,7 @@
27 0.146444290876 0.146446734667
10 0.270189255476 0.270190417767
SURF 0x10
-mat 1
+mat 2
refs 4
8 0.174999907613 0.5
25 0 0.5
@@ -3856,7 +3842,7 @@
26 0.038059331477 0.308658450842
9 0.199738904834 0.375627964735
SURF 0x10
-mat 1
+mat 2
refs 4
7 0.199738904834 0.624372243881
24 0.038059331477 0.691341757774
@@ -3863,7 +3849,7 @@
25 0 0.5
8 0.174999907613 0.5
SURF 0x10
-mat 1
+mat 2
refs 4
6 0.270189255476 0.729809761047
23 0.146444290876 0.853553414345
@@ -3870,7 +3856,7 @@
24 0.038059331477 0.691341757774
7 0.199738904834 0.624372243881
SURF 0x10
-mat 1
+mat 2
refs 4
5 0.375627279282 0.800260841846
22 0.308656483889 0.961939752102
@@ -3877,7 +3863,7 @@
23 0.146444290876 0.853553414345
6 0.270189255476 0.729809761047
SURF 0x10
-mat 1
+mat 2
refs 4
4 0.5 0.824999928474
21 0.5 1
@@ -3897,14 +3883,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -4383,14 +4369,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -4869,14 +4855,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -5355,14 +5341,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -5841,14 +5827,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -6327,14 +6313,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -6813,14 +6799,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -7299,14 +7285,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -7785,14 +7771,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -8271,14 +8257,14 @@
0 0.002643 0.0041
0 0.00235 0.004393
0 0.00195 0.0045
--0 -0.00195 0.0045
--0 -0.00235 0.004393
--0 -0.002643 0.0041
--0 -0.00275 0.0037
--0 -0.00195 -0.0045
--0 -0.00275 -0.0037
--0 -0.002643 -0.0041
--0 -0.00235 -0.004393
+0 -0.00195 0.0045
+0 -0.00235 0.004393
+0 -0.002643 0.0041
+0 -0.00275 0.0037
+0 -0.00195 -0.0045
+0 -0.00275 -0.0037
+0 -0.002643 -0.0041
+0 -0.00235 -0.004393
0 0.00195 -0.0045
0 0.00235 -0.004393
0 0.002643 -0.0041
@@ -8760,19 +8746,19 @@
0 0.0105 0.0478
0 0.0105 -0.0456
0 0.01 -0.0461
--0 -0.0099 -0.0461
+0 -0.0099 -0.0461
0 -0.0104 0.0478
0 -0.0104 -0.0456
--0 0.01 0.0483
--0 -0.0099 0.0483
--0 -0.010333 0.04805
--0 -0.01015 0.048233
--0 0.010433 0.04805
--0 0.01025 0.048233
+0 0.01 0.0483
+0 -0.0099 0.0483
+0 -0.010333 0.04805
+0 -0.01015 0.048233
+0 0.010433 0.04805
+0 0.01025 0.048233
0 0.010433 -0.04585
0 0.01025 -0.046033
0 -0.01015 -0.046033
--0 -0.010333 -0.04585
+0 -0.010333 -0.04585
numsurf 17
SURF 0x10
mat 0
@@ -8891,36 +8877,36 @@
texrep 1.000000 1.000000
crease 30.000001
numvert 32
--0 0.01 0.0483
--0 -0.0104 0.0478
--0 0.01 -0.0461
--0 -0.0104 -0.0456
--0 -0.0099 -0.0461
--0 -0.0099 0.0483
+0 0.01 0.0483
+0 -0.0104 0.0478
+0 0.01 -0.0461
+0 -0.0104 -0.0456
+0 -0.0099 -0.0461
+0 -0.0099 0.0483
0.0005 -0.0107 -0.0456
0.0005 -0.0099 -0.0464
0.0005 -0.0107 0.0478
0.0005 -0.0099 0.0486
--0 0.0105 -0.0456
--0 0.0105 0.0478
+0 0.0105 -0.0456
+0 0.0105 0.0478
0.0005 0.01 -0.0464
0.0005 0.0108 -0.0456
0.0005 0.0108 0.0478
0.0005 0.01 0.0486
0.0005 -0.0103 0.048493
--0 -0.01015 0.048233
+0 -0.01015 0.048233
0.0005 -0.010593 0.0482
--0 -0.010333 0.04805
+0 -0.010333 0.04805
0.0005 0.010693 0.0482
0.0005 0.0104 0.048493
--0 0.01025 0.048233
--0 0.010433 0.04805
--0 0.01025 -0.046033
--0 0.010433 -0.04585
+0 0.01025 0.048233
+0 0.010433 0.04805
+0 0.01025 -0.046033
+0 0.010433 -0.04585
0.0005 0.0104 -0.046293
0.0005 0.010693 -0.046
--0 -0.010333 -0.04585
--0 -0.01015 -0.046033
+0 -0.010333 -0.04585
+0 -0.01015 -0.046033
0.0005 -0.010593 -0.046
0.0005 -0.0103 -0.046293
numsurf 16
@@ -9044,29 +9030,29 @@
glass
crease 30.000001
numvert 20
-0 0.01 0.0478
-0 -0.0099 0.0478
--0 0.01 -0.0456
--0 -0.0099 -0.0456
-0 0.0105 0.0478
-0 0.0105 -0.0456
-0 0.01 -0.0461
--0 -0.0099 -0.0461
-0 -0.0104 0.0478
-0 -0.0104 -0.0456
-0 0.01 0.0483
-0 -0.0099 0.0483
--0 -0.010333 0.04805
-0 -0.01015 0.048233
-0 0.010433 0.04805
-0 0.01025 0.048233
-0 0.010433 -0.04585
-0 0.01025 -0.046033
-0 -0.01015 -0.046033
--0 -0.010333 -0.04585
+0.000304 0.01 0.0478
+0.000304 -0.0099 0.0478
+0.000304 0.01 -0.0456
+0.000304 -0.0099 -0.0456
+0.000304 0.0105 0.0478
+0.000304 0.0105 -0.0456
+0.000304 0.01 -0.0461
+0.000304 -0.0099 -0.0461
+0.000304 -0.0104 0.0478
+0.000304 -0.0104 -0.0456
+0.000304 0.01 0.0483
+0.000304 -0.0099 0.0483
+0.000304 -0.010333 0.04805
+0.000304 -0.01015 0.048233
+0.000304 0.010433 0.04805
+0.000304 0.01025 0.048233
+0.000304 0.010433 -0.04585
+0.000304 0.01025 -0.046033
+0.000304 -0.01015 -0.046033
+0.000304 -0.010333 -0.04585
numsurf 17
SURF 0x10
-mat 2
+mat 1
refs 4
0 0.005296621937 0.976076543331
1 0.005296621937 0.023923739791
@@ -9073,49 +9059,49 @@
3 0.994703292847 0.023923987523
2 0.994703292847 0.976077020168
SURF 0x10
-mat 2
+mat 1
refs 3
1 0.005296621937 0.023923739791
13 0.000709590851 0.011961993761
12 0.002648310969 0.003205782734
SURF 0x10
-mat 2
+mat 1
refs 3
0 0.005296621937 0.976076543331
14 0.002648310969 0.996795237064
15 0.000709590851 0.988038539886
SURF 0x10
-mat 2
+mat 1
refs 3
2 0.994703292847 0.976077020168
17 0.999290406704 0.988038539886
16 0.997351646423 0.996795237064
SURF 0x10
-mat 2
+mat 1
refs 3
3 0.994703292847 0.023923987523
19 0.997351646423 0.003205782734
18 0.999290406704 0.01196199...
[truncated message content] |
