Changeset 6603 in orxonox.OLD for branches/height_map_merge/src/world_entities

Timestamp:

Jan 18, 2006, 5:45:24 PM (19 years ago)

Author:

bottac

Message:

Improved texturemapping

File:

• branches/height_map_merge/src/world_entities/terrain.cc (modified) (2 diffs)

branches/height_map_merge/src/world_entities/terrain.cc

@@ -167 +167 @@
   if (this->heightMapMaterial != NULL)
     delete this->heightMapMaterial;
+
+
+   this->heightMapMaterial = new Material(); 
+   heightMapMaterial->setTransparency(1.0);
+   heightMapMaterial->setIllum(0.2);
+
+   heightMapMaterial->setDiffuse(1.0,1.0,1.0);
+   heightMapMaterial->setAmbient(1.0,1.0,1.0 );
+   heightMapMaterial->setSpecular(1.0,1.0,1.0);
+   heightMapMaterial->setShininess(.5);
+   heightMapMaterial->setTransparency(1.0);
+
+   heightMapMaterial->diffuseTexture = NULL;
+   heightMapMaterial->ambientTexture = NULL;
+   heightMapMaterial->specularTexture = NULL;
+  
+   
+   heightMapMaterial->setDiffuseMap(textureName);
+   heightMapMaterial->setAmbientMap(textureName);
+   heightMapMaterial->setSpecularMap(textureName);      
+ 
+
+
 }
 
@@ -212 +235 @@
         {
         this->heightMapMaterial->select();
-        
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
    
-        // glEnable(GL_LIGHTING);
+         glEnable(GL_LIGHTING);
         glColorMaterial ( GL_FRONT_AND_BACK, GL_EMISSION ) ;
         glEnable (GL_COLOR_MATERIAL) ;