Changeset 8093 in orxonox.OLD

Timestamp:

Jun 1, 2006, 6:28:50 PM (18 years ago)

Author:

snellen

Message:

continued working on the scriptmanager

Location:

branches/script_engine/src

Files:

• defs/include_paths.am (modified) (1 diff)
• lib/BuildLibs.am (modified) (1 diff)
• lib/script_engine/Makefile.am (modified) (2 diffs)
• lib/script_engine/account.cc (deleted)
• lib/script_engine/example.cc (added)
• lib/script_engine/script.h (modified) (1 diff)
• lib/script_engine/script_manager.cc (modified) (1 diff)
• lib/script_engine/script_manager.h (modified) (1 diff)

branches/script_engine/src/defs/include_paths.am

@@ -27 +27 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/newmat
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/script_engine
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font

branches/script_engine/src/lib/BuildLibs.am

@@ -22 +22 @@
                 $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/math/libORXmath.a \
-                $(LIB_PREFIX)/libORXlibs.a
+                $(LIB_PREFIX)/libORXlibs.a \
+                $(LIB_PREFIX)/script_engine/libORXscript.a

branches/script_engine/src/lib/script_engine/Makefile.am

@@ -10 +10 @@
 AM_CPPFLAGS= @LUA_INCLUDES@
 
-bin_PROGRAMS = account
-account_SOURCES = \
-                account.cc\
+bin_PROGRAMS = example
+example_SOURCES = \
+                example.cc\
                 script.cc\
                 script_manager.cc
@@ -18 +18 @@
 
 
-account_LDADD = libORXscript.a -L../../../extern_libs @LUA_LIBS@
+example_LDADD = libORXscript.a -L../../../extern_libs @LUA_LIBS@
 
 #main_LDFLAGS =

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(int param, std::string& toFunction);
     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
+    int   getReturnedInt();
     bool  getReturnedBool();
     float getReturnedFloat();

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

@@ +1 @@
+#include <string>
+#include <list>
 
 #include "script.h"
 #include "script_manager.h"
+
+
+
+ScriptManager::ScriptManager()
+{
+  this->init();
+
+}
+
+ScriptManager::~ScriptManager()
+{
+
+
+}
+
+
+void ScriptManager::init()
+{
+
+
+}
+
+
+
+void ScriptManager::loadParams(const TiXmlElement* root)
+{
+
+}
+

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

@@ -4 +4 @@
 
 #include <string>
+
 #include "base_object.h"
-
 #include "luaincl.h"
+#include "loading/load_param.h"
 
 
 
-class ScriptManager
+class ScriptManager //: public BaseObject
 {
  public:
-  init();
+  ScriptManager();
+  virtual ~ScriptManager();
 
-
+  virtual void loadParams(const TiXmlElement* root);
 
 
  private:
-
+  void  init();