summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/datavisualization/data/qbar3dseries.cpp2
-rw-r--r--src/datavisualization/doc/qtdatavis3d.qdocconf3
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp2
-rw-r--r--src/datavisualizationqml2/abstractdeclarative.cpp72
-rw-r--r--src/datavisualizationqml2/abstractdeclarative_p.h18
5 files changed, 34 insertions, 63 deletions
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index c338b859..e2be7cc9 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -246,7 +246,7 @@ QPoint QBar3DSeries::invalidSelectionPosition()
static inline float quaternionAngle(const QQuaternion &rotation)
{
- return qAcos(rotation.scalar()) * 360.0f / M_PI;
+ return qRadiansToDegrees(qAcos(rotation.scalar())) * 2.f;
}
/*!
diff --git a/src/datavisualization/doc/qtdatavis3d.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf
index 63aa334d..71eb43ec 100644
--- a/src/datavisualization/doc/qtdatavis3d.qdocconf
+++ b/src/datavisualization/doc/qtdatavis3d.qdocconf
@@ -49,4 +49,5 @@ navigation.landingpage = Qt Data Visualization
navigation.cppclassespage = Qt Data Visualization C++ Classes
navigation.qmltypespage = Qt Data Visualization QML Types
-manifestmeta.highlighted.names += "QtDataVisualization/Bars Example"
+manifestmeta.highlighted.names = "QtDataVisualization/Bars Example" \
+ "QtDataVisualization/Qt Quick 2 Surface Multiseries Example"
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 9fa1eeb8..cad9b97c 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -1154,7 +1154,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
// Need to determine if camera is below graph top
float distanceToCenter = activeCamera->position().length()
/ activeCamera->zoomLevel() / m_autoScaleAdjustment * 100.0f;
- qreal cameraAngle = qreal(activeCamera->yRotation()) / 180.0 * M_PI;
+ qreal cameraAngle = qDegreesToRadians(qreal(activeCamera->yRotation()));
float cameraYPos = float(qSin(cameraAngle)) * distanceToCenter;
m_yFlippedForGrid = cameraYPos < (m_scaleYWithBackground - m_oldCameraTarget.y());
} else if (m_useOrthoProjection && activeCamera->yRotation() == 0.0f) {
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index a35970a7..03d1f41d 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -38,6 +38,12 @@
#include <qpa/qplatformnativeinterface.h>
#endif
+#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_WINRT)
+#define USE_SHARED_CONTEXT
+#else
+#include "glstatestore_p.h"
+#endif
+
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
static QList<const QQuickWindow *> clearList;
@@ -52,11 +58,7 @@ AbstractDeclarative::AbstractDeclarative(QQuickItem *parent) :
m_samples(0),
m_windowSamples(0),
m_initialisedSize(0, 0),
- #ifdef USE_SHARED_CONTEXT
- m_context(0),
- #else
- m_stateStore(0),
- #endif
+ m_contextOrStateStore(0),
m_qtContext(0),
m_mainThread(QThread::currentThread()),
m_contextThread(0)
@@ -352,60 +354,44 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller)
void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window)
{
-#ifdef USE_SHARED_CONTEXT
// We can assume we are not in middle of AbstractDeclarative destructor when we are here,
// since m_context creation is always done when this function is called from
// synchDataToRenderer(), which blocks main thread -> no need to mutex.
- if (!m_context || !m_qtContext || m_contextWindow != window) {
+ if (!m_contextOrStateStore || !m_qtContext || m_contextWindow != window) {
QOpenGLContext *currentContext = QOpenGLContext::currentContext();
// Note: Changing graph to different window when using multithreaded renderer will break!
- delete m_context;
+ delete m_contextOrStateStore;
m_contextThread = QThread::currentThread();
m_contextWindow = window;
m_qtContext = currentContext;
+
+#ifdef USE_SHARED_CONTEXT
m_context = new QOpenGLContext();
m_context->setFormat(m_qtContext->format());
m_context->setShareContext(m_qtContext);
m_context->create();
-
m_context->makeCurrent(window);
- m_controller->initializeOpenGL();
-
- // Make sure context gets deleted.
- QObject::connect(m_contextThread, &QThread::finished, this,
- &AbstractDeclarative::destroyContext, Qt::DirectConnection);
- } else {
- m_context->makeCurrent(window);
- }
#else
- // Shared contexts don't work properly in some platforms, so just store the
- // context state on those
- if (!m_stateStore || !m_qtContext || m_contextWindow != window) {
- QOpenGLContext *currentContext = QOpenGLContext::currentContext();
-
- // Note: Changing graph to different window when using multithreaded renderer will break!
-
- delete m_stateStore;
-
- m_contextThread = QThread::currentThread();
- m_contextWindow = window;
- m_qtContext = currentContext;
-
+ // Shared contexts don't work properly in some platforms, so just store the
+ // context state on those
m_stateStore = new GLStateStore(QOpenGLContext::currentContext());
-
m_stateStore->storeGLState();
+#endif
m_controller->initializeOpenGL();
- // Make sure state store gets deleted.
+ // Make sure context / state store gets deleted.
QObject::connect(m_contextThread, &QThread::finished, this,
&AbstractDeclarative::destroyContext, Qt::DirectConnection);
} else {
+#ifdef USE_SHARED_CONTEXT
+ m_context->makeCurrent(window);
+#else
m_stateStore->storeGLState();
- }
#endif
+ }
}
void AbstractDeclarative::doneOpenGLContext(QQuickWindow *window)
@@ -854,24 +840,14 @@ void AbstractDeclarative::windowDestroyed(QObject *obj)
void AbstractDeclarative::destroyContext()
{
-#ifdef USE_SHARED_CONTEXT
- // Context can be in another thread, don't delete it directly in that case
if (m_contextThread && m_contextThread != m_mainThread) {
- if (m_context)
- m_context->deleteLater();
+ if (m_contextOrStateStore)
+ m_contextOrStateStore->deleteLater();
} else {
- delete m_context;
+ delete m_contextOrStateStore;
}
- m_context = 0;
-#else
- if (m_contextThread && m_contextThread != m_mainThread) {
- if (m_stateStore)
- m_stateStore->deleteLater();
- } else {
- delete m_stateStore;
- }
- m_stateStore = 0;
-#endif
+ m_contextOrStateStore = 0;
+
if (m_contextThread) {
QObject::disconnect(m_contextThread, &QThread::finished, this,
&AbstractDeclarative::destroyContext);
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index f49da398..18cca6e2 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -50,13 +50,7 @@
#include <QtCore/QMutex>
#include <QtCore/QSharedPointer>
-#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_WINRT)
-#define USE_SHARED_CONTEXT
-#endif
-
-#ifndef USE_SHARED_CONTEXT
-#include "glstatestore_p.h"
-#endif
+class GLStateStore;
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
@@ -297,11 +291,11 @@ private:
int m_samples;
int m_windowSamples;
QSize m_initialisedSize;
-#ifdef USE_SHARED_CONTEXT
- QOpenGLContext *m_context;
-#else
- GLStateStore *m_stateStore;
-#endif
+ union {
+ QObject *m_contextOrStateStore;
+ QOpenGLContext *m_context;
+ GLStateStore *m_stateStore;
+ };
QPointer<QOpenGLContext> m_qtContext;
QThread *m_mainThread;
QThread *m_contextThread;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:09:00 +0000