Changeset 7545 in orxonox.OLD

Timestamp:

May 6, 2006, 1:36:22 AM (18 years ago)

Author:

patrick

Message:

cd: work on the obb creation algorithm

Location:

branches/cd/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• subprojects/framework.cc (modified) (1 diff)

branches/cd/src/lib/collision_detection/obb_tree_node.cc

@@ -174 +174 @@
     t1 = p - q;
     t2 = p - r;
-    facelet[i] = 0.5f * fabs( t1.cross(t2).len() );
+    facelet[i] = 0.5f * /*fabs*/( t1.cross(t2).len() );
     /* update the entire convex hull surface */
     face += facelet[i];
@@ -222 +222 @@
   bool                       vertexFound;                               //!< vertex found flag
   Vector                     arithCenter;                               //!< aritmetical center
-
-  /* calculate the arithmetical center of the box */
-
-  /* go thourgh all vertices, add only the used vertices indexes */
-//   for( int i = 0; i < length; ++i)
-//   {
-//     for(int j = 0; j < 3; ++j)
-//     {
-//       vertIndex = modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j];
-//
-//       vertexFound = false;
-//       for( int i = 0; i < vertIndexVector.size(); i++)
-//       {
-//         if( vertIndexVector[i] == vertIndex)
-//           vertexFound = true;
-//       }
-//       if( !vertexFound)
-//         vertIndexVector.push_back(vertIndex);
-//     }
-//   }
-//   /* now realy calculate the center */
-//   for( int i = 0; i < vertIndexVector.size(); ++i)
-//   {
-//     tmpVec = (sVec3D*)(&modelInf.pVertices[vertIndexVector[i]]);
-//     arithCenter += *tmpVec;
-//   }
-//   box.arithCenter = arithCenter / vertIndexVector.size();
-
 
 

branches/cd/src/subprojects/framework.cc

@@ -35 +35 @@
 
   std::string dataPath = //Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, "");
-    "/home/grauerb/svn/orxonox/data";
+      "/home/boenzlip/orxonox/data";
   printf("%s\n", dataPath.c_str());
   if (!dataPath.empty())