Home Explore Help
Sign In
Godot
/
godot-docs
mirror of https://github.com/godotengine/godot-docs.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #4215 from NathanLovato/refactor/move-viewport-pages

Move viewport pages
Nathan Lovato 4 years ago
parent
41a40eca9c 77210c1d9e
commit
6c6823440d
52 changed files with 7 additions and 14 deletions
Split View Show Diff Stats
  1. 1 1
      classes/class_scenetree.rst
  2. 1 1
      classes/class_viewport.rst
  3. 0 1
      index.rst
  4. 0 0
      tutorials/rendering/img/cameras.png
  5. 0 0
      tutorials/rendering/img/container.png
  6. 0 0
      tutorials/rendering/img/default_scene.png
  7. 0 0
      tutorials/rendering/img/input.png
  8. 0 0
      tutorials/rendering/img/overdraw.png
  9. 0 0
      tutorials/rendering/img/screenres.png
  10. 0 0
      tutorials/rendering/img/stretch.png
  11. 0 0
      tutorials/rendering/img/stretch.svg
  12. 0 0
      tutorials/rendering/img/stretch_2d_expand.gif
  13. 0 0
      tutorials/rendering/img/stretch_demo_scene.png
  14. 0 0
      tutorials/rendering/img/stretch_disabled_expand.gif
  15. 0 0
      tutorials/rendering/img/stretch_viewport_expand.gif
  16. 0 0
      tutorials/rendering/img/stretch_viewport_ignore.gif
  17. 0 0
      tutorials/rendering/img/stretch_viewport_keep.gif
  18. 0 0
      tutorials/rendering/img/stretch_viewport_keep_height.gif
  19. 0 0
      tutorials/rendering/img/stretch_viewport_keep_width.gif
  20. 0 0
      tutorials/rendering/img/stretchsettings.png
  21. 0 0
      tutorials/rendering/img/texturemenu.png
  22. 0 0
      tutorials/rendering/img/texturepath.png
  23. 0 0
      tutorials/rendering/img/unshaded.png
  24. 0 0
      tutorials/rendering/img/viewportnode.png
  25. 3 0
      tutorials/rendering/index.rst
  26. 0 0
      tutorials/rendering/multiple_resolutions.rst
  27. 0 0
      tutorials/rendering/viewports.rst
  28. 0 0
      tutorials/shading/custom_postprocessing.rst
  29. 0 0
      tutorials/shading/img/planet_example.png
  30. 0 0
      tutorials/shading/img/planet_gradient.png
  31. 0 0
      tutorials/shading/img/planet_new_colorrect.png
  32. 0 0
      tutorials/shading/img/planet_new_viewport.png
  33. 0 0
      tutorials/shading/img/planet_new_viewport_texture.png
  34. 0 0
      tutorials/shading/img/planet_noise.png
  35. 0 0
      tutorials/shading/img/planet_noise_color.png
  36. 0 0
      tutorials/shading/img/planet_noise_fbm.png
  37. 0 0
      tutorials/shading/img/planet_noise_fbm_shaded.png
  38. 0 0
      tutorials/shading/img/planet_noise_smooth.png
  39. 0 0
      tutorials/shading/img/planet_normals.png
  40. 0 0
      tutorials/shading/img/planet_ocean.png
  41. 0 0
      tutorials/shading/img/planet_ocean_reflect.png
  42. 0 0
      tutorials/shading/img/planet_pick_viewport_texture.png
  43. 0 0
      tutorials/shading/img/planet_seam.png
  44. 0 0
      tutorials/shading/img/planet_sincos.png
  45. 0 0
      tutorials/shading/img/post_blur.png
  46. 0 0
      tutorials/shading/img/post_boxes.png
  47. 0 0
      tutorials/shading/img/post_hierarchy1.png
  48. 0 0
      tutorials/shading/img/post_hierarchy2.png
  49. 0 0
      tutorials/shading/img/post_outline.png
  50. 2 0
      tutorials/shading/index.rst
  51. 0 0
      tutorials/shading/using_viewport_as_texture.rst
  52. 0 11
      tutorials/viewports/index.rst

+ 1 - 1
classes/class_scenetree.rst
View File 

@@ -27,7 +27,7 @@ Tutorials
 
 
 - :doc:`../getting_started/step_by_step/scene_tree`
 
 
-- :doc:`../tutorials/viewports/multiple_resolutions`
 
+- :doc:`../tutorials/rendering/multiple_resolutions`
 
 
 Properties
 
 ----------

+ 1 - 1
classes/class_viewport.rst
View File 

@@ -33,7 +33,7 @@ Tutorials
 
 
 - :doc:`../tutorials/2d/2d_transforms`
 
 
-- :doc:`../tutorials/viewports/index`
 
+- :doc:`../tutorials/rendering/viewports`
 
 
 Properties
 
 ----------

+ 0 - 1
index.rst
View File 

@@ -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

+ 0 - 0
tutorials/viewports/img/cameras.png → tutorials/rendering/img/cameras.png
View File


+ 0 - 0
tutorials/viewports/img/container.png → tutorials/rendering/img/container.png
View File


+ 0 - 0
tutorials/viewports/img/default_scene.png → tutorials/rendering/img/default_scene.png
View File


+ 0 - 0
tutorials/viewports/img/input.png → tutorials/rendering/img/input.png
View File


+ 0 - 0
tutorials/viewports/img/overdraw.png → tutorials/rendering/img/overdraw.png
View File


+ 0 - 0
tutorials/viewports/img/screenres.png → tutorials/rendering/img/screenres.png
View File


+ 0 - 0
tutorials/viewports/img/stretch.png → tutorials/rendering/img/stretch.png
View File


+ 0 - 0
tutorials/viewports/img/stretch.svg → tutorials/rendering/img/stretch.svg
View File


+ 0 - 0
tutorials/viewports/img/stretch_2d_expand.gif → tutorials/rendering/img/stretch_2d_expand.gif
View File


+ 0 - 0
tutorials/viewports/img/stretch_demo_scene.png → tutorials/rendering/img/stretch_demo_scene.png
View File


+ 0 - 0
tutorials/viewports/img/stretch_disabled_expand.gif → tutorials/rendering/img/stretch_disabled_expand.gif
View File


+ 0 - 0
tutorials/viewports/img/stretch_viewport_expand.gif → tutorials/rendering/img/stretch_viewport_expand.gif
View File


+ 0 - 0
tutorials/viewports/img/stretch_viewport_ignore.gif → tutorials/rendering/img/stretch_viewport_ignore.gif
View File


+ 0 - 0
tutorials/viewports/img/stretch_viewport_keep.gif → tutorials/rendering/img/stretch_viewport_keep.gif
View File


+ 0 - 0
tutorials/viewports/img/stretch_viewport_keep_height.gif → tutorials/rendering/img/stretch_viewport_keep_height.gif
View File


+ 0 - 0
tutorials/viewports/img/stretch_viewport_keep_width.gif → tutorials/rendering/img/stretch_viewport_keep_width.gif
View File


+ 0 - 0
tutorials/viewports/img/stretchsettings.png → tutorials/rendering/img/stretchsettings.png
View File


+ 0 - 0
tutorials/viewports/img/texturemenu.png → tutorials/rendering/img/texturemenu.png
View File


+ 0 - 0
tutorials/viewports/img/texturepath.png → tutorials/rendering/img/texturepath.png
View File


+ 0 - 0
tutorials/viewports/img/unshaded.png → tutorials/rendering/img/unshaded.png
View File


+ 0 - 0
tutorials/viewports/img/viewportnode.png → tutorials/rendering/img/viewportnode.png
View File


+ 3 - 0
tutorials/rendering/index.rst
View File 

@@ -4,3 +4,6 @@ Rendering
 
 .. toctree::
 
    :maxdepth: 1
 
    :name: toc-learn-features-rendering
 
+
 
+   viewports
 
+   multiple_resolutions

+ 0 - 0
tutorials/viewports/multiple_resolutions.rst → tutorials/rendering/multiple_resolutions.rst
View File


+ 0 - 0
tutorials/viewports/viewports.rst → tutorials/rendering/viewports.rst
View File


+ 0 - 0
tutorials/viewports/custom_postprocessing.rst → tutorials/shading/custom_postprocessing.rst
View File


+ 0 - 0
tutorials/viewports/img/planet_example.png → tutorials/shading/img/planet_example.png
View File


+ 0 - 0
tutorials/viewports/img/planet_gradient.png → tutorials/shading/img/planet_gradient.png
View File


+ 0 - 0
tutorials/viewports/img/planet_new_colorrect.png → tutorials/shading/img/planet_new_colorrect.png
View File


+ 0 - 0
tutorials/viewports/img/planet_new_viewport.png → tutorials/shading/img/planet_new_viewport.png
View File


+ 0 - 0
tutorials/viewports/img/planet_new_viewport_texture.png → tutorials/shading/img/planet_new_viewport_texture.png
View File


+ 0 - 0
tutorials/viewports/img/planet_noise.png → tutorials/shading/img/planet_noise.png
View File


+ 0 - 0
tutorials/viewports/img/planet_noise_color.png → tutorials/shading/img/planet_noise_color.png
View File


+ 0 - 0
tutorials/viewports/img/planet_noise_fbm.png → tutorials/shading/img/planet_noise_fbm.png
View File


+ 0 - 0
tutorials/viewports/img/planet_noise_fbm_shaded.png → tutorials/shading/img/planet_noise_fbm_shaded.png
View File


+ 0 - 0
tutorials/viewports/img/planet_noise_smooth.png → tutorials/shading/img/planet_noise_smooth.png
View File


+ 0 - 0
tutorials/viewports/img/planet_normals.png → tutorials/shading/img/planet_normals.png
View File


+ 0 - 0
tutorials/viewports/img/planet_ocean.png → tutorials/shading/img/planet_ocean.png
View File


+ 0 - 0
tutorials/viewports/img/planet_ocean_reflect.png → tutorials/shading/img/planet_ocean_reflect.png
View File


+ 0 - 0
tutorials/viewports/img/planet_pick_viewport_texture.png → tutorials/shading/img/planet_pick_viewport_texture.png
View File


+ 0 - 0
tutorials/viewports/img/planet_seam.png → tutorials/shading/img/planet_seam.png
View File


+ 0 - 0
tutorials/viewports/img/planet_sincos.png → tutorials/shading/img/planet_sincos.png
View File


+ 0 - 0
tutorials/viewports/img/post_blur.png → tutorials/shading/img/post_blur.png
View File


+ 0 - 0
tutorials/viewports/img/post_boxes.png → tutorials/shading/img/post_boxes.png
View File


+ 0 - 0
tutorials/viewports/img/post_hierarchy1.png → tutorials/shading/img/post_hierarchy1.png
View File


+ 0 - 0
tutorials/viewports/img/post_hierarchy2.png → tutorials/shading/img/post_hierarchy2.png
View File


+ 0 - 0
tutorials/viewports/img/post_outline.png → tutorials/shading/img/post_outline.png
View File


+ 2 - 0
tutorials/shading/index.rst
View File 

@@ -13,3 +13,5 @@ Shading
 
    migrating_to_godot_shader_language
 
    shaders_style_guide
 
    advanced_postprocessing
 
+   using_viewport_as_texture
 
+   custom_postprocessing

+ 0 - 0
tutorials/viewports/using_viewport_as_texture.rst → tutorials/shading/using_viewport_as_texture.rst
View File


+ 0 - 11
tutorials/viewports/index.rst
View File 

@@ -1,11 +0,0 @@
 
-Viewports
 
-=========
 
-
 
-.. toctree::
 
-   :maxdepth: 1
 
-   :name: toc-learn-features-viewports
 
-
 
-   viewports
 
-   multiple_resolutions
 
-   using_viewport_as_texture
 
-   custom_postprocessing