maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed class Level to deal with changes to class Triangle

Browse Source
This commit is contained in:
Tom Hicks
2006-08-10 00:33:42 -04:00
parent f0532b9b20
commit bda7ff3a5e
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/level.cpp
View File

@@ -127,15 +127,15 @@ namespace OpenArena
{ {
//Vertex Data //Vertex Data
input >> readBuffer; input >> readBuffer;
triangles[i].vertecies[i2].x = atof(readBuffer.c_str()); triangles[i].vertecies[i2].coordinates.x = atof(readBuffer.c_str());
input >> readBuffer; input >> readBuffer;
triangles[i].vertecies[i2].y = atof(readBuffer.c_str()); triangles[i].vertecies[i2].coordinates.y = atof(readBuffer.c_str());
input >> readBuffer; input >> readBuffer;
triangles[i].vertecies[i2].z = atof(readBuffer.c_str()); triangles[i].vertecies[i2].coordinates.z = atof(readBuffer.c_str());
input >> readBuffer; input >> readBuffer;
triangles[i].texCoords[i2].x = (float)atof(readBuffer.c_str()); triangles[i].vertecies[i2].textureCoordinates.x = (float)atof(readBuffer.c_str());
input >> readBuffer; input >> readBuffer;
triangles[i].texCoords[i2].y = (float)atof(readBuffer.c_str()); triangles[i].vertecies[i2].textureCoordinates.y = (float)atof(readBuffer.c_str());
} }
//Normal //Normal
@@ -260,11 +260,11 @@ namespace OpenArena
for(unsigned int i2=0; i2<3; i2++) for(unsigned int i2=0; i2<3; i2++)
{ {
output << triangles[i].vertecies[i2].x << " " output << triangles[i].vertecies[i2].coordinates.x << " "
<< triangles[i].vertecies[i2].y << " " << triangles[i].vertecies[i2].coordinates.y << " "
<< triangles[i].vertecies[i2].z << " " << triangles[i].vertecies[i2].coordinates.z << " "
<< triangles[i].texCoords[i2].x << " " << triangles[i].vertecies[i2].textureCoordinates.x << " "
<< triangles[i].texCoords[i2].y << endl; << triangles[i].vertecies[i2].textureCoordinates.y << endl;
} }
output << triangles[i].normal.x << " " output << triangles[i].normal.x << " "
@@ -302,11 +302,11 @@ namespace OpenArena
// glNormal3f((GLfloat)triangles[i].normal.x, (GLfloat)triangles[i].normal.y, (GLfloat)triangles[i].normal.z); // glNormal3f((GLfloat)triangles[i].normal.x, (GLfloat)triangles[i].normal.y, (GLfloat)triangles[i].normal.z);
for (uint32 i2=0; i2<3; i2++) for (uint32 i2=0; i2<3; i2++)
{ {
glTexCoord2f(triangles[i].texCoords[i2].x, glTexCoord2f(triangles[i].vertecies[i2].textureCoordinates.x,
triangles[i].texCoords[i2].y); triangles[i].vertecies[i2].textureCoordinates.y);
glVertex3f((GLfloat)triangles[i].vertecies[i2].x, glVertex3f((GLfloat)triangles[i].vertecies[i2].coordinates.x,
(GLfloat)triangles[i].vertecies[i2].y, (GLfloat)triangles[i].vertecies[i2].coordinates.y,
(GLfloat)triangles[i].vertecies[i2].z); (GLfloat)triangles[i].vertecies[i2].coordinates.z);
} }
glEnd(); glEnd();
} }