From dd3d56303715bd9215a2f6d6ad01b8b8d00ecf92 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Fri, 6 Apr 2018 13:23:01 +0200 Subject: [PATCH] More cleanup. --- src/fmri/DummyLayerVisualisation.hpp | 2 +- src/fmri/InputLayerVisualisation.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/fmri/DummyLayerVisualisation.hpp b/src/fmri/DummyLayerVisualisation.hpp index 6ca5a9e..a19c7bd 100644 --- a/src/fmri/DummyLayerVisualisation.hpp +++ b/src/fmri/DummyLayerVisualisation.hpp @@ -10,7 +10,7 @@ namespace fmri class DummyLayerVisualisation : public LayerVisualisation { public: - void draw(float time) override + void draw(float) override {}; }; } diff --git a/src/fmri/InputLayerVisualisation.cpp b/src/fmri/InputLayerVisualisation.cpp index 531ea3b..e083f17 100644 --- a/src/fmri/InputLayerVisualisation.cpp +++ b/src/fmri/InputLayerVisualisation.cpp @@ -4,7 +4,6 @@ #include #include "InputLayerVisualisation.hpp" #include "Range.hpp" -#include "RenderingState.hpp" #include "glutils.hpp" using namespace fmri; @@ -67,7 +66,7 @@ InputLayerVisualisation::InputLayerVisualisation(const LayerData &data) gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, width, height, GL_RGB, GL_FLOAT, imageData.data()); } -void InputLayerVisualisation::draw(float time) +void InputLayerVisualisation::draw(float) { const float vertices[] = { 0, 0, 0, @@ -83,7 +82,7 @@ void InputLayerVisualisation::draw(float time) 0, 0, }; - float alpha = RenderingState::instance().layerAlpha(); + float alpha = getAlpha(); drawImageTiles(4, vertices, texCoords, texture, alpha); }