Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/lib/graphics/importer/array.cc

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/lib/graphics/importer/array.cc (modified) (7 diffs)

orxonox/branches/levelloader/src/lib/graphics/importer/array.cc

@@ -13 +13 @@
    co-programmer: ...
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
 #include "array.h"
@@ -30 +32 @@
 Array::~Array()
 {
-  PRINTF(2)("deleting array\n");
+  PRINTF(4)("deleting array\n");
   Entry* walker = this->firstEntry;
   Entry* previous;
@@ -49 +51 @@
 void Array::initializeArray ()
 {
-  PRINTF(2)("crating new Array\n");
+  PRINTF(4)("crating new Array\n");
   this->firstEntry = new Entry;
   this->firstEntry->next =NULL;
@@ -64 +66 @@
 void Array::finalizeArray (void)
 {
-  PRINTF(3)("Finalizing array. Length: %i\n", entryCount);  
+  PRINTF(4)("Finalizing array. Length: %i\n", entryCount);  
   //  if ((array = (GLfloat*)malloc( entryCount* sizeof(GLfloat))) == NULL)
   if (!(this->array = new GLfloat [this->entryCount]))
@@ -87 +89 @@
   if (!this->finalized)
     {
-      PRINTF(3)("adding new Entry to Array: %f\n", entry);
+      PRINTF(5)("adding new Entry to Array: %f\n", entry);
       
       this->currentEntry->value = entry;
@@ -96 +98 @@
     }
   else 
-    PRINTF(1)("adding failed, because list has been finalized\n");
+    PRINTF(2)("adding failed, because list has been finalized\n");
 }
 
@@ -131 +133 @@
 void Array::debug ()
 {
-  PRINTF(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);
+  PRINT(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);
 }