Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2012 in orxonox.OLD for orxonox/branches/chris/src


Ignore:
Timestamp:
Jun 22, 2004, 12:45:28 PM (20 years ago)
Author:
chris
Message:

orxonox/branches/chris: Improved doxygen compatibility again

Location:
orxonox/branches/chris/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/chris/src/collision.cc

    r1982 r2012  
    177177}
    178178
    179 /**
    180    \brief recursive implementation for collision detection within a CC_Tree
    181 */
    182179bool cctree_iterate(const Placement* pa, CC_Tree* ta, unsigned long* ahitflags, const Placement* pb, CC_Tree* tb, unsigned long* bhitflags)
    183180{
    … …  
    333330}
    334331
    335 /**
    336    \brief recursive implementation for traceing detection within a CC_Tree
    337 */
    338332bool cctree_trace( const Placement* p, CC_Tree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint)
    339333{

  • orxonox/branches/chris/src/collision.h

    r2010 r2012  
    2121} CC_Tree;
    2222
     23//! Basic collision detection class
    2324/**
    2425  This class implements a more or less efficient collision system based on nested hitzones.
    … …  
    3435  of a trace, the exact point of interception is returned as well.
    3536*/
    36 
    3737class CollisionCluster {
    3838 

  • orxonox/branches/chris/src/coordinates.h

    r1982 r2012  
    44#include "vector.h"
    55
    6 typedef struct Location // place of a thing on the track system
     6//! Coordinates relative to track
     7/**
     8  This identifies the position of an object on the track system
     9*/
     10typedef struct Location
    711{
    8   unsigned long part;   // ID of the track part the object is on
    9   float dist;           // distance already traveled on a track
    10   Vector pos;           // position relative to the distance already covered
    11   Rotation rot;         // direction the object is heading (relative to track direction)
     12  unsigned long part;   //!< ID of the track part the object is on
     13  float dist;           //!< The distance that has already been traveled on the track
     14  Vector pos;           //!< The position relative to the offset marked by the distance already covered
     15  Rotation rot;         //!< The direction the object is heading (relative to track direction)
    1216} Location;
    1317
    14 typedef struct Placement // place of a thing in the rendered coordinate system
     18//! Absolute coordinates
     19/**
     20  This is used to store the position of a object in the rendered coordinate system
     21*/
     22typedef struct Placement
    1523{
    16   Vector r;              // x/y/z coordinated
    17   Rotation w;            // orientation
     24  Vector r;              //!< Absolute x/y/z coordinates
     25  Rotation w;            //!< Absolute orientation
    1826} Placement;
    1927

  • orxonox/branches/chris/src/vector.h

    r2010 r2012  
    66#define PI 3.14159265359f
    77
     8//! 3D vector
    89/**
    910  Class for 3-dimensional vector calculation
    … …  
    1718  float x, y, z;
    1819
    19   Vector (float x, float y, float z) : x(x), y(y), z(z) {}
     20  Vector (float x, float y, float z) : x(x), y(y), z(z) {}  //!< assignment constructor
    2021  Vector () : x(0), y(0), z(0) {}
    2122  ~Vector () {}
    … …  
    3536float angle_rad (const Vector& v1, const Vector& v2);
    3637
     38//! 3D rotation
    3739/**
    3840  Class to handle 3-dimensional rotations
    … …  
    4345  public:
    4446 
    45   float m[9];
     47  float m[9]; //< 3x3 Rotation Matrix
    4648 
    4749  Rotation ( const Vector& v);
    … …  
    5557Vector rotate_vector( const Vector& v, const Rotation& r);
    5658
     59//! 3D line
    5760/**
    5861  Class to store Lines in 3-dimensional space
    … …  
    6467  public:
    6568 
    66   Vector r, a;
     69  Vector r;   //!< Offset
     70  Vector a;   //!< Direction
    6771 
    68   Line ( Vector r, Vector a) : r(r), a(a) {}
     72  Line ( Vector r, Vector a) : r(r), a(a) {}  //!< assignment constructor
    6973  Line () : r(Vector(0,0,0)), a(Vector (1,1,1)) {}
    7074  ~Line () {}
    … …  
    7882};
    7983
     84//! 3D plane
    8085/**
    8186  Class to handle planes in 3-dimensional space
    82 
     87 
    8388  Critical for polygon-based collision detection
    8489*/
    … …  
    8792  public:
    8893 
    89   Vector n;
    90   float k;
     94  Vector n;   //!< Normal vector
     95  float k;    //!< Offset constant
    9196 
    9297  Plane (Vector a, Vector b, Vector c);
    9398  Plane (Vector norm, Vector p);
    94   Plane (Vector n, float k) : n(n), k(k) {}
     99  Plane (Vector n, float k) : n(n), k(k) {} //!< assignment constructor
    95100  Plane () : n(Vector(1,1,1)), k(0) {}
    96101  ~Plane () {}
Note: See TracChangeset for help on using the changeset viewer.