Changeset 10387 in orxonox.OLD for trunk/src/world_entities/planet.cc

Timestamp:

Jan 26, 2007, 6:22:33 PM (19 years ago)

Author:

patrick

Message:

removed the segfault for npcs, adding clouds to planets

File:

• trunk/src/world_entities/planet.cc (modified) (4 diffs)

trunk/src/world_entities/planet.cc

@@ -45 +45 @@
   this->toList(OM_GROUP_01);
 
-  //this->material->setIllum(20);
-  //this->material->setAmbient(0.1, 0.1, 0.1);
+  //this->materialPlanet->setIllum(20);
+  //this->materialPlanet->setAmbient(0.1, 0.1, 0.1);
+
+  if( root != NULL)
+    this->loadParams(root);
+
+  PrimitiveModel* model = new PrimitiveModel(PRIM_SPHERE, this->size, 50);
+  this->setModel(model);
 
 
 
-      //st float radius, const unsigned int loops, const unsigned int segmentsPerLoop
-
-  this->loadParams(root);
-
-//   VertexArrayModel* model = new VertexArrayModel();
-//   model->spiralSphere(this->size, 10, 10);
-//   this->setModel(model);
-//   model->debug();
-//
-  PrimitiveModel* model = new PrimitiveModel(PRIM_SPHERE, this->size, 50);
-  this->setModel(model);
 }
 
@@ -78 +73 @@
 
   LoadParam(root, "texture", this, Planet, setTexture)
-      .describe("Sets the material on the Planet. The string must be the path relative to the data-dir, and without a trailing .jpg");
+      .describe("Sets the materialPlanet on the Planet. The string must be the path relative to the data-dir, and without a trailing .jpg");
+
+  LoadParam(root, "cloud-texture", this, Planet, setCloudTexture)
+      .describe("Sets the cloud texture of the planet");
 
   LoadParam(root, "size", this, Planet, setSize)
@@ -91 +89 @@
 void Planet::setTexture(const std::string& textureName)
 {
-  this->material.setDiffuseMap(textureName);
+  this->materialPlanet.setDiffuseMap(textureName);
+}
+
+
+/**
+ *  Defines which textures should be loaded onto the Planet.
+ * @param textureName the top texture.
+*/
+void Planet::setCloudTexture(const std::string& textureName)
+{
+  this->materialCloud.setDiffuseMap(textureName);
 }
 
@@ -109 +117 @@
 void Planet::draw() const
 {
-  this->material.select();
+  this->materialPlanet.select();
 
   WorldEntity::draw();