summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Krause <volker.krause@kdab.com>2016-04-10 10:31:59 +0200
committerVolker Krause <volker.krause@kdab.com>2016-04-12 16:37:43 +0000
commitfae5232d47844c49dc237757e874b1b261240cfe (patch)
treeae43ebd118e6d560dba7631856811e90150c7c49
parent7f92abdd1492560bca7b8f95dbedc1514e5a1a54 (diff)
Remove dead code.v5.7.0-beta1
Also, this was poorly duplicating code from the other ctor and would have crashed due to an uninitialized m_forwardRenderer. Change-Id: I5f4a04868362d07fe726931add986e1e2a415271 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--examples/qt3d/examples-common/qt3dwindow.cpp39
-rw-r--r--examples/qt3d/examples-common/qt3dwindow.h1
2 files changed, 0 insertions, 40 deletions
diff --git a/examples/qt3d/examples-common/qt3dwindow.cpp b/examples/qt3d/examples-common/qt3dwindow.cpp
index 741901aa6..bbf3ee51f 100644
--- a/examples/qt3d/examples-common/qt3dwindow.cpp
+++ b/examples/qt3d/examples-common/qt3dwindow.cpp
@@ -109,45 +109,6 @@ Qt3DWindow::Qt3DWindow(QScreen *screen)
m_inputSettings->setEventSource(this);
}
-Qt3DWindow::Qt3DWindow(QWindow *parent)
- : QWindow(parent)
- , m_aspectEngine(new Qt3DCore::QAspectEngine)
- , m_renderAspect(new Qt3DRender::QRenderAspect)
- , m_inputAspect(new Qt3DInput::QInputAspect)
- , m_logicAspect(new Qt3DLogic::QLogicAspect)
- , m_renderSettings(new Qt3DRender::QRenderSettings)
- , m_defaultCamera(new Qt3DRender::QCamera)
- , m_inputSettings(new Qt3DInput::QInputSettings)
- , m_root(new Qt3DCore::QEntity)
- , m_userRoot(nullptr)
- , m_initialized(false)
-{
- setSurfaceType(QSurface::OpenGLSurface);
-
- resize(1024, 768);
-
- QSurfaceFormat format;
- if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
- format.setVersion(4, 3);
- format.setProfile(QSurfaceFormat::CoreProfile);
- }
- format.setDepthBufferSize(24);
- format.setSamples(4);
- format.setStencilBufferSize(8);
- setFormat(format);
- create();
-
- m_aspectEngine->registerAspect(m_renderAspect);
- m_aspectEngine->registerAspect(m_inputAspect);
- m_aspectEngine->registerAspect(m_logicAspect);
-
- m_defaultCamera->setParent(m_root);
- m_forwardRenderer->setCamera(m_defaultCamera);
- m_forwardRenderer->setSurface(this);
- m_renderSettings->setActiveFrameGraph(m_forwardRenderer);
- m_inputSettings->setEventSource(this);
-}
-
Qt3DWindow::~Qt3DWindow()
{
}
diff --git a/examples/qt3d/examples-common/qt3dwindow.h b/examples/qt3d/examples-common/qt3dwindow.h
index 839d71497..90b660112 100644
--- a/examples/qt3d/examples-common/qt3dwindow.h
+++ b/examples/qt3d/examples-common/qt3dwindow.h
@@ -83,7 +83,6 @@ class Qt3DWindow : public QWindow
Q_OBJECT
public:
Qt3DWindow(QScreen *screen = nullptr);
- Qt3DWindow(QWindow *parent);
~Qt3DWindow();
void registerAspect(Qt3DCore::QAbstractAspect *aspect);