Menu
▾
▴
[Flightgear-commitlogs] FlightGear Base Package branch, master, updated. 7e2360f05f06d2528a0799c4df5a2372bfc9368f
|
From: Flightgear-commitlogs <ma...@hy...> - 2013-07-14 13:14:16
|
The branch, master has been updated
- Log -----------------------------------------------------------------
commit 7e2360f05f06d2528a0799c4df5a2372bfc9368f
Author: Anders Gidenstam
Date: Sun Jul 14 14:36:23 2013 +0200
Updated Short Empire:
- Switched to knob animations for the throttle box levers.
- Configured the default payload to Mark I MTOW.
- Updated the generic hydrodynamics module.
- Summary -------------------------------------------------------------
.../Short_Empire/Engines/prop_deHavilland5000.xml | 6 +-
Aircraft/Short_Empire/Models/Interior/interior.xml | 933 ++++++--------------
Aircraft/Short_Empire/Short_Empire-set.xml | 10 +-
.../Systems/Short_S23-hydrodynamics.xml | 3 +
Aircraft/Short_Empire/Systems/hydrodynamics.xml | 54 +-
Aircraft/Short_Empire/Systems/short-empire.nas | 2 +-
6 files changed, 320 insertions(+), 688 deletions(-)
- Diff ----------------------------------------------------------------
diff --git a/Aircraft/Short_Empire/Engines/prop_deHavilland5000.xml b/Aircraft/Short_Empire/Engines/prop_deHavilland5000.xml
index 69300c9..8b046d6 100644
--- a/Aircraft/Short_Empire/Engines/prop_deHavilland5000.xml
+++ b/Aircraft/Short_Empire/Engines/prop_deHavilland5000.xml
@@ -2,7 +2,7 @@
<!--
Short Empire flying boat flight model for JSBSim.
- Copyright (C) 2009 - 2012 Anders Gidenstam (anders(at)gidenstam.org)
+ Copyright (C) 2009 - 2013 Anders Gidenstam (anders(at)gidenstam.org)
This file is licensed under the GPL license version 2 or later.
-->
<propeller name="deHavilland5000">
@@ -52,8 +52,8 @@
<diameter unit="IN">153.0 </diameter>
<numblades> 3 </numblades>
<gearratio>2.0 </gearratio>
- <minpitch> 0.0 </minpitch>
- <maxpitch> 1.0 </maxpitch>
+ <minpitch> 20.0 </minpitch>
+ <maxpitch> 28.0 </maxpitch>
<ct_factor> 1.0 </ct_factor>
<cp_factor> 1.0 </cp_factor>
diff --git a/Aircraft/Short_Empire/Models/Interior/interior.xml b/Aircraft/Short_Empire/Models/Interior/interior.xml
index 83200fa..e8059da 100644
--- a/Aircraft/Short_Empire/Models/Interior/interior.xml
+++ b/Aircraft/Short_Empire/Models/Interior/interior.xml
@@ -2,7 +2,7 @@
<!--
Short S.23 Empire flying boat for FlightGear.
- Copyright (C) 2008 - 2012 Anders Gidenstam (anders(at)gidenstam.org)
+ Copyright (C) 2008 - 2013 Anders Gidenstam (anders(at)gidenstam.org)
This file is licensed under the GPL license version 2 or later.
-->
<PropertyList>
@@ -314,185 +314,11 @@
</axis>
</animation>
- <!-- Animations for the throttle levers. -->
- <animation>
- <type>pick</type>
- <object-name>throttle_handle.1</object-name>
- <object-name>throttle_arm.1</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/throttle</property>
- <step type="double">0.1</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/throttle</property>
- <step type="double">-0.1</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/throttle</property>
- <step type="double">0.01</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/throttle</property>
- <step type="double">-0.01</step>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>pick</type>
- <object-name>throttle_handle.2</object-name>
- <object-name>throttle_arm.2</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/throttle</property>
- <step type="double">0.1</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/throttle</property>
- <step type="double">-0.1</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/throttle</property>
- <step type="double">0.01</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/throttle</property>
- <step type="double">-0.01</step>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>pick</type>
- <object-name>throttle_handle.3</object-name>
- <object-name>throttle_arm.3</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/throttle</property>
- <step type="double">0.1</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/throttle</property>
- <step type="double">-0.1</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/throttle</property>
- <step type="double">0.01</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/throttle</property>
- <step type="double">-0.01</step>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>pick</type>
- <object-name>throttle_handle.4</object-name>
- <object-name>throttle_arm.4</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[3]/throttle</property>
- <step type="double">0.1</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[3]/throttle</property>
- <step type="double">-0.1</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[3]/throttle</property>
- <step type="double">0.01</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[3]/throttle</property>
- <step type="double">-0.01</step>
- </binding>
- </action>
- </animation>
+ <!-- Throttle box =========================================================-->
+ <!-- Animations for the throttle levers. -->
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>throttle_handle.1</object-name>
<object-name>throttle_arm.1</object-name>
<property>controls/engines/engine[0]/throttle</property>
@@ -508,9 +334,21 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
+ <action>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
+ <binding>
+ <command>property-adjust</command>
+ <property>controls/engines/engine[0]/throttle</property>
+ <factor type="double">0.02</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
+ </binding>
+ </action>
+ <drag-direction>vertical</drag-direction>
</animation>
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>throttle_handle.2</object-name>
<object-name>throttle_arm.2</object-name>
<property>controls/engines/engine[1]/throttle</property>
@@ -526,9 +364,21 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
+ <action>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
+ <binding>
+ <command>property-adjust</command>
+ <property>controls/engines/engine[1]/throttle</property>
+ <factor type="double">0.02</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
+ </binding>
+ </action>
+ <drag-direction>vertical</drag-direction>
</animation>
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>throttle_handle.3</object-name>
<object-name>throttle_arm.3</object-name>
<property>controls/engines/engine[2]/throttle</property>
@@ -544,9 +394,21 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
+ <action>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
+ <binding>
+ <command>property-adjust</command>
+ <property>controls/engines/engine[2]/throttle</property>
+ <factor type="double">0.02</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
+ </binding>
+ </action>
+ <drag-direction>vertical</drag-direction>
</animation>
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>throttle_handle.4</object-name>
<object-name>throttle_arm.4</object-name>
<property>controls/engines/engine[3]/throttle</property>
@@ -562,187 +424,23 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
- </animation>
-
- <!-- Animations for the mixture levers. -->
- <animation>
- <type>pick</type>
- <object-name>mixture_handle.1</object-name>
- <object-name>mixture_arm.1</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/mixture</property>
- <step type="double">-0.1</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/mixture</property>
- <step type="double">0.1</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/mixture</property>
- <step type="double">-0.01</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/mixture</property>
- <step type="double">0.01</step>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>pick</type>
- <object-name>mixture_handle.2</object-name>
- <object-name>mixture_arm.2</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/mixture</property>
- <step type="double">-0.1</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/mixture</property>
- <step type="double">0.1</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/mixture</property>
- <step type="double">-0.01</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/mixture</property>
- <step type="double">0.01</step>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>pick</type>
- <object-name>mixture_handle.3</object-name>
- <object-name>mixture_arm.3</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/mixture</property>
- <step type="double">-0.1</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/mixture</property>
- <step type="double">0.1</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/mixture</property>
- <step type="double">-0.01</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/mixture</property>
- <step type="double">0.01</step>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>pick</type>
- <object-name>mixture_handle.4</object-name>
- <object-name>mixture_arm.4</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[3]/mixture</property>
- <step type="double">-0.1</step>
- </binding>
- </action>
<action>
- <button>1</button>
<repeatable>true</repeatable>
<interval-sec>0.2</interval-sec>
<binding>
<command>property-adjust</command>
- <property>/controls/engines/engine[3]/mixture</property>
- <step type="double">0.1</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[3]/mixture</property>
- <step type="double">-0.01</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[3]/mixture</property>
- <step type="double">0.01</step>
+ <property>controls/engines/engine[3]/throttle</property>
+ <factor type="double">0.02</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
</binding>
</action>
+ <drag-direction>vertical</drag-direction>
</animation>
+ <!-- Animations for the mixture levers. -->
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>mixture_handle.1</object-name>
<object-name>mixture_arm.1</object-name>
<property>controls/engines/engine[0]/mixture</property>
@@ -758,9 +456,21 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
+ <action>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
+ <binding>
+ <command>property-adjust</command>
+ <property>controls/engines/engine[0]/mixture</property>
+ <factor type="double">-0.02</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
+ </binding>
+ </action>
+ <drag-direction>vertical</drag-direction>
</animation>
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>mixture_handle.2</object-name>
<object-name>mixture_arm.2</object-name>
<property>controls/engines/engine[1]/mixture</property>
@@ -774,228 +484,88 @@
<axis>
<x> 0.0 </x>
<y> 1.0 </y>
- <z> 0.0 </z>
- </axis>
- </animation>
- <animation>
- <type>rotate</type>
- <object-name>mixture_handle.3</object-name>
- <object-name>mixture_arm.3</object-name>
- <property>controls/engines/engine[2]/mixture</property>
- <factor>-70.0</factor>
- <offset-deg>-5.0</offset-deg>
- <center>
- <x-m> -1.98 </x-m>
- <y-m> 0.00 </y-m>
- <z-m> 1.34 </z-m>
- </center>
- <axis>
- <x> 0.0 </x>
- <y> 1.0 </y>
- <z> 0.0 </z>
- </axis>
- </animation>
- <animation>
- <type>rotate</type>
- <object-name>mixture_handle.4</object-name>
- <object-name>mixture_arm.4</object-name>
- <property>controls/engines/engine[3]/mixture</property>
- <factor>-70.0</factor>
- <offset-deg>-5.0</offset-deg>
- <center>
- <x-m> -1.98 </x-m>
- <y-m> 0.00 </y-m>
- <z-m> 1.34 </z-m>
- </center>
- <axis>
- <x> 0.0 </x>
- <y> 1.0 </y>
- <z> 0.0 </z>
- </axis>
- </animation>
-
- <!-- Animations for the propeller pitch levers. -->
- <animation>
- <type>pick</type>
- <object-name>propeller_handle.1</object-name>
- <object-name>propeller_arm.1</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/propeller-pitch</property>
- <step type="double">-1.0</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/propeller-pitch</property>
- <step type="double">1.0</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/propeller-pitch</property>
- <step type="double">-0.5</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[0]/propeller-pitch</property>
- <step type="double">0.5</step>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>pick</type>
- <object-name>propeller_handle.2</object-name>
- <object-name>propeller_arm.2</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/propeller-pitch</property>
- <step type="double">-1.0</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/propeller-pitch</property>
- <step type="double">1.0</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/propeller-pitch</property>
- <step type="double">-0.5</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[1]/propeller-pitch</property>
- <step type="double">0.5</step>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>pick</type>
- <object-name>propeller_handle.3</object-name>
- <object-name>propeller_arm.3</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/propeller-pitch</property>
- <step type="double">-1.0</step>
- </binding>
- </action>
- <action>
- <button>1</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/propeller-pitch</property>
- <step type="double">1.0</step>
- </binding>
- </action>
- <action>
- <button>3</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/propeller-pitch</property>
- <step type="double">-0.5</step>
- </binding>
- </action>
- <action>
- <button>4</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[2]/propeller-pitch</property>
- <step type="double">0.5</step>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>pick</type>
- <object-name>propeller_handle.4</object-name>
- <object-name>propeller_arm.4</object-name>
- <action>
- <button>0</button>
- <repeatable>true</repeatable>
- <interval-sec>0.2</interval-sec>
- <binding>
- <command>property-adjust</command>
- <property>/controls/engines/engine[3]/propeller-pitch</property>
- <step type="double">-1.0</step>
- </binding>
- </action>
+ <z> 0.0 </z>
+ </axis>
<action>
- <button>1</button>
<repeatable>true</repeatable>
<interval-sec>0.2</interval-sec>
<binding>
<command>property-adjust</command>
- <property>/controls/engines/engine[3]/propeller-pitch</property>
- <step type="double">1.0</step>
+ <property>controls/engines/engine[1]/mixture</property>
+ <factor type="double">-0.02</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
</binding>
</action>
+ <drag-direction>vertical</drag-direction>
+ </animation>
+ <animation>
+ <type>knob</type>
+ <object-name>mixture_handle.3</object-name>
+ <object-name>mixture_arm.3</object-name>
+ <property>controls/engines/engine[2]/mixture</property>
+ <factor>-70.0</factor>
+ <offset-deg>-5.0</offset-deg>
+ <center>
+ <x-m> -1.98 </x-m>
+ <y-m> 0.00 </y-m>
+ <z-m> 1.34 </z-m>
+ </center>
+ <axis>
+ <x> 0.0 </x>
+ <y> 1.0 </y>
+ <z> 0.0 </z>
+ </axis>
<action>
- <button>3</button>
- <repeatable>false</repeatable>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
<binding>
<command>property-adjust</command>
- <property>/controls/engines/engine[3]/propeller-pitch</property>
- <step type="double">-0.5</step>
+ <property>controls/engines/engine[2]/mixture</property>
+ <factor type="double">-0.02</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
</binding>
</action>
+ <drag-direction>vertical</drag-direction>
+ </animation>
+ <animation>
+ <type>knob</type>
+ <object-name>mixture_handle.4</object-name>
+ <object-name>mixture_arm.4</object-name>
+ <property>controls/engines/engine[3]/mixture</property>
+ <factor>-70.0</factor>
+ <offset-deg>-5.0</offset-deg>
+ <center>
+ <x-m> -1.98 </x-m>
+ <y-m> 0.00 </y-m>
+ <z-m> 1.34 </z-m>
+ </center>
+ <axis>
+ <x> 0.0 </x>
+ <y> 1.0 </y>
+ <z> 0.0 </z>
+ </axis>
<action>
- <button>4</button>
- <repeatable>false</repeatable>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
<binding>
<command>property-adjust</command>
- <property>/controls/engines/engine[3]/propeller-pitch</property>
- <step type="double">0.5</step>
+ <property>controls/engines/engine[3]/mixture</property>
+ <factor type="double">-0.02</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
</binding>
</action>
+ <drag-direction>vertical</drag-direction>
</animation>
+ <!-- Animations for the propeller pitch levers. -->
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>propeller_handle.1</object-name>
<object-name>propeller_arm.1</object-name>
- <property>fdm/jsbsim/fcs/advance-pos-norm[0]</property>
+ <property>controls/engines/engine[0]/propeller-pitch</property>
<factor>-30.0</factor>
<offset-deg>30.0</offset-deg>
<center>
@@ -1008,12 +578,24 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
+ <action>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
+ <binding>
+ <command>property-adjust</command>
+ <property>controls/engines/engine[0]/propeller-pitch</property>
+ <factor type="double">-1.0</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
+ </binding>
+ </action>
+ <drag-direction>vertical</drag-direction>
</animation>
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>propeller_handle.2</object-name>
<object-name>propeller_arm.2</object-name>
- <property>fdm/jsbsim/fcs/advance-pos-norm[1]</property>
+ <property>controls/engines/engine[1]/propeller-pitch</property>
<factor>-30.0</factor>
<offset-deg>30.0</offset-deg>
<center>
@@ -1026,12 +608,24 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
+ <action>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
+ <binding>
+ <command>property-adjust</command>
+ <property>controls/engines/engine[1]/propeller-pitch</property>
+ <factor type="double">-1.0</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
+ </binding>
+ </action>
+ <drag-direction>vertical</drag-direction>
</animation>
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>propeller_handle.3</object-name>
<object-name>propeller_arm.3</object-name>
- <property>fdm/jsbsim/fcs/advance-pos-norm[2]</property>
+ <property>controls/engines/engine[2]/propeller-pitch</property>
<factor>-30.0</factor>
<offset-deg>30.0</offset-deg>
<center>
@@ -1044,12 +638,24 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
+ <action>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
+ <binding>
+ <command>property-adjust</command>
+ <property>controls/engines/engine[2]/propeller-pitch</property>
+ <factor type="double">-1.0</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
+ </binding>
+ </action>
+ <drag-direction>vertical</drag-direction>
</animation>
<animation>
- <type>rotate</type>
+ <type>knob</type>
<object-name>propeller_handle.4</object-name>
<object-name>propeller_arm.4</object-name>
- <property>fdm/jsbsim/fcs/advance-pos-norm[3]</property>
+ <property>controls/engines/engine[3]/propeller-pitch</property>
<factor>-30.0</factor>
<offset-deg>30.0</offset-deg>
<center>
@@ -1062,40 +668,23 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
- </animation>
-
- <!-- Animations for the cut-off levers. -->
- <animation>
- <type>pick</type>
- <object-name>cutoff_lever_L</object-name>
- <action>
- <button>0</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-cycle</command>
- <property>controls/engines/inner-cutoff</property>
- <value type="double">0.0</value>
- <value type="double">1.0</value>
- </binding>
- </action>
- </animation>
- <animation>
- <type>pick</type>
- <object-name>cutoff_lever_R</object-name>
<action>
- <button>0</button>
- <repeatable>false</repeatable>
+ <repeatable>true</repeatable>
+ <interval-sec>0.2</interval-sec>
<binding>
- <command>property-cycle</command>
- <property>controls/engines/outer-cutoff</property>
- <value type="double">0.0</value>
- <value type="double">1.0</value>
+ <command>property-adjust</command>
+ <property>controls/engines/engine[3]/propeller-pitch</property>
+ <factor type="double">-1.0</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
</binding>
</action>
+ <drag-direction>vertical</drag-direction>
</animation>
- <animation>
- <type>rotate</type>
+ <!-- Animations for the cut-off levers. -->
+ <animation>
+ <type>knob</type>
<object-name>cutoff_lever_L</object-name>
<property>controls/engines/inner-cutoff</property>
<factor>90.0</factor>
@@ -1110,9 +699,20 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
+ <action>
+ <repeatable>false</repeatable>
+ <binding>
+ <command>property-adjust</command>
+ <property>controls/engines/inner-cutoff</property>
+ <factor type="double">1.0</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
+ </binding>
+ </action>
+ <drag-direction>vertical</drag-direction>
</animation>
- <animation>
- <type>rotate</type>
+ <animation>
+ <type>knob</type>
<object-name>cutoff_lever_R</object-name>
<property>controls/engines/outer-cutoff</property>
<factor>90.0</factor>
@@ -1127,27 +727,24 @@
<y> 1.0 </y>
<z> 0.0 </z>
</axis>
- </animation>
-
- <!-- Animation for the autopilot lever. -->
- <animation>
- <type>pick</type>
- <object-name>AP_engage_lever</object-name>
<action>
- <button>0</button>
<repeatable>false</repeatable>
<binding>
- <command>property-cycle</command>
- <property>instrumentation/sperry-autopilot[0]/settings/engaged-norm</property>
- <value type="double">0.0</value>
- <value type="double">1.0</value>
+ <command>property-adjust</command>
+ <property>controls/engines/outer-cutoff</property>
+ <factor type="double">1.0</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
</binding>
</action>
+ <drag-direction>vertical</drag-direction>
</animation>
- <animation>
- <type>rotate</type>
+
+ <!-- Animation for the autopilot lever. -->
+ <animation>
+ <type>knob</type>
<object-name>AP_engage_lever</object-name>
- <property>instrumentation/sperry-autopilot[0]/settings/engaged-norm</property>
+ <property>instrumentation/sperry-autopilot[0]/settings/engaged-norm</property>
<factor>120.0</factor>
<offset-deg>-60.0</offset-deg>
<axis>
@@ -1158,10 +755,79 @@
<y2-m> 0.000 </y2-m>
<z2-m> 1.103 </z2-m>
</axis>
+ <action>
+ <repeatable>false</repeatable>
+ <binding>
+ <command>property-adjust</command>
+ <property>instrumentation/sperry-autopilot[0]/settings/engaged-norm</property>
+ <factor type="double">1.0</factor>
+ <min type="double">0.0</min>
+ <max type="double">1.0</max>
+ </binding>
+ </action>
+ </animation>
+
+ <!-- Fuel system cocks ====================================================-->
+
+ <!-- Select animations for fuel system dependent items. -->
+ <animation>
+ <type>select</type>
+ <object-name>fuel_selector_box_mk1</object-name>
+ <condition>
+ <less-than>
+ <property>sim/model/mark</property>
+ <value type="int">2</value>
+ </less-than>
+ </condition>
+ </animation>
+ <animation>
+ <type>select</type>
+ <object-name>fuel_selector_box_mk2</object-name>
+ <object-name>fuel_lever_knob_PO</object-name>
+ <object-name>fuel_lever_knob_SO</object-name>
+ <object-name>fuel_lever_arm_PO</object-name>
+ <object-name>fuel_lever_arm_SO</object-name>
+ <condition>
+ <greater-than>
+ <property>sim/model/mark</property>
+ <value type="int">1</value>
+ </greater-than>
+ </condition>
+ </animation>
+ <animation>
+ <type>select</type>
+ <object-name>fuel_lever_knob_B</object-name>
+ <object-name>fuel_lever_arm_B</object-name>
+ <condition>
+ <less-than>
+ <property>sim/model/mark</property>
+ <value type="int">3</value>
+ </less-than>
+ </condition>
+ </animation>
+ <animation>
+ <type>select</type>
+ <object-name>fuel_selector_box_mk3</object-name>
+ <object-name>fuel_lever_knob_PI</object-name>
+ <object-name>fuel_lever_knob_PF</object-name>
+ <object-name>fuel_lever_knob_SI</object-name>
+ <object-name>fuel_lever_knob_SF</object-name>
+ <object-name>fuel_lever_arm_PI</object-name>
+ <object-name>fuel_lever_arm_PF</object-name>
+ <object-name>fuel_lever_arm_SI</object-name>
+ <object-name>fuel_lever_arm_SF</object-name>
+ <object-name>fuel_lever_knob_B2</object-name>
+ <object-name>fuel_lever_arm_B2</object-name>
+ <condition>
+ <greater-than>
+ <property>sim/model/mark</property>
+ <value type="int">2</value>
+ </greater-than>
+ </condition>
</animation>
<!-- Animations for the fuel cock levers present in all fuel systems. -->
- <animation>
+ <animation>
<type>pick</type>
<object-name>fuel_lever_knob_PC</object-name>
<object-name>fuel_lever_arm_PC</object-name>
@@ -1209,7 +875,7 @@
</action>
</animation>
- <animation>
+ <animation>
<type>rotate</type>
<object-name>fuel_lever_knob_PC</object-name>
<object-name>fuel_lever_arm_PC</object-name>
@@ -1492,63 +1158,6 @@
</animation>
- <!-- Select animations for fuel system dependent items. -->
- <animation>
- <type>select</type>
- <object-name>fuel_selector_box_mk1</object-name>
- <condition>
- <less-than>
- <property>sim/model/mark</property>
- <value type="int">2</value>
- </less-than>
- </condition>
- </animation>
- <animation>
- <type>select</type>
- <object-name>fuel_selector_box_mk2</object-name>
- <object-name>fuel_lever_knob_PO</object-name>
- <object-name>fuel_lever_knob_SO</object-name>
- <object-name>fuel_lever_arm_PO</object-name>
- <object-name>fuel_lever_arm_SO</object-name>
- <condition>
- <greater-than>
- <property>sim/model/mark</property>
- <value type="int">1</value>
- </greater-than>
- </condition>
- </animation>
- <animation>
- <type>select</type>
- <object-name>fuel_lever_knob_B</object-name>
- <object-name>fuel_lever_arm_B</object-name>
- <condition>
- <less-than>
- <property>sim/model/mark</property>
- <value type="int">3</value>
- </less-than>
- </condition>
- </animation>
- <animation>
- <type>select</type>
- <object-name>fuel_selector_box_mk3</object-name>
- <object-name>fuel_lever_knob_PI</object-name>
- <object-name>fuel_lever_knob_PF</object-name>
- <object-name>fuel_lever_knob_SI</object-name>
- <object-name>fuel_lever_knob_SF</object-name>
- <object-name>fuel_lever_arm_PI</object-name>
- <object-name>fuel_lever_arm_PF</object-name>
- <object-name>fuel_lever_arm_SI</object-name>
- <object-name>fuel_lever_arm_SF</object-name>
- <object-name>fuel_lever_knob_B2</object-name>
- <object-name>fuel_lever_arm_B2</object-name>
- <condition>
- <greater-than>
- <property>sim/model/mark</property>
- <value type="int">2</value>
- </greater-than>
- </condition>
- </animation>
-
<!-- LOD -->
<animation>
<type>range</type>
diff --git a/Aircraft/Short_Empire/Short_Empire-set.xml b/Aircraft/Short_Empire/Short_Empire-set.xml
index 63a32bf..c1b1244 100644
--- a/Aircraft/Short_Empire/Short_Empire-set.xml
+++ b/Aircraft/Short_Empire/Short_Empire-set.xml
@@ -2,7 +2,7 @@
<!--
Short Empire flying boat for FlightGear.
- Copyright (C) 2007 - 2012 Anders Gidenstam (anders(at)gidenstam.org)
+ Copyright (C) 2007 - 2013 Anders Gidenstam (anders(at)gidenstam.org)
This file is licensed under the GPL license version 2 or later.
-->
<PropertyList>
@@ -650,6 +650,14 @@
<stowage-cmd-norm type="double">0.0</stowage-cmd-norm>
</control-panel>
</electrical>
+ <!-- Configure for 40500 lbs TOW. -->
+ <inertia>
+ <pointmass-weight-lbs n="5" type="double">1800.0</pointmass-weight-lbs>
+ <pointmass-weight-lbs n="6" type="double">1945.0</pointmass-weight-lbs>
+ <pointmass-weight-lbs n="7" type="double">1500.0</pointmass-weight-lbs>
+ <pointmass-weight-lbs n="8" type="double">0.0</pointmass-weight-lbs>
+ <pointmass-weight-lbs n="9" type="double">1300.0</pointmass-weight-lbs>
+ </inertia>
</jsbsim>
</fdm>
diff --git a/Aircraft/Short_Empire/Systems/Short_S23-hydrodynamics.xml b/Aircraft/Short_Empire/Systems/Short_S23-hydrodynamics.xml
index 9c41969..4cde394 100644
--- a/Aircraft/Short_Empire/Systems/Short_S23-hydrodynamics.xml
+++ b/Aircraft/Short_Empire/Systems/Short_S23-hydrodynamics.xml
@@ -46,6 +46,9 @@
<property value="0.0">metrics/hydro-rp-y-in</property>
<property value="0.0">metrics/hydro-rp-z-in</property>
+ <property value="10.0">metrics/hydro-beam-ft</property>
+ <property value="56.0">metrics/hydro-length-ft</property>
+
<!-- Model parameters -->
<documentation>
The hydrodynamic coefficients are assumed to be defined as in
diff --git a/Aircraft/Short_Empire/Systems/hydrodynamics.xml b/Aircraft/Short_Empire/Systems/hydrodynamics.xml
index d90b18c..c6a40b0 100644
--- a/Aircraft/Short_Empire/Systems/hydrodynamics.xml
+++ b/Aircraft/Short_Empire/Systems/hydrodynamics.xml
@@ -3,7 +3,7 @@
Hydrodynamics section for JSBSim.
- Copyright (C) 2008 - 2012 Anders Gidenstam (anders(at)gidenstam.org)
+ Copyright (C) 2008 - 2013 Anders Gidenstam (anders(at)gidenstam.org)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -196,17 +196,20 @@
<!-- Inputs -->
<!-- Environment -->
- <property value="0.0">hydro/water-level-ft</property>
- <property value="1.9736403">hydro/rho-slug_ft3</property>
+ <property value="0.0">hydro/environment/water-level-ft</property>
+ <property value="1.9736403">hydro/environment/rho-slug_ft3</property>
- <property value="0.0">hydro/current-from-north-fps</property>
- <property value="0.0">hydro/current-from-east-fps</property>
+ <property value="0.0">hydro/environment/current-from-north-fps</property>
+ <property value="0.0">hydro/environment/current-from-east-fps</property>
<!-- Model parameters -->
<!-- HRP location. Must be defined.
- metrics/hydro-rp-x-in
- metrics/hydro-rp-y-in
- metrics/hydro-rp-z-in
+
+ - metrics/hydro-beam-ft
+ - metrics/hydro-length-ft
-->
<!-- Input forces in the hydrodynamic body frame.
@@ -230,15 +233,24 @@
<channel name="Environment">
- <fcs_function name="hydro/rho-lbs_ft3">
+ <fcs_function name="hydro/environment/rho-lbs_ft3">
<function>
<product>
<value>32.174049</value>
- <property>hydro/rho-slug_ft3</property>
+ <property>hydro/environment/rho-slug_ft3</property>
</product>
</function>
</fcs_function>
+ <fcs_function name="hydro/environment/gravity-ft_sec2">
+ <function>
+ <quotient>
+ <property>inertia/weight-lbs</property>
+ <property>inertia/mass-slugs</property>
+ </quotient>
+ </function>
+ </fcs_function>
+
</channel>
<channel name ="Hull position">
@@ -273,7 +285,7 @@
</cos>
</product>
</sum>
- <property> hydro/water-level-ft </property>
+ <property> hydro/environment/water-level-ft </property>
</difference>
</function>
</fcs_function>
@@ -288,11 +300,11 @@
<atan2>
<sum>
<property>velocities/v-east-fps</property>
- <property>hydro/current-from-east-fps</property>
+ <property>hydro/environment/current-from-east-fps</property>
</sum>
<sum>
<property>velocities/v-north-fps</property>
- <property>hydro/current-from-north-fps</property>
+ <property>hydro/environment/current-from-north-fps</property>
</sum>
</atan2>
</function>
@@ -358,14 +370,14 @@
<pow>
<sum>
<property> velocities/v-north-fps </property>
- <property> hydro/current-from-north-fps </property>
+ <property> hydro/environment/current-from-north-fps </property>
</sum>
<value> 2.0 </value>
</pow>
<pow>
<sum>
<property> velocities/v-east-fps </property>
- <property> hydro/current-from-east-fps </property>
+ <property> hydro/environment/current-from-east-fps </property>
</sum>
<value> 2.0 </value>
</pow>
@@ -409,9 +421,9 @@
<function>
<product>
<value> 0.50 </value>
- <property>hydro/rho-slug_ft3</property>
- <property> hydro/v-fps </property>
- <property> hydro/v-fps </property>
+ <property>hydro/environment/rho-slug_ft3</property>
+ <property>hydro/v-fps</property>
+ <property>hydro/v-fps</property>
</product>
</function>
</fcs_function>
@@ -420,9 +432,9 @@
<function>
<product>
<value> 0.50 </value>
- <property>hydro/rho-slug_ft3</property>
- <property> hydro/vbx-fps </property>
- <abs><property> hydro/vbx-fps </property></abs>
+ <property>hydro/environment/rho-slug_ft3</property>
+ <property>hydro/vbx-fps</property>
+ <abs><property>hydro/vbx-fps</property></abs>
</product>
</function>
</fcs_function>
@@ -431,9 +443,9 @@
<function>
<product>
<value> 0.50 </value>
- <property>hydro/rho-slug_ft3</property>
- <property> hydro/vby-fps </property>
- <abs><property> hydro/vby-fps </property></abs>
+ <property>hydro/environment/rho-slug_ft3</property>
+ <property>hydro/vby-fps</property>
+ <abs><property>hydro/vby-fps</property></abs>
</product>
</function>
</fcs_function>
diff --git a/Aircraft/Short_Empire/Systems/short-empire.nas b/Aircraft/Short_Empire/Systems/short-empire.nas
index 939d076..374bc5a 100644
--- a/Aircraft/Short_Empire/Systems/short-empire.nas
+++ b/Aircraft/Short_Empire/Systems/short-empire.nas
@@ -13,7 +13,7 @@ var astro_hatch = aircraft.door.new("sim/model/doors/astro-hatch", 10.0);
###############################################################################
var ground = func {
- setprop("/fdm/jsbsim/hydro/water-level-ft",
+ setprop("/fdm/jsbsim/hydro/environment/water-level-ft",
getprop("/position/ground-elev-ft"));
# Temporary and ugly starter handling.
-----------------------------------------------------------------------
FlightGear Base Package
|