Changeset 8085 in orxonox.OLD

Timestamp:

Jun 1, 2006, 5:07:28 PM (18 years ago)

Author:

snellen

Message:

started implementing script_manager

Location:

branches/script_engine/src/lib/script_engine

Files:

• account.cc (modified) (3 diffs)
• lunartest2.lua (modified) (1 diff)
• script.cc (modified) (4 diffs)
• script_manager.cc (modified) (1 diff)
• script_manager.h (modified) (1 diff)

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

@@ -91 +91 @@
     {
       Script script;
+      printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
 
       // Register classes with the script
@@ -104 +105 @@
       Lunar<Account>::insertObject(&script,&a,"a",false);
       Lunar<Account>::insertObject(&script,b,"b",true);
-
-
+       printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
+      //Load a file
       std::string file(argv[1]);
 
       if(script.loadFile(file))
         printf("File %s succefully loaded\n", file.c_str());
-
-      //script.executeFile();
-
+      printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
+      //execute a function
+      printf("----------- main -----------\n");
       std::string main("main");
       if( script.selectFunction(main,3))
@@ -131 +132 @@
       int ret = script.getReturnedInt();
       printf("main returned %i\n",ret);
+
+      printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
+      //execute a 2nd function
+      printf("----------- test -----------\n");
+      std::string test("test");
+      if( script.selectFunction(test,0))
+       printf("function %s selected\n",test.c_str());
+
+      script.executeFunction();
+
       
       //if(argc>1) lua_dofile(script.getLuaState(), argv[1]);
+      printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
 
       return 0;

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

@@ -14 +14 @@
 
 getmetatable(Account).__index = parent
+
+
+function test()
+io.write("Hi i'm test\n")
+end
+
 
 function main(arg)

branches/script_engine/src/lib/script_engine/script.cc

@@ -29 +29 @@
 
    if(currentFile.length() != 0)
+   { 
      printf("Could not load %s because an other file is already loaded: %s\n",filename.c_str(), currentFile.c_str());
+     return false;
+    }
 
    int error = luaL_loadfile (luaState, filename.c_str());
@@ -74 +77 @@
  bool Script::selectFunction(std::string& functionName, int retCount)
  {
-   if(returnCount == 0) //no return values left on the stack
+   if(returnCount == 0 && currentFunction.length() == 0) //no return values left on the stack and no other function selected
    {
    lua_pushlstring(luaState, functionName.c_str(), functionName.size() );
@@ -90 +93 @@
    }
    else
-     printf("there are unremoved return values on the stack. Please remove them first.\n");
+     printf("There is an other function active ( %s ) or there are unremoved return values on the stack. Please remove them first.\n",currentFunction.c_str());
+   return false;
  }
 
@@ -214 +218 @@
  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;
- }
-
+ if(error != 0)
+ {
+  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;
+ }
+ }
+

branches/script_engine/src/lib/script_engine/script_manager.cc

@@ +1 @@
+
+#include "script.h"
+#include "script_manager.h"

branches/script_engine/src/lib/script_engine/script_manager.h

@@ +1 @@
+#ifndef _SCRIPT_MANAGER_H
+#define _SCRIPT_MNAGER_H
+
+
+#include <string>
+#include "base_object.h"
+
+#include "luaincl.h"
+
+
+
+class ScriptManager
+{
+ public:
+
+
+
+
+
+ private:
+
+
+
+};
+#endif