*misc

1 files changed, 14 insertions, 9 deletions

diff --git a/source/modules/asura-core/graphics/stb_decoder.cpp b/source/modules/asura-core/graphics/stb_decoder.cpp
index eff2e65..9a14141 100644
--- a/source/modules/asura-core/graphics/stb_decoder.cpp
+++ b/source/modules/asura-core/graphics/stb_decoder.cpp
@@ -8,49 +8,54 @@ namespace AsuraEngine
 	namespace Graphics
 	{
 
-		bool STBDecoder::CanDecode(const Filesystem::DataBuffer& buffer)
+		bool STBDecoder::CanDecode(IO::DataBuffer& buffer)
 		{
 			int w = 0;
 			int h = 0;
 			int comp = 0;
 
-			int status = stbi_info_from_memory((const stbi_uc*)buffer.data, buffer.size, &w, &h, &comp);
+			int status = stbi_info_from_memory((const stbi_uc*)buffer.GetData(), buffer.GetSize(), &w, &h, &comp);
 
 			return status == 1 && w > 0 && h > 0;
 		}
 
-		void STBDecoder::Decode(const Filesystem::DataBuffer& db, ImageData& imageData)
+		void STBDecoder::Decode(IO::DataBuffer& db, ImageData& imageData)
 		{
-			const stbi_uc *buffer = (const stbi_uc *)db.data;
-			int bufferlen = db.size;
+			const stbi_uc *buffer = (const stbi_uc *)db.GetData();
+			// databuffer���ݳ�
+			int bufferlen = db.GetSize();
+
 			int width, height;
 			int comp = 0;
 			byte* data = nullptr;
-			PixelFormat format = PIXELFORMAT_UNKNOWN;
+			ColorFormat format = COLOR_FORMAT_UNKNOWN;
 			std::size_t size = 0;
 
 			if (stbi_is_hdr_from_memory(buffer, bufferlen))
 			{
 				// 4��channel����float
 				data = (byte*)stbi_loadf_from_memory(buffer, bufferlen, &width, &height, &comp, STBI_rgb_alpha);
-				format = PIXELFORMAT_RGBA32F;
+				format = COLOR_FORMAT_RGBA32F;
 				size = width * height * 4 * sizeof(float);
 			}
 			else
 			{
 				data = (byte*)stbi_load_from_memory(buffer, bufferlen, &width, &height, &comp, STBI_rgb_alpha);
-				format = PIXELFORMAT_ASTC_8x5;
+				format = COLOR_FORMAT_RGBA8;
 				size = width * height * 4;
 			}
 			if (data)
 			{
-				// ��֤�ڴ汻�ͷţ���һ�������������ϲ������û���ͷŵ��������Ϊimage data��һ���Եģ�image���Ƕ�εġ�
+				imageData.Lock();
+
 				if (imageData.pixels)
 					delete[] imageData.pixels;
 				imageData.pixels = (byte*)data;
 				imageData.format = format;
 				imageData.width = width;
 				imageData.height = height;
+
+				imageData.Unlock();
 			}
 			else
 			{