Changeset 4994 in orxonox.OLD

Timestamp:

Aug 13, 2005, 11:57:23 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: doxytag and stuff

Location:

orxonox/trunk/src

Files:

• lib/math/vector.h (modified) (2 diffs)
• world_entities/camera.cc (modified) (3 diffs)
• world_entities/player.cc (modified) (1 diff)

orxonox/trunk/src/lib/math/vector.h

@@ -115 +115 @@
 {
  public:
-  /** \brief creates a Default quaternion (multiplicational identity Quaternion)*/
+  /** creates a Default quaternion (multiplicational identity Quaternion)*/
   inline Quaternion () { w = 1; v = Vector(0,0,0); }
-  /** \brief creates a Quaternion looking into the direction v @param v: the direction @param f: the value */
+  /** creates a Quaternion looking into the direction v @param v: the direction @param f: the value */
   inline Quaternion (const Vector& v, float f) { this->w = f; this->v = v; }
   Quaternion (float m[4][4]);
-  /** \brief turns a rotation along an axis into a Quaternion @param angle: the amount of radians to rotate @param axis: the axis to rotate around */
+  /** turns a rotation along an axis into a Quaternion @param angle: the amount of radians to rotate @param axis: the axis to rotate around */
   inline Quaternion (float angle, const Vector& axis) { w = cos(angle/2); v = axis * sin(angle/2); }
   Quaternion (const Vector& dir, const Vector& up);
@@ -141 +141 @@
   /** @param q the Quaternion to substrace from this @returns the quaternion substracted by q (this -= q) */
   inline const Quaternion& operator-= (const Quaternion& q) { this->v -= q.v; this->w -= q.w; return *this; };
-  /** \brief copy constructor @param q: the Quaternion to set this to. @returns the Quaternion q (or this) */
+  /** copy constructor @param q: the Quaternion to set this to. @returns the Quaternion q (or this) */
   inline Quaternion operator= (const Quaternion& q) {this->v = q.v; this->w = q.w; return *this;}
-  /** \brief conjugates this Quaternion @returns the conjugate */
+  /** conjugates this Quaternion @returns the conjugate */
   inline Quaternion conjugate () const {  Quaternion r(*this);  r.v = Vector() - r.v;  return r;}
   Quaternion inverse () const;

orxonox/trunk/src/world_entities/camera.cc

@@ -142 +142 @@
     case VIEW_FRONT:
       this->toFovy = 120.0;
-      //this->softReparent("Player");
+     // this->softReparent("Player");
       this->target->softReparent("Player");
       this->setRelCoorSoft(4, 0, 0);
@@ -180 +180 @@
   if (tmpFovy > .001)
     this->fovy += (this->toFovy - this->fovy) * dt;
-
-  this->getParent()->debug(2);
-  //this->debug(1);
-  //this->target->debug(1);
 }
 
@@ -195 +191 @@
 void Camera::apply ()
 {
+  this->target->debugDraw(2);
   // switching to Projection Matrix
   glMatrixMode (GL_PROJECTION);

orxonox/trunk/src/world_entities/player.cc

@@ -234 +234 @@
 
   this->weaponMan->draw();
+
+  //this->debug(0);
 }