From 9cd85fdd02835f56cfab365fff033ed795d6894d Mon Sep 17 00:00:00 2001 From: Nathan Lovato Date: Wed, 7 Oct 2020 21:31:58 -0600 Subject: [PATCH] Move vertex animation files to performance Closes #4123 --- classes/class_multimesh.rst | 2 +- classes/class_multimeshinstance.rst | 2 +- classes/class_particles.rst | 2 +- tutorials/3d/index.rst | 3 --- tutorials/optimization/index.rst | 5 ++++- .../animating_thousands_of_fish.rst | 0 .../controlling_thousands_of_fish.rst | 0 .../vertex_animation/img/all_motions.gif | Bin .../vertex_animation/img/all_motions_mask.gif | Bin .../vertex_animation/img/fish.png | Bin .../vertex_animation/img/mask.png | Bin .../vertex_animation/img/pivot.gif | Bin .../vertex_animation/img/scene.gif | Bin .../vertex_animation/img/sidetoside.gif | Bin .../vertex_animation/img/twist.gif | Bin .../vertex_animation/img/wave.gif | Bin .../{3d => optimization}/vertex_animation/index.rst | 0 17 files changed, 7 insertions(+), 7 deletions(-) rename tutorials/{3d => optimization}/vertex_animation/animating_thousands_of_fish.rst (100%) rename tutorials/{3d => optimization}/vertex_animation/controlling_thousands_of_fish.rst (100%) rename tutorials/{3d => optimization}/vertex_animation/img/all_motions.gif (100%) rename tutorials/{3d => optimization}/vertex_animation/img/all_motions_mask.gif (100%) rename tutorials/{3d => optimization}/vertex_animation/img/fish.png (100%) rename tutorials/{3d => optimization}/vertex_animation/img/mask.png (100%) rename tutorials/{3d => optimization}/vertex_animation/img/pivot.gif (100%) rename tutorials/{3d => optimization}/vertex_animation/img/scene.gif (100%) rename tutorials/{3d => optimization}/vertex_animation/img/sidetoside.gif (100%) rename tutorials/{3d => optimization}/vertex_animation/img/twist.gif (100%) rename tutorials/{3d => optimization}/vertex_animation/img/wave.gif (100%) rename tutorials/{3d => optimization}/vertex_animation/index.rst (100%) diff --git a/classes/class_multimesh.rst b/classes/class_multimesh.rst index a7a6070c5..a4be1ee23 100644 --- a/classes/class_multimesh.rst +++ b/classes/class_multimesh.rst @@ -27,7 +27,7 @@ Since instances may have any behavior, the AABB used for visibility must be prov Tutorials --------- -- :doc:`../tutorials/3d/vertex_animation/animating_thousands_of_fish` +- :doc:`../tutorials/performance/vertex_animation/animating_thousands_of_fish` - :doc:`../tutorials/optimization/using_multimesh` diff --git a/classes/class_multimeshinstance.rst b/classes/class_multimeshinstance.rst index c68b6424b..62d25e8ad 100644 --- a/classes/class_multimeshinstance.rst +++ b/classes/class_multimeshinstance.rst @@ -23,7 +23,7 @@ This is useful to optimize the rendering of a high amount of instances of a give Tutorials --------- -- :doc:`../tutorials/3d/vertex_animation/animating_thousands_of_fish` +- :doc:`../tutorials/performance/vertex_animation/animating_thousands_of_fish` - :doc:`../tutorials/3d/using_multi_mesh_instance` diff --git a/classes/class_particles.rst b/classes/class_particles.rst index 8632b36e4..c0bb63369 100644 --- a/classes/class_particles.rst +++ b/classes/class_particles.rst @@ -27,7 +27,7 @@ Use the ``process_material`` property to add a :ref:`ParticlesMaterial`__ diff --git a/tutorials/3d/index.rst b/tutorials/3d/index.rst index d6fe6408d..81c30a06a 100644 --- a/tutorials/3d/index.rst +++ b/tutorials/3d/index.rst @@ -18,6 +18,3 @@ using_gridmaps using_multi_mesh_instance csg_tools - fps_tutorial/index - vertex_animation/index - portals/index diff --git a/tutorials/optimization/index.rst b/tutorials/optimization/index.rst index 7f4cd2141..0676cdc78 100644 --- a/tutorials/optimization/index.rst +++ b/tutorials/optimization/index.rst @@ -71,7 +71,10 @@ GPU .. toctree:: :maxdepth: 1 - :name: toc-learn-features-2d-optimization + :name: toc-learn-features-3d-optimization + + optimizing_3d_performance + vertex_animation/index batching diff --git a/tutorials/3d/vertex_animation/animating_thousands_of_fish.rst b/tutorials/optimization/vertex_animation/animating_thousands_of_fish.rst similarity index 100% rename from tutorials/3d/vertex_animation/animating_thousands_of_fish.rst rename to tutorials/optimization/vertex_animation/animating_thousands_of_fish.rst diff --git a/tutorials/3d/vertex_animation/controlling_thousands_of_fish.rst b/tutorials/optimization/vertex_animation/controlling_thousands_of_fish.rst similarity index 100% rename from tutorials/3d/vertex_animation/controlling_thousands_of_fish.rst rename to tutorials/optimization/vertex_animation/controlling_thousands_of_fish.rst diff --git a/tutorials/3d/vertex_animation/img/all_motions.gif b/tutorials/optimization/vertex_animation/img/all_motions.gif similarity index 100% rename from tutorials/3d/vertex_animation/img/all_motions.gif rename to tutorials/optimization/vertex_animation/img/all_motions.gif diff --git a/tutorials/3d/vertex_animation/img/all_motions_mask.gif b/tutorials/optimization/vertex_animation/img/all_motions_mask.gif similarity index 100% rename from tutorials/3d/vertex_animation/img/all_motions_mask.gif rename to tutorials/optimization/vertex_animation/img/all_motions_mask.gif diff --git a/tutorials/3d/vertex_animation/img/fish.png b/tutorials/optimization/vertex_animation/img/fish.png similarity index 100% rename from tutorials/3d/vertex_animation/img/fish.png rename to tutorials/optimization/vertex_animation/img/fish.png diff --git a/tutorials/3d/vertex_animation/img/mask.png b/tutorials/optimization/vertex_animation/img/mask.png similarity index 100% rename from tutorials/3d/vertex_animation/img/mask.png rename to tutorials/optimization/vertex_animation/img/mask.png diff --git a/tutorials/3d/vertex_animation/img/pivot.gif b/tutorials/optimization/vertex_animation/img/pivot.gif similarity index 100% rename from tutorials/3d/vertex_animation/img/pivot.gif rename to tutorials/optimization/vertex_animation/img/pivot.gif diff --git a/tutorials/3d/vertex_animation/img/scene.gif b/tutorials/optimization/vertex_animation/img/scene.gif similarity index 100% rename from tutorials/3d/vertex_animation/img/scene.gif rename to tutorials/optimization/vertex_animation/img/scene.gif diff --git a/tutorials/3d/vertex_animation/img/sidetoside.gif b/tutorials/optimization/vertex_animation/img/sidetoside.gif similarity index 100% rename from tutorials/3d/vertex_animation/img/sidetoside.gif rename to tutorials/optimization/vertex_animation/img/sidetoside.gif diff --git a/tutorials/3d/vertex_animation/img/twist.gif b/tutorials/optimization/vertex_animation/img/twist.gif similarity index 100% rename from tutorials/3d/vertex_animation/img/twist.gif rename to tutorials/optimization/vertex_animation/img/twist.gif diff --git a/tutorials/3d/vertex_animation/img/wave.gif b/tutorials/optimization/vertex_animation/img/wave.gif similarity index 100% rename from tutorials/3d/vertex_animation/img/wave.gif rename to tutorials/optimization/vertex_animation/img/wave.gif diff --git a/tutorials/3d/vertex_animation/index.rst b/tutorials/optimization/vertex_animation/index.rst similarity index 100% rename from tutorials/3d/vertex_animation/index.rst rename to tutorials/optimization/vertex_animation/index.rst