diff --git a/classes/class_scenetree.rst b/classes/class_scenetree.rst index 334faa2dc..5c2ad6802 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 b7e47f3b9..e74867cab 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` - `GUI in 3D Demo `__ diff --git a/index.rst b/index.rst index 0fd23096e..df58ddbca 100644 --- a/index.rst +++ b/index.rst @@ -96,7 +96,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