Changeset 2758 in orxonox.OLD for orxonox/branches

Timestamp:

Nov 9, 2004, 2:01:18 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/importer: error resolved due to to short resize

Location:

orxonox/branches/importer/importer

Files:

• array.cc (modified) (5 diffs)
• array.h (modified) (2 diffs)
• object.cc (modified) (3 diffs)

orxonox/branches/importer/importer/array.cc

@@ -5 +5 @@
   createArray (2000);
 }
-Array::Array (int arraySize)
+Array::Array (unsigned int arraySize)
 {
   createArray (arraySize);
 }
 
-void Array::createArray (int newArraySize)
+void Array::createArray (unsigned int newArraySize)
 {
   array = new GLfloat [newArraySize];
@@ -18 +18 @@
 }
 
-void Array::resizeArray (int newSize)
+void Array::resizeArray (unsigned int newSize)
 {
-  GLfloat* newArray = new GLfloat[newSize];
+  GLfloat* newArray = new GLfloat [newSize];
   
   for (int i=0; i<=entryCount; i++)
       newArray[i] = array[i];
 
-  delete array;
+  delete [] array;
   array = newArray;
+  arraySize = newSize;
 
   return;
@@ -33 +34 @@
 void Array::finalizeArray (void)
 {
-  resizeArray (entryCount);
+  resizeArray (entryCount+1);
   return;
 }
@@ -42 +43 @@
   entryCount++;
 
-  if (entryCount >= arraySize)
+  if (entryCount > arraySize)
     resizeArray(arraySize+2000);
   
@@ -61 +62 @@
   return array;
 }
+
+
+
+void Array::debug ()
+{
+  printf ("arraySize=%i, entryCount=%i, address=%p\n", arraySize, entryCount, array);
+}

orxonox/branches/importer/importer/array.h

@@ -5 +5 @@
  public:
   Array ();
-  Array (int arraySize);
+  Array (unsigned int arraySize);
 
-  void createArray (int newArraySize);
-  void resizeArray (int newSize);
+  void createArray (unsigned int newArraySize);
+  void resizeArray (unsigned int newSize);
   void finalizeArray (void);
   void addEntry (GLfloat entry);
@@ -15 +15 @@
   GLfloat* getArray ();
 
+  void debug(void);
  private:
   GLfloat* array;
-  int arraySize;
-  int entryCount;
+  unsigned int arraySize;
+  unsigned int entryCount;
 
 };

orxonox/branches/importer/importer/object.cc

@@ -17 +17 @@
   glArrayElement(1);
   glArrayElement(2);
+  glArrayElement(3);
+  glArrayElement(4);
+  glArrayElement(5);
+
+  
   
 
@@ -46 +51 @@
       while (fscanf (OBJ_FILE, "%s", Buffer) != EOF)
         {
-          printf ("%s\n",Buffer);
+          //      printf ("%s\n",Buffer);
 
           // case we read it is a vertex
@@ -54 +59 @@
                 {
                   fscanf (OBJ_FILE, "%s", Buffer);
-                  printf ("float: %f\n", atof(Buffer));
+                  //printf ("float: %f\n", atof(Buffer));
                   vertices->addEntry(atof(Buffer));
                 }
             }
         }
-      //      vertices->addEntry(0,0,0);
-      //      vertices->addEntry(0,1,0);
-      //      vertices->addEntry(1,0,1);
+      vertices->addEntry(0,0,0);
+      vertices->addEntry(0,-1,0);
+      vertices->addEntry(-1,0,-1);
       vertices->finalizeArray();
-      for (int i=0;i<=10;i++)
+      for (int i=0;i<=20;i++)
         printf("%f\n",vertices->getArray()[i]);
       fclose (OBJ_FILE);