Changeset 2817 in orxonox.OLD for orxonox

Timestamp:

Nov 11, 2004, 10:36:51 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: added lighting and shading (pre-test-version)

Location:

orxonox/trunk/src

Files:

• orxonox.cc (modified) (1 diff)
• world.cc (modified) (2 diffs)

orxonox/trunk/src/orxonox.cc

@@ -158 +158 @@
   glClearColor(0.0, 0.0, 0.0, 0.0);
   glEnable(GL_DEPTH_TEST);
+ 
+  // LIGHTING
+  GLfloat lmodelAmbient[] = {.1, .1, .1, 1.0};
+  GLfloat whiteLight[] = {1.0, 1.0, 1.0,1.0};
+  GLfloat lightPosition[] = {10.0, 10, 19.0, 0.0};
+
+  glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
+  glLightfv(GL_LIGHT0, GL_SPECULAR, whiteLight);
+  glEnable(GL_LIGHTING);
+  glEnable(GL_LIGHT0);
+  glEnable(GL_DEPTH_TEST);
+  glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
+  glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
+   
   //  glEnable(GL_COLOR);
   //  glShadeModel(GL_SMOOTH);

orxonox/trunk/src/world.cc

@@ -185 +185 @@
   glLoadIdentity();
   glColor3f(1.0,0,0);
-  glBegin(GL_LINES);
+  glBegin(GL_QUADS);
   float height [500][100];
   float size = 2.0;
@@ -200 +200 @@
         for (int j = 0; j<=50;j+=1)
           {       
-            glVertex3f(size*i,        size*j-25*size,      height[i][j] -20);
-            glVertex3f(size*i+size,    size*j-25*size,      height[i+1][j]-20);
-            //      glVertex3f(size*i+5.0,    size*j+5.0-12size,  height[i+1][j+1]-20);
-            glVertex3f(size*i,        size*j-25*size,      height[i][j] -20);
-            glVertex3f(size*i,        size*j+size -25*size,  height[i][j+1]-20);
+            Vector* v1 = new Vector (size*i,        size*j-25*size,      height[i][j] -20);
+            Vector* v2 = new Vector (size*i+size,    size*j-25*size,      height[i+1][j]-20);
+            Vector* v3 = new Vector (size*i+size,    size*j+size-25*size,  height[i+1][j+1]-20);
+            Vector* v4 = new Vector (size*i,        size*j+size -25*size,  height[i][j+1]-20);
+            
+            Vector c1 = *v2 - *v1;
+            Vector c2 = *v3 - *v2;
+            Vector c3 = *v4 - *v3;
+            Vector c4 = *v1 - *v4;
+            
+            c1.cross(*v4 - *v1);
+            c2.cross(*v1 - *v2);
+            c3.cross(*v2 - *v3);
+            c4.cross(*v3 - *v4);
+
+            glNormal3f(c1.x, c1.y, c1.z);
+            glVertex3f(v1->x, v1->y, v1->z);
+            glNormal3f(c2.x, c2.y, c2.z);
+            glVertex3f(v2->x, v2->y, v2->z);
+            glNormal3f(c3.x, c3.y, c3.z);
+            glVertex3f(v3->x, v3->y, v3->z);
+            glNormal3f(c4.x, c4.y, c4.z);
+            glVertex3f(v4->x, v4->y, v4->z);
+
           }
       }