Changeset 6033 in orxonox.OLD

Timestamp:

Dec 10, 2005, 11:31:12 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: model now also implements a Draw function, based on what it knows and patrick did

Location:

trunk/src

Files:

• lib/graphics/importer/model.cc (modified) (2 diffs)
• lib/graphics/importer/model.h (modified) (1 diff)
• lib/graphics/importer/static_model.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

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

@@ -17 +17 @@
 
 #include "model.h"
+
+#include "glincl.h"
 
 using namespace std;
@@ -45 +47 @@
   // delete what has to be deleted here
 }
+
+
+
+void Model::draw() const
+{
+  const GLfloat* pVertices = NULL;
+  const GLfloat* pNorm = NULL;
+  
+  glBegin(GL_TRIANGLES);
+  for( int i = 0; i < this->pModelInfo.numTriangles; ++i)
+    {
+      //printf("int i = %i\n", i);
+      pNorm = &this->pModelInfo.pNormals[this->pModelInfo.pTriangles[i].indexToNormals[0]];
+      pVertices = &this->pModelInfo.pVertices[this->pModelInfo.pTriangles[i].indexToVertices[0]];
+      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/model.h

@@ -132 +132 @@
     virtual ~Model();
 
-    virtual void draw() const {  }
+    virtual void draw() const;
 
     inline const modelInfo* getModelInfo() const { return &this->pModelInfo; }

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

@@ -220 +220 @@
 //////////
 /**
- *  Draws the Models of all Groups.
-   It does this by just calling the Lists that must have been created earlier.
-*/
+ * @brief Draws the Models of all Groups.
+ *
+ * It does this by just calling the Lists that must have been created earlier.
+ */
 void StaticModel::draw () const
 {
@@ -233 +234 @@
       tmpGroup = tmpGroup->next;
     }
-
-  /*
-    const GLfloat* pVertices = NULL;
-    const GLfloat* pNorm = NULL;
-    
-    glBegin(GL_TRIANGLES);
-    for( int i = 0; i < this->triangleCount; ++i)
-    {
-    //printf("int i = %i\n", i);
-    pNorm = &this->normals->getArray()[this->triangles[i].indexToNormals[0]];
-    pVertices = &this->vertices->getArray()[this->triangles[i].indexToVertices[0]];
-    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();
-  */
 }
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -111 +111 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(false);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;