Browse Source

Merge pull request #4234 from NathanLovato/organization/rename-shading-section

Rename shading, GUI, and I/O sections
Nathan Lovato 4 years ago
parent
commit
e63784bda8
100 changed files with 14 additions and 14 deletions
  1. 1 1
      classes/class_charfxtransform.rst
  2. 1 1
      classes/class_control.rst
  3. 1 1
      classes/class_richtexteffect.rst
  4. 1 1
      classes/class_richtextlabel.rst
  5. 1 1
      classes/class_shader.rst
  6. 1 1
      classes/class_shadermaterial.rst
  7. 1 1
      classes/class_theme.rst
  8. 1 1
      classes/class_visualshadernode.rst
  9. 2 2
      index.rst
  10. 2 2
      tutorials/io/index.rst
  11. 0 0
      tutorials/shaders/advanced_postprocessing.rst
  12. 0 0
      tutorials/shaders/converting_glsl_to_godot_shaders.rst
  13. 0 0
      tutorials/shaders/custom_postprocessing.rst
  14. 0 0
      tutorials/shaders/img/planet_example.png
  15. 0 0
      tutorials/shaders/img/planet_gradient.png
  16. 0 0
      tutorials/shaders/img/planet_new_colorrect.png
  17. 0 0
      tutorials/shaders/img/planet_new_viewport.png
  18. 0 0
      tutorials/shaders/img/planet_new_viewport_texture.png
  19. 0 0
      tutorials/shaders/img/planet_noise.png
  20. 0 0
      tutorials/shaders/img/planet_noise_color.png
  21. 0 0
      tutorials/shaders/img/planet_noise_fbm.png
  22. 0 0
      tutorials/shaders/img/planet_noise_fbm_shaded.png
  23. 0 0
      tutorials/shaders/img/planet_noise_smooth.png
  24. 0 0
      tutorials/shaders/img/planet_normals.png
  25. 0 0
      tutorials/shaders/img/planet_ocean.png
  26. 0 0
      tutorials/shaders/img/planet_ocean_reflect.png
  27. 0 0
      tutorials/shaders/img/planet_pick_viewport_texture.png
  28. 0 0
      tutorials/shaders/img/planet_seam.png
  29. 0 0
      tutorials/shaders/img/planet_sincos.png
  30. 0 0
      tutorials/shaders/img/post_blur.png
  31. 0 0
      tutorials/shaders/img/post_boxes.png
  32. 0 0
      tutorials/shaders/img/post_hierarchy1.png
  33. 0 0
      tutorials/shaders/img/post_hierarchy2.png
  34. 0 0
      tutorials/shaders/img/post_outline.png
  35. 0 0
      tutorials/shaders/img/shader_create.png
  36. 0 0
      tutorials/shaders/img/shader_material_convert.png
  37. 0 0
      tutorials/shaders/img/shader_material_create.png
  38. 0 0
      tutorials/shaders/img/shader_material_create_mesh.png
  39. 0 0
      tutorials/shaders/img/shader_material_editor.png
  40. 0 0
      tutorials/shaders/img/texscreen_bbc.png
  41. 0 0
      tutorials/shaders/img/texscreen_demo1.png
  42. 0 0
      tutorials/shaders/img/texscreen_demo2.png
  43. 0 0
      tutorials/shaders/img/visual_shader_code.png
  44. 0 0
      tutorials/shaders/img/visual_shader_create.png
  45. 0 0
      tutorials/shaders/img/visual_shader_editor.png
  46. 0 0
      tutorials/shaders/img/visual_shader_editor2.png
  47. 0 0
      tutorials/shaders/img/vs_boolean.gif
  48. 0 0
      tutorials/shaders/img/vs_expression.gif
  49. 0 0
      tutorials/shaders/img/vs_expression2.png
  50. 0 0
      tutorials/shaders/img/vs_fresnel.png
  51. 0 0
      tutorials/shaders/img/vs_if.png
  52. 0 0
      tutorials/shaders/img/vs_popup.png
  53. 0 0
      tutorials/shaders/img/vs_switch.png
  54. 2 2
      tutorials/shaders/index.rst
  55. 0 0
      tutorials/shaders/introduction_to_shaders.rst
  56. 0 0
      tutorials/shaders/screen-reading_shaders.rst
  57. 0 0
      tutorials/shaders/shader_materials.rst
  58. 0 0
      tutorials/shaders/shader_reference/canvas_item_shader.rst
  59. 0 0
      tutorials/shaders/shader_reference/index.rst
  60. 0 0
      tutorials/shaders/shader_reference/particle_shader.rst
  61. 0 0
      tutorials/shaders/shader_reference/shaders.rst
  62. 0 0
      tutorials/shaders/shader_reference/shading_language.rst
  63. 0 0
      tutorials/shaders/shader_reference/sky_shader.rst
  64. 0 0
      tutorials/shaders/shader_reference/spatial_shader.rst
  65. 0 0
      tutorials/shaders/shaders_style_guide.rst
  66. 0 0
      tutorials/shaders/using_viewport_as_texture.rst
  67. 0 0
      tutorials/shaders/visual_shaders.rst
  68. 0 0
      tutorials/shaders/your_first_shader/img/PBR.png
  69. 0 0
      tutorials/shaders/your_first_shader/img/UV.png
  70. 0 0
      tutorials/shaders/your_first_shader/img/albedo.png
  71. 0 0
      tutorials/shaders/your_first_shader/img/blue-box.png
  72. 0 0
      tutorials/shaders/your_first_shader/img/blue-tex.png
  73. 0 0
      tutorials/shaders/your_first_shader/img/cos.png
  74. 0 0
      tutorials/shaders/your_first_shader/img/cos4.png
  75. 0 0
      tutorials/shaders/your_first_shader/img/dark-water.png
  76. 0 0
      tutorials/shaders/your_first_shader/img/fresnel.png
  77. 0 0
      tutorials/shaders/your_first_shader/img/iconuv.png
  78. 0 0
      tutorials/shaders/your_first_shader/img/light.png
  79. 0 0
      tutorials/shaders/your_first_shader/img/noise-low.png
  80. 0 0
      tutorials/shaders/your_first_shader/img/noise-set.png
  81. 0 0
      tutorials/shaders/your_first_shader/img/noise.png
  82. 0 0
      tutorials/shaders/your_first_shader/img/normal-set.png
  83. 0 0
      tutorials/shaders/your_first_shader/img/normal.png
  84. 0 0
      tutorials/shaders/your_first_shader/img/normalmap.png
  85. 0 0
      tutorials/shaders/your_first_shader/img/normalmap2.png
  86. 0 0
      tutorials/shaders/your_first_shader/img/plane-sub-set.png
  87. 0 0
      tutorials/shaders/your_first_shader/img/plane-sub.png
  88. 0 0
      tutorials/shaders/your_first_shader/img/plane.png
  89. 0 0
      tutorials/shaders/your_first_shader/img/plastic.png
  90. 0 0
      tutorials/shaders/your_first_shader/img/rim.png
  91. 0 0
      tutorials/shaders/your_first_shader/img/shader-error.png
  92. 0 0
      tutorials/shaders/your_first_shader/img/specular-toon.png
  93. 0 0
      tutorials/shaders/your_first_shader/img/wave1.png
  94. 0 0
      tutorials/shaders/your_first_shader/img/wave2.png
  95. 0 0
      tutorials/shaders/your_first_shader/img/wave3.png
  96. 0 0
      tutorials/shaders/your_first_shader/index.rst
  97. 0 0
      tutorials/shaders/your_first_shader/your_first_2d_shader.rst
  98. 0 0
      tutorials/shaders/your_first_shader/your_first_3d_shader.rst
  99. 0 0
      tutorials/shaders/your_first_shader/your_second_3d_shader.rst
  100. 0 0
      tutorials/ui/bbcode_in_richtextlabel.rst

+ 1 - 1
classes/class_charfxtransform.rst

@@ -21,7 +21,7 @@ By setting various properties on this object, you can control how individual cha
 Tutorials
 ---------
 
-- :doc:`../tutorials/gui/bbcode_in_richtextlabel`
+- :doc:`../tutorials/ui/bbcode_in_richtextlabel`
 
 - `https://github.com/Eoin-ONeill-Yokai/Godot-Rich-Text-Effect-Test-Project <https://github.com/Eoin-ONeill-Yokai/Godot-Rich-Text-Effect-Test-Project>`_
 

+ 1 - 1
classes/class_control.rst

@@ -35,7 +35,7 @@ Sets :ref:`mouse_filter<class_Control_property_mouse_filter>` to :ref:`MOUSE_FIL
 Tutorials
 ---------
 
-- :doc:`../tutorials/gui/index`
+- :doc:`../tutorials/ui/index`
 
 - :doc:`../tutorials/2d/custom_drawing_in_2d`
 

+ 1 - 1
classes/class_richtexteffect.rst

@@ -30,7 +30,7 @@ A custom effect for use with :ref:`RichTextLabel<class_RichTextLabel>`.
 Tutorials
 ---------
 
-- :doc:`../tutorials/gui/bbcode_in_richtextlabel`
+- :doc:`../tutorials/ui/bbcode_in_richtextlabel`
 
 - `https://github.com/Eoin-ONeill-Yokai/Godot-Rich-Text-Effect-Test-Project <https://github.com/Eoin-ONeill-Yokai/Godot-Rich-Text-Effect-Test-Project>`_
 

+ 1 - 1
classes/class_richtextlabel.rst

@@ -23,7 +23,7 @@ Rich text can contain custom text, fonts, images and some basic formatting. The
 Tutorials
 ---------
 
-- :doc:`../tutorials/gui/bbcode_in_richtextlabel`
+- :doc:`../tutorials/ui/bbcode_in_richtextlabel`
 
 Properties
 ----------

+ 1 - 1
classes/class_shader.rst

@@ -23,7 +23,7 @@ This class allows you to define a custom shader program that can be used by a :r
 Tutorials
 ---------
 
-- :doc:`../tutorials/shading/index`
+- :doc:`../tutorials/shaders/index`
 
 - :ref:`doc_introduction_to_shaders`
 

+ 1 - 1
classes/class_shadermaterial.rst

@@ -21,7 +21,7 @@ A material that uses a custom :ref:`Shader<class_Shader>` program to render eith
 Tutorials
 ---------
 
-- :doc:`../tutorials/shading/index`
+- :doc:`../tutorials/shaders/index`
 
 Properties
 ----------

+ 1 - 1
classes/class_theme.rst

@@ -23,7 +23,7 @@ Theme resources can alternatively be loaded by writing them in a ``.theme`` file
 Tutorials
 ---------
 
-- :doc:`../tutorials/gui/gui_skinning`
+- :doc:`../tutorials/ui/gui_skinning`
 
 Properties
 ----------

+ 1 - 1
classes/class_visualshadernode.rst

@@ -18,7 +18,7 @@ Base class for nodes in a visual shader graph.
 Tutorials
 ---------
 
-- :doc:`../tutorials/shading/visual_shaders`
+- :doc:`../tutorials/shaders/visual_shaders`
 
 Properties
 ----------

+ 2 - 2
index.rst

@@ -89,9 +89,9 @@ The main documentation for the site is organized into the following sections:
    tutorials/inputs/index
    tutorials/io/index
    tutorials/i18n/index
-   tutorials/gui/index
+   tutorials/ui/index
    tutorials/rendering/index
-   tutorials/shading/index
+   tutorials/shaders/index
    tutorials/networking/index
    tutorials/vr/index
    tutorials/plugins/index

+ 2 - 2
tutorials/io/index.rst

@@ -1,5 +1,5 @@
-I/O
-===
+Input and Output (I/O)
+======================
 
 .. toctree::
     :maxdepth: 1

+ 0 - 0
tutorials/shading/advanced_postprocessing.rst → tutorials/shaders/advanced_postprocessing.rst


+ 0 - 0
tutorials/shading/converting_glsl_to_godot_shaders.rst → tutorials/shaders/converting_glsl_to_godot_shaders.rst


+ 0 - 0
tutorials/shading/custom_postprocessing.rst → tutorials/shaders/custom_postprocessing.rst


+ 0 - 0
tutorials/shading/img/planet_example.png → tutorials/shaders/img/planet_example.png


+ 0 - 0
tutorials/shading/img/planet_gradient.png → tutorials/shaders/img/planet_gradient.png


+ 0 - 0
tutorials/shading/img/planet_new_colorrect.png → tutorials/shaders/img/planet_new_colorrect.png


+ 0 - 0
tutorials/shading/img/planet_new_viewport.png → tutorials/shaders/img/planet_new_viewport.png


+ 0 - 0
tutorials/shading/img/planet_new_viewport_texture.png → tutorials/shaders/img/planet_new_viewport_texture.png


+ 0 - 0
tutorials/shading/img/planet_noise.png → tutorials/shaders/img/planet_noise.png


+ 0 - 0
tutorials/shading/img/planet_noise_color.png → tutorials/shaders/img/planet_noise_color.png


+ 0 - 0
tutorials/shading/img/planet_noise_fbm.png → tutorials/shaders/img/planet_noise_fbm.png


+ 0 - 0
tutorials/shading/img/planet_noise_fbm_shaded.png → tutorials/shaders/img/planet_noise_fbm_shaded.png


+ 0 - 0
tutorials/shading/img/planet_noise_smooth.png → tutorials/shaders/img/planet_noise_smooth.png


+ 0 - 0
tutorials/shading/img/planet_normals.png → tutorials/shaders/img/planet_normals.png


+ 0 - 0
tutorials/shading/img/planet_ocean.png → tutorials/shaders/img/planet_ocean.png


+ 0 - 0
tutorials/shading/img/planet_ocean_reflect.png → tutorials/shaders/img/planet_ocean_reflect.png


+ 0 - 0
tutorials/shading/img/planet_pick_viewport_texture.png → tutorials/shaders/img/planet_pick_viewport_texture.png


+ 0 - 0
tutorials/shading/img/planet_seam.png → tutorials/shaders/img/planet_seam.png


+ 0 - 0
tutorials/shading/img/planet_sincos.png → tutorials/shaders/img/planet_sincos.png


+ 0 - 0
tutorials/shading/img/post_blur.png → tutorials/shaders/img/post_blur.png


+ 0 - 0
tutorials/shading/img/post_boxes.png → tutorials/shaders/img/post_boxes.png


+ 0 - 0
tutorials/shading/img/post_hierarchy1.png → tutorials/shaders/img/post_hierarchy1.png


+ 0 - 0
tutorials/shading/img/post_hierarchy2.png → tutorials/shaders/img/post_hierarchy2.png


+ 0 - 0
tutorials/shading/img/post_outline.png → tutorials/shaders/img/post_outline.png


+ 0 - 0
tutorials/shading/img/shader_create.png → tutorials/shaders/img/shader_create.png


+ 0 - 0
tutorials/shading/img/shader_material_convert.png → tutorials/shaders/img/shader_material_convert.png


+ 0 - 0
tutorials/shading/img/shader_material_create.png → tutorials/shaders/img/shader_material_create.png


+ 0 - 0
tutorials/shading/img/shader_material_create_mesh.png → tutorials/shaders/img/shader_material_create_mesh.png


+ 0 - 0
tutorials/shading/img/shader_material_editor.png → tutorials/shaders/img/shader_material_editor.png


+ 0 - 0
tutorials/shading/img/texscreen_bbc.png → tutorials/shaders/img/texscreen_bbc.png


+ 0 - 0
tutorials/shading/img/texscreen_demo1.png → tutorials/shaders/img/texscreen_demo1.png


+ 0 - 0
tutorials/shading/img/texscreen_demo2.png → tutorials/shaders/img/texscreen_demo2.png


+ 0 - 0
tutorials/shading/img/visual_shader_code.png → tutorials/shaders/img/visual_shader_code.png


+ 0 - 0
tutorials/shading/img/visual_shader_create.png → tutorials/shaders/img/visual_shader_create.png


+ 0 - 0
tutorials/shading/img/visual_shader_editor.png → tutorials/shaders/img/visual_shader_editor.png


+ 0 - 0
tutorials/shading/img/visual_shader_editor2.png → tutorials/shaders/img/visual_shader_editor2.png


+ 0 - 0
tutorials/shading/img/vs_boolean.gif → tutorials/shaders/img/vs_boolean.gif


+ 0 - 0
tutorials/shading/img/vs_expression.gif → tutorials/shaders/img/vs_expression.gif


+ 0 - 0
tutorials/shading/img/vs_expression2.png → tutorials/shaders/img/vs_expression2.png


+ 0 - 0
tutorials/shading/img/vs_fresnel.png → tutorials/shaders/img/vs_fresnel.png


+ 0 - 0
tutorials/shading/img/vs_if.png → tutorials/shaders/img/vs_if.png


+ 0 - 0
tutorials/shading/img/vs_popup.png → tutorials/shaders/img/vs_popup.png


+ 0 - 0
tutorials/shading/img/vs_switch.png → tutorials/shaders/img/vs_switch.png


+ 2 - 2
tutorials/shading/index.rst → tutorials/shaders/index.rst

@@ -1,4 +1,4 @@
-Shading
+Shaders
 =======
 
 .. toctree::
@@ -6,7 +6,7 @@ Shading
    :name: toc-learn-features-shading
 
    introduction_to_shaders
-   shading_reference/index
+   shader_reference/index
    your_first_shader/index
    shader_materials
    visual_shaders

+ 0 - 0
tutorials/shading/introduction_to_shaders.rst → tutorials/shaders/introduction_to_shaders.rst


+ 0 - 0
tutorials/shading/screen-reading_shaders.rst → tutorials/shaders/screen-reading_shaders.rst


+ 0 - 0
tutorials/shading/shader_materials.rst → tutorials/shaders/shader_materials.rst


+ 0 - 0
tutorials/shading/shading_reference/canvas_item_shader.rst → tutorials/shaders/shader_reference/canvas_item_shader.rst


+ 0 - 0
tutorials/shading/shading_reference/index.rst → tutorials/shaders/shader_reference/index.rst


+ 0 - 0
tutorials/shading/shading_reference/particle_shader.rst → tutorials/shaders/shader_reference/particle_shader.rst


+ 0 - 0
tutorials/shading/shading_reference/shaders.rst → tutorials/shaders/shader_reference/shaders.rst


+ 0 - 0
tutorials/shading/shading_reference/shading_language.rst → tutorials/shaders/shader_reference/shading_language.rst


+ 0 - 0
tutorials/shading/shading_reference/sky_shader.rst → tutorials/shaders/shader_reference/sky_shader.rst


+ 0 - 0
tutorials/shading/shading_reference/spatial_shader.rst → tutorials/shaders/shader_reference/spatial_shader.rst


+ 0 - 0
tutorials/shading/shaders_style_guide.rst → tutorials/shaders/shaders_style_guide.rst


+ 0 - 0
tutorials/shading/using_viewport_as_texture.rst → tutorials/shaders/using_viewport_as_texture.rst


+ 0 - 0
tutorials/shading/visual_shaders.rst → tutorials/shaders/visual_shaders.rst


+ 0 - 0
tutorials/shading/your_first_shader/img/PBR.png → tutorials/shaders/your_first_shader/img/PBR.png


+ 0 - 0
tutorials/shading/your_first_shader/img/UV.png → tutorials/shaders/your_first_shader/img/UV.png


+ 0 - 0
tutorials/shading/your_first_shader/img/albedo.png → tutorials/shaders/your_first_shader/img/albedo.png


+ 0 - 0
tutorials/shading/your_first_shader/img/blue-box.png → tutorials/shaders/your_first_shader/img/blue-box.png


+ 0 - 0
tutorials/shading/your_first_shader/img/blue-tex.png → tutorials/shaders/your_first_shader/img/blue-tex.png


+ 0 - 0
tutorials/shading/your_first_shader/img/cos.png → tutorials/shaders/your_first_shader/img/cos.png


+ 0 - 0
tutorials/shading/your_first_shader/img/cos4.png → tutorials/shaders/your_first_shader/img/cos4.png


+ 0 - 0
tutorials/shading/your_first_shader/img/dark-water.png → tutorials/shaders/your_first_shader/img/dark-water.png


+ 0 - 0
tutorials/shading/your_first_shader/img/fresnel.png → tutorials/shaders/your_first_shader/img/fresnel.png


+ 0 - 0
tutorials/shading/your_first_shader/img/iconuv.png → tutorials/shaders/your_first_shader/img/iconuv.png


+ 0 - 0
tutorials/shading/your_first_shader/img/light.png → tutorials/shaders/your_first_shader/img/light.png


+ 0 - 0
tutorials/shading/your_first_shader/img/noise-low.png → tutorials/shaders/your_first_shader/img/noise-low.png


+ 0 - 0
tutorials/shading/your_first_shader/img/noise-set.png → tutorials/shaders/your_first_shader/img/noise-set.png


+ 0 - 0
tutorials/shading/your_first_shader/img/noise.png → tutorials/shaders/your_first_shader/img/noise.png


+ 0 - 0
tutorials/shading/your_first_shader/img/normal-set.png → tutorials/shaders/your_first_shader/img/normal-set.png


+ 0 - 0
tutorials/shading/your_first_shader/img/normal.png → tutorials/shaders/your_first_shader/img/normal.png


+ 0 - 0
tutorials/shading/your_first_shader/img/normalmap.png → tutorials/shaders/your_first_shader/img/normalmap.png


+ 0 - 0
tutorials/shading/your_first_shader/img/normalmap2.png → tutorials/shaders/your_first_shader/img/normalmap2.png


+ 0 - 0
tutorials/shading/your_first_shader/img/plane-sub-set.png → tutorials/shaders/your_first_shader/img/plane-sub-set.png


+ 0 - 0
tutorials/shading/your_first_shader/img/plane-sub.png → tutorials/shaders/your_first_shader/img/plane-sub.png


+ 0 - 0
tutorials/shading/your_first_shader/img/plane.png → tutorials/shaders/your_first_shader/img/plane.png


+ 0 - 0
tutorials/shading/your_first_shader/img/plastic.png → tutorials/shaders/your_first_shader/img/plastic.png


+ 0 - 0
tutorials/shading/your_first_shader/img/rim.png → tutorials/shaders/your_first_shader/img/rim.png


+ 0 - 0
tutorials/shading/your_first_shader/img/shader-error.png → tutorials/shaders/your_first_shader/img/shader-error.png


+ 0 - 0
tutorials/shading/your_first_shader/img/specular-toon.png → tutorials/shaders/your_first_shader/img/specular-toon.png


+ 0 - 0
tutorials/shading/your_first_shader/img/wave1.png → tutorials/shaders/your_first_shader/img/wave1.png


+ 0 - 0
tutorials/shading/your_first_shader/img/wave2.png → tutorials/shaders/your_first_shader/img/wave2.png


+ 0 - 0
tutorials/shading/your_first_shader/img/wave3.png → tutorials/shaders/your_first_shader/img/wave3.png


+ 0 - 0
tutorials/shading/your_first_shader/index.rst → tutorials/shaders/your_first_shader/index.rst


+ 0 - 0
tutorials/shading/your_first_shader/your_first_2d_shader.rst → tutorials/shaders/your_first_shader/your_first_2d_shader.rst


+ 0 - 0
tutorials/shading/your_first_shader/your_first_3d_shader.rst → tutorials/shaders/your_first_shader/your_first_3d_shader.rst


+ 0 - 0
tutorials/shading/your_first_shader/your_second_3d_shader.rst → tutorials/shaders/your_first_shader/your_second_3d_shader.rst


+ 0 - 0
tutorials/gui/bbcode_in_richtextlabel.rst → tutorials/ui/bbcode_in_richtextlabel.rst


Some files were not shown because too many files changed in this diff