[Csp-commits] svn:csp r1522 - in trunk/CSP/CSPSim: . Demo Include Source Source/F16

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

Author: delta
Date: 2005-04-25 13:09:09 -0700 (Mon, 25 Apr 2005)
New Revision: 1522

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Demo/Aircraft_KeyBinding.txt
   trunk/CSP/CSPSim/Demo/GameScreen_KeyBinding.txt
   trunk/CSP/CSPSim/Include/ControlInputsChannels.h
   trunk/CSP/CSPSim/Source/AircraftObject.cpp
   trunk/CSP/CSPSim/Source/CSPSim.cpp
   trunk/CSP/CSPSim/Source/F16/F16GearDynamics.cpp
   trunk/CSP/CSPSim/Source/F16/FLCS.cpp
Log:
* Need to include a few headers to avoid a syntax error (g++ and vc++ don't 
  manage forward class declaration equivalently).
* Avoid a few warnings. 
* Other minor changes.

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-04-25 07:28:15 UTC (rev 1521)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-04-25 20:09:09 UTC (rev 1522)
@@ -1,13 +1,21 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-04-25: delta
+ * Need to include a few headers to avoid a syntax error (g++ and vc++ don't 
+   manage forward class declaration equivalently).
+   
+ * Avoid a few warnings.
+ 
+ * Other minor changes.
+
 2005-04-24: onsight
  * More gear animation refactoring.  Merged the gear sequence and structure
    animations into a single class.  Split part of TimedSequence into a
    SharedSequence base class and created a DrivenSequence subclass.
 
  * Added rate limiting for steering.  This is just a temporary measure until
-   steering control is intergrated into the fcs.
+   steering control is integrated into the fcs.
 
  * Adjusted gear stiffness, damping, and position for the F16.
 

Modified: trunk/CSP/CSPSim/Demo/Aircraft_KeyBinding.txt
===================================================================
--- trunk/CSP/CSPSim/Demo/Aircraft_KeyBinding.txt	2005-04-25 07:28:15 UTC (rev 1521)
+++ trunk/CSP/CSPSim/Demo/Aircraft_KeyBinding.txt	2005-04-25 20:09:09 UTC (rev 1522)
@@ -1,3 +1,5 @@
+us keyboard
+
 'DOWN ': INC_ELEVATOR
 'DOWN': STOP_INC_ELEVATOR
 'UP': DEC_ELEVATOR

Modified: trunk/CSP/CSPSim/Demo/GameScreen_KeyBinding.txt
===================================================================
--- trunk/CSP/CSPSim/Demo/GameScreen_KeyBinding.txt	2005-04-25 07:28:15 UTC (rev 1521)
+++ trunk/CSP/CSPSim/Demo/GameScreen_KeyBinding.txt	2005-04-25 20:09:09 UTC (rev 1522)
@@ -1,3 +1,5 @@
+us keyboard
+
 '0': CAMERA_VIEW_0
 '1': CAMERA_VIEW_1
 '2': CAMERA_VIEW_2

Modified: trunk/CSP/CSPSim/Include/ControlInputsChannels.h
===================================================================
--- trunk/CSP/CSPSim/Include/ControlInputsChannels.h	2005-04-25 07:28:15 UTC (rev 1521)
+++ trunk/CSP/CSPSim/Include/ControlInputsChannels.h	2005-04-25 20:09:09 UTC (rev 1522)
@@ -35,6 +35,7 @@
 	static const char *RudderInput;
 	static const char *LeftBrakeInput;
 	static const char *RightBrakeInput;
+	static const char *SteeringInput;
 	static const char *ThrottleInput;
 	static const char *AirbrakeInput;
 };

Modified: trunk/CSP/CSPSim/Source/AircraftObject.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/AircraftObject.cpp	2005-04-25 07:28:15 UTC (rev 1521)
+++ trunk/CSP/CSPSim/Source/AircraftObject.cpp	2005-04-25 20:09:09 UTC (rev 1522)
@@ -25,6 +25,7 @@
 #include <SimData/Math.h>
 
 #include "AircraftObject.h"
+#include "Animation.h"
 #include "AnimationSequence.h"
 #include "KineticsChannels.h"
 #include "Collision.h"

Modified: trunk/CSP/CSPSim/Source/CSPSim.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/CSPSim.cpp	2005-04-25 07:28:15 UTC (rev 1521)
+++ trunk/CSP/CSPSim/Source/CSPSim.cpp	2005-04-25 20:09:09 UTC (rev 1522)
@@ -35,6 +35,7 @@
 #include "CSPSim.h"
 
 #include "Animation.h"
+#include "AnimationSequence.h"
 #include "Atmosphere.h"
 #include "Config.h"
 //#include "ConsoleCommands.h"

Modified: trunk/CSP/CSPSim/Source/F16/F16GearDynamics.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/F16/F16GearDynamics.cpp	2005-04-25 07:28:15 UTC (rev 1521)
+++ trunk/CSP/CSPSim/Source/F16/F16GearDynamics.cpp	2005-04-25 20:09:09 UTC (rev 1522)
@@ -25,6 +25,7 @@
 
 #include "F16Channels.h"
 #include "F16GearDynamics.h"
+#include "GearAnimation.h"
 
 #include <SimData/Math.h>
 #include <SimData/Conversions.h>

Modified: trunk/CSP/CSPSim/Source/F16/FLCS.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/F16/FLCS.cpp	2005-04-25 07:28:15 UTC (rev 1521)
+++ trunk/CSP/CSPSim/Source/F16/FLCS.cpp	2005-04-25 20:09:09 UTC (rev 1522)
@@ -185,7 +185,7 @@
 		alpha_break1 = 10.0;
 		// what is alpha_break2, and are any of the slopes different?
 	}
-	double reduced_pitch_rate = m_PitchRateSchedule[b_QBar->value()] * 0.7 * m_PitchRateDeltaFilter.value();
+	double reduced_pitch_rate = m_PitchRateSchedule[static_cast<float>(b_QBar->value())] * 0.7 * m_PitchRateDeltaFilter.value();
 	double alpha_break1_compensation = reduced_pitch_rate + alpha_f - alpha_break1;
 	double g_limit = std::max(0.0, 0.322 * alpha_break1_compensation) + 0.334 * m_PitchRateDeltaFilter.value() + g_minus_1;
 	m_GLimitFilter.update(g_limit, timer.dt());
@@ -245,7 +245,7 @@
 	limit = simdata::clampTo(limit, 0.0, 228.0);
 	limit = 308.0 - limit;
 
-	double roll_command = m_RollCommandSchedule[b_RollInput->value() * 80.0];
+	double roll_command = m_RollCommandSchedule[static_cast<float>(b_RollInput->value() * 80.0)];
 	if (b_TakeoffLandingGains->value()) {
 		roll_command = 0.50 * roll_command;
 	} else {