Changeset 8044 in orxonox.OLD for branches/script_engine/src/lib/script_engine/Script.cc

Timestamp:

May 31, 2006, 9:24:11 PM (18 years ago)

Author:

snellen

Message:

calling scriptfunctions from c++ works now (includeing adding parameters)

File:

• branches/script_engine/src/lib/script_engine/Script.cc (modified) (6 diffs)

branches/script_engine/src/lib/script_engine/Script.cc

@@ -4 +4 @@
 Script::Script()
 {
+
+  returnCount = argumentCount = 0;
 
   luaState = lua_open();
@@ -13 +15 @@
   luaopen_math(luaState);
   luaopen_debug(luaState);
+
 
 }
@@ -26 +29 @@
 bool Script::loadFile(std::string& filename)
  {
+
    int error = luaL_loadfile (luaState, filename.c_str());
 
    if(error == 0)
    {
-     return true;
+     error = lua_pcall(luaState, 0, 0, 0);
+
+     if(error == 0)
+      return true;
+     else
+     {
+      reportError(error);
+      return false;
+     }
    }
    else
    {
-     switch(error)
-     {
-     case LUA_ERRSYNTAX :
-       printf("Syntax error in file %s \n",filename.c_str() );
+     reportError(error);
+   }
 
-     case LUA_ERRMEM :
-       printf("Memory allocation error in file %s", filename.c_str() );
-     }
+   return false;
+ }
+
+ bool Script::executeFile()
+ {
+   int error = lua_pcall(luaState, 0, LUA_MULTRET, 0);
+   if( error== 0)
+     return true;
+   else
+   {
+     reportError(error);
+     return false;
    }
 
  }
 
-
-
  void Script::selectFunction(std::string& functionName, int retCount)
  {
    returnCount = retCount;
+   argumentCount = 0;
    currentFunction = functionName;
    lua_pushlstring(luaState, currentFunction.c_str(), currentFunction.size() );
@@ -57 +75 @@
 
  //return number of returned values
- int  Script::executeFunction()
+ void Script::executeFunction()
  {
-    lua_call(luaState, argumentCount, returnCount);
+    lua_pcall(luaState, argumentCount, returnCount,0);
  }
 
@@ -66 +84 @@
  bool Script::pushParam(int param, std::string& toFunction)
  {
-   if(currentFunction.compare(toFunction) != 0)
+   if(currentFunction.compare(toFunction) == 0)
    {
-    lua_pushnumber(luaState,  param);
+     lua_pushnumber(luaState, (lua_Number) param);
+     argumentCount++;
     return true;
    }
    else
    {
-     printf("Couldn't add parameter because the wrong function is selected: %s instead of %s", currentFunction.c_str(), toFunction.c_str());
-     return false;
+    printf("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
+    return false;
    }
 
@@ -82 +101 @@
  bool Script::pushParam(float param, std::string& toFunction)
  {
-   if(currentFunction.compare(toFunction) != 0)
+   if(currentFunction.compare(toFunction) == 0)
    {
-     lua_pushnumber(luaState, param);
+     lua_pushnumber(luaState,(lua_Number) param);
+     argumentCount++;
      return true;
    }
    else
    {
-     printf("Couldn't add parameter because the wrong function is selected: %s instead of %s", currentFunction.c_str(), toFunction.c_str());
+     printf("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
      return false;
    }
 
  }
+
+ int Script::reportError(int error)
+ {
+ const char *msg = lua_tostring(luaState, -1);
+ if (msg == NULL) msg = "(error with no message)";
+ fprintf(stderr, "ERROR: %s\n", msg);
+ lua_pop(luaState, 1);
+ return error;
+ }
+