summaryrefslogtreecommitdiffstats
path: root/src/logic
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-01-20 16:33:53 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-01-22 14:29:34 +0000
commit86177b98e27a9d376e35039454986ff7de8f3104 (patch)
tree6ac256365641f538128666917f0b5090d873320a /src/logic
parent31e4d157c6b0af0c04546af643707a3811583455 (diff)
QAspectEngine/QAbstractAspects: get rid of setData
Getting rid of set data and the refactoring on setting the surface implies that: - Given the FrameGraph configuration, there may be several RenderViews each having a different RenderSurfaceSelector/Window - This means that the Renderer/QRenderAspect can't know about the surface before reading the scene - This means that the Renderer may be dealing with more than 1 window - This means that initialization, render and shutdown procedures will have to be updated accordingly Therefore the Renderer was refactored to: - Be initialized without knowing about a surface - For each RenderView, check the surface and if different from the previous one: * Make the context current with it * Create the appropriate glHelpers (as Surfaces may have != formats) TO DO: - Fix picking - Fix windows exposition - Fix shutdown / detection of all windows beging closed Change-Id: I49d070b05f46be4b26cfb57e494feba145d1da9c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/logic')
-rw-r--r--src/logic/qlogicaspect.cpp3
-rw-r--r--src/logic/qlogicaspect.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index 9941f4b1f..2efa505e2 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -105,9 +105,8 @@ QVector<QAspectJobPtr> QLogicAspect::jobsToExecute(qint64 time)
return jobs;
}
-void QLogicAspect::onInitialize(const QVariantMap &data)
+void QLogicAspect::onInitialize()
{
- Q_UNUSED(data);
}
void QLogicAspect::onCleanup()
diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h
index 3abc5e03b..b5323f25e 100644
--- a/src/logic/qlogicaspect.h
+++ b/src/logic/qlogicaspect.h
@@ -58,7 +58,7 @@ protected:
void registerBackendTypes();
private:
- void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE;
+ void onInitialize() Q_DECL_OVERRIDE;
void onStartup() Q_DECL_OVERRIDE;
void onShutdown() Q_DECL_OVERRIDE;
void onCleanup() Q_DECL_OVERRIDE;