bert/research-project
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More cleanup.

Browse Source
This commit is contained in:
Bert Peters
2018-04-06 13:23:01 +02:00
parent e54082c96a
commit dd3d563037
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fmri/DummyLayerVisualisation.hpp
View File

@@ -10,7 +10,7 @@ namespace fmri
class DummyLayerVisualisation : public LayerVisualisation class DummyLayerVisualisation : public LayerVisualisation
{ {
public: public:
void draw(float time) override void draw(float) override
{}; {};
}; };
} }

5
src/fmri/InputLayerVisualisation.cpp
View File

@@ -4,7 +4,6 @@
#include <opencv2/core.hpp> #include <opencv2/core.hpp>
#include "InputLayerVisualisation.hpp" #include "InputLayerVisualisation.hpp"
#include "Range.hpp" #include "Range.hpp"
#include "RenderingState.hpp"
#include "glutils.hpp" #include "glutils.hpp"
using namespace fmri; 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()); 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[] = { const float vertices[] = {
0, 0, 0, 0, 0, 0,
@@ -83,7 +82,7 @@ void InputLayerVisualisation::draw(float time)
0, 0, 0, 0,
}; };
float alpha = RenderingState::instance().layerAlpha(); float alpha = getAlpha();
drawImageTiles(4, vertices, texCoords, texture, alpha); drawImageTiles(4, vertices, texCoords, texture, alpha);
} }