diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/3rdParty/Luax/luax_class.hpp | 17 | ||||
| -rw-r--r-- | Source/3rdParty/Luax/luax_runtime.cpp | 6 | ||||
| -rw-r--r-- | Source/Asura.Engine/Graphics/Shader.h | 4 | ||||
| -rw-r--r-- | Source/Asura.Engine/Physics/World.h | 2 | ||||
| -rw-r--r-- | Source/Asura.Engine/graphics/shader.h | 4 | ||||
| -rw-r--r-- | Source/Asura.Engine/physics/world.h | 2 | ||||
| -rw-r--r-- | Source/Samples/LuaxTest/main.cpp | 2 |
7 files changed, 12 insertions, 25 deletions
diff --git a/Source/3rdParty/Luax/luax_class.hpp b/Source/3rdParty/Luax/luax_class.hpp index 96124f0..0d3dc5b 100644 --- a/Source/3rdParty/Luax/luax_class.hpp +++ b/Source/3rdParty/Luax/luax_class.hpp @@ -17,9 +17,9 @@ namespace Luax /// LuaxGetFactoryName ùͬʱעʱעΪsingletonͨʱ /// #define LUAX_DECL_FACTORY(type) \ - static void RegisterLuaxClass(LuaxState&);\ - static void RegisterLuaxInterface(LuaxState&);\ - static void RegisterLuaxPostprocess(LuaxState&); \ + static void RegisterLuaxClass(Luax::LuaxState&);\ + static void RegisterLuaxInterface(Luax::LuaxState&);\ + static void RegisterLuaxPostprocess(Luax::LuaxState&); \ static const char* GetLuaxFactoryName() { return #type; };\ static const char* GetLuaxClassName() { return #type; };\ static bool IsLuaxClassSingleton() { return false; }; @@ -29,7 +29,7 @@ namespace Luax /// LuaxGetSingletonName õ /// #define LUAX_DECL_SINGLETON(type) \ - static void RegisterLuaxClass(LuaxState&); \ + static void RegisterLuaxClass(Luax::LuaxState&); \ static const char* GetLuaxSingletonName() { return #type; }; \ static const char* GetLuaxClassName() { return #type; }; \ static bool IsLuaxClassSingleton() { return true; }; @@ -55,13 +55,6 @@ namespace Luax /// bool PushLuaUserdata(LuaxState& state); - //------------------------------------------------------------------------------------------------------------ - - /// - /// reftableĹ - /// - void Ref(); - private: friend class LuaxState; @@ -120,7 +113,7 @@ namespace Luax LUAX_DECL_METHOD( l_GetClassName ); LUAX_DECL_METHOD( l_GetInterfaceTable ); - LUAX_DECL_METHOD(l_ToString); + LUAX_DECL_METHOD( l_ToString ); //------------------------------------------------------------------------------------------------------------ // diff --git a/Source/3rdParty/Luax/luax_runtime.cpp b/Source/3rdParty/Luax/luax_runtime.cpp index 3903d9c..47b20cb 100644 --- a/Source/3rdParty/Luax/luax_runtime.cpp +++ b/Source/3rdParty/Luax/luax_runtime.cpp @@ -25,10 +25,12 @@ namespace Luax { lua_State* L = lua_open(); assert(L); - // + + // 1. mContexts.insert(pair<lua_State*, Context>(L, Context(L))); - // ʼcontext + // 2. ʼcontext (*this)[L].Setup(); + return L; } diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h index 103c7b7..7c00dda 100644 --- a/Source/Asura.Engine/Graphics/Shader.h +++ b/Source/Asura.Engine/Graphics/Shader.h @@ -96,8 +96,6 @@ namespace AsuraEngine public: - //---------------------------------------------------------------------------------------------------------- - LUAX_DECL_FACTORY(SimShader); LUAX_DECL_METHOD(l_Use); @@ -113,8 +111,6 @@ namespace AsuraEngine LUAX_DECL_METHOD(l_SetUniformVector4); LUAX_DECL_METHOD(l_SetUniformColor); - //---------------------------------------------------------------------------------------------------------- - }; } diff --git a/Source/Asura.Engine/Physics/World.h b/Source/Asura.Engine/Physics/World.h index 71984f5..971adce 100644 --- a/Source/Asura.Engine/Physics/World.h +++ b/Source/Asura.Engine/Physics/World.h @@ -1,8 +1,8 @@ #ifndef __ASURA_ENGINE_WORLD_H__ #define __ASURA_ENGINE_WORLD_H__ -#include "Luax/luax.h" #include "Box2D/Box2D.h" +#include "scripting/luax.hpp" namespace AsuraEngine { diff --git a/Source/Asura.Engine/graphics/shader.h b/Source/Asura.Engine/graphics/shader.h index 103c7b7..7c00dda 100644 --- a/Source/Asura.Engine/graphics/shader.h +++ b/Source/Asura.Engine/graphics/shader.h @@ -96,8 +96,6 @@ namespace AsuraEngine public: - //---------------------------------------------------------------------------------------------------------- - LUAX_DECL_FACTORY(SimShader); LUAX_DECL_METHOD(l_Use); @@ -113,8 +111,6 @@ namespace AsuraEngine LUAX_DECL_METHOD(l_SetUniformVector4); LUAX_DECL_METHOD(l_SetUniformColor); - //---------------------------------------------------------------------------------------------------------- - }; } diff --git a/Source/Asura.Engine/physics/world.h b/Source/Asura.Engine/physics/world.h index 71984f5..971adce 100644 --- a/Source/Asura.Engine/physics/world.h +++ b/Source/Asura.Engine/physics/world.h @@ -1,8 +1,8 @@ #ifndef __ASURA_ENGINE_WORLD_H__ #define __ASURA_ENGINE_WORLD_H__ -#include "Luax/luax.h" #include "Box2D/Box2D.h" +#include "scripting/luax.hpp" namespace AsuraEngine { diff --git a/Source/Samples/LuaxTest/main.cpp b/Source/Samples/LuaxTest/main.cpp index a629da6..3d5eb34 100644 --- a/Source/Samples/LuaxTest/main.cpp +++ b/Source/Samples/LuaxTest/main.cpp @@ -227,7 +227,7 @@ function main() print(Asura.SimBoy.Foo()) print(Asura.EGender.BOY) - --Asura.EGender.BOY = 2 + Asura.EGender.BOY = 2 print(Asura.EGender.BOY) print(Asura.SimBoy.EHabits.Girls) print(Asura.EHabits.Girls) |