fly/flightgear
1
0
Fork 0
Code Activity

AIMultiplayer: Maintenance

Browse source 
scope conflict with parent variables
This commit is contained in:
Scott Giese 2022-01-15 20:01:58 -06:00
parent 1998ffce84
commit 4dce923ef3
1 changed files with 32 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/AIModel/AIMultiplayer.cxx
View file

@ -168,10 +168,12 @@ void FGAIMultiplayer::FGAIMultiplayerInterpolate(
std::vector<FGPropertyData*>::const_iterator prevPropItEnd; std::vector<FGPropertyData*>::const_iterator prevPropItEnd;
std::vector<FGPropertyData*>::const_iterator nextPropIt; std::vector<FGPropertyData*>::const_iterator nextPropIt;
std::vector<FGPropertyData*>::const_iterator nextPropItEnd; std::vector<FGPropertyData*>::const_iterator nextPropItEnd;
prevPropIt = prevIt->second.properties.begin(); prevPropIt = prevIt->second.properties.begin();
prevPropItEnd = prevIt->second.properties.end(); prevPropItEnd = prevIt->second.properties.end();
nextPropIt = nextIt->second.properties.begin(); nextPropIt = nextIt->second.properties.begin();
nextPropItEnd = nextIt->second.properties.end(); nextPropItEnd = nextIt->second.properties.end();
while (prevPropIt != prevPropItEnd) while (prevPropIt != prevPropItEnd)
{ {
PropertyMap::iterator pIt = mPropertyMap.find((*prevPropIt)->id); PropertyMap::iterator pIt = mPropertyMap.find((*prevPropIt)->id);
@ -181,7 +183,6 @@ void FGAIMultiplayer::FGAIMultiplayerInterpolate(
{ {
//cout << "Found " << pIt->second->getPath() << ":"; //cout << "Found " << pIt->second->getPath() << ":";
float val;
/* /*
* RJH - 2017-01-25 * RJH - 2017-01-25
* During multiplayer operations a series of crashes were encountered that affected all players * During multiplayer operations a series of crashes were encountered that affected all players
@ -206,24 +207,29 @@ void FGAIMultiplayer::FGAIMultiplayerInterpolate(
// fixes: https://sourceforge.net/p/flightgear/codetickets/1885/ // fixes: https://sourceforge.net/p/flightgear/codetickets/1885/
pIt->second->setIntValue((*nextPropIt)->int_value); pIt->second->setIntValue((*nextPropIt)->int_value);
break; break;
case simgear::props::FLOAT: case simgear::props::FLOAT:
case simgear::props::DOUBLE: case simgear::props::DOUBLE:
val = (1 - tau)*(*prevPropIt)->float_value + {
float val = (1 - tau)*(*prevPropIt)->float_value +
tau*(*nextPropIt)->float_value; tau*(*nextPropIt)->float_value;
//cout << "Flo: " << val << "\n";
pIt->second->setFloatValue(val); pIt->second->setFloatValue(val);
}
break; break;
case simgear::props::STRING: case simgear::props::STRING:
case simgear::props::UNSPECIFIED: case simgear::props::UNSPECIFIED:
//cout << "Str: " << (*nextPropIt)->string_value << "\n"; //cout << "Str: " << (*nextPropIt)->string_value << "\n";
pIt->second->setStringValue((*nextPropIt)->string_value); pIt->second->setStringValue((*nextPropIt)->string_value);
break; break;
default: default:
// FIXME - currently defaults to float values // FIXME - currently defaults to float values
val = (1 - tau)*(*prevPropIt)->float_value + {
float val = (1 - tau)*(*prevPropIt)->float_value +
tau*(*nextPropIt)->float_value; tau*(*nextPropIt)->float_value;
//cout << "Unk: " << val << "\n";
pIt->second->setFloatValue(val); pIt->second->setFloatValue(val);
}
break; break;
} }
} }
@ -365,21 +371,24 @@ static void s_MotionLogging(const std::string& _callsign, double tInterp, SGVec3
static SGVec3d s_pos_0; static SGVec3d s_pos_0;
static SGVec3d s_pos_prev; static SGVec3d s_pos_prev;
static double s_t_prev = -1; static double s_t_prev = -1;
SGVec3d pos = ecPos; SGVec3d pos2 = ecPos;
double sim_replay_time = fgGetDouble("/sim/replay/time"); double sim_replay_time = fgGetDouble("/sim/replay/time");
double t = fgGetBool("/sim/replay/replay-state") ? sim_replay_time : tInterp; double t = fgGetBool("/sim/replay/replay-state") ? sim_replay_time : tInterp;
if (s_t_prev == -1) if (s_t_prev == -1)
{ {
s_pos_0 = pos; s_pos_0 = pos2;
} }
double t_dt = t - s_t_prev; double t_dt = t - s_t_prev;
if (s_t_prev != -1 /*&& t_dt != 0*/) if (s_t_prev != -1 /*&& t_dt != 0*/)
{ {
SGVec3d delta_pos = pos - s_pos_prev; SGVec3d delta_pos = pos2 - s_pos_prev;
SGVec3d delta_pos_norm = normalize(delta_pos); SGVec3d delta_pos_norm = normalize(delta_pos);
double distance0 = length(pos - s_pos_0); double distance0 = length(pos2 - s_pos_0);
double distance = length(delta_pos); double distance = length(delta_pos);
double speed = (t_dt) ? distance / t_dt : -999; double speed = (t_dt) ? distance / t_dt : -999;
if (t_dt) if (t_dt)
{ {
SGPropertyNode* n0 = fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-values", true /*create*/); SGPropertyNode* n0 = fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-values", true /*create*/);
@ -406,30 +415,24 @@ static void s_MotionLogging(const std::string& _callsign, double tInterp, SGVec3
double user_to_mp_bearing = SGGeodesy::courseDeg(user_pos_geod, pos_geod); double user_to_mp_bearing = SGGeodesy::courseDeg(user_pos_geod, pos_geod);
double user_distance0 = length(user_pos - s_pos_0); double user_distance0 = length(user_pos - s_pos_0);
if (1)
{
fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-relative-distance", true /*create*/) fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-relative-distance", true /*create*/)
->addChild("value") ->addChild("value")
->setDoubleValue(user_to_mp_distance) ->setDoubleValue(user_to_mp_distance);
;
fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-relative-bearing", true /*create*/) fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-relative-bearing", true /*create*/)
->addChild("value") ->addChild("value")
->setDoubleValue(user_to_mp_bearing) ->setDoubleValue(user_to_mp_bearing);
;
fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-absolute-distance", true /*create*/) fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-absolute-distance", true /*create*/)
->addChild("value") ->addChild("value")
->setDoubleValue(distance0) ->setDoubleValue(distance0);
;
fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-user-absolute-distance", true /*create*/) fgGetNode("/sim/replay/log-raw-speed-multiplayer-post-user-absolute-distance", true /*create*/)
->addChild("value") ->addChild("value")
->setDoubleValue(user_distance0) ->setDoubleValue(user_distance0);
;
}
} }
if (t_dt) if (t_dt)
{ {
s_t_prev = t; s_t_prev = t;
s_pos_prev = pos; s_pos_prev = pos2;
} }
} }
} }
@ -633,17 +636,7 @@ void FGAIMultiplayer::update(double dt)
// the case tInterp = curentPkgTime need to be in the interpolation, to avoid a bug zeroing the position // the case tInterp = curentPkgTime need to be in the interpolation, to avoid a bug zeroing the position
double tau = 0; double tau = 0;
if (nextIt == mMotionInfo.end()) // Not sure this can happen. if (nextIt == mMotionInfo.begin())
{
/*
* RJH: 2017-02-16 another exception thrown here when running under debug (and hence huge frame delays)
* the value of nextIt was already end(); which I think means that we cannot run the entire next section of code.
*/
// Leave prevIt and nextIt pointing at same item.
--nextIt;
--prevIt;
}
else if (nextIt == mMotionInfo.begin())
{ {
// Leave prevIt and nextIt pointing at same item. // Leave prevIt and nextIt pointing at same item.
SG_LOG(SG_GENERAL, SG_DEBUG, "Only one frame for interpolation: " << _callsign); SG_LOG(SG_GENERAL, SG_DEBUG, "Only one frame for interpolation: " << _callsign);
@ -881,11 +874,12 @@ FGAIMultiplayer::addMotionInfo(FGExternalMotionData& motionInfo,
double dt = t_key - m_simple_time_recent_packet_time; double dt = t_key - m_simple_time_recent_packet_time;
if (dt != 0) if (dt != 0)
{ {
double e = 0.05; double ep = 0.05;
lagPpsAveraged = (1-e) * lagPpsAveraged + e * (1/dt); lagPpsAveraged = (1-ep) * lagPpsAveraged + ep * (1/dt);
props->setDoubleValue("lag/pps-averaged", lagPpsAveraged); props->setDoubleValue("lag/pps-averaged", lagPpsAveraged);
} }
} }
m_simple_time_recent_packet_time = t_key; m_simple_time_recent_packet_time = t_key;
// We use compensated time <t_key> as key in mMotionInfo. // We use compensated time <t_key> as key in mMotionInfo.