summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Bin/win64/LuaxTest.exebin557056 -> 557056 bytes
-rw-r--r--Build/3rdParty/Luax/Luax.vcxproj1
-rw-r--r--Build/3rdParty/Luax/Luax.vcxproj.filters1
-rw-r--r--Source/3rdParty/Luax/luax_class.hpp8
-rw-r--r--Source/3rdParty/Luax/luax_class.inl50
-rw-r--r--Source/3rdParty/Luax/luax_state.inl14
-rw-r--r--Source/Asura.Engine/scripting/portable.hpp2
-rw-r--r--Source/Samples/LuaxTest/main.cpp6
8 files changed, 40 insertions, 42 deletions
diff --git a/Bin/win64/LuaxTest.exe b/Bin/win64/LuaxTest.exe
index 679e70b..98c4eea 100644
--- a/Bin/win64/LuaxTest.exe
+++ b/Bin/win64/LuaxTest.exe
Binary files differ
diff --git a/Build/3rdParty/Luax/Luax.vcxproj b/Build/3rdParty/Luax/Luax.vcxproj
index bfefbb9..3da7f29 100644
--- a/Build/3rdParty/Luax/Luax.vcxproj
+++ b/Build/3rdParty/Luax/Luax.vcxproj
@@ -137,7 +137,6 @@
<ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_state.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax.cpp" />
<ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_cfunctions.cpp" />
<ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_class.cpp" />
<ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_context.cpp" />
diff --git a/Build/3rdParty/Luax/Luax.vcxproj.filters b/Build/3rdParty/Luax/Luax.vcxproj.filters
index 1e374c7..f48ce37 100644
--- a/Build/3rdParty/Luax/Luax.vcxproj.filters
+++ b/Build/3rdParty/Luax/Luax.vcxproj.filters
@@ -16,7 +16,6 @@
<ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_memberref.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax.cpp" />
<ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_module.cpp" />
<ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_ref.cpp" />
<ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_state.cpp" />
diff --git a/Source/3rdParty/Luax/luax_class.hpp b/Source/3rdParty/Luax/luax_class.hpp
index 6557c0b..c196024 100644
--- a/Source/3rdParty/Luax/luax_class.hpp
+++ b/Source/3rdParty/Luax/luax_class.hpp
@@ -38,7 +38,7 @@ namespace Luax
/// Ҫ¶luanative classҪ̳дࡣͨluaʵҪȷüȷԣڶ߳Ҫȷͷš
///
template<class T>
- class LuaxClass
+ class LuaxNativeClass
{
public:
@@ -54,8 +54,8 @@ namespace Luax
protected:
- LuaxClass();
- virtual ~LuaxClass();
+ LuaxNativeClass();
+ virtual ~LuaxNativeClass();
///
/// userdata pushջûгʼmUserdataʼúԪѳʼõuserdataջһá
@@ -97,7 +97,7 @@ namespace Luax
//------------------------------------------------------------------------------------------------------------
///
- /// LuaxClass<T>͵ʵ
+ /// LuaxNativeClass<T>͵ʵ
///
static LuaxStrongRef mClassTable; // class table͵
static LuaxStrongRef mSingletonRefTable; // ǵsingletonijԱԱ֤ᱻͨ
diff --git a/Source/3rdParty/Luax/luax_class.inl b/Source/3rdParty/Luax/luax_class.inl
index 6086b3d..666c1a3 100644
--- a/Source/3rdParty/Luax/luax_class.inl
+++ b/Source/3rdParty/Luax/luax_class.inl
@@ -8,7 +8,7 @@ namespace Luax
/// ԲͬͣͨGetLuaClassName࣬GetClassNameᱻǣָluax_c_getupvalue
///
template<typename T>
- int LuaxClass<T>::l_GetClassName(lua_State* L)
+ int LuaxNativeClass<T>::l_GetClassName(lua_State* L)
{
LUAX_SETUP(L, "*");
@@ -23,7 +23,7 @@ namespace Luax
/// עṤ͵еԱ
///
template<typename T>
- void LuaxClass<T>::RegisterLuaxClass(LuaxState& state)
+ void LuaxNativeClass<T>::RegisterLuaxClass(LuaxState& state)
{
luaL_Reg regTable[] = {
{ "GetClassName", l_GetClassName },
@@ -37,7 +37,7 @@ namespace Luax
/// ijԱעclass table
///
template<typename T>
- void LuaxClass<T>::RegisterLuaxFactoryClass(LuaxState& state)
+ void LuaxNativeClass<T>::RegisterLuaxFactoryClass(LuaxState& state)
{
luaL_Reg regTable[] = {
{ "GetClass", l_GetClass },
@@ -52,7 +52,7 @@ namespace Luax
/// ijԱעclass table
///
template<typename T>
- void LuaxClass<T>::RegisterLuaxSingletonClass(LuaxState& state)
+ void LuaxNativeClass<T>::RegisterLuaxSingletonClass(LuaxState& state)
{
luaL_Reg regTable[] = {
{ NULL, NULL }
@@ -62,7 +62,7 @@ namespace Luax
}
template<typename T>
- void LuaxClass<T>::PushLuaxClassTable(LuaxState& state)
+ void LuaxNativeClass<T>::PushLuaxClassTable(LuaxState& state)
{
assert(mClassTable);
@@ -70,24 +70,24 @@ namespace Luax
}
template<typename T>
- void LuaxClass<T>::SetLuaxClassTableRef(LuaxState& state, int idx)
+ void LuaxNativeClass<T>::SetLuaxClassTableRef(LuaxState& state, int idx)
{
mClassTable.SetRef(state, idx);
}
template<typename T>
- LuaxClass<T>::LuaxClass()
+ LuaxNativeClass<T>::LuaxNativeClass()
{
}
template<typename T>
- LuaxClass<T>::~LuaxClass()
+ LuaxNativeClass<T>::~LuaxNativeClass()
{
}
template<typename T>
template<typename U>
- void LuaxClass<T>::LuaRetain(LuaxState& state, U* userdata)
+ void LuaxNativeClass<T>::LuaRetain(LuaxState& state, U* userdata)
{
if (PushLuaxRefTable(state))
{
@@ -105,7 +105,7 @@ namespace Luax
template<typename T>
template<typename U>
- void LuaxClass<T>::LuaRelease(LuaxState& state, U* userdata)
+ void LuaxNativeClass<T>::LuaRelease(LuaxState& state, U* userdata)
{
if (PushLuaxRefTable(state))
{
@@ -130,7 +130,7 @@ namespace Luax
}
template<typename T>
- bool LuaxClass<T>::PushLuaxUserdata(LuaxState& state)
+ bool LuaxNativeClass<T>::PushLuaxUserdata(LuaxState& state)
{
assert(!T::IsLuaxClassSingleton());
if (!mUserdata)
@@ -142,7 +142,7 @@ namespace Luax
}
template<typename T>
- bool LuaxClass<T>::PushLuaxMemberTable(LuaxState& state)
+ bool LuaxNativeClass<T>::PushLuaxMemberTable(LuaxState& state)
{
int top = state.GetTop();
if (this->PushLuaxUserdata(state))
@@ -163,7 +163,7 @@ namespace Luax
}
template<typename T>
- bool LuaxClass<T>::PushLuaxRefTable(LuaxState& state)
+ bool LuaxNativeClass<T>::PushLuaxRefTable(LuaxState& state)
{
// Singleton
if (T::IsLuaxClassSingleton())
@@ -199,7 +199,7 @@ namespace Luax
/// class table б͵ʵеĺ
///
template<typename T>
- void LuaxClass<T>::BindToLua(LuaxState& state)
+ void LuaxNativeClass<T>::BindToLua(LuaxState& state)
{
// ܰuserdata
assert(!T::IsLuaxClassSingleton());
@@ -250,7 +250,7 @@ namespace Luax
/// Աù
///
template<typename T>
- void LuaxClass<T>::SetMemberRef(LuaxState& state, LuaxMemberRef& memRef, int idx)
+ void LuaxNativeClass<T>::SetMemberRef(LuaxState& state, LuaxMemberRef& memRef, int idx)
{
ClearMemberRef(state, memRef);
if (!lua_isnil(state, idx))
@@ -266,7 +266,7 @@ namespace Luax
}
template<typename T>
- bool LuaxClass<T>::PushMemberRef(LuaxState& state, LuaxMemberRef& memRef)
+ bool LuaxNativeClass<T>::PushMemberRef(LuaxState& state, LuaxMemberRef& memRef)
{
if (memRef)
{
@@ -286,7 +286,7 @@ namespace Luax
}
template<typename T>
- void LuaxClass<T>::ClearMemberRef(LuaxState& state, LuaxMemberRef& memRef)
+ void LuaxNativeClass<T>::ClearMemberRef(LuaxState& state, LuaxMemberRef& memRef)
{
if (memRef)
{
@@ -305,7 +305,7 @@ namespace Luax
/// ͷŹʵ
///
template<typename T>
- int LuaxClass<T>::l___gc(lua_State* L)
+ int LuaxNativeClass<T>::l___gc(lua_State* L)
{
LUAX_SETUP(L, "U");
@@ -317,7 +317,7 @@ namespace Luax
/// ַ
///
template<typename T>
- int LuaxClass<T>::l___tostring(lua_State* L)
+ int LuaxNativeClass<T>::l___tostring(lua_State* L)
{
LUAX_STATE(L);
T* self = state.GetLuaUserdata<T>(1);
@@ -345,7 +345,7 @@ namespace Luax
}
template<typename T>
- int LuaxClass<T>::l_ExtendFactory(lua_State* L)
+ int LuaxNativeClass<T>::l_ExtendFactory(lua_State* L)
{
@@ -353,7 +353,7 @@ namespace Luax
}
template<typename T>
- int LuaxClass<T>::l_ExtendSingleton(lua_State* L)
+ int LuaxNativeClass<T>::l_ExtendSingleton(lua_State* L)
{
@@ -361,7 +361,7 @@ namespace Luax
}
template<typename T>
- int LuaxClass<T>::l_GetClass(lua_State* L)
+ int LuaxNativeClass<T>::l_GetClass(lua_State* L)
{
LUAX_STATE(L);
if (!mClassTable)
@@ -372,7 +372,7 @@ namespace Luax
}
template<typename T>
- int LuaxClass<T>::l_GetRefTable(lua_State* L)
+ int LuaxNativeClass<T>::l_GetRefTable(lua_State* L)
{
LUAX_STATE(L);
T* self = state.GetLuaUserdata<T>(1);
@@ -382,7 +382,7 @@ namespace Luax
return 1;
}
- template<typename T> LuaxStrongRef LuaxClass<T>::mClassTable; // class table
- template<typename T> LuaxStrongRef LuaxClass<T>::mSingletonRefTable; //
+ template<typename T> LuaxStrongRef LuaxNativeClass<T>::mClassTable; // class table
+ template<typename T> LuaxStrongRef LuaxNativeClass<T>::mSingletonRefTable; //
} \ No newline at end of file
diff --git a/Source/3rdParty/Luax/luax_state.inl b/Source/3rdParty/Luax/luax_state.inl
index 63f849f..63245bb 100644
--- a/Source/3rdParty/Luax/luax_state.inl
+++ b/Source/3rdParty/Luax/luax_state.inl
@@ -15,8 +15,8 @@ namespace Luax
// class table
lua_newtable(L);
- LuaxClass<T>::RegisterLuaxClass(state);
- LuaxClass<T>::RegisterLuaxFactoryClass(state);
+ LuaxNativeClass<T>::RegisterLuaxClass(state);
+ LuaxNativeClass<T>::RegisterLuaxFactoryClass(state);
T::RegisterLuaxClass(state);
// TǷûעķ
@@ -31,14 +31,14 @@ namespace Luax
// .Extend()
lua_pushvalue(state, -1); // class table
- lua_pushcclosure(state, LuaxClass<T>::l_ExtendFactory, 1);
+ lua_pushcclosure(state, LuaxNativeClass<T>::l_ExtendFactory, 1);
lua_setfield(state, -2, "Extend");
// class["__index"] = class
lua_pushvalue(state, -1); // class table
lua_setfield(state, -2, "__index");
- LuaxClass<T>::SetLuaxClassTableRef(state, -1);
+ LuaxNativeClass<T>::SetLuaxClassTableRef(state, -1);
cc8* type = T::GetLuaxFactoryName();
SetField(top, type);
@@ -64,11 +64,11 @@ namespace Luax
// class table.
lua_newtable(L);
- LuaxClass<T>::RegisterLuaxClass(state);
- LuaxClass<T>::RegisterLuaxFactoryClass(state);
+ LuaxNativeClass<T>::RegisterLuaxClass(state);
+ LuaxNativeClass<T>::RegisterLuaxFactoryClass(state);
T::RegisterLuaxClass(state);
- LuaxClass<T>::SetLuaxClassTableRef(state, -1);
+ LuaxNativeClass<T>::SetLuaxClassTableRef(state, -1);
// class table__index__newindexָ
lua_pushvalue(state, -1);
diff --git a/Source/Asura.Engine/scripting/portable.hpp b/Source/Asura.Engine/scripting/portable.hpp
index 450f4bb..aeb1ed0 100644
--- a/Source/Asura.Engine/scripting/portable.hpp
+++ b/Source/Asura.Engine/scripting/portable.hpp
@@ -11,7 +11,7 @@ namespace AsuraEngine
{
template<typename T>
- class Portable : public Luax::LuaxClass<T>
+ class Portable : public Luax::LuaxNativeClass<T>
{
public:
diff --git a/Source/Samples/LuaxTest/main.cpp b/Source/Samples/LuaxTest/main.cpp
index 65cdaa1..f87226e 100644
--- a/Source/Samples/LuaxTest/main.cpp
+++ b/Source/Samples/LuaxTest/main.cpp
@@ -18,7 +18,7 @@ using namespace Luax;
class School
: public Singleton<School>
- , public LuaxClass<School>
+ , public LuaxNativeClass<School>
{
public:
@@ -65,7 +65,7 @@ void School::RegisterLuaxPostprocess(Luax::LuaxState&)
//----------------------------------------------------------------------------------------------------------------
-class Boy : public LuaxClass<Boy>
+class Boy : public LuaxNativeClass<Boy>
{
public:
@@ -197,7 +197,7 @@ void Boy::RegisterLuaxPostprocess(LuaxState& state)
//----------------------------------------------------------------------------------------------------------------
-class Girl : public LuaxClass<Girl>
+class Girl : public LuaxNativeClass<Girl>
{
};
generated by cgit v1.1-26-g67d0 at 2025-05-22 11:23:36 +0000