From 50084b0b3451328a4dfe6db65c78a225e9c8f288 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 6 Sep 2018 19:57:40 +0800 Subject: +bitmap --- src/libjin/Graphics/Texture.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/libjin/Graphics/Texture.h') diff --git a/src/libjin/Graphics/Texture.h b/src/libjin/Graphics/Texture.h index 947021a..2586d63 100644 --- a/src/libjin/Graphics/Texture.h +++ b/src/libjin/Graphics/Texture.h @@ -4,8 +4,9 @@ #if JIN_MODULES_RENDER #include "../3rdparty/GLee/GLee.h" -#include "color.h" -#include "drawable.h" +#include "Color.h" +#include "Drawable.h" +#include "Bitmap.h" namespace jin { namespace graphics @@ -13,22 +14,14 @@ namespace graphics class Texture: public Drawable { - public: - static Texture* createTexture(const char* file); - static Texture* createTexture(const void* mem, size_t size); + static Texture* createTexture(Bitmap* bitmap); ~Texture(); - color getPixel(int x, int y); - private: Texture(); - bool loadb(const void* buffer, size_t size); - - color* pixels; - }; } // graphics -- cgit v1.1-26-g67d0