[Gcblue-commits] gcb_wx/src/graphics tc3DModel.cpp,1.28,1.29 tc3DTerrain.cpp,1.18,1.19 tc3DViewer.cpp,1.24,1.25 tcMapView.cpp,1.31,1.32

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

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

Modified Files:
	tc3DModel.cpp tc3DTerrain.cpp tc3DViewer.cpp tcMapView.cpp 
Log Message:


Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** tcMapView.cpp	16 Jul 2005 23:12:38 -0000	1.31
--- tcMapView.cpp	20 Jul 2005 16:24:54 -0000	1.32
***************
*** 1623,1627 ****
  
                  osg::Vec4Array* colors = new osg::Vec4Array;
!                 colors->push_back(osg::Vec4(0.5, 0.8, 0.5, 1.0));
                  altA->setColorArray(colors);
                  altA->setColorBinding(osg::Geometry::BIND_OVERALL);
--- 1623,1627 ----
  
                  osg::Vec4Array* colors = new osg::Vec4Array;
!                 colors->push_back(osg::Vec4(0.6, 0.6, 0.8, 1.0));
                  altA->setColorArray(colors);
                  altA->setColorBinding(osg::Geometry::BIND_OVERALL);
***************
*** 1633,1637 ****
                  osg::Geometry* altB = new osg::Geometry(*maSymbolB[nAffiliation][nSymbol]);
                  osg::Vec4Array* colors = new osg::Vec4Array;
!                 colors->push_back(osg::Vec4(0.5, 0.8, 0.5, 1.0));
                  altB->setColorArray(colors);
                  altB->setColorBinding(osg::Geometry::BIND_OVERALL);
--- 1633,1637 ----
                  osg::Geometry* altB = new osg::Geometry(*maSymbolB[nAffiliation][nSymbol]);
                  osg::Vec4Array* colors = new osg::Vec4Array;
!                 colors->push_back(osg::Vec4(0.6, 0.6, 0.8, 1.0));
                  altB->setColorArray(colors);
                  altB->setColorBinding(osg::Geometry::BIND_OVERALL);

Index: tc3DTerrain.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DTerrain.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tc3DTerrain.cpp	26 May 2005 11:54:11 -0000	1.18
--- tc3DTerrain.cpp	20 Jul 2005 16:24:54 -0000	1.19
***************
*** 94,98 ****
      colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
      waterSurface->setColorArray(colors);
!     waterSurface->setColorBinding(osg::Geometry::BIND_OVERALL);
  
  
--- 94,98 ----
      colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
      waterSurface->setColorArray(colors);
! 	waterSurface->setColorBinding(osg::Geometry::BIND_OFF); // BIND_OVERALL
  
  

Index: tc3DModel.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DModel.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** tc3DModel.cpp	16 Jul 2005 23:12:38 -0000	1.28
--- tc3DModel.cpp	20 Jul 2005 16:24:54 -0000	1.29
***************
*** 455,459 ****
  	{
  		// if object is close to camera, use predicted track for position
! 		if (distanceFromCamera < 10e3)
  		{
  			tcTrack predicted;
--- 455,459 ----
  	{
  		// if object is close to camera, use predicted track for position
! 		if ((distanceFromCamera < 10e3) || (sensorTrack->IsBearingOnly()))
  		{
  			tcTrack predicted;

Index: tc3DViewer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DViewer.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** tc3DViewer.cpp	17 Jul 2005 12:58:04 -0000	1.24
--- tc3DViewer.cpp	20 Jul 2005 16:24:54 -0000	1.25
***************
*** 1060,1064 ****
      }
      
!     // limit min camera altitude unless surface or subsurface obj
      const unsigned int limitMask = (~PTYPE_FIXED) & 0xFFF0;
  
--- 1060,1064 ----
      }
      
!     // limit min camera altitude for ground objects
      const unsigned int limitMask = (~PTYPE_FIXED) & 0xFFF0;
  
***************
*** 1270,1280 ****
  
  	tcGameObject* obj = simState->GetObject(hookID);
  	if (obj == 0)
  	{
! 		classification = 0;
  		return lastPos;
  	}
  
!     float x, y, z;
      if (n3DCheatMode == 3)
      {
--- 1270,1301 ----
  
  	tcGameObject* obj = simState->GetObject(hookID);
+     float x, y, z;
+ 
+ 	// try to find in sensor map if null object (multiplayer client case)
  	if (obj == 0)
  	{
!         tcSensorMap* sensorMap = simState->GetSensorMap();
!         unsigned int ownAlliance = simState->mpUserInfo->GetOwnAlliance();
!         
! 		if (tcSensorMapTrack* track = 
!             sensorMap->GetSensorMapTrack(hookID, ownAlliance))
!         {
!             tcTrack predicted;
!             track->GetPrediction(predicted, simState->GetTime());
!             x = LonToX(predicted.mfLon_rad);
!             y = LatToY(predicted.mfLat_rad);
!             z = predicted.GetOrGuessAltitude();
! 
! 			classification = predicted.mnClassification;
! 			lastPos.set(x, y, z);
!         }
! 		else
! 		{
! 			classification = 0;
! 		}
  		return lastPos;
  	}
  
! 
      if (n3DCheatMode == 3)
      {