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

* 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

View File

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

View File

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

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

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;

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,