[Gcblue-commits] gcb_wx/src/graphics ObjectUpdater.cpp,1.19,1.20 cspSky.cpp,1.15,1.16 tc3DViewer.cpp,1.23,1.24

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

Update of /cvsroot/gcblue/gcb_wx/src/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31623/src/graphics

Modified Files:
	ObjectUpdater.cpp cspSky.cpp tc3DViewer.cpp 
Log Message:


Index: ObjectUpdater.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/ObjectUpdater.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ObjectUpdater.cpp	14 Jul 2005 23:42:22 -0000	1.19
--- ObjectUpdater.cpp	17 Jul 2005 12:58:04 -0000	1.20
***************
*** 221,229 ****
  	tcSensorMapTrack* sensorTrack = model->GetSensorTrack();
  
!     int displayMode = tcOptions::Get()->mn3DCheatMode;
  
      if (gameObject)
      {        
! 		if ((displayMode == 3) || simState->mpUserInfo->IsOwnAlliance(gameObject->GetAlliance()))
  		{
  			UpdateTrue(node);
--- 221,231 ----
  	tcSensorMapTrack* sensorTrack = model->GetSensorTrack();
  
! 	bool use3Dcheat = tcOptions::Get()->mn3DCheatMode == 3;
!     bool isServer = simState->IsMultiplayerServer();
! 
  
      if (gameObject)
      {        
! 		if (use3Dcheat || isServer || simState->mpUserInfo->IsOwnAlliance(gameObject->GetAlliance()))
  		{
  			UpdateTrue(node);

Index: cspSky.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/cspSky.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** cspSky.cpp	16 Jul 2005 23:12:38 -0000	1.15
--- cspSky.cpp	17 Jul 2005 12:58:04 -0000	1.16
***************
*** 1109,1112 ****
--- 1109,1119 ----
  ////////////////////////////////////////////////////////////////////////////////
  
+ float Sky::skyDomeRadius = 50000.0f;
+ 
+ void Sky::SetRadius(float r)
+ {
+ 	skyDomeRadius = r;
+ }
+ 
  Sky::Sky(): Group() {
  	m_LastMoonFullUpdate = -1e+10;
***************
*** 1154,1158 ****
  	float x, y, z;
  	float alpha, theta;
! 	float radius = 1100000.0f; 
  
  	m_Horizon = new FalseHorizon;
--- 1161,1165 ----
  	float x, y, z;
  	float alpha, theta;
! 	float radius = skyDomeRadius; 
  
  	m_Horizon = new FalseHorizon;

Index: tc3DViewer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DViewer.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** tc3DViewer.cpp	16 Jul 2005 23:12:38 -0000	1.23
--- tc3DViewer.cpp	17 Jul 2005 12:58:04 -0000	1.24
***************
*** 1899,1905 ****
      updateVisitor->setTraversalNumber(frameStamp->getFrameNumber());
  
!     frameStampFar->setFrameNumber(frameStampFar->getFrameNumber()+1);
!     frameStampFar->setReferenceTime(gameTime);
!     updateVisitorFar->setTraversalNumber(frameStampFar->getFrameNumber());
  
  }
--- 1899,1908 ----
      updateVisitor->setTraversalNumber(frameStamp->getFrameNumber());
  
! 	if (useFarSceneView)
! 	{
! 		frameStampFar->setFrameNumber(frameStampFar->getFrameNumber()+1);
! 		frameStampFar->setReferenceTime(gameTime);
! 		updateVisitorFar->setTraversalNumber(frameStampFar->getFrameNumber());
! 	}
  
  }
***************
*** 1969,1972 ****
--- 1972,1977 ----
      // ----------------------
  
+ 	Sky::SetRadius(zmax - 100.0f);
+ 
      shiftDistance = 50000.0f;
      cameraAz = 0.5f*C_PI;