Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6519 in orxonox.OLD for trunk/src/lib


Ignore:
Timestamp:
Jan 18, 2006, 12:38:19 AM (19 years ago)
Author:
bensch
Message:

trunk: better smoother water

Location:
trunk/src/lib/graphics/importer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/graphics/importer/grid.h

    r6518 r6519  
    2828
    2929  float& height(unsigned int row, unsigned int column) { return this->vertex(row*this->_columns + column).y;};
     30  Vector& vertexG(unsigned int row, unsigned int column) { return this->vertex(row*this->_columns + column); };
     31  Vector& normalG(unsigned int row, unsigned int column) { return this->normal(row*this->_columns + column); };
    3032
    3133
  • trunk/src/lib/graphics/importer/vertex_array_model.cc

    r6477 r6519  
    137137  PRINTF(4)("drawing 3D-VertexArrayModel %s\n", this->getName());
    138138  glEnableClientState(GL_VERTEX_ARRAY );
    139   //glEnableClientState(GL_TEXTURE_COORD_ARRAY );
     139  glEnableClientState(GL_TEXTURE_COORD_ARRAY );
    140140  glEnableClientState(GL_NORMAL_ARRAY );
    141141  glEnableClientState(GL_COLOR_ARRAY );
     
    144144  glVertexPointer(3, GL_FLOAT, 0, &this->vertices[0]);
    145145  glNormalPointer(GL_FLOAT, 0, &this->normals[0]);
    146   //glTexCoordPointer(2, GL_FLOAT, 0, &this->texCoords[0]);
     146  glTexCoordPointer(2, GL_FLOAT, 0, &this->texCoords[0]);
    147147  glColorPointer(3, GL_FLOAT, 0, &this->colors[0]);
    148148
Note: See TracChangeset for help on using the changeset viewer.