Linux compilation fix for barchart example

Tweaks

3 files changed, 7 insertions, 6 deletions

diff --git a/examples/datavis3d/barchart/main.cpp b/examples/datavis3d/barchart/main.cpp
index 00a77999..dba2d197 100644
--- a/examples/datavis3d/barchart/main.cpp
+++ b/examples/datavis3d/barchart/main.cpp
@@ -83,7 +83,7 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart)
     // Set bar type to smooth bar
     //m_chart->setBarType(Q3DBars::Bars, true);
     // Set bar colors
-    m_chart->setBarColor(QColor(Qt::black), QColor(Qt::cyan), QColor(Qt::darkGreen), false);
+    m_chart->setBarColor(QColor(Qt::black), QColor(Qt::green), QColor(Qt::black), false);
 }
 
 ChartDataGenerator::~ChartDataGenerator()
@@ -122,11 +122,12 @@ void ChartDataGenerator::start()
 
 void ChartDataGenerator::addDataSet()
 {
-    QVector<QVector<float>> data;
+    QVector< QVector<float> > data;
     QVector<float> row;
     for (int j = 0; j < m_rowCount; j++) {
         for (int i = 0; i < m_columnCount; i++) {
             row.append(((float)i / (float)m_columnCount) / 2.0f + (float)(rand() % 30) / 100);
+            //row.append(1.0f);
         }
         data.append(row);
         row.clear();
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index 4d202f0a..63d5b9e5 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -198,8 +198,8 @@ void Q3DBars::render()
         backgroundRotation = 0.0f;
     }
     //qDebug() << "projectionMatrix" << projectionMatrix;
-    QVector3D lightPos = QVector3D(0.0f, 2.0f, zComp); // above the center of bar chart // TODO: test to keep all z's positive
-//    QVector3D lightPos = QVector3D(0.0f, 1.5f, (d_ptr->m_sampleCount.y() / 2.0f));
+    //QVector3D lightPos = QVector3D(0.0f, 2.0f, zComp); // above the center of bar chart // TODO: test to keep all z's positive
+    QVector3D lightPos = QVector3D(0.0f, 1.5f, (d_ptr->m_sampleCount.y() / 2.0f));
 //    QVector3D lightPos = QVector3D(0.0f, 2.0f, (float)qSqrt((float)d_ptr->m_sampleCount.y()/3.0f));
 //    QVector3D lightPos = viewMatrix.row(0).toVector3D();
 //    lightPos.setY(lightPos.y() + 3.0f);
@@ -415,7 +415,7 @@ void Q3DBars::render()
 
             QVector3D barColor = baseColor + heightColor + depthColor;
 
-            float lightStrength = 4.0f;
+            float lightStrength = 5.0f;
             Q3DBarsPrivate::SelectionType selectionType = d_ptr->isSelected(row, bar, selection);
             switch (selectionType) {
             case Q3DBarsPrivate::Bar:
diff --git a/src/datavis3d/engine/shaders/fragmentShaderColorOnY b/src/datavis3d/engine/shaders/fragmentShaderColorOnY
index 782e5e01..e2b336e1 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderColorOnY
+++ b/src/datavis3d/engine/shaders/fragmentShaderColorOnY
@@ -8,7 +8,7 @@ uniform highp vec3 color_mdl;
 uniform highp float lightStrength;
 void main() {
         highp vec3 materialDiffuseColor = vec3(coords_mdl.y * color_mdl.x, coords_mdl.y * color_mdl.y, coords_mdl.y * color_mdl.z);
-        highp vec3 materialAmbientColor = vec3(0.1, 0.1, 0.1) * color_mdl;//materialDiffuseColor;
+        highp vec3 materialAmbientColor = vec3(0.2, 0.2, 0.2) * color_mdl;//materialDiffuseColor;
         highp vec3 materialSpecularColor = vec3(1.0, 1.0, 1.0);
         highp float distance = length(lightPosition_wrld - position_wrld);
         highp vec3 n = normalize(normal_cmr);