X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FTexture.hpp;h=b47ab1cb1cb6d6c219cfe771f2747a9804bd1e6b;hb=8f372db25c010303cc25868b48cb5c0d0a540067;hp=54df61336cdecc4d6ba849d5fab29f9ba2a0a697;hpb=a3775aa01cd00672b37785365675f6842b9db2dc;p=lugaru.git diff --git a/Source/Graphic/Texture.hpp b/Source/Graphic/Texture.hpp index 54df613..b47ab1c 100644 --- a/Source/Graphic/Texture.hpp +++ b/Source/Graphic/Texture.hpp @@ -1,6 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) +Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -24,9 +24,9 @@ along with Lugaru. If not, see . #include "Graphic/gamegl.hpp" #include +#include #include #include -#include class TextureRes { @@ -49,15 +49,19 @@ public: /* Make sure TextureRes never gets copied */ TextureRes(TextureRes const& other) = delete; - TextureRes & operator=(TextureRes const& other) = delete; + TextureRes& operator=(TextureRes const& other) = delete; }; class Texture { private: std::shared_ptr tex; + public: - inline Texture(): tex(nullptr) {} + inline Texture() + : tex(nullptr) + { + } void load(const string& filename, bool hasMipmap); void load(const string& filename, bool hasMipmap, GLubyte* array, int* skinsizep); void bind();