Changeset 6266 in orxonox.OLD for branches/height_map/src

Timestamp:

Dec 22, 2005, 7:24:57 PM (19 years ago)

Author:

bensch

Message:

heightMap: sphere with some info, draw with colors

Location:

branches/height_map/src

Files:

• lib/graphics/importer/vertex_array_model.cc (modified) (4 diffs)
• story_entities/world.cc (modified) (1 diff)

branches/height_map/src/lib/graphics/importer/vertex_array_model.cc

@@ -66 +66 @@
 void VertexArrayModel::draw() const
 {
-  PRINTF(4)("drawing the 3D-VertexArrayModels\n");
-  glDisable(GL_LIGHTING);
-
+  PRINTF(4)("drawing 3D-VertexArrayModel %s\n", this->getName());
   glEnableClientState(GL_VERTEX_ARRAY );
   glEnableClientState(GL_TEXTURE_COORD_ARRAY );
@@ -87 +85 @@
                       &this->indices[this->stripes[i-1]] );
     }
-    glEnable(GL_LIGHTING);
 }
 
@@ -245 +242 @@
     float cosPhi = std::cos(phi);
     this->addVertex(radius * cosPhi * sinTheta, radius * sinPhi * sinTheta, radius * cosTheta);
-    this->addNormal(1,1,1);
-    this->addTexCoor(0,0);
-    this->addColor(.125,.436,.246);
+    this->addNormal(radius * cosPhi * sinTheta, radius * sinPhi * sinTheta, radius * cosTheta);
+    this->addTexCoor(0,0); /// FIXME
+    this->addColor(.125,.436,.246); ///FIXME
   }
   for (unsigned int loopNumber = 0; loopNumber <= loops; ++loopNumber)
@@ -264 +261 @@
       float cosPhi = std::cos(phi);
       this->addVertex(radius * cosPhi * sinTheta, radius * sinPhi * sinTheta, radius * cosTheta);
-      this->addNormal(1,1,1);
-      this->addTexCoor(0,0);
+      this->addNormal(radius * cosPhi * sinTheta, radius * sinPhi * sinTheta, radius * cosTheta);
+      this->addTexCoor(0,0); //FIXME
       this->addColor(.125,.436,.246);
 

branches/height_map/src/story_entities/world.cc

@@ -393 +393 @@
 
   VertexArrayModel* mod = new VertexArrayModel;
-  mod->planeModel();
+  mod->spiralSphere( 10,0,0);
   mod->finalize();
   mod->debug();