Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-23 20:53:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Added missing spring enums for generic_6dof_joint

Browse Source 
(cherry picked from commit 45d1f41837)
This commit is contained in:
Bastiaan Olij 2020-05-02 21:48:00 +10:00 committed by Rémi Verschelde
parent 23ee40deff
commit 02b1a5de47
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/classes/Generic6DOFJoint.xml
View File

@ -373,6 +373,12 @@
<constant name="PARAM_LINEAR_MOTOR_FORCE_LIMIT" value="6" enum="Param"> <constant name="PARAM_LINEAR_MOTOR_FORCE_LIMIT" value="6" enum="Param">
The maximum force the linear motor will apply while trying to reach the velocity target. The maximum force the linear motor will apply while trying to reach the velocity target.
</constant> </constant>
<constant name="PARAM_LINEAR_SPRING_STIFFNESS" value="7" enum="Param">
</constant>
<constant name="PARAM_LINEAR_SPRING_DAMPING" value="8" enum="Param">
</constant>
<constant name="PARAM_LINEAR_SPRING_EQUILIBRIUM_POINT" value="9" enum="Param">
</constant>
<constant name="PARAM_ANGULAR_LOWER_LIMIT" value="10" enum="Param"> <constant name="PARAM_ANGULAR_LOWER_LIMIT" value="10" enum="Param">
The minimum rotation in negative direction to break loose and rotate around the axes. The minimum rotation in negative direction to break loose and rotate around the axes.
</constant> </constant>
@ -400,6 +406,12 @@
<constant name="PARAM_ANGULAR_MOTOR_FORCE_LIMIT" value="18" enum="Param"> <constant name="PARAM_ANGULAR_MOTOR_FORCE_LIMIT" value="18" enum="Param">
Maximum acceleration for the motor at the axes. Maximum acceleration for the motor at the axes.
</constant> </constant>
<constant name="PARAM_ANGULAR_SPRING_STIFFNESS" value="19" enum="Param">
</constant>
<constant name="PARAM_ANGULAR_SPRING_DAMPING" value="20" enum="Param">
</constant>
<constant name="PARAM_ANGULAR_SPRING_EQUILIBRIUM_POINT" value="21" enum="Param">
</constant>
<constant name="PARAM_MAX" value="22" enum="Param"> <constant name="PARAM_MAX" value="22" enum="Param">
Represents the size of the [enum Param] enum. Represents the size of the [enum Param] enum.
</constant> </constant>

6
scene/3d/physics_joint.cpp
View File

@ -807,6 +807,9 @@ void Generic6DOFJoint::_bind_methods() {
BIND_ENUM_CONSTANT(PARAM_LINEAR_DAMPING); BIND_ENUM_CONSTANT(PARAM_LINEAR_DAMPING);
BIND_ENUM_CONSTANT(PARAM_LINEAR_MOTOR_TARGET_VELOCITY); BIND_ENUM_CONSTANT(PARAM_LINEAR_MOTOR_TARGET_VELOCITY);
BIND_ENUM_CONSTANT(PARAM_LINEAR_MOTOR_FORCE_LIMIT); BIND_ENUM_CONSTANT(PARAM_LINEAR_MOTOR_FORCE_LIMIT);
BIND_ENUM_CONSTANT(PARAM_LINEAR_SPRING_STIFFNESS);
BIND_ENUM_CONSTANT(PARAM_LINEAR_SPRING_DAMPING);
BIND_ENUM_CONSTANT(PARAM_LINEAR_SPRING_EQUILIBRIUM_POINT);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_LOWER_LIMIT); BIND_ENUM_CONSTANT(PARAM_ANGULAR_LOWER_LIMIT);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_UPPER_LIMIT); BIND_ENUM_CONSTANT(PARAM_ANGULAR_UPPER_LIMIT);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_LIMIT_SOFTNESS); BIND_ENUM_CONSTANT(PARAM_ANGULAR_LIMIT_SOFTNESS);
@ -816,6 +819,9 @@ void Generic6DOFJoint::_bind_methods() {
BIND_ENUM_CONSTANT(PARAM_ANGULAR_ERP); BIND_ENUM_CONSTANT(PARAM_ANGULAR_ERP);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTOR_TARGET_VELOCITY); BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTOR_TARGET_VELOCITY);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTOR_FORCE_LIMIT); BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTOR_FORCE_LIMIT);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_SPRING_STIFFNESS);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_SPRING_DAMPING);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_SPRING_EQUILIBRIUM_POINT);
BIND_ENUM_CONSTANT(PARAM_MAX); BIND_ENUM_CONSTANT(PARAM_MAX);
BIND_ENUM_CONSTANT(FLAG_ENABLE_LINEAR_LIMIT); BIND_ENUM_CONSTANT(FLAG_ENABLE_LINEAR_LIMIT);