Przeglądaj źródła

Change function argument from const char* to String.

Aster Jian 12 lat temu
rodzic
commit
deee8e8162

+ 1 - 1
Extras/LuaScript/LuaScript.cpp

@@ -319,7 +319,7 @@ void LuaScript::HandleEvent(StringHash eventType, VariantMap& eventData)
 void LuaScript::HandleConsoleCommand(StringHash eventType, VariantMap& eventData)
 void LuaScript::HandleConsoleCommand(StringHash eventType, VariantMap& eventData)
 {
 {
     using namespace ConsoleCommand;
     using namespace ConsoleCommand;
-    ExecuteString(eventData[P_COMMAND].GetString().CString());
+    ExecuteString(eventData[P_COMMAND].GetString());
 }
 }
 
 
 Context* GetContext()
 Context* GetContext()

+ 8 - 3
Extras/LuaScript/pkgs/LuaScriptLuaAPI.pkg

@@ -2,8 +2,13 @@ $#define TOLUA_RELEASE
 
 
 $#include "LuaScript.h"
 $#include "LuaScript.h"
 
 
+void ExecuteFile(const String& fileName);
 void ExecuteFile(const char* fileName);
 void ExecuteFile(const char* fileName);
+
+void SendEvent(const String& eventName, VariantMap& eventData);
 void SendEvent(const char* eventName, VariantMap& eventData);
 void SendEvent(const char* eventName, VariantMap& eventData);
+
+void SubscribeToEvent(const String& eventName, const char* functionName);
 void SubscribeToEvent(const char* eventName, const char* functionName);
 void SubscribeToEvent(const char* eventName, const char* functionName);
 
 
 $using namespace Urho3D;
 $using namespace Urho3D;
@@ -16,17 +21,17 @@ static LuaScript* GetLuaScript()
     return GetContext()->GetSubsystem<LuaScript>();
     return GetContext()->GetSubsystem<LuaScript>();
 }
 }
 
 
-static bool ExecuteFile(const char* fileName)
+static bool ExecuteFile(const String& fileName)
 {
 {
     return GetLuaScript()->ExecuteFile(fileName);
     return GetLuaScript()->ExecuteFile(fileName);
 }
 }
 
 
-static void SendEvent(const char* eventName, VariantMap& eventData)
+static void SendEvent(const String& eventName, VariantMap& eventData)
 {
 {
     GetLuaScript()->ScriptSendEvent(eventName, eventData);
     GetLuaScript()->ScriptSendEvent(eventName, eventData);
 }
 }
 
 
-static void SubscribeToEvent(const char* eventName, const char* functionName)
+static void SubscribeToEvent(const String& eventName, const char* functionName)
 {
 {
     GetLuaScript()->ScriptSubscribeToEvent(eventName, functionName);
     GetLuaScript()->ScriptSubscribeToEvent(eventName, functionName);
 }
 }

+ 3 - 2
Urho3D/Urho3D.cpp

@@ -64,7 +64,8 @@ void Urho3D::Setup()
     
     
     #if defined(ANDROID) || defined(IOS)
     #if defined(ANDROID) || defined(IOS)
     // Can not pass script name on mobile devices, so choose a hardcoded default
     // Can not pass script name on mobile devices, so choose a hardcoded default
-    scriptFileName_ = "Scripts/NinjaSnowWar.as";
+    // scriptFileName_ = "Scripts/NinjaSnowWar.as";
+    scriptFileName_ = "LuaScripts/TestSceneAndroid.lua";
     #endif
     #endif
     
     
     // Show usage if not found
     // Show usage if not found
@@ -132,7 +133,7 @@ void Urho3D::Start()
         LuaScript* luaScript = GetSubsystem<LuaScript>();
         LuaScript* luaScript = GetSubsystem<LuaScript>();
 
 
         // If script loading is successful, proceed to main loop
         // If script loading is successful, proceed to main loop
-        if (luaScript->ExecuteFile(scriptFileName_.CString()))
+        if (luaScript->ExecuteFile(scriptFileName_))
         {
         {
             luaScript->ExecuteFunction("Start");
             luaScript->ExecuteFunction("Start");
             return;
             return;