[Csp-commits] svn:csp r1391 - in trunk/CSP/CSPSim: . Data/Models/Runway Data/XML/vehicles/aircraft/m2k

[<sv...@ww...>]

Author: mkrose
Date: 2004-12-15 22:43:41 -0800 (Wed, 15 Dec 2004)
New Revision: 1391

Added:
   trunk/CSP/CSPSim/Data/Models/Runway/runway.3ds
Removed:
   trunk/CSP/CSPSim/Data/Models/Runway/runway.3DS
Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/systems.xml
Log:
* Fix m2k animations bound to different channels.  An driven rotation
animation can only use a single input channel.  More complex animations,
such as coordinated motion of elevators and ailerons requires either
special handling in the FCS system (with dedicated channels for each
control surface), or a custom animation callback.

* Fix the deflection limits for the m2k ailerons and elevators.  The new
values may not be correct, but at least the aileron limits are
symmetric.

* Rename the runway model file to all lowercase (wasn't found under linux).

==> Run ComplileData.py after updating to pick up the changes.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1391

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2004-12-15 20:05:59 UTC (rev 1390)
+++ trunk/CSP/CSPSim/CHANGES.current	2004-12-16 06:43:41 UTC (rev 1391)
@@ -1,6 +1,21 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2004-12-15: onsight
+ * Fix m2k animations bound to different channels.  An driven rotation
+   animation can only use a single input channel.  More complex animations,
+   such as coordinated motion of elevators and ailerons requires either
+   special handling in the FCS system (with dedicated channels for each
+   control surface), or a custom animation callback.
+
+ * Fix the deflection limits for the m2k ailerons and elevators.  The new
+   values may not be correct, but at least the aileron limits are
+   symmetric.
+
+ * Rename the runway model file to all lowercase (wasn't found under linux).
+
+==> Run ComplileData.py after updating to pick up the changes.
+
 2004-12-14: onsight
  * Minor fix for the engine cutoff function under linux.
 

Deleted: trunk/CSP/CSPSim/Data/Models/Runway/runway.3DS
===================================================================
(Binary files differ)

Copied: trunk/CSP/CSPSim/Data/Models/Runway/runway.3ds (from rev 1388, trunk/CSP/CSPSim/Data/Models/Runway/runway.3DS)

Modified: trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml	2004-12-15 20:05:59 UTC (rev 1390)
+++ trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml	2004-12-16 06:43:41 UTC (rev 1391)
@@ -29,24 +29,12 @@
             <Vector name="axis">0 -0.34 0.94</Vector>
         </Object>
 
-        <Object  class="DrivenRotation">
-            <String name="channel_name">ControlSurfaces.ElevatorDeflection</String>
-            <Key name="model_id">Aircraft.LeftOuterAileron</Key>
-            <Int name="lod_limit">1</Int>
-            <Vector name="axis">-1 0 0</Vector>
-        </Object>
         <Object class="DrivenRotation">
             <String name="channel_name">ControlSurfaces.ElevatorDeflection</String>
             <Key name="model_id">Aircraft.LeftAileron</Key>
             <Int name="lod_limit">1</Int>
             <Vector name="axis">-1 0 0</Vector>
         </Object>
-        <Object  class="DrivenRotation">
-            <String name="channel_name">ControlSurfaces.ElevatorDeflection</String>
-            <Key name="model_id">Aircraft.RightOuterAileron</Key>
-            <Int name="lod_limit">1</Int>
-            <Vector name="axis">-1 0 0</Vector>
-        </Object>
         <Object class="DrivenRotation">
             <String name="channel_name">ControlSurfaces.ElevatorDeflection</String>
             <Key name="model_id">Aircraft.RightAileron</Key>
@@ -60,20 +48,8 @@
             <Int name="lod_limit">1</Int>
             <Vector name="axis">1 0 0</Vector>
         </Object>
-        <Object  class="DrivenRotation">
-            <String name="channel_name">ControlSurfaces.AileronDeflection</String>
-            <Key name="model_id">Aircraft.LeftAileron</Key>
-            <Int name="lod_limit">1</Int>
-            <Vector name="axis">1 0 0</Vector>
-        </Object>
         <Object class="DrivenRotation">
             <String name="channel_name">ControlSurfaces.AileronDeflection</String>
-            <Key name="model_id">Aircraft.RightAileron</Key>
-            <Int name="lod_limit">1</Int>
-            <Vector name="axis">-1 0 0</Vector>
-        </Object>
-        <Object class="DrivenRotation">
-            <String name="channel_name">ControlSurfaces.AileronDeflection</String>
             <Key name="model_id">Aircraft.RightOuterAileron</Key>
             <Int name="lod_limit">1</Int>
             <Vector name="axis">-1 0 0</Vector>

Modified: trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/systems.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/systems.xml	2004-12-15 20:05:59 UTC (rev 1390)
+++ trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/systems.xml	2004-12-16 06:43:41 UTC (rev 1391)
@@ -5,8 +5,8 @@
 		<Object class="AircraftInputSystem" />
 		<Object class="AircraftSimpleFCS">
 			<Float name="elevator_limit0">-25.0</Float>
-			<Float name="elevator_limit1">16.0</Float>
-			<Float name="aileron_limit0">-25</Float>
+			<Float name="elevator_limit1">25.0</Float>
+			<Float name="aileron_limit0">-16</Float>
 			<Float name="aileron_limit1">16</Float>
 			<Float name="rudder_limit">30.0</Float>
 			<Float name="airbrake_limit">60.0</Float>