Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4957 in orxonox.OLD for orxonox/trunk/src/lib


Ignore:
Timestamp:
Jul 25, 2005, 9:06:44 PM (19 years ago)
Author:
patrick
Message:

orxnox/trunk: resolved a conflict, functions now defined well

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

    r4956 r4957  
    400400      b = *(sVec3D*)&this->pVertices[this->pTriangles[i]->indexToVertices[1]];
    401401      c = *(sVec3D*)&this->pVertices[this->pTriangles[i]->indexToVertices[2]];
    402      
     402
    403403      if( unlikely(this->pointInTriangle(position, a, b, c)))
    404         {
    405           tri = this->pTriangles[i];
    406           break;
    407         }
     404        {
     405          tri = this->pTriangles[i];
     406          break;
     407        }
    408408    }
    409  
     409
    410410  /* calculate height out of the data collected above */
    411  
     411
    412412}
    413413
     
    419419
    420420 There is some random behaviour if there are more than one triangle at the same y
    421  coordinate. At the moment the function just takes the first triangle, that included the 
     421 coordinate. At the moment the function just takes the first triangle, that included the
    422422 vector
    423423*/
     
    433433
    434434      if( unlikely(this->pointInTriangle(position, a, b, c)))
    435         return this->pTriangles[i];
     435        return this->pTriangles[i];
    436436    }
    437437  return NULL;
     
    456456
    457457/**
    458  *  checks if two points are on the same side 
     458 *  checks if two points are on the same side
    459459 * @param point one to be checked
    460460 * @param point two to be checked
Note: See TracChangeset for help on using the changeset viewer.