[Gcblue-commits] gcb_wx/src/common simmath.cpp,1.27,1.28 tcOptions.cpp,1.17,1.18 tcSound.cpp,1.32,1.
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-07-20 16:25:03
|
Update of /cvsroot/gcblue/gcb_wx/src/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4256/src/common Modified Files: simmath.cpp tcOptions.cpp tcSound.cpp Log Message: Index: simmath.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** simmath.cpp 28 Jun 2005 02:51:34 -0000 1.27 --- simmath.cpp 20 Jul 2005 16:24:53 -0000 1.28 *************** *** 366,414 **** if (isBearingOnly) { ! if (bearingRateValid) ! { ! const float dh_max = C_PIOVER180 * 15.0f; ! const float dh_min = -C_PIOVER180 * 15.0f; ! float dHeading = dt_s * bearingRate_radps; ! if (dHeading < dh_min) dHeading = dh_min; ! else if (dHeading > dh_max) dHeading = dh_max; ! td.mfHeading_rad = mfHeading_rad + dHeading; ! } ! else ! { ! td.mfHeading_rad = mfHeading_rad; ! } ! } ! else if (bHeadingValid) ! { ! td.mfHeading_rad = mfHeading_rad; } else { ! td.mfHeading_rad = 0; ! } ! if (bSpeedValid && bHeadingValid) ! { ! float fGroundSpeed_kts; ! if (bClimbValid) ! { ! fGroundSpeed_kts = mfSpeed_kts*cosf(mfClimbAngle_rad); ! } ! else ! { ! fGroundSpeed_kts = mfSpeed_kts; ! } ! float fRange_rad = fGroundSpeed_kts*C_KTSTORADPS*dt_s; ! nsNav::OffsetApprox(mfLat_rad,mfLon_rad, td.mfLat_rad,td.mfLon_rad, mfHeading_rad,fRange_rad); ! td.mfSpeed_kts = mfSpeed_kts; ! } ! else ! { ! td.mfLat_rad = mfLat_rad; ! td.mfLon_rad = mfLon_rad; ! td.mfSpeed_kts = 0; } --- 366,422 ---- if (isBearingOnly) { ! if (bearingRateValid) ! { ! const float dh_max = C_PIOVER180 * 15.0f; ! const float dh_min = -C_PIOVER180 * 15.0f; ! float dHeading = dt_s * bearingRate_radps; ! if (dHeading < dh_min) dHeading = dh_min; ! else if (dHeading > dh_max) dHeading = dh_max; ! td.mfHeading_rad = mfHeading_rad + dHeading; ! } ! else ! { ! td.mfHeading_rad = mfHeading_rad; ! } ! ! // bearing-only track arbitrarily plotted 10 km from sensing platform ! td.mfLat_rad = mfLat_rad; ! td.mfLon_rad = mfLon_rad; ! td.Offset(10.0f, td.mfHeading_rad); } else { ! if (bHeadingValid) ! { ! td.mfHeading_rad = mfHeading_rad; ! } ! else ! { ! td.mfHeading_rad = 0; ! } ! if (bSpeedValid && bHeadingValid) ! { ! float fGroundSpeed_kts; ! if (bClimbValid) ! { ! fGroundSpeed_kts = mfSpeed_kts*cosf(mfClimbAngle_rad); ! } ! else ! { ! fGroundSpeed_kts = mfSpeed_kts; ! } ! float fRange_rad = fGroundSpeed_kts*C_KTSTORADPS*dt_s; ! nsNav::OffsetApprox(mfLat_rad,mfLon_rad, td.mfLat_rad,td.mfLon_rad, mfHeading_rad,fRange_rad); ! td.mfSpeed_kts = mfSpeed_kts; ! } ! else ! { ! td.mfLat_rad = mfLat_rad; ! td.mfLon_rad = mfLon_rad; ! td.mfSpeed_kts = 0; ! } } *************** *** 418,421 **** --- 426,431 ---- td.mfAlt_m = mfAlt_m + fClimbRate_mps*dt_s; td.mfClimbAngle_rad = mfClimbAngle_rad; + + if ((mfAlt_m >= 0)&&(td.mfAlt_m < 0)) {td.mfAlt_m = 0;} } else *************** *** 425,428 **** --- 435,440 ---- } + wxASSERT((td.mfHeading_rad < 10.0f)&&(td.mfHeading_rad > -10.0f)); + td.bearingRate_radps = bearingRate_radps; // for bearing only tracks, copy rate td.mnFlags = mnFlags; *************** *** 432,436 **** td.mnAlliance = mnAlliance; td.mnClassification = mnClassification; - if ((mfAlt_m >= 0)&&(td.mfAlt_m < 0)) {td.mfAlt_m = 0;} } --- 444,447 ---- Index: tcSound.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSound.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** tcSound.cpp 5 May 2005 02:14:51 -0000 1.32 --- tcSound.cpp 20 Jul 2005 16:24:54 -0000 1.33 *************** *** 133,150 **** void tcSound::InitOpenAL() { // create Sources's to use as buffers for (size_t n=0; n<N_EFFECT_BUFFERS; n++) ! { wxString stateName = wxString::Format("state%d", n); openalpp::ref_ptr<Source> source = new Source; source->stop(); source->setAmbient(); source->setGain(0.5f); // volume source->setLooping(false); effectBuffer.push_back(source); available.push_back(n); } } --- 133,161 ---- void tcSound::InitOpenAL() { + fprintf(stdout, "InitOpenAL - Initializing buffer "); + // create Sources's to use as buffers for (size_t n=0; n<N_EFFECT_BUFFERS; n++) ! { ! fprintf(stdout, "%d", n); wxString stateName = wxString::Format("state%d", n); openalpp::ref_ptr<Source> source = new Source; + fprintf(stdout, "."); source->stop(); + fprintf(stdout, "."); source->setAmbient(); + fprintf(stdout, "."); source->setGain(0.5f); // volume + fprintf(stdout, "."); source->setLooping(false); + fprintf(stdout, "."); effectBuffer.push_back(source); available.push_back(n); + + } + fprintf(stdout, "\n"); } Index: tcOptions.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOptions.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** tcOptions.cpp 16 Jul 2005 23:12:38 -0000 1.17 --- tcOptions.cpp 20 Jul 2005 16:24:54 -0000 1.18 *************** *** 79,85 **** oi.mnValue = 1; oi.mpAssociated = &mnMapMode; ! oi.mzCaption[0] = "MM 0"; ! oi.mzCaption[1] = "MM 1"; ! oi.mzCaption[2] = "MM 2"; AddOption(oi); --- 79,85 ---- oi.mnValue = 1; oi.mpAssociated = &mnMapMode; ! oi.mzCaption[0] = "Copper-Blue Map"; ! oi.mzCaption[1] = "Yellow-Blue Map"; ! oi.mzCaption[2] = "Black-Blue Map"; AddOption(oi); |