Merge pull request #64719 from akien-mga/property-slasher
This commit is contained in:
Rémi Verschelde
GitHub
commit
be5c1e2737
@ -14,40 +14,40 @@
|
||||
<member name="dry" type="float" setter="set_dry" getter="get_dry" default="1.0">
|
||||
Output percent of original sound. At 0, only delayed sounds are output. Value can range from 0 to 1.
|
||||
</member>
|
||||
<member name="feedback/active" type="bool" setter="set_feedback_active" getter="is_feedback_active" default="false">
|
||||
<member name="feedback_active" type="bool" setter="set_feedback_active" getter="is_feedback_active" default="false">
|
||||
If [code]true[/code], feedback is enabled.
|
||||
</member>
|
||||
<member name="feedback/delay_ms" type="float" setter="set_feedback_delay_ms" getter="get_feedback_delay_ms" default="340.0">
|
||||
<member name="feedback_delay_ms" type="float" setter="set_feedback_delay_ms" getter="get_feedback_delay_ms" default="340.0">
|
||||
Feedback delay time in milliseconds.
|
||||
</member>
|
||||
<member name="feedback/level_db" type="float" setter="set_feedback_level_db" getter="get_feedback_level_db" default="-6.0">
|
||||
<member name="feedback_level_db" type="float" setter="set_feedback_level_db" getter="get_feedback_level_db" default="-6.0">
|
||||
Sound level for [code]tap1[/code].
|
||||
</member>
|
||||
<member name="feedback/lowpass" type="float" setter="set_feedback_lowpass" getter="get_feedback_lowpass" default="16000.0">
|
||||
<member name="feedback_lowpass" type="float" setter="set_feedback_lowpass" getter="get_feedback_lowpass" default="16000.0">
|
||||
Low-pass filter for feedback, in Hz. Frequencies below this value are filtered out of the source signal.
|
||||
</member>
|
||||
<member name="tap1/active" type="bool" setter="set_tap1_active" getter="is_tap1_active" default="true">
|
||||
<member name="tap1_active" type="bool" setter="set_tap1_active" getter="is_tap1_active" default="true">
|
||||
If [code]true[/code], [code]tap1[/code] will be enabled.
|
||||
</member>
|
||||
<member name="tap1/delay_ms" type="float" setter="set_tap1_delay_ms" getter="get_tap1_delay_ms" default="250.0">
|
||||
<member name="tap1_delay_ms" type="float" setter="set_tap1_delay_ms" getter="get_tap1_delay_ms" default="250.0">
|
||||
[code]tap1[/code] delay time in milliseconds.
|
||||
</member>
|
||||
<member name="tap1/level_db" type="float" setter="set_tap1_level_db" getter="get_tap1_level_db" default="-6.0">
|
||||
<member name="tap1_level_db" type="float" setter="set_tap1_level_db" getter="get_tap1_level_db" default="-6.0">
|
||||
Sound level for [code]tap1[/code].
|
||||
</member>
|
||||
<member name="tap1/pan" type="float" setter="set_tap1_pan" getter="get_tap1_pan" default="0.2">
|
||||
<member name="tap1_pan" type="float" setter="set_tap1_pan" getter="get_tap1_pan" default="0.2">
|
||||
Pan position for [code]tap1[/code]. Value can range from -1 (fully left) to 1 (fully right).
|
||||
</member>
|
||||
<member name="tap2/active" type="bool" setter="set_tap2_active" getter="is_tap2_active" default="true">
|
||||
<member name="tap2_active" type="bool" setter="set_tap2_active" getter="is_tap2_active" default="true">
|
||||
If [code]true[/code], [code]tap2[/code] will be enabled.
|
||||
</member>
|
||||
<member name="tap2/delay_ms" type="float" setter="set_tap2_delay_ms" getter="get_tap2_delay_ms" default="500.0">
|
||||
<member name="tap2_delay_ms" type="float" setter="set_tap2_delay_ms" getter="get_tap2_delay_ms" default="500.0">
|
||||
[b]Tap2[/b] delay time in milliseconds.
|
||||
</member>
|
||||
<member name="tap2/level_db" type="float" setter="set_tap2_level_db" getter="get_tap2_level_db" default="-12.0">
|
||||
<member name="tap2_level_db" type="float" setter="set_tap2_level_db" getter="get_tap2_level_db" default="-12.0">
|
||||
Sound level for [code]tap2[/code].
|
||||
</member>
|
||||
<member name="tap2/pan" type="float" setter="set_tap2_pan" getter="get_tap2_pan" default="-0.4">
|
||||
<member name="tap2_pan" type="float" setter="set_tap2_pan" getter="get_tap2_pan" default="-0.4">
|
||||
Pan position for [code]tap2[/code]. Value can range from -1 (fully left) to 1 (fully right).
|
||||
</member>
|
||||
</members>
|
||||
|
||||
@ -140,12 +140,6 @@
|
||||
</method>
|
||||
</methods>
|
||||
<members>
|
||||
<member name="collision/safe_margin" type="float" setter="set_safe_margin" getter="get_safe_margin" default="0.08">
|
||||
Extra margin used for collision recovery when calling [method move_and_slide].
|
||||
If the body is at least this close to another body, it will consider them to be colliding and will be pushed away before performing the actual motion.
|
||||
A higher value means it's more flexible for detecting collision, which helps with consistently detecting walls and floors.
|
||||
A lower value forces the collision algorithm to use more exact detection, so it can be used in cases that specifically require precision, e.g at very low scale to avoid visible jittering, or for stability with a stack of character bodies.
|
||||
</member>
|
||||
<member name="floor_block_on_wall" type="bool" setter="set_floor_block_on_wall_enabled" getter="is_floor_block_on_wall_enabled" default="true">
|
||||
If [code]true[/code], the body will be able to move on the floor only. This option avoids to be able to walk on walls, it will however allow to slide down along them.
|
||||
</member>
|
||||
@ -179,6 +173,12 @@
|
||||
<member name="moving_platform_wall_layers" type="int" setter="set_moving_platform_wall_layers" getter="get_moving_platform_wall_layers" default="0">
|
||||
Collision layers that will be included for detecting wall bodies that will act as moving platforms to be followed by the [CharacterBody2D]. By default, all wall bodies are ignored.
|
||||
</member>
|
||||
<member name="safe_margin" type="float" setter="set_safe_margin" getter="get_safe_margin" default="0.08">
|
||||
Extra margin used for collision recovery when calling [method move_and_slide].
|
||||
If the body is at least this close to another body, it will consider them to be colliding and will be pushed away before performing the actual motion.
|
||||
A higher value means it's more flexible for detecting collision, which helps with consistently detecting walls and floors.
|
||||
A lower value forces the collision algorithm to use more exact detection, so it can be used in cases that specifically require precision, e.g at very low scale to avoid visible jittering, or for stability with a stack of character bodies.
|
||||
</member>
|
||||
<member name="slide_on_ceiling" type="bool" setter="set_slide_on_ceiling_enabled" getter="is_slide_on_ceiling_enabled" default="true">
|
||||
If [code]true[/code], during a jump against the ceiling, the body will slide, if [code]false[/code] it will be stopped and will fall vertically.
|
||||
</member>
|
||||
|
||||
@ -125,12 +125,6 @@
|
||||
</method>
|
||||
</methods>
|
||||
<members>
|
||||
<member name="collision/safe_margin" type="float" setter="set_safe_margin" getter="get_safe_margin" default="0.001">
|
||||
Extra margin used for collision recovery when calling [method move_and_slide].
|
||||
If the body is at least this close to another body, it will consider them to be colliding and will be pushed away before performing the actual motion.
|
||||
A higher value means it's more flexible for detecting collision, which helps with consistently detecting walls and floors.
|
||||
A lower value forces the collision algorithm to use more exact detection, so it can be used in cases that specifically require precision, e.g at very low scale to avoid visible jittering, or for stability with a stack of character bodies.
|
||||
</member>
|
||||
<member name="floor_block_on_wall" type="bool" setter="set_floor_block_on_wall_enabled" getter="is_floor_block_on_wall_enabled" default="true">
|
||||
If [code]true[/code], the body will be able to move on the floor only. This option avoids to be able to walk on walls, it will however allow to slide down along them.
|
||||
</member>
|
||||
@ -164,6 +158,12 @@
|
||||
<member name="moving_platform_wall_layers" type="int" setter="set_moving_platform_wall_layers" getter="get_moving_platform_wall_layers" default="0">
|
||||
Collision layers that will be included for detecting wall bodies that will act as moving platforms to be followed by the [CharacterBody3D]. By default, all wall bodies are ignored.
|
||||
</member>
|
||||
<member name="safe_margin" type="float" setter="set_safe_margin" getter="get_safe_margin" default="0.001">
|
||||
Extra margin used for collision recovery when calling [method move_and_slide].
|
||||
If the body is at least this close to another body, it will consider them to be colliding and will be pushed away before performing the actual motion.
|
||||
A higher value means it's more flexible for detecting collision, which helps with consistently detecting walls and floors.
|
||||
A lower value forces the collision algorithm to use more exact detection, so it can be used in cases that specifically require precision, e.g at very low scale to avoid visible jittering, or for stability with a stack of character bodies.
|
||||
</member>
|
||||
<member name="slide_on_ceiling" type="bool" setter="set_slide_on_ceiling_enabled" getter="is_slide_on_ceiling_enabled" default="true">
|
||||
If [code]true[/code], during a jump against the ceiling, the body will slide, if [code]false[/code] it will be stopped and will fall vertically.
|
||||
</member>
|
||||
|
||||
@ -36,13 +36,13 @@
|
||||
<member name="softness" type="float" setter="set_param" getter="get_param" default="0.8">
|
||||
The ease with which the joint starts to twist. If it's too low, it takes more force to start twisting the joint.
|
||||
</member>
|
||||
<member name="swing_span" type="float" setter="_set_swing_span" getter="_get_swing_span" default="45.0">
|
||||
<member name="swing_span" type="float" setter="set_param" getter="get_param" default="0.785398">
|
||||
Swing is rotation from side to side, around the axis perpendicular to the twist axis.
|
||||
The swing span defines, how much rotation will not get corrected along the swing axis.
|
||||
Could be defined as looseness in the [ConeTwistJoint3D].
|
||||
If below 0.05, this behavior is locked.
|
||||
</member>
|
||||
<member name="twist_span" type="float" setter="_set_twist_span" getter="_get_twist_span" default="180.0">
|
||||
<member name="twist_span" type="float" setter="set_param" getter="get_param" default="3.14159">
|
||||
Twist is the rotation around the twist axis, this value defined how far the joint can twist.
|
||||
Twist is locked if below 0.05.
|
||||
</member>
|
||||
|
||||
@ -102,7 +102,7 @@
|
||||
<member name="angular_limit_x/force_limit" type="float" setter="set_param_x" getter="get_param_x" default="0.0">
|
||||
The maximum amount of force that can occur, when rotating around the X axis.
|
||||
</member>
|
||||
<member name="angular_limit_x/lower_angle" type="float" setter="_set_angular_lo_limit_x" getter="_get_angular_lo_limit_x" default="0.0">
|
||||
<member name="angular_limit_x/lower_angle" type="float" setter="set_param_x" getter="get_param_x" default="0.0">
|
||||
The minimum rotation in negative direction to break loose and rotate around the X axis.
|
||||
</member>
|
||||
<member name="angular_limit_x/restitution" type="float" setter="set_param_x" getter="get_param_x" default="0.0">
|
||||
@ -111,7 +111,7 @@
|
||||
<member name="angular_limit_x/softness" type="float" setter="set_param_x" getter="get_param_x" default="0.5">
|
||||
The speed of all rotations across the X axis.
|
||||
</member>
|
||||
<member name="angular_limit_x/upper_angle" type="float" setter="_set_angular_hi_limit_x" getter="_get_angular_hi_limit_x" default="0.0">
|
||||
<member name="angular_limit_x/upper_angle" type="float" setter="set_param_x" getter="get_param_x" default="0.0">
|
||||
The minimum rotation in positive direction to break loose and rotate around the X axis.
|
||||
</member>
|
||||
<member name="angular_limit_y/damping" type="float" setter="set_param_y" getter="get_param_y" default="1.0">
|
||||
@ -126,7 +126,7 @@
|
||||
<member name="angular_limit_y/force_limit" type="float" setter="set_param_y" getter="get_param_y" default="0.0">
|
||||
The maximum amount of force that can occur, when rotating around the Y axis.
|
||||
</member>
|
||||
<member name="angular_limit_y/lower_angle" type="float" setter="_set_angular_lo_limit_y" getter="_get_angular_lo_limit_y" default="0.0">
|
||||
<member name="angular_limit_y/lower_angle" type="float" setter="set_param_y" getter="get_param_y" default="0.0">
|
||||
The minimum rotation in negative direction to break loose and rotate around the Y axis.
|
||||
</member>
|
||||
<member name="angular_limit_y/restitution" type="float" setter="set_param_y" getter="get_param_y" default="0.0">
|
||||
@ -135,7 +135,7 @@
|
||||
<member name="angular_limit_y/softness" type="float" setter="set_param_y" getter="get_param_y" default="0.5">
|
||||
The speed of all rotations across the Y axis.
|
||||
</member>
|
||||
<member name="angular_limit_y/upper_angle" type="float" setter="_set_angular_hi_limit_y" getter="_get_angular_hi_limit_y" default="0.0">
|
||||
<member name="angular_limit_y/upper_angle" type="float" setter="set_param_y" getter="get_param_y" default="0.0">
|
||||
The minimum rotation in positive direction to break loose and rotate around the Y axis.
|
||||
</member>
|
||||
<member name="angular_limit_z/damping" type="float" setter="set_param_z" getter="get_param_z" default="1.0">
|
||||
@ -150,7 +150,7 @@
|
||||
<member name="angular_limit_z/force_limit" type="float" setter="set_param_z" getter="get_param_z" default="0.0">
|
||||
The maximum amount of force that can occur, when rotating around the Z axis.
|
||||
</member>
|
||||
<member name="angular_limit_z/lower_angle" type="float" setter="_set_angular_lo_limit_z" getter="_get_angular_lo_limit_z" default="0.0">
|
||||
<member name="angular_limit_z/lower_angle" type="float" setter="set_param_z" getter="get_param_z" default="0.0">
|
||||
The minimum rotation in negative direction to break loose and rotate around the Z axis.
|
||||
</member>
|
||||
<member name="angular_limit_z/restitution" type="float" setter="set_param_z" getter="get_param_z" default="0.0">
|
||||
@ -159,7 +159,7 @@
|
||||
<member name="angular_limit_z/softness" type="float" setter="set_param_z" getter="get_param_z" default="0.5">
|
||||
The speed of all rotations across the Z axis.
|
||||
</member>
|
||||
<member name="angular_limit_z/upper_angle" type="float" setter="_set_angular_hi_limit_z" getter="_get_angular_hi_limit_z" default="0.0">
|
||||
<member name="angular_limit_z/upper_angle" type="float" setter="set_param_z" getter="get_param_z" default="0.0">
|
||||
The minimum rotation in positive direction to break loose and rotate around the Z axis.
|
||||
</member>
|
||||
<member name="angular_motor_x/enabled" type="bool" setter="set_flag_x" getter="get_flag_x" default="false">
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
<member name="angular_limit/enable" type="bool" setter="set_flag" getter="get_flag" default="false">
|
||||
If [code]true[/code], the hinges maximum and minimum rotation, defined by [member angular_limit/lower] and [member angular_limit/upper] has effects.
|
||||
</member>
|
||||
<member name="angular_limit/lower" type="float" setter="_set_lower_limit" getter="_get_lower_limit" default="-90.0">
|
||||
<member name="angular_limit/lower" type="float" setter="set_param" getter="get_param" default="-1.5708">
|
||||
The minimum rotation. Only active if [member angular_limit/enable] is [code]true[/code].
|
||||
</member>
|
||||
<member name="angular_limit/relaxation" type="float" setter="set_param" getter="get_param" default="1.0">
|
||||
@ -55,7 +55,7 @@
|
||||
</member>
|
||||
<member name="angular_limit/softness" type="float" setter="set_param" getter="get_param" default="0.9">
|
||||
</member>
|
||||
<member name="angular_limit/upper" type="float" setter="_set_upper_limit" getter="_get_upper_limit" default="90.0">
|
||||
<member name="angular_limit/upper" type="float" setter="set_param" getter="get_param" default="1.5708">
|
||||
The maximum rotation. Only active if [member angular_limit/enable] is [code]true[/code].
|
||||
</member>
|
||||
<member name="motor/enable" type="bool" setter="set_flag" getter="get_flag" default="false">
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
<link title="3D Truck Town Demo">https://godotengine.org/asset-library/asset/524</link>
|
||||
</tutorials>
|
||||
<members>
|
||||
<member name="collision/exclude_nodes" type="bool" setter="set_exclude_nodes_from_collision" getter="get_exclude_nodes_from_collision" default="true">
|
||||
<member name="exclude_nodes_from_collision" type="bool" setter="set_exclude_nodes_from_collision" getter="get_exclude_nodes_from_collision" default="true">
|
||||
If [code]true[/code], the two bodies of the nodes are not able to collide with each other.
|
||||
</member>
|
||||
<member name="nodes/node_a" type="NodePath" setter="set_node_a" getter="get_node_a" default="NodePath("")">
|
||||
<member name="node_a" type="NodePath" setter="set_node_a" getter="get_node_a" default="NodePath("")">
|
||||
The node attached to the first side (A) of the joint.
|
||||
</member>
|
||||
<member name="nodes/node_b" type="NodePath" setter="set_node_b" getter="get_node_b" default="NodePath("")">
|
||||
<member name="node_b" type="NodePath" setter="set_node_b" getter="get_node_b" default="NodePath("")">
|
||||
The node attached to the second side (B) of the joint.
|
||||
</member>
|
||||
<member name="solver/priority" type="int" setter="set_solver_priority" getter="get_solver_priority" default="1">
|
||||
<member name="solver_priority" type="int" setter="set_solver_priority" getter="get_solver_priority" default="1">
|
||||
The priority used to define which solver is executed first for multiple joints. The lower the value, the higher the priority.
|
||||
</member>
|
||||
</members>
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
Moves the body along the vector [param distance]. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [param distance] should be computed using [code]delta[/code].
|
||||
Returns a [KinematicCollision2D], which contains information about the collision when stopped, or when touching another body along the motion.
|
||||
If [param test_only] is [code]true[/code], the body does not move but the would-be collision information is given.
|
||||
[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody2D.collision/safe_margin] for more details).
|
||||
[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody2D.safe_margin] for more details).
|
||||
</description>
|
||||
</method>
|
||||
<method name="remove_collision_exception_with">
|
||||
@ -52,7 +52,7 @@
|
||||
Checks for collisions without moving the body. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [param distance] should be computed using [code]delta[/code].
|
||||
Virtually sets the node's position, scale and rotation to that of the given [Transform2D], then tries to move the body along the vector [param distance]. Returns [code]true[/code] if a collision would stop the body from moving along the whole path.
|
||||
[param collision] is an optional object of type [KinematicCollision2D], which contains additional information about the collision when stopped, or when touching another body along the motion.
|
||||
[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody2D.collision/safe_margin] for more details).
|
||||
[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody2D.safe_margin] for more details).
|
||||
</description>
|
||||
</method>
|
||||
</methods>
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
Moves the body along the vector [param distance]. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [param distance] should be computed using [code]delta[/code].
|
||||
The body will stop if it collides. Returns a [KinematicCollision3D], which contains information about the collision when stopped, or when touching another body along the motion.
|
||||
If [param test_only] is [code]true[/code], the body does not move but the would-be collision information is given.
|
||||
[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody3D.collision/safe_margin] for more details).
|
||||
[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody3D.safe_margin] for more details).
|
||||
[param max_collisions] allows to retrieve more than one collision result.
|
||||
</description>
|
||||
</method>
|
||||
@ -70,7 +70,7 @@
|
||||
Checks for collisions without moving the body. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [param distance] should be computed using [code]delta[/code].
|
||||
Virtually sets the node's position, scale and rotation to that of the given [Transform3D], then tries to move the body along the vector [param distance]. Returns [code]true[/code] if a collision would stop the body from moving along the whole path.
|
||||
[param collision] is an optional object of type [KinematicCollision3D], which contains additional information about the collision when stopped, or when touching another body along the motion.
|
||||
[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody3D.collision/safe_margin] for more details).
|
||||
[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody3D.safe_margin] for more details).
|
||||
[param max_collisions] allows to retrieve more than one collision result.
|
||||
</description>
|
||||
</method>
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
The amount of damping of the rotation when the limit is surpassed.
|
||||
A lower damping value allows a rotation initiated by body A to travel to body B slower.
|
||||
</member>
|
||||
<member name="angular_limit/lower_angle" type="float" setter="_set_lower_limit_angular" getter="_get_lower_limit_angular" default="0.0">
|
||||
<member name="angular_limit/lower_angle" type="float" setter="set_param" getter="get_param" default="0.0">
|
||||
The lower limit of rotation in the slider.
|
||||
</member>
|
||||
<member name="angular_limit/restitution" type="float" setter="set_param" getter="get_param" default="0.7">
|
||||
@ -39,7 +39,7 @@
|
||||
A factor applied to the all rotation once the limit is surpassed.
|
||||
Makes all rotation slower when between 0 and 1.
|
||||
</member>
|
||||
<member name="angular_limit/upper_angle" type="float" setter="_set_upper_limit_angular" getter="_get_upper_limit_angular" default="0.0">
|
||||
<member name="angular_limit/upper_angle" type="float" setter="set_param" getter="get_param" default="0.0">
|
||||
The upper limit of rotation in the slider.
|
||||
</member>
|
||||
<member name="angular_motion/damping" type="float" setter="set_param" getter="get_param" default="1.0">
|
||||
|
||||
@ -1702,7 +1702,7 @@ void CharacterBody2D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("set_velocity", "velocity"), &CharacterBody2D::set_velocity);
|
||||
ClassDB::bind_method(D_METHOD("get_velocity"), &CharacterBody2D::get_velocity);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_safe_margin", "pixels"), &CharacterBody2D::set_safe_margin);
|
||||
ClassDB::bind_method(D_METHOD("set_safe_margin", "margin"), &CharacterBody2D::set_safe_margin);
|
||||
ClassDB::bind_method(D_METHOD("get_safe_margin"), &CharacterBody2D::get_safe_margin);
|
||||
ClassDB::bind_method(D_METHOD("is_floor_stop_on_slope_enabled"), &CharacterBody2D::is_floor_stop_on_slope_enabled);
|
||||
ClassDB::bind_method(D_METHOD("set_floor_stop_on_slope_enabled", "enabled"), &CharacterBody2D::set_floor_stop_on_slope_enabled);
|
||||
@ -1756,17 +1756,21 @@ void CharacterBody2D::_bind_methods() {
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "slide_on_ceiling"), "set_slide_on_ceiling_enabled", "is_slide_on_ceiling_enabled");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "max_slides", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_max_slides", "get_max_slides");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "wall_min_slide_angle", PROPERTY_HINT_RANGE, "0,180,0.1,radians", PROPERTY_USAGE_DEFAULT), "set_wall_min_slide_angle", "get_wall_min_slide_angle");
|
||||
|
||||
ADD_GROUP("Floor", "floor_");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "floor_stop_on_slope"), "set_floor_stop_on_slope_enabled", "is_floor_stop_on_slope_enabled");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "floor_constant_speed"), "set_floor_constant_speed_enabled", "is_floor_constant_speed_enabled");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "floor_block_on_wall"), "set_floor_block_on_wall_enabled", "is_floor_block_on_wall_enabled");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "floor_max_angle", PROPERTY_HINT_RANGE, "0,180,0.1,radians"), "set_floor_max_angle", "get_floor_max_angle");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "floor_snap_length", PROPERTY_HINT_RANGE, "0,32,0.1,or_greater,suffix:px"), "set_floor_snap_length", "get_floor_snap_length");
|
||||
|
||||
ADD_GROUP("Moving Platform", "moving_platform");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "moving_platform_apply_velocity_on_leave", PROPERTY_HINT_ENUM, "Always,Upward Only,Never", PROPERTY_USAGE_DEFAULT), "set_moving_platform_apply_velocity_on_leave", "get_moving_platform_apply_velocity_on_leave");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "moving_platform_floor_layers", PROPERTY_HINT_LAYERS_2D_PHYSICS), "set_moving_platform_floor_layers", "get_moving_platform_floor_layers");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "moving_platform_wall_layers", PROPERTY_HINT_LAYERS_2D_PHYSICS), "set_moving_platform_wall_layers", "get_moving_platform_wall_layers");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision/safe_margin", PROPERTY_HINT_RANGE, "0.001,256,0.001,suffix:px"), "set_safe_margin", "get_safe_margin");
|
||||
|
||||
ADD_GROUP("Collision", "");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "safe_margin", PROPERTY_HINT_RANGE, "0.001,256,0.001,suffix:px"), "set_safe_margin", "get_safe_margin");
|
||||
|
||||
BIND_ENUM_CONSTANT(MOTION_MODE_GROUNDED);
|
||||
BIND_ENUM_CONSTANT(MOTION_MODE_FLOATING);
|
||||
|
||||
@ -221,11 +221,11 @@ void Joint3D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("set_exclude_nodes_from_collision", "enable"), &Joint3D::set_exclude_nodes_from_collision);
|
||||
ClassDB::bind_method(D_METHOD("get_exclude_nodes_from_collision"), &Joint3D::get_exclude_nodes_from_collision);
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "nodes/node_a", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "PhysicsBody3D"), "set_node_a", "get_node_a");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "nodes/node_b", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "PhysicsBody3D"), "set_node_b", "get_node_b");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "solver/priority", PROPERTY_HINT_RANGE, "1,8,1"), "set_solver_priority", "get_solver_priority");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "node_a", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "PhysicsBody3D"), "set_node_a", "get_node_a");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "node_b", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "PhysicsBody3D"), "set_node_b", "get_node_b");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "solver_priority", PROPERTY_HINT_RANGE, "1,8,1"), "set_solver_priority", "get_solver_priority");
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "collision/exclude_nodes"), "set_exclude_nodes_from_collision", "get_exclude_nodes_from_collision");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "exclude_nodes_from_collision"), "set_exclude_nodes_from_collision", "get_exclude_nodes_from_collision");
|
||||
}
|
||||
|
||||
Joint3D::Joint3D() {
|
||||
@ -292,22 +292,6 @@ PinJoint3D::PinJoint3D() {
|
||||
|
||||
///////////////////////////////////
|
||||
|
||||
void HingeJoint3D::_set_upper_limit(real_t p_limit) {
|
||||
set_param(PARAM_LIMIT_UPPER, Math::deg2rad(p_limit));
|
||||
}
|
||||
|
||||
real_t HingeJoint3D::_get_upper_limit() const {
|
||||
return Math::rad2deg(get_param(PARAM_LIMIT_UPPER));
|
||||
}
|
||||
|
||||
void HingeJoint3D::_set_lower_limit(real_t p_limit) {
|
||||
set_param(PARAM_LIMIT_LOWER, Math::deg2rad(p_limit));
|
||||
}
|
||||
|
||||
real_t HingeJoint3D::_get_lower_limit() const {
|
||||
return Math::rad2deg(get_param(PARAM_LIMIT_LOWER));
|
||||
}
|
||||
|
||||
void HingeJoint3D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &HingeJoint3D::set_param);
|
||||
ClassDB::bind_method(D_METHOD("get_param", "param"), &HingeJoint3D::get_param);
|
||||
@ -315,17 +299,11 @@ void HingeJoint3D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("set_flag", "flag", "enabled"), &HingeJoint3D::set_flag);
|
||||
ClassDB::bind_method(D_METHOD("get_flag", "flag"), &HingeJoint3D::get_flag);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_upper_limit", "upper_limit"), &HingeJoint3D::_set_upper_limit);
|
||||
ClassDB::bind_method(D_METHOD("_get_upper_limit"), &HingeJoint3D::_get_upper_limit);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_lower_limit", "lower_limit"), &HingeJoint3D::_set_lower_limit);
|
||||
ClassDB::bind_method(D_METHOD("_get_lower_limit"), &HingeJoint3D::_get_lower_limit);
|
||||
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "params/bias", PROPERTY_HINT_RANGE, "0.00,0.99,0.01"), "set_param", "get_param", PARAM_BIAS);
|
||||
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "angular_limit/enable"), "set_flag", "get_flag", FLAG_USE_LIMIT);
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit/upper", PROPERTY_HINT_RANGE, "-180,180,0.1"), "_set_upper_limit", "_get_upper_limit");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit/lower", PROPERTY_HINT_RANGE, "-180,180,0.1"), "_set_lower_limit", "_get_lower_limit");
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/upper", PROPERTY_HINT_RANGE, "-180,180,0.1,radians"), "set_param", "get_param", PARAM_LIMIT_UPPER);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/lower", PROPERTY_HINT_RANGE, "-180,180,0.1,radians"), "set_param", "get_param", PARAM_LIMIT_LOWER);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/bias", PROPERTY_HINT_RANGE, "0.01,0.99,0.01"), "set_param", "get_param", PARAM_LIMIT_BIAS);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param", "get_param", PARAM_LIMIT_SOFTNESS);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/relaxation", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param", "get_param", PARAM_LIMIT_RELAXATION);
|
||||
@ -420,34 +398,10 @@ HingeJoint3D::HingeJoint3D() {
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
|
||||
//////////////////////////////////
|
||||
|
||||
void SliderJoint3D::_set_upper_limit_angular(real_t p_limit_angular) {
|
||||
set_param(PARAM_ANGULAR_LIMIT_UPPER, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t SliderJoint3D::_get_upper_limit_angular() const {
|
||||
return Math::rad2deg(get_param(PARAM_ANGULAR_LIMIT_UPPER));
|
||||
}
|
||||
|
||||
void SliderJoint3D::_set_lower_limit_angular(real_t p_limit_angular) {
|
||||
set_param(PARAM_ANGULAR_LIMIT_LOWER, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t SliderJoint3D::_get_lower_limit_angular() const {
|
||||
return Math::rad2deg(get_param(PARAM_ANGULAR_LIMIT_LOWER));
|
||||
}
|
||||
|
||||
void SliderJoint3D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &SliderJoint3D::set_param);
|
||||
ClassDB::bind_method(D_METHOD("get_param", "param"), &SliderJoint3D::get_param);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_upper_limit_angular", "upper_limit_angular"), &SliderJoint3D::_set_upper_limit_angular);
|
||||
ClassDB::bind_method(D_METHOD("_get_upper_limit_angular"), &SliderJoint3D::_get_upper_limit_angular);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_lower_limit_angular", "lower_limit_angular"), &SliderJoint3D::_set_lower_limit_angular);
|
||||
ClassDB::bind_method(D_METHOD("_get_lower_limit_angular"), &SliderJoint3D::_get_lower_limit_angular);
|
||||
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_limit/upper_distance", PROPERTY_HINT_RANGE, "-1024,1024,0.01,suffix:m"), "set_param", "get_param", PARAM_LINEAR_LIMIT_UPPER);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_limit/lower_distance", PROPERTY_HINT_RANGE, "-1024,1024,0.01,suffix:m"), "set_param", "get_param", PARAM_LINEAR_LIMIT_LOWER);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_limit/softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"), "set_param", "get_param", PARAM_LINEAR_LIMIT_SOFTNESS);
|
||||
@ -460,8 +414,8 @@ void SliderJoint3D::_bind_methods() {
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_ortho/restitution", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"), "set_param", "get_param", PARAM_LINEAR_ORTHOGONAL_RESTITUTION);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_ortho/damping", PROPERTY_HINT_RANGE, "0,16.0,0.01"), "set_param", "get_param", PARAM_LINEAR_ORTHOGONAL_DAMPING);
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit/upper_angle", PROPERTY_HINT_RANGE, "-180,180,0.1"), "_set_upper_limit_angular", "_get_upper_limit_angular");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit/lower_angle", PROPERTY_HINT_RANGE, "-180,180,0.1"), "_set_lower_limit_angular", "_get_lower_limit_angular");
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/upper_angle", PROPERTY_HINT_RANGE, "-180,180,0.1,radians"), "set_param", "get_param", PARAM_ANGULAR_LIMIT_UPPER);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/lower_angle", PROPERTY_HINT_RANGE, "-180,180,0.1,radians"), "set_param", "get_param", PARAM_ANGULAR_LIMIT_LOWER);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"), "set_param", "get_param", PARAM_ANGULAR_LIMIT_SOFTNESS);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/restitution", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"), "set_param", "get_param", PARAM_ANGULAR_LIMIT_RESTITUTION);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit/damping", PROPERTY_HINT_RANGE, "0,16.0,0.01"), "set_param", "get_param", PARAM_ANGULAR_LIMIT_DAMPING);
|
||||
@ -562,34 +516,12 @@ SliderJoint3D::SliderJoint3D() {
|
||||
|
||||
//////////////////////////////////
|
||||
|
||||
void ConeTwistJoint3D::_set_swing_span(real_t p_limit_angular) {
|
||||
set_param(PARAM_SWING_SPAN, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t ConeTwistJoint3D::_get_swing_span() const {
|
||||
return Math::rad2deg(get_param(PARAM_SWING_SPAN));
|
||||
}
|
||||
|
||||
void ConeTwistJoint3D::_set_twist_span(real_t p_limit_angular) {
|
||||
set_param(PARAM_TWIST_SPAN, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t ConeTwistJoint3D::_get_twist_span() const {
|
||||
return Math::rad2deg(get_param(PARAM_TWIST_SPAN));
|
||||
}
|
||||
|
||||
void ConeTwistJoint3D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &ConeTwistJoint3D::set_param);
|
||||
ClassDB::bind_method(D_METHOD("get_param", "param"), &ConeTwistJoint3D::get_param);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_swing_span", "swing_span"), &ConeTwistJoint3D::_set_swing_span);
|
||||
ClassDB::bind_method(D_METHOD("_get_swing_span"), &ConeTwistJoint3D::_get_swing_span);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_twist_span", "twist_span"), &ConeTwistJoint3D::_set_twist_span);
|
||||
ClassDB::bind_method(D_METHOD("_get_twist_span"), &ConeTwistJoint3D::_get_twist_span);
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "swing_span", PROPERTY_HINT_RANGE, "-180,180,0.1"), "_set_swing_span", "_get_swing_span");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "twist_span", PROPERTY_HINT_RANGE, "-40000,40000,0.1"), "_set_twist_span", "_get_twist_span");
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "swing_span", PROPERTY_HINT_RANGE, "-180,180,0.1,radians"), "set_param", "get_param", PARAM_SWING_SPAN);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "twist_span", PROPERTY_HINT_RANGE, "-40000,40000,0.1,radians"), "set_param", "get_param", PARAM_TWIST_SPAN);
|
||||
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "bias", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"), "set_param", "get_param", PARAM_BIAS);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"), "set_param", "get_param", PARAM_SOFTNESS);
|
||||
@ -620,8 +552,6 @@ real_t ConeTwistJoint3D::get_param(Param p_param) const {
|
||||
|
||||
void ConeTwistJoint3D::_configure_joint(RID p_joint, PhysicsBody3D *body_a, PhysicsBody3D *body_b) {
|
||||
Transform3D gt = get_global_transform();
|
||||
//Vector3 cone_twistpos = gt.origin;
|
||||
//Vector3 cone_twistdir = gt.basis.get_axis(2);
|
||||
|
||||
Transform3D ainv = body_a->get_global_transform().affine_inverse();
|
||||
|
||||
@ -652,73 +582,7 @@ ConeTwistJoint3D::ConeTwistJoint3D() {
|
||||
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
void Generic6DOFJoint3D::_set_angular_hi_limit_x(real_t p_limit_angular) {
|
||||
set_param_x(PARAM_ANGULAR_UPPER_LIMIT, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t Generic6DOFJoint3D::_get_angular_hi_limit_x() const {
|
||||
return Math::rad2deg(get_param_x(PARAM_ANGULAR_UPPER_LIMIT));
|
||||
}
|
||||
|
||||
void Generic6DOFJoint3D::_set_angular_lo_limit_x(real_t p_limit_angular) {
|
||||
set_param_x(PARAM_ANGULAR_LOWER_LIMIT, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t Generic6DOFJoint3D::_get_angular_lo_limit_x() const {
|
||||
return Math::rad2deg(get_param_x(PARAM_ANGULAR_LOWER_LIMIT));
|
||||
}
|
||||
|
||||
void Generic6DOFJoint3D::_set_angular_hi_limit_y(real_t p_limit_angular) {
|
||||
set_param_y(PARAM_ANGULAR_UPPER_LIMIT, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t Generic6DOFJoint3D::_get_angular_hi_limit_y() const {
|
||||
return Math::rad2deg(get_param_y(PARAM_ANGULAR_UPPER_LIMIT));
|
||||
}
|
||||
|
||||
void Generic6DOFJoint3D::_set_angular_lo_limit_y(real_t p_limit_angular) {
|
||||
set_param_y(PARAM_ANGULAR_LOWER_LIMIT, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t Generic6DOFJoint3D::_get_angular_lo_limit_y() const {
|
||||
return Math::rad2deg(get_param_y(PARAM_ANGULAR_LOWER_LIMIT));
|
||||
}
|
||||
|
||||
void Generic6DOFJoint3D::_set_angular_hi_limit_z(real_t p_limit_angular) {
|
||||
set_param_z(PARAM_ANGULAR_UPPER_LIMIT, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t Generic6DOFJoint3D::_get_angular_hi_limit_z() const {
|
||||
return Math::rad2deg(get_param_z(PARAM_ANGULAR_UPPER_LIMIT));
|
||||
}
|
||||
|
||||
void Generic6DOFJoint3D::_set_angular_lo_limit_z(real_t p_limit_angular) {
|
||||
set_param_z(PARAM_ANGULAR_LOWER_LIMIT, Math::deg2rad(p_limit_angular));
|
||||
}
|
||||
|
||||
real_t Generic6DOFJoint3D::_get_angular_lo_limit_z() const {
|
||||
return Math::rad2deg(get_param_z(PARAM_ANGULAR_LOWER_LIMIT));
|
||||
}
|
||||
|
||||
void Generic6DOFJoint3D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("_set_angular_hi_limit_x", "angle"), &Generic6DOFJoint3D::_set_angular_hi_limit_x);
|
||||
ClassDB::bind_method(D_METHOD("_get_angular_hi_limit_x"), &Generic6DOFJoint3D::_get_angular_hi_limit_x);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_angular_lo_limit_x", "angle"), &Generic6DOFJoint3D::_set_angular_lo_limit_x);
|
||||
ClassDB::bind_method(D_METHOD("_get_angular_lo_limit_x"), &Generic6DOFJoint3D::_get_angular_lo_limit_x);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_angular_hi_limit_y", "angle"), &Generic6DOFJoint3D::_set_angular_hi_limit_y);
|
||||
ClassDB::bind_method(D_METHOD("_get_angular_hi_limit_y"), &Generic6DOFJoint3D::_get_angular_hi_limit_y);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_angular_lo_limit_y", "angle"), &Generic6DOFJoint3D::_set_angular_lo_limit_y);
|
||||
ClassDB::bind_method(D_METHOD("_get_angular_lo_limit_y"), &Generic6DOFJoint3D::_get_angular_lo_limit_y);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_angular_hi_limit_z", "angle"), &Generic6DOFJoint3D::_set_angular_hi_limit_z);
|
||||
ClassDB::bind_method(D_METHOD("_get_angular_hi_limit_z"), &Generic6DOFJoint3D::_get_angular_hi_limit_z);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_set_angular_lo_limit_z", "angle"), &Generic6DOFJoint3D::_set_angular_lo_limit_z);
|
||||
ClassDB::bind_method(D_METHOD("_get_angular_lo_limit_z"), &Generic6DOFJoint3D::_get_angular_lo_limit_z);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_param_x", "param", "value"), &Generic6DOFJoint3D::set_param_x);
|
||||
ClassDB::bind_method(D_METHOD("get_param_x", "param"), &Generic6DOFJoint3D::get_param_x);
|
||||
|
||||
@ -794,8 +658,8 @@ void Generic6DOFJoint3D::_bind_methods() {
|
||||
ADD_GROUP("Angular Limit", "angular_limit_");
|
||||
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "angular_limit_x/enabled"), "set_flag_x", "get_flag_x", FLAG_ENABLE_ANGULAR_LIMIT);
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit_x/upper_angle", PROPERTY_HINT_RANGE, "-180,180,0.01"), "_set_angular_hi_limit_x", "_get_angular_hi_limit_x");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit_x/lower_angle", PROPERTY_HINT_RANGE, "-180,180,0.01"), "_set_angular_lo_limit_x", "_get_angular_lo_limit_x");
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_x/upper_angle", PROPERTY_HINT_RANGE, "-180,180,0.01,radians"), "set_param_x", "get_param_x", PARAM_ANGULAR_UPPER_LIMIT);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_x/lower_angle", PROPERTY_HINT_RANGE, "-180,180,0.01,radians"), "set_param_x", "get_param_x", PARAM_ANGULAR_LOWER_LIMIT);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_x/softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param_x", "get_param_x", PARAM_ANGULAR_LIMIT_SOFTNESS);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_x/restitution", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param_x", "get_param_x", PARAM_ANGULAR_RESTITUTION);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_x/damping", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param_x", "get_param_x", PARAM_ANGULAR_DAMPING);
|
||||
@ -803,8 +667,8 @@ void Generic6DOFJoint3D::_bind_methods() {
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_x/erp"), "set_param_x", "get_param_x", PARAM_ANGULAR_ERP);
|
||||
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "angular_limit_y/enabled"), "set_flag_y", "get_flag_y", FLAG_ENABLE_ANGULAR_LIMIT);
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit_y/upper_angle", PROPERTY_HINT_RANGE, "-180,180,0.01"), "_set_angular_hi_limit_y", "_get_angular_hi_limit_y");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit_y/lower_angle", PROPERTY_HINT_RANGE, "-180,180,0.01"), "_set_angular_lo_limit_y", "_get_angular_lo_limit_y");
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_y/upper_angle", PROPERTY_HINT_RANGE, "-180,180,0.01,radians"), "set_param_y", "get_param_y", PARAM_ANGULAR_UPPER_LIMIT);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_y/lower_angle", PROPERTY_HINT_RANGE, "-180,180,0.01,radians"), "set_param_y", "get_param_y", PARAM_ANGULAR_LOWER_LIMIT);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_y/softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param_y", "get_param_y", PARAM_ANGULAR_LIMIT_SOFTNESS);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_y/restitution", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param_y", "get_param_y", PARAM_ANGULAR_RESTITUTION);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_y/damping", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param_y", "get_param_y", PARAM_ANGULAR_DAMPING);
|
||||
@ -812,8 +676,8 @@ void Generic6DOFJoint3D::_bind_methods() {
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_y/erp"), "set_param_y", "get_param_y", PARAM_ANGULAR_ERP);
|
||||
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "angular_limit_z/enabled"), "set_flag_z", "get_flag_z", FLAG_ENABLE_ANGULAR_LIMIT);
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit_z/upper_angle", PROPERTY_HINT_RANGE, "-180,180,0.01"), "_set_angular_hi_limit_z", "_get_angular_hi_limit_z");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "angular_limit_z/lower_angle", PROPERTY_HINT_RANGE, "-180,180,0.01"), "_set_angular_lo_limit_z", "_get_angular_lo_limit_z");
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_z/upper_angle", PROPERTY_HINT_RANGE, "-180,180,0.01,radians"), "set_param_z", "get_param_z", PARAM_ANGULAR_UPPER_LIMIT);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_z/lower_angle", PROPERTY_HINT_RANGE, "-180,180,0.01,radians"), "set_param_z", "get_param_z", PARAM_ANGULAR_LOWER_LIMIT);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_z/softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param_z", "get_param_z", PARAM_ANGULAR_LIMIT_SOFTNESS);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_z/restitution", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param_z", "get_param_z", PARAM_ANGULAR_RESTITUTION);
|
||||
ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_limit_z/damping", PROPERTY_HINT_RANGE, "0.01,16,0.01"), "set_param_z", "get_param_z", PARAM_ANGULAR_DAMPING);
|
||||
|
||||
@ -136,12 +136,6 @@ protected:
|
||||
virtual void _configure_joint(RID p_joint, PhysicsBody3D *body_a, PhysicsBody3D *body_b) override;
|
||||
static void _bind_methods();
|
||||
|
||||
void _set_upper_limit(real_t p_limit);
|
||||
real_t _get_upper_limit() const;
|
||||
|
||||
void _set_lower_limit(real_t p_limit);
|
||||
real_t _get_lower_limit() const;
|
||||
|
||||
public:
|
||||
void set_param(Param p_param, real_t p_value);
|
||||
real_t get_param(Param p_param) const;
|
||||
@ -188,12 +182,6 @@ public:
|
||||
};
|
||||
|
||||
protected:
|
||||
void _set_upper_limit_angular(real_t p_limit_angular);
|
||||
real_t _get_upper_limit_angular() const;
|
||||
|
||||
void _set_lower_limit_angular(real_t p_limit_angular);
|
||||
real_t _get_lower_limit_angular() const;
|
||||
|
||||
real_t params[PARAM_MAX];
|
||||
virtual void _configure_joint(RID p_joint, PhysicsBody3D *body_a, PhysicsBody3D *body_b) override;
|
||||
static void _bind_methods();
|
||||
@ -221,12 +209,6 @@ public:
|
||||
};
|
||||
|
||||
protected:
|
||||
void _set_swing_span(real_t p_limit_angular);
|
||||
real_t _get_swing_span() const;
|
||||
|
||||
void _set_twist_span(real_t p_limit_angular);
|
||||
real_t _get_twist_span() const;
|
||||
|
||||
real_t params[PARAM_MAX];
|
||||
virtual void _configure_joint(RID p_joint, PhysicsBody3D *body_a, PhysicsBody3D *body_b) override;
|
||||
static void _bind_methods();
|
||||
@ -281,24 +263,6 @@ public:
|
||||
};
|
||||
|
||||
protected:
|
||||
void _set_angular_hi_limit_x(real_t p_limit_angular);
|
||||
real_t _get_angular_hi_limit_x() const;
|
||||
|
||||
void _set_angular_hi_limit_y(real_t p_limit_angular);
|
||||
real_t _get_angular_hi_limit_y() const;
|
||||
|
||||
void _set_angular_hi_limit_z(real_t p_limit_angular);
|
||||
real_t _get_angular_hi_limit_z() const;
|
||||
|
||||
void _set_angular_lo_limit_x(real_t p_limit_angular);
|
||||
real_t _get_angular_lo_limit_x() const;
|
||||
|
||||
void _set_angular_lo_limit_y(real_t p_limit_angular);
|
||||
real_t _get_angular_lo_limit_y() const;
|
||||
|
||||
void _set_angular_lo_limit_z(real_t p_limit_angular);
|
||||
real_t _get_angular_lo_limit_z() const;
|
||||
|
||||
real_t params_x[PARAM_MAX];
|
||||
bool flags_x[FLAG_MAX];
|
||||
real_t params_y[PARAM_MAX];
|
||||
|
||||
@ -1947,7 +1947,7 @@ void CharacterBody3D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("set_velocity", "velocity"), &CharacterBody3D::set_velocity);
|
||||
ClassDB::bind_method(D_METHOD("get_velocity"), &CharacterBody3D::get_velocity);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_safe_margin", "pixels"), &CharacterBody3D::set_safe_margin);
|
||||
ClassDB::bind_method(D_METHOD("set_safe_margin", "margin"), &CharacterBody3D::set_safe_margin);
|
||||
ClassDB::bind_method(D_METHOD("get_safe_margin"), &CharacterBody3D::get_safe_margin);
|
||||
ClassDB::bind_method(D_METHOD("is_floor_stop_on_slope_enabled"), &CharacterBody3D::is_floor_stop_on_slope_enabled);
|
||||
ClassDB::bind_method(D_METHOD("set_floor_stop_on_slope_enabled", "enabled"), &CharacterBody3D::set_floor_stop_on_slope_enabled);
|
||||
@ -2001,17 +2001,21 @@ void CharacterBody3D::_bind_methods() {
|
||||
ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "velocity", PROPERTY_HINT_NONE, "suffix:m/s", PROPERTY_USAGE_NO_EDITOR), "set_velocity", "get_velocity");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "max_slides", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_max_slides", "get_max_slides");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "wall_min_slide_angle", PROPERTY_HINT_RANGE, "0,180,0.1,radians", PROPERTY_USAGE_DEFAULT), "set_wall_min_slide_angle", "get_wall_min_slide_angle");
|
||||
|
||||
ADD_GROUP("Floor", "floor_");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "floor_stop_on_slope"), "set_floor_stop_on_slope_enabled", "is_floor_stop_on_slope_enabled");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "floor_constant_speed"), "set_floor_constant_speed_enabled", "is_floor_constant_speed_enabled");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "floor_block_on_wall"), "set_floor_block_on_wall_enabled", "is_floor_block_on_wall_enabled");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "floor_max_angle", PROPERTY_HINT_RANGE, "0,180,0.1,radians"), "set_floor_max_angle", "get_floor_max_angle");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "floor_snap_length", PROPERTY_HINT_RANGE, "0,1,0.01,or_greater,suffix:m"), "set_floor_snap_length", "get_floor_snap_length");
|
||||
|
||||
ADD_GROUP("Moving Platform", "moving_platform");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "moving_platform_apply_velocity_on_leave", PROPERTY_HINT_ENUM, "Always,Upward Only,Never", PROPERTY_USAGE_DEFAULT), "set_moving_platform_apply_velocity_on_leave", "get_moving_platform_apply_velocity_on_leave");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "moving_platform_floor_layers", PROPERTY_HINT_LAYERS_2D_PHYSICS), "set_moving_platform_floor_layers", "get_moving_platform_floor_layers");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "moving_platform_wall_layers", PROPERTY_HINT_LAYERS_2D_PHYSICS), "set_moving_platform_wall_layers", "get_moving_platform_wall_layers");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision/safe_margin", PROPERTY_HINT_RANGE, "0.001,256,0.001,suffix:m"), "set_safe_margin", "get_safe_margin");
|
||||
|
||||
ADD_GROUP("Collision", "");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "safe_margin", PROPERTY_HINT_RANGE, "0.001,256,0.001,suffix:m"), "set_safe_margin", "get_safe_margin");
|
||||
|
||||
BIND_ENUM_CONSTANT(MOTION_MODE_GROUNDED);
|
||||
BIND_ENUM_CONSTANT(MOTION_MODE_FLOATING);
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
/*************************************************************************/
|
||||
|
||||
#include "audio_effect_delay.h"
|
||||
|
||||
#include "core/math/math_funcs.h"
|
||||
#include "servers/audio_server.h"
|
||||
|
||||
@ -286,37 +287,21 @@ void AudioEffectDelay::_bind_methods() {
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "dry", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_dry", "get_dry");
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "tap1/active"), "set_tap1_active", "is_tap1_active");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap1/delay_ms", PROPERTY_HINT_RANGE, "0,1500,1,suffix:ms"), "set_tap1_delay_ms", "get_tap1_delay_ms");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap1/level_db", PROPERTY_HINT_RANGE, "-60,0,0.01,suffix:dB"), "set_tap1_level_db", "get_tap1_level_db");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap1/pan", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_tap1_pan", "get_tap1_pan");
|
||||
ADD_GROUP("Tap 1", "tap1_");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "tap1_active"), "set_tap1_active", "is_tap1_active");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap1_delay_ms", PROPERTY_HINT_RANGE, "0,1500,1,suffix:ms"), "set_tap1_delay_ms", "get_tap1_delay_ms");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap1_level_db", PROPERTY_HINT_RANGE, "-60,0,0.01,suffix:dB"), "set_tap1_level_db", "get_tap1_level_db");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap1_pan", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_tap1_pan", "get_tap1_pan");
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "tap2/active"), "set_tap2_active", "is_tap2_active");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap2/delay_ms", PROPERTY_HINT_RANGE, "0,1500,1,suffix:ms"), "set_tap2_delay_ms", "get_tap2_delay_ms");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap2/level_db", PROPERTY_HINT_RANGE, "-60,0,0.01,suffix:dB"), "set_tap2_level_db", "get_tap2_level_db");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap2/pan", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_tap2_pan", "get_tap2_pan");
|
||||
ADD_GROUP("Tap 2", "tap2_");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "tap2_active"), "set_tap2_active", "is_tap2_active");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap2_delay_ms", PROPERTY_HINT_RANGE, "0,1500,1,suffix:ms"), "set_tap2_delay_ms", "get_tap2_delay_ms");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap2_level_db", PROPERTY_HINT_RANGE, "-60,0,0.01,suffix:dB"), "set_tap2_level_db", "get_tap2_level_db");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap2_pan", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_tap2_pan", "get_tap2_pan");
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "feedback/active"), "set_feedback_active", "is_feedback_active");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "feedback/delay_ms", PROPERTY_HINT_RANGE, "0,1500,1,suffix:ms"), "set_feedback_delay_ms", "get_feedback_delay_ms");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "feedback/level_db", PROPERTY_HINT_RANGE, "-60,0,0.01,suffix:dB"), "set_feedback_level_db", "get_feedback_level_db");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "feedback/lowpass", PROPERTY_HINT_RANGE, "1,16000,1"), "set_feedback_lowpass", "get_feedback_lowpass");
|
||||
}
|
||||
|
||||
AudioEffectDelay::AudioEffectDelay() {
|
||||
tap_1_active = true;
|
||||
tap_1_delay_ms = 250;
|
||||
tap_1_level = -6;
|
||||
tap_1_pan = 0.2;
|
||||
|
||||
tap_2_active = true;
|
||||
tap_2_delay_ms = 500;
|
||||
tap_2_level = -12;
|
||||
tap_2_pan = -0.4;
|
||||
|
||||
feedback_active = false;
|
||||
feedback_delay_ms = 340;
|
||||
feedback_level = -6;
|
||||
feedback_lowpass = 16000;
|
||||
|
||||
dry = 1.0;
|
||||
ADD_GROUP("Feedback", "feedback_");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "feedback_active"), "set_feedback_active", "is_feedback_active");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "feedback_delay_ms", PROPERTY_HINT_RANGE, "0,1500,1,suffix:ms"), "set_feedback_delay_ms", "get_feedback_delay_ms");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "feedback_level_db", PROPERTY_HINT_RANGE, "-60,0,0.01,suffix:dB"), "set_feedback_level_db", "get_feedback_level_db");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "feedback_lowpass", PROPERTY_HINT_RANGE, "1,16000,1"), "set_feedback_lowpass", "get_feedback_lowpass");
|
||||
}
|
||||
|
||||
@ -37,6 +37,7 @@ class AudioEffectDelay;
|
||||
|
||||
class AudioEffectDelayInstance : public AudioEffectInstance {
|
||||
GDCLASS(AudioEffectDelayInstance, AudioEffectInstance);
|
||||
|
||||
friend class AudioEffectDelay;
|
||||
Ref<AudioEffectDelay> base;
|
||||
|
||||
@ -66,22 +67,22 @@ class AudioEffectDelay : public AudioEffect {
|
||||
MAX_TAPS = 2
|
||||
};
|
||||
|
||||
float dry;
|
||||
float dry = 1.0f;
|
||||
|
||||
bool tap_1_active;
|
||||
float tap_1_delay_ms;
|
||||
float tap_1_level;
|
||||
float tap_1_pan;
|
||||
bool tap_1_active = true;
|
||||
float tap_1_delay_ms = 250.0f;
|
||||
float tap_1_level = -6.0f;
|
||||
float tap_1_pan = 0.2f;
|
||||
|
||||
bool tap_2_active;
|
||||
float tap_2_delay_ms;
|
||||
float tap_2_level;
|
||||
float tap_2_pan;
|
||||
bool tap_2_active = true;
|
||||
float tap_2_delay_ms = 500.0f;
|
||||
float tap_2_level = -12.0f;
|
||||
float tap_2_pan = -0.4f;
|
||||
|
||||
bool feedback_active;
|
||||
float feedback_delay_ms;
|
||||
float feedback_level;
|
||||
float feedback_lowpass;
|
||||
bool feedback_active = false;
|
||||
float feedback_delay_ms = 340.0f;
|
||||
float feedback_level = -6.0f;
|
||||
float feedback_lowpass = 16000.0f;
|
||||
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
@ -128,7 +129,7 @@ public:
|
||||
|
||||
Ref<AudioEffectInstance> instantiate() override;
|
||||
|
||||
AudioEffectDelay();
|
||||
AudioEffectDelay() {}
|
||||
};
|
||||
|
||||
#endif // AUDIO_EFFECT_DELAY_H
|
||||
|
||||
Loading…
Reference in New Issue
Block a user