X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fsplines%2Fmath_quaternion.h;h=e8341c04c1924cb299361b269ab44e7de4acc798;hb=3c2e55a0b39649b041dc19f9047a965a6191eca4;hp=b33f4425d28c2b6b660df07058c1ff1d56cd480b;hpb=f3d0806dfea23aef768535ee2fc8e1fff9aebe9f;p=xonotic%2Fnetradiant.git diff --git a/libs/splines/math_quaternion.h b/libs/splines/math_quaternion.h index b33f4425..e8341c04 100644 --- a/libs/splines/math_quaternion.h +++ b/libs/splines/math_quaternion.h @@ -31,44 +31,45 @@ class mat3_t; class quat_t { public: -float x; -float y; -float z; -float w; + float x; + float y; + float z; + float w; -quat_t(); -quat_t( float x, float y, float z, float w ); + quat_t(); + quat_t( float x, float y, float z, float w ); + quat_t( const quat_t & ) = default; -friend void toQuat( idVec3_t &src, quat_t &dst ); -friend void toQuat( angles_t &src, quat_t &dst ); -friend void toQuat( mat3_t &src, quat_t &dst ); + friend void toQuat( idVec3_t &src, quat_t &dst ); + friend void toQuat( angles_t &src, quat_t &dst ); + friend void toQuat( mat3_t &src, quat_t &dst ); -float *vec4( void ); + float *vec4( void ); -float operator[]( int index ) const; -float &operator[]( int index ); + float operator[]( int index ) const; + float &operator[]( int index ); -void set( float x, float y, float z, float w ); + void set( float x, float y, float z, float w ); -void operator=( quat_t a ); + quat_t &operator=( const quat_t &a ) = default; -friend quat_t operator+( quat_t a, quat_t b ); -quat_t &operator+=( quat_t a ); + friend quat_t operator+( quat_t a, quat_t b ); + quat_t &operator+=( quat_t a ); -friend quat_t operator-( quat_t a, quat_t b ); -quat_t &operator-=( quat_t a ); + friend quat_t operator-( quat_t a, quat_t b ); + quat_t &operator-=( quat_t a ); -friend quat_t operator*( quat_t a, float b ); -friend quat_t operator*( float a, quat_t b ); -quat_t &operator*=( float a ); + friend quat_t operator*( quat_t a, float b ); + friend quat_t operator*( float a, quat_t b ); + quat_t &operator*=( float a ); -friend int operator==( quat_t a, quat_t b ); -friend int operator!=( quat_t a, quat_t b ); + friend int operator==( quat_t a, quat_t b ); + friend int operator!=( quat_t a, quat_t b ); -float Length( void ); -quat_t &Normalize( void ); + float Length( void ); + quat_t &Normalize( void ); -quat_t operator-(); + quat_t operator-(); }; inline quat_t::quat_t() { @@ -102,13 +103,6 @@ inline void quat_t::set( float x, float y, float z, float w ) { this->w = w; } -inline void quat_t::operator=( quat_t a ) { - x = a.x; - y = a.y; - z = a.z; - w = a.w; -} - inline quat_t operator+( quat_t a, quat_t b ) { return quat_t( a.x + b.x, a.y + b.y, a.z + b.z, a.w + b.w ); }