Changeset 5693 in orxonox.OLD for trunk/src/lib

Timestamp:

Nov 22, 2005, 12:53:48 AM (19 years ago)

Author:

patrick

Message:

orxonox: work flush

Location:

trunk/src/lib

Files:

• Makefile.in (modified) (1 diff)
• collision_detection/Makefile.in (modified) (1 diff)
• collision_detection/bv_tree.cc (modified) (1 diff)
• collision_detection/obb_tree_node.cc (modified) (3 diffs)
• collision_detection/obb_tree_node.h (modified) (2 diffs)

trunk/src/lib/Makefile.in

@@ -280 +280 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/Makefile
+          $(AUTOMAKE) --foreign  src/lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

trunk/src/lib/collision_detection/Makefile.in

@@ -219 +219 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile
+          $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

trunk/src/lib/collision_detection/bv_tree.cc

@@ -21 +21 @@
 
 
+
 /**
  *  standard constructor

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -51 +51 @@
   this->bvElement = NULL;
 
-  if(OBBTreeNode::coMat == NULL)
+  if( OBBTreeNode::coMat == NULL)
   {
     OBBTreeNode::coMat = new float*[4];
@@ -57 +57 @@
       OBBTreeNode::coMat[i] = new float[4];
   }
-  if(OBBTreeNode::eigvMat == NULL)
+  if( OBBTreeNode::eigvMat == NULL)
   {
     OBBTreeNode::eigvMat = new float*[4];
-    for(int i = 0; i < 4; i++)
+    for( int i = 0; i < 4; i++)
       OBBTreeNode::eigvMat[i] = new float[4];
   }
@@ -70 +70 @@
     OBBTreeNode::rotCount = new int;
 
-  if (OBBTreeNode_sphereObj == NULL)
+  if( OBBTreeNode_sphereObj == NULL)
     OBBTreeNode_sphereObj = gluNewQuadric();
 }

trunk/src/lib/collision_detection/obb_tree_node.h

@@ -45 +45 @@
     void calculateBoxEigenvectors(OBB* box, const sVec3D* verticesList, unsigned int length);
     void calculateBoxAxis(OBB* box, const sVec3D* verticesList, unsigned int length);
-    
+
     void calculateBoxCovariance(OBB* box, const modelInfo& modInfo);
     void calculateBoxEigenvectors(OBB* box, const modelInfo& modInfo);
     void calculateBoxAxis(OBB* box, const modelInfo& modInfo);
 
-    
+
     void forkBox(OBB* box);
 
@@ -67 +67 @@
     static OBBTree*     obbTree;                    //!< reference to the obb tree
     Plane*              separationPlane;            //!< the separation plane of the obb
-    const sVec3D*       sepPlaneCenter;             //!< only needed to draw plane @todo: separationPlane drawing
+    const sVec3D*       sepPlaneCenter;             //!< only needed to draw plane
     int                 longestAxisIndex;           //!< only needed to draw plane