Changeset 8072 in orxonox.OLD

Timestamp:

Jun 1, 2006, 3:26:41 PM (18 years ago)

Author:

snellen

Message:

multiple return values from lua functions are now supported

Location:

branches/script_engine/src/lib/script_engine

Files:

• Script.cc (modified) (3 diffs)
• Script.h (modified) (1 diff)
• account.cc (modified) (2 diffs)
• lunartest2.lua (modified) (1 diff)
• script_manager.cc (added)
• script_manager.h (added)

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

@@ -175 +175 @@
        returnValue = (int)lua_tonumber(luaState, -1);
        returnCount--;
+       lua_pop(luaState,1);
      }
    }
@@ -190 +191 @@
        returnValue = (bool)lua_toboolean(luaState, -1);
        returnCount--;
+       lua_pop(luaState,1);
      }
    }
@@ -195 +197 @@
  }
 
+float Script::getReturnedFloat()
+ {
+   float returnValue;
+   if(returnCount > 0)
+   {
+     if(lua_isnumber(luaState, -1))
+     {
+       returnValue = (float)lua_tonumber(luaState, -1);
+       returnCount--;
+       lua_pop(luaState,1);
+     }
+   }
+   return returnValue;
+ }
 
  int Script::reportError(int error)

branches/script_engine/src/lib/script_engine/Script.h

@@ -23 +23 @@
     bool executeFunction();
     // push parameters for luafunction
-    bool pushParam(int param, std::string& toFunction);//overload this function to add different types
-    bool pushParam(float param, std::string& toFunction);
-    bool pushParam(double param, std::string& toFunction);
-    // get returned values
-    int  getReturnedInt();//overload this function to get different types
-    bool getReturnedBool();
+    bool  pushParam(int param, std::string& toFunction);//overload this function to add different types
+    bool  pushParam(float param, std::string& toFunction);
+    bool  pushParam(double param, std::string& toFunction);
+    // get returned values the last return value in lua is the first in c.
+    int   getReturnedInt();//overload this function to get different types
+    bool  getReturnedBool();
+    float getReturnedFloat();
 
 

branches/script_engine/src/lib/script_engine/account.cc

@@ -89 +89 @@
 
       std::string main("main");
-      if( script.selectFunction(main,1))
+      if( script.selectFunction(main,3))
        printf("function %s selected\n",main.c_str());
 
@@ -95 +95 @@
       script.executeFunction();
 
+      float retf = script.getReturnedFloat();
+      printf("main returned %f\n",retf);
+      
+
+      if(script.getReturnedBool())
+       printf("main returned true\n");
+      else
+       printf("main returned false\n");
+
       int ret = script.getReturnedInt();
       printf("main returned %i\n",ret);
-
+      
       //if(argc>1) lua_dofile(script.getLuaState(), argv[1]);
 

branches/script_engine/src/lib/script_engine/lunartest2.lua

@@ -28 +28 @@
   Obj:printName()
 
-  return 2
+  return 2,false,2.72
   --debug.debug()
 end