Changeset 622 for code/branches/FICN/src

Timestamp:

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

Author:

landauf

Message:

added some randomly generated (rotating) asteroids

Location:

code/branches/FICN/src/orxonox

Files:

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

code/branches/FICN/src/orxonox/Main.cc

@@ -123 +123 @@
       orx->start();
 #else
+/*
+for (int i = 0; i < 500; i++)
+{
+int x = rand() % 40000 - 20000;
+int y = rand() % 40000 - 20000;
+int z = rand() % 40000 - 20000;
+
+int scale = rand() % 100 + 20;
+
+int version = rand() % 6 + 1;
+
+float rotx = float(rand()) / RAND_MAX;
+float roty = float(rand()) / RAND_MAX;
+float rotz = float(rand()) / RAND_MAX;
+
+int axis = rand() % 3 + 1;
+
+if (axis == 1)
+  rotx = 0;
+if (axis == 2)
+  roty = 0;
+if (axis == 3)
+  rotz = 0;
+
+int rotation = rand() % 40 + 10;
+
+//    <Model position="1000,1500,0" scale="50" mesh="ast1.mesh" rotationAxis="0,1.25,0" rotationRate="70" />
+std::cout << "    <Model position=\"" << x << "," << y << "," << z << "\" scale=\"" << scale << "\" mesh=\"ast" << version << ".mesh\" rotationAxis=\"" << rotx << "," << roty << "," << rotz << "\" rotationRate=\"" << rotation << "\" />" << std::endl;
+
+
+}
+*/
       orx->init(argc, argv, "");
       orx->start();

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();