1 files changed, 24 insertions, 6 deletions
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 3a240c24..2092dd60 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -36,6 +36,7 @@ Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene)
       m_isBarSpecRelative(true),
       m_barThicknessRatio(1.0f),
       m_barSpacing(QSizeF(1.0, 1.0)),
+      m_floorLevel(0.0f),
       m_renderer(0)
 {
     // Setting a null axis creates a new default axis according to orientation and graph type.
@@ -83,6 +84,12 @@ void Bars3DController::synchDataToRenderer()
         needSceneUpdate = true;
     }
 
+    // Floor level update requires data update, so do before abstract sync
+    if (m_changeTracker.floorLevelChanged) {
+        m_renderer->updateFloorLevel(m_floorLevel);
+        m_changeTracker.floorLevelChanged = false;
+    }
+
     Abstract3DController::synchDataToRenderer();
 
     // Notify changes to renderer
@@ -114,12 +121,10 @@ void Bars3DController::synchDataToRenderer()
         m_changeTracker.selectedBarChanged = false;
     }
 
-    if (needSceneUpdate) {
-        // Since scene is updated before axis updates are handled,
-        // do another render pass for scene update
-        m_scene->d_ptr->m_sceneDirty = true;
-        emitNeedRender();
-    }
+    // Since scene is updated before axis updates are handled, do another render pass to
+    // properly update controller side camera limits.
+    if (needSceneUpdate)
+        m_scene->d_ptr->markDirty();
 }
 
 void Bars3DController::handleArrayReset()
@@ -487,6 +492,19 @@ bool Bars3DController::isBarSpecRelative()
     return m_isBarSpecRelative;
 }
 
+void Bars3DController::setFloorLevel(float level)
+{
+    m_floorLevel = level;
+    m_isDataDirty = true;
+    m_changeTracker.floorLevelChanged = true;
+    emitNeedRender();
+}
+
+float Bars3DController::floorLevel() const
+{
+    return m_floorLevel;
+}
+
 void Bars3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
 {
     if (mode.testFlag(QAbstract3DGraph::SelectionSlice)