Changeset 10392 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 26, 2007, 7:33:33 PM (18 years ago)

Author:

patrick

Message:

better cloud options, clouds are optional now

Location:

trunk/src/world_entities

Files:

• planet.cc (modified) (4 diffs)
• planet.h (modified) (1 diff)

trunk/src/world_entities/planet.cc

@@ -47 +47 @@
   this->rotSpeedPlanet = 0.0;
   this->rotSpeedCloud = 0.0;
+  this->bClouds = false;
 
   //this->materialPlanet->setIllum(20);
@@ -57 +58 @@
   this->setModel(model);
 
-  this->cloudModel = new PrimitiveModel(PRIM_SPHERE, this->size + 10, 50);
+  this->cloudModel = new PrimitiveModel(PRIM_SPHERE, this->size + 2, 50);
 }
 
@@ -105 +106 @@
 {
   this->materialCloud.setDiffuseMap(textureName);
+  this->bClouds = true;
 }
 
@@ -140 +142 @@
   WorldEntity::draw();
 
-  this->materialCloud.select();
-  WorldEntity::draw(this->cloudModel);
-
+  if( this->bClouds)
+  {
+    glDisable(GL_LIGHTING);
+    this->materialCloud.select();
+    WorldEntity::draw(this->cloudModel);
+    glEnable(GL_LIGHTING);
+  }
 }
 

trunk/src/world_entities/planet.h

@@ -44 +44 @@
   Model*          cloudModel;      //!< the model for the cloud
 
+  bool            bClouds;         //!< true if there are clouds defined
   float           rotSpeedCloud;   //! cloud rotation speed
   float           rotSpeedPlanet;  //! planet rotation speed