From 70b82d1981c0de3c7b77670ff8abcfeb26815142 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 12 Mar 2019 00:39:26 +0800 Subject: *misc --- Source/Asura.Engine/Graphics/Image.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'Source/Asura.Engine/Graphics/Image.cpp') diff --git a/Source/Asura.Engine/Graphics/Image.cpp b/Source/Asura.Engine/Graphics/Image.cpp index 8287d76..e704945 100644 --- a/Source/Asura.Engine/Graphics/Image.cpp +++ b/Source/Asura.Engine/Graphics/Image.cpp @@ -1,3 +1,4 @@ +#include "Config.h" #include "Image.h" #include "GL.h" @@ -7,7 +8,6 @@ namespace AsuraEngine { Image::Image() - : Texture() { } @@ -16,18 +16,17 @@ namespace AsuraEngine } //创建\更新纹理像素信息 - bool Image::Load(const ImageData* data) + bool Image::Load(ImageData* data) { - if (!data) - return false; - if (mImageData) - delete mImageData; - mImageData = data; + ASSERT(data); + glBindTexture(GL_TEXTURE_2D, mTextureHandle); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, data->width, data->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data->pixels); glBindTexture(GL_TEXTURE_2D, 0); return true; + + RRA(data, mImageData); } } -} +} \ No newline at end of file -- cgit v1.1-26-g67d0