flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 15:15:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #789, FSX errors OPERATION_INVALID and EXCEPTION_UNRECOGNIZED_ID

Browse Source 
* only emit aircraft as rendered when object id is received, not before
* added CSimualtedAircraft to CSimConnectObject (so it can be used as signal argument)
* some utility functions to get callsign/simobject by id
This commit is contained in:
Klaus Basan
2016-10-24 03:33:46 +02:00
parent 6a8c8c8889
commit f8c9782da4
8 changed files with 187 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/simulator/fsx/simconnectobject.h
View File

@@ -12,7 +12,7 @@
#ifndef BLACKSIMPLUGIN_SIMCONNECT_OBJECT_H
#define BLACKSIMPLUGIN_SIMCONNECT_OBJECT_H
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include <QSharedPointer>
namespace BlackMisc { class IInterpolator; }
@@ -25,21 +25,20 @@ namespace BlackSimPlugin
class CSimConnectObject
{
public:
//! Constructor
CSimConnectObject();
//! Constructor
CSimConnectObject(const BlackMisc::Aviation::CCallsign &callsign, int requestId, int objectId, bool vtol);
CSimConnectObject(const BlackMisc::Simulation::CSimulatedAircraft &aircraft,int requestId);
//! Destructor
~CSimConnectObject() {}
//! Set callsign
void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { m_callsign = callsign; }
//! Get Callsign
BlackMisc::Aviation::CCallsign getCallsign() const { return m_callsign; }
BlackMisc::Aviation::CCallsign getCallsign() const { return m_aircraft.getCallsign(); }
//! Simulated aircraft (as added)
BlackMisc::Simulation::CSimulatedAircraft getAircraft() const { return m_aircraft; }
//! Set Simconnect request id
void setRequestId(int id) { m_requestId = id; }
@@ -54,16 +53,15 @@ namespace BlackSimPlugin
int getObjectId() const { return m_objectId; }
//! VTOL?
bool isVtol() const { return m_vtol; }
bool isVtol() const { return m_aircraft.isVtol(); }
//! VTOL?
void setVtol(bool vtol) { m_vtol = vtol; }
//! Was the object really added to SIM
bool hasValidRequestAndObjectId() const;
private:
BlackMisc::Aviation::CCallsign m_callsign;
BlackMisc::Simulation::CSimulatedAircraft m_aircraft;
int m_requestId = -1;
int m_objectId = -1;
bool m_vtol = false;
};
} // namespace
} // namespace