From a407be072ddee7d7cddc3db81a88402eebff12e5 Mon Sep 17 00:00:00 2001 From: Remco Date: Tue, 21 Jun 2016 23:12:22 +0200 Subject: [PATCH] Revert "Revert "Revert "added loadingscreen clas""" This reverts commit 97448bfabf9e5e65749d9fbf2e3a71e0d4dcbcbb. --- LoadingScreen.cpp | 51 ----------------------------------------------- LoadingScreen.h | 15 -------------- 2 files changed, 66 deletions(-) delete mode 100644 LoadingScreen.cpp delete mode 100644 LoadingScreen.h diff --git a/LoadingScreen.cpp b/LoadingScreen.cpp deleted file mode 100644 index 247cc6f..0000000 --- a/LoadingScreen.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include "LoadingScreen.h" -#include -#include "CrystalPoint.h" -#include "Util.h" -#include - - -LoadingScreen::LoadingScreen() -{ - loading = "Loading..."; -} - - -LoadingScreen::~LoadingScreen() -{ -} - - - -void LoadingScreen::draw() -{ - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, CrystalPoint::width, CrystalPoint::height, 0, -10, 10); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - glDisable(GL_LIGHTING); - glDisable(GL_DEPTH_TEST); - glDisable(GL_TEXTURE_2D); - - - glColor4f(0.0f, 0.0f, 0.0f, 1.0f); - glBegin(GL_QUADS); - glVertex2f(0, 0); - glVertex2f(0, CrystalPoint::height); - glVertex2f(CrystalPoint::width, CrystalPoint::height); - glVertex2f(CrystalPoint::width, 0); - glEnd(); - - glColor4f(1.0f, 1.0f, 0.0f, 1.0f); - - Util::glutBitmapString(loading, - CrystalPoint::width / 2 - Util::glutTextWidth(loading), - CrystalPoint::height / 2 - 7); - - - glEnable(GL_LIGHTING); - glEnable(GL_DEPTH_TEST); - glutSwapBuffers(); -} diff --git a/LoadingScreen.h b/LoadingScreen.h deleted file mode 100644 index 01a7c96..0000000 --- a/LoadingScreen.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once -#include - -class LoadingScreen -{ -public: - LoadingScreen(); - ~LoadingScreen(); - - void draw(); - -private: - std::string loading; -}; -