Changeset 6453 in orxonox.OLD

Timestamp:

Jan 9, 2006, 11:11:59 PM (18 years ago)

Author:

bensch

Message:

trunk Vectors instead of floats used in VertexArrayModel

Location:

trunk/src/lib/graphics/importer

Files:

• vertex_array_model.cc (modified) (4 diffs)
• vertex_array_model.h (modified) (2 diffs)

trunk/src/lib/graphics/importer/vertex_array_model.cc

@@ -179 +179 @@
 void VertexArrayModel::addVertex(float x, float y, float z)
 {
-  this->vertices.push_back(x);
-  this->vertices.push_back(y);
-  this->vertices.push_back(z);
+  this->vertices.push_back(Vector(x,y,z));
   this->pModelInfo.numVertices++;
 }
@@ -196 +194 @@
 void VertexArrayModel::addNormal(float x, float y, float z)
 {
-  this->normals.push_back(x);
-  this->normals.push_back(y);
-  this->normals.push_back(z);
+  this->normals.push_back(Vector(x,y,z));
   this->pModelInfo.numNormals++;
 }
@@ -225 +221 @@
 void VertexArrayModel::addColor(float r, float g, float b)
 {
-  this->colors.push_back(r);
-  this->colors.push_back(g);
-  this->colors.push_back(b);
+  this->colors.push_back(Vector(r,g,b));
   // FIXME
 }
@@ -357 +351 @@
             this->stripes.size(),
             this->indices.size(),
-            this->vertices.size()/3,
-            this->normals.size()/3,
+            this->vertices.size(),
+            this->normals.size(),
             this->texCoords.size()/2,
-            this->colors.size() )/3;
+            this->colors.size() );
   for (GLuint i = 1; i < this->stripes.size(); ++i)
   {

trunk/src/lib/graphics/importer/vertex_array_model.h

@@ -51 +51 @@
   unsigned int indiceCount() const { return this->indices.size(); };
 
-  float& vertex(unsigned int i) { return this->vertices[i]; };
+//  float& vertex(unsigned int i) { return this->vertices[i]; };
 
   //
@@ -63 +63 @@
 
  private:
-  std::vector<float>       vertices;        //!< The Array that handles the Vertices.
-  std::vector<float>       normals;         //!< The Array that handles the Normals.
-  std::vector<float>       texCoords;       //!< The Array that handles the VertexTextureCoordinates.
-  std::vector<float>       colors;          //!< The Array that handles Colors.
+  std::vector<Vector>        vertices;        //!< The Array that handles the Vertices.
+  std::vector<Vector>        normals;         //!< The Array that handles the Normals.
+  std::vector<float>         texCoords;       //!< The Array that handles the VertexTextureCoordinates.
+  std::vector<Vector>        colors;          //!< The Array that handles Colors.
 
   std::vector<GLuint>        indices;         //!< The Array that tells us what Vertex is connected to which other one.