From 634a14844e7e05bf17f5a37f82f8565c9b2f13ec Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Mon, 7 Dec 2020 12:11:44 +0000 Subject: [PATCH] Fix inconsistent Joint3DSW copy constructor and assignment declarations --- .../physics/joints/generic_6dof_joint_sw.h | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/servers/physics/joints/generic_6dof_joint_sw.h b/servers/physics/joints/generic_6dof_joint_sw.h index 07626ffa97..665e5e361a 100644 --- a/servers/physics/joints/generic_6dof_joint_sw.h +++ b/servers/physics/joints/generic_6dof_joint_sw.h @@ -103,19 +103,6 @@ public: m_enableLimit = false; } - G6DOFRotationalLimitMotorSW(const G6DOFRotationalLimitMotorSW &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; } - G6DOFTranslationalLimitMotorSW(const G6DOFTranslationalLimitMotorSW &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: //!@} - Generic6DOFJointSW &operator=(Generic6DOFJointSW &other) { - ERR_PRINT("pito"); - (void)other; - return *this; - } + Generic6DOFJointSW(Generic6DOFJointSW const &) = delete; + void operator=(Generic6DOFJointSW const &) = delete; void buildLinearJacobian( JacobianEntrySW &jacLinear, const Vector3 &normalWorld,