[Csp-commits] APPLICATIONS/CSPSim/Source GameScreen.cpp,1.32,1.33 AircraftPhysicsModel.cpp,1.8,1.9

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

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20279

Modified Files:
	GameScreen.cpp AircraftPhysicsModel.cpp 
Log Message:
see CHANGES.current

Index: GameScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/GameScreen.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** GameScreen.cpp	3 Apr 2004 22:15:21 -0000	1.32
--- GameScreen.cpp	7 Apr 2004 12:52:15 -0000	1.33
***************
*** 181,184 ****
--- 181,186 ----
  	m_ZoomOut = new ZoomOut;
  	m_ZoomStop = new ZoomStop;
+ 	m_ZoomStepIn = new ZoomStepIn;
+ 	m_ZoomStepOut = new ZoomStepOut;
  	m_Mouse = new MouseCommand;
  }
***************
*** 195,198 ****
--- 197,202 ----
  	delete m_ZoomStop;
  	delete m_Mouse;
+ 	delete m_ZoomStepIn;
+ 	delete m_ZoomStepOut;
  	m_CurrentCameraCommand = 0;
  }
***************
*** 254,258 ****
  	}
  	m_ActiveObject = object;
! 	m_CameraAgent.notifyObjectToViews(object);
  	if (object.valid() && object->isHuman() && object->isLocal()) {
  		on_View1();
--- 258,262 ----
  	}
  	m_ActiveObject = object;
! 	m_CameraAgent.setObject(object);
  	if (object.valid() && object->isHuman() && object->isLocal()) {
  		on_View1();
***************
*** 298,304 ****
  
  void GameScreen::on_View3() {
! 	if (m_ActiveObject.valid()) {
! 		m_ViewMode = 3;
! 	}
  }
  
--- 302,306 ----
  
  void GameScreen::on_View3() {
! 	m_ViewMode = 3;
  }
  
***************
*** 319,327 ****
  }
  
! void GameScreen::on_View8()
! {
! 	if (m_ActiveObject.valid()) {
! 		m_ViewMode = 8;
! 	}
  }
  
--- 321,326 ----
  }
  
! void GameScreen::on_View8() {
! 	m_ViewMode = 8;
  }
  
***************
*** 436,444 ****
  
  void GameScreen::on_ViewZoomStepIn() {
! 	m_CurrentCameraCommand = m_ZoomIn;
  }
  
  void GameScreen::on_ViewZoomStepOut() {
! 	m_CurrentCameraCommand = m_ZoomOut;
  }
  
--- 435,443 ----
  
  void GameScreen::on_ViewZoomStepIn() {
! 	m_CurrentCameraCommand = m_ZoomStepIn;
  }
  
  void GameScreen::on_ViewZoomStepOut() {
! 	m_CurrentCameraCommand = m_ZoomStepOut;
  }
  

Index: AircraftPhysicsModel.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftPhysicsModel.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AircraftPhysicsModel.cpp	3 Apr 2004 22:15:22 -0000	1.8
--- AircraftPhysicsModel.cpp	7 Apr 2004 12:52:15 -0000	1.9
***************
*** 111,115 ****
  
  	if (dt == 0.0) dt = 0.017;
! 	unsigned short n = std::min<unsigned short>(6,static_cast<unsigned short>(180 * dt)) + 1;
  	double dtlocal = dt/n;
  	std::for_each(m_Dynamics.begin(),m_Dynamics.end(),InitializeSimulationStep(dtlocal));
--- 111,116 ----
  
  	if (dt == 0.0) dt = 0.017;
! 	//unsigned short n = std::min<unsigned short>(6,static_cast<unsigned short>(180 * dt)) + 1;
! 	unsigned short n = std::min<unsigned short>(10,static_cast<unsigned short>(600 * dt)) + 1;
  	double dtlocal = dt/n;
  	std::for_each(m_Dynamics.begin(),m_Dynamics.end(),InitializeSimulationStep(dtlocal));