Changeset 3698 in orxonox.OLD for orxonox/branches/shadows/src/world.cc

Timestamp:

Mar 31, 2005, 9:04:45 PM (19 years ago)

Author:

dave

Message:

branches/shadows: so jetzt ist die Ausgangslage geschaffen

File:

• orxonox/branches/shadows/src/world.cc (modified) (11 diffs)

orxonox/branches/shadows/src/world.cc

@@ -28 +28 @@
 #include "helper_parent.h"
 #include "glmenu_imagescreen.h"
+#include "skysphere.h"
+#include "importer/material.h"
 
 using namespace std;
@@ -92 +94 @@
   {20.0, 10.0, 5.0}, {40.0, -10.0, 0.0},
   {60.0, -10.0, 5.0}, {80.0, 10.0, 5.0}};
+
+
 
 
@@ -286 +290 @@
             orx->getLocalInput()->bind (myPlayer);
             
+            
+            // create skybox
+            this->skysphere =new Skysphere();
+                    
+                    
             // bind camera
             this->localCamera = new Camera(this);
@@ -330 +339 @@
             this->pathnodes[5] = Vector(30, 50, 0);
             
-
+            
 
 
@@ -368 +377 @@
 
   // initialize debug coord system
+  
+ 
+  
+  
+    
+ 
+  // Initializing the Ground, and loading a Texture into it.
+  Material* boden = new Material("Ground");
+  boden->setDiffuseMap("../data/pictures/ground.tga");
+  // Setting the illumination mode otherwise it is flat-shaded.
+  boden->setIllum(3);
+  
+    
   objectList = glGenLists(1);
   glNewList (objectList, GL_COMPILE);
   glLoadIdentity();
-  glColor3f(1.0,0,0);
+  //glColor3f(1.0,0,0);
+  
+  // Enabling Textures
+  glEnable(GL_TEXTURE_2D);
+  
+  // Selecting the new Ground Material.
+  boden->select();
+  
+  
   glBegin(GL_QUADS);
-
+  
+  
+  
   int sizeX = 100;
   int sizeZ = 80;
   float length = 1000;
-  float width = 200;
+  float width = 300;
   float widthX = float (length /sizeX);
   float widthZ = float (width /sizeZ);
@@ -419 +451 @@
       }
 
-  int snowheight=3;
+  
   for ( int i = 0; i<sizeX; i+=1)
     for (int j = 0; j<sizeZ;j+=1)
@@ -428 +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]=0;
-          a[1]=1.0-height[i][j]/10-.3;
-          a[2]=0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
-        else{
-            a[0]=1.0;
-            a[1]=1.0;
-            a[2]=1.0;
-            glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-            
-        }
+        a[0]=1.0;
+        a[1]=1.0;
+        a[2]=1.0;
+        glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        
         glNormal3f(normal_vectors[i][j].x, normal_vectors[i][j].y, normal_vectors[i][j].z);
+        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;
-          a[1] =1.0-height[i+1][j]/10-.3;
-          a[2]=0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
-        else{
-          a[0]=1.0;
-          a[1]=1.0;
-          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(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;
-          a[1] =1.0-height[i+1][j+1]/10-.3;
-          a[2]=0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
-        else{
-          a[0]=1.0;
-          a[1]=1.0;
-          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(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;
-          a[1] =1.0-height[i+1][j+1]/10-.3;
-          a[2]=0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
-        else{
-          a[0]=1.0;
-          a[1]=1.0;
-          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(0.0f,1.0f);
+        //glTexCoord2f((float)(i)/(float)sizeX,(float)(j+1.0)/(float)sizeZ);
         glVertex3f(v4.x, v4.y, v4.z);
         
       }
   glEnd();
-  /*  
-  glBegin(GL_LINES);
-  for( float x = -128.0; x < 128.0; x += 25.0)
-    {
-      for( float y = -128.0; y < 128.0; y += 25.0)
-        {
-          glColor3f(1,0,0);
-          glVertex3f(x,y,-128.0);
-          glVertex3f(x,y,0.0);
-          glColor3f(0.5,0,0);
-          glVertex3f(x,y,0.0);
-          glVertex3f(x,y,128.0);
-        }
-    }
-  for( float y = -128.0; y < 128.0; y += 25.0)
-    {
-      for( float z = -128.0; z < 128.0; z += 25.0)
-        {
-          glColor3f(0,1,0);
-          glVertex3f(-128.0,y,z);
-          glVertex3f(0.0,y,z);
-          glColor3f(0,0.5,0);
-          glVertex3f(0.0,y,z);
-          glVertex3f(128.0,y,z);
-        }
-    }
-  for( float x = -128.0; x < 128.0; x += 25.0)
-    {
-      for( float z = -128.0; z < 128.0; z += 25.0)
-        {
-          glColor3f(0,0,1);
-          glVertex3f(x,-128.0,z);
-          glVertex3f(x,0.0,z);
-          glColor3f(0,0,0.5);
-          glVertex3f(x,0.0,z);
-          glVertex3f(x,128.0,z);
-        }
-      
-    }
-  */  
+  
+  // Disable Textures Again, for Performance reasons.
+  //glLoadIdentity();
+  glDisable(GL_TEXTURE_2D);
+
+  
   //draw track
   glBegin(GL_LINES);
@@ -541 +504 @@
   glEnd();
   
-  /*
-  glBegin(GL_LINE_STRIP);
-  glColor3f(1.0, 5.0, 1.0);
-  for( int i = 0; i <= 30; i++)
-    {
-      glEvalCoord1f ((GLfloat) i/30.0);
-    }
-  glEnd();
-  */
+
 
   trackManager->drawGraph(.01);
   trackManager->debug(2);
   delete trackManager;
-  
-  /*
-  glBegin(GL_LINES);
-  float i;
-  for(i = 0.0; i<1; i+=.01)
-    {
-      printf("%f, %f, %f\n",tmpCurve->calcPos(i).x, tmpCurve->calcPos(i).y, tmpCurve->calcPos(i).z);
-      glVertex3f(tmpCurve->calcPos(i).x, tmpCurve->calcPos(i).y, tmpCurve->calcPos(i).z);
-    }
-  glEnd();
-  */
-  glEndList();
+    
+  glEndList();  
 }
 
@@ -630 +575 @@
 
   // draw debug coord system
+  //glLoadIdentity();
+  
   glCallList (objectList);
 
+
+  //After calling the list, draw the skysphere
+  
+  glEnable(GL_TEXTURE_2D);
+  
+  skysphere->draw();
+  
 }
 
@@ -644 +598 @@
 void World::update ()
 {
+    
   /*
   //List<WorldEntity> *l;
@@ -711 +666 @@
       entity = entities->nextElement();
     }
-
+  
+  skysphere->updatePosition(localPlayer->absCoordinate.x,localPlayer->absCoordinate.y,localPlayer->absCoordinate.z);
+  
   //for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
 }