Changeset 3406 in orxonox.OLD

Timestamp:

Feb 14, 2005, 3:52:14 PM (19 years ago)

Author:

dave

Message:

branches/dave/src: Textur ist jetzt drauf

File:

• orxonox/branches/dave/src/world.cc (modified) (10 diffs)

orxonox/branches/dave/src/world.cc

@@ -371 +371 @@
 
   // initialize debug coord system
+  //fog initialisation
+ 
+  //float fog_color[]={0.8f,0.8f,0.2f,1.0f};
+  
+  //glEnable(GL_FOG);
+  //glLoadIdentity();
+  //glFogi(GL_FOG_MODE,GL_EXP);
+  //glFogf(GL_FOG_DENSITY,.02f);
+  //glFogfv(GL_FOG_COLOR,fog_color);
+  //glClearColor(.8f,.8f,.8f,1.0f);
+  
     
  
@@ -392 +403 @@
   
   glBegin(GL_QUADS);
+  
+  
   
   int sizeX = 100;
@@ -447 +460 @@
         Vector v4 = Vector (widthX*(i),      height[i][j+1]-20,     widthZ*(j+1)-width/2);
         float a[3];
-        if(height[i][j]<snowheight){
+        a[0]=1.0;
+        a[1]=1.0;
+        a[2]=1.0;
+        glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        /*if(height[i][j]<snowheight){
           a[0]=0;
           a[1]=1.0-height[i][j]/10-.3;
@@ -459 +476 @@
             glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
             
-        }
+        }*/
         glNormal3f(normal_vectors[i][j].x, normal_vectors[i][j].y, normal_vectors[i][j].z);
-        glTexCoord2f((float)i/(float)sizeX,(float)j/(float)sizeZ);
+        glTexCoord2f(0.0f,0.0f);
+        //glTexCoord2f((float)i/(float)sizeX,(float)j/(float)sizeZ);
         glVertex3f(v1.x, v1.y, v1.z);
-
-
+        
+        /*
         if(height[i+1][j]<snowheight){
           a[0]=0;
@@ -476 +494 @@
           a[2]=1.0;
           glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
+        }*/
         glNormal3f(normal_vectors[i+1][j].x, normal_vectors[i+1][j].y, normal_vectors[i+1][j].z);
-        glTexCoord2f((float)(i+1.0)/(float)sizeX,(float)j/(float)sizeZ);
+        glTexCoord2f(1.0f,0.0f);
+        //glTexCoord2f((float)(i+1.0)/(float)sizeX,(float)j/(float)sizeZ);
         glVertex3f(v2.x, v2.y, v2.z);
-
+        /*
         if(height[i+1][j+1]<snowheight){
           a[0]=0;
@@ -492 +511 @@
           a[2]=1.0;
           glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
+        }*/
         glNormal3f(normal_vectors[i+1][j+1].x, normal_vectors[i+1][j+1].y, normal_vectors[i+1][j+1].z);
-        glTexCoord2f((float)(i+1.0)/(float)sizeX,(float)(j+1.0)/(float)sizeZ);
+        glTexCoord2f(1.0f,1.0f);
+        //glTexCoord2f((float)(i+1.0)/(float)sizeX,(float)(j+1.0)/(float)sizeZ);
         glVertex3f(v3.x, v3.y, v3.z);
-
+        /*
         if(height[i][j+1]<snowheight){
           a[0]=0;
@@ -508 +528 @@
           a[2]=1.0;
           glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
+        }*/
         glNormal3f(normal_vectors[i][j+1].x, normal_vectors[i][j+1].y, normal_vectors[i][j+1].z);
-        glTexCoord2f((float)(i)/(float)sizeX,(float)(j+1.0)/(float)sizeZ);
+        glTexCoord2f(0.0f,1.0f);
+        //glTexCoord2f((float)(i)/(float)sizeX,(float)(j+1.0)/(float)sizeZ);
         glVertex3f(v4.x, v4.y, v4.z);
         
@@ -517 +538 @@
   
   // Disable Textures Again, for Performance reasons.
+  //glLoadIdentity();
   glDisable(GL_TEXTURE_2D);
 
@@ -594 +616 @@
   */
   glEndList();
+  
+  
 }
 
@@ -658 +682 @@
 
   // draw debug coord system
+  //glLoadIdentity();
   glCallList (objectList);