Changeset 580

Timestamp:

Dec 17, 2007, 4:27:41 PM (16 years ago)

Author:

rgrieder

Message:

• fixed the problem about the ship being static.
• added SceneNode hierarchy support in parser

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/orxonox/objects/BaseEntity.cc (modified) (2 diffs)
• src/orxonox/objects/SceneNode.cc (modified) (1 diff)
• src/orxonox/objects/WorldEntity.cc (modified) (1 diff)
• src/orxonox/objects/WorldEntity.h (modified) (1 diff)

code/branches/FICN/bin/levels/sample.oxw

@@ -26 +26 @@
                 <Skybox src="Orxonox/StarfieldSkyBox" />
 
-                <BaseEntity name="ASSF" src="assf2.mesh" node="OgreHeadNode" />
-
+    <SceneNode name="ShipNode" pos="0,0,0" node="OgreHeadNode" scale="10,10,10" yaw="-90" pitch="-90" />
+    <BaseEntity name="TheShip" src="assf2.mesh" node="ShipNode" />
 
     <SceneNode name="node1" pos="0,200,0" />

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

@@ -31 +31 @@
         mesh_ = xmlElem->Attribute("src");
         std::string node = xmlElem->Attribute("node");
+
+        // get the node
+        this->setNode(Orxonox::getSingleton()->getSceneManager()->getSceneNode(node));
+
         
         // register variables to be synchronised
@@ -54 +58 @@
      Ogre::Entity* entity = mgr->createEntity(name_, mesh_);
      
-     Ogre::MovableObject *ent = (Ogre::MovableObject *)entity;
-     getNode()->attachObject(ent); // big problem here: sigsegv
+     //Ogre::MovableObject *ent = (Ogre::MovableObject *)entity;
+     getNode()->attachObject(entity); // big problem here: sigsegv
      return true;
    }

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

@@ -37 +37 @@
                 String2Number<float>(z, pos[2]);
 
+        float sx = 1, sy = 1, sz = 1;
+        if (xmlElem->Attribute("scale"))
+        {
+                  pos = tokenize(xmlElem->Attribute("scale"),",");
+                  String2Number<float>(sx, pos[0]);
+                  String2Number<float>(sy, pos[1]);
+                  String2Number<float>(sz, pos[2]);
+        }
 
-                mgr->getRootSceneNode()->createChildSceneNode(name, Vector3(x,y,z));
+        float yaw = 0.0;
+        if (xmlElem->Attribute("yaw"))
+        {
+          String2Number<float>(yaw,xmlElem->Attribute("yaw"));
+        }
+        float pitch = 0.0;
+        if (xmlElem->Attribute("pitch"))
+        {
+          String2Number<float>(pitch,xmlElem->Attribute("pitch"));
+        }
+        float roll = 0.0;
+        if (xmlElem->Attribute("roll"))
+        {
+          String2Number<float>(roll,xmlElem->Attribute("roll"));
+        }
+
+        Ogre::SceneNode *parentNode;
+        if (xmlElem->Attribute("node"))
+          parentNode = mgr->getSceneNode(xmlElem->Attribute("node"));
+        else
+          parentNode = mgr->getRootSceneNode();
+
+        Ogre::SceneNode* node = parentNode->createChildSceneNode(name, Vector3(x,y,z));
+        node->scale(sx,sy,sz);
+        node->yaw(Ogre::Degree(yaw));
+        node->pitch(Ogre::Degree(pitch));
+        node->roll(Ogre::Degree(roll));
 
                 COUT(4) << "Loader: Created node "<< name <<" : "<<x<<" " << y << " " << z  << std::endl << std::endl;

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

@@ -50 +50 @@
             name << (WorldEntity::worldEntityCounter_s++);
             this->setName("WorldEntity" + name.str());
-            node_ = Orxonox::getSingleton()->getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
+            // don't set the node yet!
+            //node_ = Orxonox::getSingleton()->getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
             std::cout << "blubbbi: " << this->getName() << " .. " << this->node_ << std::endl;
         }

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

@@ -22 +22 @@
       inline Ogre::SceneNode* getNode()
           { return this->node_; }
+
+      inline void setNode(Ogre::SceneNode* node)
+          { this->node_ = node; }
 
       inline void setPosition(const Vector3& pos)