Changeset 10176 in orxonox.OLD for branches/mount_points

Timestamp:

Jan 3, 2007, 6:10:19 PM (18 years ago)

Author:

patrick

Message:

transparency is handled correclty in bsp

Location:

branches/mount_points/src/lib

Files:

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

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

@@ -309 +309 @@
   {
     hasSwapped = false;
+
     for( int i = 0; i < size - 1; i++)
     {
@@ -326 +327 @@
 
       // swap if necessary
-      if( v1 < v2)
+      if( v1 > v2)
       {
         // swap elements
         int tmp = this->trasparent[i+1];
         this->trasparent[i+1] = this->trasparent[i];
-        this->trasparent[i+1] = tmp;
+        this->trasparent[i] = tmp;
 
         hasSwapped = true;

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()); }
+  inline bool operator> (const Vector& v) const  { return (this->len() > v.len()); }
+  inline bool operator< (const Vector& v) const  { return (this->len() < v.len()); }
 
   /** @param index The index of the "array" @returns the x/y/z coordinate */