*合并master到minimal分支

6 files changed, 274 insertions, 239 deletions

diff --git a/src/lua/modules/audio/audio.cpp b/src/lua/modules/audio/audio.cpp
deleted file mode 100644
index 198323d..0000000
--- a/src/lua/modules/audio/audio.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "lua/modules/luax.h"
-#include "lua/modules/types.h"
-#include "lua/common/common.h"
-#include "libjin/jin.h"
-
-namespace JinEngine
-{
-    namespace Lua
-    {   
-
-	    using namespace JinEngine::Audio;
-	    using namespace JinEngine::Filesystem;
-
-	    typedef SDLAudio Audio;
-	    typedef SDLSource Source;
-
-        static int l_init(lua_State* L) 
-        {
-		    Audio::Setting setting;
-            setting.samplerate = 44100;
-            setting.samples = 44100;
-            if (!Audio::get()->init(&setting))
-            {
-                luax_error(L, "could not init audio");
-                luax_pushboolean(L, false);
-                return 1;
-            }
-            luax_pushboolean(L, true); 
-            return 1;
-        }
-
-        static int l_play(lua_State* L)
-        {
-            Audio::get()->play();
-            return 0;
-        }
-
-        static int l_stop(lua_State* L)
-        {
-            Audio::get()->stop();
-            return 0;
-        }
-
-        static int l_pause(lua_State* L)
-        {
-            Audio::get()->pause();
-            return 0;
-        }
-
-        static int l_resume(lua_State* L)
-        {
-            Audio::get()->resume();
-            return 0;
-        }
-
-        static int l_setVolume(lua_State* L)
-        {
-            float volume = luax_checknumber(L, 1);
-            Audio::get()->setVolume(volume);
-            return 0;
-        }
-
-        static int l_newSource(lua_State* L)
-        {
-            AssetDatabase* fs = AssetDatabase::get();
-            const char* f = luax_checkstring(L, 1);
-            Buffer b;
-            if (!fs->exists(f))
-            {
-                error(L, "No such image %s", f);
-                goto fail;
-            }
-            if (!fs->read(f, b))
-            {
-                error(L, "Failed to read source file %s", f);
-                goto fail;
-            }
-            Source* src = Source::createSource((void*)&b, b.size());
-            if (src == nullptr)
-            {
-                error(L, "Failed to decode source file %s", f);
-                goto fail;
-            }
-            Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_AUDIO_SOURCE, sizeof(Proxy));
-            proxy->bind(new Ref<Source>(src, JIN_AUDIO_SOURCE));
-            return 1;
-        fail:
-            luax_pushnil(L);
-            return 1;
-        }
-    
-        static int l_destroy(lua_State* L)
-        {
-            Audio* audio = Audio::get();
-            audio->quit();
-            return 0;
-        }
-
-        static const luaL_Reg f[] = {
-            { "init",      l_init      },
-            { "play",      l_play      },
-            { "stop",      l_stop      },
-            { "pause",     l_pause     },
-            { "resume",    l_resume    },
-            { "setVolume", l_setVolume },
-            { "newSource", l_newSource },
-            { "destroy",   l_destroy   },
-            { 0,           0           }
-        };
-
-        extern int luaopen_Source(lua_State* L);
-
-        int luaopen_audio(lua_State* L)
-        {
-            luaopen_Source(L);
-
-            luax_newlib(L, f);
-
-            return 1; 
-        }
-
-    } // namespace Lua
-} // namespace JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/audio/je_lua_audio.cpp b/src/lua/modules/audio/je_lua_audio.cpp
new file mode 100644
index 0000000..50c5268
--- /dev/null
+++ b/src/lua/modules/audio/je_lua_audio.cpp
@@ -0,0 +1,135 @@
+#include "lua/modules/luax.h"
+
+#include "lua/common/je_lua_common.h"
+#include "libjin/jin.h"
+#include "je_lua_source.h"
+
+using namespace JinEngine::Audio;
+using namespace JinEngine::Audio::SDL;
+using namespace JinEngine::Filesystem;
+
+namespace JinEngine
+{
+    namespace Lua
+    {   
+
+	    typedef SDLAudio Audio;
+	    typedef SDLSource Source;
+
+        struct
+        {
+            bool initialized = false;
+        } context;
+
+        LUA_IMPLEMENT int l_init(lua_State* L) 
+        {
+            if (context.initialized)
+            {
+                // Already initialized.
+                luax_pushboolean(L, true);
+                return 1;
+            }
+		    Audio::Setting setting;
+            setting.samplerate = 44100;
+            setting.samples = 44100;
+            context.initialized = Audio::get()->init(&setting);
+            if (!context.initialized)
+            {
+                luax_error(L, "could not init audio");
+                luax_pushboolean(L, false);
+                return 1;
+            }
+            luax_pushboolean(L, true); 
+            return 1;
+        }
+
+        LUA_IMPLEMENT int l_play(lua_State* L)
+        {
+            Audio::get()->play();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_stop(lua_State* L)
+        {
+            Audio::get()->stop();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_pause(lua_State* L)
+        {
+            Audio::get()->pause();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_resume(lua_State* L)
+        {
+            Audio::get()->resume();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_setVolume(lua_State* L)
+        {
+            float volume = luax_checknumber(L, 1);
+            Audio::get()->setVolume(volume);
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_newSource(lua_State* L)
+        {
+            AssetDatabase* fs = AssetDatabase::get();
+            const char* f = luax_checkstring(L, 1);
+            Buffer b;
+            try
+            {
+                if (!fs->exists(f))
+                    throw Exception("No such source file %s.", f);
+                fs->read(f, b);
+            }
+            catch (Exception& e)
+            {
+                error(L, "Failed to read source file %s", f);
+                luax_pushnil(L);
+                return 1;
+            }
+            Source* src = Source::createSource((void*)&b, b.size());
+            if (src == nullptr)
+            {
+                error(L, "Failed to decode source file %s", f);
+                luax_pushnil(L);
+                return 1;
+            }
+            Proxy* proxy = luax_newinstance(L, Jin_Lua_Source);
+            proxy->bind(new Shared<Source>(src, Jin_Lua_Source));
+            return 1;
+        }
+    
+        LUA_IMPLEMENT int l_destroy(lua_State* L)
+        {
+            Audio* audio = Audio::get();
+            audio->quit();
+            return 0;
+        }
+
+        LUA_EXPORT int luaopen_audio(lua_State* L)
+        {
+            luaopen_Source(L);
+
+            luaL_Reg f[] = {
+                { "init",      l_init      },
+                { "play",      l_play      },
+                { "stop",      l_stop      },
+                { "pause",     l_pause     },
+                { "resume",    l_resume    },
+                { "setVolume", l_setVolume },
+                { "newSource", l_newSource },
+                { "destroy",   l_destroy   },
+                { 0,           0           }
+            };
+
+            luax_newlib(L, f);
+
+            return 1; 
+        }
+
+    } // namespace Lua
+} // namespace JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/audio/je_lua_audio.h b/src/lua/modules/audio/je_lua_audio.h
new file mode 100644
index 0000000..fa66392
--- /dev/null
+++ b/src/lua/modules/audio/je_lua_audio.h
@@ -0,0 +1,6 @@
+#ifndef __JE_LUA_AUDIO_H__
+#define __JE_LUA_AUDIO_H__
+
+#include "je_lua_audio.h"
+
+#endif
\ No newline at end of file
diff --git a/src/lua/modules/audio/je_lua_source.cpp b/src/lua/modules/audio/je_lua_source.cpp
new file mode 100644
index 0000000..e152847
--- /dev/null
+++ b/src/lua/modules/audio/je_lua_source.cpp
@@ -0,0 +1,117 @@
+#include "libjin/jin.h"
+#include "lua/modules/luax.h"
+#include "lua/common/je_lua_common.h"
+
+
+using namespace JinEngine::Audio;
+
+namespace JinEngine
+{
+    namespace Lua
+    {
+
+        const char* Jin_Lua_Source = "Source";
+
+        typedef Shared<Source>& SharedSource;
+
+        LUA_IMPLEMENT inline SharedSource checkSource(lua_State* L)
+        {
+            Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Source);
+		    return proxy->getShared<Source>();
+        }
+
+        LUA_IMPLEMENT int l_play(lua_State* L)
+        {
+		    SharedSource shared = checkSource(L);
+            shared->play();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_stop(lua_State* L)
+        {
+		    SharedSource shared = checkSource(L);
+		    shared->stop();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_pause(lua_State* L)
+        {
+		    SharedSource shared = checkSource(L);
+		    shared->pause();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_rewind(lua_State* L)
+        {
+		    SharedSource shared = checkSource(L);
+		    shared->rewind();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_resume(lua_State* L)
+        {
+		    SharedSource shared = checkSource(L);
+		    shared->resume();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_isStop(lua_State* L)
+        {
+		    SharedSource shared = checkSource(L);
+            bool isStop = shared->isStopped();
+            luax_pushboolean(L, isStop);
+            return 1;
+        }
+
+        LUA_IMPLEMENT int l_isPaused(lua_State* L)
+        {
+		    SharedSource shared = checkSource(L);
+            bool isPaused = shared->isPaused();
+            luax_pushboolean(L, isPaused);
+            return 1;
+        }
+
+        LUA_IMPLEMENT int l_setVolume(lua_State* L)
+        {
+		    SharedSource shared = checkSource(L);
+            float volume = luax_checknumber(L, 2);
+		    shared->setVolume(volume);
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_setLoop(lua_State* L)
+        {
+		    SharedSource shared = checkSource(L);
+            bool loop = luax_checkbool(L, 2);
+		    shared->setLoop(loop);
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_gc(lua_State* L)
+        {
+            Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Source);
+            proxy->release();
+            return 0;
+        }
+    
+        LUA_EXPORT void luaopen_Source(lua_State* L)
+        {
+            luaL_Reg f[] = {
+                { "__gc",      l_gc        },
+                { "play",      l_play      },
+                { "stop",      l_stop      },
+                { "pause",     l_pause     },
+                { "resume",    l_resume    },
+                { "rewind",    l_rewind    },
+                { "isStop",    l_isStop    },
+                { "isPaused",  l_isPaused  },
+                { "setVolume", l_setVolume },
+                { "setLoop",   l_setLoop   },
+                { 0,           0           }
+            };
+
+            luax_newtype(L, Jin_Lua_Source, f);
+        }
+
+    } // namespace Lua
+} // namespace JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/audio/je_lua_source.h b/src/lua/modules/audio/je_lua_source.h
new file mode 100644
index 0000000..f7e6b48
--- /dev/null
+++ b/src/lua/modules/audio/je_lua_source.h
@@ -0,0 +1,16 @@
+#ifndef __JE_LUA_SOURCE_H__
+#define __JE_LUA_SOURCE_H__
+
+namespace JinEngine
+{
+    namespace Lua
+    {
+
+        extern const char* Jin_Lua_Source;
+
+        void luaopen_Source(lua_State* L);
+
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/lua/modules/audio/source.cpp b/src/lua/modules/audio/source.cpp
deleted file mode 100644
index bf43ceb..0000000
--- a/src/lua/modules/audio/source.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "libjin/jin.h"
-#include "lua/modules/luax.h"
-#include "lua/common/common.h"
-#include "lua/modules/types.h"
-
-namespace JinEngine
-{
-    namespace Lua
-    {
-
-	    using namespace JinEngine::Audio;
-
-        typedef Ref<Source>& SourceRef;
-
-        static inline SourceRef checkSource(lua_State* L)
-        {
-            Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_AUDIO_SOURCE);
-		    return proxy->getRef<Source>();
-        }
-
-        static int l_play(lua_State* L)
-        {
-		    SourceRef ref = checkSource(L);
-            ref->play();
-            return 0;
-        }
-
-        static int l_stop(lua_State* L)
-        {
-		    SourceRef ref = checkSource(L);
-		    ref->stop();
-            return 0;
-        }
-
-        static int l_pause(lua_State* L)
-        {
-		    SourceRef ref = checkSource(L);
-		    ref->pause();
-            return 0;
-        }
-
-        static int l_rewind(lua_State* L)
-        {
-		    SourceRef ref = checkSource(L);
-		    ref->rewind();
-            return 0;
-        }
-
-        static int l_resume(lua_State* L)
-        {
-		    SourceRef ref = checkSource(L);
-		    ref->resume();
-            return 0;
-        }
-
-        static int l_isStop(lua_State* L)
-        {
-		    SourceRef ref = checkSource(L);
-            bool isStop = ref->isStopped();
-            luax_pushboolean(L, isStop);
-            return 1;
-        }
-
-        static int l_isPaused(lua_State* L)
-        {
-		    SourceRef ref = checkSource(L);
-            bool isPaused = ref->isPaused();
-            luax_pushboolean(L, isPaused);
-            return 1;
-        }
-
-        static int l_setVolume(lua_State* L)
-        {
-		    SourceRef ref = checkSource(L);
-            float volume = luax_checknumber(L, 2);
-		    ref->setVolume(volume);
-            return 0;
-        }
-
-        static int l_setLoop(lua_State* L)
-        {
-		    SourceRef ref = checkSource(L);
-            bool loop = luax_checkbool(L, 2);
-		    ref->setLoop(loop);
-            return 0;
-        }
-
-        static int l_gc(lua_State* L)
-        {
-            Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_AUDIO_SOURCE);
-            proxy->release();
-            return 0;
-        }
-
-        static const luaL_Reg f[] = {
-            { "__gc",      l_gc        },
-            { "play",      l_play      },
-            { "stop",      l_stop      },
-            { "pause",     l_pause     },
-            { "resume",    l_resume    },
-            { "rewind",    l_rewind    },
-            { "isStop",    l_isStop    },
-            { "isPaused",  l_isPaused  },
-            { "setVolume", l_setVolume },
-            { "setLoop",   l_setLoop   },
-            { 0,           0           }
-        };
-    
-        int luaopen_Source(lua_State* L)
-        {
-            luax_newtype(L, JIN_AUDIO_SOURCE, f);
-            return 0; 
-        }
-
-    } // namespace Lua
-} // namespace JinEngine
\ No newline at end of file