Merge remote-tracking branch 'origin/master'

master
Benjamin Kraft 3 years ago
commit 12aa58bb53
  1. 4
      Fragment.glsl
  2. 5
      src/MainWindow.cpp

@ -6,8 +6,8 @@ uniform int iterationCount;
in vec2 complexPos; in vec2 complexPos;
vec3 getColor(in float value){ vec3 getColor(in float value){
vec3 red = vec3(0.5, 0, 0); vec3 red = vec3(1, 0, 0);
vec3 blue = vec3(0, 0, 0.5); vec3 blue = vec3(0, 0, 1);
return value * red + (1 - value) * blue; return value * red + (1 - value) * blue;
} }

@ -11,9 +11,10 @@ MainWindow::MainWindow() {
void MainWindow::buildUI() { void MainWindow::buildUI() {
resize(700, 700); resize(700, 700);
auto iterationsCaption = new QLabel("Iteration count:"); auto iterationsCaption = new QLabel("Iteration count: ");
auto iterationsLabel = new QLabel; auto iterationsLabel = new QLabel;
//iterationsLabel->setAlignment(Qt::AlignRight); iterationsLabel->setFixedWidth(50);
iterationsLabel->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
auto iterationsSlider = new QSlider(Qt::Horizontal); auto iterationsSlider = new QSlider(Qt::Horizontal);
iterationsSlider->setRange(5, 300); iterationsSlider->setRange(5, 300);
connect( connect(

Loading…
Cancel
Save