Changeset 4576 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 10, 2005, 2:18:01 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: calculating box dimensions

Location:

orxonox/trunk/src/lib/collision_detection

Files:

• obb.cc (modified) (3 diffs)
• obb.h (modified) (3 diffs)
• obb_tree_node.cc (modified) (3 diffs)

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

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -26 +26 @@
    \brief standard constructor
 */
-OBB::OBB () 
+OBB::OBB ()
 {
-   this->setClassID(CL_OBB, "OBB"); 
-   this->axis = new Vector[3];
+   this->setClassID(CL_OBB, "OBB");
+   this->axis = new Vector*[3];
    this->halfLength = new float[3];
 }
@@ -38 +38 @@
 
 */
-OBB::~OBB () 
+OBB::~OBB ()
 {
   // delete what has to be deleted here

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

@@ -1 @@
-/*! 
+/*!
     \file obb.h
     \brief Definition of an OBB (object Oriented Bounding Box)
@@ -21 +21 @@
 
 
-  inline const Vector* getAxis () const { return this->axis; }
-  inline const float* getHalfLength() const { return this->halfLength; } 
+  inline Vector** getAxis () const { return this->axis; }
+  inline const float* getHalfLength() const { return this->halfLength; }
 
   virtual sVect3D* getVertices() const { return this->vertices; }
@@ -33 +33 @@
 
  public:
-  Vector*          axis;                       //!< Axes of oriented box [x,y,z]
+  Vector**         axis;                       //!< Axes of oriented box [x,y,z]
   float*           halfLength;                 //!< Half lengths of the box along the axis
   float            covarianceMatrix[3][3];     //!< the covariance matrix

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

@@ -166 +166 @@
      vectors
   */
-
   Matrix                V(3,3);                               //!< for eigenvectors
   DiagonalMatrix        D(3);                                 //!< for eigenvalues    
   SymmetricMatrix       C(3);                                 //!< for the covariance symmetrical matrix
-  Vector**              axis;                                 //!< the references to the obb axis
+  Vector**              axis = new Vector*[3];                //!< the references to the obb axis
   
   C(1,1) = covariance[0][0];
@@ -196 +195 @@
   }
 
-   //axis1 = 
-
+  axis[0] = new Vector(V(1, 1), V(2, 1), V(3, 1));
+  axis[1] = new Vector(V(1, 2), V(2, 2), V(3, 2));
+  axis[2] = new Vector(V(1, 3), V(2, 3), V(3, 3));
+  box->axis = axis;
+  
+  printf("eigenvector: %f, %f, %f\n", V(1, 1), V(2, 1), V(3, 1));
+  printf("eigenvector: %f, %f, %f\n", V(1, 2), V(2, 2), V(3, 2));
+  printf("eigenvector: %f, %f, %f\n", V(1, 3), V(2, 3), V(3, 3));
+
+
+  /* now get the axis length */
+  Line                ax1(*box->center, *box->axis[0]);      //!< the the axis representation
+  Line                ax2(*box->center, *box->axis[1]);      //!< the the axis representation
+  Line                ax3(*box->center, *box->axis[2]);      //!< the the axis representation
+  
+
+  
 }
 
@@ -208 +222 @@
   for(int i = 0; i < 3; ++i)
     {
-      if( aLength < box->axis[i].len())
+      if( aLength < box->axis[i]->len())
         {
-          aLength = box->axis[i].len();
+          aLength = box->axis[i]->len();
           axisNr = i;
         }