Changeset 1052 for code/trunk/src/orxonox/objects/Model.cc

Timestamp:

Apr 14, 2008, 3:42:49 AM (16 years ago)

Author:

landauf

Message:

merged core2 back to trunk
there might be some errors, wasn't able to test it yet due to some strange g++ and linker behaviour.

File:

• code/trunk/src/orxonox/objects/Model.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/Model.cc

@@ -68 +68 @@
         @return The XML-element
     */
-    void Model::XMLPort(Element& xmlelement, bool loading)
+    void Model::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        WorldEntity::XMLPort(xmlelement, loading);
+        WorldEntity::XMLPort(xmlelement, mode);
 
-        XMLPortParamLoadOnly(Model, "mesh", setMesh, xmlelement, loading);
+        XMLPortParamLoadOnly(Model, "mesh", setMesh, xmlelement, mode);
 
         create();
@@ -84 +84 @@
     bool Model::create(){
       WorldEntity::create();
-      if(meshSrc_.compare("")!=0){
+      if ((this->meshSrc_ != "") && (this->meshSrc_.size() > 0))
+      {
         this->mesh_.setMesh(meshSrc_);
         this->attachObject(this->mesh_.getEntity());