Changeset 8250 in orxonox.OLD

Timestamp:

Jun 8, 2006, 3:06:29 PM (18 years ago)

Author:

bensch

Message:

linking

Location:

branches/script_engine/src

Files:

• defs/include_paths.am (modified) (1 diff)
• lib/script_engine/Makefile.am (modified) (2 diffs)
• lib/script_engine/account.cc (moved) (moved from branches/script_engine/src/lib/script_engine/Account.cc) (3 diffs)
• lib/script_engine/object.cc (moved) (moved from branches/script_engine/src/lib/script_engine/Object.cc) (2 diffs)
• lib/script_engine/script_class.h (modified) (2 diffs)

branches/script_engine/src/defs/include_paths.am

@@ -37 +37 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/../extern_libs

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

@@ -16 +16 @@
                 script_manager.cc\
                 script_class.cc\
-                account.cc\
+                account.cc \
                 object.cc
-                
+
 
 AM_CPPFLAGS= @LUA_INCLUDES@
@@ -27 +27 @@
                 script_manager.h\
                 script_class.h
-                
+
 
 

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

@@ -1 @@
- 
- 
- 
+
+
+
 #include <iostream>
 
 #include "luaincl.h"
+#include "base_object.h"
+#include "lunar.h"
+
+#include "script_class.h"
 
 
- 
  class Account : public BaseObject {
       lua_Number m_balance;
@@ -15 +18 @@
 
      Account(lua_State *L)      { m_balance = luaL_checknumber(L, 1); }
-     Account(double balance=0)    : m_balance(balance) { }
+     Account(double balance=0)    : m_balance(balance) { this->setClassID(CL_ACCOUNT, "Account"); }
 
      void deposit (float value) { m_balance += value; };
@@ -35 +38 @@
    {0,NULL}
  };
- 
-CREATE_SCRIPTABLE_CLASS(Account, CL_ACCOUNT)
+
+ CREATE_SCRIPTABLE_CLASS(Account, CL_ACCOUNT);
+

branches/script_engine/src/lib/script_engine/object.cc

@@ -2 +2 @@
 #include <iostream>
 
-#include "luaincl.h"
+#include "base_object.h"
+#include "lunar.h"
 
-
+#include "script_class.h"
 
 
@@ -49 +50 @@
    {0,0}
  };
- 
-CREATE_SCRIPTABLE_CLASS(Object, CL_TEST_OBJECT)
+
+ CREATE_SCRIPTABLE_CLASS(Object, CL_TEST_OBJECT);

branches/script_engine/src/lib/script_engine/script_class.h

@@ -28 +28 @@
 {
 
-public:
-  ScriptClass(const std::string& name, ClassID classID);
-  virtual ~ScriptClass();
+  public:
+    virtual ~ScriptClass();
 
-  bool operator==(const std::string& name) { return (this->getName() == name); }
-  bool operator==(ClassID classID) { return (this->classID == classID); }
-  
-  virtual void registerClass(Script* script) = 0;
-  virtual int insertObject(Script* L, BaseObject* obj, const std::string& name, bool gc=false) = 0;
+    bool operator==(const std::string& name) { return (this->getName() == name); }
+    bool operator==(ClassID classID) { return (this->classID == classID); }
 
-private:
-  ClassID             classID;
+    virtual void registerClass(Script* script) = 0;
+    virtual int insertObject(Script* L, BaseObject* obj, bool gc=false) = 0;
+
+  protected:
+    ScriptClass(const std::string& name, ClassID classID);
+
+  private:
+    ClassID             classID;
 };
 
@@ -48 +50 @@
 class tScriptable : public ScriptClass
 {
-  tScriptable(const std::string& name, ClassID classID)
-  : ScriptClass(name, classID)
-  { }
+  public:
+    tScriptable(const std::string& name, ClassID classID)
+        : ScriptClass(name, classID)
+    { }
 
-  virtual void registerClass(Script* script)
-  {
-    Lunar<T>::Register(script);
-  }
-  virtual int insertObject(Script* L, BaseObject* obj, bool gc=false) 
-  {
-    Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
-  }
-  
+    virtual void registerClass(Script* script)
+    {
+      Lunar<T>::Register(script);
+    }
+    virtual int insertObject(Script* L, BaseObject* obj, bool gc=false)
+    {
+      Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
+    }
+