merge total remake

src/framework/graphics/texture.h

@@ -1,37 +1,13 @@
-/* The MIT License
- *
- * Copyright (c) 2010 OTClient, https://github.com/edubart/otclient
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
 #ifndef TEXTURE_H
 #define TEXTURE_H
 
-#include <global.h>
+#include "graphicsdeclarations.h"
 
 class Texture : public std::enable_shared_from_this<Texture>
 {
 public:
     /// Create a texture, width and height must be a multiple of 2
-    Texture(int width, int height, int channels, uchar *pixels = NULL);
+    Texture(int width, int height, int channels, uchar* pixels = NULL);
     virtual ~Texture();
 
     /// Enable texture bilinear filter (smooth scaled textures)
@@ -41,21 +17,18 @@ public:
     virtual uint getTextureId() const { return m_textureId; }
 
     /// Copy pixels from OpenGL texture
-    uchar *getPixels();
+    uchar* getPixels();
 
     const Size& getSize() const { return m_size; }
     const Size& getGlSize() const { return m_glSize; }
 
 protected:
     Texture() {  }
-    uint internalLoadGLTexture(uchar *pixels, int channels, int w, int h);
+    uint internalLoadGLTexture(uchar* pixels, int channels, int w, int h);
 
     uint m_textureId;
     Size m_size;
     Size m_glSize;
 };
 
-typedef std::shared_ptr<Texture> TexturePtr;
-typedef std::weak_ptr<Texture> TextureWeakPtr;
-
-#endif // TEXTURE_H
+#endif