X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=libs%2Fsplines%2Fmath_quaternion.h;h=e8341c04c1924cb299361b269ab44e7de4acc798;hb=a47384c81aa3f7149e3fbe8d0034782417793fe8;hp=b74459534dbb6889867a4b27d56c1aa93146a7e4;hpb=231225d6f97d0b926b2e896e5783cccfbc7c5619;p=xonotic%2Fnetradiant.git

diff --git a/libs/splines/math_quaternion.h b/libs/splines/math_quaternion.h
index b7445953..e8341c04 100644
--- a/libs/splines/math_quaternion.h
+++ b/libs/splines/math_quaternion.h
@@ -1,23 +1,23 @@
 /*
-Copyright (C) 1999-2006 Id Software, Inc. and contributors.
-For a list of contributors, see the accompanying CONTRIBUTORS file.
+   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+   For a list of contributors, see the accompanying CONTRIBUTORS file.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #ifndef __MATH_QUATERNION_H__
 #define __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			operator[]( int index ) const;
-	float			&operator[]( int index );
+	float *vec4( void );
 
-	void 			set( float x, float y, float z, float w );
+	float  operator[]( int index ) const;
+	float &operator[]( int index );
 
-	void			operator=( quat_t a );
+	void set( float x, float y, float z, float w );
 
-	friend quat_t	operator+( quat_t a, quat_t b );
-	quat_t			&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, float b );
-	friend quat_t	operator*( float a, quat_t b );
-	quat_t			&operator*=( float a );
+	friend quat_t operator-( quat_t a, quat_t b );
+	quat_t &operator-=( quat_t a );
 
-	friend int		operator==(	quat_t a, quat_t b );
-	friend int		operator!=(	quat_t a, quat_t b );
+	friend quat_t operator*( quat_t a, float b );
+	friend quat_t operator*( float a, quat_t b );
+	quat_t &operator*=( float a );
 
-	float			Length( void );
-	quat_t			&Normalize( void );
+	friend int operator==( quat_t a, quat_t b );
+	friend int operator!=( quat_t a, quat_t b );
 
-	quat_t			operator-();
+	float Length( void );
+	quat_t &Normalize( void );
+
+	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 );
 }
@@ -157,12 +151,12 @@ inline int operator==( quat_t a, quat_t b ) {
 }
 
 inline int operator!=( quat_t a, quat_t b ) {
-	return ( ( a.x != b.x ) || ( a.y != b.y ) || ( a.z != b.z ) && ( a.w != b.w ) );
+	return ( ( a.x != b.x ) || ( a.y != b.y ) || (( a.z != b.z ) && ( a.w != b.w )) );
 }
 
 inline float quat_t::Length( void ) {
 	float length;
-	
+
 	length = x * x + y * y + z * z + w * w;
 	return ( float )sqrt( length );
 }
@@ -179,7 +173,7 @@ inline quat_t& quat_t::Normalize( void ) {
 		z *= ilength;
 		w *= ilength;
 	}
-		
+
 	return *this;
 }