[Qt] QQuickMapboxGLRenderer is now a friend of QQuickMapboxGL
Simplify implementation by removing unsafe accessors from QQuickMapboxGL meant only to be used by QQuickMapboxGLRenderer.
This commit is contained in:
@@ -8,10 +8,12 @@
|
||||
#include <QPointF>
|
||||
#include <QQuickFramebufferObject>
|
||||
|
||||
#include <QMapbox>
|
||||
#include <QQuickMapboxGLStyle>
|
||||
|
||||
class QDeclarativeGeoServiceProvider;
|
||||
class QQuickItem;
|
||||
class QQuickMapboxGLRenderer;
|
||||
|
||||
class Q_DECL_EXPORT QQuickMapboxGL : public QQuickFramebufferObject
|
||||
{
|
||||
@@ -71,9 +73,6 @@ public:
|
||||
|
||||
Q_INVOKABLE void pan(int dx, int dy);
|
||||
|
||||
QList<QVariantMap>& layoutPropertyChanges() { return m_layoutChanges; }
|
||||
QList<QVariantMap>& paintPropertyChanges() { return m_paintChanges; }
|
||||
|
||||
// MapboxGL QML Type interface.
|
||||
void setStyle(QQuickMapboxGLStyle *);
|
||||
QQuickMapboxGLStyle* style() const;
|
||||
@@ -84,8 +83,36 @@ public:
|
||||
void setPitch(qreal pitch);
|
||||
qreal pitch() const;
|
||||
|
||||
QPointF swapPan();
|
||||
protected:
|
||||
// QQuickItem implementation.
|
||||
virtual void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value);
|
||||
|
||||
signals:
|
||||
void minimumZoomLevelChanged();
|
||||
void maximumZoomLevelChanged();
|
||||
void zoomLevelChanged(qreal zoomLevel);
|
||||
void centerChanged(const QGeoCoordinate &coordinate);
|
||||
void colorChanged(const QColor &color);
|
||||
|
||||
// Compatibility with Map QML Type, but no-op.
|
||||
void pluginChanged(QDeclarativeGeoServiceProvider *plugin);
|
||||
void errorChanged();
|
||||
void copyrightLinkActivated(const QString &link);
|
||||
void copyrightsVisibleChanged(bool visible);
|
||||
|
||||
void styleChanged();
|
||||
void bearingChanged(qreal angle);
|
||||
void pitchChanged(qreal angle);
|
||||
|
||||
public slots:
|
||||
void setCenter(const QGeoCoordinate ¢er);
|
||||
|
||||
private slots:
|
||||
void onMapChanged(QMapbox::MapChange);
|
||||
void onStyleChanged();
|
||||
void onStylePropertyUpdated(const QVariantMap ¶ms);
|
||||
|
||||
private:
|
||||
enum SyncState {
|
||||
NothingNeedsSync = 0,
|
||||
ZoomNeedsSync = 1 << 0,
|
||||
@@ -96,42 +123,11 @@ public:
|
||||
PitchNeedsSync = 1 << 5,
|
||||
};
|
||||
|
||||
int swapSyncState();
|
||||
|
||||
protected:
|
||||
// QQuickItem implementation.
|
||||
virtual void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value);
|
||||
|
||||
signals:
|
||||
void minimumZoomLevelChanged();
|
||||
void maximumZoomLevelChanged();
|
||||
void zoomLevelChanged(qreal zoomLevel);
|
||||
void centerChanged(const QGeoCoordinate &coordinate);
|
||||
|
||||
// Compatibility with Map QML Type, but no-op.
|
||||
void pluginChanged(QDeclarativeGeoServiceProvider *plugin);
|
||||
void errorChanged();
|
||||
void copyrightLinkActivated(const QString &link);
|
||||
void copyrightsVisibleChanged(bool visible);
|
||||
void colorChanged(const QColor &color);
|
||||
|
||||
void styleChanged();
|
||||
void bearingChanged(qreal angle);
|
||||
void pitchChanged(qreal angle);
|
||||
|
||||
public slots:
|
||||
void setCenter(const QGeoCoordinate ¢er);
|
||||
|
||||
private slots:
|
||||
void onStyleChanged();
|
||||
void onStylePropertyUpdated(const QVariantMap ¶ms);
|
||||
|
||||
private:
|
||||
qreal m_minimumZoomLevel = 0;
|
||||
qreal m_maximumZoomLevel = 20;
|
||||
qreal m_zoomLevel = 20;
|
||||
|
||||
QPointF m_pan = QPointF(0, 0);
|
||||
QPointF m_pan;
|
||||
|
||||
QGeoCoordinate m_center;
|
||||
QGeoShape m_visibleRegion;
|
||||
@@ -144,6 +140,9 @@ private:
|
||||
qreal m_pitch = 0;
|
||||
|
||||
int m_syncState = NothingNeedsSync;
|
||||
bool m_styleLoaded = false;
|
||||
|
||||
friend class QQuickMapboxGLRenderer;
|
||||
};
|
||||
|
||||
#endif // QQUICKMAPBOXGL_H
|
||||
|
||||
@@ -23,9 +23,7 @@ QQuickMapboxGL::~QQuickMapboxGL()
|
||||
|
||||
QQuickFramebufferObject::Renderer *QQuickMapboxGL::createRenderer() const
|
||||
{
|
||||
QQuickMapboxGLRenderer *renderer = new QQuickMapboxGLRenderer();
|
||||
connect(renderer, SIGNAL(styleChanged()), this, SIGNAL(styleChanged()));
|
||||
return renderer;
|
||||
return new QQuickMapboxGLRenderer;
|
||||
}
|
||||
|
||||
void QQuickMapboxGL::setPlugin(QDeclarativeGeoServiceProvider *)
|
||||
@@ -199,6 +197,7 @@ void QQuickMapboxGL::setStyle(QQuickMapboxGLStyle *style)
|
||||
}
|
||||
|
||||
m_syncState |= StyleNeedsSync;
|
||||
m_styleLoaded = false;
|
||||
update();
|
||||
|
||||
emit styleChanged();
|
||||
@@ -251,24 +250,6 @@ qreal QQuickMapboxGL::pitch() const
|
||||
return m_pitch;
|
||||
}
|
||||
|
||||
QPointF QQuickMapboxGL::swapPan()
|
||||
{
|
||||
QPointF oldPan = m_pan;
|
||||
|
||||
m_pan = QPointF(0, 0);
|
||||
|
||||
return oldPan;
|
||||
}
|
||||
|
||||
int QQuickMapboxGL::swapSyncState()
|
||||
{
|
||||
int oldState = m_syncState;
|
||||
|
||||
m_syncState = NothingNeedsSync;
|
||||
|
||||
return oldState;
|
||||
}
|
||||
|
||||
void QQuickMapboxGL::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
|
||||
{
|
||||
QQuickFramebufferObject::itemChange(change, value);
|
||||
@@ -290,6 +271,14 @@ void QQuickMapboxGL::itemChange(QQuickItem::ItemChange change, const QQuickItem:
|
||||
}
|
||||
}
|
||||
|
||||
void QQuickMapboxGL::onMapChanged(QMapbox::MapChange change)
|
||||
{
|
||||
if (change == QMapbox::MapChangeDidFinishLoadingStyle) {
|
||||
m_styleLoaded = true;
|
||||
update();
|
||||
}
|
||||
}
|
||||
|
||||
void QQuickMapboxGL::onStylePropertyUpdated(const QVariantMap ¶ms)
|
||||
{
|
||||
switch (params.value("type").toInt()) {
|
||||
|
||||
@@ -20,36 +20,12 @@ QQuickMapboxGLRenderer::QQuickMapboxGLRenderer()
|
||||
settings.setViewportMode(QMapboxGLSettings::FlippedYViewport);
|
||||
|
||||
m_map.reset(new QMapboxGL(nullptr, settings));
|
||||
connect(m_map.data(), SIGNAL(mapChanged(QMapbox::MapChange)), this, SLOT(onMapChanged(QMapbox::MapChange)));
|
||||
}
|
||||
|
||||
QQuickMapboxGLRenderer::~QQuickMapboxGLRenderer()
|
||||
{
|
||||
}
|
||||
|
||||
void QQuickMapboxGLRenderer::onMapChanged(QMapbox::MapChange change)
|
||||
{
|
||||
auto onMapChangeWillStartLoadingMap = [&]() {
|
||||
m_styleLoaded = false;
|
||||
};
|
||||
|
||||
auto onMapChangeDidFinishLoadingMap = [&]() {
|
||||
m_styleLoaded = true;
|
||||
emit styleChanged();
|
||||
};
|
||||
|
||||
switch (change) {
|
||||
case QMapbox::MapChangeWillStartLoadingMap:
|
||||
onMapChangeWillStartLoadingMap();
|
||||
break;
|
||||
case QMapbox::MapChangeDidFinishLoadingMap:
|
||||
onMapChangeDidFinishLoadingMap();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
QOpenGLFramebufferObject* QQuickMapboxGLRenderer::createFramebufferObject(const QSize &size)
|
||||
{
|
||||
m_map->resize(size);
|
||||
@@ -67,17 +43,16 @@ void QQuickMapboxGLRenderer::render()
|
||||
|
||||
void QQuickMapboxGLRenderer::synchronize(QQuickFramebufferObject *item)
|
||||
{
|
||||
auto quickMap = qobject_cast<QQuickMapboxGL*>(item);
|
||||
if (!m_initialized) {
|
||||
auto qquickMapbox = static_cast<QQuickMapboxGL*>(item);
|
||||
|
||||
QObject::connect(m_map.data(), &QMapboxGL::needsRendering, qquickMapbox, &QQuickMapboxGL::update);
|
||||
QObject::connect(this, &QQuickMapboxGLRenderer::centerChanged, qquickMapbox, &QQuickMapboxGL::setCenter);
|
||||
|
||||
QObject::connect(m_map.data(), &QMapboxGL::needsRendering, quickMap, &QQuickMapboxGL::update);
|
||||
QObject::connect(m_map.data(), SIGNAL(mapChanged(QMapbox::MapChange)), quickMap, SLOT(onMapChanged(QMapbox::MapChange)));
|
||||
QObject::connect(this, &QQuickMapboxGLRenderer::centerChanged, quickMap, &QQuickMapboxGL::setCenter);
|
||||
m_initialized = true;
|
||||
}
|
||||
|
||||
auto quickMap = static_cast<QQuickMapboxGL*>(item);
|
||||
auto syncStatus = quickMap->swapSyncState();
|
||||
auto syncStatus = quickMap->m_syncState;
|
||||
quickMap->m_syncState = QQuickMapboxGL::NothingNeedsSync;
|
||||
|
||||
if (syncStatus & QQuickMapboxGL::CenterNeedsSync || syncStatus & QQuickMapboxGL::ZoomNeedsSync) {
|
||||
const auto& center = quickMap->center();
|
||||
@@ -86,11 +61,11 @@ void QQuickMapboxGLRenderer::synchronize(QQuickFramebufferObject *item)
|
||||
|
||||
if (syncStatus & QQuickMapboxGL::StyleNeedsSync && quickMap->style()) {
|
||||
m_map->setStyleUrl(quickMap->style()->url());
|
||||
m_styleLoaded = false;
|
||||
}
|
||||
|
||||
if (syncStatus & QQuickMapboxGL::PanNeedsSync) {
|
||||
m_map->moveBy(quickMap->swapPan());
|
||||
m_map->moveBy(quickMap->m_pan);
|
||||
quickMap->m_pan = QPointF();
|
||||
emit centerChanged(QGeoCoordinate(m_map->latitude(), m_map->longitude()));
|
||||
}
|
||||
|
||||
@@ -102,19 +77,17 @@ void QQuickMapboxGLRenderer::synchronize(QQuickFramebufferObject *item)
|
||||
m_map->setPitch(quickMap->pitch());
|
||||
}
|
||||
|
||||
if (m_styleLoaded) {
|
||||
if (!quickMap->layoutPropertyChanges().empty()) {
|
||||
for (const auto& change: quickMap->layoutPropertyChanges()) {
|
||||
m_map->setLayoutProperty(change.value("layer").toString(), change.value("property").toString(), change.value("value"));
|
||||
}
|
||||
quickMap->layoutPropertyChanges().clear();
|
||||
}
|
||||
|
||||
if (!quickMap->paintPropertyChanges().empty()) {
|
||||
for (const auto& change: quickMap->paintPropertyChanges()) {
|
||||
m_map->setPaintProperty(change.value("layer").toString(), change.value("property").toString(), change.value("value"), change.value("class").toString());
|
||||
}
|
||||
quickMap->paintPropertyChanges().clear();
|
||||
}
|
||||
if (!quickMap->m_styleLoaded) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (const auto& change: quickMap->m_layoutChanges) {
|
||||
m_map->setLayoutProperty(change.value("layer").toString(), change.value("property").toString(), change.value("value"));
|
||||
}
|
||||
quickMap->m_layoutChanges.clear();
|
||||
|
||||
for (const auto& change: quickMap->m_paintChanges) {
|
||||
m_map->setPaintProperty(change.value("layer").toString(), change.value("property").toString(), change.value("value"), change.value("class").toString());
|
||||
}
|
||||
quickMap->m_paintChanges.clear();
|
||||
}
|
||||
|
||||
@@ -25,14 +25,9 @@ public:
|
||||
|
||||
signals:
|
||||
void centerChanged(const QGeoCoordinate &);
|
||||
void styleChanged();
|
||||
|
||||
public slots:
|
||||
void onMapChanged(QMapbox::MapChange);
|
||||
|
||||
private:
|
||||
bool m_initialized = false;
|
||||
bool m_styleLoaded = false;
|
||||
|
||||
QScopedPointer<QMapboxGL> m_map;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user