Changeset 8104 in orxonox.OLD

Timestamp:

Jun 1, 2006, 10:12:43 PM (18 years ago)

Author:

snellen

Message:

did some cleanup and added getFileName function to script

Location:

branches/script_engine/src/lib/script_engine

Files:

• example.cc (modified) (2 diffs)
• lunartest2.lua (modified) (2 diffs)
• script.h (modified) (1 diff)

branches/script_engine/src/lib/script_engine/example.cc

@@ -28 +28 @@
     const char Account::className[] = "Account";
 
-
-    #define method(class, name) {#name, &class::name}
-
     Lunar<Account>::RegType Account::methods[] = {
       {"deposit", new ExecutorLua1<Account, float>(&Account::deposit)},
@@ -48 +45 @@
         ~Object() { printf("deleted Object (%p)\n", this); }
 
-        //lua Interface
-        //function that returns a value to lua
-        int getCallCount(lua_State* L)
-        {
-         int calls = getCallCount();
-         lua_pushnumber(L,(lua_Number)calls);
-         return 1; // return number of values that the function wants to return to lua
-        }
-
-         //function that takes an argument from lua
-         int takeParam(lua_State* L)
-         {
-          int param = (int)lua_tonumber(L,-1);
-          takeParam(param);
-          return 0;
-         }
-
-        //meber functions
         void takeParam(int i)
         {

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

@@ -36 +36 @@
   io.write("callCount is now ",callCount)
   io.write("\n")
-  
+
   --pass parameters to a c++ method
   Obj:takeParam(3)
@@ -51 +51 @@
 
   return 2,false,2.72
+
   --debug.debug()
 end

branches/script_engine/src/lib/script_engine/script.h

@@ -16 +16 @@
 
     bool loadFile(std::string& filename);
+    std::string getFileName(){return currentFile;}
     bool executeFile();