From 77210c1d9e94234a0b2b38b6fd90e4b6d37a840b Mon Sep 17 00:00:00 2001 From: Nathan Lovato Date: Tue, 6 Oct 2020 20:05:52 -0600 Subject: [PATCH] Move viewport pages Closes #4180 --- classes/class_scenetree.rst | 2 +- classes/class_viewport.rst | 2 +- index.rst | 1 - tutorials/{viewports => rendering}/img/cameras.png | Bin .../{viewports => rendering}/img/container.png | Bin .../{viewports => rendering}/img/default_scene.png | Bin tutorials/{viewports => rendering}/img/input.png | Bin tutorials/{viewports => rendering}/img/overdraw.png | Bin .../{viewports => rendering}/img/screenres.png | Bin tutorials/{viewports => rendering}/img/stretch.png | Bin tutorials/{viewports => rendering}/img/stretch.svg | 0 .../img/stretch_2d_expand.gif | Bin .../img/stretch_demo_scene.png | Bin .../img/stretch_disabled_expand.gif | Bin .../img/stretch_viewport_expand.gif | Bin .../img/stretch_viewport_ignore.gif | Bin .../img/stretch_viewport_keep.gif | Bin .../img/stretch_viewport_keep_height.gif | Bin .../img/stretch_viewport_keep_width.gif | Bin .../img/stretchsettings.png | Bin .../{viewports => rendering}/img/texturemenu.png | Bin .../{viewports => rendering}/img/texturepath.png | Bin tutorials/{viewports => rendering}/img/unshaded.png | Bin .../{viewports => rendering}/img/viewportnode.png | Bin tutorials/rendering/index.rst | 3 +++ .../multiple_resolutions.rst | 0 tutorials/{viewports => rendering}/viewports.rst | 0 .../custom_postprocessing.rst | 0 .../{viewports => shading}/img/planet_example.png | Bin .../{viewports => shading}/img/planet_gradient.png | Bin .../img/planet_new_colorrect.png | Bin .../img/planet_new_viewport.png | Bin .../img/planet_new_viewport_texture.png | Bin .../{viewports => shading}/img/planet_noise.png | Bin .../img/planet_noise_color.png | Bin .../{viewports => shading}/img/planet_noise_fbm.png | Bin .../img/planet_noise_fbm_shaded.png | Bin .../img/planet_noise_smooth.png | Bin .../{viewports => shading}/img/planet_normals.png | Bin .../{viewports => shading}/img/planet_ocean.png | Bin .../img/planet_ocean_reflect.png | Bin .../img/planet_pick_viewport_texture.png | Bin .../{viewports => shading}/img/planet_seam.png | Bin .../{viewports => shading}/img/planet_sincos.png | Bin tutorials/{viewports => shading}/img/post_blur.png | Bin tutorials/{viewports => shading}/img/post_boxes.png | Bin .../{viewports => shading}/img/post_hierarchy1.png | Bin .../{viewports => shading}/img/post_hierarchy2.png | Bin .../{viewports => shading}/img/post_outline.png | Bin tutorials/shading/index.rst | 2 ++ .../using_viewport_as_texture.rst | 0 tutorials/viewports/index.rst | 11 ----------- 52 files changed, 7 insertions(+), 14 deletions(-) rename tutorials/{viewports => rendering}/img/cameras.png (100%) rename tutorials/{viewports => rendering}/img/container.png (100%) rename tutorials/{viewports => rendering}/img/default_scene.png (100%) rename tutorials/{viewports => rendering}/img/input.png (100%) rename tutorials/{viewports => rendering}/img/overdraw.png (100%) rename tutorials/{viewports => rendering}/img/screenres.png (100%) rename tutorials/{viewports => rendering}/img/stretch.png (100%) rename tutorials/{viewports => rendering}/img/stretch.svg (100%) rename tutorials/{viewports => rendering}/img/stretch_2d_expand.gif (100%) rename tutorials/{viewports => rendering}/img/stretch_demo_scene.png (100%) rename tutorials/{viewports => rendering}/img/stretch_disabled_expand.gif (100%) rename tutorials/{viewports => rendering}/img/stretch_viewport_expand.gif (100%) rename tutorials/{viewports => rendering}/img/stretch_viewport_ignore.gif (100%) rename tutorials/{viewports => rendering}/img/stretch_viewport_keep.gif (100%) rename tutorials/{viewports => rendering}/img/stretch_viewport_keep_height.gif (100%) rename tutorials/{viewports => rendering}/img/stretch_viewport_keep_width.gif (100%) rename tutorials/{viewports => rendering}/img/stretchsettings.png (100%) rename tutorials/{viewports => rendering}/img/texturemenu.png (100%) rename tutorials/{viewports => rendering}/img/texturepath.png (100%) rename tutorials/{viewports => rendering}/img/unshaded.png (100%) rename tutorials/{viewports => rendering}/img/viewportnode.png (100%) rename tutorials/{viewports => rendering}/multiple_resolutions.rst (100%) rename tutorials/{viewports => rendering}/viewports.rst (100%) rename tutorials/{viewports => shading}/custom_postprocessing.rst (100%) rename tutorials/{viewports => shading}/img/planet_example.png (100%) rename tutorials/{viewports => shading}/img/planet_gradient.png (100%) rename tutorials/{viewports => shading}/img/planet_new_colorrect.png (100%) rename tutorials/{viewports => shading}/img/planet_new_viewport.png (100%) rename tutorials/{viewports => shading}/img/planet_new_viewport_texture.png (100%) rename tutorials/{viewports => shading}/img/planet_noise.png (100%) rename tutorials/{viewports => shading}/img/planet_noise_color.png (100%) rename tutorials/{viewports => shading}/img/planet_noise_fbm.png (100%) rename tutorials/{viewports => shading}/img/planet_noise_fbm_shaded.png (100%) rename tutorials/{viewports => shading}/img/planet_noise_smooth.png (100%) rename tutorials/{viewports => shading}/img/planet_normals.png (100%) rename tutorials/{viewports => shading}/img/planet_ocean.png (100%) rename tutorials/{viewports => shading}/img/planet_ocean_reflect.png (100%) rename tutorials/{viewports => shading}/img/planet_pick_viewport_texture.png (100%) rename tutorials/{viewports => shading}/img/planet_seam.png (100%) rename tutorials/{viewports => shading}/img/planet_sincos.png (100%) rename tutorials/{viewports => shading}/img/post_blur.png (100%) rename tutorials/{viewports => shading}/img/post_boxes.png (100%) rename tutorials/{viewports => shading}/img/post_hierarchy1.png (100%) rename tutorials/{viewports => shading}/img/post_hierarchy2.png (100%) rename tutorials/{viewports => shading}/img/post_outline.png (100%) rename tutorials/{viewports => shading}/using_viewport_as_texture.rst (100%) delete mode 100644 tutorials/viewports/index.rst diff --git a/classes/class_scenetree.rst b/classes/class_scenetree.rst index 3fa3ce8c7..3790c424f 100644 --- a/classes/class_scenetree.rst +++ b/classes/class_scenetree.rst @@ -27,7 +27,7 @@ Tutorials - :doc:`../getting_started/step_by_step/scene_tree` -- :doc:`../tutorials/viewports/multiple_resolutions` +- :doc:`../tutorials/rendering/multiple_resolutions` Properties ---------- diff --git a/classes/class_viewport.rst b/classes/class_viewport.rst index dd8ea9be6..9b0b55693 100644 --- a/classes/class_viewport.rst +++ b/classes/class_viewport.rst @@ -33,7 +33,7 @@ Tutorials - :doc:`../tutorials/2d/2d_transforms` -- :doc:`../tutorials/viewports/index` +- :doc:`../tutorials/rendering/viewports` Properties ---------- diff --git a/index.rst b/index.rst index 60722660d..39f726aaf 100644 --- a/index.rst +++ b/index.rst @@ -90,7 +90,6 @@ The main documentation for the site is organized into the following sections: tutorials/io/index tutorials/i18n/index tutorials/gui/index - tutorials/viewports/index tutorials/rendering/index tutorials/shading/index tutorials/networking/index diff --git a/tutorials/viewports/img/cameras.png b/tutorials/rendering/img/cameras.png similarity index 100% rename from tutorials/viewports/img/cameras.png rename to tutorials/rendering/img/cameras.png diff --git a/tutorials/viewports/img/container.png b/tutorials/rendering/img/container.png similarity index 100% rename from tutorials/viewports/img/container.png rename to tutorials/rendering/img/container.png diff --git a/tutorials/viewports/img/default_scene.png b/tutorials/rendering/img/default_scene.png similarity index 100% rename from tutorials/viewports/img/default_scene.png rename to tutorials/rendering/img/default_scene.png diff --git a/tutorials/viewports/img/input.png b/tutorials/rendering/img/input.png similarity index 100% rename from tutorials/viewports/img/input.png rename to tutorials/rendering/img/input.png diff --git a/tutorials/viewports/img/overdraw.png b/tutorials/rendering/img/overdraw.png similarity index 100% rename from tutorials/viewports/img/overdraw.png rename to tutorials/rendering/img/overdraw.png diff --git a/tutorials/viewports/img/screenres.png b/tutorials/rendering/img/screenres.png similarity index 100% rename from tutorials/viewports/img/screenres.png rename to tutorials/rendering/img/screenres.png diff --git a/tutorials/viewports/img/stretch.png b/tutorials/rendering/img/stretch.png similarity index 100% rename from tutorials/viewports/img/stretch.png rename to tutorials/rendering/img/stretch.png diff --git a/tutorials/viewports/img/stretch.svg b/tutorials/rendering/img/stretch.svg similarity index 100% rename from tutorials/viewports/img/stretch.svg rename to tutorials/rendering/img/stretch.svg diff --git a/tutorials/viewports/img/stretch_2d_expand.gif b/tutorials/rendering/img/stretch_2d_expand.gif similarity index 100% rename from tutorials/viewports/img/stretch_2d_expand.gif rename to tutorials/rendering/img/stretch_2d_expand.gif diff --git a/tutorials/viewports/img/stretch_demo_scene.png b/tutorials/rendering/img/stretch_demo_scene.png similarity index 100% rename from tutorials/viewports/img/stretch_demo_scene.png rename to tutorials/rendering/img/stretch_demo_scene.png diff --git a/tutorials/viewports/img/stretch_disabled_expand.gif b/tutorials/rendering/img/stretch_disabled_expand.gif similarity index 100% rename from tutorials/viewports/img/stretch_disabled_expand.gif rename to tutorials/rendering/img/stretch_disabled_expand.gif diff --git a/tutorials/viewports/img/stretch_viewport_expand.gif b/tutorials/rendering/img/stretch_viewport_expand.gif similarity index 100% rename from tutorials/viewports/img/stretch_viewport_expand.gif rename to tutorials/rendering/img/stretch_viewport_expand.gif diff --git a/tutorials/viewports/img/stretch_viewport_ignore.gif b/tutorials/rendering/img/stretch_viewport_ignore.gif similarity index 100% rename from tutorials/viewports/img/stretch_viewport_ignore.gif rename to tutorials/rendering/img/stretch_viewport_ignore.gif diff --git a/tutorials/viewports/img/stretch_viewport_keep.gif b/tutorials/rendering/img/stretch_viewport_keep.gif similarity index 100% rename from tutorials/viewports/img/stretch_viewport_keep.gif rename to tutorials/rendering/img/stretch_viewport_keep.gif diff --git a/tutorials/viewports/img/stretch_viewport_keep_height.gif b/tutorials/rendering/img/stretch_viewport_keep_height.gif similarity index 100% rename from tutorials/viewports/img/stretch_viewport_keep_height.gif rename to tutorials/rendering/img/stretch_viewport_keep_height.gif diff --git a/tutorials/viewports/img/stretch_viewport_keep_width.gif b/tutorials/rendering/img/stretch_viewport_keep_width.gif similarity index 100% rename from tutorials/viewports/img/stretch_viewport_keep_width.gif rename to tutorials/rendering/img/stretch_viewport_keep_width.gif diff --git a/tutorials/viewports/img/stretchsettings.png b/tutorials/rendering/img/stretchsettings.png similarity index 100% rename from tutorials/viewports/img/stretchsettings.png rename to tutorials/rendering/img/stretchsettings.png diff --git a/tutorials/viewports/img/texturemenu.png b/tutorials/rendering/img/texturemenu.png similarity index 100% rename from tutorials/viewports/img/texturemenu.png rename to tutorials/rendering/img/texturemenu.png diff --git a/tutorials/viewports/img/texturepath.png b/tutorials/rendering/img/texturepath.png similarity index 100% rename from tutorials/viewports/img/texturepath.png rename to tutorials/rendering/img/texturepath.png diff --git a/tutorials/viewports/img/unshaded.png b/tutorials/rendering/img/unshaded.png similarity index 100% rename from tutorials/viewports/img/unshaded.png rename to tutorials/rendering/img/unshaded.png diff --git a/tutorials/viewports/img/viewportnode.png b/tutorials/rendering/img/viewportnode.png similarity index 100% rename from tutorials/viewports/img/viewportnode.png rename to tutorials/rendering/img/viewportnode.png diff --git a/tutorials/rendering/index.rst b/tutorials/rendering/index.rst index cea6b3333..f27856c65 100644 --- a/tutorials/rendering/index.rst +++ b/tutorials/rendering/index.rst @@ -4,3 +4,6 @@ Rendering .. toctree:: :maxdepth: 1 :name: toc-learn-features-rendering + + viewports + multiple_resolutions diff --git a/tutorials/viewports/multiple_resolutions.rst b/tutorials/rendering/multiple_resolutions.rst similarity index 100% rename from tutorials/viewports/multiple_resolutions.rst rename to tutorials/rendering/multiple_resolutions.rst diff --git a/tutorials/viewports/viewports.rst b/tutorials/rendering/viewports.rst similarity index 100% rename from tutorials/viewports/viewports.rst rename to tutorials/rendering/viewports.rst diff --git a/tutorials/viewports/custom_postprocessing.rst b/tutorials/shading/custom_postprocessing.rst similarity index 100% rename from tutorials/viewports/custom_postprocessing.rst rename to tutorials/shading/custom_postprocessing.rst diff --git a/tutorials/viewports/img/planet_example.png b/tutorials/shading/img/planet_example.png similarity index 100% rename from tutorials/viewports/img/planet_example.png rename to tutorials/shading/img/planet_example.png diff --git a/tutorials/viewports/img/planet_gradient.png b/tutorials/shading/img/planet_gradient.png similarity index 100% rename from tutorials/viewports/img/planet_gradient.png rename to tutorials/shading/img/planet_gradient.png diff --git a/tutorials/viewports/img/planet_new_colorrect.png b/tutorials/shading/img/planet_new_colorrect.png similarity index 100% rename from tutorials/viewports/img/planet_new_colorrect.png rename to tutorials/shading/img/planet_new_colorrect.png diff --git a/tutorials/viewports/img/planet_new_viewport.png b/tutorials/shading/img/planet_new_viewport.png similarity index 100% rename from tutorials/viewports/img/planet_new_viewport.png rename to tutorials/shading/img/planet_new_viewport.png diff --git a/tutorials/viewports/img/planet_new_viewport_texture.png b/tutorials/shading/img/planet_new_viewport_texture.png similarity index 100% rename from tutorials/viewports/img/planet_new_viewport_texture.png rename to tutorials/shading/img/planet_new_viewport_texture.png diff --git a/tutorials/viewports/img/planet_noise.png b/tutorials/shading/img/planet_noise.png similarity index 100% rename from tutorials/viewports/img/planet_noise.png rename to tutorials/shading/img/planet_noise.png diff --git a/tutorials/viewports/img/planet_noise_color.png b/tutorials/shading/img/planet_noise_color.png similarity index 100% rename from tutorials/viewports/img/planet_noise_color.png rename to tutorials/shading/img/planet_noise_color.png diff --git a/tutorials/viewports/img/planet_noise_fbm.png b/tutorials/shading/img/planet_noise_fbm.png similarity index 100% rename from tutorials/viewports/img/planet_noise_fbm.png rename to tutorials/shading/img/planet_noise_fbm.png diff --git a/tutorials/viewports/img/planet_noise_fbm_shaded.png b/tutorials/shading/img/planet_noise_fbm_shaded.png similarity index 100% rename from tutorials/viewports/img/planet_noise_fbm_shaded.png rename to tutorials/shading/img/planet_noise_fbm_shaded.png diff --git a/tutorials/viewports/img/planet_noise_smooth.png b/tutorials/shading/img/planet_noise_smooth.png similarity index 100% rename from tutorials/viewports/img/planet_noise_smooth.png rename to tutorials/shading/img/planet_noise_smooth.png diff --git a/tutorials/viewports/img/planet_normals.png b/tutorials/shading/img/planet_normals.png similarity index 100% rename from tutorials/viewports/img/planet_normals.png rename to tutorials/shading/img/planet_normals.png diff --git a/tutorials/viewports/img/planet_ocean.png b/tutorials/shading/img/planet_ocean.png similarity index 100% rename from tutorials/viewports/img/planet_ocean.png rename to tutorials/shading/img/planet_ocean.png diff --git a/tutorials/viewports/img/planet_ocean_reflect.png b/tutorials/shading/img/planet_ocean_reflect.png similarity index 100% rename from tutorials/viewports/img/planet_ocean_reflect.png rename to tutorials/shading/img/planet_ocean_reflect.png diff --git a/tutorials/viewports/img/planet_pick_viewport_texture.png b/tutorials/shading/img/planet_pick_viewport_texture.png similarity index 100% rename from tutorials/viewports/img/planet_pick_viewport_texture.png rename to tutorials/shading/img/planet_pick_viewport_texture.png diff --git a/tutorials/viewports/img/planet_seam.png b/tutorials/shading/img/planet_seam.png similarity index 100% rename from tutorials/viewports/img/planet_seam.png rename to tutorials/shading/img/planet_seam.png diff --git a/tutorials/viewports/img/planet_sincos.png b/tutorials/shading/img/planet_sincos.png similarity index 100% rename from tutorials/viewports/img/planet_sincos.png rename to tutorials/shading/img/planet_sincos.png diff --git a/tutorials/viewports/img/post_blur.png b/tutorials/shading/img/post_blur.png similarity index 100% rename from tutorials/viewports/img/post_blur.png rename to tutorials/shading/img/post_blur.png diff --git a/tutorials/viewports/img/post_boxes.png b/tutorials/shading/img/post_boxes.png similarity index 100% rename from tutorials/viewports/img/post_boxes.png rename to tutorials/shading/img/post_boxes.png diff --git a/tutorials/viewports/img/post_hierarchy1.png b/tutorials/shading/img/post_hierarchy1.png similarity index 100% rename from tutorials/viewports/img/post_hierarchy1.png rename to tutorials/shading/img/post_hierarchy1.png diff --git a/tutorials/viewports/img/post_hierarchy2.png b/tutorials/shading/img/post_hierarchy2.png similarity index 100% rename from tutorials/viewports/img/post_hierarchy2.png rename to tutorials/shading/img/post_hierarchy2.png diff --git a/tutorials/viewports/img/post_outline.png b/tutorials/shading/img/post_outline.png similarity index 100% rename from tutorials/viewports/img/post_outline.png rename to tutorials/shading/img/post_outline.png diff --git a/tutorials/shading/index.rst b/tutorials/shading/index.rst index 39e09c144..ec3f51936 100644 --- a/tutorials/shading/index.rst +++ b/tutorials/shading/index.rst @@ -14,3 +14,5 @@ Shading migrating_to_godot_shader_language godot_shader_language_style_guide advanced_postprocessing + using_viewport_as_texture + custom_postprocessing diff --git a/tutorials/viewports/using_viewport_as_texture.rst b/tutorials/shading/using_viewport_as_texture.rst similarity index 100% rename from tutorials/viewports/using_viewport_as_texture.rst rename to tutorials/shading/using_viewport_as_texture.rst diff --git a/tutorials/viewports/index.rst b/tutorials/viewports/index.rst deleted file mode 100644 index b47f27dbd..000000000 --- a/tutorials/viewports/index.rst +++ /dev/null @@ -1,11 +0,0 @@ -Viewports -========= - -.. toctree:: - :maxdepth: 1 - :name: toc-learn-features-viewports - - viewports - multiple_resolutions - using_viewport_as_texture - custom_postprocessing