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

Use Color type wherever possible.

Browse Source
This commit is contained in:
Bert Peters
2018-04-03 19:22:14 +02:00
parent f62c2859e3
commit d4d4d6d431
5 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fmri/ActivityAnimation.cpp
View File

@@ -11,12 +11,12 @@
using namespace std;
using namespace fmri;
ActivityAnimation::Color ActivityAnimation::colorBySign(float intensity)
Color ActivityAnimation::colorBySign(float intensity)
{
if (intensity > 0) {
return {0, 1, 0};
return {0, 1, 0, 1};
} else {
return {1, 0, 0};
return {1, 0, 0, 1};
}
}
@@ -67,7 +67,7 @@ void ActivityAnimation::draw(float timeScale)
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_COLOR_ARRAY);
glColorPointer(3, GL_FLOAT, 0, colorBuf.data());
glColorPointer(std::tuple_size<Color>::value, GL_FLOAT, 0, colorBuf.data());
glVertexPointer(3, GL_FLOAT, 0, vertexBuffer.data());
glDrawArrays(GL_POINTS, 0, bufferLength / 3);
glDisableClientState(GL_COLOR_ARRAY);