move Bitmap2DLoader codes to TextureLoader.h

inc/hgl/graph/TextureLoader.h

@@ -3,6 +3,7 @@
 
 #include<hgl/io/InputStream.h>
 #include<hgl/type/BaseString.h>
+#include<hgl/graph/Bitmap.h>
 namespace hgl
 {
     namespace graph
@@ -54,6 +55,27 @@ namespace hgl
             bool Load(io::InputStream *is);
             bool Load(const OSString &filename);
         };//class Texture2DLoader
+        
+        /**
+         * 2D位图加载
+         */
+        class Bitmap2DLoader:public Texture2DLoader
+        {
+        protected:
+
+            BitmapData *bmp=nullptr;
+
+        public:
+
+            ~Bitmap2DLoader();
+
+            void *OnBegin(uint32 total_bytes) override;
+            void OnEnd() override {}
+
+            BitmapData *GetBitmap();
+        };//class Bitmap2DLoader
+    
+        BitmapData *LoadBitmapFromFile(const OSString &filename);
     }//namespace graph
 }//namespace hgl
 #endif//HGL_GRAPH_TEXTURE_LOADER_INCLUDE

src/SceneGraph/Texture2DLoader.cpp

@@ -53,21 +53,15 @@ namespace hgl
 
     namespace graph
     {
-        class Bitmap2DLoader:public Texture2DLoader
-        {
-        protected:
-
-            BitmapData *bmp=nullptr;
-
-        public:
-
-            ~Bitmap2DLoader()
+        Bitmap2DLoader::~Bitmap2DLoader()
         {
             SAFE_CLEAR(bmp);
         }
 
-            void *OnBegin(uint32 total_bytes) override
+        void *Bitmap2DLoader::OnBegin(uint32 total_bytes)
         {
+            SAFE_CLEAR(bmp);
+
             bmp=new BitmapData;
 
             bmp->width      =file_header.width;
@@ -79,15 +73,12 @@ namespace hgl
             return bmp->data;
         }
 
-            void OnEnd() override {}
-
-            BitmapData *GetBitmap()
+        BitmapData *Bitmap2DLoader::GetBitmap()
         {
             BitmapData *result=bmp;
             bmp=nullptr;
             return result;
         }
-        };//class Bitmap2DLoader
     
         BitmapData *LoadBitmapFromFile(const OSString &filename)
         {