Sfoglia il codice sorgente

Merge pull request #38413 from BastiaanOlij/add_missing_6dofjoint_enums

Added missing spring enums for generic_6dof_joint
Rémi Verschelde 5 anni fa
parent
commit
f5cd33f39d
2 ha cambiato i file con 18 aggiunte e 0 eliminazioni
  1. 12 0
      doc/classes/Generic6DOFJoint3D.xml
  2. 6 0
      scene/3d/physics_joint_3d.cpp

+ 12 - 0
doc/classes/Generic6DOFJoint3D.xml

@@ -373,6 +373,12 @@
 		<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.
 		</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">
 			The minimum rotation in negative direction to break loose and rotate around the axes.
 		</constant>
@@ -400,6 +406,12 @@
 		<constant name="PARAM_ANGULAR_MOTOR_FORCE_LIMIT" value="18" enum="Param">
 			Maximum acceleration for the motor at the axes.
 		</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">
 			Represents the size of the [enum Param] enum.
 		</constant>

+ 6 - 0
scene/3d/physics_joint_3d.cpp

@@ -807,6 +807,9 @@ void Generic6DOFJoint3D::_bind_methods() {
 	BIND_ENUM_CONSTANT(PARAM_LINEAR_DAMPING);
 	BIND_ENUM_CONSTANT(PARAM_LINEAR_MOTOR_TARGET_VELOCITY);
 	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_UPPER_LIMIT);
 	BIND_ENUM_CONSTANT(PARAM_ANGULAR_LIMIT_SOFTNESS);
@@ -816,6 +819,9 @@ void Generic6DOFJoint3D::_bind_methods() {
 	BIND_ENUM_CONSTANT(PARAM_ANGULAR_ERP);
 	BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTOR_TARGET_VELOCITY);
 	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(FLAG_ENABLE_LINEAR_LIMIT);