aboutsummaryrefslogtreecommitdiffstats
path: root/src/texture.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-11-25 16:51:33 -0500
committerClyne Sullivan <tullivan99@gmail.com>2016-11-25 16:51:33 -0500
commit58b469223e6aef6323791141fb66d72d7d86d983 (patch)
treed678020776b185882e3ce1f5123ce867273eecfe /src/texture.cpp
parent34d992d75ea2b7f7c663dab6731ae819c4c54001 (diff)
fixes, dialog box
Diffstat (limited to 'src/texture.cpp')
-rw-r--r--src/texture.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/texture.cpp b/src/texture.cpp
index 1f80d38..3a2f071 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -67,7 +67,6 @@ namespace Texture{
#ifdef DEBUG
DEBUG_printf("Loaded image file: %s\n", fileName.c_str());
#endif // DEBUG
-
/*
* Load texture through OpenGL.
*/
@@ -77,10 +76,8 @@ namespace Texture{
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); // Sets the "min" filter
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); // The the "max" filter of the stack
-
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); // Wrap the texture to the matrix
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); //
-
glTexImage2D(GL_TEXTURE_2D, // Sets the texture to the image file loaded above
0,
GL_RGBA,
@@ -104,7 +101,7 @@ namespace Texture{
GLuint genColor(Color c)
{
std::string out;
-
+
// add the red
out += static_cast<int>(c.red);
@@ -140,7 +137,7 @@ namespace Texture{
GL_UNSIGNED_BYTE, // type
out.data() // source
);
-
+
return object;
}