From f19083670a88465e99f1496f9d231c4019b3c80e Mon Sep 17 00:00:00 2001 From: Nathan Lovato Date: Sat, 10 Oct 2020 22:13:27 -0600 Subject: [PATCH] Move pages out of the tutorials/content section Remove the section --- classes/class_arraymesh.rst | 2 +- index.rst | 1 - tutorials/3d/index.rst | 1 + .../procedural_geometry/arraymesh.rst | 0 .../procedural_geometry/immediategeometry.rst | 0 .../{content => 3d}/procedural_geometry/index.rst | 0 .../procedural_geometry/meshdatatool.rst | 0 .../procedural_geometry/surfacetool.rst | 0 tutorials/content/index.rst | 9 --------- tutorials/{content => shaders}/img/tree_base.png | Bin .../{content => shaders}/img/tree_gradient.png | Bin tutorials/{content => shaders}/img/tree_sway.gif | Bin .../{content => shaders}/img/tree_vertex_paint.png | Bin tutorials/shaders/index.rst | 1 + tutorials/{content => shaders}/making_trees.rst | 0 15 files changed, 3 insertions(+), 11 deletions(-) rename tutorials/{content => 3d}/procedural_geometry/arraymesh.rst (100%) rename tutorials/{content => 3d}/procedural_geometry/immediategeometry.rst (100%) rename tutorials/{content => 3d}/procedural_geometry/index.rst (100%) rename tutorials/{content => 3d}/procedural_geometry/meshdatatool.rst (100%) rename tutorials/{content => 3d}/procedural_geometry/surfacetool.rst (100%) delete mode 100644 tutorials/content/index.rst rename tutorials/{content => shaders}/img/tree_base.png (100%) rename tutorials/{content => shaders}/img/tree_gradient.png (100%) rename tutorials/{content => shaders}/img/tree_sway.gif (100%) rename tutorials/{content => shaders}/img/tree_vertex_paint.png (100%) rename tutorials/{content => shaders}/making_trees.rst (100%) diff --git a/classes/class_arraymesh.rst b/classes/class_arraymesh.rst index 7c595788a..ba732abb2 100644 --- a/classes/class_arraymesh.rst +++ b/classes/class_arraymesh.rst @@ -41,7 +41,7 @@ The :ref:`MeshInstance` is ready to be added to the :ref:`Sc Tutorials --------- -- :doc:`../tutorials/content/procedural_geometry/arraymesh` +- :doc:`../tutorials/3d/procedural_geometry/arraymesh` Properties ---------- diff --git a/index.rst b/index.rst index 82e1233c1..83c84d0e1 100644 --- a/index.rst +++ b/index.rst @@ -96,7 +96,6 @@ The main documentation for the site is organized into the following sections: tutorials/vr/index tutorials/plugins/index tutorials/platform/index - tutorials/content/index tutorials/performance/index diff --git a/tutorials/3d/index.rst b/tutorials/3d/index.rst index 298f8cc9b..64b1e1cd3 100644 --- a/tutorials/3d/index.rst +++ b/tutorials/3d/index.rst @@ -18,3 +18,4 @@ using_gridmaps using_multi_mesh_instance csg_tools + procedural_geometry/index diff --git a/tutorials/content/procedural_geometry/arraymesh.rst b/tutorials/3d/procedural_geometry/arraymesh.rst similarity index 100% rename from tutorials/content/procedural_geometry/arraymesh.rst rename to tutorials/3d/procedural_geometry/arraymesh.rst diff --git a/tutorials/content/procedural_geometry/immediategeometry.rst b/tutorials/3d/procedural_geometry/immediategeometry.rst similarity index 100% rename from tutorials/content/procedural_geometry/immediategeometry.rst rename to tutorials/3d/procedural_geometry/immediategeometry.rst diff --git a/tutorials/content/procedural_geometry/index.rst b/tutorials/3d/procedural_geometry/index.rst similarity index 100% rename from tutorials/content/procedural_geometry/index.rst rename to tutorials/3d/procedural_geometry/index.rst diff --git a/tutorials/content/procedural_geometry/meshdatatool.rst b/tutorials/3d/procedural_geometry/meshdatatool.rst similarity index 100% rename from tutorials/content/procedural_geometry/meshdatatool.rst rename to tutorials/3d/procedural_geometry/meshdatatool.rst diff --git a/tutorials/content/procedural_geometry/surfacetool.rst b/tutorials/3d/procedural_geometry/surfacetool.rst similarity index 100% rename from tutorials/content/procedural_geometry/surfacetool.rst rename to tutorials/3d/procedural_geometry/surfacetool.rst diff --git a/tutorials/content/index.rst b/tutorials/content/index.rst deleted file mode 100644 index 410f51351..000000000 --- a/tutorials/content/index.rst +++ /dev/null @@ -1,9 +0,0 @@ -Creating content -================ - -.. toctree:: - :maxdepth: 1 - :name: toc-tutorials-content - - procedural_geometry/index - making_trees diff --git a/tutorials/content/img/tree_base.png b/tutorials/shaders/img/tree_base.png similarity index 100% rename from tutorials/content/img/tree_base.png rename to tutorials/shaders/img/tree_base.png diff --git a/tutorials/content/img/tree_gradient.png b/tutorials/shaders/img/tree_gradient.png similarity index 100% rename from tutorials/content/img/tree_gradient.png rename to tutorials/shaders/img/tree_gradient.png diff --git a/tutorials/content/img/tree_sway.gif b/tutorials/shaders/img/tree_sway.gif similarity index 100% rename from tutorials/content/img/tree_sway.gif rename to tutorials/shaders/img/tree_sway.gif diff --git a/tutorials/content/img/tree_vertex_paint.png b/tutorials/shaders/img/tree_vertex_paint.png similarity index 100% rename from tutorials/content/img/tree_vertex_paint.png rename to tutorials/shaders/img/tree_vertex_paint.png diff --git a/tutorials/shaders/index.rst b/tutorials/shaders/index.rst index 82b9478f1..e0c86272e 100644 --- a/tutorials/shaders/index.rst +++ b/tutorials/shaders/index.rst @@ -16,3 +16,4 @@ Shaders advanced_postprocessing using_viewport_as_texture custom_postprocessing + making_trees diff --git a/tutorials/content/making_trees.rst b/tutorials/shaders/making_trees.rst similarity index 100% rename from tutorials/content/making_trees.rst rename to tutorials/shaders/making_trees.rst