Change XX colors, fix pulling hdg knob

This commit is contained in:
Joshua Davidson 2017-05-27 15:58:19 -04:00
parent d0edc52772
commit 50e13ff689
7 changed files with 125 additions and 98 deletions

View file

@ -332,6 +332,9 @@
<ap1>0</ap1> <ap1>0</ap1>
<ap2>0</ap2> <ap2>0</ap2>
</output> </output>
<custom>
<hdg-input>0</hdg-input>
</custom>
</it-autoflight> </it-autoflight>
<it-fbw n="0"> <it-fbw n="0">

View file

@ -386,24 +386,16 @@
<type>select</type> <type>select</type>
<object-name>lat.dash</object-name> <object-name>lat.dash</object-name>
<condition> <condition>
<or> <and>
<equals> <not-equals>
<property>/it-autoflight/output/lat</property> <property>/it-autoflight/output/lat</property>
<value>1</value> <value>0</value>
</equals> </not-equals>
<equals> <equals>
<property>/it-autoflight/output/lat</property> <property>/it-autoflight/custom/hdg-input</property>
<value>2</value> <value>0</value>
</equals> </equals>
<equals> </and>
<property>/it-autoflight/output/lat</property>
<value>4</value>
</equals>
<equals>
<property>/it-autoflight/output/lat</property>
<value>5</value>
</equals>
</or>
</condition> </condition>
</animation> </animation>
@ -537,13 +529,19 @@
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/it-autoflight/input/lat</property> <property>/it-autoflight/input/lat</property>
<value>0</value> <value>3</value>
</binding> </binding>
</action> </action>
<action> <action>
<button>3</button> <button>3</button>
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<condition>
<equals>
<property>/it-autoflight/input/lat</property>
<value>0</value>
</equals>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>/it-autoflight/input/hdg</property> <property>/it-autoflight/input/hdg</property>
<step>1</step> <step>1</step>
@ -556,6 +554,12 @@
<button>4</button> <button>4</button>
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<condition>
<equals>
<property>/it-autoflight/input/lat</property>
<value>0</value>
</equals>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>/it-autoflight/input/hdg</property> <property>/it-autoflight/input/hdg</property>
<step>-1</step> <step>-1</step>
@ -983,7 +987,6 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>hdg.ind</object-name> <object-name>hdg.ind</object-name>
<object-name>hdg-text</object-name>
<condition> <condition>
<equals> <equals>
<property>/it-autoflight/output/lat</property> <property>/it-autoflight/output/lat</property>
@ -992,6 +995,23 @@
</condition> </condition>
</animation> </animation>
<animation>
<type>select</type>
<object-name>hdg-text</object-name>
<condition>
<or>
<equals>
<property>/it-autoflight/output/lat</property>
<value>0</value>
</equals>
<equals>
<property>/it-autoflight/custom/hdg-input</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>hdg2.ind</object-name> <object-name>hdg2.ind</object-name>
@ -1403,7 +1423,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>hdg-sel</object-name> <object-name>hdg-sel</object-name>
<property>/it-autoflight/input/hdg</property> <property>/it-autoflight/input/hdg-sel</property>
<factor>11.25</factor> <factor>11.25</factor>
<axis> <axis>
<x1-m>-0.4608</x1-m> <x1-m>-0.4608</x1-m>

View file

@ -197,26 +197,26 @@
<type>material</type> <!-- Amber --> <type>material</type> <!-- Amber -->
<object-name>XX.1</object-name> <object-name>XX.1</object-name>
<object-name>XX.2</object-name> <object-name>XX.2</object-name>
<diffuse> <diffuse>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.3</green>
<blue>0</blue> <blue>0</blue>
</diffuse> </diffuse>
<ambient> <ambient>
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</ambient> </ambient>
<specular> <specular>
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</specular> </specular>
<emission> <emission>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.3</green>
<blue>0</blue> <blue>0</blue>
</emission> </emission>
</animation> </animation>
<animation> <animation>

View file

@ -249,26 +249,26 @@
<object-name>XX.2</object-name> <object-name>XX.2</object-name>
<object-name>XX.3</object-name> <object-name>XX.3</object-name>
<object-name>XX.4</object-name> <object-name>XX.4</object-name>
<diffuse> <diffuse>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.3</green>
<blue>0</blue> <blue>0</blue>
</diffuse> </diffuse>
<ambient> <ambient>
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</ambient> </ambient>
<specular> <specular>
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</specular> </specular>
<emission> <emission>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.3</green>
<blue>0</blue> <blue>0</blue>
</emission> </emission>
</animation> </animation>
<animation> <animation>

View file

@ -197,26 +197,26 @@
<type>material</type> <!-- Amber --> <type>material</type> <!-- Amber -->
<object-name>XX.1</object-name> <object-name>XX.1</object-name>
<object-name>XX.2</object-name> <object-name>XX.2</object-name>
<diffuse> <diffuse>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.3</green>
<blue>0</blue> <blue>0</blue>
</diffuse> </diffuse>
<ambient> <ambient>
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</ambient> </ambient>
<specular> <specular>
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</specular> </specular>
<emission> <emission>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.3</green>
<blue>0</blue> <blue>0</blue>
</emission> </emission>
</animation> </animation>
<animation> <animation>

View file

@ -249,26 +249,26 @@
<object-name>XX.2</object-name> <object-name>XX.2</object-name>
<object-name>XX.3</object-name> <object-name>XX.3</object-name>
<object-name>XX.4</object-name> <object-name>XX.4</object-name>
<diffuse> <diffuse>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.3</green>
<blue>0</blue> <blue>0</blue>
</diffuse> </diffuse>
<ambient> <ambient>
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</ambient> </ambient>
<specular> <specular>
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</specular> </specular>
<emission> <emission>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.3</green>
<blue>0</blue> <blue>0</blue>
</emission> </emission>
</animation> </animation>
<animation> <animation>

View file

@ -124,6 +124,10 @@ var triggerDoor = func(door, doorName, doorDesc) {
} }
} }
}; };
#######################
# Various Other Stuff #
#######################
setlistener("/sim/signals/fdm-initialized", func { setlistener("/sim/signals/fdm-initialized", func {
systems.elec_init(); systems.elec_init();