Changeset 8239 in orxonox.OLD for branches/script_engine/src/lib

Timestamp:

Jun 8, 2006, 1:53:06 PM (19 years ago)

Author:

bensch

Message:

more integration into orxonox framework

Location:

branches/script_engine/src/lib

Files:

• BuildLibs.am (modified) (2 diffs)
• script_engine/script_manager.cc (modified) (4 diffs)
• script_engine/script_manager.h (modified) (2 diffs)
• script_engine/script_trigger.cc (modified) (2 diffs)

branches/script_engine/src/lib/BuildLibs.am

@@ -6 +6 @@
                 $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \
                 $(LIB_PREFIX)/gui/libORXbasegui.a \
+                $(LIB_PREFIX)/script_engine/libORXscript.a \
                 $(LIB_PREFIX)/graphics/importer/libORXimporter.a \
                 $(LIB_PREFIX)/graphics/libORXgraphics.a \
@@ -22 +23 @@
                 $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/math/libORXmath.a \
-                $(LIB_PREFIX)/libORXlibs.a \
-                $(LIB_PREFIX)/script_engine/libORXscript.a
+                $(LIB_PREFIX)/libORXlibs.a

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

@@ -16 +16 @@
 
 
-ScriptManager::ScriptManager()
+ScriptManager::ScriptManager(const TiXmlElement* root)
 {
-  this->init();
+  this->setName("ScriptManager");
+
+  this->scripts = NULL;
+  this->triggers = NULL;
+
+  if (root != NULL)
+    this->loadParams(root);
 }
+
+
 
 ScriptManager::~ScriptManager()
 {
-  // delete all scripts since they are useless without the manager
-  if(getScripts())
-    for(std::list<BaseObject*>::const_iterator it = scripts->begin(); it != scripts->end(); it++ )
-  {
-    ClassList::removeFromClassList( (*it) );
-  }
-
+  this->flush();
 }
 
@@ -35 +37 @@
 void ScriptManager::loadParams(const TiXmlElement* root)
 {
-  this->reset();
   //BaseObject::loadParams(root);
   {
-  LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
+    LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
 
-  LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers);
+    LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers);
   } // make shure that the loading process is finished
 
@@ -46 +47 @@
   getTriggers();
   getScripts();
+}
 
 
-}
 
-void  ScriptManager::reset()
+void  ScriptManager::flush()
 {
   //Delete all scripts as they aren't deleted automatically
-  if(getScripts())
-    for(std::list<BaseObject*>::const_iterator it = scripts->begin(); it != scripts->end(); it++ )
-    {
-     ClassList::removeFromClassList( (*it) );
-    }
-
-  this->scripts = NULL;
-  this->triggers = NULL;
+  if(this->getScripts())
+    while(!scripts->empty())
+      delete scripts->front();
 }
-
-void ScriptManager::init()
-{
-  //this->setClassID("");
-  this->setName("ScriptManager");
-
-  this->scripts = NULL;
-  this->triggers = NULL;
-}
-
 
 void  ScriptManager::createScripts(const TiXmlElement* scripts)
@@ -98 +84 @@
 {
   if(getScripts())
-   for(std::list<BaseObject*>::const_iterator it = scripts->begin(); it != scripts->end(); it++ )
+    for(std::list<BaseObject*>::const_iterator it = scripts->begin(); it != scripts->end(); it++ )
     {
       if( (dynamic_cast<Script*>(*it))->getFileName().compare(file) == 0)
-     {
-       return dynamic_cast<Script*>(*it);
-     }
-   }
+      {
+        return dynamic_cast<Script*>(*it);
+      }
+    }
 
   return NULL;

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

@@ -14 +14 @@
 {
  public:
-   ScriptManager();
+   ScriptManager(const TiXmlElement* root = NULL);
    ~ScriptManager();
-
-  inline static ScriptManager* getInstance() { if (!ScriptManager::singletonRef)ScriptManager::singletonRef = new ScriptManager(); return ScriptManager::singletonRef; }
 
   /// LOADING
@@ -28 +26 @@
 
  private:
-
-   void  reset();                                   //!< Resets the script manager
-   void  init();
+   void  flush();                                   //!< Resets the script manager
    void  createScripts(const TiXmlElement* scripts);
    void  createTriggers(const TiXmlElement* triggers);

branches/script_engine/src/lib/script_engine/script_trigger.cc

@@ -3 +3 @@
 #include "script.h"
 
+#include "state.h"
 
 ScriptTrigger::ScriptTrigger(const TiXmlElement* root)
@@ -112 +113 @@
 void ScriptTrigger::setScript(const std::string& file)
 {
-  ScriptManager* scriptManager = ScriptManager::getInstance();
-  script = scriptManager->getScriptByFile(file);
-  if(script != NULL)
-    scriptIsOk = true;
-
+  ScriptManager* scriptManager = State::getScriptManager();
+  if (scriptManager != NULL)
+  {
+    script = scriptManager->getScriptByFile(file);
+    if(script != NULL)
+      scriptIsOk = true;
+  }
 }