I discovered that the SenecaII uses some instruments that are shared
with other aircraft and not defined in the SenecaII file hierarchy.
These instruments seem to agree that the property controlling the
dimming of instrument lights is /sim/model/material/instruments/factor,
not /controls/lighting/instruments-norm.
This new version of my patch unifies all uses of the lighting properties
for consistency and compatibility with common instruments. Only the
following properties are used now:
<model>
<material>
<instruments>
<red type="double">1.0</red>
<green type="double">0.2</green>
<blue type="double">0.0</blue>
<factor type="double">0</factor> <!-- used by instruments common to
several aircraft -->
</instruments>
<overhead-lighting>
<red type="double">0.06</red>
<green type="double">0.003</green>
<blue type="double">0</blue>
<factor type="double">0</factor>
</overhead-lighting>
</material>
(This version replaces the earlier ones I posted; it is cumulative.)
--
Ludovic Brenta.
--- SenecaII/Instruments-3d/DeiceControl.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Instruments-3d/DeiceControl.xml 2014-06-19 23:33:34.530355244 +0200
@@ -36,10 +36,10 @@
<object-name>DeiceControl.Ampmeter.Scale</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>
+ <red-prop>/sim/model/material/instruments/red</red-prop>
+ <green-prop>/sim/model/material/instruments/green</green-prop>
+ <blue-prop>/sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Instruments-3d/FuelFlow.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Instruments-3d/FuelFlow.xml 2014-06-19 23:33:34.502355427 +0200
@@ -28,10 +28,10 @@
<type>material</type>
<object-name>FuelFlow</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>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Instruments-3d/ki266.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Instruments-3d/ki266.xml 2014-06-19 23:33:34.538355193 +0200
@@ -59,10 +59,10 @@
<type>material</type>
<object-name>ModeSwitch</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>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Instruments-3d/kr87.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Instruments-3d/kr87.xml 2014-06-19 23:33:34.542355166 +0200
@@ -48,10 +48,10 @@
<object-name>knobs.FLT</object-name>
<object-name>knobs.SET</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>
+ <red-prop>/sim/model/material/instruments/red</red-prop>
+ <green-prop>/sim/model/material/instruments/green</green-prop>
+ <blue-prop>/sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Instruments-3d/kra10a.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Instruments-3d/kra10a.xml 2014-06-19 23:33:34.538355193 +0200
@@ -28,10 +28,10 @@
<type>material</type>
<object-name>kra10.face</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>
+ <red-prop>/sim/model/material/instruments/red</red-prop>
+ <green-prop>/sim/model/material/instruments/green</green-prop>
+ <blue-prop>/sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Instruments-3d/ManifoldPressure.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Instruments-3d/ManifoldPressure.xml 2014-06-19 23:33:34.538355193 +0200
@@ -32,10 +32,10 @@
<type>material</type>
<object-name>ManifoldPressure</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>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Instruments-3d/SwitchPanel.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Instruments-3d/SwitchPanel.xml 2014-06-19 23:33:34.534355218 +0200
@@ -47,10 +47,10 @@
<object-name>Master</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>
+ <red-prop>sim/model/material/overhead-lighting/red</red-prop>
+ <green-prop>sim/model/material/overhead-lighting/green</green-prop>
+ <blue-prop>sim/model/material/overhead-lighting/blue</blue-prop>
+ <factor-prop>sim/model/material/overhead-lighting/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/Airspeed.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/Airspeed.xml 2014-06-19 23:33:34.786353576 +0200
@@ -39,10 +39,10 @@
<object-name>Airspeed.IAS</object-name>
<object-name>Airspeed.Needle</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>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/EGT.xml 2014-01-18 10:15:11.000000000 +0100
+++ SenecaII/Models/EGT.xml 2014-06-19 23:33:34.782353602 +0200
@@ -37,10 +37,10 @@
<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>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/FuelOilAmps.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/FuelOilAmps.xml 2014-06-19 23:33:34.666354359 +0200
@@ -29,10 +29,10 @@
<type>material</type>
<object-name>FuelOilAmps</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>
+ <red-prop>/sim/model/material/instruments/red</red-prop>
+ <green-prop>/sim/model/material/instruments/green</green-prop>
+ <blue-prop>/sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/gma340.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/gma340.xml 2014-06-19 23:33:34.658354410 +0200
@@ -41,14 +41,14 @@
<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>
+ <red-prop>/sim/model/material/instruments/red</red-prop>
+ <green-prop>/sim/model/material/instruments/green</green-prop>
+ <blue-prop>/sim/model/material/instruments/blue</blue-prop>
-->
<red>0.05</red>
<green>0.1.</green>
<blue>0.05</blue>
- <factor-prop>/controls/lighting/instruments-norm</factor-prop>
+ <factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/gps155.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/gps155.xml 2014-06-19 23:33:34.730353942 +0200
@@ -50,7 +50,7 @@
<red>0.05</red>
<green>0.1.</green>
<blue>0.05</blue>
- <factor-prop>/controls/lighting/instruments-norm</factor-prop>
+ <factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
-->
--- SenecaII/Models/gtx330.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/gtx330.xml 2014-06-19 23:33:34.658354410 +0200
@@ -50,7 +50,7 @@
<red>0.05</red>
<green>0.1.</green>
<blue>0.05</blue>
- <factor-prop>/controls/lighting/instruments-norm</factor-prop>
+ <factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
-->
--- SenecaII/Models/kcs55/ka51b.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/kcs55/ka51b.xml 2014-06-19 23:33:34.558355063 +0200
@@ -30,15 +30,14 @@
<animation>
<type>material</type>
- <property-base>sim/model/material/cockpit</property-base>
<object-name>face</object-name>
<object-name>auto</object-name>
<object-name>direction</object-name>
<emission>
- <red-prop>red</red-prop>
- <green-prop>green</green-prop>
- <blue-prop>blue</blue-prop>
- <factor-prop>factor</factor-prop>
+ <red-prop>sim/model/material/overhead-lighting/red</red-prop>
+ <green-prop>sim/model/material/overhead-lighting/green</green-prop>
+ <blue-prop>sim/model/material/overhead-lighting/blue</blue-prop>
+ <factor-prop>sim/model/material/overhead-lighting/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/kcs55/ki525a.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/kcs55/ki525a.xml 2014-06-19 23:33:34.558355063 +0200
@@ -46,14 +46,13 @@
<animation>
<type>material</type>
- <property-base>sim/model/material/cockpit</property-base>
<object-name>Chassis</object-name>
<object-name>Screw</object-name>
<emission>
- <red-prop>red</red-prop>
- <green-prop>green</green-prop>
- <blue-prop>blue</blue-prop>
- <factor-prop>factor</factor-prop>
+ <red-prop>sim/model/material/overhead-lighting/red</red-prop>
+ <green-prop>sim/model/material/overhead-lighting/green</green-prop>
+ <blue-prop>sim/model/material/overhead-lighting/blue</blue-prop>
+ <factor-prop>sim/model/material/overhead-lighting/factor</factor-prop>
</emission>
</animation>
@@ -77,10 +76,10 @@
<object-name>OBSSelector</object-name>
<object-name>HDGSelector</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>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/ki209a-1.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/ki209a-1.xml 2014-06-19 23:33:34.766353705 +0200
@@ -45,10 +45,10 @@
<object-name>Marker</object-name>
<object-name>OBSSelector</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>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/ki209a-2.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/ki209a-2.xml 2014-06-19 23:33:34.682354254 +0200
@@ -45,10 +45,10 @@
<object-name>Marker</object-name>
<object-name>OBSSelector</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>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/RPM.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/RPM.xml 2014-06-19 23:33:34.686354229 +0200
@@ -36,10 +36,10 @@
<object-name>Face</object-name>
<object-name>Needle</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>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Models/SenecaII.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/SenecaII.xml 2014-06-19 23:33:34.666354359 +0200
@@ -771,6 +771,16 @@
</action>
</animation>
<animation>
+ <type>material</type>
+ <object-name>CowlFlapsControl.L</object-name>
+ <emission>
+ <red-prop>sim/model/material/overhead-lighting/red</red-prop>
+ <green-prop>sim/model/material/overhead-lighting/green</green-prop>
+ <blue-prop>sim/model/material/overhead-lighting/blue</blue-prop>
+ <factor-prop>sim/model/material/overhead-lighting/factor</factor-prop>
+ </emission>
+ </animation>
+ <animation>
<type>rotate</type>
<object-name>CowlFlapsControl.L</object-name>
<property>controls/engines/engine[0]/cowl-flaps-norm</property>
@@ -786,6 +796,16 @@
</axis>
</animation>
<animation>
+ <type>material</type>
+ <object-name>CowlFlapsControl.R</object-name>
+ <emission>
+ <red-prop>sim/model/material/overhead-lighting/red</red-prop>
+ <green-prop>sim/model/material/overhead-lighting/green</green-prop>
+ <blue-prop>sim/model/material/overhead-lighting/blue</blue-prop>
+ <factor-prop>sim/model/material/overhead-lighting/factor</factor-prop>
+ </emission>
+ </animation>
+ <animation>
<type>rotate</type>
<object-name>CowlFlapsControl.R</object-name>
<property>controls/engines/engine[1]/cowl-flaps-norm</property>
@@ -813,45 +833,38 @@
<object-name>PanelLightsDimmer</object-name>
<object-name>RadioLightsDimmer</object-name>
<object-name>Overhead.CockpitLightSwitch</object-name>
-
+ <object-name>InstrumentCover</object-name>
+ <object-name>Chart1</object-name>
+ <object-name>Chart2</object-name>
+ <object-name>ThrottleControl.L</object-name>
+ <object-name>ThrottleControl.R</object-name>
+ <object-name>PropellerControl.L</object-name>
+ <object-name>PropellerControl.R</object-name>
+ <object-name>MixtureControl.L</object-name>
+ <object-name>MixtureControl.R</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>
+ <red-prop>sim/model/material/overhead-lighting/red</red-prop>
+ <green-prop>sim/model/material/overhead-lighting/green</green-prop>
+ <blue-prop>sim/model/material/overhead-lighting/blue</blue-prop>
+ <factor-prop>sim/model/material/overhead-lighting/factor</factor-prop>
</emission>
</animation>
<animation>
<type>material</type>
<object-name>Overhead.CockpitLight</object-name>
-
<emission>
<red>0.3</red>
<green>0</green>
<blue>0</blue>
- <factor-prop>/controls/lighting/panel-norm</factor-prop>
- </emission>
- </animation>
- <!--
- <animation>
- <type>material</type>
- <object-name>InstrumentCover</object-name>
- <object-name>Chart1</object-name>
- <object-name>Chart2</object-name>
-
- <emission>
- <red>0.1</red>
- <green>0</green>
- <blue>0</blue>
- <factor-prop>/controls/lighting/panel-norm</factor-prop>
+ <factor-prop>/sim/model/material/overhead-lighting/factor</factor-prop>
</emission>
</animation>
- -->
+
<animation>
<type>rotate</type>
<object-name>PanelLightsDimmer</object-name>
- <property>controls/lighting/instruments-norm</property>
+ <property>sim/model/material/instruments/factor</property>
<factor>-112.5</factor>
<axis>
<x>0.0</x>
@@ -930,7 +943,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-toggle</command>
- <property>controls/lighting/instruments-norm</property>
+ <property>sim/model/material/instruments/factor</property>
</binding>
</action>
<action>
@@ -938,7 +951,7 @@
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
- <property>controls/lighting/instruments-norm</property>
+ <property>sim/model/material/instruments/factor</property>
<step>-.01</step>
<min>0</min>
<max>1</max>
@@ -950,7 +963,7 @@
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
- <property>controls/lighting/instruments-norm</property>
+ <property>sim/model/material/instruments/factor</property>
<step>0.01</step>
<min>0</min>
<max>1</max>
@@ -966,6 +979,16 @@
<object-name>FlapControl</object-name>
</animation>
<animation>
+ <type>material</type>
+ <object-name>FlapControl</object-name>
+ <emission>
+ <red-prop>sim/model/material/overhead-lighting/red</red-prop>
+ <green-prop>sim/model/material/overhead-lighting/green</green-prop>
+ <blue-prop>sim/model/material/overhead-lighting/blue</blue-prop>
+ <factor-prop>sim/model/material/overhead-lighting/factor</factor-prop>
+ </emission>
+ </animation>
+ <animation>
<type>rotate</type>
<object-name>FlapControl</object-name>
<property>controls/flight/flaps</property>
@@ -2125,10 +2148,10 @@
<type>material</type>
<object-name>Compass.Ring</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>
+ <red-prop>/sim/model/material/instruments/red</red-prop>
+ <green-prop>/sim/model/material/instruments/green</green-prop>
+ <blue-prop>/sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
@@ -2239,7 +2262,7 @@
<animation>
<type>rotate</type>
<object-name>Overhead.CockpitLightSwitch</object-name>
- <property>controls/lighting/panel-norm</property>
+ <property>sim/model/material/overhead-lighting/factor</property>
<factor>-40.0</factor>
<axis>
<x1-m>-1.20476</x1-m>
@@ -2250,6 +2273,19 @@
<z2-m>1.94148</z2-m>
</axis>
</animation>
+ <animation>
+ <type>pick</type>
+ <object-name>Overhead.CockpitLightSwitch</object-name>
+ <visible>true</visible>
+ <action>
+ <button>0</button>
+ <repeatable>false</repeatable>
+ <binding>
+ <command>property-toggle</command>
+ <property>sim/model/material/overhead-lighting/factor</property>
+ </binding>
+ </action>
+ </animation>
<animation>
<type>noshadow</type>
--- SenecaII/Models/Vacuum.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Models/Vacuum.xml 2014-06-19 23:33:34.786353576 +0200
@@ -31,10 +31,10 @@
<type>material</type>
<object-name>Face</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>
+ <red-prop>/sim/model/material/instruments/red</red-prop>
+ <green-prop>/sim/model/material/instruments/green</green-prop>
+ <blue-prop>/sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Nasal/SenecaII.nas 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Nasal/SenecaII.nas 2014-06-19 23:33:34.822353342 +0200
@@ -124,18 +124,6 @@
setlistener( "/controls/engines/engine[1]/magneto[0]", magnetoswitchlistener, 1, 0 );
setlistener( "/controls/engines/engine[1]/magneto[1]", magnetoswitchlistener, 1, 0 );
-########################################
-# Sync the dimmer controls with the according properties
-########################################
-
-var instrumentsFactorNode = props.globals.initNode( "/sim/model/material/instruments/factor", 1.0 );
-var dimmerlistener = func(n) {
- if( n != nil )
- instrumentsFactorNode.setValue( n.getValue() );
-}
-
-setlistener( "/controls/lighting/instruments-norm", dimmerlistener, 1, 0 );
-
####################################################################
var SetFuelSelector = func( side ) {
--- SenecaII/SenecaII-base.xml 2014-01-18 10:15:11.000000000 +0100
+++ SenecaII/SenecaII-base.xml 2014-06-19 23:33:34.850353159 +0200
@@ -34,20 +34,19 @@
<aircraft-class type="string">ga</aircraft-class>
<aircraft-operator></aircraft-operator>
<model>
- <instrument-lighting>
- <emission>
+ <material>
+ <instruments>
<red type="double">1.0</red>
<green type="double">0.2</green>
<blue type="double">0.0</blue>
- </emission>
- </instrument-lighting>
- <material>
- <cockpit>
- <red type="double">0.5</red>
- <green type="double">0.1</green>
- <blue type="double">0.1</blue>
+ <factor type="double">0</factor> <!-- used by instruments common to several aircraft -->
+ </instruments>
+ <overhead-lighting>
+ <red type="double">0.06</red>
+ <green type="double">0.003</green>
+ <blue type="double">0</blue>
<factor type="double">0</factor>
- </cockpit>
+ </overhead-lighting>
</material>
<icing>
<iceable>
@@ -255,6 +254,13 @@
<time>1.0</time>
</binding>
</item>
+ <item>
+ <label>Overhead light on/off</label>
+ <binding>
+ <command>property-toggle</command>
+ <property>sim/model/material/overhead-lighting/factor</property>
+ </binding>
+ </item>
<!--item>
<label>Yaw Damper (on/off) default off</label>
<binding>
@@ -468,8 +474,6 @@
<taxi-light type="bool">false</taxi-light>
<nav-lights type="bool">false</nav-lights>
<radio-norm type="double">0.0</radio-norm>
- <panel-norm type="double">0.0</panel-norm>
- <instruments-norm type="double">0.0</instruments-norm>
</lighting>
<deice>
<surface-deice type="bool">false</surface-deice>
@@ -532,6 +536,22 @@
</limits>
<input>
<keyboard>
+ <key n="12">
+ <name>Ctrl+L</name>
+ <desc>Toggle overhead cockpit lights</desc>
+ <binding>
+ <command>property-toggle</command>
+ <property>sim/model/material/overhead-lighting/factor</property>
+ </binding>
+ </key>
+ <key n="99">
+ <name>c</name>
+ <desc>Show/hide Aircraft</desc>
+ <binding>
+ <command>property-toggle</command>
+ <property>sim/model/hide-model</property>
+ </binding>
+ </key>
<key n="267">
<name>F11</name>
<desc>Pop up autopilot dialog</desc>
--- SenecaII/Systems/AltimaticIIIc.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Systems/AltimaticIIIc.xml 2014-06-19 23:33:34.806353445 +0200
@@ -18,7 +18,6 @@
-->
<PropertyList>
<params>
- <light-factor>sim/model/material/instruments/factor</light-factor>
<controls>
<roll>
<on>autopilot/CENTURYIII/controls/roll/button-on</on>
@@ -67,12 +66,11 @@
<animation>
<type>material</type>
<object-name>Altimatic.Face</object-name>
- <object-name>Altimatic.DeltaPitchNeedle</object-name>
<emission>
- <red>0.45</red>
- <green>0.09</green>
- <blue>0.00001</blue>
- <factor-prop alias="../../../params/light-factor"/>
+ <red-prop>sim/model/material/overhead-lighting/red</red-prop>
+ <green-prop>sim/model/material/overhead-lighting/green</green-prop>
+ <blue-prop>sim/model/material/overhead-lighting/blue</blue-prop>
+ <factor-prop>sim/model/material/overhead-lighting/factor</factor-prop>
</emission>
</animation>
@@ -83,11 +81,12 @@
<object-name>Altimatic.PitchButton</object-name>
<object-name>Altimatic.RollButton</object-name>
<object-name>Altimatic.PitchWheel</object-name>
+ <object-name>Altimatic.DeltaPitchNeedle</object-name>
<emission>
- <red>0.2</red>
- <green>0.04</green>
- <blue>0.00002</blue>
- <factor-prop alias="../../../params/light-factor"/>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Systems/AutopilotMode.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Systems/AutopilotMode.xml 2014-06-19 23:33:34.810353420 +0200
@@ -28,10 +28,10 @@
<type>material</type>
<object-name>AutopilotMode.Face</object-name>
<emission>
- <red>0.45</red>
- <green>0.09</green>
- <blue>0.00001</blue>
- <factor-prop>/sim/model/material/instruments/factor</factor-prop>
+ <red-prop>sim/model/material/overhead-lighting/red</red-prop>
+ <green-prop>sim/model/material/overhead-lighting/green</green-prop>
+ <blue-prop>sim/model/material/overhead-lighting/blue</blue-prop>
+ <factor-prop>sim/model/material/overhead-lighting/factor</factor-prop>
</emission>
</animation>
@@ -39,10 +39,10 @@
<type>material</type>
<object-name>AutopilotMode.Knob</object-name>
<emission>
- <red>0.2</red>
- <green>0.04</green>
- <blue>0.00002</blue>
- <factor-prop>/sim/model/material/instruments/factor</factor-prop>
+ <red-prop>sim/model/material/instruments/red</red-prop>
+ <green-prop>sim/model/material/instruments/green</green-prop>
+ <blue-prop>sim/model/material/instruments/blue</blue-prop>
+ <factor-prop>sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
--- SenecaII/Systems/flight-recorder.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Systems/flight-recorder.xml 2014-06-19 23:33:34.810353420 +0200
@@ -118,8 +118,8 @@
<signal><type>bool</type><property type="string">/controls/gear/gear-emergency-extend</property></signal>
<signal><type>bool</type><property type="string">/controls/gear/gear-emergency-extend-unlock</property></signal>
- <signal><type>float</type><property type="string">/controls/lighting/instruments-norm</property></signal>
- <signal><type>float</type><property type="string">/controls/lighting/panel-norm</property></signal>
+ <signal><type>float</type><property type="string">/sim/model/material/instruments/factor</property></signal>
+ <signal><type>float</type><property type="string">/sim/model/material/overhead-lighting/factor</property></signal>
<signal><type>float</type><property type="string">/controls/lighting/radio-norm</property></signal>
</signals>
--- SenecaII/Tutorials/___ColdStart.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Tutorials/___ColdStart.xml 2014-06-19 23:33:34.834353263 +0200
@@ -95,7 +95,7 @@
<value>0</value>
</set>
<set>
- <property>controls/lighting/panel-norm</property>
+ <property>sim/model/material/overhead-lighting/factor</property>
<value>0</value>
</set>
<set>
--- SenecaII/Tutorials/___HotStart.xml 2012-08-02 10:43:27.000000000 +0200
+++ SenecaII/Tutorials/___HotStart.xml 2014-06-19 23:33:34.830353288 +0200
@@ -95,7 +95,7 @@
<value>0</value>
</set>
<set>
- <property>controls/lighting/panel-norm</property>
+ <property>sim/model/material/overhead-lighting/factor</property>
<value>0</value>
</set>
<set>
@@ -161,7 +161,7 @@
<nasal>
<script>
if( props.globals.getNode( "/sim/time/sun-angle-rad" ).getValue() > 1.57 ) {
- props.globals.getNode( "/controls/lighting/instruments-norm" ).setValue( 1.0 );
+ props.globals.getNode( "/sim/model/material/instruments/factor" ).setValue( 1.0 );
}
</script>
</nasal>
