Sound: typos, add clock and airframe strain sounds.

parent b0b1facd
......@@ -724,6 +724,13 @@
<output>/engines/engine[3]/n2_</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/systems/airframe/sound/strain-vol</input>
<output>/instrumentation/jsbsim/systems/airframe/sound/strain-vol</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
......@@ -835,6 +842,63 @@
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/propulsion/engine[0]/starter-noise-vol</input>
<output>/instrumentation/jsbsim/propulsion/engine[0]/starter-noise-vol</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/propulsion/engine[0]/starter-noise-pitch</input>
<output>/instrumentation/jsbsim/propulsion/engine[0]/starter-noise-pitch</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/propulsion/engine[1]/starter-noise-vol</input>
<output>/instrumentation/jsbsim/propulsion/engine[1]/starter-noise-vol</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/propulsion/engine[1]/starter-noise-pitch</input>
<output>/instrumentation/jsbsim/propulsion/engine[1]/starter-noise-pitch</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/propulsion/engine[2]/starter-noise-vol</input>
<output>/instrumentation/jsbsim/propulsion/engine[2]/starter-noise-vol</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/propulsion/engine[2]/starter-noise-pitch</input>
<output>/instrumentation/jsbsim/propulsion/engine[2]/starter-noise-pitch</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/propulsion/engine[3]/starter-noise-vol</input>
<output>/instrumentation/jsbsim/propulsion/engine[3]/starter-noise-vol</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/propulsion/engine[3]/starter-noise-pitch</input>
<output>/instrumentation/jsbsim/propulsion/engine[3]/starter-noise-pitch</output>
</filter>
<!-- ALS secondary lights -->
<!-- FIXME Not working in replay. -->
......
......@@ -3,10 +3,16 @@
<!--
XXX The "y" coordinate for sound is negative for the right.
XXX Nobody ever cared to fix this since at least 2008.
-->
-->
<!-- TODO Real sounds are available from videos -->
<fx>
<!--
SIC Seprarate sounds for SP because:
SIC - JSBSim vs. engine "helper" vs. flightrecorder beefs.
SIC - cockpit windows
-->
<engine_mp>
<name>Turbine 1</name>
......@@ -19,7 +25,8 @@
</condition>
<pitch>
<property>engines/engine[0]/n1</property>
<factor>0.75</factor>
<factor>2.0</factor>
<offset>0.0</offset>
</pitch>
<volume>
<property>engines/engine[0]/n1</property>
......@@ -51,7 +58,7 @@
<property>/sim/current-view/internal</property>
</not>
</condition>
<pitch>2.0</pitch>
<pitch><offset>1.0</offset></pitch>
<volume>
<property>engines/engine[0]/n2</property>
</volume>
......@@ -84,7 +91,8 @@
</condition>
<pitch>
<property>engines/engine[1]/n1</property>
<factor>0.75</factor>
<factor>2.0</factor>
<offset>0.0</offset>
</pitch>
<volume>
<property>engines/engine[1]/n1</property>
......@@ -116,7 +124,7 @@
<property>/sim/current-view/internal</property>
</not>
</condition>
<pitch>2.0</pitch>
<pitch><offset>1.0</offset></pitch>
<volume>
<property>engines/engine[1]/n2</property>
</volume>
......@@ -149,7 +157,8 @@
</condition>
<pitch>
<property>engines/engine[2]/n1</property>
<factor>0.75</factor>
<factor>2.0</factor>
<offset>0.0</offset>
</pitch>
<volume>
<property>engines/engine[2]/n1</property>
......@@ -181,7 +190,7 @@
<property>/sim/current-view/internal</property>
</not>
</condition>
<pitch>2.0</pitch>
<pitch><offset>1.0</offset></pitch>
<volume>
<property>engines/engine[2]/n2</property>
</volume>
......@@ -214,7 +223,8 @@
</condition>
<pitch>
<property>engines/engine[3]/n1</property>
<factor>0.75</factor>
<factor>2.0</factor>
<offset>0.0</offset>
</pitch>
<volume>
<property>engines/engine[3]/n1</property>
......@@ -246,7 +256,7 @@
<property>/sim/current-view/internal</property>
</not>
</condition>
<pitch>2.0</pitch>
<pitch><offset>1.0</offset></pitch>
<volume>
<property>engines/engine[3]/n2</property>
</volume>
......
This diff is collapsed.
......@@ -98,12 +98,20 @@
<signal><property type="string">/engines/engine[0]/n1_</property><type>float</type></signal>
<signal><property type="string">/engines/engine[0]/n2_</property><type>float</type></signal>
<signal><property type="string">instrumentation/jsbsim/propulsion/engine[0]/starter-noise-vol</property><type>float</type></signal>
<signal><property type="string">instrumentation/jsbsim/propulsion/engine[0]/starter-noise-pitch</property><type>float</type></signal>
<signal><property type="string">/engines/engine[1]/n1_</property><type>float</type></signal>
<signal><property type="string">/engines/engine[1]/n2_</property><type>float</type></signal>
<signal><property type="string">instrumentation/jsbsim/propulsion/engine[1]/starter-noise-vol</property><type>float</type></signal>
<signal><property type="string">instrumentation/jsbsim/propulsion/engine[1]/starter-noise-pitch</property><type>float</type></signal>
<signal><property type="string">/engines/engine[2]/n1_</property><type>float</type></signal>
<signal><property type="string">/engines/engine[2]/n2_</property><type>float</type></signal>
<signal><property type="string">instrumentation/jsbsim/propulsion/engine[2]/starter-noise-vol</property><type>float</type></signal>
<signal><property type="string">instrumentation/jsbsim/propulsion/engine[2]/starter-noise-pitch</property><type>float</type></signal>
<signal><property type="string">/engines/engine[3]/n1_</property><type>float</type></signal>
<signal><property type="string">/engines/engine[3]/n2_</property><type>float</type></signal>
<signal><property type="string">instrumentation/jsbsim/propulsion/engine[3]/starter-noise-vol</property><type>float</type></signal>
<signal><property type="string">instrumentation/jsbsim/propulsion/engine[3]/starter-noise-pitch</property><type>float</type></signal>
<signal><property type="string">/sim/multiplay/generic/float[0]</property><type>float</type></signal>
<signal><property type="string">/sim/multiplay/generic/float[1]</property><type>float</type></signal>
......
......@@ -96,6 +96,10 @@
<type>float</type>
</signal>
<signal>
<property type="string">/instrumentation/jsbsim/systems/airframe/sound/strain-vol</property>
<type>float</type>
</signal>
<signal>
<property type="string">/instrumentation/jsbsim/systems/elec/sound/hum-400Hz-vol</property>
<type>float</type>
......
......@@ -3284,7 +3284,7 @@
</channel>
<channel name="Airframe damage" execrate="16">
<channel name="Airframe damage" execrate="6">
<switch name="systems/airframe/damage/systems">
<!-- TODO This must be per-system. -->
......@@ -3366,5 +3366,30 @@
</channel>
<channel name="Airframe sound" execrate="4">
<!-- FGBUG This is the job of <factor>, <offset>, <min>, <max> in Sound.xml, but they're broken... -->
<fcs_function name="systems/airframe/sound/strain-vol">
<function>
<sum>
<abs>
<sum>
<p>accelerations/Nz_damped</p>
<v>-1.0</v>
</sum>
</abs>
<v>-1.0</v>
</sum>
</function>
<clipto>
<min>0.0</min>
<max>3.0</max>
</clipto>
</fcs_function>
</channel>
</flight_control>
......@@ -435,6 +435,38 @@
</function>
</fcs_function>
<fcs_function name="&U;/starter-noise-vol">
<function>
<product>
<p>&U;/starter</p>
<table>
<independentVar lookup="row">&U;/n2-mechanical</independentVar>
<tableData>
0.0 0.0
1.0 1.0
20.0 0.0
</tableData>
</table>
</product>
</function>
</fcs_function>
<fcs_function name="&U;/starter-noise-pitch">
<function>
<product>
<p>&U;/starter</p>
<table>
<independentVar lookup="row">&U;/n2-mechanical</independentVar>
<tableData>
0.0 0.0
1.0 1.0
20.0 0.75
</tableData>
</table>
</product>
</function>
</fcs_function>
</channel>
......
......@@ -435,6 +435,38 @@
</function>
</fcs_function>
<fcs_function name="&U;/starter-noise-vol">
<function>
<product>
<p>&U;/starter</p>
<table>
<independentVar lookup="row">&U;/n2-mechanical</independentVar>
<tableData>
0.0 0.0
1.0 1.0
20.0 0.0
</tableData>
</table>
</product>
</function>
</fcs_function>
<fcs_function name="&U;/starter-noise-pitch">
<function>
<product>
<p>&U;/starter</p>
<table>
<independentVar lookup="row">&U;/n2-mechanical</independentVar>
<tableData>
0.0 0.0
1.0 1.0
20.0 0.75
</tableData>
</table>
</product>
</function>
</fcs_function>
</channel>
......
......@@ -435,6 +435,38 @@
</function>
</fcs_function>
<fcs_function name="&U;/starter-noise-vol">
<function>
<product>
<p>&U;/starter</p>
<table>
<independentVar lookup="row">&U;/n2-mechanical</independentVar>
<tableData>
0.0 0.0
1.0 1.0
20.0 0.0
</tableData>
</table>
</product>
</function>
</fcs_function>
<fcs_function name="&U;/starter-noise-pitch">
<function>
<product>
<p>&U;/starter</p>
<table>
<independentVar lookup="row">&U;/n2-mechanical</independentVar>
<tableData>
0.0 0.0
1.0 1.0
20.0 0.75
</tableData>
</table>
</product>
</function>
</fcs_function>
</channel>
......
......@@ -435,6 +435,38 @@
</function>
</fcs_function>
<fcs_function name="&U;/starter-noise-vol">
<function>
<product>
<p>&U;/starter</p>
<table>
<independentVar lookup="row">&U;/n2-mechanical</independentVar>
<tableData>
0.0 0.0
1.0 1.0
20.0 0.0
</tableData>
</table>
</product>
</function>
</fcs_function>
<fcs_function name="&U;/starter-noise-pitch">
<function>
<product>
<p>&U;/starter</p>
<table>
<independentVar lookup="row">&U;/n2-mechanical</independentVar>
<tableData>
0.0 0.0
1.0 1.0
20.0 0.75
</tableData>
</table>
</product>
</function>
</fcs_function>
</channel>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment