Slightly more consise.

This commit is contained in:
2018-02-13 10:39:43 +01:00
parent 2192408ef9
commit 74cf511436
3 changed files with 5 additions and 2 deletions

View File

@@ -102,8 +102,7 @@ void fmri::throttleIdleFunc()
const auto diff = now - lastCalled; const auto diff = now - lastCalled;
if (diff < refreshRate) { if (diff < refreshRate) {
const auto remaining = refreshRate - diff; this_thread::sleep_for(refreshRate - diff);
this_thread::sleep_for(remaining);
} }
lastCalled = now; lastCalled = now;

View File

@@ -151,6 +151,7 @@ static void specialKeyFunc(int key, int, int)
static void idleFunc() static void idleFunc()
{ {
checkGLErrors(); checkGLErrors();
glutPostRedisplay();
throttleIdleFunc(); throttleIdleFunc();
} }

View File

@@ -28,6 +28,8 @@ fmri::LayerVisualisation *fmri::getVisualisationForLayer(const fmri::LayerData &
static vector <pair<DType, pair<size_t, size_t>>> static vector <pair<DType, pair<size_t, size_t>>>
computeActivityStrengths(const LayerData &prevState, const LayerInfo &layer) computeActivityStrengths(const LayerData &prevState, const LayerInfo &layer)
{ {
LOG(INFO) << "Computing top interactions for " << layer.name() << endl;
typedef pair <DType, pair<size_t, size_t>> Entry; typedef pair <DType, pair<size_t, size_t>> Entry;
vector <Entry> result; vector <Entry> result;
@@ -72,6 +74,7 @@ fmri::ActivityAnimation *fmri::getActivityAnimation(const fmri::LayerData &prevS
unique_ptr<float[]> startingPositions(new float[bufferSize]); unique_ptr<float[]> startingPositions(new float[bufferSize]);
unique_ptr<float[]> endingPositions(new float[bufferSize]); unique_ptr<float[]> endingPositions(new float[bufferSize]);
LOG(INFO) << "Creating position buffers for interaction in " << layer.name() << endl;
for (auto i : Range(entries.size())) { for (auto i : Range(entries.size())) {
memcpy(startingPositions.get() + 3 * i, prevPositions.data() + 3 * entries[i].second.first, 3 * sizeof(float)); memcpy(startingPositions.get() + 3 * i, prevPositions.data() + 3 * entries[i].second.first, 3 * sizeof(float));
memcpy(endingPositions.get() + 3 * i, curPositions.data() + 3 * entries[i].second.second, 3 * sizeof(float)); memcpy(endingPositions.get() + 3 * i, curPositions.data() + 3 * entries[i].second.second, 3 * sizeof(float));