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

Reduce copying in animation step.

Browse Source
This commit is contained in:
Bert Peters
2018-03-27 13:22:52 +02:00
parent e77c68f562
commit 76f92964bf
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fmri/ActivityAnimation.cpp
View File

@@ -51,7 +51,7 @@ ActivityAnimation::ActivityAnimation(
void ActivityAnimation::draw(float timeScale) void ActivityAnimation::draw(float timeScale)
{ {
const auto vertexBuffer = animate(startingPos, delta, timeScale); const auto &vertexBuffer = animate(startingPos, delta, timeScale);
glPointSize(5); glPointSize(5);
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);

2
src/fmri/ImageInteractionAnimation.cpp
View File

@@ -8,7 +8,7 @@ using namespace fmri;
void ImageInteractionAnimation::draw(float step) void ImageInteractionAnimation::draw(float step)
{ {
auto vertexBuffer = animate(startingPositions, deltas, step); auto &vertexBuffer = animate(startingPositions, deltas, step);
drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), texture); drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), texture);
} }

2
src/fmri/PoolingLayerAnimation.cpp
View File

@@ -30,7 +30,7 @@ PoolingLayerAnimation::PoolingLayerAnimation(const LayerData &prevData, const La
void PoolingLayerAnimation::draw(float timeStep) void PoolingLayerAnimation::draw(float timeStep)
{ {
auto vertexBuffer = animate(startingPositions, deltas, timeStep); auto& vertexBuffer = animate(startingPositions, deltas, timeStep);
drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), original); drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), original);
} }

5
src/fmri/utils.cpp
View File

@@ -16,9 +16,10 @@ std::default_random_engine &fmri::rng()
return rng; return rng;
} }
std::vector<float> fmri::animate(const std::vector<float> &start, const std::vector<float> &delta, float time) const std::vector<float> & fmri::animate(const std::vector<float> &start, const std::vector<float> &delta, float time)
{ {
auto vertexBuffer = delta; static std::vector<float> vertexBuffer;
vertexBuffer = delta;
caffe::caffe_scal(vertexBuffer.size(), time, vertexBuffer.data()); caffe::caffe_scal(vertexBuffer.size(), time, vertexBuffer.data());
caffe::caffe_add(start.size(), vertexBuffer.data(), start.data(), vertexBuffer.data()); caffe::caffe_add(start.size(), vertexBuffer.data(), start.data(), vertexBuffer.data());

2
src/fmri/utils.hpp
View File

@@ -238,5 +238,5 @@ namespace fmri
* @param time 0..1 where in the animation are we? * @param time 0..1 where in the animation are we?
* @return Resulting list of floats. * @return Resulting list of floats.
*/ */
std::vector<float> animate(const std::vector<float>& start, const std::vector<float>& delta, float time); const std::vector<float> & animate(const std::vector<float> &start, const std::vector<float> &delta, float time);
} }