Changeset 4560 in orxonox.OLD

Timestamp:

Jun 9, 2005, 12:21:08 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: compiles again, some smaller changes in the cd engine

Location:

orxonox/trunk

Files:

• orxonox.kdevelop (modified) (5 diffs)
• src/lib/collision_detection/bounding_volume.cc (modified) (1 diff)
• src/lib/collision_detection/bounding_volume.h (modified) (2 diffs)
• src/lib/collision_detection/obb.h (modified) (1 diff)
• src/lib/collision_detection/obb_tree_node.cc (modified) (7 diffs)
• src/lib/collision_detection/obb_tree_node.h (modified) (2 diffs)

orxonox/trunk/orxonox.kdevelop

@@ -10 +10 @@
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
+    <description/>
     <secondaryLanguages/>
   </general>
@@ -22 +22 @@
       <directoryradio>executable</directoryradio>
       <customdirectory>/</customdirectory>
-      <programargs></programargs>
+      <programargs/>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
@@ -63 +63 @@
     <general>
       <dbgshell>libtool</dbgshell>
-      <programargs></programargs>
-      <gdbpath></gdbpath>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <programargs/>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
@@ -148 +148 @@
   </kdevcppsupport>
   <kdevfileview>
-    <groups/>
+    <groups>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidenonlocation>false</hidenonlocation>
+    </groups>
     <tree>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
@@ -162 +165 @@
   <kdevdocumentation>
     <projectdoc>
-      <docsystem></docsystem>
-      <docurl></docurl>
-      <usermanualurl></usermanualurl>
+      <docsystem/>
+      <docurl/>
+      <usermanualurl/>
     </projectdoc>
   </kdevdocumentation>

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

@@ -17 +17 @@
 
 #include "bounding_volume.h"
+#include "vector.h"
 
 using namespace std;

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

@@ -24 +24 @@
   inline const Vector* getCenter() const { return this->center; }
 
-  virtual tList<sVect3D>* getVertices() const = NULL;
+  virtual sVect3D* getVertices() const = NULL;
   virtual void mergeWith(const BoundingVolume &bv) = NULL;
 
@@ -32 +32 @@
 
 
- protected:
+ public:
   Vector*             center;                     //!< Center point of box
 

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

@@ -22 +22 @@
 
   inline const Vector* getAxis () const { return this->axis; }
-  inline const sVect3D* getHalfLength() const { return this->halfLength; } 
+  inline const float* getHalfLength() const { return this->halfLength; } 
 
-  virtual tList<sVect3D>* getVertices() const { return this->verticesBuffer; }
+  virtual sVect3D* getVertices() const { return this->vertices; }
   virtual void mergeWith(const BoundingVolume &bv);
 

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

@@ -56 +56 @@
 {
   this->bvElement = this->createBox();
-  this->calculateBoxAttributes(box);
-  this->forkBox(box);
+  this->calculateBoxAttributes(this->bvElement, verticesList, length);
+  this->forkBox(this->bvElement);
 }
 
@@ -67 +67 @@
 
 
-void OBBTreeNode::calculateBoxAttributes(OBB* box)
+void OBBTreeNode::calculateBoxAttributes(OBB* box, sVec3D* verticesList, int length)
 {
   float     facelet[length];                         //!< surface area of the i'th triangle of the convex hull
@@ -75 +75 @@
   Vector    p, q, r;                                 //!< holder of the polygon data, much more conveniant to work with Vector than sVec3d
   Vector    t1, t2;                                  //!< temporary values
-  float     covariance[3][3];                        //!< the covariance matrix
+  float**   covariance;                               //!< the covariance matrix
     
   this->numOfVertices = length;
@@ -130 +130 @@
       printf(" |\n");
     }
-  printf("center: %f, %f, %f\n\n", centre.x, centre.y, centre.z);
+  printf("center: %f, %f, %f\n\n", center.x, center.y, center.z);
 
   for(int i = 0; i < length; i++)
@@ -137 +137 @@
     }
 
-
+   
+  for(int i = 0; i < 3; ++i)
+    {
     
-  box->covarianceMatrix = covariance;
-  box->center = center;
+      box->covarianceMatrix[i][0] = covariance[i][0];
+      box->covarianceMatrix[i][1] = covariance[i][1];
+      box->covarianceMatrix[i][3] = covariance[i][2];
+    }
+  *box->center = center;
 
 
@@ -161 +166 @@
   for(int i = 0; i < 3; ++i)
     {
-      if( aLength < box->axis[i])
+      if( aLength < box->axis[i].len())
         {
-          aLength = box->axis[i];
+          aLength = box->axis[i].len();
           axisNr = i;
         }
@@ -194 +199 @@
   this->bvElement->axis;
   
-  glBegin(GL_TRIANGLE);
-  glVertex3f(this->bvElement->center );
-  glEnd();
+  //glBegin(GL_TRIANGLE);
+  //glVertex3f(this->bvElement->center );
+  //glEnd();
 }
 

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

@@ -27 +27 @@
   virtual void spawnBVTree(const int depth, sVec3D *verticesList, const int length);
 
-  BoundingVolume* getBV(int index) const { return this->bvElement; }
+  BoundingVolume* getBV(int index) const { return (BoundingVolume*)this->bvElement; }
   inline const int getIndex() { return this->treeIndex; }  
 
@@ -38 +38 @@
  private:
   OBB* createBox();
-  void calculateBoxAttributes(OBB* box);
+  void calculateBoxAttributes(OBB* box, sVec3D* verticesList, int length);
   void forkBox(OBB* box);
   
 
-
  protected:
-  BoundingVolume* bvElement;
+  OBB* bvElement;
   OBBTreeNode* nodeLeft;
   OBBTreeNode* nodeRight;