Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texture in loadings screen

Browse Source
This commit is contained in:
Remco
2016-06-22 01:40:53 +02:00
parent fea7728139
commit cdd3b962eb
4 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LoadingScreen.cpp
+21 -8
View File
@@ -1,5 +1,7 @@
#include "stb_image.h"
#include "LoadingScreen.h"
#include <GL\freeglut.h>
#include "CrystalPoint.h"
#include "Util.h"
#include <ostream>
@@ -22,20 +24,26 @@ void LoadingScreen::draw()
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glDisable(GL_LIGHTING);
glDisable(GL_LIGHTING);
glDisable(GL_DEPTH_TEST);
glDisable(GL_TEXTURE_2D);
glDisable(GL_COLOR_MATERIAL);
glEnable(GL_TEXTURE_2D);
glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glBindTexture(GL_TEXTURE_2D, textureId);
glBegin(GL_QUADS);
glTexCoord2f(0, 1);
glVertex2f(0, 0);
glTexCoord2f(0, 0);
glVertex2f(0, CrystalPoint::height);
glTexCoord2f(1, 0);
glVertex2f(CrystalPoint::width, CrystalPoint::height);
glVertex2f(CrystalPoint::width, 0);
glTexCoord2f(1, 1);
glVertex2f(CrystalPoint::width, 0);
glEnd();
glColor4f(1.0f, 1.0f, 0.0f, 1.0f);
/*glColor4f(1.0f, 1.0f, 0.0f, 1.0f);
std::ostringstream oss;
@@ -43,9 +51,9 @@ void LoadingScreen::draw()
Util::glutBitmapString(oss.str(),
CrystalPoint::width / 2 - Util::glutTextWidth(oss.str()),
CrystalPoint::height / 2 - 7);
CrystalPoint::height / 2 - 7);*/
glDisable(GL_TEXTURE_2D);
glEnable(GL_LIGHTING);
glEnable(GL_DEPTH_TEST);
glutSwapBuffers();
@@ -56,3 +64,8 @@ void LoadingScreen::rise()
points++;
draw();
}
void LoadingScreen::setTexture(const std::string filename)
{
textureId = Util::loadTexture(filename);
}