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

Change drawing order depending on camera direction.

Browse Source
This commit is contained in:
Bert Peters
2018-04-11 13:24:33 +02:00
parent 63e487afce
commit 170c5658a5
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/fmri/RenderingState.cpp
View File

@@ -253,20 +253,23 @@ void RenderingState::render(float time) const
glPushMatrix(); glPushMatrix();
glTranslatef(-LAYER_X_OFFSET / 2 * currentData->size(), 0, 0);
for (auto i : Range(currentData->size())) { // Ensure we render back-to-front for transparency
glPushMatrix(); if (angle[0] <= 0) {
renderLayerName(currentData->at(i).name()); // Render from the first to the last layer.
if (options.renderLayers) { glTranslatef(-LAYER_X_OFFSET / 2 * currentData->size(), 0, 0);
layerVisualisations[i]->draw(time); for (auto i : Range(currentData->size())) {
} drawLayer(time, i);
if (options.renderInteractions && i < interactionAnimations.size() && interactionAnimations[i]) { glTranslatef(LAYER_X_OFFSET, 0, 0);
interactionAnimations[i]->draw(time);
} }
} else {
// Render from the last layer to the first layer.
glTranslatef(LAYER_X_OFFSET / 2 * (currentData->size() - 2), 0, 0);
for (auto i = currentData->size(); i--;) {
drawLayer(time, i);
glPopMatrix(); glTranslatef(-LAYER_X_OFFSET, 0, 0);
glTranslatef(LAYER_X_OFFSET, 0, 0); }
} }
glPopMatrix(); glPopMatrix();
@@ -276,6 +279,21 @@ void RenderingState::render(float time) const
glutSwapBuffers(); glutSwapBuffers();
} }
void RenderingState::drawLayer(float time, unsigned long i) const
{
glPushMatrix();
renderLayerName(currentData->at(i).name());
if (options.renderLayers) {
layerVisualisations[i]->draw(time);
}
if (options.renderInteractions && i < interactionAnimations.size() && interactionAnimations[i]) {
interactionAnimations[i]->draw(time);
}
glPopMatrix();
}
void RenderingState::renderOverlayText() const void RenderingState::renderOverlayText() const
{ {
std::stringstream overlayText; std::stringstream overlayText;

2
src/fmri/RenderingState.hpp
View File

@@ -90,5 +90,7 @@ namespace fmri
std::string debugInfo() const; std::string debugInfo() const;
void renderOverlayText() const; void renderOverlayText() const;
void renderLayerName(const std::string& name) const; void renderLayerName(const std::string& name) const;
void drawLayer(float time, unsigned long i) const;
}; };
} }