Changeset 4804 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 7, 2005, 11:17:56 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: introduced the modelInfo struct which contains refereces to all data a model needs, this will serve as an interface

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• abstract_model.h (modified) (2 diffs)
• model.cc (modified) (2 diffs)
• model.h (modified) (2 diffs)

orxonox/trunk/src/lib/graphics/importer/abstract_model.h

@@ -118 +118 @@
 
 
+typedef struct
+{
+  unsigned int     numVertices;
+  unsigned int     numTriangles;
+  unsigned int     numNormals;
+  unsigned int     numTexCoor;
+
+  const float*     pVertices;
+  sTriangleExt*    pTriangles;
+  const float*     pNormals;
+  const float*     pTexCoor;
+
+} modelInfo;
+
+
+
 //! This class defines the basic components of a model
 class AbstractModel : public BaseObject {
@@ -129 +145 @@
 
 
+
 #endif /* _ABSTRACT_MODEL_H */

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -150 +150 @@
   this->triangleCount = 0;
   this->triangles = NULL;
+  this->pModelInfo = NULL;
 
   this->scaleFactor = 1;
@@ -212 +213 @@
     //this->deleteArrays();
   this->cleanup();
+
+  /* load the ModelInfo */
+  this->pModelInfo = new modelInfo;
+  this->pModelInfo->numVertices = this->vertexCount;
+  this->pModelInfo->pVertices = this->vertices->getArray();
+  this->pModelInfo->numTriangles = this->triangleCount;
+  this->pModelInfo->pTriangles = this->triangles;
+  this->pModelInfo->numNormals = this->normalCount;
+  this->pModelInfo->pNormals = this->normals->getArray();
+  this->pModelInfo->numTexCoor = this->vTexture->getCount();
+  this->pModelInfo->pTexCoor = this->vTexture->getArray();
 
   this->finalized = true;

orxonox/trunk/src/lib/graphics/importer/model.h

@@ -128 +128 @@
   inline unsigned int getFaceCount() const { return this->faceCount; };
 
+  inline modelInfo* getModelInfo() const { return this->pModelInfo; }
 
   Material* addMaterial(Material* material);
@@ -180 +181 @@
   Array<GLfloat>*  vTexture;        //!< The Array that handles the VertexTextureCoordinates.
   sTriangleExt*    triangles;       //!< The Array of triangles in the abstract_model.h style
+  modelInfo*       pModelInfo;      //!< Reference to the modelInfo defined in abstract_model.h
 
   ModelGroup*      firstGroup;      //!< The first of all groups.