5 files changed, 10 insertions, 79 deletions

diff --git a/src/libjin/common/je_utf8.cpp b/src/libjin/common/je_utf8.cpp
deleted file mode 100644
index bd7ce94..0000000
--- a/src/libjin/common/je_utf8.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "../core/je_configuration.h"
-#if jin_os == jin_os_windows
-
-#include "je_utf8.h"
-
-namespace JinEngine
-{
-
-    std::string to_utf8(LPCWSTR wstr)
-    {
-        size_t wide_len = wcslen(wstr) + 1;
-
-        // Get size in UTF-8.
-        int utf8_size = WideCharToMultiByte(CP_UTF8, 0, wstr, wide_len, 0, 0, 0, 0);
-
-        char * utf8_str = new char[utf8_size];
-
-        // Convert to UTF-8.
-        int ok = WideCharToMultiByte(CP_UTF8, 0, wstr, wide_len, utf8_str, utf8_size, 0, 0);
-
-        if (!ok)
-        {
-            delete[] utf8_str;
-        }
-
-        return ok ? std::string(utf8_str) : std::string();
-    }
-
-    void replace_char(std::string & str, char find, char replace)
-    {
-        int length = str.length();
-
-        for (int i = 0; i<length; i++)
-        {
-            if (str[i] == find)
-                str[i] = replace;
-        }
-    }
-
-} // namespace JinEngine
-
-#endif // jin_os == jin_os_windows
\ No newline at end of file
diff --git a/src/libjin/common/je_utf8.h b/src/libjin/common/je_utf8.h
deleted file mode 100644
index a720640..0000000
--- a/src/libjin/common/je_utf8.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __JE_COMMON_UTF8_H__
-#define __JE_COMMON_UTF8_H__
-
-#include "../core/je_configuration.h"
-#if jin_os == jin_os_windows
-
-#include <string>
-#include <windows.h>
-
-namespace JinEngine
-{
-
-    /// 
-    /// Convert the wide string to a UTF-8 encoded string.
-    /// 
-    /// @param wstr The wide-char string.
-    /// @return A UTF-8 string.
-    /// 
-    std::string to_utf8(LPCWSTR wstr);
-
-    /// 
-    /// Replace all occurences of 'find' with 'replace' in a string.
-    ///
-    /// @param str The string to modify.
-    /// @param find The character to match.
-    /// @param replace The character to replace matches.
-    /// 
-    void replace_char(std::string & str, char find, char replace);
-
-} // namespace JinEngine
-
-#endif // jin_os == jin_os_windows
-
-#endif // __JE_COMMON_UTF8_H__
\ No newline at end of file
diff --git a/src/libjin/graphics/particles/je_particle_system.cpp b/src/libjin/graphics/particles/je_particle_system.cpp
index a6e9460..cb2472f 100644
--- a/src/libjin/graphics/particles/je_particle_system.cpp
+++ b/src/libjin/graphics/particles/je_particle_system.cpp
@@ -192,6 +192,14 @@ namespace JinEngine
                 va_end(args);
             }
 
+            void ParticleSystem::addParticleSprites(const std::vector<const Sprite*>& sprs)
+            {
+                for (const Sprite* spr : sprs)
+                {
+                    addParticleSprite(spr);
+                }
+            }
+
             void ParticleSystem::removeParticleSprite(uint i)
             {
                 mDef.particleDef.spritesDef.sprites.erase(mDef.particleDef.spritesDef.sprites.begin() + i);
diff --git a/src/libjin/graphics/particles/je_particle_system.h b/src/libjin/graphics/particles/je_particle_system.h
index 56043a5..4734313 100644
--- a/src/libjin/graphics/particles/je_particle_system.h
+++ b/src/libjin/graphics/particles/je_particle_system.h
@@ -131,6 +131,7 @@ namespace JinEngine
                 void setParticleSpritesMode(SpriteMode mode);
                 void addParticleSprite(const Sprite* sprite);
                 void addParticleSprites(uint count, ...);
+                void addParticleSprites(const std::vector<const Sprite*>& sprs);
                 void removeParticleSprite(uint i);
 
                 void enableParticleBlendAdditive(bool enable);
@@ -148,7 +149,6 @@ namespace JinEngine
                 void removeParticleTransparencyPoint(uint i);
 
             private:
-
                 friend class ParticleEmitter;
 
                 ///
@@ -190,6 +190,6 @@ namespace JinEngine
 
         } // namespace Particles
     } // namespace Graphics
-} // namespace JinEngine 
+} // namespace JinEngine
 
 #endif
\ No newline at end of file
diff --git a/src/libjin/utils/je_log.h b/src/libjin/utils/je_log.h
index f81bbae..3d34943 100644
--- a/src/libjin/utils/je_log.h
+++ b/src/libjin/utils/je_log.h
@@ -45,7 +45,6 @@ private:
     static std::ofstream fs;    // ����ļ��� 
 };
 
-
 typedef Loghelper::Level Loglevel;
 
 #if defined(jin_debug)