Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 15 insertions, 0 deletions

diff --git a/src/render/backend/nodemanagers.cpp b/src/render/backend/nodemanagers.cpp
index d83623ce2..2647bbb1a 100644
--- a/src/render/backend/nodemanagers.cpp
+++ b/src/render/backend/nodemanagers.cpp
@@ -46,6 +46,7 @@
 #include <Qt3DRender/private/texturedatamanager_p.h>
 #include <Qt3DRender/private/geometryrenderermanager_p.h>
 #include <Qt3DRender/private/techniquemanager_p.h>
+#include <private/resourceaccessor_p.h>
 
 #include <QOpenGLVertexArrayObject>
 
@@ -88,8 +89,10 @@ NodeManagers::NodeManagers()
     , m_objectPickerManager(new ObjectPickerManager())
 //    , m_boundingVolumeDebugManager(new BoundingVolumeDebugManager())
     , m_lightManager(new LightManager())
+    , m_environmentLightManager(new EnvironmentLightManager())
     , m_computeJobManager(new ComputeCommandManager())
     , m_renderStateManager(new RenderStateManager())
+    , m_resourceAccessor(new ResourceAccessor(this))
 {
 }
 
@@ -126,11 +129,17 @@ NodeManagers::~NodeManagers()
     delete m_objectPickerManager;
 //    delete m_boundingVolumeDebugManager;
     delete m_lightManager;
+    delete m_environmentLightManager;
     delete m_computeJobManager;
     delete m_renderStateManager;
     delete m_renderNodesManager;
 }
 
+QSharedPointer<ResourceAccessor> NodeManagers::resourceAccessor()
+{
+    return m_resourceAccessor;
+}
+
 template<>
 CameraManager *NodeManagers::manager<CameraLens>() const Q_DECL_NOTHROW
 {
@@ -312,6 +321,12 @@ LightManager *NodeManagers::manager<Light>() const Q_DECL_NOTHROW
 }
 
 template<>
+EnvironmentLightManager *NodeManagers::manager<EnvironmentLight>() const Q_DECL_NOTHROW
+{
+    return m_environmentLightManager;
+}
+
+template<>
 ComputeCommandManager *NodeManagers::manager<ComputeCommand>() const Q_DECL_NOTHROW
 {
     return m_computeJobManager;