maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
[3.2] Fix inconsistent Joint3DSW copy constructor and assignment declarations
This commit is contained in:
Rémi Verschelde 2020-12-08 09:41:40 +01:00 committed by GitHub
parent e30d4fc6ed 634a14844e
commit 8adc5b5df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
servers/physics/joints/generic_6dof_joint_sw.h
View file

@ -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,