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

More generalized code.

Browse Source 
MultiImageLayer and FlatLayer now use the same code for arranging nodes,
rather than then same logic twice.
This commit is contained in:
Bert Peters
2018-02-27 15:32:38 +01:00
parent 2dec364b1b
commit 7fdce48259
5 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MultiImageVisualisation.cpp
View File

@@ -18,14 +18,8 @@ MultiImageVisualisation::MultiImageVisualisation(const fmri::LayerData &layer)
CHECK_EQ(1, images) << "Only single input image is supported" << endl;
nodePositions_.resize(channels * 3);
const int columns = numCols(channels);
texture = loadTexture(layer.data(), width, channels * height, channels);
for (auto i : Range(channels)) {
nodePositions_[3 * i + 0] = 0;
nodePositions_[3 * i + 1] = 3 * (i / columns);
nodePositions_[3 * i + 2] = -3 * (i % columns);
}
initNodePositions<Ordering::SQUARE>(channels, 3);
vertexBuffer = std::make_unique<float[]>(channels * BASE_VERTICES.size());
texCoordBuffer = std::make_unique<float[]>(channels * 2u * BASE_VERTICES.size() / 3);