Changeset 6912 in orxonox.OLD for trunk

Timestamp:

Jan 31, 2006, 8:24:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: tried to fix the planet

Location:

trunk/src

Files:

• lib/graphics/importer/primitive_model.cc (modified) (3 diffs)
• world_entities/planet.cc (modified) (2 diffs)

trunk/src/lib/graphics/importer/primitive_model.cc

@@ -73 +73 @@
   if (detail <= 0)
     detail = 1;
-  size /= 2;
+  size /= 2.0;
   //  detail = 2; // make it even
   float df = (float)detail;
@@ -80 +80 @@
   for (float i = 0; i < df *2.0; i+=1.0)
     {
-      float vi = i/df *PI;
-      for (float j = -df / 2.0 +1.0; j < df / 2.0; j+=1.0 *df/(df+1.0))
+      float vi = i/df * PI;
+      for (float j = -df / 2.0 +1.0; j <= df / 2.0; j+=1.0 *df/(df+1.0))
         {
           float vj = j/df *PI;
@@ -92 +92 @@
                           size * sin(vi) * cos(vj));
 
-          this->addVertexTexture(i / (df *2.0), (j-1.0)/(df)+.5);
+          this->addVertexTexture( i / (df *2.0),
+                                 (j-1.0)/(df)+.5);
         }
     }

trunk/src/world_entities/planet.cc

@@ -112 +112 @@
 void Planet::draw() const
 {
-
-
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -123 +121 @@
                 this->getAbsCoor ().y,
                 this->getAbsCoor ().z);
-
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
   this->material->select();