Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/lib/math/vector.h

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/lib/math/vector.h (modified) (2 diffs)

orxonox/branches/levelloader/src/lib/math/vector.h

@@ -41 +41 @@
   Vector* getNormalized();
   Vector abs();
+
+  void debug();
 };
 
@@ -53 +55 @@
 {
  public:
-        Vector v;       //!< Imaginary Vector
-        float w;        //!< Real part of the number
-
-        Quaternion ();
-        Quaternion (float m[4][4]);
-        Quaternion (float angle, const Vector& axis);
-        Quaternion (const Vector& dir, const Vector& up);
-        Quaternion (float roll, float pitch, float yaw);
-        
-        Quaternion operator/ (const float& f) const;
-        Quaternion operator* (const float& f) const;
-        Quaternion operator* (const Quaternion& q) const;
-        Quaternion operator+ (const Quaternion& q) const;
-        Quaternion operator- (const Quaternion& q) const;
-        Quaternion conjugate () const;
-        Quaternion inverse () const;
-        Vector apply (Vector& f) const;
-        float norm () const;
-        void matrix (float m[4][4]) const;
-        void quatSlerp(const Quaternion* from, const Quaternion* to, const float t, Quaternion* res);
-
+  Vector v;     //!< Imaginary Vector
+  float w;        //!< Real part of the number
+  
+  Quaternion ();
+  Quaternion (float m[4][4]);
+  Quaternion (float angle, const Vector& axis);
+  Quaternion (const Vector& dir, const Vector& up);
+  Quaternion (float roll, float pitch, float yaw);
+  
+  Quaternion operator/ (const float& f) const;
+  Quaternion operator* (const float& f) const;
+  Quaternion operator* (const Quaternion& q) const;
+  Quaternion operator+ (const Quaternion& q) const;
+  Quaternion operator- (const Quaternion& q) const;
+  Quaternion conjugate () const;
+  Quaternion inverse () const;
+  Vector apply (Vector& f) const;
+  float norm () const;
+  void matrix (float m[4][4]) const;
+  void quatSlerp(const Quaternion* from, const Quaternion* to, const float t, Quaternion* res);
+  
+  void debug();
  private:
-        float DELTA;      //!< resolution of calculation
+  float DELTA;      //!< resolution of calculation
 
 };