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

Cleanup of dependencies.

Browse Source
This commit is contained in:
Bert Peters
2018-04-06 13:10:07 +02:00
parent 2138ce440a
commit 3269e40c11
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fmri/FlatLayerVisualisation.cpp
View File

@@ -69,7 +69,7 @@ FlatLayerVisualisation::FlatLayerVisualisation(const LayerData &layer, Ordering
patchTransparancy(); patchTransparancy();
} }
void FlatLayerVisualisation::draw(float time) void FlatLayerVisualisation::draw(float)
{ {
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_COLOR_ARRAY); glEnableClientState(GL_COLOR_ARRAY);

5
src/fmri/ImageInteractionAnimation.cpp
View File

@@ -1,7 +1,6 @@
#include "ImageInteractionAnimation.hpp" #include "ImageInteractionAnimation.hpp"
#include "glutils.hpp" #include "glutils.hpp"
#include "MultiImageVisualisation.hpp" #include "MultiImageVisualisation.hpp"
#include "RenderingState.hpp"
#include <caffe/util/math_functions.hpp> #include <caffe/util/math_functions.hpp>
using namespace fmri; using namespace fmri;
@@ -11,9 +10,7 @@ void ImageInteractionAnimation::draw(float step)
{ {
auto &vertexBuffer = animate(startingPositions, deltas, step); auto &vertexBuffer = animate(startingPositions, deltas, step);
float alpha = RenderingState::instance().interactionAlpha(); drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), texture, getAlpha());
drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), texture, alpha);
} }
ImageInteractionAnimation::ImageInteractionAnimation(const DType *data, const std::vector<int> &shape, const std::vector<float> &prevPositions, ImageInteractionAnimation::ImageInteractionAnimation(const DType *data, const std::vector<int> &shape, const std::vector<float> &prevPositions,

6
src/fmri/MultiImageVisualisation.cpp
View File

@@ -2,7 +2,6 @@
#include "MultiImageVisualisation.hpp" #include "MultiImageVisualisation.hpp"
#include "glutils.hpp" #include "glutils.hpp"
#include "Range.hpp" #include "Range.hpp"
#include "RenderingState.hpp"
using namespace fmri; using namespace fmri;
using namespace std; using namespace std;
@@ -25,10 +24,9 @@ MultiImageVisualisation::MultiImageVisualisation(const fmri::LayerData &layer)
texCoordBuffer = getTexCoords(channels); texCoordBuffer = getTexCoords(channels);
} }
void MultiImageVisualisation::draw(float time) void MultiImageVisualisation::draw(float)
{ {
float alpha = RenderingState::instance().layerAlpha(); drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), texCoordBuffer.data(), texture, getAlpha());
drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), texCoordBuffer.data(), texture, alpha);
} }
vector<float> MultiImageVisualisation::getVertices(const std::vector<float> &nodePositions, float scaling) vector<float> MultiImageVisualisation::getVertices(const std::vector<float> &nodePositions, float scaling)

5
src/fmri/PoolingLayerAnimation.cpp
View File

@@ -4,7 +4,6 @@
#include "PoolingLayerAnimation.hpp" #include "PoolingLayerAnimation.hpp"
#include "glutils.hpp" #include "glutils.hpp"
#include "MultiImageVisualisation.hpp" #include "MultiImageVisualisation.hpp"
#include "RenderingState.hpp"
using namespace std; using namespace std;
using namespace fmri; using namespace fmri;
@@ -33,9 +32,7 @@ void PoolingLayerAnimation::draw(float timeStep)
{ {
auto& vertexBuffer = animate(startingPositions, deltas, timeStep); auto& vertexBuffer = animate(startingPositions, deltas, timeStep);
float alpha = RenderingState::instance().interactionAlpha(); drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), original, getAlpha());
drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), original, alpha);
} }
Texture PoolingLayerAnimation::loadTextureForData(const LayerData &data) Texture PoolingLayerAnimation::loadTextureForData(const LayerData &data)