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

Timestamp:

Jul 2, 2006, 1:36:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

Location:

trunk/src/lib/script_engine

Files:

• script.cc (modified) (4 diffs)
• script.h (modified) (2 diffs)
• script_class.h (modified) (2 diffs)
• script_manager.cc (modified) (1 diff)

trunk/src/lib/script_engine/script.cc

@@ -24 +24 @@
 
 #include "class_list.h"
+// uncommet this when the std:string and the const bug is fixed
+//CREATE_SCRIPTABLE_CLASS(Script, CL_SCRIPT,
+//                               addMethod("addObject", ExecutorLua2<Script,std::string,std::string>(&Script::addObject))
+//                               ):
 
 Script::Script(const TiXmlElement* root)
@@ -73 +77 @@
 bool Script::loadFile(const std::string& filename)
  {
-
+   this->setName(filename);
    std::string filedest(ResourceManager::getInstance()->getDataDir());
    filedest += "scripts/" + filename;
@@ -93 +97 @@
      {
       currentFile = filename;
+      //this->addThisScript();
       return true;
      }
@@ -323 +328 @@
  }
 
+
+void Script::addThisScript()
+{
+  BaseObject* scriptClass = ClassList::getObject("Script", CL_SCRIPT_CLASS);
+   if (scriptClass != NULL)
+   {
+     static_cast<ScriptClass*>(scriptClass)->registerClass(this);
+     static_cast<ScriptClass*>(scriptClass)->insertObject(this, this,"thisscript", false);
+   }
+}
+
  int Script::reportError(int error)
  {

trunk/src/lib/script_engine/script.h

@@ -31 +31 @@
     void loadFileNoRet(const std::string& filename) { loadFile(filename); };
     bool loadFile(const std::string& filename);
-    void addObject(const std::string& className, const std::string& objectName);
+    void addObject( const std::string& className,const std::string& objectName);
 
     /// QUERRYING
@@ -61 +61 @@
 
   private:
-
+    void addThisScript();
     int  reportError(int error);                      //!< Get errormessage from the lua stack and print it.
     bool registerStandartClasses();                   //!< Register all the classes that the script might need

trunk/src/lib/script_engine/script_class.h

@@ -34 +34 @@
   virtual void registerClass(Script* script) = 0;
   virtual int insertObject(Script* L, BaseObject* obj, bool gc=false) = 0;
+  virtual int insertObject(Script* L, BaseObject* obj, const std::string& name, bool gc=false) = 0; 
 
   const ScriptMethod* scriptMethods() const { return this->_scriptMethods; }
@@ -64 +65 @@
     return Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
   }
+
+  virtual int insertObject(Script* L, BaseObject* obj,const std::string& name, bool gc=false)
+  {
+    return Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), name, gc);
+  }
 };
 

trunk/src/lib/script_engine/script_manager.cc

@@ -74 +74 @@
     while(!scripts->empty())
       delete scripts->front();
+  //Delete all triggers
+  if(this->getTriggers())
+    while(!triggers->empty())
+      delete triggers->front();
+  
 }