Ghettomerge

This commit is contained in:
Tobias Dahl
2014-03-11 22:32:49 +01:00
parent 33dbcc10a1
commit bb6cc1a23e
41 changed files with 892 additions and 648 deletions
+3 -3
View File
@@ -1,14 +1,14 @@
#include "Texture.h"
Texture::Texture( const char* path )
Texture::Texture(std::string path)
{
Load(path);
}
void Texture::Load( const char* path )
void Texture::Load(std::string path)
{
texture = SOIL_load_OGL_texture(path, 0, 0, SOIL_FLAG_INVERT_Y);
texture = SOIL_load_OGL_texture(path.c_str(), 0, 0, SOIL_FLAG_INVERT_Y);
}
void Texture::Bind()