Changeset 8206 in orxonox.OLD

Timestamp:

Jun 7, 2006, 5:56:55 PM (18 years ago)

Author:

snellen

Message:

script checks now before adding an object and a class wether the class or object has already been added

Location:

branches/script_engine/src/lib/script_engine

Files:

• script.cc (modified) (2 diffs)
• script.h (modified) (3 diffs)
• script_manager.cc (modified) (3 diffs)
• script_manager.h (modified) (1 diff)
• script_trigger.cc (modified) (1 diff)

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

@@ -95 +95 @@
    if (scriptClass != NULL)
    {
+     if( !classIsRegistered(className) )
      static_cast<ScriptClass*>(scriptClass)->registerClass(this);
      
      BaseObject* object = ClassList::getObject(objectName, className);
-     if (object != NULL)
+     if (object != NULL && !objectIsAdded(objectName))
      {
         static_cast<ScriptClass*>(scriptClass)->insertObject(this, object, false);
@@ -292 +293 @@
  }
 
+ 
+ bool Script::classIsRegistered(const std::string& type)
+ {
+   for(std::list<worldObject>::const_iterator it = registeredObjects.begin(); it != registeredObjects.end(); it++ )
+   {
+     if( (*it).type == type)
+     {
+       return true;
+     }
+   }
+   return false;
+ }
+ 
+ 
+ 
+ bool Script::objectIsAdded(const std::string& name)
+ {
+   for(std::list<worldObject>::const_iterator it = registeredObjects.begin(); it != registeredObjects.end(); it++ )
+   {
+     if( (*it).name == name)
+     {
+       return true;
+     }
+   }
+   return false;
+ 
+ 
+ }

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

@@ -5 +5 @@
 #include "base_object.h"
 
+
 struct lua_State;
+
+struct worldObject
+{
+  std::string name;
+  std::string type;
+};
 
 class Script : public BaseObject
@@ -18 +25 @@
     void loadFileNoRet(const std::string& filename) { loadFile(filename); };
     bool loadFile(const std::string& filename);
+    void addObject(const std::string& className, const std::string& objectName);
+    
+    /// QUERRYING
     /** @returns fileName */
     std::string getFileName() { return currentFile; }
-
-    void addObject(const std::string& className, const std::string& objectName);
-    
-        
-
     lua_State* getLuaState() const { return luaState; }
 
@@ -51 +56 @@
   private:
 
-    int reportError(int error);          //!< Get errormessage from the lua stack and print it.
+    int  reportError(int error);                      //!< Get errormessage from the lua stack and print it.
+    bool classIsRegistered(const std::string& type);
+    bool objectIsAdded(const std::string& name);
 
-    lua_State*         luaState;         //!< The lua_State that the Script works on
-    std::string        currentFile;      //!< The file that is loaded in the script
-    std::string        currentFunction;  //!< The name of the current active function (the one that gets the pushed parameter)
-    int                argumentCount;    //!< Number of arguments for the current function
-    int                returnCount;      //!< Number of return values of the current function
+    lua_State*              luaState;                //!< The lua_State that the Script works on
+    std::string             currentFile;             //!< The file that is loaded in the script
+    std::string             currentFunction;         //!< The name of the current active function (the one that gets the pushed parameter)
+    int                     argumentCount;           //!< Number of arguments for the current function
+    int                     returnCount;             //!< Number of return values of the current function
+    
+    std::list<worldObject>  registeredObjects;       //!< The list of all the objects and their type that have been registered with this script
 
 

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

@@ -31 +31 @@
 {
   //BaseObject::loadParams(root);
-
+  {
   LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers); 
   
   LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
+  } // make shure that the loading process is finished
+  
+  // fill the scripts and triggers (doing that on runtime is very slow!)
+  getTriggers();
+  getScripts();
+  
+  
 }
 
@@ -72 +79 @@
 Script* ScriptManager::getScriptByFile(std::string& file)
 {
-
-//   for(std::list<LuaScript>::iterator it = scriptList.begin(); it != scriptList.end(); it++ )
-//   {
-//     if( (*it).name.compare(file) == 0)
-//     {
-//       return &((*it).script);
-//     }
-//   }
-//   return NULL;
+  if(getScripts())
+   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 NULL;
 
 }
@@ -90 +98 @@
 }
 
+bool ScriptManager::getTriggers()
+{
+  return (this->triggers != NULL || (this->triggers = ClassList::getList(CL_SCRIPT_TRIGGER)) != NULL); 
+}
 
 
+

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

@@ -20 +20 @@
 
   virtual void loadParams(const TiXmlElement* root);
-
 
   Script* getScriptByFile(std::string& file);

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

@@ -102 +102 @@
      ScriptManager* scriptManager = ScriptManager::getInstance();
      Script* script = scriptManager->getScriptByFile(this->scriptFile);
+     if(script != NULL)
      if(!(script->selectFunction(this->functionName,0)) )
        printf("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), scriptFile.c_str());