Changeset 10622 in orxonox.OLD for trunk/src/lib

Timestamp:

Apr 6, 2007, 6:54:15 PM (18 years ago)

Author:

snellen

Message:

merged scriptimprovements back to trunk

Location:

trunk/src/lib/script_engine

Files:

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

trunk/src/lib/script_engine/script.cc

@@ -106 +106 @@
    filedest += "scripts/" + directory + file;
 
-   this->addThisScript();
+   this->addStandartObjects();
    this->registerStandartClasses();
 
@@ -406 +406 @@
    bool success = false;
 
-   //this->registerClass(std::string("Vector"));
-    this->registerClass("ScriptTrigger");
-  //  this->registerClass("AttractorMine");
+    this->registerClass("SpaceTrigger");
+    this->registerClass("TickTrigger");
+    this->registerClass("TimeTrigger");
+
+   return success;
+ }
+
+bool Script::addStandartObjects()
+ {
+   bool success = true;
+
+   this->addThisScript();
 
    return success;

trunk/src/lib/script_engine/script.h

@@ -68 +68 @@
     int  reportError(int error);                      //!< Get errormessage from the lua stack and print it.
     bool registerStandartClasses();                   //!< Register all the classes that the script might need
+    bool addStandartObjects();                        //!< Add all the objects that the script might need
     bool classIsRegistered(const std::string& type);  //!< Checks wheter the class "type" has already been registered with the script
     bool objectIsAdded(const std::string& name);      //!< Checks wheter the object "name" has already been added to the script

trunk/src/lib/script_engine/script_manager.cc

@@ -25 +25 @@
 
 #include "script.h"
-#include "tools/script_trigger.h"
+#include "script_triggers/script_trigger.h"
 #include "luaincl.h"
 #include "loading/load_param_xml.h"
+#include "util/loading/factory.h"
 
 
@@ -50 +51 @@
 {
   BaseObject::loadParams(root);
-  {
-    LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
 
-    LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers);
-  } // make shure that the loading process is finished
+  LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
 
-  // fill the scripts and triggers (doing that on runtime is very slow!)
+  LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers);
+
 }
 
@@ -85 +84 @@
 void ScriptManager::createTriggers(const TiXmlElement* triggers)
 {
+   
   LOAD_PARAM_START_CYCLE(triggers, object);
   {
-    new ScriptTrigger(object);
+   Factory::fabricate(object);
   }
   LOAD_PARAM_END_CYCLE(object);