[Gcblue-commits] gcb_wx/src/sim tcMapData.cpp,1.15,1.16 tcRadar.cpp,1.24,1.25 tcTorpedoObject.cpp,1.3,1.4

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

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

Modified Files:
	tcMapData.cpp tcRadar.cpp tcTorpedoObject.cpp 
Log Message:
Replaced osgAL with OpenAL++ exclusively due to instability issues.

Index: tcMapData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMapData.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcMapData.cpp	20 Feb 2005 21:54:35 -0000	1.15
--- tcMapData.cpp	21 Feb 2005 18:26:13 -0000	1.16
***************
*** 371,375 ****
  		nRed = 10;
  		nGreen = 10;
! 		nBlue = 100;
  		maPalette1[k] = nRed + (nGreen << 8) + (nBlue << 16) + (nAlpha << 24);
  	}
--- 371,375 ----
  		nRed = 10;
  		nGreen = 10;
! 		nBlue = 90;
  		maPalette1[k] = nRed + (nGreen << 8) + (nBlue << 16) + (nAlpha << 24);
  	}

Index: tcTorpedoObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcTorpedoObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcTorpedoObject.cpp	21 Dec 2004 02:26:18 -0000	1.3
--- tcTorpedoObject.cpp	21 Feb 2005 18:26:26 -0000	1.4
***************
*** 246,250 ****
      UpdateSpeedSimple(dt_s);
  
!     float speed_mps = C_KTSTOMPS * mcKin.mfSpeed_kts;
      float disp_m = speed_mps * dt_s; // distance moved this update
      float disp_rad = C_MTORAD * disp_m; // distance in equator radians
--- 246,250 ----
      UpdateSpeedSimple(dt_s);
  
!     float speed_mps = C_KTSTOMPS * cosf(mcKin.mfClimbAngle_rad) * mcKin.mfSpeed_kts;
      float disp_m = speed_mps * dt_s; // distance moved this update
      float disp_rad = C_MTORAD * disp_m; // distance in equator radians
***************
*** 252,256 ****
  
      float heading_rad = mcKin.mfHeading_rad;
-     float fGroundSpeed_kts = cosf(mcKin.mfClimbAngle_rad) * mcKin.mfSpeed_kts;
  
      mcKin.mfLon_rad += disp_rad * (double)(sinf(heading_rad) / cosf((float)mcKin.mfLat_rad));
--- 252,255 ----

Index: tcRadar.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcRadar.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** tcRadar.cpp	1 Feb 2005 02:29:15 -0000	1.24
--- tcRadar.cpp	21 Feb 2005 18:26:26 -0000	1.25
***************
*** 381,385 ****
                  (PTYPE_AIR | PTYPE_FIXED | PTYPE_MISSILE | PTYPE_SURFACE)) != 0);
  
!             if (CanDetectTarget(ptarget, fRange_km)) 
              {
                  UpdateTrack(ptarget, t);
--- 381,385 ----
                  (PTYPE_AIR | PTYPE_FIXED | PTYPE_MISSILE | PTYPE_SURFACE)) != 0);
  
!             if (isEligible && CanDetectTarget(ptarget, fRange_km)) 
              {
                  UpdateTrack(ptarget, t);