Remove LoadingScreen from the ABI.

This commit is contained in:
2018-04-16 16:38:10 +02:00
parent d20f568836
commit 1fdb60f679
2 changed files with 17 additions and 20 deletions

View File

@@ -42,6 +42,23 @@ static void updatePointSize(float dir)
glPointSize(std::max(1.f, size)); glPointSize(std::max(1.f, size));
} }
static void renderLoadingScreen()
{
glLoadIdentity();
glTranslatef(0, 0, -4);
glRotatef(360 * getAnimationStep(std::chrono::seconds(4)), 0, 1, 0);
glColor3f(1, 1, 1);
glutWireTeapot(1);
auto pulse = std::cos(2 * M_PI * getAnimationStep(std::chrono::seconds(3)));
pulse *= pulse;
glColor3d(pulse, pulse, 0);
glLoadIdentity();
setOrthographicProjection();
renderText("Loading...", 5, 15);
restorePerspectiveProjection();
}
void RenderingState::move(unsigned char key, bool sprint) void RenderingState::move(unsigned char key, bool sprint)
{ {
float speed = 0.5f; float speed = 0.5f;
@@ -299,24 +316,6 @@ void RenderingState::renderVisualisation(float time) const
renderOverlayText(); renderOverlayText();
} }
void RenderingState::renderLoadingScreen() const
{
glLoadIdentity();
glTranslatef(0, 0, -4);
glRotatef(360 * getAnimationStep(std::chrono::seconds(4)), 0, 1, 0);
glColor3f(1, 1, 1);
glutWireTeapot(1);
auto pulse = std::cos(2 * M_PI * getAnimationStep(std::chrono::seconds(3)));
pulse *= pulse;
glColor3d(pulse, pulse, 0);
glLoadIdentity();
setOrthographicProjection();
renderText("Loading...", 5, 15);
restorePerspectiveProjection();
}
void RenderingState::drawLayer(float time, unsigned long i) const void RenderingState::drawLayer(float time, unsigned long i) const
{ {
glPushMatrix(); glPushMatrix();

View File

@@ -99,8 +99,6 @@ namespace fmri
void queueUpdate(); void queueUpdate();
void renderLoadingScreen() const;
void renderVisualisation(float time) const; void renderVisualisation(float time) const;
void loadGLItems(); void loadGLItems();