Changeset 3495 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 11, 2005, 10:20:51 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: taken curve and matrix out of stdincl.h because they are not needed very often.

Location:

orxonox/trunk/src

Files:

• defs/stdincl.h (modified) (1 diff)
• lib/graphics/importer/model.cc (modified) (2 diffs)
• track_manager.cc (modified) (1 diff)
• track_manager.h (modified) (1 diff)

orxonox/trunk/src/defs/stdincl.h

@@ -22 +22 @@
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "glincl.h"
 
+
 // MATH //
-#include "matrix.h"
 #include "vector.h"
-#include "curve.h"
 
 #include "list.h"

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -931 +931 @@
   
   if (count != detail)
-    cout << "calculation error, count should be " << detail << " but is " << count << endl;
+    PRINTF(1)("calculation error, count should be %d but is %d.\n", detail, count);
   vertices->debug();
 
@@ -943 +943 @@
       p3 = 2*i+4;
       p4 = 2*i+3;
-      cout <<i+1 <<": "<< p1 <<" "<< p2 <<" "<< p3 <<" "<< p4 <<endl;
+      // something is wrong here
       this->addFace(4, 0, p1, p2, p3, p4);
       this->addFace(3, 0, p4, p1, 2*detail+1);

orxonox/trunk/src/track_manager.cc

@@ -16 +16 @@
 
 #include "track_manager.h"
+
+#include "p_node.h"
+
 #include <stdarg.h>
-#include "p_node.h"
 
 using namespace std;

orxonox/trunk/src/track_manager.h

@@ -13 +13 @@
 
 #include "stdincl.h"
+#include "curve.h"
 
 class PNode;