Revert "Indentation style changed to Horstmann"

This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
This commit is contained in:
2014-04-12 01:48:15 +02:00
parent d7e65ff118
commit 3470a80f40
61 changed files with 697 additions and 354 deletions
+10 -5
View File
@@ -2,25 +2,30 @@
#include "Texture.h"
Texture::Texture(std::string path)
{ Load(path);
{
Load(path);
}
void Texture::Load(std::string path)
{ auto cachedTexture = m_TextureCache.find(path);
{
auto cachedTexture = m_TextureCache.find(path);
if (cachedTexture == m_TextureCache.end())
{ m_TextureCache[path] = SOIL_load_OGL_texture(path.c_str(), 0, 0, SOIL_FLAG_INVERT_Y);
{
m_TextureCache[path] = SOIL_load_OGL_texture(path.c_str(), 0, 0, SOIL_FLAG_INVERT_Y);
}
m_Texture = m_TextureCache[path];
}
void Texture::Bind()
{ glActiveTexture(GL_TEXTURE0);
{
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, m_Texture);
}
Texture::~Texture()
{ glDeleteTextures(1, &m_Texture);
{
glDeleteTextures(1, &m_Texture);
}