Changeset 4559 in orxonox.OLD

Timestamp:

Jun 9, 2005, 12:20:58 AM (19 years ago)

Author:

bensch

Message:

orxonox/tags: added new tag, version 0.3.0-pre-alpha

Location:

orxonox/tags/0.3.0-pre-alpha

Files:

• . (copied) (copied from orxonox/trunk)
• orxonox.kdevelop (deleted)
• src/lib/collision_detection/bounding_volume.cc (modified) (2 diffs)
• src/lib/collision_detection/bounding_volume.h (modified) (1 diff)
• src/lib/collision_detection/obb.cc (modified) (3 diffs)
• src/lib/collision_detection/obb.h (modified) (1 diff)
• src/lib/collision_detection/obb_tree_node.cc (modified) (5 diffs)
• src/lib/collision_detection/obb_tree_node.h (modified) (2 diffs)
• src/story_entities/world.cc (modified) (1 diff)

orxonox/tags/0.3.0-pre-alpha/src/lib/collision_detection/bounding_volume.cc

@@ -27 +27 @@
 {
    this->setClassID(CL_BOUNDING_VOLUME, "BoundingVolume"); 
-   this->center = new Vector();
 
 }
@@ -39 +38 @@
 {
   // delete what has to be deleted here
-  delete this->center;
 }

orxonox/tags/0.3.0-pre-alpha/src/lib/collision_detection/bounding_volume.h

@@ -35 +35 @@
   Vector*             center;                     //!< Center point of box
 
-  sVect3D*            vertices;                   //!< if CD_STORE_VERTICES enabled, this is the place, where the vert. will be sotred
-  int                 numOfVertices;              //!< number of vertices in the vertices buffer
+  tList<sVect3D>*     verticesBuffer;             //!< if CD_STORE_VERTICES enabled, this is the place, where the vert. will be sotred
 };
 

orxonox/tags/0.3.0-pre-alpha/src/lib/collision_detection/obb.cc

@@ -18 +18 @@
 #include "obb.h"
 #include "list.h"
-#include "vector.h"
 
 using namespace std;
@@ -29 +28 @@
 {
    this->setClassID(CL_OBB, "OBB"); 
-   this->axis = new Vector[3];
-   this->halfLength = new float[3];
 }
 
@@ -41 +38 @@
 {
   // delete what has to be deleted here
-  delete [] this->axis;
-  delete [] this->halfLength;
 }
 

orxonox/tags/0.3.0-pre-alpha/src/lib/collision_detection/obb.h

@@ -32 +32 @@
 
 
- public:
+ private:
   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
+  sVect3D*         halfLength;                 //!< Half lengths of the box
 
+  OBB*             leftNode;                   //!< left node of the tree
+  OBB*             rightNode;                  //!< right node of the tree
 };
 

orxonox/tags/0.3.0-pre-alpha/src/lib/collision_detection/obb_tree_node.cc

@@ -55 +55 @@
 void OBBTreeNode::spawnBVTree(const int depth, sVec3D *verticesList, const int length)
 {
-  this->bvElement = this->createBox();
-  this->calculateBoxAttributes(box);
-  this->forkBox(box);
-}
-
-
-OBB* OBBTreeNode::createBox()
-{
-  return new OBB();
-}
-
-
-void OBBTreeNode::calculateBoxAttributes(OBB* box)
-{
   float     facelet[length];                         //!< surface area of the i'th triangle of the convex hull
   float     face;                                    //!< surface area of the entire convex hull
   Vector    centroid[length];                        //!< centroid of the i'th convex hull  
-  Vector    center;                                  //!< the center of the entire hull
+  Vector    centre;                                  //!< the centre of the entire hull
+  OBB*      obb = new OBB();                         //!< the new obb to add
   Vector    p, q, r;                                 //!< holder of the polygon data, much more conveniant to work with Vector than sVec3d
   Vector    t1, t2;                                  //!< temporary values
@@ -98 +85 @@
       centroid[i] = (p + q + r) * 1/3;
       /* now calculate the centroid of the entire convex hull, weighted average of triangle centroids */
-      center += centroid[i] * facelet[i];
+      centre += centroid[i] * facelet[i];
     }
   /* take the average of the centroid sum */
-  center /= face;
+  centre /= face;
   
   /* now calculate the covariance matrix - if not written in three for-loops, it would compute faster: minor */
@@ -115 +102 @@
 
               covariance[j][k] = facelet[i] / (12.0f * face) * (9.0f * centroid[i][j] * centroid[i][k] + p[j]* p[k] +
-                                                                q[j] * q[k] + r[j]*r[k]) - center[j] * center[k];
+                                                                q[j] * q[k] + r[j]*r[k]) - centre[j] * centre[k];
             }
         }
     }
-  
+
   printf("Covariance Matrix:\n");
   for(int j = 0; j < 3; ++j)
@@ -136 +123 @@
       printf("vertex %i: %f, %f, %f\n", i, verticesList[i][0], verticesList[i][1], verticesList[i][2]);
     }
-
-
-    
-  box->covarianceMatrix = covariance;
-  box->center = center;
-
-
-  /* now getting spanning vectors of the sub-space:
-     the eigenvectors of a symmertric matrix, such as the
-     covarience matrix are mutually orthogonal.
-     after normalizing them, they can be used as a the basis 
-     vectors
-  */
-  
-
-}
-
-
-void OBBTreeNode::forkBox(OBB* box)
-{
-  /* get the longest axis of the box */
-  float aLength = -1.0f;
-  int axisNr = 0;
-  for(int i = 0; i < 3; ++i)
-    {
-      if( aLength < box->axis[i])
-        {
-          aLength = box->axis[i];
-          axisNr = i;
-        }
-    }
-  
-  /* get the closest vertex near the center */
   
 }
@@ -191 +145 @@
 
 void OBBTreeNode::drawBVPolygon(int currentDepth, const int depth) const
-{
-  this->bvElement->axis;
-  
-  glBegin(GL_TRIANGLE);
-  glVertex3f(this->bvElement->center );
-  glEnd();
-}
+{}
 
 

orxonox/tags/0.3.0-pre-alpha/src/lib/collision_detection/obb_tree_node.h

@@ -14 +14 @@
 // FORWARD DEFINITION
 class BoundingVolume;
-class OBB;
 //struct sVec3D;
 
@@ -36 +35 @@
   virtual void drawBVBlended(int currentDepth, const int depth) const;
 
- private:
-  OBB* createBox();
-  void calculateBoxAttributes(OBB* box);
-  void forkBox(OBB* box);
-  
-
 
  protected:

orxonox/tags/0.3.0-pre-alpha/src/story_entities/world.cc

@@ -506 +506 @@
   new PhysicsConnection(system, gravity);
   //    new PhysicsConnection(this->localPlayer, gravity);
-
 
   TestEntity* testEntity = new TestEntity();