Changeset 10174 in orxonox.OLD for branches/mount_points

Timestamp:

Jan 3, 2007, 5:25:07 PM (18 years ago)

Author:

patrick

Message:

upgraded vector class to support some more actions, bubble sort algorithm almost finished

Location:

branches/mount_points/src/lib

Files:

• graphics/importer/bsp/bsp_manager.cc (modified) (3 diffs)
• math/vector.h (modified) (2 diffs)

branches/mount_points/src/lib/graphics/importer/bsp/bsp_manager.cc

@@ -304 +304 @@
   // bubble sort
   bool hasSwapped = true;
+  Vector v1, v2;
+
   while( hasSwapped)
   {
@@ -313 +315 @@
       face& fac2 =  (this->bspFile->faces)[this->trasparent[i+1]];
 
-      if(1)
+      // get center of face 1
+      const BspVertex* curVertex = (BspVertex *) this->bspFile->vertice;
+
+      // assign the values of the vertices
+      v1(curVertex[fac1.vertex].position[0], curVertex[fac1.vertex].position[1], curVertex[fac1.vertex].position[2]);
+      v2(curVertex[fac2.vertex].position[0], curVertex[fac2.vertex].position[1], curVertex[fac2.vertex].position[2]);
+      // relativly to observer
+      v1 = this->cam - v1;
+      v2 = this->cam - v2;
+
+      // swap if necessary
+      if( v1 < v2)
       {
         // swap elements
@@ -324 +337 @@
     }
   }
-
-//   function bubble_sort(list L, number listsize)
-//       loop
-//        has_swapped := 0 //reset flag
-//        for number i from 1 to (listsize - 1)
-//          if L[i] > L[i + 1] //if they are in the wrong order
-//            swap(L[i], L[i + 1]) //exchange them
-//            has_swapped := 1 //we have swapped at least once, list may not be sorted yet
-//          endif
-//       endfor
-//         //if no swaps were made during this pass, the list has been sorted
-//         if has_swapped = 0
-//          exit
-//         endif
-//       endloop
-//   endfunction
 
 

branches/mount_points/src/lib/math/vector.h

@@ -47 +47 @@
   /** @param v: the Vecor to compare with this one @returns true, if the Vecors are different, false otherwise */
   inline bool operator!= (const Vector& v) const { return (this->x!=v.x||this->y!=v.y||this->z!=v.z)?true:false; };
+  inline bool operator> (const Vector& v)  { return (this->len() > v.len()); }
+  inline bool operator< (const Vector& v)  { return (this->len() < v.len()); }
+
   /** @param index The index of the "array" @returns the x/y/z coordinate */
   inline float operator[] (float index) const {if( index == 0) return this->x; if( index == 1) return this->y; if( index == 2) return this->z; }
@@ -82 +85 @@
   inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
   inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
+
+  /** this operator can be used to assign values to the vector */
+  inline void operator() (float x, float y, float z) { this->x = x; this->y = y; this->z = z;}
+
+
+
+
   /** @param v: the other vector \return the dot product of the vectors */
   float dot (const Vector& v) const { return x*v.x+y*v.y+z*v.z; };