Browse Source

Changed Lua library & object registration order to ensure base classes are correctly set up.

Lasse Öörni 12 years ago
parent
commit
fc2854167c

+ 5 - 5
Source/Extras/LuaScript/LuaScript.cpp

@@ -84,19 +84,19 @@ LuaScript::LuaScript(Context* context) :
     RegisterLoader();
     ReplacePrint();
 
-    tolua_AudioLuaAPI_open(luaState_);
     tolua_ContainerLuaAPI_open(luaState_);
+    tolua_MathLuaAPI_open(luaState_);
     tolua_CoreLuaAPI_open(luaState_);
+    tolua_IOLuaAPI_open(luaState_);
+    tolua_ResourceLuaAPI_open(luaState_);
+    tolua_SceneLuaAPI_open(luaState_);
+    tolua_AudioLuaAPI_open(luaState_);
     tolua_EngineLuaAPI_open(luaState_);
     tolua_GraphicsLuaAPI_open(luaState_);
     tolua_InputLuaAPI_open(luaState_);
-    tolua_IOLuaAPI_open(luaState_);
-    tolua_MathLuaAPI_open(luaState_);
     tolua_NavigationLuaAPI_open(luaState_);
     tolua_NetworkLuaAPI_open(luaState_);
     tolua_PhysicsLuaAPI_open(luaState_);
-    tolua_ResourceLuaAPI_open(luaState_);
-    tolua_SceneLuaAPI_open(luaState_);
     tolua_UILuaAPI_open(luaState_);
     tolua_LuaScriptLuaAPI_open(luaState_);
 

+ 1 - 1
Source/Extras/LuaScript/pkgs/GraphicsLuaAPI.pkg

@@ -1,4 +1,5 @@
 $pfile "Graphics/GraphicsDefs.pkg"
+$pfile "Graphics/Drawable.pkg"
 $pfile "Graphics/AnimatedModel.pkg"
 $pfile "Graphics/Animation.pkg"
 $pfile "Graphics/AnimationController.pkg"
@@ -7,7 +8,6 @@ $pfile "Graphics/BillboardSet.pkg"
 $pfile "Graphics/Camera.pkg"
 $pfile "Graphics/DebugRenderer.pkg"
 $pfile "Graphics/DecalSet.pkg"
-$pfile "Graphics/Drawable.pkg"
 $pfile "Graphics/Graphics.pkg"
 $pfile "Graphics/Light.pkg"
 $pfile "Graphics/Material.pkg"

+ 1 - 1
Source/Extras/LuaScript/pkgs/ResourceLuaAPI.pkg

@@ -1,5 +1,5 @@
-$pfile "Resource/Image.pkg"
 $pfile "Resource/Resource.pkg"
+$pfile "Resource/Image.pkg"
 $pfile "Resource/ResourceCache.pkg"
 $pfile "Resource/XMLElement.pkg"
 $pfile "Resource/XMLFile.pkg"

+ 1 - 1
Source/Extras/LuaScript/pkgs/SceneLuaAPI.pkg

@@ -1,7 +1,7 @@
+$pfile "Scene/Serializable.pkg"
 $pfile "Scene/Component.pkg"
 $pfile "Scene/Node.pkg"
 $pfile "Scene/Scene.pkg"
-$pfile "Scene/Serializable.pkg"
 
 $using namespace Urho3D;
 $#pragma warning(disable:4800)

+ 4 - 4
Source/Extras/LuaScript/pkgs/UILuaAPI.pkg

@@ -1,21 +1,21 @@
+$pfile "UI/UIElement.pkg"
 $pfile "UI/BorderImage.pkg"
 $pfile "UI/Button.pkg"
 $pfile "UI/CheckBox.pkg"
 $pfile "UI/Cursor.pkg"
-$pfile "UI/DropDownList.pkg"
 $pfile "UI/FileSelector.pkg"
 $pfile "UI/Font.pkg"
 $pfile "UI/LineEdit.pkg"
-$pfile "UI/ListView.pkg"
 $pfile "UI/Menu.pkg"
+$pfile "UI/DropDownList.pkg"
+$pfile "UI/Slider.pkg"
 $pfile "UI/ScrollBar.pkg"
 $pfile "UI/ScrollView.pkg"
-$pfile "UI/Slider.pkg"
+$pfile "UI/ListView.pkg"
 $pfile "UI/Sprite.pkg"
 $pfile "UI/Text.pkg"
 $pfile "UI/Text3D.pkg"
 $pfile "UI/UI.pkg"
-$pfile "UI/UIElement.pkg"
 $pfile "UI/Window.pkg"
 $pfile "UI/View3D.pkg"