[Csp-commits] APPLICATIONS/CSPSim/Source Engine.cpp,1.1,1.2

[<mk...@us...>]

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

Modified Files:
	Engine.cpp 
Log Message:
fixed thrust x,y ordering and units

Index: Engine.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Engine.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Engine.cpp	19 Jun 2003 18:06:29 -0000	1.1
--- Engine.cpp	20 Jun 2003 17:47:45 -0000	1.2
***************
*** 50,62 ****
  
  float ThrustData::getMil(float altitude, float mach) const {
! 	return m_mil_thrust.getValue(altitude, mach);
  }
  
  float ThrustData::getIdle(float altitude, float mach) const {
! 	return m_idle_thrust.getValue(altitude, mach);
  }
  
  float ThrustData::getAb(float altitude, float mach) const {
! 	return m_ab_thrust.getValue(altitude, mach);
  }
  
--- 50,62 ----
  
  float ThrustData::getMil(float altitude, float mach) const {
! 	return m_mil_thrust.getValue(mach, altitude);
  }
  
  float ThrustData::getIdle(float altitude, float mach) const {
! 	return m_idle_thrust.getValue(mach, altitude);
  }
  
  float ThrustData::getAb(float altitude, float mach) const {
! 	return m_ab_thrust.getValue(mach, altitude);
  }
  
***************
*** 188,198 ****
  			(*i)->setThrottle(2.0f *  static_cast<float>(*m_Throttle));
  			simdata::Vector3 force = (*i)->getThrust();
- 			//FIXME: convert XML value to newton
- 			force = simdata::Vector3(simdata::convert::lb_n(force.x),
- 									 simdata::convert::lb_n(force.y), 
- 									 simdata::convert::lb_n(force.z));
  			m_Force += force;
  			m_Moment += (*i)->m_EngineOffset^force;
  		}
  	}
! }
\ No newline at end of file
--- 188,195 ----
  			(*i)->setThrottle(2.0f *  static_cast<float>(*m_Throttle));
  			simdata::Vector3 force = (*i)->getThrust();
  			m_Force += force;
  			m_Moment += (*i)->m_EngineOffset^force;
  		}
  	}
! }
!