Changeset 10432 in orxonox.OLD for trunk

Timestamp:

Jan 28, 2007, 2:25:09 AM (18 years ago)

Author:

patrick

Message:

more on planets. no atmo

Location:

trunk/src/world_entities

Files:

• planet.cc (modified) (5 diffs)
• planet.h (modified) (2 diffs)

trunk/src/world_entities/planet.cc

@@ -29 +29 @@
 #include "vertex_array_model.h"
 #include "primitive_model.h"
+#include "effects/billboard.h"
 
 #include "debug.h"
@@ -78 +79 @@
       .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, "size", this, Planet, setSize)
+      .describe("Sets the Size of the Planet (normally this should be 90% of the maximal viewing Distance).");
+
   LoadParam(root, "cloud-texture", this, Planet, setCloudTexture)
       .describe("Sets the cloud texture of the planet");
@@ -83 +87 @@
   LoadParam(root, "cloud-rotation", this, Planet, setCloudRotation)
       .describe("Sets the cloud rotation speed");
-
-  LoadParam(root, "size", this, Planet, setSize)
-      .describe("Sets the Size of the Planet (normally this should be 90% of the maximal viewing Distance).");
 }
 
@@ -105 +106 @@
 void Planet::setCloudTexture(const std::string& textureName)
 {
-  this->materialCloud.setDiffuseMap(textureName);
+//   this->materialCloud.setDiffuseMap(textureName);
+//   this->halo = new Billboard();
+//   this->halo->setTexture( textureName);
+//   this->halo->setSize(this->size + 5, this->size + 5);
+//   this->halo->setParent( this);
   this->bClouds = true;
 }
@@ -142 +147 @@
   WorldEntity::draw();
 
-  if( this->bClouds)
-  {
-    glDisable(GL_LIGHTING);
-    this->materialCloud.select();
-    WorldEntity::draw(this->cloudModel);
-    glEnable(GL_LIGHTING);
-  }
+//   if( this->bClouds)
+//   {
+//     glDisable(GL_LIGHTING);
+//     this->materialCloud.select();
+//     WorldEntity::draw(this->cloudModel);
+//     glEnable(GL_LIGHTING);
+//   }
 }
 

trunk/src/world_entities/planet.h

@@ -12 +12 @@
 /* FORWARD DECLARATION */
 class Texture;
+class Billboard;
 
 //! A Class to handle a Planet
@@ -43 +44 @@
 
   Model*          cloudModel;      //!< the model for the cloud
+  Billboard*      halo;            //!< halo around the planet
 
   bool            bClouds;         //!< true if there are clouds defined