Changeset 6162 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Dec 19, 2005, 4:52:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontroll branche into the trunk
merged with command
svn merge -r6036:HEAD spaceshipcontrol/ ../trunk/
no conflicts

Location:

trunk/src/lib/graphics/importer

Files:

• model.cc (modified) (3 diffs)
• objModel.cc (modified) (1 diff)
• static_model.cc (modified) (2 diffs)

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

@@ -28 +28 @@
 Model::Model()
 {
-//   this->setClassID(CL_PROTO_ID, "ProtoClass");
+  this->setClassID(CL_MODEL, "Model");
   this->pModelInfo.numVertices = 0;
   this->pModelInfo.numTriangles = 0;
@@ -55 +55 @@
   const GLfloat* pVertices = NULL;
   const GLfloat* pNorm = NULL;
-  
+
   glBegin(GL_TRIANGLES);
   for( int i = 0; i < this->pModelInfo.numTriangles; ++i)
@@ -64 +64 @@
       glNormal3f(pNorm[0], pNorm[1], pNorm[2]);
       glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
-      
+
       pNorm = &this->pModelInfo.pNormals[this->pModelInfo.pTriangles[i].indexToNormals[1]];
       pVertices = &this->pModelInfo.pVertices[this->pModelInfo.pTriangles[i].indexToVertices[1]];
       glNormal3f(pNorm[0], pNorm[1], pNorm[2]);
       glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
-      
+
       pNorm = &this->pModelInfo.pNormals[this->pModelInfo.pTriangles[i].indexToNormals[2]];
       pVertices = &this->pModelInfo.pVertices[this->pModelInfo.pTriangles[i].indexToVertices[2]];
       glNormal3f(pNorm[0], pNorm[1], pNorm[2]);
       glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
-      
+
     }
   glEnd();

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

@@ -34 +34 @@
 OBJModel::OBJModel(const char* fileName, float scaling) : StaticModel(fileName)
 {
+  this->setClassID(CL_OBJ_MODEL, "OBJModel");
+
   this->objPath = "./";
 

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

@@ -144 +144 @@
 StaticModel::StaticModel(const char* modelName)
 {
-  this->setClassID(CL_MODEL, "Model");
+  this->setClassID(CL_STATIC_MODEL, "StaticModel");
   PRINTF(4)("new 3D-Model is being created\n");
   this->setName(modelName);
@@ -550 +550 @@
       this->currentGroup->currentFace->vertexCount++;
     }
-  
+
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount -2;
   this->faceCount += this->currentGroup->currentFace->vertexCount -2;