Changeset 3195 in orxonox.OLD for orxonox/trunk/importer/array.cc

Timestamp:

Dec 17, 2004, 12:03:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: this→pointers implemented in classes object, material, array, pathlist

File:

• orxonox/trunk/importer/array.cc (modified) (10 diffs)

orxonox/trunk/importer/array.cc

@@ -21 +21 @@
 Array::Array ()
 {
-  initializeArray ();
+  this->initializeArray ();
 }
 
@@ -32 +32 @@
   if (verbose >= 2)
     printf("deleting array\n");
-  Entry* walker = firstEntry;
+  Entry* walker = this->firstEntry;
   Entry* previous;
   while (walker)
@@ -41 +41 @@
     }
   if (finalized)
-    delete []array;
+    delete []this->array;
 }
 
@@ -52 +52 @@
   if (verbose >= 2)
     printf ("crating new Array\n");
-  firstEntry = new Entry;
-  firstEntry->next =NULL;
-  currentEntry=firstEntry;
-  finalized = false;
-  entryCount = 0; //0 means one entry
+  this->firstEntry = new Entry;
+  this->firstEntry->next =NULL;
+  this->currentEntry=firstEntry;
+  this->finalized = false;
+  this->entryCount = 0; //0 means one entry
   return;
 }
@@ -69 +69 @@
     printf ("Finalizing array. Length: %i\n", entryCount);  
   //  if ((array = (GLfloat*)malloc( entryCount* sizeof(GLfloat))) == NULL)
-  if ((array = new GLfloat [entryCount]) == NULL)
-    printf ("could not allocate %i data Blocks\n", entryCount);
-  Entry* walker = firstEntry;
-  for (int i=0; i<entryCount; i++)
+  if ((this->array = new GLfloat [this->entryCount]) == NULL)
+    printf ("could not allocate %i data Blocks\n", this->entryCount);
+  Entry* walker = this->firstEntry;
+  for (int i=0; i<this->entryCount; i++)
     {
-      array[i] = walker->value;
+      this->array[i] = walker->value;
       walker = walker->next;
     }
-  finalized = true;
+  this->finalized = true;
 
   return;
@@ -88 +88 @@
 void Array::addEntry (GLfloat entry)
 {
-  if (!finalized)
+  if (!this->finalized)
     {
       if (verbose >= 3)
         printf ("adding new Entry to Array: %f\n", entry);
       
-      currentEntry->value = entry;
-      currentEntry->next = new Entry;
-      currentEntry = currentEntry->next;
-      currentEntry->next = NULL;
-      ++entryCount;
+      this->currentEntry->value = entry;
+      this->currentEntry->next = new Entry;
+      this->currentEntry = currentEntry->next;
+      this->currentEntry->next = NULL;
+      ++this->entryCount;
     }
   else 
@@ -109 +109 @@
 void Array::addEntry (GLfloat entry0, GLfloat entry1, GLfloat entry2)
 {
-  addEntry (entry0);
-  addEntry (entry1);
-  addEntry (entry2);
+  this->addEntry (entry0);
+  this->addEntry (entry1);
+  this->addEntry (entry2);
 }
   
@@ -120 +120 @@
 GLfloat* Array::getArray ()
 {
-  return array;
+  return this->array;
 }
 
@@ -128 +128 @@
 int Array::getCount()
 {
-  return entryCount;
+  return this->entryCount;
 }
 
@@ -136 +136 @@
 void Array::debug ()
 {
-  printf ("entryCount=%i, address=%p\n", entryCount, array);
+  printf ("entryCount=%i, address=%p\n", this->entryCount, this->array);
 }