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

refs #396, move subproject BlackSim into BlackMisc::Simulation

Browse Source 
* removed unused samples / tests
* fixed found Doxygen issues
* removed blacksimfreefunctions, now in BlackMisc::Simulation::registerMetadata()
* samples_vetcor_geo to samples_geo
This commit is contained in:
Klaus Basan
2015-04-03 18:17:54 +02:00
committed by Roland Winklmeier
parent a6ca57265e
commit 32f60722c8
148 changed files with 2577 additions and 2792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/simulator/fs9/callback_wrapper.h
View File

@@ -49,4 +49,4 @@ namespace BlackSimPlugin
}
}
#endif //BLACKSIMPLUGIN_FS9_CALLBACK_WRAPPER_H
#endif // guard

1
src/plugins/simulator/fs9/directplay_peer.h
View File

@@ -48,6 +48,7 @@ namespace BlackSimPlugin
//! Send a custom DirectPlay message
HRESULT sendMessage(const QByteArray &data);
//! Reset peer
void reset();
signals:

4
src/plugins/simulator/fs9/plugin_fs9.pro
View File

@@ -7,7 +7,7 @@ TARGET = simulator_fs9
TEMPLATE = lib
CONFIG += plugin shared
CONFIG += blackmisc blackcore blacksim
CONFIG += blackmisc blackcore
LIBS += -lsimulator_fscommon -lFSUIPC_User -luuid
@@ -23,10 +23,8 @@ SOURCES += *.cpp
HEADERS += *.h
win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \
../../../../lib/blacksim.lib \
../../../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \
../../../../lib/libblacksim.a \
../../../../lib/libblackcore.a
DESTDIR = ../../../../bin/plugins/simulator

4
src/plugins/simulator/fs9/simulator_fs9.cpp
View File

@@ -15,7 +15,7 @@
#include "multiplayer_packets.h"
#include "multiplayer_packet_parser.h"
#include "blackcore/interpolator_linear.h"
#include "blacksim/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/project.h"
#include "blackmisc/logmessage.h"
@@ -29,7 +29,7 @@ using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackSim;
using namespace BlackMisc::Simulation;
using namespace BlackSimPlugin::Fs9;
using namespace BlackSimPlugin::FsCommon;

6
src/plugins/simulator/fs9/simulator_fs9.h
View File

@@ -20,7 +20,7 @@
#include "blackcore/interpolator.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/aviation/aircraft.h"
#include "blacksim/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/pixmap.h"
#include <QObject>
#include <QtPlugin>
@@ -141,11 +141,13 @@ namespace BlackSimPlugin
Q_INTERFACES(BlackCore::ISimulatorFactory)
public:
//! Constructor
CSimulatorFs9Factory(QObject* parent = nullptr);
//! Destructor
virtual ~CSimulatorFs9Factory();
//! \copydoc BlackCore::ISimulatorFactory::create()
//! \copydoc BlackCore::ISimulatorFactory::create(ownAircraftProvider, remoteAircraftProvider, parent)
virtual BlackCore::ISimulator *create(
BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider,

4
src/plugins/simulator/fscommon/fsuipc.cpp
View File

@@ -13,14 +13,14 @@
// bug in FSUIPC_User.h, windows.h not included, so we have to import it first
#include "FSUIPC/FSUIPC_User.h"
#include "blacksim/fscommon/bcdconversions.h"
#include "blackmisc/simulation/fscommon/bcdconversions.h"
#include "blackmisc/logmessage.h"
#include <QDebug>
#include <QLatin1Char>
#include <QDateTime>
using namespace BlackMisc;
using namespace BlackSim::FsCommon;
using namespace BlackMisc::Simulation::FsCommon;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
using namespace BlackMisc::Geo;

2
src/plugins/simulator/fscommon/plugin_fscommon.pro
View File

@@ -21,10 +21,8 @@ SOURCES += *.cpp
HEADERS += *.h
win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \
../../../../lib/blacksim.lib \
../../../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \
../../../../lib/libblacksim.a \
../../../../lib/libblackcore.a
DESTDIR = ../../lib

11
src/plugins/simulator/fscommon/simulator_fscommon.cpp
View File

@@ -9,18 +9,17 @@
#include "simulator_fscommon.h"
#include "blackmisc/logmessage.h"
#include "blacksim/fscommon/vpilotmodelmappings.h"
#include "blacksim/fscommon/fscommonutil.h"
#include "blackmisc/simulation/fscommon/vpilotmodelmappings.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation;
using namespace BlackSim::FsCommon;
using namespace BlackMisc::Simulation::FsCommon;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
using namespace BlackMisc;
using namespace BlackSimPlugin::FsCommon;
using namespace BlackSim;
using namespace BlackSim::FsCommon;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::FsCommon;
namespace BlackSimPlugin
{

4
src/plugins/simulator/fscommon/simulator_fscommon.h
View File

@@ -14,7 +14,7 @@
#include "blackcore/simulator.h"
#include "blackcore/interpolator.h"
#include "blacksim/fscommon/aircraftmapper.h"
#include "blackmisc/simulation/fscommon/aircraftmapper.h"
#include "fsuipc.h"
#include <QObject>
@@ -108,7 +108,7 @@ namespace BlackSimPlugin
static void reverseLookupIcaoData(BlackMisc::Simulation::CAircraftModel &model);
//! Get the mapper singleton
static BlackSim::FsCommon::CAircraftMapper *mapperInstance();
static BlackMisc::Simulation::FsCommon::CAircraftMapper *mapperInstance();
protected slots:

4
src/plugins/simulator/fsx/plugin_fsx.pro
View File

@@ -7,7 +7,7 @@ TARGET = simulator_fsx
TEMPLATE = lib
CONFIG += plugin shared
CONFIG += blackmisc blackcore blacksim
CONFIG += blackmisc blackcore
LIBS += -lsimulator_fscommon -lSimConnect -lFSUIPC_User
@@ -23,10 +23,8 @@ SOURCES += *.cpp
HEADERS += *.h
win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \
../../../../lib/blacksim.lib \
../../../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \
../../../../lib/libblacksim.a \
../../../../lib/libblackcore.a
DESTDIR = ../../../../bin/plugins/simulator

14
src/plugins/simulator/fsx/simulator_fsx.cpp
View File

@@ -9,10 +9,10 @@
#include "simulator_fsx.h"
#include "simconnect_datadefinition.h"
#include "blacksim/fscommon/bcdconversions.h"
#include "blacksim/fsx/simconnectutilities.h"
#include "blacksim/fsx/fsxsimulatorsetup.h"
#include "blacksim/simulatorplugininfo.h"
#include "blackmisc/simulation/fscommon/bcdconversions.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"
#include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/project.h"
#include "blackmisc/aviation/airportlist.h"
@@ -29,9 +29,9 @@ using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation;
using namespace BlackSim;
using namespace BlackSim::FsCommon;
using namespace BlackSim::Fsx;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::FsCommon;
using namespace BlackMisc::Simulation::Fsx;
using namespace BlackCore;
namespace BlackSimPlugin

7
src/plugins/simulator/fsx/simulator_fsx.h
View File

@@ -17,7 +17,7 @@
#include "../fscommon/simulator_fscommon.h"
#include "blackcore/simulator.h"
#include "blackcore/interpolator_linear.h"
#include "blacksim/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/aviation/airportlist.h"
@@ -195,7 +195,7 @@ namespace BlackSimPlugin
uint m_nextObjID = 1; //!< object ID TODO: also used as request id, where to we place other request ids as for facilities
QHash<BlackMisc::Aviation::CCallsign, CSimConnectObject> m_simConnectObjects;
QFutureWatcher<bool> m_watcherConnect;
BlackSim::CSimulatorPluginInfo m_simulatorInfo;
BlackMisc::Simulation::CSimulatorPluginInfo m_simulatorInfo;
// statistics
qint64 m_statsUpdateAircraftTimeTotal = 0;
@@ -203,6 +203,7 @@ namespace BlackSimPlugin
int m_statsUpdateAircraftCount = 0;
};
//! Listener for FSX
class CSimulatorFsxListener : public BlackCore::ISimulatorListener {
Q_OBJECT
@@ -223,6 +224,6 @@ namespace BlackSimPlugin
};
}
} // namespace BlackCore
} // namespace
#endif // guard

14
src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp
View File

@@ -9,10 +9,10 @@
#include "simulator_fsx.h"
#include "simconnect_datadefinition.h"
#include "blacksim/fscommon/bcdconversions.h"
#include "blacksim/fsx/simconnectutilities.h"
#include "blacksim/fsx/fsxsimulatorsetup.h"
#include "blacksim/simulatorplugininfo.h"
#include "blackmisc/simulation/fscommon/bcdconversions.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"
#include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/project.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/logmessage.h"
@@ -23,9 +23,9 @@ using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Network;
using namespace BlackSim;
using namespace BlackSim::FsCommon;
using namespace BlackSim::Fsx;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::FsCommon;
using namespace BlackMisc::Simulation::Fsx;
namespace BlackSimPlugin
{

2
src/plugins/simulator/fsx/simulator_fsxfactory.cpp
View File

@@ -9,7 +9,7 @@
#include "simulator_fsxfactory.h"
#include "simulator_fsx.h"
#include "blacksim/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/project.h"
#include <QTimer>
#include <QtConcurrent>

2
src/plugins/simulator/fsx/simulator_fsxfactory.h
View File

@@ -13,7 +13,7 @@
#define BLACKSIMPLUGIN_SIMULATOR_FSXFACTORY_H
#include "blackcore/simulator.h"
#include "blacksim/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include <simconnect/SimConnect.h>
#include <QObject>

2
src/plugins/simulator/xplane/plugin_xplane.pro
View File

@@ -7,7 +7,7 @@ TARGET = simulator_xplane
TEMPLATE = lib
CONFIG += plugin shared
CONFIG += blackmisc blackcore blacksim
CONFIG += blackmisc blackcore
DEPENDPATH += . ../../../../src
INCLUDEPATH += . ../../../../src

2
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -22,7 +22,7 @@ using namespace BlackMisc::Network;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Geo;
using namespace BlackSim;
using namespace BlackMisc::Simulation;
namespace {
inline QString xbusServiceName() {

2
src/plugins/simulator/xplane/simulator_xplane.h
View File

@@ -13,7 +13,7 @@
#define BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
#include "blackcore/simulator.h"
#include "blackmisc/simulation/simdirectaccessownaircraft.h"
#include "blackmisc/simulation/ownaircraftprovider.h"
#include "blackmisc/pixmap.h"
#include <QDBusConnection>