diff --git a/include/IAnimatedMeshMD3.h b/include/IAnimatedMeshMD3.h index 08c897d..cdd416e 100644 --- a/include/IAnimatedMeshMD3.h +++ b/include/IAnimatedMeshMD3.h @@ -156,12 +156,6 @@ namespace scene position.X = 0.f; } - // construct copy constructor - SMD3QuaternionTag( const SMD3QuaternionTag & copyMe ) - { - *this = copyMe; - } - // construct for searching SMD3QuaternionTag( const core::stringc& name ) : Name ( name ) {} @@ -181,14 +175,6 @@ namespace scene return Name == other.Name; } - SMD3QuaternionTag & operator=( const SMD3QuaternionTag & copyMe ) - { - Name = copyMe.Name; - position = copyMe.position; - rotation = copyMe.rotation; - return *this; - } - core::stringc Name; core::vector3df position; core::quaternion rotation; @@ -202,12 +188,6 @@ namespace scene Container.setAllocStrategy(core::ALLOC_STRATEGY_SAFE); } - // construct copy constructor - SMD3QuaternionTagList(const SMD3QuaternionTagList& copyMe) - { - *this = copyMe; - } - virtual ~SMD3QuaternionTagList() {} SMD3QuaternionTag* get(const core::stringc& name) @@ -250,12 +230,6 @@ namespace scene Container.push_back(other); } - SMD3QuaternionTagList& operator = (const SMD3QuaternionTagList & copyMe) - { - Container = copyMe.Container; - return *this; - } - private: core::array < SMD3QuaternionTag > Container; }; diff --git a/include/IQ3Shader.h b/include/IQ3Shader.h index d4108f6..bcdb4d5 100644 --- a/include/IQ3Shader.h +++ b/include/IQ3Shader.h @@ -639,13 +639,6 @@ namespace quake3 : ID ( 0 ), VarGroup ( 0 ) {} virtual ~IShader () {} - void operator = (const IShader &other ) - { - ID = other.ID; - VarGroup = other.VarGroup; - name = other.name; - } - bool operator == (const IShader &other ) const { return 0 == strcmp ( name.c_str(), other.name.c_str () ); diff --git a/include/SMaterial.h b/include/SMaterial.h index 29bc332..b70a7df 100644 --- a/include/SMaterial.h +++ b/include/SMaterial.h @@ -328,53 +328,6 @@ namespace video *this = other; } - //! Assignment operator - /** \param other Material to copy from. */ - SMaterial& operator=(const SMaterial& other) - { - // Check for self-assignment! - if (this == &other) - return *this; - - MaterialType = other.MaterialType; - - AmbientColor = other.AmbientColor; - DiffuseColor = other.DiffuseColor; - EmissiveColor = other.EmissiveColor; - SpecularColor = other.SpecularColor; - Shininess = other.Shininess; - MaterialTypeParam = other.MaterialTypeParam; - MaterialTypeParam2 = other.MaterialTypeParam2; - Thickness = other.Thickness; - for (u32 i=0; i& start, const vector2d& end) : start(start), end(end) {} - //! Copy constructor. - line2d(const line2d& other) : start(other.start), end(other.end) {} // operators diff --git a/include/matrix4.h b/include/matrix4.h index 0128901..cd03c44 100644 --- a/include/matrix4.h +++ b/include/matrix4.h @@ -102,9 +102,6 @@ namespace core //! Simple operator for linearly accessing every element of the matrix. const T& operator[](u32 index) const { return M[index]; } - //! Sets this matrix equal to the other matrix. - inline CMatrix4& operator=(const CMatrix4 &other); - //! Sets all elements of this matrix to the value. inline CMatrix4& operator=(const T& scalar); @@ -1504,19 +1501,6 @@ namespace core } - template - inline CMatrix4& CMatrix4::operator=(const CMatrix4 &other) - { - if (this==&other) - return *this; - memcpy(M, other.M, 16*sizeof(T)); -#if defined ( USE_MATRIX_TEST ) - definitelyIdentityMatrix=other.definitelyIdentityMatrix; -#endif - return *this; - } - - template inline CMatrix4& CMatrix4::operator=(const T& scalar) { diff --git a/include/quaternion.h b/include/quaternion.h index 5fdff79..85c2792 100644 --- a/include/quaternion.h +++ b/include/quaternion.h @@ -55,9 +55,6 @@ class quaternion //! inequality operator bool operator!=(const quaternion& other) const; - //! Assignment operator - inline quaternion& operator=(const quaternion& other); - #ifndef IRR_TEST_BROKEN_QUATERNION_USE //! Matrix assignment operator inline quaternion& operator=(const matrix4& other); @@ -240,16 +237,6 @@ inline bool quaternion::operator!=(const quaternion& other) const return !(*this == other); } -// assignment operator -inline quaternion& quaternion::operator=(const quaternion& other) -{ - X = other.X; - Y = other.Y; - Z = other.Z; - W = other.W; - return *this; -} - #ifndef IRR_TEST_BROKEN_QUATERNION_USE // matrix assignment operator inline quaternion& quaternion::operator=(const matrix4& m) diff --git a/include/vector2d.h b/include/vector2d.h index 2d28ce7..08672a3 100644 --- a/include/vector2d.h +++ b/include/vector2d.h @@ -27,8 +27,6 @@ public: vector2d(T nx, T ny) : X(nx), Y(ny) {} //! Constructor with the same value for both members explicit vector2d(T n) : X(n), Y(n) {} - //! Copy constructor - vector2d(const vector2d& other) : X(other.X), Y(other.Y) {} vector2d(const dimension2d& other) : X(other.Width), Y(other.Height) {} @@ -36,8 +34,6 @@ public: vector2d operator-() const { return vector2d(-X, -Y); } - vector2d& operator=(const vector2d& other) { X = other.X; Y = other.Y; return *this; } - vector2d& operator=(const dimension2d& other) { X = other.Width; Y = other.Height; return *this; } vector2d operator+(const vector2d& other) const { return vector2d(X + other.X, Y + other.Y); } diff --git a/include/vector3d.h b/include/vector3d.h index 5f4f613..95325ef 100644 --- a/include/vector3d.h +++ b/include/vector3d.h @@ -28,15 +28,11 @@ namespace core vector3d(T nx, T ny, T nz) : X(nx), Y(ny), Z(nz) {} //! Constructor with the same value for all elements explicit vector3d(T n) : X(n), Y(n), Z(n) {} - //! Copy constructor - vector3d(const vector3d& other) : X(other.X), Y(other.Y), Z(other.Z) {} // operators vector3d operator-() const { return vector3d(-X, -Y, -Z); } - vector3d& operator=(const vector3d& other) { X = other.X; Y = other.Y; Z = other.Z; return *this; } - vector3d operator+(const vector3d& other) const { return vector3d(X + other.X, Y + other.Y, Z + other.Z); } vector3d& operator+=(const vector3d& other) { X+=other.X; Y+=other.Y; Z+=other.Z; return *this; } vector3d operator+(const T val) const { return vector3d(X + val, Y + val, Z + val); }