BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Indentation style changed to Allman

Browse Source 
Using Artistic Style (http://astyle.sourceforge.net/)
Options:
--style=allman
--indent=tab
--keep-one-line-blocks
--align-pointer=type
--align-reference=name
This commit is contained in:
sippeangelo
2014-04-11 20:56:19 +02:00
parent 34bcfbce08
commit 4c081d0e1c
56 changed files with 599 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CubemapTexture.cpp
+15 -12
View File
@@ -15,7 +15,8 @@ CubemapTexture::CubemapTexture(std::string posXFile, std::string negXFile, std::
CubemapTexture::~CubemapTexture()
{
if (m_Texture != 0) {
if (m_Texture != 0)
{
//glDeleteTextures(1, &m_Texture);
}
}
@@ -25,17 +26,18 @@ void CubemapTexture::Load()
m_Loaded = true;
m_Texture = SOIL_load_OGL_cubemap(
m_TextureFiles[0].c_str(),
m_TextureFiles[1].c_str(),
m_TextureFiles[2].c_str(),
m_TextureFiles[3].c_str(),
m_TextureFiles[4].c_str(),
m_TextureFiles[5].c_str(),
SOIL_LOAD_AUTO,
SOIL_CREATE_NEW_ID,
0);
m_TextureFiles[0].c_str(),
m_TextureFiles[1].c_str(),
m_TextureFiles[2].c_str(),
m_TextureFiles[3].c_str(),
m_TextureFiles[4].c_str(),
m_TextureFiles[5].c_str(),
SOIL_LOAD_AUTO,
SOIL_CREATE_NEW_ID,
0);
if (m_Texture == 0) {
if (m_Texture == 0)
{
LOG_ERROR("SOIL cubemap loading error: %s", SOIL_last_result());
return;
}
@@ -49,7 +51,8 @@ void CubemapTexture::Load()
void CubemapTexture::Bind(GLenum textureUnit)
{
if (!m_Loaded) {
if (!m_Loaded)
{
LOG_WARNING("Cubemap \"%s\" was not loaded before being bound! Attempting to load now...", m_TextureFiles[0].c_str());
Load();
}