[Gcblue-commits] gcb_wx/src/sim tc3DViewer.cpp,1.24.2.1,1.24.2.2

[<ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs1:/tmp/cvs-serv12634/src/sim

Modified Files:
      Tag: v0_5_0
	tc3DViewer.cpp 
Log Message:


Index: tc3DViewer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tc3DViewer.cpp,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -d -r1.24.2.1 -r1.24.2.2
*** tc3DViewer.cpp	19 Jan 2004 21:20:58 -0000	1.24.2.1
--- tc3DViewer.cpp	20 Jan 2004 03:03:10 -0000	1.24.2.2
***************
*** 620,625 ****
  * distance exceeds shiftDistance, then set the origin
  * to current camera position.
  */
! void tc3DViewer::UpdateOrigin()
  {
      float camx = cameraPosition.x();
--- 620,626 ----
  * distance exceeds shiftDistance, then set the origin
  * to current camera position.
+ * @return true if origin updated
  */
! bool tc3DViewer::UpdateOrigin()
  {
      float camx = cameraPosition.x();
***************
*** 627,631 ****
      float camRadius = sqrtf(camx*camx + camy*camy);
  
!     if (camRadius >= shiftDistance)
      {
          double newLon = XToLon(cameraPosition.x());
--- 628,632 ----
      float camRadius = sqrtf(camx*camx + camy*camy);
  
!     if ((camRadius >= shiftDistance)&&(isActive))
      {
          double newLon = XToLon(cameraPosition.x());
***************
*** 636,640 ****
--- 637,643 ----
          cameraPosition.y() = 0;
          SetOrigin(newLon, newLat);
+         return true;
      }
+     return false;
  }
  
***************
*** 840,845 ****
      if (!simState) return;
  
-     UpdateModels();
- 
      if (lastHook != hookID)
      {
--- 843,846 ----
***************
*** 856,861 ****
      }
  
!     UpdateOrigin();
      UpdateCamera();
      UpdateSky(dateZulu);
  
--- 857,869 ----
      }
  
!     UpdateModels();
      UpdateCamera();
+ 
+     if (UpdateOrigin())
+     {
+         UpdateModels();
+         UpdateCamera();
+     }
+ 
      UpdateSky(dateZulu);