Changeset 2758 in orxonox.OLD for orxonox/branches/importer/importer/array.cc

Timestamp:

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

Author:

bensch

Message:

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

File:

• orxonox/branches/importer/importer/array.cc (modified) (5 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);
+}