Changeset 8208 in orxonox.OLD

Timestamp:

Jun 7, 2006, 6:42:28 PM (18 years ago)

Author:

snellen

Message:

added reset function to script manager

Location:

branches/script_engine/src/lib/script_engine

Files:

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

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

@@ -44 +44 @@
 }
 
+void  ScriptManager::reset()
+{
+  //TODO: delete all scripts and triggers, empty lists.
+
+
+
+}
 
 void ScriptManager::init()

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

@@ -19 +19 @@
   inline static ScriptManager* getInstance() { if (!ScriptManager::singletonRef)ScriptManager::singletonRef = new ScriptManager(); return ScriptManager::singletonRef; }
 
+  /// LOADING
   virtual void loadParams(const TiXmlElement* root);
-
+ 
+  /// QUERRYING
   Script* getScriptByFile(std::string& file);
-
+  
 
   
  private:
 
+   void  reset();                                   //!< Resets the script manager
    void  init();
    void  createScripts(const TiXmlElement* scripts);
@@ -36 +39 @@
    static ScriptManager*             singletonRef;   //!< Reference to this class
 
-   const std::list<BaseObject*>*     triggers;
+   const std::list<BaseObject*>*     triggers;       //!< A list of all the triggers in the world
 
-   const std::list<BaseObject*>*     scripts;
+   const std::list<BaseObject*>*     scripts;        //!< A list of all the scripts in the world
 
 

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

@@ -44 +44 @@
         .defaultValues("");
     LoadParam(root, "triggerparent", this, ScriptTrigger, setTriggerParent)
-        .describe("The name of the target as it is in the *.oxw file")
+        .describe("The name of the parent as it is in the *.oxw file")
         .defaultValues("");
 

branches/script_engine/src/lib/script_engine/script_trigger.h

@@ -19 +19 @@
     
     
-    ///
+    /// DO WORK
     virtual void tick(float timestep);
     virtual void executeAction();
 
-    
+    /// SET MEMBER
     void setTarget(const std::string& targetName);
     void setTarget(WorldEntity* target) { if(target!=NULL) this->target=target; }
-    
     void setTriggerParent(const std::string& name);
- 
-    void setCallOnce(const bool call) { this->callOnce = call;}
-    void setRadius(const float radius) { if(radius>0) this->radius = radius;}
-    void setDelay(const float time){if(delay>0) this->delay = delay;}
-    void setScript(const std::string& script){this->scriptFile = script;}
-    void setFunction(const std::string& function){this->functionName = function;}
+    void setCallOnce(const bool call) { this->callOnce = call; }
+    void setRadius(const float radius) { if(radius>0) this->radius = radius; }
+    void setDelay(const float time){if(delay>0) this->delay = delay; }
+    void setScript(const std::string& script){ this->scriptFile = script; }
+    void setFunction(const std::string& function){ this->functionName = function; }
+
 
   private:
@@ -44 +43 @@
     std::string  functionName;
 
-    
+    //for internal use
     bool         scriptCalled;
     bool         callScript;