Merge branch 'master' into shader-refactor

Source/Engine/LuaScript/LuaScript.cpp

@@ -272,13 +272,17 @@ int LuaScript::Loader(lua_State* L)
     // Get module name.
     const char* name = luaL_checkstring(L, 1);
 
+    // Get Luc file from module name.
+    LuaFile* lucFile = cache->GetResource<LuaFile>(String(name) + ".luc");
+    if (lucFile)
+        return lucFile->LoadChunk(L) ? 1 : 0;
+
     // Get Lua file from module name.
     LuaFile* luaFile = cache->GetResource<LuaFile>(String(name) + ".lua");
-    if (!luaFile)
-        return false;
+    if (luaFile)
+        return luaFile->LoadChunk(L) ? 1 : 0;
 
-    // Load Lua file to Lua chunk.
-    return luaFile->LoadChunk(L) ? 1 : 0;
+    return false;
 }
 
 void LuaScript::ReplacePrint()

Source/Engine/LuaScript/pkgs/pkgToDox.lua

@@ -7,8 +7,9 @@ end
 pkgFiles = {}
 enums = {}
 classes = {}
-globalConstants = {}
 globalFunctions = {}
+globalProperties = {}
+globalConstants = {}
 renamings = {}
 
 -- trim string.
@@ -122,6 +123,8 @@ function handleLine(line)
         
         if line:find(")") ~= nil then -- global function.
             table.insert(globalFunctions, line)
+        elseif line:find("tolua_property") ~= nil then -- global properties
+            table.insert(globalProperties, line)
         else
             local i, _, oldName, newName = line:find("$renaming%s+(.-)%s*@%s*(.-)%s*$") 
             if i ~= nill then -- renaming types.
@@ -191,6 +194,21 @@ function writeGlobalFunctions(ofile)
     ofile:write("\n")
 end
 
+function writeGlobalProperties(ofile)
+    ofile:write("\\\section LuaScriptAPI_GlobalProperties Global properties\n")
+    for _, line in ipairs(globalProperties) do
+        line = line:gsub("tolua_property__get_set ", "")
+        line = line:gsub(";", "")
+        if line:find("tolua_readonly") == nil then
+            ofile:write("- ", line, "\n")
+        else
+            line = line:gsub("tolua_readonly ", "")
+            ofile:write("- ", line, " (readonly)\n")
+        end
+    end
+    ofile:write("\n")
+end
+
 function writeGlobalConstants(ofile)
     ofile:write("\\section LuaScriptAPI_GlobalConstants Global constants\n")
     for _, line in ipairs(globalConstants) do
@@ -284,6 +302,7 @@ ofile:write("\n")
 writeClasses(ofile)
 writeEnums(ofile)
 writeGlobalFunctions(ofile)
+writeGlobalProperties(ofile)
 writeGlobalConstants(ofile)
 writeRenamings(ofile)
 

Source/Tools/Urho3DPlayer/Urho3DPlayer.cpp

@@ -112,7 +112,7 @@ void Urho3DPlayer::Setup()
 void Urho3DPlayer::Start()
 {
     String extension = GetExtension(scriptFileName_);
-    if (extension != ".lua")
+    if (extension != ".lua" && extension != ".luc")
     {
 #ifdef ENABLE_ANGELSCRIPT
         // Instantiate and register the AngelScript subsystem