Changeset 4568 in orxonox.OLD

Timestamp:

Jun 9, 2005, 6:01:18 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: moved the newmat source to lib

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.h (modified) (1 diff)
• lib/newmat (moved) (moved from orxonox/trunk/src/util/newmat)
• lib/newmat/Makefile.am (copied) (copied from orxonox/trunk/src/util/newmat/Makefile.am)
• lib/newmat/eigen.cpp (copied) (copied from orxonox/trunk/src/util/newmat/eigen.cpp)

orxonox/trunk/src/Makefile.am

@@ -15 +15 @@
                        lib/particles/libORXparticles.a \
                        lib/collision_detection/libORXcd.a \
-                       lib/tinyxml/libtinyxml.a
+                       lib/tinyxml/libtinyxml.a \
+                       util/newmat/libnewmat.a
 
 orxonox_LDADD = lib/gui/libORXgui.a \
@@ -25 +26 @@
                 lib/collision_detection/libORXcd.a \
                 lib/tinyxml/libtinyxml.a \
+                util/newmat/libnewmat.a \
+                
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -135 +135 @@
   printf("center: %f, %f, %f\n\n", center.x, center.y, center.z);
 
-  for(int i = 0; i < length; i++)
-    {
-      printf("vertex %i: %f, %f, %f\n", i, verticesList[i][0], verticesList[i][1], verticesList[i][2]);
-    }
-
    
   for(int i = 0; i < 3; ++i)
@@ -210 +205 @@
 void OBBTreeNode::drawBVBlended(int currentDepth, const int depth) const
 {}
+
+
+void OBBTreeNode::debug()
+{
+
+  /*
+  for(int i = 0; i < length; i++)
+    {
+      printf("vertex %i: %f, %f, %f\n", i, verticesList[i][0], verticesList[i][1], verticesList[i][2]);
+    }
+  */
+}

orxonox/trunk/src/lib/collision_detection/obb_tree_node.h

@@ -36 +36 @@
   virtual void drawBVBlended(int currentDepth, const int depth) const;
 
+  void debug();
+
  private:
   OBB* createBox();