[Csp-commits] APPLICATIONS/CSPSim/Source AircraftObject.cpp,1.3,1.4

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv31741

Modified Files:
	AircraftObject.cpp 
Log Message:
initializing control input parameters

Index: AircraftObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AircraftObject.cpp	2 Feb 2003 20:53:28 -0000	1.3
--- AircraftObject.cpp	15 Feb 2003 20:54:00 -0000	1.4
***************
*** 56,59 ****
--- 56,61 ----
  	//m_iObjectType = AIRPLANE_OBJECT_TYPE;
  	//m_iObjectID = g_pBattlefield->getNewObjectID();
+ 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::AircraftObject() ...");
  	m_sObjectName = "AIRCRAFT";
  
***************
*** 79,82 ****
--- 81,91 ----
  	m_ThrottleInput = 0.0;
  
+ 	m_dThrottleInput = 0;
+ 	m_dAileronInput = 0;
+ 	m_dElevatorInput = 0;
+ 
+     m_decayAileron = 0;
+     m_decayElevator = 0;
+ 
  	m_ComplexPhysics = false;
  	m_PhysicsInitialized = false;
***************
*** 98,101 ****
--- 107,111 ----
  	BIND_ACTION("DEC_ELEVATOR", DecElevator);
  	BIND_ACTION("STOP_DEC_ELEVATOR", noDecElevator);
+     CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::AircraftObject()");
  }
  
***************
*** 166,169 ****
--- 176,183 ----
  void AircraftObject::updateControls(double dt)
  {
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::updateControls ...");
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_dThrottleInput = " << m_dThrottleInput);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_dAileronInput = " << m_dAileronInput);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_dElevatorInput = " << m_dElevatorInput);
  	m_ThrottleInput += m_dThrottleInput * dt * 0.2;
  	m_AileronInput += m_dAileronInput * dt * 0.4;
***************
*** 180,187 ****
--- 194,205 ----
  	CLIP(m_AileronInput, -1.0, 1.0);
  	CLIP(m_ElevatorInput, -1.0, 1.0);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_decayElevator = " << m_decayElevator);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_ElevatorInput = " << m_ElevatorInput);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::updateControls");
  }
  
  void AircraftObject::doFCS(double dt)
  {
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::doFCS ...");
  	// FIXME: very temporary fcs mappings
  	m_Rudder = m_RudderInput * m_RudderMax * 0.017;
***************
*** 189,192 ****
--- 207,211 ----
  	m_Elevator = m_ElevatorInput * m_ElevatorMax * 0.017;
  	m_Throttle = (1.0 - m_ThrottleInput) * 0.5;
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, " ... AircraftObject::doFCS");
  }
  
***************
*** 208,230 ****
--- 227,259 ----
  void AircraftObject::setElevator(double x)
  { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::setElevator ...");
  	m_ElevatorInput = x; 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "m_ElevatorInput = " << m_ElevatorInput << " ...AircraftObject::setElevator");
  }
  
  void AircraftObject::IncElevator() { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::IncElevator ...");
  	m_dElevatorInput = 1.0; 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::IncElevator");
  }	
  
  void AircraftObject::noIncElevator() { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::noIncElevator ...");
  	if (m_dElevatorInput > 0.0) m_dElevatorInput = 0.0; 
  	m_decayElevator = 30;
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::noIncElevator");
  }
  
  void AircraftObject::DecElevator() { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::DecElevator ...");
  	m_dElevatorInput = -1.0; 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::DecElevator");
  }
  
  void AircraftObject::noDecElevator() { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::noDecElevator ...");
  	if (m_dElevatorInput < 0.0) m_dElevatorInput = 0.0; 
  	m_decayElevator = 30;
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::noDecElevator");
  }
  
***************
*** 375,379 ****
--- 404,436 ----
  }
  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  #if 0
+ /*
  void AircraftObject::initialize()
  {
***************
*** 384,388 ****
  void AircraftObject::initializeHud()
  {
!   m_phud = osgNew Hud(m_InitialDirection);
    m_phud->BuildHud("../Data/Scripts/HudM2k.csp");
    m_rpSwitch->addChild(m_phud);
--- 441,445 ----
  void AircraftObject::initializeHud()
  {
!   m_phud = new Hud(m_InitialDirection);
    m_phud->BuildHud("../Data/Scripts/HudM2k.csp");
    m_rpSwitch->addChild(m_phud);
***************
*** 549,553 ****
  }
  
! 
  #endif
  
--- 606,610 ----
  }
  
! */
  #endif