Skip to content

Commit

Permalink
Merge pull request #24924 from danilo2205/rename-oriented-path-follow
Browse files Browse the repository at this point in the history
Merge OrientedPathFollow into PathFollow
  • Loading branch information
akien-mga authored Jan 16, 2019
2 parents 9c17688 + e74a3ad commit 07e2046
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 336 deletions.
4 changes: 2 additions & 2 deletions doc/classes/Curve3D.xml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
</argument>
<description>
Sets the tilt angle in radians for the point [code]idx[/code]. If the index is out of bounds, the function sends an error to the console.
The tilt controls the rotation along the look-at axis an object traveling the path would have. In the case of a curve controlling a [PathFollow] or [OrientedPathFollow], this tilt is an offset over the natural tilt the [PathFollow] or [OrientedPathFollow] calculates.
The tilt controls the rotation along the look-at axis an object traveling the path would have. In the case of a curve controlling a [PathFollow], this tilt is an offset over the natural tilt the [PathFollow] calculates.
</description>
</method>
<method name="tessellate" qualifiers="const">
Expand All @@ -248,7 +248,7 @@
The distance in meters between two adjacent cached points. Changing it forces the cache to be recomputed the next time the [method get_baked_points] or [method get_baked_length] function is called. The smaller the distance, the more points in the cache and the more memory it will consume, so use with care.
</member>
<member name="up_vector_enabled" type="bool" setter="set_up_vector_enabled" getter="is_up_vector_enabled">
If [code]true[/code], the curve will bake up vectors used for orientation. See [OrientedPathFollow]. Changing it forces the cache to be recomputed.
If [code]true[/code], the curve will bake up vectors used for orientation. This is used when a [member PathFollow.rotation_mode] is set to [code]ROTATION_ORIENTED[/code], see [PathFollow] for details. Changing it forces the cache to be recomputed.
</member>
</members>
<constants>
Expand Down
40 changes: 0 additions & 40 deletions doc/classes/OrientedPathFollow.xml

This file was deleted.

3 changes: 3 additions & 0 deletions doc/classes/PathFollow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,8 @@
<constant name="ROTATION_XYZ" value="3" enum="RotationMode">
Allows the PathFollow to rotate in any axis.
</constant>
<constant name="ROTATION_ORIENTED" value="4" enum="RotationMode">
Uses the up vector information in a [Curve3D] to enforce orientation. This rotation mode requires the [Path]'s [member Curve3D.up_vector_enabled] property to be set to [code]true[/code].
</constant>
</constants>
</class>
5 changes: 0 additions & 5 deletions editor/icons/icon_oriented_path_follow.svg

This file was deleted.

Loading

0 comments on commit 07e2046

Please sign in to comment.