Changeset 9692 in orxonox.OLD for branches/new_class_id/src/lib/script_engine

Timestamp:

Aug 23, 2006, 12:43:25 AM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: some thoughts on a BaseIterator class, that can travers through ObejectLists without knowing the Polymorph type.
This is all virtual, and since templated virutal functions are not allowed, quite hard to implements…
hpe it will work

Location:

branches/new_class_id/src/lib/script_engine

Files:

• script.cc (modified) (8 diffs)
• script.h (modified) (2 diffs)
• script_class.cc (modified) (2 diffs)

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

@@ -24 +24 @@
 
 #include "class_list.h"
-CREATE_SCRIPTABLE_CLASS(Script, CL_SCRIPT,
+CREATE_SCRIPTABLE_CLASS(Script, Script::classID(),
                     addMethod("addObject", ExecutorLua2<Script,const std::string&, const std::string& >(&Script::addObject))
                     ->addMethod("registerClass", ExecutorLua1<Script,const std::string&>(&Script::registerClass))
@@ -31 +31 @@
                      );
 
+NewObjectListDefinition(Script);
+
 Script::Script(const TiXmlElement* root)
 {
-  this->setClassID(CL_SCRIPT, "Script");
+  this->registerObject(this, Script::_objectList);
 
   returnCount = argumentCount = 0;
@@ -64 +66 @@
   luaopen_math(luaState);
   luaopen_debug(luaState);
-  
+
   this->loadFile(filename);
 
@@ -100 +102 @@
    std::string filedest(ResourceManager::getInstance()->getDataDir());
    filedest += "scripts/" + filename;
-   
+
    this->addThisScript();
    this->registerStandartClasses();
-   
+
    if(currentFile.length() != 0)
    {
@@ -295 +297 @@
        lua_remove(luaState,-1*returnCount);
        returnCount--;
-       
+
      }
    }
@@ -375 +377 @@
  {
    bool success = false;
-   
+
    //this->registerClass(std::string("Vector"));
     this->registerClass("ScriptTrigger");
@@ -382 +384 @@
    return success;
  }
- 
- 
+
+
  void Script::registerClass( const std::string& className)
  {
@@ -400 +402 @@
      }
    }
- 
+
  }
 

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

@@ -22 +22 @@
 class Script : public BaseObject
 {
+  NewObjectListDeclaration(Script);
   public:
     Script(const TiXmlElement* root = NULL);
@@ -33 +34 @@
     bool loadFile(const std::string& filename);
     void addObject( const std::string& className,const std::string& objectName);
-    void registerClass(const std::string& className);                           //!< Register a class but dont add any instances 
+    void registerClass(const std::string& className);                           //!< Register a class but dont add any instances
 
     /// QUERRYING

branches/new_class_id/src/lib/script_engine/script_class.cc

@@ -19 +19 @@
 #include <cassert>
 
+NewObjectListDefinition(ScriptClass);
 /**
  * @brief standard constructor
@@ -27 +28 @@
 {
   assert(scriptMethods != NULL);
-  this->setClassID(CL_SCRIPT_CLASS, "ScriptClass");
+  this->registerObject(this, Shell::_objectList);
 
   this->_classID = classID;