Changeset 2807 in orxonox.OLD for orxonox/branches

Timestamp:

Nov 11, 2004, 1:40:43 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/importer: now it works on Windows too. The Problem was, that malloc wrote into the wrong memory holes. thats why I rewrote the whole code.
This Problem may araise again, if multiple Models are imported in Windows, because the malloc function is still active.

Location:

orxonox/branches/importer/importer

Files:

• array.cc (modified) (3 diffs)
• array.h (modified) (2 diffs)
• framework.cc (modified) (1 diff)

orxonox/branches/importer/importer/array.cc

@@ -3 +3 @@
 Array::Array ()
 {
-  createArray (2000);
-}
-Array::Array (unsigned int arraySize)
-{
-  createArray (arraySize);
+  createArray ();
 }
 
-void Array::createArray (unsigned int newArraySize)
+void Array::createArray ()
 {
   if (verbose >= 2)
-    printf ("crating new Array of size %i\n", newArraySize);
-  array = new GLfloat [newArraySize];
+    printf ("crating new Array\n");
+  firstEntry = new Entry;
+  firstEntry->next =NULL;
+  currentEntry=firstEntry;
   entryCount = -1; //0 means one entry
-  arraySize = newArraySize;
   return;
 }
 
-void Array::resizeArray (unsigned int newSize)
-{
-  if (verbose >= 2)
-    printf ("Resizing Array to size %i\n", newSize);  
-  GLfloat* newArray = new GLfloat [newSize];
-  
-  for (int i=0; i<=entryCount; i++)
-      newArray[i] = array[i];
-
-  delete [] array;
-  array = newArray;
-  arraySize = newSize;
-
-  return;
-}
-  
 void Array::finalizeArray (void)
 {
   if (verbose >= 3)
     printf ("Finalizing array.\n");  
-  resizeArray (entryCount+1);
+  if ((array = (GLfloat*)malloc( entryCount* sizeof(GLfloat))) == NULL)
+    printf ("could not allocate %i data Blocks\n", entryCount);
+  Entry* walker = firstEntry;
+  for (int i=0; i<=entryCount; i++)
+    {
+      array[i] = walker->value;
+      walker = walker->next;
+    }
   return;
 }
@@ -49 +37 @@
   if (verbose >= 3)
     printf ("adding new Entry to Array: %f\n", entry);
+
   entryCount++;
-
-  if (entryCount > arraySize)
-    resizeArray(arraySize+2000);
-  
-  array[entryCount] = entry;
+  currentEntry->value = entry;
+  currentEntry->next = new Entry;
+  currentEntry = currentEntry->next;
+  currentEntry->next = NULL;
 
 }
@@ -80 +68 @@
 void Array::debug ()
 {
-  printf ("arraySize=%i, entryCount=%i, address=%p\n", arraySize, entryCount, array);
+  printf ("entryCount=%i, address=%p\n", entryCount, array);
 }

orxonox/branches/importer/importer/array.h

@@ -11 +11 @@
  public:
   Array ();
-  Array (unsigned int arraySize);
 
-  void createArray (unsigned int newArraySize);
-  void resizeArray (unsigned int newSize);
+  void createArray ();
   void finalizeArray (void);
   void addEntry (GLfloat entry);
@@ -23 +21 @@
   void debug(void);
  private:
+  struct Entry
+  {
+    GLfloat value;
+    Entry* next;
+  };
+
   GLfloat* array;
-  unsigned int arraySize;
-  unsigned int entryCount;
-
+  int entryCount;
+  Entry* firstEntry;
+  Entry* currentEntry;
+  
+  
 };
 

orxonox/branches/importer/importer/framework.cc

@@ -2 +2 @@
 #include "object.h"
 
-int verbose = 2;
+int verbose = 4;
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
 Object* obj;