Changeset 9195 in orxonox.OLD

Timestamp:

Jul 5, 2006, 9:29:01 AM (18 years ago)

Author:

snellen

Message:

scripttrigger can be created form within a script

Location:

branches/presentation/src

Files:

• lib/script_engine/script.cc (modified) (7 diffs)
• lib/script_engine/script.h (modified) (2 diffs)
• world_entities/script_trigger.cc (modified) (5 diffs)

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

@@ -26 +26 @@
 CREATE_SCRIPTABLE_CLASS(Script, CL_SCRIPT,
                     addMethod("addObject", ExecutorLua2<Script,const std::string&, const std::string& >(&Script::addObject))
+                    ->addMethod("registerClass", ExecutorLua1<Script,const std::string&>(&Script::registerClass))
                     ->addMethod("selectFunction", ExecutorLua2ret<Script, bool, const std::string&, int >(&Script::selectFunction))
                     ->addMethod("executeFunction", ExecutorLua0ret<Script,bool >(&Script::executeFunction))
@@ -78 +79 @@
 bool Script::loadFile(const std::string& filename)
  {
-   this->setName(filename);
    std::string filedest(ResourceManager::getInstance()->getDataDir());
    filedest += "scripts/" + filename;
@@ -95 +95 @@
    if(error == 0)
    {
-     
+     currentFile = filename;
      error = lua_pcall(luaState, 0, 0, 0);
 
      if(error == 0)
      {
-      currentFile = filename;
       return true;
      }
@@ -360 +359 @@
    //this->registerClass(std::string("Vector"));
     this->registerClass("ScriptTrigger");
-    this->registerClass("AttractorMine");
+  //  this->registerClass("AttractorMine");
 
    return success;
@@ -366 +365 @@
  
  
- bool Script::registerClass( const std::string& className)
+ void Script::registerClass( const std::string& className)
  {
    BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
@@ -379 +378 @@
        tmpObj.name = "";
        registeredObjects.push_back(tmpObj);
+       return;
+     }
+   }
+ 
+ }
+
+ 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::classIsRegistered(const std::string& type)
+ }
+
+
+
+ bool Script::objectIsAdded(const std::string& name)
  {
    for(std::list<WorldObject>::const_iterator it = registeredObjects.begin(); it != registeredObjects.end(); it++ )
    {
-     if( (*it).type == type)
+     if( (*it).name == name)
      {
        return true;
@@ -396 +408 @@
    }
    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/presentation/src/lib/script_engine/script.h

@@ -32 +32 @@
     bool loadFile(const std::string& filename);
     void addObject( const std::string& className,const std::string& objectName);
+    void registerClass(const std::string& className);                           //!< Register a class but dont add any instances 
 
     /// QUERRYING
@@ -64 +65 @@
     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 registerClass(const std::string& className); //!< Register a class but dont add any instances 
     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

branches/presentation/src/world_entities/script_trigger.cc

@@ -52 +52 @@
   this->toList(OM_COMMON);
 
+  radius = 10;
   returnCount = 1;
   scriptFinished = false;
@@ -72 +73 @@
   
   }
+  
 }
 
@@ -137 +139 @@
   BaseObject* targetEntity = ClassList::getObject(target, CL_WORLD_ENTITY);
 
-  if (targetEntity != NULL)
+      if (targetEntity != NULL)
   {
     this->setTarget(dynamic_cast<WorldEntity*>(targetEntity));
@@ -216 +218 @@
 void ScriptTrigger::setScript(const std::string& file)
 {
-
   ScriptManager* scriptManager = State::getScriptManager();
   if (scriptManager != NULL)
@@ -224 +225 @@
     if(script != NULL)
     {
+      printf("setting script to %s\n",file.c_str());
       scriptIsOk = true;
     }