- Timestamp:
- Aug 13, 2005, 11:57:23 AM (19 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/math/vector.h
r4992 r4994 115 115 { 116 116 public: 117 /** \briefcreates a Default quaternion (multiplicational identity Quaternion)*/117 /** creates a Default quaternion (multiplicational identity Quaternion)*/ 118 118 inline Quaternion () { w = 1; v = Vector(0,0,0); } 119 /** \briefcreates a Quaternion looking into the direction v @param v: the direction @param f: the value */119 /** creates a Quaternion looking into the direction v @param v: the direction @param f: the value */ 120 120 inline Quaternion (const Vector& v, float f) { this->w = f; this->v = v; } 121 121 Quaternion (float m[4][4]); 122 /** \briefturns a rotation along an axis into a Quaternion @param angle: the amount of radians to rotate @param axis: the axis to rotate around */122 /** turns a rotation along an axis into a Quaternion @param angle: the amount of radians to rotate @param axis: the axis to rotate around */ 123 123 inline Quaternion (float angle, const Vector& axis) { w = cos(angle/2); v = axis * sin(angle/2); } 124 124 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) */ 142 142 inline const Quaternion& operator-= (const Quaternion& q) { this->v -= q.v; this->w -= q.w; return *this; }; 143 /** \briefcopy constructor @param q: the Quaternion to set this to. @returns the Quaternion q (or this) */143 /** copy constructor @param q: the Quaternion to set this to. @returns the Quaternion q (or this) */ 144 144 inline Quaternion operator= (const Quaternion& q) {this->v = q.v; this->w = q.w; return *this;} 145 /** \briefconjugates this Quaternion @returns the conjugate */145 /** conjugates this Quaternion @returns the conjugate */ 146 146 inline Quaternion conjugate () const { Quaternion r(*this); r.v = Vector() - r.v; return r;} 147 147 Quaternion inverse () const; -
orxonox/trunk/src/world_entities/camera.cc
r4992 r4994 142 142 case VIEW_FRONT: 143 143 this->toFovy = 120.0; 144 //this->softReparent("Player");144 // this->softReparent("Player"); 145 145 this->target->softReparent("Player"); 146 146 this->setRelCoorSoft(4, 0, 0); … … 180 180 if (tmpFovy > .001) 181 181 this->fovy += (this->toFovy - this->fovy) * dt; 182 183 this->getParent()->debug(2);184 //this->debug(1);185 //this->target->debug(1);186 182 } 187 183 … … 195 191 void Camera::apply () 196 192 { 193 this->target->debugDraw(2); 197 194 // switching to Projection Matrix 198 195 glMatrixMode (GL_PROJECTION); -
orxonox/trunk/src/world_entities/player.cc
r4990 r4994 234 234 235 235 this->weaponMan->draw(); 236 237 //this->debug(0); 236 238 } 237 239
Note: See TracChangeset
for help on using the changeset viewer.