Changeset 6329 in orxonox.OLD for branches/height_map/src/world_entities

Timestamp:

Dec 28, 2005, 1:51:28 PM (19 years ago)

Author:

bottac

Message:

Fixed some bugs.

File:

• branches/height_map/src/world_entities/terrain.cc (modified) (4 diffs)

branches/height_map/src/world_entities/terrain.cc

@@ -44 +44 @@
   this->tmp_mat = new Material(); 
   tmp_mat->setTransparency(1.0);
-  tmp_mat->setIllum(0.3);
+  tmp_mat->setIllum(0.2);
 /*  tmp_mat->setDiffuse(0.55,0.4,0.2);
   tmp_mat->setAmbient(0.6,0.4,0.2);
@@ -51 +51 @@
   tmp_mat->setAmbient(1.0,1.0,1.0 );
   tmp_mat->setSpecular(1.0,1.0,1.0);
-  tmp_mat->setShininess(.1);
+  tmp_mat->setShininess(.5);
   tmp_mat->setTransparency(1.0);
 
   tmp_mat->diffuseTexture = NULL;
   tmp_mat->ambientTexture = NULL;
- // tmp_mat->specularTexture = NULL;
+  tmp_mat->specularTexture = NULL;
   
+    const  char* texture_name = "pictures/ground1.tga";
+  tmp_mat->setDiffuseMap(texture_name);
+  tmp_mat->setAmbientMap(texture_name);
+   tmp_mat->setSpecularMap(texture_name); 
   // this->loadParams(root);
 
@@ -63 +67 @@
  char* colourmapName = ResourceManager::getFullName("pictures/heightmapHelloCM.bmp");
  hm = new HeightMap(heightmapName, colourmapName);
- hm->scale(Vector(23.0f,1.7f,23.0f));
+ hm->scale(Vector(43.0f,1.10f,43.0f));
+ hm->shift(Vector(-1000.0,-1500.0,-1000.0));
  hm->load();
  this->model=hm;
@@ -217 +222 @@
   glPushMatrix();
 
+  
   /* translate */
-  glTranslatef (this->getAbsCoor ().x - 1000,
-                this->getAbsCoor ().y - 400,
-                this->getAbsCoor ().z - 1000)   ;
+ glTranslatef (this->getAbsCoor ().x ,
+               this->getAbsCoor ().y ,
+               this->getAbsCoor ().z)   ;
+ 
   /* rotate */
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-        
-   //this->tmp_mat->select();
-        
-
-  hm->draw();
+ Vector tmpRot = this->getAbsDir().getSpacialAxis();
+ glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+ 
+        
+ 
+ this->tmp_mat->select();
+ hm->draw();
  /* if (this->objectList)
     glCallList(this->objectList);