Changeset 8393 in orxonox.OLD

Timestamp:

Jun 14, 2006, 3:43:56 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: scriptMethod much better implemented

Location:

branches/script_engine/src

Files:

• lib/script_engine/account.cc (modified) (1 diff)
• lib/script_engine/object.cc (modified) (1 diff)
• lib/script_engine/script_class.cc (modified) (2 diffs)
• lib/script_engine/script_class.h (modified) (4 diffs)
• lib/script_engine/script_method.cc (modified) (1 diff)
• lib/script_engine/script_method.h (modified) (1 diff)
• world_entities/space_ships/helicopter.cc (modified) (1 diff)

branches/script_engine/src/lib/script_engine/account.cc

@@ -39 +39 @@
  };
 
- CREATE_SCRIPTABLE_CLASS(Account, CL_ACCOUNT);
+ CREATE_SCRIPTABLE_CLASS(Account, CL_ACCOUNT, ScriptMethod("deposit", ExecutorLua1<Account, float>(&Account::deposit)));
 

branches/script_engine/src/lib/script_engine/object.cc

@@ -51 +51 @@
  };
 
- CREATE_SCRIPTABLE_CLASS(Object, CL_TEST_OBJECT);
+ CREATE_SCRIPTABLE_CLASS(Object, CL_TEST_OBJECT, ScriptMethod("printName", ExecutorLua0<Object>(&Object::printName)));

branches/script_engine/src/lib/script_engine/script_class.cc

@@ -17 +17 @@
 
 #include "script_class.h"
+#include <cassert>
 
 /**
- * standard constructor
+ * @brief standard constructor
  * @todo this constructor is not jet implemented - do it
 */
-ScriptClass::ScriptClass(const std::string& name, ClassID classID)
- : BaseObject(name)
+ScriptClass::ScriptClass(const std::string& name, ClassID classID, ScriptMethod* scriptMethods)
+    : BaseObject(name)
 {
-   this->setClassID(CL_SCRIPT_CLASS, "ScriptClass");
-   this->classID = classID;
+  assert(scriptMethods != NULL);
+  this->setClassID(CL_SCRIPT_CLASS, "ScriptClass");
+  this->classID = classID;
+
+  this->scriptMethods = scriptMethods;
 }
 
@@ -35 +39 @@
 ScriptClass::~ScriptClass ()
 {
-  // delete what has to be deleted here
+  delete this->scriptMethods;
 }

branches/script_engine/src/lib/script_engine/script_class.h

@@ -11 +11 @@
 #include "script.h"
 #include "lunar.h"
+#include "script_method.h"
+
 
 /**
@@ -16 +18 @@
  * this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
  */
-#define CREATE_SCRIPTABLE_CLASS(CLASS_NAME, CLASS_ID) \
-    tScriptable<CLASS_NAME> global_##CLASS_NAME##_ScriptableClass(#CLASS_NAME, CLASS_ID)
+#define CREATE_SCRIPTABLE_CLASS(CLASS_NAME, CLASS_ID, SCRIPT_METHODS) \
+    tScriptable<CLASS_NAME> global_##CLASS_NAME##_ScriptableClass(#CLASS_NAME, CLASS_ID, new SCRIPT_METHODS)
 
 
@@ -35 +37 @@
 
 protected:
-  ScriptClass(const std::string& name, ClassID classID);
+  ScriptClass(const std::string& name, ClassID classID, ScriptMethod* scriptMethods);
 
 private:
   ClassID             classID;
+  ScriptMethod*       scriptMethods;
 };
 
@@ -48 +51 @@
 {
 public:
-  tScriptable(const std::string& name, ClassID classID)
-      : ScriptClass(name, classID)
+  tScriptable(const std::string& name, ClassID classID, ScriptMethod* scriptMethods)
+      : ScriptClass(name, classID, scriptMethods)
   { }
 

branches/script_engine/src/lib/script_engine/script_method.cc

@@ -27 +27 @@
 }
 
-ScriptMethod& ScriptMethod::addMethod(const std::string& methodName, const Executor& executor)
+ScriptMethod* ScriptMethod::addMethod(const std::string& methodName, const Executor& executor)
 {
   this->methods.push_back(ScriptMethod::Method(methodName, executor));
 
-  return *this;
+  return this;
 }
 

branches/script_engine/src/lib/script_engine/script_method.h

@@ -19 +19 @@
   ~ScriptMethod();
 
-  ScriptMethod& addMethod(const std::string& methodName, const Executor& executor);
+  ScriptMethod* addMethod(const std::string& methodName, const Executor& executor);
+
+  const std::string& name(unsigned int methodNumber) const { return methods[methodNumber].name; };
+  const Executor* executor(unsigned int methodNumber) const { return methods[methodNumber].executor; };
 
 

branches/script_engine/src/world_entities/space_ships/helicopter.cc

@@ -36 +36 @@
 CREATE_FACTORY(Helicopter, CL_HELICOPTER);
 #include "script_class.h"
-//CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER);
+//CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER, NULL);