Changeset 8271 in orxonox.OLD for trunk/src/lib/script_engine

Timestamp:

Jun 8, 2006, 4:50:50 PM (18 years ago)

Author:

bensch

Message:

merge

Location:

trunk/src/lib/script_engine

Files:

• Makefile.am (modified) (2 diffs)
• OLD (deleted)
• Script.cc (deleted)
• Script.h (deleted)
• account.cc (copied) (copied from branches/script_engine/src/lib/script_engine/account.cc)
• example.cc (copied) (copied from branches/script_engine/src/lib/script_engine/example.cc)
• luna (deleted)
• lunar.h (modified) (4 diffs)
• lunartest2.lua (modified) (2 diffs)
• object.cc (copied) (copied from branches/script_engine/src/lib/script_engine/object.cc)
• script.cc (copied) (copied from branches/script_engine/src/lib/script_engine/script.cc)
• script.h (copied) (copied from branches/script_engine/src/lib/script_engine/script.h)
• script_class.cc (copied) (copied from branches/script_engine/src/lib/script_engine/script_class.cc)
• script_class.h (copied) (copied from branches/script_engine/src/lib/script_engine/script_class.h)
• script_manager.cc (copied) (copied from branches/script_engine/src/lib/script_engine/script_manager.cc)
• script_manager.h (copied) (copied from branches/script_engine/src/lib/script_engine/script_manager.h)

trunk/src/lib/script_engine/Makefile.am

@@ -1 +1 @@
 MAINSRCDIR=../..
 include $(MAINSRCDIR)/defs/include_paths.am
+
+
+LIB_PREFIX=$(MAINSRCDIR)/lib
+include $(MAINSRCDIR)/lib/BuildLibs.am
+
+
 
 INCLUDES= -I../../../extern_libs
@@ -6 +12 @@
 noinst_LIBRARIES = libORXscript.a
 
-libORXscript_a_SOURCES =
+libORXscript_a_SOURCES = \
+                script.cc\
+                script_manager.cc\
+                script_class.cc\
+                account.cc \
+                object.cc
+
 
 AM_CPPFLAGS= @LUA_INCLUDES@
 
-bin_PROGRAMS = account
-account_SOURCES = \
-                account.cc\
-                Script.cc
+noinst_HEADERS = \
+                lunar.h\
+                script.h\
+                script_manager.h\
+                script_class.h
 
 
 
-account_LDADD = libORXscript.a -L../../../extern_libs @LUA_LIBS@
 
-#main_LDFLAGS =
+check_PROGRAMS = example
 
 
-noinst_HEADERS = \
-                lunar.h\
-                Script.h
+
+
+
+
+
+example_DEPENDENCIES = \
+                $(MAINSRCDIR)/world_entities/libORXwe.a \
+                $(libORXlibs_a_LIBRARIES_) \
+                $(MAINSRCDIR)/util/libORXutils.a
+
+example_LDADD = \
+                $(MAINSRCDIR)/util/libORXutils.a \
+                $(libORXlibs_a_LIBRARIES_) \
+                libORXscript.a -L../../../extern_libs @LUA_LIBS@ \
+                $(MAINSRCDIR)/world_entities/libORXwe.a \
+                $(libORXlibs_a_LIBRARIES_) \
+                $(MAINSRCDIR)/util/libORXutils.a
+
+example_SOURCES= \
+                example.cc \
+                \
+                ../util/executor/executor_lua.cc

trunk/src/lib/script_engine/lunar.h

@@ -3 +3 @@
 
 #include <string>
-#include "Script.h"
+#include <cassert>
+#include "script.h"
 
 #include "luaincl.h"
+#include "executor/executor_lua.h"
 
 
@@ -12 +14 @@
       typedef struct { T *pT; } userdataType;
     public:
-      typedef int (T::*mfp)(lua_State *L);
+      typedef Executor* mfp;
       typedef struct { const char *name; mfp mfunc; } RegType;
 
@@ -139 +141 @@
       static int insertObject(Script* script, T* obj, const std::string& name, bool gc=false)
       {
-        if(script != NULL)
-          return insertObject(script->getLuaState(), obj, name, gc);
-
-
+        assert (script != NULL);
+        return insertObject(script->getLuaState(), obj, name, gc);
       }
 
@@ -163 +163 @@
         // get member function from upvalue
         RegType *l = static_cast<RegType*>(lua_touserdata(L, lua_upvalueindex(1)));
-        return (obj->*(l->mfunc))(L);  // call member function
+        int value;
+        (*l->mfunc)(obj, value, L);  // call member function
+        return value;
       }
 

trunk/src/lib/script_engine/lunartest2.lua

@@ -15 +15 @@
 getmetatable(Account).__index = parent
 
+
+function test()
+io.write("Hi i'm test\n")
+end
+
+
 function main(arg)
+  -- use parameter
   io.write("main received ", arg)
   io.write(" as parameter\n")
+
+  --call member of an inserted object
   Obj:printName()
+
+  --create object of a registered type
+  o = Object()
+  o:printName()
+
+  --take returnvalue from c
+  callCount = Obj:getCallCount()
+  io.write("callCount is now ",callCount)
+  io.write("\n")
+
+  --pass parameters to a c++ method
+  Obj:takeParam(3)
+
+  --print object information
   print('a =', a)
   print('b =', b)
@@ -28 +51 @@
   Obj:printName()
 
-  return 2
+  return 2,false,2.72
+
   --debug.debug()
 end