[Qt] Expose {add,remove}CustomLayer
This commit is contained in:
committed by
Thiago Marcos P. Santos
parent
0d4ccd4e44
commit
8ff17ffc9a
@@ -42,6 +42,22 @@ struct Q_DECL_EXPORT CameraOptions {
|
||||
Q_DECL_EXPORT NetworkMode networkMode();
|
||||
Q_DECL_EXPORT void setNetworkMode(NetworkMode);
|
||||
|
||||
// This struct is a 1:1 copy of mbgl::CustomLayerRenderParameters.
|
||||
struct Q_DECL_EXPORT CustomLayerRenderParameters {
|
||||
double width;
|
||||
double height;
|
||||
double latitude;
|
||||
double longitude;
|
||||
double zoom;
|
||||
double bearing;
|
||||
double pitch;
|
||||
double altitude;
|
||||
};
|
||||
|
||||
typedef void (*CustomLayerInitializeFunction)(void* context) ;
|
||||
typedef void (*CustomLayerRenderFunction)(void* context, const CustomLayerRenderParameters&);
|
||||
typedef void (*CustomLayerDeinitializeFunction)(void* context);
|
||||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE(QMapbox::Coordinate);
|
||||
|
||||
@@ -168,6 +168,14 @@ public:
|
||||
void setMargins(const QMargins &margins);
|
||||
QMargins margins() const;
|
||||
|
||||
void addCustomLayer(const QString &id,
|
||||
QMapbox::CustomLayerInitializeFunction,
|
||||
QMapbox::CustomLayerRenderFunction,
|
||||
QMapbox::CustomLayerDeinitializeFunction,
|
||||
void* context,
|
||||
char* before = NULL);
|
||||
void removeCustomLayer(const QString& id);
|
||||
|
||||
public slots:
|
||||
void render();
|
||||
void connectionEstablished();
|
||||
|
||||
@@ -542,6 +542,29 @@ QMargins QMapboxGL::margins() const
|
||||
);
|
||||
}
|
||||
|
||||
void QMapboxGL::addCustomLayer(const QString &id,
|
||||
QMapbox::CustomLayerInitializeFunction initFn,
|
||||
QMapbox::CustomLayerRenderFunction renderFn,
|
||||
QMapbox::CustomLayerDeinitializeFunction deinitFn,
|
||||
void *context_,
|
||||
char *before)
|
||||
{
|
||||
d_ptr->mapObj->addCustomLayer(
|
||||
id.toStdString(),
|
||||
reinterpret_cast<mbgl::CustomLayerInitializeFunction>(initFn),
|
||||
// This cast is safe as long as both mbgl:: and QMapbox::
|
||||
// CustomLayerRenderParameters members remains the same.
|
||||
(mbgl::CustomLayerRenderFunction)renderFn,
|
||||
reinterpret_cast<mbgl::CustomLayerDeinitializeFunction>(deinitFn),
|
||||
context_,
|
||||
before == NULL ? nullptr : before);
|
||||
}
|
||||
|
||||
void QMapboxGL::removeCustomLayer(const QString& id)
|
||||
{
|
||||
d_ptr->mapObj->removeCustomLayer(id.toStdString());
|
||||
}
|
||||
|
||||
void QMapboxGL::render()
|
||||
{
|
||||
d_ptr->mapObj->render();
|
||||
|
||||
Reference in New Issue
Block a user