Merge pull request #44164 from madmiraal/g6dof-use-default-copy

Fix inconsistent Joint3DSW copy constructor and assignment declarations

1 files changed, 2 insertions, 28 deletions

diff --git a/servers/physics_3d/joints/generic_6dof_joint_3d_sw.h b/servers/physics_3d/joints/generic_6dof_joint_3d_sw.h
index cc1423a1cb..7b98177066 100644
--- a/servers/physics_3d/joints/generic_6dof_joint_3d_sw.h
+++ b/servers/physics_3d/joints/generic_6dof_joint_3d_sw.h
@@ -103,19 +103,6 @@ public:
 		m_enableLimit = false;
 	}
 
-	G6DOFRotationalLimitMotor3DSW(const G6DOFRotationalLimitMotor3DSW &limot) {
-		m_targetVelocity = limot.m_targetVelocity;
-		m_maxMotorForce = limot.m_maxMotorForce;
-		m_limitSoftness = limot.m_limitSoftness;
-		m_loLimit = limot.m_loLimit;
-		m_hiLimit = limot.m_hiLimit;
-		m_ERP = limot.m_ERP;
-		m_bounce = limot.m_bounce;
-		m_currentLimit = limot.m_currentLimit;
-		m_currentLimitError = limot.m_currentLimitError;
-		m_enableMotor = limot.m_enableMotor;
-	}
-
 	//! Is limited
 	bool isLimited() {
 		return (m_loLimit < m_hiLimit);
@@ -163,16 +150,6 @@ public:
 		enable_limit[2] = true;
 	}
 
-	G6DOFTranslationalLimitMotor3DSW(const G6DOFTranslationalLimitMotor3DSW &other) {
-		m_lowerLimit = other.m_lowerLimit;
-		m_upperLimit = other.m_upperLimit;
-		m_accumulatedImpulse = other.m_accumulatedImpulse;
-
-		m_limitSoftness = other.m_limitSoftness;
-		m_damping = other.m_damping;
-		m_restitution = other.m_restitution;
-	}
-
 	//! Test limit
 	/*!
     - free means upper < lower,
@@ -242,11 +219,8 @@ protected:
 
 	//!@}
 
-	Generic6DOFJoint3DSW &operator=(Generic6DOFJoint3DSW &other) {
-		ERR_PRINT("pito");
-		(void)other;
-		return *this;
-	}
+	Generic6DOFJoint3DSW(Generic6DOFJoint3DSW const &) = delete;
+	void operator=(Generic6DOFJoint3DSW const &) = delete;
 
 	void buildLinearJacobian(
 			JacobianEntry3DSW &jacLinear, const Vector3 &normalWorld,