[Csp-commits] APPLICATIONS/CSPSim/Source AircraftObject.cpp,1.15,1.16 NumericalMethod.cpp,1.2,1.3

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

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

Modified Files:
	AircraftObject.cpp NumericalMethod.cpp 
Log Message:
see CHANGES.current

Index: AircraftObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftObject.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AircraftObject.cpp	18 Apr 2003 20:29:41 -0000	1.15
--- AircraftObject.cpp	18 Apr 2003 20:59:55 -0000	1.16
***************
*** 42,48 ****
  	m_ObjectName = "AIRCRAFT";
  
! 	m_heading = 0.0;
! 	m_roll = 0.0;
! 	m_pitch = 0.0;
  	
  	m_Aileron = 0.0;
--- 42,48 ----
  	m_ObjectName = "AIRCRAFT";
  
! 	m_Heading = 0.0;
! 	m_Roll = 0.0;
! 	m_Pitch = 0.0;
  	
  	m_Aileron = 0.0;
***************
*** 373,379 ****
  {
  	simdata::Quaternion attitude;
! 	attitude = simdata::Quaternion::MakeQFromEulerAngles(DegreesToRadians(pitch),
!                                                              DegreesToRadians(roll), 
! 	                                                     DegreesToRadians(heading));
  	DynamicObject::setAttitude(attitude);
  }
--- 373,382 ----
  {
  	simdata::Quaternion attitude;
! 	m_Pitch = DegreesToRadians(pitch);
! 	m_Roll = DegreesToRadians(roll);
! 	m_Heading = DegreesToRadians(heading);
! 	attitude = simdata::Quaternion::MakeQFromEulerAngles(m_Pitch,
!                                                              m_Roll, 
! 	                                                     m_Heading);
  	DynamicObject::setAttitude(attitude);
  }
***************
*** 397,403 ****
  
  	simdata::Vector3 angles = simdata::Quaternion::MakeEulerAnglesFromQ(m_Attitude);
! 	m_heading = RadiansToDegrees(angles.x);
! 	m_pitch = RadiansToDegrees(angles.y);
! 	m_roll = RadiansToDegrees(angles.z);
  	m_Speed = m_LinearVelocity.Length();
  }
--- 400,406 ----
  
  	simdata::Vector3 angles = simdata::Quaternion::MakeEulerAnglesFromQ(m_Attitude);
! 	m_Heading = angles.x;
! 	m_Pitch = angles.y;
! 	m_Roll = angles.z;
  	m_Speed = m_LinearVelocity.Length();
  }
***************
*** 488,492 ****
  	stats.push_back(buffer);
  	snprintf(buffer, 255, "Heading: %.3f, Pitch: %.3f, Roll: %.3f",
! 	         m_heading, m_pitch, m_roll);
  	stats.push_back(buffer);
  }
--- 491,497 ----
  	stats.push_back(buffer);
  	snprintf(buffer, 255, "Heading: %.3f, Pitch: %.3f, Roll: %.3f",
! 	         RadiansToDegrees(m_Heading), 
! 		 RadiansToDegrees(m_Pitch), 
! 		 RadiansToDegrees(m_Roll));
  	stats.push_back(buffer);
  }

Index: NumericalMethod.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/NumericalMethod.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NumericalMethod.cpp	18 Apr 2003 20:29:41 -0000	1.2
--- NumericalMethod.cpp	18 Apr 2003 20:59:55 -0000	1.3
***************
*** 353,355 ****
   //std::cout << "RungeKuttaCK::enhancedSolve nok = " << nok << "; nbad = " << nbad << "\n" << std::endl;
   return result;               
! }
\ No newline at end of file
--- 353,356 ----
   //std::cout << "RungeKuttaCK::enhancedSolve nok = " << nok << "; nbad = " << nbad << "\n" << std::endl;
   return result;               
! }
!