fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next

Browse source
This commit is contained in:
Torsten Dreyer 2011-06-28 12:48:39 +02:00
commit 0d900923b2
19 changed files with 52 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/AIModel/AIAircraft.cxx
View file

@ -52,7 +52,11 @@ using std::string;
static string tempReg;
FGAIAircraft::FGAIAircraft(FGAISchedule *ref) : FGAIBase(otAircraft) {
FGAIAircraft::FGAIAircraft(FGAISchedule *ref) :
/* HOT must be disabled for AI Aircraft,
* otherwise traffic detection isn't working as expected.*/
FGAIBase(otAircraft, false)
{
trafficRef = ref;
if (trafficRef) {
groundOffset = trafficRef->getGroundOffset();

2
src/AIModel/AIBallistic.cxx
View file

@ -40,7 +40,7 @@ const double FGAIBallistic::slugs_to_kgs = 14.5939029372;
const double FGAIBallistic::slugs_to_lbs = 32.1740485564;
FGAIBallistic::FGAIBallistic(object_type ot) :
FGAIBase(ot),
FGAIBase(ot, false),
_height(0.0),
_speed(0),
_ht_agl_ft(0.0),

6
src/AIModel/AIBase.cxx
View file

@ -52,7 +52,7 @@ const double FGAIBase::lbs_to_slugs = 0.031080950172; //conversion factor
using namespace simgear;
FGAIBase::FGAIBase(object_type ot) :
FGAIBase::FGAIBase(object_type ot, bool enableHot) :
_max_speed(300),
_name(""),
_parent(""),
@ -121,6 +121,10 @@ FGAIBase::FGAIBase(object_type ot) :
p = 1e5;
a = 340;
Mach = 0;
// explicitly disable HOT for (most) AI models
if (!enableHot)
aip.getSceneGraph()->setNodeMask(~SG_NODEMASK_TERRAIN_BIT);
}
FGAIBase::~FGAIBase() {

2
src/AIModel/AIBase.hxx
View file

@ -52,7 +52,7 @@ public:
otEscort, otMultiplayer,
MAX_OBJECTS }; // Needs to be last!!!
FGAIBase(object_type ot);
FGAIBase(object_type ot, bool enableHot);
virtual ~FGAIBase();
virtual void readFromScenario(SGPropertyNode* scFileNode);

6
src/AIModel/AIManager.cxx
View file

@ -358,9 +358,9 @@ FGAIManager::loadScenarioFile(const std::string& filename)
SGPropertyNode_ptr root = new SGPropertyNode;
readProperties(path.str(), root);
return root;
} catch (const sg_exception &) {
SG_LOG(SG_GENERAL, SG_DEBUG, "Incorrect path specified for AI "
"scenario: \"" << path.str() << "\"");
} catch (const sg_exception &t) {
SG_LOG(SG_GENERAL, SG_ALERT, "Failed to load scenario '"
<< path.str() << "': " << t.getFormattedMessage());
return 0;
}
}

6
src/AIModel/AIMultiplayer.cxx
View file

@ -29,18 +29,18 @@
#include "AIMultiplayer.hxx"
#include <simgear/scene/util/SGNodeMasks.hxx>
// #define SG_DEBUG SG_ALERT
FGAIMultiplayer::FGAIMultiplayer() : FGAIBase(otMultiplayer) {
FGAIMultiplayer::FGAIMultiplayer() :
FGAIBase(otMultiplayer, false)
{
no_roll = false;
mTimeOffsetSet = false;
mAllowExtrapolation = true;
mLagAdjustSystemSpeed = 10;
mLastTimestamp = 0;
aip.getSceneGraph()->setNodeMask(~SG_NODEMASK_TERRAIN_BIT);
lastUpdateTime = 0;
}

3
src/AIModel/AIShip.cxx
View file

@ -42,7 +42,8 @@
FGAIShip::FGAIShip(object_type ot) :
FGAIBase(ot),
// allow HOT to be enabled
FGAIBase(ot, true),
_waiting(false),

2
src/AIModel/AIStatic.cxx
View file

@ -33,7 +33,7 @@ using std::string;
#include "AIStatic.hxx"
FGAIStatic::FGAIStatic() : FGAIBase(otStatic) {
FGAIStatic::FGAIStatic() : FGAIBase(otStatic, false) {
}

4
src/AIModel/AIStorm.cxx
View file

@ -35,7 +35,9 @@ using std::string;
#include "AIStorm.hxx"
FGAIStorm::FGAIStorm() : FGAIBase(otStorm) {
FGAIStorm::FGAIStorm() :
FGAIBase(otStorm, false)
{
delay = 3.6;
subflashes = 1;
timer = 0.0;

4
src/AIModel/AIThermal.cxx
View file

@ -35,7 +35,9 @@ using std::string;
#include "AIThermal.hxx"
FGAIThermal::FGAIThermal() : FGAIBase(otThermal) {
FGAIThermal::FGAIThermal() :
FGAIBase(otThermal, false)
{
max_strength = 6.0;
diameter = 0.5;
strength = factor = 0.0;

2
src/Airports/simple.cxx
View file

@ -442,7 +442,7 @@ void FGAirport::processThreshold(SGPropertyNode* aThreshold)
// first, let's identify the current runway
string id(aThreshold->getStringValue("rwy"));
if (!hasRunwayWithIdent(id)) {
SG_LOG(SG_GENERAL, SG_WARN, "FGAirport::processThreshold: "
SG_LOG(SG_GENERAL, SG_DEBUG, "FGAirport::processThreshold: "
"found runway not defined in the global data:" << ident() << "/" << id);
return;
}

4
src/Instrumentation/heading_indicator_dg.cxx
View file

@ -115,7 +115,7 @@ HeadingIndicatorDG::update (double dt)
// Next, calculate time-based precession
double offset = _offset_node->getDoubleValue();
offset -= dt * (0.25 / 60.0); // 360deg/day
SG_NORMALIZE_RANGE(offset, -360.0, 360.0);
offset = SGMiscd::normalizePeriodic(-360.0,360.0,offset);
_offset_node->setDoubleValue(offset);
// No magvar - set the alignment manually
@ -153,7 +153,7 @@ HeadingIndicatorDG::update (double dt)
_last_heading_deg = heading;
heading += offset + align + error;
SG_NORMALIZE_RANGE(heading, 0.0, 360.0);
heading = SGMiscd::normalizePeriodic(0.0,360.0,heading);
_heading_out_node->setDoubleValue(heading);

3
src/Main/CameraGroup.cxx
View file

@ -27,6 +27,7 @@
#include "WindowSystemAdapter.hxx"
#include <simgear/props/props.hxx>
#include <simgear/structure/OSGUtils.hxx>
#include <simgear/structure/OSGVersion.hxx>
#include <simgear/scene/material/EffectCullVisitor.hxx>
#include <simgear/scene/util/RenderConstants.hxx>
@ -191,8 +192,10 @@ void CameraGroup::update(const osg::Vec3d& position,
for (CameraList::iterator i = _cameras.begin(); i != _cameras.end(); ++i) {
const CameraInfo* info = i->get();
const View::Slave& slave = _viewer->getSlave(info->slaveIndex);
#if SG_OSG_VERSION_LESS_THAN(3,0,0)
// refreshes camera viewports (for now)
updateCameras(info);
#endif
Camera* camera = info->camera.get();
Matrix viewMatrix;
if ((info->flags & VIEW_ABSOLUTE) != 0)

10
src/Main/options.cxx
View file

@ -1167,6 +1167,15 @@ fgOptScenario( const char *arg )
return FG_OPTIONS_OK;
}
static int
fgOptNoScenarios( const char *arg )
{
SGPropertyNode_ptr ai_node = fgGetNode( "/sim/ai", true );
ai_node->removeChildren("scenario",false);
ai_node->setBoolValue( "enabled", false );
return FG_OPTIONS_OK;
}
static int
fgOptRunway( const char *arg )
{
@ -1465,6 +1474,7 @@ struct OptionDesc {
{"min-status", true, OPTION_STRING, "/sim/aircraft-min-status", false, "all", 0 },
{"livery", true, OPTION_FUNC, "", false, "", fgOptLivery },
{"ai-scenario", true, OPTION_FUNC, "", false, "", fgOptScenario },
{"disable-ai-scenarios", false, OPTION_FUNC, "", false, "", fgOptNoScenarios},
{"parking-id", true, OPTION_FUNC, "", false, "", fgOptParking },
{"version", false, OPTION_FUNC, "", false, "", fgOptVersion },
{"enable-fpe", false, OPTION_FUNC, "", false, "", fgOptFpe},

2
src/MultiPlayer/multiplaymgr.cxx
View file

@ -1205,7 +1205,7 @@ FGMultiplayMgr::ProcessPosMsg(const FGMultiplayMgr::MsgBuf& Msg,
else
{
// We failed to find the property. We'll try the next packet immediately.
SG_LOG(SG_NETWORK, SG_INFO, "FGMultiplayMgr::ProcessPosMsg - "
SG_LOG(SG_NETWORK, SG_DEBUG, "FGMultiplayMgr::ProcessPosMsg - "
"message from " << MsgHdr->Callsign << " has unknown property id "
<< id);
}

4
src/Navaids/airways.cxx
View file

@ -197,13 +197,13 @@ void Airway::Network::addEdge(Airway* aWay, const SGGeod& aStartPos,
FGPositionedRef end = FGPositioned::findClosestWithIdent(aEndIdent, aEndPos);
if (!start) {
SG_LOG(SG_GENERAL, SG_INFO, "unknown airways start pt: '" << aStartIdent << "'");
SG_LOG(SG_GENERAL, SG_DEBUG, "unknown airways start pt: '" << aStartIdent << "'");
start = FGPositioned::createUserWaypoint(aStartIdent, aStartPos);
return;
}
if (!end) {
SG_LOG(SG_GENERAL, SG_INFO, "unknown airways end pt: '" << aEndIdent << "'");
SG_LOG(SG_GENERAL, SG_DEBUG, "unknown airways end pt: '" << aEndIdent << "'");
end = FGPositioned::createUserWaypoint(aEndIdent, aEndPos);
return;
}

4
src/Navaids/navdb.cxx
View file

@ -297,12 +297,12 @@ FGRunway* getRunwayFromName(const std::string& aName)
const FGAirport* apt = fgFindAirportID(parts[0]);
if (!apt) {
SG_LOG(SG_GENERAL, SG_WARN, "navaid " << aName << " associated with bogus airport ID:" << parts[0]);
SG_LOG(SG_GENERAL, SG_DEBUG, "navaid " << aName << " associated with bogus airport ID:" << parts[0]);
return NULL;
}
if (!apt->hasRunwayWithIdent(parts[1])) {
SG_LOG(SG_GENERAL, SG_WARN, "navaid " << aName << " associated with bogus runway ID:" << parts[1]);
SG_LOG(SG_GENERAL, SG_DEBUG, "navaid " << aName << " associated with bogus runway ID:" << parts[1]);
return NULL;
}

2
src/Navaids/navrecord.cxx
View file

@ -61,7 +61,7 @@ FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent,
// assign our own defaults, unless the range is not set for some
// reason.
if (range < 0.1) {
SG_LOG(SG_GENERAL, SG_WARN, "navaid " << ident() << " has no range set, using defaults");
SG_LOG(SG_GENERAL, SG_DEBUG, "navaid " << ident() << " has no range set, using defaults");
switch (type()) {
case NDB:
case VOR:

4
src/Traffic/SchedFlight.cxx
View file

@ -269,13 +269,13 @@ bool FGScheduledFlight::initializeAirports()
departurePort = FGAirport::findByIdent(depId);
if(departurePort == NULL)
{
SG_LOG( SG_GENERAL, SG_WARN, "Traffic manager could not find departure airport : " << depId);
SG_LOG( SG_GENERAL, SG_DEBUG, "Traffic manager could not find departure airport : " << depId);
return false;
}
arrivalPort = FGAirport::findByIdent(arrId);
if(arrivalPort == NULL)
{
SG_LOG( SG_GENERAL, SG_WARN, "Traffic manager could not find arrival airport : " << arrId);
SG_LOG( SG_GENERAL, SG_DEBUG, "Traffic manager could not find arrival airport : " << arrId);
return false;
}