Changeset 4109 in orxonox.OLD

Timestamp:

May 7, 2005, 5:10:38 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: little error in model, and also a speed-fix in Array

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• array.cc (modified) (1 diff)
• array.h (modified) (1 diff)
• model.cc (modified) (5 diffs)

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

@@ -112 +112 @@
   
 /**
-   \brief Gives back the array !! MUST be executed AFTER finalize.
-   \returns The created array.
-*/
-GLfloat* Array::getArray ()
-{
-  return this->array;
-}
-
-/**
-   \returns The Count of entries in the Array
-*/
-int Array::getCount()
-{
-  return this->entryCount;
-}
-
-/**
    \brief Simple debug info about the Array
 */
-void Array::debug ()
+void Array::debug (void) const
 {
   PRINT(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);

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

@@ -23 +23 @@
   void addEntry(GLfloat entry0, GLfloat entry1, GLfloat entry2);
   
-  GLfloat* getArray ();
-  int getCount();
-  void debug(void);
+  /** \returns The array */
+  inline const GLfloat* getArray () const {return this->array;}
+  /**   \returns The Count of entries in the Array*/
+  inline int getCount(void)const {return this->entryCount;}
+  void debug(void) const ;
  private:
   //! One entry of the Array

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

@@ -36 +36 @@
 ModelFaceElement::ModelFaceElement()
 {
+  this->vertexNumber = -1;
+  this->normalNumber = -1;
+  this->texCoordNumber = -1;    
+
   this->next = NULL;
 }
@@ -556 +560 @@
       if (vertex)
         tmpElem->vertexNumber = atoi(vertex)-1;
-      else
-        tmpElem->vertexNumber = -1;
       if (texture)
         tmpElem->texCoordNumber = atoi(texture)-1;
-      else
-        tmpElem->texCoordNumber = -1;
       if (normal)
         tmpElem->normalNumber = atoi(normal)-1;
-      else
-        tmpElem->normalNumber = -1;
 
       faceString += tmpLen;
@@ -845 +843 @@
   if (elem->texCoordNumber != -1)
     {
-      if (likely(elem->texCoordNumber <= this->texCoordCount))
+      if (likely(elem->texCoordNumber < this->texCoordCount))
         glTexCoord2fv(this->vTexture->getArray() + elem->texCoordNumber * 2);
       else
@@ -853 +851 @@
   if (elem->normalNumber != -1)
     {
-    if (likely(elem->normalNumber <= this->normalCount))
+    if (likely(elem->normalNumber < this->normalCount))
       glNormal3fv(this->normals->getArray() + elem->normalNumber * 3);
     else
@@ -861 +859 @@
   if (elem->vertexNumber != -1)
     {
-      if (likely(elem->vertexNumber <= this->vertexCount))
+      if (likely(elem->vertexNumber < this->vertexCount -1000))
           glVertex3fv(this->vertices->getArray() + elem->vertexNumber * 3);
       else