From 6cf2623a20466467821e5353c3d7968d4e92d532 Mon Sep 17 00:00:00 2001 From: Micky <66727710+Mickeon@users.noreply.github.com> Date: Tue, 7 Dec 2021 19:01:01 +0100 Subject: [PATCH] Various improvements to Camera2D's documentation A summary of the tweaked descriptions: * "get_camera_position()" is explains what the camera position is, and mitigates the confusion between this method and Node2D.position; * "get_camera_screen_center()" links to the "get_camera_position" method; * "reset_smoothing()" links to the "smoothing_enabled" propriety; * "drag_horizontal_offset" and "drag_vertical_offset" link to their respective _enabled_ properties; * "limit_smoothed" links to the "smoothing_enabled" propriety; * "rotating" clarifies that the camera _view_ rotates when enabled. Partially closes https://github.com/godotengine/godot-docs/issues/5417, as some of the issues described are no longer present in 4.0, or are not fully solved in this PR. Further tweaks are welcome, as I'm afraid this could be a too verbose. A few of these could be split into their PR if necessary. --- doc/classes/Camera2D.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/classes/Camera2D.xml b/doc/classes/Camera2D.xml index 6a1782fc526..1bcc9689aac 100644 --- a/doc/classes/Camera2D.xml +++ b/doc/classes/Camera2D.xml @@ -30,13 +30,15 @@ - Returns the camera position. + Returns the camera's [code]position[/code] (the tracked point the camera attempts to follow), relative to the origin. + [b]Note:[/b] The returned value is not the same as [member Node2D.position] or [member Node2D.global_position], as it is affected by the [code]drag[/code] properties. Returns the location of the [Camera2D]'s screen-center, relative to the origin. + [b]Note:[/b] The real [code]position[/code] of the camera may be different, see [method get_camera_position]. @@ -57,7 +59,7 @@ Sets the camera's position immediately to its current smoothing destination. - This has no effect if smoothing is disabled. + This method has no effect if [member smoothing_enabled] is [code]false[/code]. @@ -95,7 +97,7 @@ The relative horizontal drag offset of the camera between the right ([code]-1[/code]) and left ([code]1[/code]) drag margins. - [b]Note:[/b] Used to set the initial horizontal drag offset; determine the current offset; or force the current offset. It's not automatically updated when the horizontal drag margin is enabled or the drag margins are changed. + [b]Note:[/b] Used to set the initial horizontal drag offset; determine the current offset; or force the current offset. It's not automatically updated when [member drag_horizontal_enabled] is [code]true[/code] or the drag margins are changed. Left margin needed to drag the camera. A value of [code]1[/code] makes the camera move only when reaching the left edge of the screen. @@ -111,7 +113,7 @@ The relative vertical drag offset of the camera between the bottom ([code]-1[/code]) and top ([code]1[/code]) drag margins. - [b]Note:[/b] Used to set the initial vertical drag offset; determine the current offset; or force the current offset. It's not automatically updated when the vertical drag margin is enabled or the drag margins are changed. + [b]Note:[/b] Used to set the initial vertical drag offset; determine the current offset; or force the current offset. It's not automatically updated when [member drag_vertical_enabled] is [code]true[/code] or the drag margins are changed. If [code]true[/code], draws the camera's drag margin rectangle in the editor. @@ -133,7 +135,7 @@ If [code]true[/code], the camera smoothly stops when reaches its limits. - This has no effect if smoothing is disabled. + This property has no effect if [member smoothing_enabled] is [code]false[/code]. [b]Note:[/b] To immediately update the camera's position to be within limits without smoothing, even with this setting enabled, invoke [method reset_smoothing]. @@ -146,7 +148,7 @@ The camera's process callback. See [enum Camera2DProcessCallback]. - If [code]true[/code], the camera rotates with the target. + If [code]true[/code], the camera view rotates with the target. If [code]true[/code], the camera smoothly moves towards the target at [member smoothing_speed].