Changeset 6263 in orxonox.OLD for branches/height_map/src/world_entities
- Timestamp:
- Dec 22, 2005, 6:43:49 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/height_map/src/world_entities/terrain.cc
r6249 r6263 42 42 this->init(); 43 43 44 this->tmp_mat = new Material(); 44 this->tmp_mat = new Material(); 45 45 tmp_mat->setTransparency(1.0); 46 46 tmp_mat->setIllum(0.3); … … 57 57 tmp_mat->ambientTexture = NULL; 58 58 // tmp_mat->specularTexture = NULL; 59 59 60 60 // this->loadParams(root); 61 61 62 62 char* heightmapName = ResourceManager::getFullName("pictures/heightmapHello.bmp"); 63 63 char* colourmapName = ResourceManager::getFullName("pictures/heightmapHelloCM.bmp"); 64 hm = new HeightMap(heightmapName, colourmapName);65 hm->scale(Vector(23.0f,1.7f,23.0f));66 hm->load();67 this->model=hm;64 // hm = new HeightMap(heightmapName, colourmapName); 65 // hm->scale(Vector(23.0f,1.7f,23.0f)); 66 // hm->load(); 67 // this->model=hm; 68 68 69 69 /* this->model = new HeightMap(); … … 126 126 127 127 this->model->finalize(); */ 128 128 129 129 /*if (this->model != NULL) 130 130 this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);*/ … … 224 224 Vector tmpRot = this->getAbsDir().getSpacialAxis(); 225 225 glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z ); 226 226 227 227 //this->tmp_mat->select(); 228 229 230 hm->draw();228 229 230 //hm->draw(); 231 231 /* if (this->objectList) 232 232 glCallList(this->objectList);
Note: See TracChangeset
for help on using the changeset viewer.