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

Refactor vertex positioning to separate function.

Browse Source
This commit is contained in:
Bert Peters
2017-12-01 14:50:58 +01:00
parent a75a435bc5
commit 259e809c2f
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/FlatLayerVisualisation.cpp
View File

@@ -37,23 +37,9 @@ FlatLayerVisualisation::FlatLayerVisualisation(const fmri::LayerData &layer) :
auto scalingMax = max(abs(*minElem), abs(*maxElem)); auto scalingMax = max(abs(*minElem), abs(*maxElem));
int v = 0; int v = 0;
int j = 0;
for (int i = 0; i < limit; ++i) { for (int i = 0; i < limit; ++i) {
const float zOffset = -2 * i; setVertexPositions(i, vertexBuffer.get() + 12 * i);
const int vertexBase = i * 4; const int vertexBase = i * 4;
// Create the 4 vertices for the pyramid
vertexBuffer[j++] = -0.5f;
vertexBuffer[j++] = 0;
vertexBuffer[j++] = 0.5f + zOffset;
vertexBuffer[j++] = 0;
vertexBuffer[j++] = 0;
vertexBuffer[j++] = -0.5f + zOffset;
vertexBuffer[j++] = 0;
vertexBuffer[j++] = 1;
vertexBuffer[j++] = 0 + zOffset;
vertexBuffer[j++] = 0.5;
vertexBuffer[j++] = 0;
vertexBuffer[j++] = 0.5 + zOffset;
// Define the colors for the vertices // Define the colors for the vertices
for (int c = 0; c < 4; ++c) { for (int c = 0; c < 4; ++c) {
@@ -76,7 +62,6 @@ FlatLayerVisualisation::FlatLayerVisualisation(const fmri::LayerData &layer) :
indexBuffer[v++] = vertexBase + 3; indexBuffer[v++] = vertexBase + 3;
} }
assert(v == faceCount * 3); assert(v == faceCount * 3);
assert(j == faceCount * 3);
} }
void FlatLayerVisualisation::render() void FlatLayerVisualisation::render()
@@ -91,3 +76,22 @@ void FlatLayerVisualisation::render()
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_COLOR_ARRAY); glDisableClientState(GL_COLOR_ARRAY);
} }
void FlatLayerVisualisation::setVertexPositions(int vertexNo, float *destination)
{
int j = 0;
const float zOffset = -2 * vertexNo;
// Create the 4 vertices for the pyramid
destination[j++] = -0.5f;
destination[j++] = 0;
destination[j++] = 0.5f + zOffset;
destination[j++] = 0;
destination[j++] = 0;
destination[j++] = -0.5f + zOffset;
destination[j++] = 0;
destination[j++] = 1;
destination[j++] = 0 + zOffset;
destination[j++] = 0.5;
destination[j++] = 0;
destination[j++] = 0.5 + zOffset;
}

2
src/FlatLayerVisualisation.hpp
View File

@@ -19,5 +19,7 @@ namespace fmri
std::unique_ptr<float[]> vertexBuffer; std::unique_ptr<float[]> vertexBuffer;
std::unique_ptr<float[]> colorBuffer; std::unique_ptr<float[]> colorBuffer;
std::unique_ptr<int[]> indexBuffer; std::unique_ptr<int[]> indexBuffer;
void setVertexPositions(int vertexNo, float* destination);
}; };
} }