Changeset 8197 in orxonox.OLD

Timestamp:

Jun 7, 2006, 3:25:04 PM (18 years ago)

Author:

snellen

Message:

scriptengine integrated

Location:

branches/script_engine/src/lib

Files:

• lang/class_list.cc (modified) (1 diff)
• lang/class_list.h (modified) (1 diff)
• script_engine/script.cc (modified) (3 diffs)
• script_engine/scriptable.h (modified) (2 diffs)

branches/script_engine/src/lib/lang/class_list.cc

@@ -221 +221 @@
           return (*bo);
     }
+  }
+  return NULL;
+}
+
+
+/**
+ * @brief checks if the BaseObject* object exists.
+ * @param objectName the name of the BaseObject to look for
+ * @param classID if not CL_NULL it will only search through a specific type of Objects. Otherwise it will be searched everywhere.
+ * @return true, if the Object Exists in the specified ClassID, false otherwise
+ * @todo: speed this up!!
+ */
+BaseObject* ClassList::getObject(const std::string& objectName, const std::string& className)
+{
+  ClassList* cl = ClassList::getClassList(className);
+  if (cl != NULL)
+  {
+    std::list<BaseObject*>::iterator bo;
+    for (bo = cl->objectList.begin(); bo != cl->objectList.end(); bo++)
+      if ((*bo)->getName() != NULL && objectName == (*bo)->getName())
+        return (*bo);
   }
   return NULL;

branches/script_engine/src/lib/lang/class_list.h

@@ -42 +42 @@
     static const std::list<BaseObject*>*  getList(const std::string& className); // { return (ClassList* fl = ClassList::getClassList(className) != NULL)? &(fl->objectList) : NULL;  };
     static const std::list<std::string>*  getClassNames();
-    static BaseObject*                    getObject(const std::string& name, ClassID classID = CL_NULL);
+    static BaseObject*                    getObject(const std::string& objectName, ClassID classID = CL_NULL);
+    static BaseObject*                    getObject(const std::string& objectName, const std::string& className);
     static bool                           exists(const BaseObject* object, ClassID classID = CL_NULL);
     static bool                           exists(const std::string& className, const std::string& objectName);

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

@@ -1 +1 @@
 #include "script.h"
+#include "scriptable.h"
+
 #include "loading/load_param.h"
-
+#include "parser/tinyxml/tinyxml.h"
+
+#include "class_list.h"
 
 Script::Script(const TiXmlElement* root)
@@ -33 +37 @@
 void Script::loadParams(const TiXmlElement* root)
 {
-  LOAD_PARAM_START_CYCLE(root, objectElement);
+  LOAD_PARAM_START_CYCLE(root, object);
   {
-    LoadParam_CYCLE(objectElement, "object", this, Script, addObject)
+    LoadParam_CYCLE(object, "object", this, Script, addObject)
         .describe("The name of an object that is needed by a script");
   }
-  LOAD_PARAM_END_CYCLE(objectElement);
+  LOAD_PARAM_END_CYCLE(object);
 
 
@@ -85 +89 @@
  void Script::addObject(const std::string& className, const std::string& objectName)
  {
-   
+   BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPTABLE);
+   if (scriptClass != NULL)
+   {
+     static_cast<Scriptable*>(scriptClass)->registerClass(this);
+     
+     BaseObject* object = ClassList::getObject(objectName, className);
+     if (object != NULL)
+     {
+        static_cast<Scriptable*>(scriptClass)->insertObject(this, object, false);
+     }
+   }
  }
 

branches/script_engine/src/lib/script_engine/scriptable.h

@@ -25 +25 @@
 
 //! A class for ...
-class Scriptable : virtual protected BaseObject
+class Scriptable : protected BaseObject
 {
 
@@ -56 +56 @@
     Lunar<T>::Register(script);
   }
-  virtual int insertObject(Script* L, BaseObject* obj, const std::string& name, bool gc=false) 
+  virtual int insertObject(Script* L, BaseObject* obj, bool gc=false) 
   {
-    Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), name, gc);
+    Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
   }