[Gcblue-commits] gcb_wx/src/sim tcAeroAirObject.cpp,1.8,1.9 tcGroundObject.cpp,1.2,1.3 tcLauncher.cp
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-02-18 17:42:00
|
Update of /cvsroot/gcblue/gcb_wx/src/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1814/src/sim Modified Files: tcAeroAirObject.cpp tcGroundObject.cpp tcLauncher.cpp tcPlatformObject.cpp Log Message: Parallel ai update Index: tcLauncher.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcLauncher.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcLauncher.cpp 1 Feb 2005 02:29:15 -0000 1.10 --- tcLauncher.cpp 18 Feb 2005 17:41:51 -0000 1.11 *************** *** 342,345 **** --- 342,385 ---- /** + * + */ + float tcLauncher::GetSectorCenter() const + { + if (fireControlSensor) + { + return fireControlSensor->mountAz_rad; + } + else + { + return pointingAngle; + } + } + + /** + * + */ + float tcLauncher::GetSectorWidth() const + { + if (fireControlSensor) + { + float fcFov = C_PIOVER180 * fireControlSensor->mpDBObj->mfFieldOfView_deg; + + if (meLaunchMode == SEEKER_TRACK) + { + return min(0.524f, fcFov); // guess 30 deg for seeker FOV, TODO: calculate true number + } + else + { + return fcFov; + } + } + else + { + return C_TWOPI; + } + } + + + /** * autopoint launchers will automatically point to target before launch * @return true if launcher is auto-pointable Index: tcGroundObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGroundObject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcGroundObject.cpp 1 Feb 2005 02:29:15 -0000 1.2 --- tcGroundObject.cpp 18 Feb 2005 17:41:51 -0000 1.3 *************** *** 114,117 **** --- 114,119 ---- UpdateSensors(afStatusTime); + UpdateAI(afStatusTime); + mfStatusTime = afStatusTime; } Index: tcPlatformObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcPlatformObject.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** tcPlatformObject.cpp 16 Feb 2005 23:13:49 -0000 1.35 --- tcPlatformObject.cpp 18 Feb 2005 17:41:51 -0000 1.36 *************** *** 876,880 **** brain = new Brain(this); ! brain->AddTask("TestTask", 1.0); mpDBObject = obj; --- 876,880 ---- brain = new Brain(this); ! //brain->AddTask("TestTask", 1.0); mpDBObject = obj; Index: tcAeroAirObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAeroAirObject.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcAeroAirObject.cpp 7 Nov 2004 03:40:45 -0000 1.8 --- tcAeroAirObject.cpp 18 Feb 2005 17:41:51 -0000 1.9 *************** *** 159,162 **** --- 159,164 ---- UpdateSensors(afStatusTime); + UpdateAI(afStatusTime); + mfStatusTime = afStatusTime; } |