Changeset 10350 in orxonox.OLD for branches

Timestamp:

Jan 24, 2007, 7:15:34 PM (18 years ago)

Author:

snellen

Message:

object name in orxonox and in the script can now be handled seperately

Location:

branches/scriptchanges.new/src/lib/script_engine

Files:

• script.cc (modified) (1 diff)
• script.h (modified) (1 diff)
• script_class.cc (modified) (1 diff)

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

@@ -170 +170 @@
  }
 
+
+void Script::addObjectAsName( const std::string& className, const std::string& objectName, const std::string& nameInScript)
+ {
+   ScriptClass* scriptClass = ScriptClass::objectList().getObject(className);
+   WorldObject tmpObj;
+   if (scriptClass != NULL)
+   {
+     tmpObj.type = className;
+     if( !classIsRegistered(className) )
+     {
+       scriptClass->registerClass(this);
+     }
+     BaseObject* object = ObjectListBase::getBaseObject(className, objectName);
+     if (object != NULL && !objectIsAdded(objectName))
+     {
+        scriptClass->insertObject(this, object,nameInScript, false);
+        tmpObj.name = objectName;
+        registeredObjects.push_back(tmpObj);
+     }
+   }
+ }
 
 

branches/scriptchanges.new/src/lib/script_engine/script.h

@@ -34 +34 @@
     bool loadFile(const std::string& filename);
     void addObject( const std::string& className,const std::string& objectName);
+    void addObjectAsName( const std::string& className,const std::string& objectName, const std::string& nameInScript);
     void registerClass(const std::string& className);                           //!< Register a class but dont add any instances
 

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

@@ -25 +25 @@
 CREATE_SCRIPTABLE_CLASS(Script,
                     addMethod("addObject", Executor2<Script, lua_State*,const std::string&, const std::string& >(&Script::addObject))
+                    ->addMethod("addObjectAsName", Executor3<Script, lua_State*,const std::string&, const std::string&, const std::string& >(&Script::addObjectAsName))
                     ->addMethod("registerClass", Executor1<Script, lua_State*,const std::string&>(&Script::registerClass))
                     ->addMethod("selectFunction", Executor2ret<Script, lua_State*, bool, const std::string&, int >(&Script::selectFunction))