Browse Source

Minor refactoring

Panagiotis Christopoulos Charitos 7 years ago
parent
commit
c836eb2dfe

+ 9 - 9
src/anki/script/Event.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-// WARNING: The file is auto generated.
+// WARNING: This file is auto generated.
 
 #include <anki/script/LuaBinder.h>
 #include <anki/script/ScriptManager.h>
@@ -40,7 +40,7 @@ const char* LuaBinder::getWrappedTypeName<LightEvent>()
 /// Pre-wrap method LightEvent::setIntensityMultiplier.
 static inline int pwrapLightEventsetIntensityMultiplier(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -88,7 +88,7 @@ static int wrapLightEventsetIntensityMultiplier(lua_State* l)
 /// Pre-wrap method LightEvent::setFrequency.
 static inline int pwrapLightEventsetFrequency(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -163,7 +163,7 @@ const char* LuaBinder::getWrappedTypeName<EventManager>()
 /// Pre-wrap method EventManager::newLightEvent.
 static inline int pwrapEventManagernewLightEvent(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -211,8 +211,8 @@ static inline int pwrapEventManagernewLightEvent(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "LightEvent");
 	ud->initPointed(840634010629725278, const_cast<LightEvent*>(ret));
 
@@ -243,7 +243,7 @@ static inline void wrapEventManager(lua_State* l)
 /// Pre-wrap function getEventManager.
 static inline int pwrapgetEventManager(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -262,8 +262,8 @@ static inline int pwrapgetEventManager(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "EventManager");
 	ud->initPointed(-6959305329499243407, const_cast<EventManager*>(ret));
 

+ 1 - 1
src/anki/script/Event.xml

@@ -4,7 +4,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-// WARNING: The file is auto generated.
+// WARNING: This file is auto generated.
 
 #include <anki/script/LuaBinder.h>
 #include <anki/script/ScriptManager.h>

+ 2 - 2
src/anki/script/LuaBinder.cpp

@@ -186,14 +186,14 @@ Error LuaBinder::checkString(lua_State* l, I32 stackIdx, const char*& out)
 	return err;
 }
 
-Error LuaBinder::checkUserData(lua_State* l, I32 stackIdx, const char* typeName, I64 typeSignature, UserData*& out)
+Error LuaBinder::checkUserData(lua_State* l, I32 stackIdx, const char* typeName, I64 typeSignature, LuaUserData*& out)
 {
 	Error err = Error::NONE;
 
 	void* p = lua_touserdata(l, stackIdx);
 	if(p != nullptr)
 	{
-		out = reinterpret_cast<UserData*>(p);
+		out = reinterpret_cast<LuaUserData*>(p);
 		if(out->getSig() == typeSignature)
 		{
 			// Check using a LUA method again

+ 17 - 15
src/anki/script/LuaBinder.h

@@ -20,11 +20,11 @@ namespace anki
 {
 
 /// LUA userdata.
-class UserData
+class LuaUserData
 {
 public:
 	/// @note NEVER ADD A DESTRUCTOR. LUA cannot call that.
-	~UserData() = delete;
+	~LuaUserData() = delete;
 
 	I64 getSig() const
 	{
@@ -33,38 +33,42 @@ public:
 
 	void initGarbageCollected(I64 sig)
 	{
+		ANKI_ASSERT(m_addressOrGarbageCollect == 0 && m_sig == 0);
 		m_sig = sig;
-		m_addressAndGarbageCollect = GC_MASK;
+		m_addressOrGarbageCollect = GC_MASK;
 	}
 
 	void initPointed(I64 sig, void* ptrToObject)
 	{
+		ANKI_ASSERT(m_addressOrGarbageCollect == 0 && m_sig == 0);
 		m_sig = sig;
 		U64 addr = ptrToNumber(ptrToObject);
 		ANKI_ASSERT((addr & GC_MASK) == 0 && "Address too high, cannot encode a flag");
-		m_addressAndGarbageCollect = addr;
+		m_addressOrGarbageCollect = addr;
 	}
 
 	Bool isGarbageCollected() const
 	{
-		return m_addressAndGarbageCollect == GC_MASK;
+		ANKI_ASSERT(m_addressOrGarbageCollect != 0);
+		return m_addressOrGarbageCollect == GC_MASK;
 	}
 
 	template<typename T>
 	T* getData()
 	{
+		ANKI_ASSERT(m_addressOrGarbageCollect != 0);
 		T* out = nullptr;
 		if(isGarbageCollected())
 		{
-			// Garbage collected
+			// Garbage collected, the data -in memory- are after this object
 			PtrSize mem = ptrToNumber(this);
-			mem += getAlignedRoundUp(alignof(T), sizeof(UserData));
+			mem += getAlignedRoundUp(alignof(T), sizeof(LuaUserData));
 			out = numberToPtr<T*>(mem);
 		}
 		else
 		{
 			// Pointed
-			PtrSize mem = static_cast<PtrSize>(m_addressAndGarbageCollect);
+			PtrSize mem = static_cast<PtrSize>(m_addressOrGarbageCollect);
 			out = numberToPtr<T*>(mem);
 		}
 
@@ -76,7 +80,7 @@ public:
 	template<typename T>
 	static PtrSize computeSizeForGarbageCollected()
 	{
-		return getAlignedRoundUp(alignof(T), sizeof(UserData)) + sizeof(T);
+		return getAlignedRoundUp(alignof(T), sizeof(LuaUserData)) + sizeof(T);
 	}
 
 private:
@@ -84,9 +88,7 @@ private:
 
 	I64 m_sig = 0; ///< Signature to identify the user data.
 
-	/// Encodes an address and a flag for garbage collection.
-	/// High bit is the GC flag and the rest are an address.
-	U64 m_addressAndGarbageCollect = 0;
+	U64 m_addressOrGarbageCollect = 0; ///< Encodes an address or a flag if it's for garbage collection.
 };
 
 /// Lua binder class. A wrapper on top of LUA
@@ -152,7 +154,7 @@ public:
 	/// The function uses the type signature to validate the type and not the
 	/// typeName. That is supposed to be faster.
 	static ANKI_USE_RESULT Error checkUserData(
-		lua_State* l, I32 stackIdx, const char* typeName, I64 typeSignature, UserData*& out);
+		lua_State* l, I32 stackIdx, const char* typeName, I64 typeSignature, LuaUserData*& out);
 
 	/// Allocate memory.
 	static void* luaAlloc(lua_State* l, size_t size, U32 alignment);
@@ -192,8 +194,8 @@ inline Error LuaBinder::checkNumber(lua_State* l, I stackIdx, TNumber& number)
 template<typename T>
 inline void LuaBinder::exposeVariable(const char* name, T* y)
 {
-	void* ptr = lua_newuserdata(m_l, sizeof(UserData));
-	UserData* ud = static_cast<UserData*>(ptr);
+	void* ptr = lua_newuserdata(m_l, sizeof(LuaUserData));
+	LuaUserData* ud = static_cast<LuaUserData*>(ptr);
 	ud->initPointed(getWrappedTypeSignature<T>(), y);
 	luaL_setmetatable(m_l, getWrappedTypeName<T>());
 	lua_setglobal(m_l, name);

File diff suppressed because it is too large
+ 124 - 124
src/anki/script/Math.cpp


+ 1 - 1
src/anki/script/Math.xml

@@ -4,7 +4,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-// WARNING: The file is auto generated.
+// WARNING: This file is auto generated.
 
 #include <anki/script/LuaBinder.h>
 #include <anki/Math.h>

+ 7 - 7
src/anki/script/Renderer.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-// WARNING: The file is auto generated.
+// WARNING: This file is auto generated.
 
 #include <anki/script/LuaBinder.h>
 #include <anki/script/ScriptManager.h>
@@ -39,7 +39,7 @@ const char* LuaBinder::getWrappedTypeName<Dbg>()
 /// Pre-wrap method Dbg::getEnabled.
 static inline int pwrapDbggetEnabled(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -81,7 +81,7 @@ static int wrapDbggetEnabled(lua_State* l)
 /// Pre-wrap method Dbg::setEnabled.
 static inline int pwrapDbgsetEnabled(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -150,7 +150,7 @@ const char* LuaBinder::getWrappedTypeName<MainRenderer>()
 /// Pre-wrap method MainRenderer::getAspectRatio.
 static inline int pwrapMainRenderergetAspectRatio(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -200,7 +200,7 @@ static inline void wrapMainRenderer(lua_State* l)
 /// Pre-wrap function getMainRenderer.
 static inline int pwrapgetMainRenderer(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -219,8 +219,8 @@ static inline int pwrapgetMainRenderer(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "MainRenderer");
 	ud->initPointed(919289102518575326, const_cast<MainRenderer*>(ret));
 

+ 1 - 1
src/anki/script/Renderer.xml

@@ -4,7 +4,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-// WARNING: The file is auto generated.
+// WARNING: This file is auto generated.
 
 #include <anki/script/LuaBinder.h>
 #include <anki/script/ScriptManager.h>

+ 130 - 130
src/anki/script/Scene.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-// WARNING: The file is auto generated.
+// WARNING: This file is auto generated.
 
 #include <anki/script/LuaBinder.h>
 #include <anki/script/ScriptManager.h>
@@ -55,7 +55,7 @@ const char* LuaBinder::getWrappedTypeName<MoveComponent>()
 /// Pre-wrap method MoveComponent::setLocalOrigin.
 static inline int pwrapMoveComponentsetLocalOrigin(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -103,7 +103,7 @@ static int wrapMoveComponentsetLocalOrigin(lua_State* l)
 /// Pre-wrap method MoveComponent::getLocalOrigin.
 static inline int pwrapMoveComponentgetLocalOrigin(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -124,8 +124,8 @@ static inline int pwrapMoveComponentgetLocalOrigin(lua_State* l)
 	const Vec4& ret = self->getLocalOrigin();
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "Vec4");
 	ud->initPointed(6804478823655046386, const_cast<Vec4*>(&ret));
 
@@ -148,7 +148,7 @@ static int wrapMoveComponentgetLocalOrigin(lua_State* l)
 /// Pre-wrap method MoveComponent::setLocalRotation.
 static inline int pwrapMoveComponentsetLocalRotation(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -196,7 +196,7 @@ static int wrapMoveComponentsetLocalRotation(lua_State* l)
 /// Pre-wrap method MoveComponent::getLocalRotation.
 static inline int pwrapMoveComponentgetLocalRotation(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -217,8 +217,8 @@ static inline int pwrapMoveComponentgetLocalRotation(lua_State* l)
 	const Mat3x4& ret = self->getLocalRotation();
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "Mat3x4");
 	ud->initPointed(-2654194732934255869, const_cast<Mat3x4*>(&ret));
 
@@ -241,7 +241,7 @@ static int wrapMoveComponentgetLocalRotation(lua_State* l)
 /// Pre-wrap method MoveComponent::setLocalScale.
 static inline int pwrapMoveComponentsetLocalScale(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -287,7 +287,7 @@ static int wrapMoveComponentsetLocalScale(lua_State* l)
 /// Pre-wrap method MoveComponent::getLocalScale.
 static inline int pwrapMoveComponentgetLocalScale(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -329,7 +329,7 @@ static int wrapMoveComponentgetLocalScale(lua_State* l)
 /// Pre-wrap method MoveComponent::setLocalTransform.
 static inline int pwrapMoveComponentsetLocalTransform(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -377,7 +377,7 @@ static int wrapMoveComponentsetLocalTransform(lua_State* l)
 /// Pre-wrap method MoveComponent::getLocalTransform.
 static inline int pwrapMoveComponentgetLocalTransform(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -398,8 +398,8 @@ static inline int pwrapMoveComponentgetLocalTransform(lua_State* l)
 	const Transform& ret = self->getLocalTransform();
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "Transform");
 	ud->initPointed(7048620195620777229, const_cast<Transform*>(&ret));
 
@@ -451,7 +451,7 @@ const char* LuaBinder::getWrappedTypeName<LightComponent>()
 /// Pre-wrap method LightComponent::setDiffuseColor.
 static inline int pwrapLightComponentsetDiffuseColor(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -499,7 +499,7 @@ static int wrapLightComponentsetDiffuseColor(lua_State* l)
 /// Pre-wrap method LightComponent::getDiffuseColor.
 static inline int pwrapLightComponentgetDiffuseColor(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -520,8 +520,8 @@ static inline int pwrapLightComponentgetDiffuseColor(lua_State* l)
 	const Vec4& ret = self->getDiffuseColor();
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "Vec4");
 	ud->initPointed(6804478823655046386, const_cast<Vec4*>(&ret));
 
@@ -544,7 +544,7 @@ static int wrapLightComponentgetDiffuseColor(lua_State* l)
 /// Pre-wrap method LightComponent::setSpecularColor.
 static inline int pwrapLightComponentsetSpecularColor(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -592,7 +592,7 @@ static int wrapLightComponentsetSpecularColor(lua_State* l)
 /// Pre-wrap method LightComponent::getSpecularColor.
 static inline int pwrapLightComponentgetSpecularColor(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -613,8 +613,8 @@ static inline int pwrapLightComponentgetSpecularColor(lua_State* l)
 	const Vec4& ret = self->getSpecularColor();
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "Vec4");
 	ud->initPointed(6804478823655046386, const_cast<Vec4*>(&ret));
 
@@ -637,7 +637,7 @@ static int wrapLightComponentgetSpecularColor(lua_State* l)
 /// Pre-wrap method LightComponent::setRadius.
 static inline int pwrapLightComponentsetRadius(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -683,7 +683,7 @@ static int wrapLightComponentsetRadius(lua_State* l)
 /// Pre-wrap method LightComponent::getRadius.
 static inline int pwrapLightComponentgetRadius(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -725,7 +725,7 @@ static int wrapLightComponentgetRadius(lua_State* l)
 /// Pre-wrap method LightComponent::setDistance.
 static inline int pwrapLightComponentsetDistance(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -771,7 +771,7 @@ static int wrapLightComponentsetDistance(lua_State* l)
 /// Pre-wrap method LightComponent::getDistance.
 static inline int pwrapLightComponentgetDistance(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -813,7 +813,7 @@ static int wrapLightComponentgetDistance(lua_State* l)
 /// Pre-wrap method LightComponent::setInnerAngle.
 static inline int pwrapLightComponentsetInnerAngle(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -859,7 +859,7 @@ static int wrapLightComponentsetInnerAngle(lua_State* l)
 /// Pre-wrap method LightComponent::getInnerAngle.
 static inline int pwrapLightComponentgetInnerAngle(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -901,7 +901,7 @@ static int wrapLightComponentgetInnerAngle(lua_State* l)
 /// Pre-wrap method LightComponent::setOuterAngle.
 static inline int pwrapLightComponentsetOuterAngle(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -947,7 +947,7 @@ static int wrapLightComponentsetOuterAngle(lua_State* l)
 /// Pre-wrap method LightComponent::getOuterAngle.
 static inline int pwrapLightComponentgetOuterAngle(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -989,7 +989,7 @@ static int wrapLightComponentgetOuterAngle(lua_State* l)
 /// Pre-wrap method LightComponent::setShadowEnabled.
 static inline int pwrapLightComponentsetShadowEnabled(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1035,7 +1035,7 @@ static int wrapLightComponentsetShadowEnabled(lua_State* l)
 /// Pre-wrap method LightComponent::getShadowEnabled.
 static inline int pwrapLightComponentgetShadowEnabled(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1112,7 +1112,7 @@ const char* LuaBinder::getWrappedTypeName<DecalComponent>()
 /// Pre-wrap method DecalComponent::setDiffuseDecal.
 static inline int pwrapDecalComponentsetDiffuseDecal(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1179,7 +1179,7 @@ static int wrapDecalComponentsetDiffuseDecal(lua_State* l)
 /// Pre-wrap method DecalComponent::setNormalRoughnessDecal.
 static inline int pwrapDecalComponentsetNormalRoughnessDecal(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1246,7 +1246,7 @@ static int wrapDecalComponentsetNormalRoughnessDecal(lua_State* l)
 /// Pre-wrap method DecalComponent::updateShape.
 static inline int pwrapDecalComponentupdateShape(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1328,7 +1328,7 @@ const char* LuaBinder::getWrappedTypeName<LensFlareComponent>()
 /// Pre-wrap method LensFlareComponent::setFirstFlareSize.
 static inline int pwrapLensFlareComponentsetFirstFlareSize(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1376,7 +1376,7 @@ static int wrapLensFlareComponentsetFirstFlareSize(lua_State* l)
 /// Pre-wrap method LensFlareComponent::setColorMultiplier.
 static inline int pwrapLensFlareComponentsetColorMultiplier(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1447,7 +1447,7 @@ const char* LuaBinder::getWrappedTypeName<SceneNode>()
 /// Pre-wrap method SceneNode::getName.
 static inline int pwrapSceneNodegetName(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1489,7 +1489,7 @@ static int wrapSceneNodegetName(lua_State* l)
 /// Pre-wrap method SceneNode::addChild.
 static inline int pwrapSceneNodeaddChild(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1537,7 +1537,7 @@ static int wrapSceneNodeaddChild(lua_State* l)
 /// Pre-wrap method SceneNode::tryGetComponent<MoveComponent>.
 static inline int pwrapSceneNodegetMoveComponent(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1564,8 +1564,8 @@ static inline int pwrapSceneNodegetMoveComponent(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "MoveComponent");
 	ud->initPointed(2038493110845313445, const_cast<MoveComponent*>(ret));
 
@@ -1588,7 +1588,7 @@ static int wrapSceneNodegetMoveComponent(lua_State* l)
 /// Pre-wrap method SceneNode::tryGetComponent<LightComponent>.
 static inline int pwrapSceneNodegetLightComponent(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1615,8 +1615,8 @@ static inline int pwrapSceneNodegetLightComponent(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "LightComponent");
 	ud->initPointed(7940823622056993903, const_cast<LightComponent*>(ret));
 
@@ -1639,7 +1639,7 @@ static int wrapSceneNodegetLightComponent(lua_State* l)
 /// Pre-wrap method SceneNode::tryGetComponent<LensFlareComponent>.
 static inline int pwrapSceneNodegetLensFlareComponent(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1666,8 +1666,8 @@ static inline int pwrapSceneNodegetLensFlareComponent(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "LensFlareComponent");
 	ud->initPointed(-2019248835133422777, const_cast<LensFlareComponent*>(ret));
 
@@ -1690,7 +1690,7 @@ static int wrapSceneNodegetLensFlareComponent(lua_State* l)
 /// Pre-wrap method SceneNode::tryGetComponent<DecalComponent>.
 static inline int pwrapSceneNodegetDecalComponent(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1717,8 +1717,8 @@ static inline int pwrapSceneNodegetDecalComponent(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "DecalComponent");
 	ud->initPointed(-1979693900066114370, const_cast<DecalComponent*>(ret));
 
@@ -1768,7 +1768,7 @@ const char* LuaBinder::getWrappedTypeName<ModelNode>()
 /// Pre-wrap method ModelNode::getSceneNodeBase.
 static inline int pwrapModelNodegetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1789,8 +1789,8 @@ static inline int pwrapModelNodegetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -1835,7 +1835,7 @@ const char* LuaBinder::getWrappedTypeName<PerspectiveCamera>()
 /// Pre-wrap method PerspectiveCamera::getSceneNodeBase.
 static inline int pwrapPerspectiveCameragetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1856,8 +1856,8 @@ static inline int pwrapPerspectiveCameragetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -1880,7 +1880,7 @@ static int wrapPerspectiveCameragetSceneNodeBase(lua_State* l)
 /// Pre-wrap method PerspectiveCamera::setAll.
 static inline int pwrapPerspectiveCamerasetAll(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1967,7 +1967,7 @@ const char* LuaBinder::getWrappedTypeName<PointLight>()
 /// Pre-wrap method PointLight::getSceneNodeBase.
 static inline int pwrapPointLightgetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -1988,8 +1988,8 @@ static inline int pwrapPointLightgetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2012,7 +2012,7 @@ static int wrapPointLightgetSceneNodeBase(lua_State* l)
 /// Pre-wrap method PointLight::loadLensFlare.
 static inline int pwrapPointLightloadLensFlare(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2090,7 +2090,7 @@ const char* LuaBinder::getWrappedTypeName<SpotLight>()
 /// Pre-wrap method SpotLight::getSceneNodeBase.
 static inline int pwrapSpotLightgetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2111,8 +2111,8 @@ static inline int pwrapSpotLightgetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2157,7 +2157,7 @@ const char* LuaBinder::getWrappedTypeName<StaticCollisionNode>()
 /// Pre-wrap method StaticCollisionNode::getSceneNodeBase.
 static inline int pwrapStaticCollisionNodegetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2178,8 +2178,8 @@ static inline int pwrapStaticCollisionNodegetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2224,7 +2224,7 @@ const char* LuaBinder::getWrappedTypeName<Portal>()
 /// Pre-wrap method Portal::getSceneNodeBase.
 static inline int pwrapPortalgetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2245,8 +2245,8 @@ static inline int pwrapPortalgetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2291,7 +2291,7 @@ const char* LuaBinder::getWrappedTypeName<Sector>()
 /// Pre-wrap method Sector::getSceneNodeBase.
 static inline int pwrapSectorgetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2312,8 +2312,8 @@ static inline int pwrapSectorgetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2358,7 +2358,7 @@ const char* LuaBinder::getWrappedTypeName<ParticleEmitter>()
 /// Pre-wrap method ParticleEmitter::getSceneNodeBase.
 static inline int pwrapParticleEmittergetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2379,8 +2379,8 @@ static inline int pwrapParticleEmittergetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2425,7 +2425,7 @@ const char* LuaBinder::getWrappedTypeName<ReflectionProbe>()
 /// Pre-wrap method ReflectionProbe::getSceneNodeBase.
 static inline int pwrapReflectionProbegetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2446,8 +2446,8 @@ static inline int pwrapReflectionProbegetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2492,7 +2492,7 @@ const char* LuaBinder::getWrappedTypeName<ReflectionProxy>()
 /// Pre-wrap method ReflectionProxy::getSceneNodeBase.
 static inline int pwrapReflectionProxygetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2513,8 +2513,8 @@ static inline int pwrapReflectionProxygetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2559,7 +2559,7 @@ const char* LuaBinder::getWrappedTypeName<OccluderNode>()
 /// Pre-wrap method OccluderNode::getSceneNodeBase.
 static inline int pwrapOccluderNodegetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2580,8 +2580,8 @@ static inline int pwrapOccluderNodegetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2626,7 +2626,7 @@ const char* LuaBinder::getWrappedTypeName<DecalNode>()
 /// Pre-wrap method DecalNode::getSceneNodeBase.
 static inline int pwrapDecalNodegetSceneNodeBase(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2647,8 +2647,8 @@ static inline int pwrapDecalNodegetSceneNodeBase(lua_State* l)
 	SceneNode& ret = *self;
 
 	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneNode");
 	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
 
@@ -2693,7 +2693,7 @@ const char* LuaBinder::getWrappedTypeName<SceneGraph>()
 /// Pre-wrap method SceneGraph::newPerspectiveCamera.
 static inline int pwrapSceneGraphnewPerspectiveCamera(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2727,8 +2727,8 @@ static inline int pwrapSceneGraphnewPerspectiveCamera(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "PerspectiveCamera");
 	ud->initPointed(-4317960537256382878, const_cast<PerspectiveCamera*>(ret));
 
@@ -2751,7 +2751,7 @@ static int wrapSceneGraphnewPerspectiveCamera(lua_State* l)
 /// Pre-wrap method SceneGraph::newModelNode.
 static inline int pwrapSceneGraphnewModelNode(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2791,8 +2791,8 @@ static inline int pwrapSceneGraphnewModelNode(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "ModelNode");
 	ud->initPointed(-1856316251880904290, const_cast<ModelNode*>(ret));
 
@@ -2815,7 +2815,7 @@ static int wrapSceneGraphnewModelNode(lua_State* l)
 /// Pre-wrap method SceneGraph::newPointLight.
 static inline int pwrapSceneGraphnewPointLight(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2849,8 +2849,8 @@ static inline int pwrapSceneGraphnewPointLight(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "PointLight");
 	ud->initPointed(3561037663389896020, const_cast<PointLight*>(ret));
 
@@ -2873,7 +2873,7 @@ static int wrapSceneGraphnewPointLight(lua_State* l)
 /// Pre-wrap method SceneGraph::newSpotLight.
 static inline int pwrapSceneGraphnewSpotLight(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2907,8 +2907,8 @@ static inline int pwrapSceneGraphnewSpotLight(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SpotLight");
 	ud->initPointed(7940385212889719421, const_cast<SpotLight*>(ret));
 
@@ -2931,7 +2931,7 @@ static int wrapSceneGraphnewSpotLight(lua_State* l)
 /// Pre-wrap method SceneGraph::newStaticCollisionNode.
 static inline int pwrapSceneGraphnewStaticCollisionNode(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -2979,8 +2979,8 @@ static inline int pwrapSceneGraphnewStaticCollisionNode(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "StaticCollisionNode");
 	ud->initPointed(-4376619865753613291, const_cast<StaticCollisionNode*>(ret));
 
@@ -3003,7 +3003,7 @@ static int wrapSceneGraphnewStaticCollisionNode(lua_State* l)
 /// Pre-wrap method SceneGraph::newPortal.
 static inline int pwrapSceneGraphnewPortal(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -3043,8 +3043,8 @@ static inline int pwrapSceneGraphnewPortal(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "Portal");
 	ud->initPointed(7450426072538297652, const_cast<Portal*>(ret));
 
@@ -3067,7 +3067,7 @@ static int wrapSceneGraphnewPortal(lua_State* l)
 /// Pre-wrap method SceneGraph::newSector.
 static inline int pwrapSceneGraphnewSector(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -3107,8 +3107,8 @@ static inline int pwrapSceneGraphnewSector(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "Sector");
 	ud->initPointed(2371391302432627552, const_cast<Sector*>(ret));
 
@@ -3131,7 +3131,7 @@ static int wrapSceneGraphnewSector(lua_State* l)
 /// Pre-wrap method SceneGraph::newParticleEmitter.
 static inline int pwrapSceneGraphnewParticleEmitter(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -3171,8 +3171,8 @@ static inline int pwrapSceneGraphnewParticleEmitter(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "ParticleEmitter");
 	ud->initPointed(-1716560948193631017, const_cast<ParticleEmitter*>(ret));
 
@@ -3195,7 +3195,7 @@ static int wrapSceneGraphnewParticleEmitter(lua_State* l)
 /// Pre-wrap method SceneGraph::newReflectionProbe.
 static inline int pwrapSceneGraphnewReflectionProbe(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -3235,8 +3235,8 @@ static inline int pwrapSceneGraphnewReflectionProbe(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "ReflectionProbe");
 	ud->initPointed(205427259474779436, const_cast<ReflectionProbe*>(ret));
 
@@ -3259,7 +3259,7 @@ static int wrapSceneGraphnewReflectionProbe(lua_State* l)
 /// Pre-wrap method SceneGraph::newReflectionProxy.
 static inline int pwrapSceneGraphnewReflectionProxy(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -3299,8 +3299,8 @@ static inline int pwrapSceneGraphnewReflectionProxy(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "ReflectionProxy");
 	ud->initPointed(205427259496779646, const_cast<ReflectionProxy*>(ret));
 
@@ -3323,7 +3323,7 @@ static int wrapSceneGraphnewReflectionProxy(lua_State* l)
 /// Pre-wrap method SceneGraph::newOccluderNode.
 static inline int pwrapSceneGraphnewOccluderNode(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -3363,8 +3363,8 @@ static inline int pwrapSceneGraphnewOccluderNode(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "OccluderNode");
 	ud->initPointed(-6885028590097645115, const_cast<OccluderNode*>(ret));
 
@@ -3387,7 +3387,7 @@ static int wrapSceneGraphnewOccluderNode(lua_State* l)
 /// Pre-wrap method SceneGraph::newDecalNode.
 static inline int pwrapSceneGraphnewDecalNode(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -3421,8 +3421,8 @@ static inline int pwrapSceneGraphnewDecalNode(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "DecalNode");
 	ud->initPointed(1097508121406753350, const_cast<DecalNode*>(ret));
 
@@ -3445,7 +3445,7 @@ static int wrapSceneGraphnewDecalNode(lua_State* l)
 /// Pre-wrap method SceneGraph::setActiveCamera.
 static inline int pwrapSceneGraphsetActiveCamera(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -3513,7 +3513,7 @@ static inline void wrapSceneGraph(lua_State* l)
 /// Pre-wrap function getSceneGraph.
 static inline int pwrapgetSceneGraph(lua_State* l)
 {
-	UserData* ud;
+	LuaUserData* ud;
 	(void)ud;
 	void* voidp;
 	(void)voidp;
@@ -3532,8 +3532,8 @@ static inline int pwrapgetSceneGraph(lua_State* l)
 		return -1;
 	}
 
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
+	voidp = lua_newuserdata(l, sizeof(LuaUserData));
+	ud = static_cast<LuaUserData*>(voidp);
 	luaL_setmetatable(l, "SceneGraph");
 	ud->initPointed(-7754439619132389154, const_cast<SceneGraph*>(ret));
 

+ 1 - 1
src/anki/script/Scene.xml

@@ -4,7 +4,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-// WARNING: The file is auto generated.
+// WARNING: This file is auto generated.
 
 #include <anki/script/LuaBinder.h>
 #include <anki/script/ScriptManager.h>

+ 7 - 7
src/anki/script/lua_glue_gen.py

@@ -130,8 +130,8 @@ def ret(ret_el):
 		wglue("lua_pushnumber(l, ret);")
 	else:
 		if is_ptr or is_ref:
-		 	wglue("voidp = lua_newuserdata(l, sizeof(UserData));")
-			wglue("ud = static_cast<UserData*>(voidp);")
+		 	wglue("voidp = lua_newuserdata(l, sizeof(LuaUserData));")
+			wglue("ud = static_cast<LuaUserData*>(voidp);")
 			wglue("luaL_setmetatable(l, \"%s\");" % type)
 
 			if is_ptr:
@@ -139,11 +139,11 @@ def ret(ret_el):
 			elif is_ref:
 				wglue("ud->initPointed(%d, const_cast<%s*>(&ret));" % (type_sig(type), type))
 		else:
-			wglue("size = UserData::computeSizeForGarbageCollected<%s>();" % type)
+			wglue("size = LuaUserData::computeSizeForGarbageCollected<%s>();" % type)
 			wglue("voidp = lua_newuserdata(l, size);")
 			wglue("luaL_setmetatable(l, \"%s\");" % type)
 
-			wglue("ud = static_cast<UserData*>(voidp);")
+			wglue("ud = static_cast<LuaUserData*>(voidp);")
 			wglue("ud->initGarbageCollected(%d);" % type_sig(type))
 
 			wglue("::new(ud->getData<%s>()) %s(std::move(ret));" % (type, type))
@@ -262,7 +262,7 @@ def get_meth_alias(meth_el):
 	return meth_alias
 
 def write_local_vars():
-	wglue("UserData* ud;")
+	wglue("LuaUserData* ud;")
 	wglue("(void)ud;")
 	wglue("void* voidp;")
 	wglue("(void)voidp;")
@@ -417,10 +417,10 @@ def constructor(constr_el, class_name):
 	# Create new userdata
 	wglue("// Create user data")
 
-	wglue("size = UserData::computeSizeForGarbageCollected<%s>();" % class_name)
+	wglue("size = LuaUserData::computeSizeForGarbageCollected<%s>();" % class_name)
 	wglue("voidp = lua_newuserdata(l, size);")
 	wglue("luaL_setmetatable(l, classname%s);" % class_name)
-	wglue("ud = static_cast<UserData*>(voidp);")
+	wglue("ud = static_cast<LuaUserData*>(voidp);")
 	wglue("ud->initGarbageCollected(%d);" % type_sig(class_name))
 	wglue("::new(ud->getData<%s>()) %s(%s);" % (class_name, class_name, args_str))
 	wglue("")

Some files were not shown because too many files changed in this diff