Changeset 589 for code/branches

Timestamp:

Dec 17, 2007, 7:14:41 PM (17 years ago)

Author:

landauf

Message:

finally found the damn fkng bug.

Location:

code/branches/FICN/src/orxonox/objects

Files:

• Mesh.cc (modified) (1 diff)
• Mesh.h (modified) (1 diff)
• Model.cc (modified) (1 diff)
• WorldEntity.cc (modified) (5 diffs)
• WorldEntity.h (modified) (1 diff)

code/branches/FICN/src/orxonox/objects/Mesh.cc

@@ -13 +13 @@
     }
 
-    Mesh::Mesh(const std::string& file)
+    void Mesh::setMesh(const std::string& file)
     {
-        std::cout << "Mesh: 1\n";
         std::ostringstream name;
-        std::cout << "Mesh: 2\n";
         name << (Mesh::meshCounter_s++);
-        std::cout << "Mesh: 3, entity before creation: " << this->entity_ << "\n";
-        std::cout << ("Mesh: name: Mesh" + name.str()) << std::endl;
-        std::cout << "Mesh: file: " << file << std::endl;
         this->entity_ = Orxonox::getSingleton()->getSceneManager()->createEntity("Mesh" + name.str() + "gugus", file);
-        std::cout << "Mesh: 4, entity after creation: " << this->entity_ << "\n";
     }
 

code/branches/FICN/src/orxonox/objects/Mesh.h

@@ -12 +12 @@
         public:
             Mesh();
-            Mesh(const std::string& file);
             ~Mesh();
+            void setMesh(const std::string& file);
+
             inline Ogre::Entity* getEntity()
                 { return this->entity_; }
+
+            inline const std::string& getName() const
+                { return this->entity_->getName(); }
 
         private:

code/branches/FICN/src/orxonox/objects/Model.cc

@@ -23 +23 @@
     void Model::loadParams(TiXmlElement* xmlElem)
     {
-std::cout << "### START PARSING MODEL" << std::endl;
         WorldEntity::loadParams(xmlElem);
 
-
-std::cout << "Model: 1\n";
         if (xmlElem->Attribute("mesh"))
         {
-std::cout << "Model: 2_1\n";
                 std::string src = xmlElem->Attribute("mesh");
-std::cout << "Model: 2_2\n";
-std::cout << "Model: mesh before creation: " << &this->mesh_ << std::endl;
-std::cout << "Model: entity before creation: " << this->mesh_.getEntity() << std::endl;
-                this->mesh_ = Mesh(src);
-std::cout << "Model: 2_3\n";
-std::cout << "Model: entity after creation: " << this->mesh_.getEntity() << std::endl;
-std::cout << "Model: mesh after creation: " << &this->mesh_ << std::endl;
-std::cout << "Model: node: " << this->getNode() << std::endl;
-
-//Entity *ent2 = Orxonox::getSingleton()->getSceneManager()->createEntity( "Robot2", "ogrehead.mesh" );
-//SceneNode *node2 = mSceneMgr->getRootSceneNode()->createChildSceneNode( "RobotNode2", Vector3( 50, 0, 0 ) );
-//node2->attachObject( ent2 );
-//this->attachObject( ent2 );
-//node2->attachObject( this->mesh_.getEntity() );
-this->attachObject( this->mesh_.getEntity() );
-
-//                  this->attachObject(this->mesh_.getEntity());
-std::cout << "Model: 2_4\n";
+                this->mesh_.setMesh(src);
+                    this->attachObject(this->mesh_.getEntity());
         }
-std::cout << "Model: 3\n";
-std::cout << "### FINISHED PARSING MODEL" << std::endl;
 
         COUT(4) << "Loader: Created model" << std::endl;

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -46 +46 @@
         RegisterObject(WorldEntity);
 
-        std::cout << "WE: const: 1_1\n";
         if (Orxonox::getSingleton()->getSceneManager())
         {
-        std::cout << "WE: const: 1_2\n";
             std::ostringstream name;
             name << (WorldEntity::worldEntityCounter_s++);
             this->setName("WorldEntity" + name.str());
             node_ = Orxonox::getSingleton()->getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
-            std::cout << "WE: const: name: " << this->getName() << ", node: " << this->node_ << std::endl;
         }
-        std::cout << "WE: const: 1_3\n";
 
         this->bStatic_ = true;
@@ -84 +80 @@
     void WorldEntity::loadParams(TiXmlElement* xmlElem)
     {
-std::cout << "### START PARSING WE" << std::endl;
         BaseObject::loadParams(xmlElem);
 
-        std::cout << "WE: 1\n";
         if (xmlElem->Attribute("name"))
         {
-        std::cout << "WE: 2\n";
                 this->setName(xmlElem->Attribute("mesh"));
         }
-        std::cout << "WE: 3\n";
+
         if (xmlElem->Attribute("position"))
         {
-        std::cout << "WE: 4\n";
                 std::vector<std::string> pos = tokenize(xmlElem->Attribute("position"),",");
                 float x, y, z;
@@ -104 +96 @@
                 this->setPosition(x, y, z);
         }
-        std::cout << "WE: 5\n";
+
         if (xmlElem->Attribute("direction"))
         {
-        std::cout << "WE: 6\n";
                 std::vector<std::string> pos = tokenize(xmlElem->Attribute("direction"),",");
                 float x, y, z;
@@ -115 +106 @@
                 this->setDirection(x, y, z);
         }
-        std::cout << "WE: 7\n";
+
         if (xmlElem->Attribute("scale"))
         {
-        std::cout << "WE: 8\n";
                     std::string scaleStr = xmlElem->Attribute("scale");
                     float scale;
@@ -124 +114 @@
                     this->setScale(scale);
         }
-        std::cout << "WE: 9\n";
-std::cout << "### FINISHED PARSING WE" << std::endl;
     }
 

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -78 +78 @@
 
       inline void attachObject(Ogre::MovableObject *obj)
-        { std::cout << "gux_1 " << this->node_ << " " << obj << "\n"; this->node_->attachObject(obj); std::cout << "gux_2\n"; }
+        { this->node_->attachObject(obj); }
       inline void attachObject(Mesh &mesh)
-        { std::cout << "gux_3 " << this->node_ << " " << &mesh << " " << mesh.getEntity() << "\n"; this->node_->attachObject(mesh.getEntity()); std::cout << "gux_4\n"; }
+        { this->node_->attachObject(mesh.getEntity()); }
       inline void detachObject(Ogre::MovableObject *obj)
         { this->node_->detachObject(obj); }