Changeset 9829 in orxonox.OLD for branches/new_class_id

Timestamp:

Sep 26, 2006, 1:09:35 PM (18 years ago)

Author:

bensch

Message:

new static_model_data added

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

• Makefile.am (modified) (2 diffs)
• static_model_data.cc (copied) (copied from branches/new_class_id/src/lib/graphics/importer/static_model.cc) (43 diffs)
• static_model_data.h (copied) (copied from branches/new_class_id/src/lib/graphics/importer/static_model.h) (2 diffs)

branches/new_class_id/src/lib/graphics/importer/Makefile.am

@@ -11 +11 @@
                 grid.cc \
                 static_model.cc \
+                static_model_data.cc \
                 objModel.cc \
                 primitive_model.cc \
@@ -57 +58 @@
                 grid.h \
                 static_model.h \
+                static_model_data.h \
                 objModel.h \
                 primitive_model.h \

branches/new_class_id/src/lib/graphics/importer/static_model_data.cc

@@ -18 +18 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
-#include "static_model.h"
+#include "static_model_data.h"
 
 #include "debug.h"
@@ -134 +134 @@
 /// MODEL ///
 /////////////
-ObjectListDefinition(StaticModel);
+ObjectListDefinition(StaticModelData);
 
 /**
@@ -141 +141 @@
  * assigns it a Name and a Type
  */
-StaticModel::StaticModel(const std::string& modelName)
-{
-  this->registerObject(this, StaticModel::_objectList);
+StaticModelData::StaticModelData(const std::string& modelName)
+{
+  this->registerObject(this, StaticModelData::_objectList);
   PRINTF(4)("new 3D-Model is being created\n");
   this->setName(modelName);
@@ -162 +162 @@
  * Looks if any from model allocated space is still in use, and if so deleted it.
  */
-StaticModel::~StaticModel()
+StaticModelData::~StaticModelData()
 {
   PRINTF(4)("Deleting Model ");
@@ -189 +189 @@
     delete (*modMat);
   }
-
-  // mark this stuff as beeing deleted
-  this->pModelInfo.pVertices = NULL;
-  this->pModelInfo.pNormals = NULL;
-  this->pModelInfo.pTexCoor = NULL;
 }
 
@@ -199 +194 @@
  * @brief Finalizes an Object. This can be done outside of the Class.
  */
-void StaticModel::finalize()
+void StaticModelData::finalize()
 {
   // this creates the display List.
@@ -205 +200 @@
   this->buildTriangleList();
 
-  // write out the modelInfo data used for the collision detection!
-  this->pModelInfo.pVertices = &this->vertices[0];
-  this->pModelInfo.pNormals = &this->normals[0];
-  this->pModelInfo.pTexCoor = &this->vTexture[0];
-
   this->finalized = true;
 }
@@ -216 +206 @@
  * @brief rebuild the Model from the Information we got.
  */
-void StaticModel::rebuild()
+void StaticModelData::rebuild()
 {
   PRINTF(3)("Rebuilding Model '%s'\n", this->getCName());
@@ -230 +220 @@
  * It does this by just calling the Lists that must have been created earlier.
  */
-void StaticModel::draw () const
+void StaticModelData::draw () const
 {
   PRINTF(4)("drawing the 3D-Models\n");
@@ -249 +239 @@
  * It does this by just calling the List that must have been created earlier.
  */
-void StaticModel::draw (int groupNumber) const
+void StaticModelData::draw (int groupNumber) const
 {
   if (unlikely(groupNumber >= this->groupCount))
@@ -281 +271 @@
  * It does this by just calling the List that must have been created earlier.
  */
-void StaticModel::draw (const std::string& groupName) const
+void StaticModelData::draw (const std::string& groupName) const
 {
   PRINTF(4)("drawing the requested 3D-Models if found.\n");
@@ -310 +300 @@
  * This will be applied at the end of the importing Process.
 */
-bool StaticModel::cleanup()
+bool StaticModelData::cleanup()
 {
   PRINTF(4)("cleaning up the 3D-Model to save Memory.\n");
@@ -328 +318 @@
  * with this option set the Materials will not be deleted with the Model.
  */
-Material* StaticModel::addMaterial(Material* material)
+Material* StaticModelData::addMaterial(Material* material)
 {
   if (material == NULL)
@@ -344 +334 @@
  * @returns the added material
  */
-Material* StaticModel::addMaterial(const std::string& materialName)
+Material* StaticModelData::addMaterial(const std::string& materialName)
 {
   ModelMaterial* modMat = new ModelMaterial;
@@ -360 +350 @@
  * @returns the Material if found, NULL otherwise
  */
-Material* StaticModel::findMaterialByName(const std::string& materialName)
+Material* StaticModelData::findMaterialByName(const std::string& materialName)
 {
   std::list<ModelMaterial*>::iterator modMat;
@@ -376 +366 @@
  * With it you should be able to create Models with more than one SubModel inside
  */
-bool StaticModel::addGroup(const std::string& groupString)
+bool StaticModelData::addGroup(const std::string& groupString)
 {
   PRINTF(5)("Read Group: %s.\n", groupString.c_str());
@@ -399 +389 @@
  *  If a vertex line is found this function will inject it into the vertex-Array
  */
-bool StaticModel::addVertex (const std::string& vertexString)
+bool StaticModelData::addVertex (const std::string& vertexString)
 {
   float subbuffer1;
@@ -408 +398 @@
   this->vertices.push_back(subbuffer2*scaleFactor);
   this->vertices.push_back(subbuffer3*scaleFactor);
-  this->pModelInfo.numVertices++;
   return true;
 }
@@ -418 +407 @@
  * @param z the Z-coordinate of the Vertex to add.
  */
-bool StaticModel::addVertex(float x, float y, float z)
+bool StaticModelData::addVertex(float x, float y, float z)
 {
   PRINTF(5)("reading in a vertex: %f %f %f\n", x, y, z);
@@ -424 +413 @@
   this->vertices.push_back(y*scaleFactor);
   this->vertices.push_back(z*scaleFactor);
-  this->pModelInfo.numVertices++;
   return true;
 }
@@ -434 +422 @@
  * If a vertexNormal line is found this function will inject it into the vertexNormal-Array
  */
-bool StaticModel::addVertexNormal (const std::string& normalString)
+bool StaticModelData::addVertexNormal (const std::string& normalString)
 {
   float subbuffer1;
@@ -443 +431 @@
   this->normals.push_back(subbuffer2);
   this->normals.push_back(subbuffer3);
-  this->pModelInfo.numNormals++;
   return true;
 }
@@ -455 +442 @@
  * If a vertexNormal line is found this function will inject it into the vertexNormal-Array
  */
-bool StaticModel::addVertexNormal(float x, float y, float z)
+bool StaticModelData::addVertexNormal(float x, float y, float z)
 {
   PRINTF(5)("found vertex-Normal %f, %f, %f\n", x, y, z);
@@ -461 +448 @@
   this->normals.push_back(y);
   this->normals.push_back(z);
-  this->pModelInfo.numNormals++;
   return true;
 }
@@ -474 +460 @@
  * !! WARNING THIS IS DIFFERNT FROM addVervexTexture(float, float); because it changes the second entry to 1-v !!
  */
-bool StaticModel::addVertexTexture (const std::string& vTextureString)
+bool StaticModelData::addVertexTexture (const std::string& vTextureString)
 {
   float subbuffer1;
@@ -481 +467 @@
   this->vTexture.push_back(subbuffer1);
   this->vTexture.push_back(1 - subbuffer2);
-  this->pModelInfo.numTexCoor++;
   return true;
 }
@@ -493 +478 @@
  *  inject it into the TextureCoordinate-Array
  */
-bool StaticModel::addVertexTexture(float u, float v)
+bool StaticModelData::addVertexTexture(float u, float v)
 {
   PRINTF(5)("found vertex-Texture %f, %f\n", u, v);
   this->vTexture.push_back(u);
   this->vTexture.push_back(v);
-  this->pModelInfo.numTexCoor++;
   return true;
 }
@@ -513 +497 @@
  * @TODO make it std::string conform
  */
-bool StaticModel::addFace (const std::string& faceStringInput)
+bool StaticModelData::addFace (const std::string& faceStringInput)
 {
   const char* faceString = faceStringInput.c_str();
@@ -571 +555 @@
  * @param type The information Passed with each Vertex
 */
-bool StaticModel::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
+bool StaticModelData::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
 {
   if (this->currentGroup->faceCount > 0)
@@ -604 +588 @@
  * @param matString the Material that will be set.
 */
-bool StaticModel::setMaterial(const std::string& matString)
+bool StaticModelData::setMaterial(const std::string& matString)
 {
   if (this->currentGroup->faceCount > 0)
@@ -620 +604 @@
  * @param mtl the Material that will be set.
 */
-bool StaticModel::setMaterial(Material* mtl)
+bool StaticModelData::setMaterial(Material* mtl)
 {
   if (this->currentGroup->faceCount > 0)
@@ -641 +625 @@
  * 4. It goes through all the normale-Points and calculates the VertexNormale and includes it in the normals-Array.
  */
-bool StaticModel::buildVertexNormals ()
+bool StaticModelData::buildVertexNormals ()
 {
   PRINTF(4)("Normals are being calculated.\n");
@@ -721 +705 @@
  *  reads and includes the Faces/Materials into the openGL state Machine
 */
-bool StaticModel::importToDisplayList()
+bool StaticModelData::importToDisplayList()
 {
   // finalize the Arrays
@@ -811 +795 @@
  *  builds an array of triangles, that can later on be used for obb separation and octree separation
  */
-bool StaticModel::buildTriangleList()
-{
-  if( unlikely(this->pModelInfo.pTriangles != NULL))
+bool StaticModelData::buildTriangleList()
+{
+  if( unlikely(!this->triangles.empty()))
     return true;
   /* make sure, that all the arrays are finalized */
@@ -823 +807 @@
   ModelFace*         tmpFace;              //!< the temporary face referece
 
+  unsigned int numTriangles = 0;
   bool warned = false;
-
-  this->pModelInfo.numTriangles = 0;
 
   /* count the number of triangles */
@@ -836 +819 @@
     {
       /* if its a triangle just add it to the list */
-      if( tmpFace->vertexCount == 3){
-        ++this->pModelInfo.numTriangles;
+      if( tmpFace->vertexCount == 3)
+      {
+        ++numTriangles;
       } /* if the polygon is a quad */
-      else if( tmpFace->vertexCount == 4) {
-        this->pModelInfo.numTriangles += 2;
+      else if( tmpFace->vertexCount == 4)
+      {
+        numTriangles += 2;
       }
-      else if( tmpFace->vertexCount > 4) {
-        if (!warned)        {
+      else if( tmpFace->vertexCount > 4)
+      {
+        if (!warned)
+        {
           PRINTF(2)("This model (%s) got over 4 vertices per face <=> conflicts in the CD engine!\n", this->getCName());
           warned = true;
@@ -853 +840 @@
   }
 
-  PRINTF(3)("got %i triangles, %i vertices\n", this->pModelInfo.numTriangles, this->pModelInfo.numVertices);
+  PRINTF(3)("got %i triangles, %i vertices\n", numTriangles, this->vertices.size());
 
 
@@ -859 +846 @@
 
   /* allocate memory for the new triangle structures */
-  if( (this->pModelInfo.pTriangles = new sTriangleExt[this->pModelInfo.numTriangles]) == NULL)
-  {
-    PRINTF(1)("Could not allocate memory for triangle list\n");
-    return false;
-  }
+  this->triangles.reserve(numTriangles);
 
   /* now iterate through all groups and build up the triangle list */
@@ -879 +862 @@
         for( int j = 0; j < 3; ++j)
         {
-          this->pModelInfo.pTriangles[index].indexToVertices[j] = (unsigned int)tmpElem->vertexNumber * 3 ;
-          this->pModelInfo.pTriangles[index].indexToNormals[j] = (unsigned int)tmpElem->normalNumber * 3 ;
-          this->pModelInfo.pTriangles[index].indexToTexCoor[j] = (unsigned int)tmpElem->texCoordNumber * 3 ;
+          this->triangles[index].indexToVertices[j] = (unsigned int)tmpElem->vertexNumber * 3 ;
+          this->triangles[index].indexToNormals[j] = (unsigned int)tmpElem->normalNumber * 3 ;
+          this->triangles[index].indexToTexCoor[j] = (unsigned int)tmpElem->texCoordNumber * 3 ;
           tmpElem = tmpElem->next;
 
@@ -890 +873 @@
       {
 
-        this->pModelInfo.pTriangles[index].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber * 3;
-        this->pModelInfo.pTriangles[index].indexToNormals[0] = (unsigned int)tmpElem->normalNumber * 3;
-        this->pModelInfo.pTriangles[index].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber * 3;
-
-        this->pModelInfo.pTriangles[index + 1].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber * 3;
-        this->pModelInfo.pTriangles[index + 1].indexToNormals[0] = (unsigned int)tmpElem->normalNumber * 3;
-        this->pModelInfo.pTriangles[index + 1].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber * 3;
+        this->triangles[index].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index].indexToNormals[0] = (unsigned int)tmpElem->normalNumber * 3;
+        this->triangles[index].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber * 3;
+
+        this->triangles[index + 1].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index + 1].indexToNormals[0] = (unsigned int)tmpElem->normalNumber * 3;
+        this->triangles[index + 1].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber * 3;
         tmpElem = tmpElem->next;
 
-        this->pModelInfo.pTriangles[index].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber * 3;
-        this->pModelInfo.pTriangles[index].indexToNormals[1] = (unsigned int)tmpElem->normalNumber * 3;
-        this->pModelInfo.pTriangles[index].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber * 3;
+        this->triangles[index].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index].indexToNormals[1] = (unsigned int)tmpElem->normalNumber * 3;
+        this->triangles[index].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber * 3;
         tmpElem = tmpElem->next;
 
-        this->pModelInfo.pTriangles[index].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber * 3;
-        this->pModelInfo.pTriangles[index].indexToNormals[2] = (unsigned int)tmpElem->normalNumber * 3;
-        this->pModelInfo.pTriangles[index].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber * 3;
-
-        this->pModelInfo.pTriangles[index + 1].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber * 3;
-        this->pModelInfo.pTriangles[index + 1].indexToNormals[2] = (unsigned int)tmpElem->normalNumber * 3;
-        this->pModelInfo.pTriangles[index + 1].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber * 3;
+        this->triangles[index].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index].indexToNormals[2] = (unsigned int)tmpElem->normalNumber * 3;
+        this->triangles[index].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber * 3;
+
+        this->triangles[index + 1].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index + 1].indexToNormals[2] = (unsigned int)tmpElem->normalNumber * 3;
+        this->triangles[index + 1].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber * 3;
         tmpElem = tmpElem->next;
 
-        this->pModelInfo.pTriangles[index + 1].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber * 3;
-        this->pModelInfo.pTriangles[index + 1].indexToNormals[1] = (unsigned int)tmpElem->normalNumber * 3;
-        this->pModelInfo.pTriangles[index + 1].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber * 3;
+        this->triangles[index + 1].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index + 1].indexToNormals[1] = (unsigned int)tmpElem->normalNumber * 3;
+        this->triangles[index + 1].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber * 3;
 
         index += 2;
@@ -937 +920 @@
    merging this information, the face will be drawn.
 */
-bool StaticModel::addGLElement (ModelFaceElement* elem)
+bool StaticModelData::addGLElement (ModelFaceElement* elem)
 {
   PRINTF(5)("importing grafical Element to openGL.\n");
@@ -943 +926 @@
   if (elem->texCoordNumber > -1)
   {
-    if (likely((unsigned int)elem->texCoordNumber < this->pModelInfo.numTexCoor))
+    if (likely((unsigned int)elem->texCoordNumber < this->vTexture.size()))
       glTexCoord2fv(&this->vTexture[0] + elem->texCoordNumber * 2);
     else
       PRINTF(2)("TextureCoordinate %d is not in the List (max: %d)\nThe Model might be incomplete\n",
-                elem->texCoordNumber, this->pModelInfo.numTexCoor);
+                elem->texCoordNumber, this->vTexture.size());
   }
   if (elem->normalNumber > -1)
   {
-    if (likely((unsigned int)elem->normalNumber < this->pModelInfo.numNormals))
+    if (likely((unsigned int)elem->normalNumber < this->normals.size()))
       glNormal3fv(&this->normals[0] + elem->normalNumber * 3);
     else
       PRINTF(2)("Normal %d is not in the List (max: %d)\nThe Model might be incomplete",
-                elem->normalNumber, this->pModelInfo.numNormals);
+                elem->normalNumber, this->normals.size());
   }
   if (elem->vertexNumber > -1)
   {
-    if (likely((unsigned int)elem->vertexNumber < this->pModelInfo.numVertices))
+    if (likely((unsigned int)elem->vertexNumber < this->vertices.size()))
       glVertex3fv(&this->vertices[0]+ elem->vertexNumber * 3);
     else
       PRINTF(2)("Vertex %d is not in the List (max: %d)\nThe Model might be incomplete",
-                elem->vertexNumber, this->pModelInfo.numVertices);
+                elem->vertexNumber, this->vertices.size());
   }
 
@@ -974 +957 @@
    This will inject a Cube, because this is the most basic model.
 */
-void StaticModel::cubeModel()
+void StaticModelData::cubeModel()
 {
   this->addVertex (-0.5, -0.5, 0.5);

branches/new_class_id/src/lib/graphics/importer/static_model_data.h

@@ -90 +90 @@
  * All the objects are rendered with glLists
  */
-class StaticModel : public Model
+class StaticModelData : public BaseObject
 {
-  ObjectListDeclaration(StaticModel);
+  ObjectListDeclaration(StaticModelData);
   public:
-  StaticModel(const std::string& modelName = "");
-  virtual ~StaticModel();
+  StaticModelData(const std::string& modelName = "");
+  virtual ~StaticModelData();
 
   virtual void draw() const;
@@ -153 +153 @@
   std::vector<GLfloat>       vTexture;        //!< The Array that handles the VertexTextureCoordinates.
 
+  std::vector<sTriangleExt>  triangles;       //!< The Triangles if built.
+
   ModelGroup*                firstGroup;      //!< The first of all groups.
   ModelGroup*                currentGroup;    //!< The currentGroup. this is the one we will work with.