Changeset 3861 in orxonox.OLD

Timestamp:

Apr 17, 2005, 10:53:00 PM (19 years ago)

Author:

dave

Message:

branches/shadows:nicht ueberraschen lassen von der weissen Farbe, ist debugphase, und von dem her einfach mal eine Zwischenspeicherung

Location:

orxonox/branches/shadows/src

Files:

• shadow.cc (modified) (6 diffs)
• world.cc (modified) (5 diffs)

orxonox/branches/shadows/src/shadow.cc

@@ -82 +82 @@
     glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_CLAMP_TO_EDGE_EXT);
-    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_CLAMP_TO_EDGE_EXT);
+    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
     glTexImage2D(GL_TEXTURE_2D,0,GL_RGB,SIZE,SIZE,0,GL_RGB,GL_UNSIGNED_BYTE,NULL);
 
@@ -108 +108 @@
     glBindTexture(GL_TEXTURE_2D,this->shadow_id);
     
+    
+    float m[16],m2[16]; 
+    glClearColor(1,1,1,1);
+    //glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+   
+    glMatrixMode(GL_PROJECTION);
+    glGetFloatv(GL_PROJECTION_MATRIX,m);
+    glLoadIdentity();
+    glOrtho(-4.2,4.2,-4.2,4.2,-100,100);
+    glMatrixMode(GL_MODELVIEW);
+    glGetFloatv(GL_MODELVIEW_MATRIX,m2);
+    glLoadIdentity();
    
     gluLookAt(this->lightPos[0],this->lightPos[1],this->lightPos[2],this->playerPos[0],this->playerPos[1],this->playerPos[2],0,0,1);
@@ -121 +133 @@
     glCallList(this->player_id);
     glEnable(GL_LIGHTING);
-    
-    
-    
-    //glCopyTexSubImage2D(GL_TEXTURE_2D,0,0,0,0,0,SIZE,SIZE);
-    glReadPixels(0,0,SIZE,SIZE,GL_RGB,GL_UNSIGNED_BYTE,this->image);
-    blur(this->image,SIZE);
-    glTexSubImage2D(GL_TEXTURE_2D,0,0,0,SIZE,SIZE,GL_RGB,GL_UNSIGNED_BYTE,this->image);
+    glColor3f(1,1,1);
+    
+    
+    
+    glCopyTexSubImage2D(GL_TEXTURE_2D,0,0,0,0,0,SIZE,SIZE);
+    //glReadPixels(0,0,SIZE,SIZE,GL_RGB,GL_UNSIGNED_BYTE,this->image);
+    //blur(this->image,SIZE);
+    //glTexSubImage2D(GL_TEXTURE_2D,30,30,30,SIZE,SIZE,GL_RGB,GL_UNSIGNED_BYTE,this->image);
     
     glDisable(GL_SCISSOR_TEST);
     glViewport(0,0,1024,768); //Achtung: hier Aufloesung von Orxonox einstellen!
-     
-    
-    
+    
+    //Die oben veraenderten und zwischengespeicherten werte wieder herstellen!
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glMultMatrixf(m);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glMultMatrixf(m2); 
+  
 }
 
@@ -149 +168 @@
     //glLoadIdentity();
         
-    this->mat->select();
-    glCallList(this->ground_id);
-    
-    //glDisable(GL_TEXTURE_2D);
+    //this->mat->select();
+    //glCallList(this->ground_id);
+    
+    glDisable(GL_TEXTURE_2D);
         
+    /*shadow*/
     glEnable(GL_TEXTURE_GEN_S);
     glEnable(GL_TEXTURE_GEN_T);
@@ -162 +182 @@
     glMatrixMode(GL_TEXTURE);
     glLoadIdentity();
-    //glTranslatef(.5,.5,0);
-    //glScalef(.5,.5,1.0);
-    //glOrtho(-1,1,-1,1,-1,1);
+    glTranslatef(1.5,.5,0);
+    glScalef(.5f,1.0,.5f);
+    glOrtho(-1,1,-1,1,-100,100);
     
     gluLookAt(this->lightPos[0],this->lightPos[1],this->lightPos[2],this->playerPos[0],this->playerPos[1],this->playerPos[2],0,0,1);
     
     glMultMatrixf(im);
-    glEnable(GL_TEXTURE_2D),
+    glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_2D,this->shadow_id);
     glEnable(GL_BLEND);
     glBlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
-    //glCallList(this->ground_id);
+    glCallList(this->ground_id);
     glDisable(GL_BLEND);
-    glDisable(GL_TEXTURE_2D);
-    
-    glLoadIdentity();
+    //glDisable(GL_TEXTURE_2D);
+    
+    //glLoadIdentity();
     glMatrixMode(GL_MODELVIEW);
     glDisable(GL_TEXTURE_GEN_S);
@@ -184 +204 @@
     glDisable(GL_TEXTURE_GEN_Q);
     
-    
+
     
     

orxonox/branches/shadows/src/world.cc

@@ -400 +400 @@
  
   // Initializing the Ground, and loading a Texture into it.
-  Material* boden = new Material("Ground");
-  boden->setDiffuseMap("../data/pictures/ground.tga");
+  //Material* boden = new Material("Ground");
+  //boden->setDiffuseMap("../data/pictures/ground.tga");
   // Setting the illumination mode otherwise it is flat-shaded.
-  boden->setIllum(3);
-  boden->select();
+  //boden->setIllum(3);
+  //boden->select();
   int sizeX = 100;
   int sizeZ = 80;
@@ -579 +579 @@
   // draw entities
   
-
+ 
   WorldEntity* entity;
   entity = this->entities->enumerate();
@@ -595 +595 @@
   //glLoadIdentity();
   
-  
+   shadow->draw(); 
  
 
@@ -603 +603 @@
   
   skysphere->draw();
-  shadow->draw(); 
+ 
  
   
@@ -691 +691 @@
   skysphere->updatePosition(localPlayer->absCoordinate.x,localPlayer->absCoordinate.y,localPlayer->absCoordinate.z);
   shadow->updatePosition(localPlayer->absCoordinate.x,localPlayer->absCoordinate.y,localPlayer->absCoordinate.z);
+  
   //for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
 }