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

Actually show percentage done while loading.

Browse Source
This commit is contained in:
Bert Peters
2018-04-30 14:42:36 +02:00
parent c60d73d765
commit b820bb407f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fmri/RenderingState.cpp
View File

@@ -44,6 +44,8 @@ static void updatePointSize(float dir)
glPointSize(std::max(1.f, size)); glPointSize(std::max(1.f, size));
} }
static unsigned int loadingPct;
static void renderLoadingScreen() static void renderLoadingScreen()
{ {
glLoadIdentity(); glLoadIdentity();
@@ -52,12 +54,15 @@ static void renderLoadingScreen()
glColor3f(1, 1, 1); glColor3f(1, 1, 1);
glutWireTeapot(1); glutWireTeapot(1);
char state[1024];
std::snprintf(state, sizeof(state), "Loading... %u%%", loadingPct);
auto pulse = std::cos(2 * M_PI * getAnimationStep(std::chrono::seconds(3))); auto pulse = std::cos(2 * M_PI * getAnimationStep(std::chrono::seconds(3)));
pulse *= pulse; pulse *= pulse;
glColor3d(pulse, pulse, 0); glColor3d(pulse, pulse, 0);
glLoadIdentity(); glLoadIdentity();
setOrthographicProjection(); setOrthographicProjection();
renderText("Loading...", 5, 15); renderText(state, 5, 15);
restorePerspectiveProjection(); restorePerspectiveProjection();
} }
@@ -77,6 +82,7 @@ static VisualisationList loadVisualisations(const Options& options)
auto dumper = options.imageDumper(); auto dumper = options.imageDumper();
for (auto& input : options.inputs()) { for (auto& input : options.inputs()) {
loadingPct = 100 * result.size() / options.inputs().size();
LOG(INFO) << "Simulating " << input; LOG(INFO) << "Simulating " << input;
auto item = simulator.simulate(input); auto item = simulator.simulate(input);