Changeset 4170 in orxonox.OLD

Timestamp:

May 11, 2005, 11:22:00 PM (19 years ago)

Author:

dave

Message:

branches/shadow/src:der Boden hat nicht mehr so komische Farben

Location:

orxonox/branches/shadows/src

Files:

• shadow.cc (modified) (2 diffs)
• shadow.h (modified) (1 diff)
• world.cc (modified) (2 diffs)

orxonox/branches/shadows/src/shadow.cc

@@ -56 +56 @@
 }
 
-void Shadow::init(GLuint ground_id_imported)
+void Shadow::init(GLuint ground_id_imported,Material*  boden)
 {
     
@@ -65 +65 @@
     
     
-    this->mat=new Material("Ground");
-    this->mat->setDiffuseMap("../data/pictures/ground.tga");
-    this->mat->setIllum(3);
+    //this->mat=new Material("Ground");
+    //this->mat->setDiffuseMap("../data/pictures/ground.tga");
+    //this->mat->setIllum(3);
+    this->mat=boden;
     
     glClearDepth(1);

orxonox/branches/shadows/src/shadow.h

@@ -51 +51 @@
         Shadow(OBJModel* player,Player* playerangle);
         ~Shadow();
-        void init(GLuint ground_id);
+        void init(GLuint ground_id,Material* boden);
         void createShadow();
         void draw();

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->setIllum(3);
   //boden->select();
   int sizeX = 100;
@@ -524 +524 @@
     
   glEndList();
- shadow->init(objectList);  
+ shadow->init(objectList,boden);  
   
 }