Changeset 622 for code/branches/FICN/src/orxonox/objects

Timestamp:

Dec 18, 2007, 6:03:54 PM (17 years ago)

Author:

landauf

Message:

added some randomly generated (rotating) asteroids

Location:

code/branches/FICN/src/orxonox/objects

Files:

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

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

@@ -25 +25 @@
         WorldEntity::loadParams(xmlElem);
 
-        if (xmlElem->Attribute("mesh"))
-        {
-                std::string src = xmlElem->Attribute("mesh");
-                this->mesh_.setMesh(src);
-                    this->attachObject(this->mesh_.getEntity());
+        if (xmlElem->Attribute("mesh"))
+        {
+            std::string src = xmlElem->Attribute("mesh");
+            this->mesh_.setMesh(src);
+            this->attachObject(this->mesh_.getEntity());
         }
 

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

@@ -82 +82 @@
         BaseObject::loadParams(xmlElem);
 
-        if (xmlElem->Attribute("name"))
-        {
-                this->setName(xmlElem->Attribute("mesh"));
-        }
+        if (xmlElem->Attribute("name"))
+        {
+            this->setName(xmlElem->Attribute("mesh"));
+        }
 
-        if (xmlElem->Attribute("position"))
-        {
-                std::vector<std::string> pos = tokenize(xmlElem->Attribute("position"),",");
-                float x, y, z;
-                String2Number<float>(x, pos[0]);
-                String2Number<float>(y, pos[1]);
-                String2Number<float>(z, pos[2]);
-                this->setPosition(x, y, z);
-        }
+        if (xmlElem->Attribute("position"))
+        {
+            std::vector<std::string> pos = tokenize(xmlElem->Attribute("position"),",");
+            float x, y, z;
+            String2Number<float>(x, pos[0]);
+            String2Number<float>(y, pos[1]);
+            String2Number<float>(z, pos[2]);
+            this->setPosition(x, y, z);
+        }
 
-        if (xmlElem->Attribute("direction"))
-        {
-                std::vector<std::string> pos = tokenize(xmlElem->Attribute("direction"),",");
-                float x, y, z;
-                String2Number<float>(x, pos[0]);
-                String2Number<float>(y, pos[1]);
-                String2Number<float>(z, pos[2]);
-                this->setDirection(x, y, z);
-        }
+        if (xmlElem->Attribute("direction"))
+        {
+            std::vector<std::string> pos = tokenize(xmlElem->Attribute("direction"),",");
+            float x, y, z;
+            String2Number<float>(x, pos[0]);
+            String2Number<float>(y, pos[1]);
+            String2Number<float>(z, pos[2]);
+            this->setDirection(x, y, z);
+        }
 
         if (xmlElem->Attribute("yaw") || xmlElem->Attribute("pitch") || xmlElem->Attribute("roll"))
@@ -124 +124 @@
         }
 
-        if (xmlElem->Attribute("scale"))
-        {
-                    std::string scaleStr = xmlElem->Attribute("scale");
-                    float scale;
-                    String2Number<float>(scale, scaleStr);
-                    this->setScale(scale);
-        }
+        if (xmlElem->Attribute("scale"))
+        {
+            std::string scaleStr = xmlElem->Attribute("scale");
+            float scale;
+            String2Number<float>(scale, scaleStr);
+            this->setScale(scale);
+        }
+
+        if (xmlElem->Attribute("rotationAxis"))
+        {
+            std::vector<std::string> pos = tokenize(xmlElem->Attribute("rotationAxis"),",");
+            float x, y, z;
+            String2Number<float>(x, pos[0]);
+            String2Number<float>(y, pos[1]);
+            String2Number<float>(z, pos[2]);
+            this->setRotationAxis(x, y, z);
+        }
+
+        if (xmlElem->Attribute("rotationRate"))
+        {
+            float rotationRate;
+            String2Number<float>(rotationRate, xmlElem->Attribute("rotationRate"));
+            this->setRotationRate(Degree(rotationRate));
+            if (rotationRate != 0)
+                this->setStatic(false);
+        }
+
     }
 

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

@@ -123 +123 @@
           { return this->node_->getOrientation(); }
 
+      inline void setStatic(bool bStatic)
+          { this->bStatic_ = bStatic; }
+      inline bool isStatic()
+          { return this->bStatic_; }
+
     protected:
       void registerAllVariables();