Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
45d1f418
Commit
45d1f418
authored
May 02, 2020
by
Bastiaan Olij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added missing spring enums for generic_6dof_joint
parent
d2887ea7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
0 deletions
+18
-0
Generic6DOFJoint3D.xml
doc/classes/Generic6DOFJoint3D.xml
+12
-0
physics_joint_3d.cpp
scene/3d/physics_joint_3d.cpp
+6
-0
No files found.
doc/classes/Generic6DOFJoint3D.xml
View file @
45d1f418
...
@@ -373,6 +373,12 @@
...
@@ -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 @@
...
@@ -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>
...
...
scene/3d/physics_joint_3d.cpp
View file @
45d1f418
...
@@ -807,6 +807,9 @@ void Generic6DOFJoint3D::_bind_methods() {
...
@@ -807,6 +807,9 @@ void Generic6DOFJoint3D::_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 Generic6DOFJoint3D::_bind_methods() {
...
@@ -816,6 +819,9 @@ void Generic6DOFJoint3D::_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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment