Changeset 6046 in orxonox.OLD

Timestamp:

Dec 11, 2005, 2:42:55 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/controll: Should compile on windows again

Location:

branches/spaceshipcontrol/src

Files:

• defs/class_id.h (modified) (2 diffs)
• lib/graphics/graphics_engine.cc (modified) (3 diffs)
• lib/graphics/importer/model.cc (modified) (3 diffs)
• lib/graphics/importer/objModel.cc (modified) (1 diff)
• lib/graphics/importer/static_model.cc (modified) (2 diffs)
• lib/graphics/importer/vertex_array_model.cc (modified) (4 diffs)

branches/spaceshipcontrol/src/defs/class_id.h

@@ -91 +91 @@
   CL_TEXTURE                    =    0x00c01000,
   CL_MODEL                      =    0x00c02000,
+  CL_STATIC_MODEL               =    0x00c04000,
+  CL_VERTEX_ARRAY_MODEL         =    0x00c08000,
 
 
@@ -198 +200 @@
   CL_MATERIAL                   =    0x00000804,
   CL_TEXTURE_SEQUENCE           =    0x00c04805,
-  CL_VERTEX_ARRAY_MODEL         =    0x00000806,
-  CL_OBJMODEL                   =    0x00000807,
+  CL_OBJ_MODEL                  =    0x00000807,
   CL_PROMITIVE_MODEL            =    0x00000808,
   CL_MD2Model                   =    0x00000809,

branches/spaceshipcontrol/src/lib/graphics/graphics_engine.cc

@@ -36 +36 @@
  #include "class_list.h"
  #include "list.h"
- #include "model.h"
+ #include "static_model.h"
 #endif
 using namespace std;
@@ -283 +283 @@
   }
   PRINTF(4)("Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
-
-}
+}
+
 
 /**
@@ -320 +320 @@
     }
     // REBUILDING MODELS
-    const std::list<BaseObject*>* modelList = ClassList::getList(CL_MODEL);
+    const std::list<BaseObject*>* modelList = ClassList::getList(CL_STATIC_MODEL);
     if (texList != NULL)
     {
       std::list<BaseObject*>::const_iterator reModel;
       for (reModel = modelList->begin(); reModel != modelList->end(); reModel++)
-        dynamic_cast<Model*>(*reModel)->rebuild();
+        dynamic_cast<StaticModel*>(*reModel)->rebuild();
     }
 #endif /* __WIN32__ */

branches/spaceshipcontrol/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;
@@ -54 +54 @@
   const GLfloat* pVertices = NULL;
   const GLfloat* pNorm = NULL;
-  
+
   glBegin(GL_TRIANGLES);
   for( int i = 0; i < this->pModelInfo.numTriangles; ++i)
@@ -63 +63 @@
       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();

branches/spaceshipcontrol/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 = "./";
 

branches/spaceshipcontrol/src/lib/graphics/importer/static_model.cc

@@ -143 +143 @@
 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);
@@ -547 +547 @@
       this->currentGroup->currentFace->vertexCount++;
     }
-  
+
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount -2;
   this->faceCount += this->currentGroup->currentFace->vertexCount -2;

branches/spaceshipcontrol/src/lib/graphics/importer/vertex_array_model.cc

@@ -33 +33 @@
 VertexArrayModel::VertexArrayModel()
 {
-  this->setClassID(CL_MODEL, "VertexArrayModel");
+  this->setClassID(CL_VERTEX_ARRAY_MODEL, "VertexArrayModel");
 
   this->finalized = false;
@@ -88 +88 @@
   glVertexPointer(3, GL_FLOAT, 0, this->vertices.getArray());
   glNormalPointer(GL_FLOAT, 0, this->normals.getArray());
-  glTexCoordPointer(2, GL_FLOAT, 0, this->texCoords.getArray());  
+  glTexCoordPointer(2, GL_FLOAT, 0, this->texCoords.getArray());
 
   printf("%d\n", this->indices.getCount());
@@ -100 +100 @@
   /*  const GLfloat* pVertices = NULL;
       const GLfloat* pNorm = NULL;
-      
+
       glBegin(GL_TRIANGLES);
       for( int i = 0; i < this->triangleCount; ++i)
@@ -109 +109 @@
       glNormal3f(pNorm[0], pNorm[1], pNorm[2]);
       glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
-      
+
       pNorm = &this->normals->getArray()[this->triangles[i].indexToNormals[1]];
       pVertices = &this->vertices->getArray()[this->triangles[i].indexToVertices[1]];
       glNormal3f(pNorm[0], pNorm[1], pNorm[2]);
       glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
-      
+
       pNorm = &this->normals->getArray()[this->triangles[i].indexToNormals[2]];
       pVertices = &this->vertices->getArray()[this->triangles[i].indexToVertices[2]];
       glNormal3f(pNorm[0], pNorm[1], pNorm[2]);
       glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
-      
+
       }
       glEnd();