From b65bcfd3061f038b956dd99a5e10948fd95d5ba4 Mon Sep 17 00:00:00 2001 From: Avery-Moore Date: Tue, 12 Dec 2023 12:12:05 -0800 Subject: [PATCH 1/2] Remove 'DEPTH' constant from CanvasItem shaders --- tutorials/shaders/shader_reference/canvas_item_shader.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tutorials/shaders/shader_reference/canvas_item_shader.rst b/tutorials/shaders/shader_reference/canvas_item_shader.rst index bac835ec29e..e306b0b0702 100644 --- a/tutorials/shaders/shader_reference/canvas_item_shader.rst +++ b/tutorials/shaders/shader_reference/canvas_item_shader.rst @@ -159,8 +159,7 @@ it to the ``NORMALMAP`` property. Godot will handle converting it for use in 2D | Built-in | Description | +=============================================+===============================================================+ | in vec4 **FRAGCOORD** | Coordinate of pixel center. In screen space. ``xy`` specifies | -| | position in window, ``z`` specifies fragment depth if | -| | ``DEPTH`` is not used. Origin is lower-left. | +| | position in window. | +---------------------------------------------+---------------------------------------------------------------+ | in vec2 **SCREEN_PIXEL_SIZE** | Size of individual pixels. Equal to inverse of resolution. | +---------------------------------------------+---------------------------------------------------------------+ @@ -233,8 +232,7 @@ Below is an example of a light shader that takes a CanvasItem's normal map into | Built-in | Description | +==================================+==============================================================================+ | in vec4 **FRAGCOORD** | Coordinate of pixel center. In screen space. ``xy`` specifies | -| | position in window, ``z`` specifies fragment depth if | -| | ``DEPTH`` is not used. Origin is lower-left. | +| | position in window. | +----------------------------------+------------------------------------------------------------------------------+ | in vec3 **NORMAL** | Input Normal. | +----------------------------------+------------------------------------------------------------------------------+ From 2a37dca14e4620a27d6119786ecc097bdc113efa Mon Sep 17 00:00:00 2001 From: Avery-Moore Date: Tue, 12 Dec 2023 12:41:19 -0800 Subject: [PATCH 2/2] Re-added Origin mention --- tutorials/shaders/shader_reference/canvas_item_shader.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorials/shaders/shader_reference/canvas_item_shader.rst b/tutorials/shaders/shader_reference/canvas_item_shader.rst index e306b0b0702..3090093e523 100644 --- a/tutorials/shaders/shader_reference/canvas_item_shader.rst +++ b/tutorials/shaders/shader_reference/canvas_item_shader.rst @@ -159,7 +159,7 @@ it to the ``NORMALMAP`` property. Godot will handle converting it for use in 2D | Built-in | Description | +=============================================+===============================================================+ | in vec4 **FRAGCOORD** | Coordinate of pixel center. In screen space. ``xy`` specifies | -| | position in window. | +| | position in window. Origin is lower-left. | +---------------------------------------------+---------------------------------------------------------------+ | in vec2 **SCREEN_PIXEL_SIZE** | Size of individual pixels. Equal to inverse of resolution. | +---------------------------------------------+---------------------------------------------------------------+ @@ -232,7 +232,7 @@ Below is an example of a light shader that takes a CanvasItem's normal map into | Built-in | Description | +==================================+==============================================================================+ | in vec4 **FRAGCOORD** | Coordinate of pixel center. In screen space. ``xy`` specifies | -| | position in window. | +| | position in window. Origin is lower-left. | +----------------------------------+------------------------------------------------------------------------------+ | in vec3 **NORMAL** | Input Normal. | +----------------------------------+------------------------------------------------------------------------------+