matthias/openglplayground
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WIP: GUI Toolkit

Browse Source
This commit is contained in:
Matthias Blankertz
2015-03-09 01:11:13 +01:00
parent ffbc59140a
commit 9d7dd452c7
24 changed files with 1003 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
texture.cc
View File

@@ -101,10 +101,10 @@ void TextureCubeMap::bind() const
glBindTexture(GL_TEXTURE_CUBE_MAP, _texID);
}
Texture2D::Texture2D()
: texID_(0), width_(0), height_(0), alpha_(false)
{
}
// Texture2D::Texture2D()
// : texID_(0), width_(0), height_(0), alpha_(false)
// {
// }
Texture2D::Texture2D(unsigned width, unsigned height, bool alpha)
: texID_(0), width_(width), height_(height), alpha_(alpha)
@@ -202,14 +202,15 @@ void Texture2D::copyFromSurface(SDL_Surface *src)
surf = src;
}
if (SDL_MUSTLOCK(surf))
SDL_LockSurface(surf);
SDLSurfaceScopedLock lock{surf};
bind();
if(surf->format->Amask == 0)
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, surf->w, surf->h, GL_RGB, GL_UNSIGNED_BYTE, surf->pixels);
else
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, surf->w, surf->h, GL_RGBA, GL_UNSIGNED_BYTE, surf->pixels);
lock.unlock();
glGenerateMipmap(GL_TEXTURE_2D);
}