From 7aff9287d854bb3516deaa39b0e6e77b8186e16b Mon Sep 17 00:00:00 2001 From: barry Date: Thu, 21 Mar 2019 18:43:02 -0700 Subject: [PATCH] Reorganized Far tutorials into groups: - moved and renumbered the 11 Far tutorials into 5 groups - updated documentation/tutorials.rst: - replaced the two-column tables with simple sections - created sub-sections describing the Far tutorial groups - updated additional Far tutorial references for new numbering --- documentation/CMakeLists.txt | 22 +- documentation/api_overview.rst | 2 +- ...utorial_0.0.png => far_tutorial_1_1.0.png} | Bin ...utorial_1.0.png => far_tutorial_2_1.0.png} | Bin ...utorial_3.0.png => far_tutorial_2_2.0.png} | Bin ...utorial_6.0.png => far_tutorial_5_1.0.png} | Bin documentation/porting.rst | 2 +- documentation/tutorials.rst | 258 ++++++++++-------- tutorials/far/CMakeLists.txt | 22 +- .../CMakeLists.txt | 4 +- .../far_tutorial_1_1.cpp} | 0 .../CMakeLists.txt | 4 +- .../far_tutorial_1_2.cpp} | 0 .../CMakeLists.txt | 4 +- .../far_tutorial_2_1.cpp} | 0 .../CMakeLists.txt | 4 +- .../far_tutorial_2_2.cpp} | 0 tutorials/far/tutorial_2_3/CMakeLists.txt | 27 ++ .../far_tutorial_2_3.cpp} | 0 tutorials/far/tutorial_3/CMakeLists.txt | 27 -- tutorials/far/tutorial_3_1/CMakeLists.txt | 27 ++ .../far_tutorial_3_1.cpp} | 0 .../{tutorial_1 => tutorial_3_1}/hbr_to_vtr.h | 0 tutorials/far/tutorial_4/CMakeLists.txt | 27 -- tutorials/far/tutorial_4_1/CMakeLists.txt | 27 ++ .../far_tutorial_4_1.cpp} | 0 tutorials/far/tutorial_4_2/CMakeLists.txt | 27 ++ .../far_tutorial_4_2.cpp} | 0 tutorials/far/tutorial_4_3/CMakeLists.txt | 27 ++ .../far_tutorial_4_3.cpp} | 0 tutorials/far/tutorial_5/CMakeLists.txt | 27 -- tutorials/far/tutorial_5_1/CMakeLists.txt | 27 ++ .../far_tutorial_5_1.cpp} | 0 .../CMakeLists.txt | 4 +- .../far_tutorial_5_2.cpp} | 0 tutorials/far/tutorial_6/CMakeLists.txt | 27 -- tutorials/far/tutorial_7/CMakeLists.txt | 27 -- tutorials/far/tutorial_8/CMakeLists.txt | 27 -- 38 files changed, 335 insertions(+), 315 deletions(-) rename documentation/images/{far_tutorial_0.0.png => far_tutorial_1_1.0.png} (100%) rename documentation/images/{far_tutorial_1.0.png => far_tutorial_2_1.0.png} (100%) rename documentation/images/{far_tutorial_3.0.png => far_tutorial_2_2.0.png} (100%) rename documentation/images/{far_tutorial_6.0.png => far_tutorial_5_1.0.png} (100%) rename tutorials/far/{tutorial_0 => tutorial_1_1}/CMakeLists.txt (96%) rename tutorials/far/{tutorial_0/far_tutorial_0.cpp => tutorial_1_1/far_tutorial_1_1.cpp} (100%) rename tutorials/far/{tutorial_1 => tutorial_1_2}/CMakeLists.txt (96%) rename tutorials/far/{tutorial_10/far_tutorial_10.cpp => tutorial_1_2/far_tutorial_1_2.cpp} (100%) rename tutorials/far/{tutorial_10 => tutorial_2_1}/CMakeLists.txt (96%) rename tutorials/far/{tutorial_2/far_tutorial_2.cpp => tutorial_2_1/far_tutorial_2_1.cpp} (100%) rename tutorials/far/{tutorial_2 => tutorial_2_2}/CMakeLists.txt (96%) rename tutorials/far/{tutorial_3/far_tutorial_3.cpp => tutorial_2_2/far_tutorial_2_2.cpp} (100%) create mode 100644 tutorials/far/tutorial_2_3/CMakeLists.txt rename tutorials/far/{tutorial_8/far_tutorial_8.cpp => tutorial_2_3/far_tutorial_2_3.cpp} (100%) delete mode 100644 tutorials/far/tutorial_3/CMakeLists.txt create mode 100644 tutorials/far/tutorial_3_1/CMakeLists.txt rename tutorials/far/{tutorial_1/far_tutorial_1.cpp => tutorial_3_1/far_tutorial_3_1.cpp} (100%) rename tutorials/far/{tutorial_1 => tutorial_3_1}/hbr_to_vtr.h (100%) delete mode 100644 tutorials/far/tutorial_4/CMakeLists.txt create mode 100644 tutorials/far/tutorial_4_1/CMakeLists.txt rename tutorials/far/{tutorial_4/far_tutorial_4.cpp => tutorial_4_1/far_tutorial_4_1.cpp} (100%) create mode 100644 tutorials/far/tutorial_4_2/CMakeLists.txt rename tutorials/far/{tutorial_5/far_tutorial_5.cpp => tutorial_4_2/far_tutorial_4_2.cpp} (100%) create mode 100644 tutorials/far/tutorial_4_3/CMakeLists.txt rename tutorials/far/{tutorial_7/far_tutorial_7.cpp => tutorial_4_3/far_tutorial_4_3.cpp} (100%) delete mode 100644 tutorials/far/tutorial_5/CMakeLists.txt create mode 100644 tutorials/far/tutorial_5_1/CMakeLists.txt rename tutorials/far/{tutorial_6/far_tutorial_6.cpp => tutorial_5_1/far_tutorial_5_1.cpp} (100%) rename tutorials/far/{tutorial_9 => tutorial_5_2}/CMakeLists.txt (96%) rename tutorials/far/{tutorial_9/far_tutorial_9.cpp => tutorial_5_2/far_tutorial_5_2.cpp} (100%) delete mode 100644 tutorials/far/tutorial_6/CMakeLists.txt delete mode 100644 tutorials/far/tutorial_7/CMakeLists.txt delete mode 100644 tutorials/far/tutorial_8/CMakeLists.txt diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index 6c56e154..a523dc59 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -170,17 +170,17 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND) hbr/tutorial_0/hbr_tutorial_0.cpp hbr/tutorial_1/hbr_tutorial_1.cpp hbr/tutorial_2/hbr_tutorial_2.cpp - far/tutorial_0/far_tutorial_0.cpp - far/tutorial_1/far_tutorial_1.cpp - far/tutorial_2/far_tutorial_2.cpp - far/tutorial_3/far_tutorial_3.cpp - far/tutorial_4/far_tutorial_4.cpp - far/tutorial_5/far_tutorial_5.cpp - far/tutorial_6/far_tutorial_6.cpp - far/tutorial_7/far_tutorial_7.cpp - far/tutorial_8/far_tutorial_8.cpp - far/tutorial_9/far_tutorial_9.cpp - far/tutorial_10/far_tutorial_10.cpp + far/tutorial_1_1/far_tutorial_1_1.cpp + far/tutorial_1_2/far_tutorial_1_2.cpp + far/tutorial_2_1/far_tutorial_2_1.cpp + far/tutorial_2_2/far_tutorial_2_2.cpp + far/tutorial_2_3/far_tutorial_2_3.cpp + far/tutorial_3_1/far_tutorial_3_1.cpp + far/tutorial_4_1/far_tutorial_4_1.cpp + far/tutorial_4_2/far_tutorial_4_2.cpp + far/tutorial_4_3/far_tutorial_4_3.cpp + far/tutorial_5_1/far_tutorial_5_1.cpp + far/tutorial_5_2/far_tutorial_5_2.cpp osd/tutorial_0/osd_tutorial_0.cpp ) diff --git a/documentation/api_overview.rst b/documentation/api_overview.rst index 3b43801e..ad1b1e51 100644 --- a/documentation/api_overview.rst +++ b/documentation/api_overview.rst @@ -189,7 +189,7 @@ from the `Far::TopologyDescriptor // do something with dst and fverts } -6. Done! See `far_tutorial_0 `__ for the complete code example. +6. Done! See `Far tutorial 1.1 `__ for the complete code example. Use case 2: GL adaptive tessellation drawing of animating mesh ============================================================== diff --git a/documentation/images/far_tutorial_0.0.png b/documentation/images/far_tutorial_1_1.0.png similarity index 100% rename from documentation/images/far_tutorial_0.0.png rename to documentation/images/far_tutorial_1_1.0.png diff --git a/documentation/images/far_tutorial_1.0.png b/documentation/images/far_tutorial_2_1.0.png similarity index 100% rename from documentation/images/far_tutorial_1.0.png rename to documentation/images/far_tutorial_2_1.0.png diff --git a/documentation/images/far_tutorial_3.0.png b/documentation/images/far_tutorial_2_2.0.png similarity index 100% rename from documentation/images/far_tutorial_3.0.png rename to documentation/images/far_tutorial_2_2.0.png diff --git a/documentation/images/far_tutorial_6.0.png b/documentation/images/far_tutorial_5_1.0.png similarity index 100% rename from documentation/images/far_tutorial_6.0.png rename to documentation/images/far_tutorial_5_1.0.png diff --git a/documentation/porting.rst b/documentation/porting.rst index 1cdea81e..2bfc5372 100644 --- a/documentation/porting.rst +++ b/documentation/porting.rst @@ -87,7 +87,7 @@ recommended for usage where this conversion process is critical. Details on how to construct a TopologyRefiner can be found in the `Far overview `__ documentation. Additionally, documentation for Far::TopologyRefinerFactory outlines the -requirements, and a Far tutorial (tutorials/far/tutorial_1) provides an example +requirements, and Far tutorial 3.1 (tutorials/far/tutorial_3_1) provides an example of a factory for directly converting HbrMeshes to TopologyRefiners. Its worth a reminder here that Far::TopologyRefiner contains only topological diff --git a/documentation/tutorials.rst b/documentation/tutorials.rst index bb05e926..e117bd88 100644 --- a/documentation/tutorials.rst +++ b/documentation/tutorials.rst @@ -35,136 +35,156 @@ The tutorial source code can be found in the `github.com repository `__ or in your local ``/tutorials``. ----- +Far Tutorials +============= -.. raw:: html +1. Basic Construction and Interpolation +*************************************** - +Tutorial 1.1 +^^^^^^^^^^^^ + This tutorial presents the requisite steps to instantiate a mesh as a + Far::TopologyRefiner from simple topological data and to interpolate + vertex data associated with the mesh. `[code] `__ + +.. image:: images/far_tutorial_1_1.0.png + :align: center + :width: 100px + :target: images/far_tutorial_1_1.0.png + +Tutorial 1.2 +^^^^^^^^^^^^ + This tutorial makes use of a different vertex data definition for use when vertex + data is of arbitrary width. Uniform refinement is applied to data buffers of three + types: two of fixed but different sizes and the third a union of the two that is + dynamically sized and constructed. `[code] `__ + +2. Uniform Refinement and Primvar Data Types +******************************************** + +Tutorial 2.1 +^^^^^^^^^^^^ + Building on the basic tutorial, this example shows how to instantiate a simple mesh, + refine it uniformly and then interpolate both 'vertex' and 'varying' primvar data. + `[code] `__ + +.. image:: images/far_tutorial_2_1.0.png + :align: center + :width: 100px + :target: images/far_tutorial_2_1.0.png + +Tutorial 2.2 +^^^^^^^^^^^^ + Building on the previous tutorial, this example shows how to instantiate a simple mesh, + refine it uniformly and then interpolate both 'vertex' and 'face-varying' primvar data. + The resulting interpolated data is output in Obj format, with the 'face-varying' data + recorded in the UV texture layout. `[code] `__ + +.. image:: images/far_tutorial_2_2.0.png + :align: center + :width: 100px + :target: images/far_tutorial_2_2.0.png + +Tutorial 2.3 +^^^^^^^^^^^^ + Building on previous tutorials, this example shows how to instantiate a simple mesh, + refine it uniformly, interpolate both 'vertex' and 'face-varying' primvar data, and + finally calculate approximated smooth normals. The resulting interpolated data is + output in Obj format. `[code] `__ + +3. Creating a Custom Far::TopologyRefinerFactory +************************************************ + +Tutorial 3.1 +^^^^^^^^^^^^ + Previous tutorials have instantiated topology from a simple face-vertex list via the + Far::TopologyDescriptor and its TopologyRefinerFactory. This tutorial shows how to + more efficiently convert an existing high-level topology representation to a + Far::TopologyDescriptor with a custom factory class. `[code] `__ + +4. Construction and Usage of Far::StencilTables +*********************************************** + +Tutorial 4.1 +^^^^^^^^^^^^ + This tutorial shows how to create and manipulate a StencilTable. Factorized stencils + are used to efficiently interpolate vertex primvar data buffers. + `[code] `__ + +Tutorial 4.2 +^^^^^^^^^^^^ + This tutorial shows how to create and manipulate StencilTables for both 'vertex' and + 'varying' primvar data buffers: vertex positions and varying colors. + `[code] `__ + +Tutorial 4.3 +^^^^^^^^^^^^ + This tutorial shows how to create and manipulate tables of cascading stencils to apply + hierarchical vertex edits. `[code] `__ + +5. Construction and Usage of Far::PatchTables +********************************************* + +Tutorial 5.1 +^^^^^^^^^^^^ + This tutorial shows how to compute points on the limit surface at arbitrary parametric + locations using a Far::PatchTable constructed from adaptive refinement. + `[code] `__ + +.. image:: images/far_tutorial_5_1.0.png + :align: center + :width: 100px + :target: images/far_tutorial_5_1.0.png + +Tutorial 5.2 +^^^^^^^^^^^^ + Building on the previous tutorial, this example shows how to manage the limit surface + of a potentially large mesh by creating and evaluating separate PatchTables for selected + groups of faces of the mesh. `[code] `__ ---- -.. |far_tut_0| image:: images/far_tutorial_0.0.png - :width: 100px - :target: images/far_tutorial_0.0.png +Osd Tutorials +============= -.. |far_tut_1| image:: images/far_tutorial_1.0.png - :width: 100px - :target: images/far_tutorial_1.0.png - -.. |far_tut_3| image:: images/far_tutorial_3.0.png - :width: 100px - :target: images/far_tutorial_3.0.png - -.. |far_tut_6| image:: images/far_tutorial_6.0.png - :width: 100px - :target: images/far_tutorial_6.0.png - -.. list-table:: **Far Tutorials** - :class: quickref - :widths: 50 50 - - * - | **Tutorial 0** - | This tutorial presents in a very succinct way the requisite steps to - instantiate a mesh as a Far::TopologyRefiner from simple topological - data. `[code] `__ - | |far_tut_0| - | - | **Tutorial 1** - | This tutorial shows how to interface a high-level topology representation - with Far for better efficiency. In tutorial 0, we showed how to instantiate - topology from a simple face-vertex list. Here we will show how to take - advantage of more complex data structures. `[code] `__ - | - | **Tutorial 2** - | Building on tutorial 0, this example shows how to instantiate a simple mesh, - refine it uniformly and then interpolate both 'vertex' and 'varying' primvar - data. `[code] `__ - | |far_tut_1| - | - | **Tutorial 3** - | Building on tutorial 0, this example shows how to instantiate a simple mesh, - refine it uniformly and then interpolate both 'vertex' and 'face-varying' - primvar data. - The resulting interpolated data is output as an 'obj' file, with the - 'face-varying' data recorded in the uv texture layout. `[code] `__ - | |far_tut_3| - | - | **Tutorial 4** - | This tutorial shows how to create and manipulate a StencilTable. We use the - factorized stencils to interpolate vertex primvar data buffers. `[code] `__ - | - - | **Tutorial 5** - | This tutorial shows how to create and manipulate both 'vertex' and 'varying' - FarStencilTable to interpolate 2 primvar data buffers: vertex positions and - vertex colors. `[code] `__ - | - | **Tutorial 6** - | This tutorial shows how to interpolate surface limits at arbitrary - parametric locations using feature adaptive Far::PatchTable. `[code] `__ - | |far_tut_6| - | - | **Tutorial 7** - | This tutorial shows how to create and manipulate tables of cascading - stencils to apply hierarchical vertex edits. `[code] `__ - | - | **Tutorial 8** - | Building on tutorial 3, this example shows how to instantiate a simple mesh, - refine it uniformly, interpolate both 'vertex' and 'face-varying' primvar - data, and finally calculate approximated smooth normals. The resulting - interpolated data is output in 'obj' format. `[code] `__ - | - | **Tutorial 9** - | Building on tutorial 6, this example shows how to manage the limit surface - of a potentially large mesh by creating and evaluating separate PatchTables - for selected groups of faces of the mesh. `[code] `__ - | - | **Tutorial 10** - | In contrast to other tutorials, this tutorial makes use of a different vertex - data definition for use when vertex data is of arbitrary width. Uniform - refinement is applied to data buffers of three types: two of fixed size and - the third a union of the two that is dynamically sized and constructed. - `[code] `__ - | +Tutorial 0 +********** + This tutorial demonstrates the manipulation of Osd Evaluator and BufferDescriptor. + `[code] `__ ---- -.. list-table:: **Osd Tutorials** - :class: quickref - :widths: 50 50 +Hbr Tutorials +============= - * - | **Tutorial 0** - | This tutorial demonstrates the manipulation of Osd Evaluator and BufferDescriptor. - `[code] `__ - | - - | +Use of Hbr is no longer recommended -- these tutorials are included solely for +historical reference. -.. |hbr_tut_2| image:: images/hbr_tutorial_2.0.png +Tutorial 0 +********** + This tutorial presents, in a very succinct way, the requisite steps to + instantiate an Hbr mesh from simple topological data. `[code] `__ + +Tutorial 1 +********** + This tutorial shows how to safely create Hbr meshes from arbitrary topology. + Because Hbr is a half-edge data structure, it cannot represent non-manifold + topology. Ensuring that the geometry used is manifold is a requirement to use + Hbr safely. This tutorial presents some simple tests to detect inappropriate + topology. `[code] `__ + +Tutorial 2 +********** + This tutorial shows how to subdivide uniformly a simple Hbr mesh. We are + building upon previous tutorials and assuming a fully instantiated mesh: + we start with an HbrMesh pointer initialized from the same pyramid shape + used in hbr_tutorial_0. We then apply the Refine() function sequentially + to all the faces in the mesh to generate several levels of uniform + subdivision. The resulting data is then dumped to the terminal in Wavefront + OBJ format for inspection. `[code] `__ + +.. image:: images/hbr_tutorial_2.0.png + :align: center :width: 100px :target: images/hbr_tutorial_2.0.png -.. list-table:: **Hbr Tutorials** - :class: quickref - :widths: 50 50 - - * - | **Tutorial 0** - | This tutorial presents, in a very succinct way, the requisite steps to - instantiate an Hbr mesh from simple topological data. `[code] `__ - | - | **Tutorial 1** - | This tutorial shows how to safely create Hbr meshes from arbitrary topology. - Because Hbr is a half-edge data structure, it cannot represent non-manifold - topology. Ensuring that the geometry used is manifold is a requirement to use - Hbr safely. This tutorial presents some simple tests to detect inappropriate - topology. `[code] `__ - | - - | **Tutorial 2** - | This tutorial shows how to subdivide uniformly a simple Hbr mesh. We are - building upon previous tutorials and assuming a fully instantiated mesh: - we start with an HbrMesh pointer initialized from the same pyramid shape - used in hbr_tutorial_0. We then apply the Refine() function sequentially - to all the faces in the mesh to generate several levels of uniform - subdivision. The resulting data is then dumped to the terminal in Wavefront - OBJ format for inspection. `[code] `__ - | |hbr_tut_2| - | - diff --git a/tutorials/far/CMakeLists.txt b/tutorials/far/CMakeLists.txt index 60531dcd..603978de 100644 --- a/tutorials/far/CMakeLists.txt +++ b/tutorials/far/CMakeLists.txt @@ -36,17 +36,17 @@ endmacro() set(TUTORIALS - tutorial_0 - tutorial_1 - tutorial_2 - tutorial_3 - tutorial_4 - tutorial_5 - tutorial_6 - tutorial_7 - tutorial_8 - tutorial_9 - tutorial_10 + tutorial_1_1 + tutorial_1_2 + tutorial_2_1 + tutorial_2_2 + tutorial_2_3 + tutorial_3_1 + tutorial_4_1 + tutorial_4_2 + tutorial_4_3 + tutorial_5_1 + tutorial_5_2 ) foreach(tutorial ${TUTORIALS}) diff --git a/tutorials/far/tutorial_0/CMakeLists.txt b/tutorials/far/tutorial_1_1/CMakeLists.txt similarity index 96% rename from tutorials/far/tutorial_0/CMakeLists.txt rename to tutorials/far/tutorial_1_1/CMakeLists.txt index c1dc9cb7..fc8b01a1 100644 --- a/tutorials/far/tutorial_0/CMakeLists.txt +++ b/tutorials/far/tutorial_1_1/CMakeLists.txt @@ -22,6 +22,6 @@ # language governing permissions and limitations under the Apache License. # _add_far_tutorial( - far_tutorial_0 - far_tutorial_0.cpp + far_tutorial_1_1 + far_tutorial_1_1.cpp ) diff --git a/tutorials/far/tutorial_0/far_tutorial_0.cpp b/tutorials/far/tutorial_1_1/far_tutorial_1_1.cpp similarity index 100% rename from tutorials/far/tutorial_0/far_tutorial_0.cpp rename to tutorials/far/tutorial_1_1/far_tutorial_1_1.cpp diff --git a/tutorials/far/tutorial_1/CMakeLists.txt b/tutorials/far/tutorial_1_2/CMakeLists.txt similarity index 96% rename from tutorials/far/tutorial_1/CMakeLists.txt rename to tutorials/far/tutorial_1_2/CMakeLists.txt index c171d623..4fd16d51 100644 --- a/tutorials/far/tutorial_1/CMakeLists.txt +++ b/tutorials/far/tutorial_1_2/CMakeLists.txt @@ -22,6 +22,6 @@ # language governing permissions and limitations under the Apache License. # _add_far_tutorial( - far_tutorial_1 - far_tutorial_1.cpp + far_tutorial_1_2 + far_tutorial_1_2.cpp ) diff --git a/tutorials/far/tutorial_10/far_tutorial_10.cpp b/tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp similarity index 100% rename from tutorials/far/tutorial_10/far_tutorial_10.cpp rename to tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp diff --git a/tutorials/far/tutorial_10/CMakeLists.txt b/tutorials/far/tutorial_2_1/CMakeLists.txt similarity index 96% rename from tutorials/far/tutorial_10/CMakeLists.txt rename to tutorials/far/tutorial_2_1/CMakeLists.txt index 76f83694..d22fa27e 100644 --- a/tutorials/far/tutorial_10/CMakeLists.txt +++ b/tutorials/far/tutorial_2_1/CMakeLists.txt @@ -22,6 +22,6 @@ # language governing permissions and limitations under the Apache License. # _add_far_tutorial( - far_tutorial_10 - far_tutorial_10.cpp + far_tutorial_2_1 + far_tutorial_2_1.cpp ) diff --git a/tutorials/far/tutorial_2/far_tutorial_2.cpp b/tutorials/far/tutorial_2_1/far_tutorial_2_1.cpp similarity index 100% rename from tutorials/far/tutorial_2/far_tutorial_2.cpp rename to tutorials/far/tutorial_2_1/far_tutorial_2_1.cpp diff --git a/tutorials/far/tutorial_2/CMakeLists.txt b/tutorials/far/tutorial_2_2/CMakeLists.txt similarity index 96% rename from tutorials/far/tutorial_2/CMakeLists.txt rename to tutorials/far/tutorial_2_2/CMakeLists.txt index 333d76c0..3a67cb3e 100644 --- a/tutorials/far/tutorial_2/CMakeLists.txt +++ b/tutorials/far/tutorial_2_2/CMakeLists.txt @@ -22,6 +22,6 @@ # language governing permissions and limitations under the Apache License. # _add_far_tutorial( - far_tutorial_2 - far_tutorial_2.cpp + far_tutorial_2_2 + far_tutorial_2_2.cpp ) diff --git a/tutorials/far/tutorial_3/far_tutorial_3.cpp b/tutorials/far/tutorial_2_2/far_tutorial_2_2.cpp similarity index 100% rename from tutorials/far/tutorial_3/far_tutorial_3.cpp rename to tutorials/far/tutorial_2_2/far_tutorial_2_2.cpp diff --git a/tutorials/far/tutorial_2_3/CMakeLists.txt b/tutorials/far/tutorial_2_3/CMakeLists.txt new file mode 100644 index 00000000..af3b688a --- /dev/null +++ b/tutorials/far/tutorial_2_3/CMakeLists.txt @@ -0,0 +1,27 @@ +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the trade +# names, trademarks, service marks, or product names of the Licensor +# and its affiliates, except as required to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. +# +# You may obtain a copy of the Apache License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. +# +_add_far_tutorial( + far_tutorial_2_3 + far_tutorial_2_3.cpp +) diff --git a/tutorials/far/tutorial_8/far_tutorial_8.cpp b/tutorials/far/tutorial_2_3/far_tutorial_2_3.cpp similarity index 100% rename from tutorials/far/tutorial_8/far_tutorial_8.cpp rename to tutorials/far/tutorial_2_3/far_tutorial_2_3.cpp diff --git a/tutorials/far/tutorial_3/CMakeLists.txt b/tutorials/far/tutorial_3/CMakeLists.txt deleted file mode 100644 index 98fe7403..00000000 --- a/tutorials/far/tutorial_3/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2013 Pixar -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# -_add_far_tutorial( - far_tutorial_3 - far_tutorial_3.cpp -) diff --git a/tutorials/far/tutorial_3_1/CMakeLists.txt b/tutorials/far/tutorial_3_1/CMakeLists.txt new file mode 100644 index 00000000..86264e4c --- /dev/null +++ b/tutorials/far/tutorial_3_1/CMakeLists.txt @@ -0,0 +1,27 @@ +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the trade +# names, trademarks, service marks, or product names of the Licensor +# and its affiliates, except as required to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. +# +# You may obtain a copy of the Apache License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. +# +_add_far_tutorial( + far_tutorial_3_1 + far_tutorial_3_1.cpp +) diff --git a/tutorials/far/tutorial_1/far_tutorial_1.cpp b/tutorials/far/tutorial_3_1/far_tutorial_3_1.cpp similarity index 100% rename from tutorials/far/tutorial_1/far_tutorial_1.cpp rename to tutorials/far/tutorial_3_1/far_tutorial_3_1.cpp diff --git a/tutorials/far/tutorial_1/hbr_to_vtr.h b/tutorials/far/tutorial_3_1/hbr_to_vtr.h similarity index 100% rename from tutorials/far/tutorial_1/hbr_to_vtr.h rename to tutorials/far/tutorial_3_1/hbr_to_vtr.h diff --git a/tutorials/far/tutorial_4/CMakeLists.txt b/tutorials/far/tutorial_4/CMakeLists.txt deleted file mode 100644 index 64e3a75b..00000000 --- a/tutorials/far/tutorial_4/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2013 Pixar -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# -_add_far_tutorial( - far_tutorial_4 - far_tutorial_4.cpp -) diff --git a/tutorials/far/tutorial_4_1/CMakeLists.txt b/tutorials/far/tutorial_4_1/CMakeLists.txt new file mode 100644 index 00000000..3475ab1c --- /dev/null +++ b/tutorials/far/tutorial_4_1/CMakeLists.txt @@ -0,0 +1,27 @@ +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the trade +# names, trademarks, service marks, or product names of the Licensor +# and its affiliates, except as required to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. +# +# You may obtain a copy of the Apache License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. +# +_add_far_tutorial( + far_tutorial_4_1 + far_tutorial_4_1.cpp +) diff --git a/tutorials/far/tutorial_4/far_tutorial_4.cpp b/tutorials/far/tutorial_4_1/far_tutorial_4_1.cpp similarity index 100% rename from tutorials/far/tutorial_4/far_tutorial_4.cpp rename to tutorials/far/tutorial_4_1/far_tutorial_4_1.cpp diff --git a/tutorials/far/tutorial_4_2/CMakeLists.txt b/tutorials/far/tutorial_4_2/CMakeLists.txt new file mode 100644 index 00000000..bd0b691d --- /dev/null +++ b/tutorials/far/tutorial_4_2/CMakeLists.txt @@ -0,0 +1,27 @@ +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the trade +# names, trademarks, service marks, or product names of the Licensor +# and its affiliates, except as required to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. +# +# You may obtain a copy of the Apache License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. +# +_add_far_tutorial( + far_tutorial_4_2 + far_tutorial_4_2.cpp +) diff --git a/tutorials/far/tutorial_5/far_tutorial_5.cpp b/tutorials/far/tutorial_4_2/far_tutorial_4_2.cpp similarity index 100% rename from tutorials/far/tutorial_5/far_tutorial_5.cpp rename to tutorials/far/tutorial_4_2/far_tutorial_4_2.cpp diff --git a/tutorials/far/tutorial_4_3/CMakeLists.txt b/tutorials/far/tutorial_4_3/CMakeLists.txt new file mode 100644 index 00000000..d09296eb --- /dev/null +++ b/tutorials/far/tutorial_4_3/CMakeLists.txt @@ -0,0 +1,27 @@ +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the trade +# names, trademarks, service marks, or product names of the Licensor +# and its affiliates, except as required to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. +# +# You may obtain a copy of the Apache License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. +# +_add_far_tutorial( + far_tutorial_4_3 + far_tutorial_4_3.cpp +) diff --git a/tutorials/far/tutorial_7/far_tutorial_7.cpp b/tutorials/far/tutorial_4_3/far_tutorial_4_3.cpp similarity index 100% rename from tutorials/far/tutorial_7/far_tutorial_7.cpp rename to tutorials/far/tutorial_4_3/far_tutorial_4_3.cpp diff --git a/tutorials/far/tutorial_5/CMakeLists.txt b/tutorials/far/tutorial_5/CMakeLists.txt deleted file mode 100644 index dbd45ee3..00000000 --- a/tutorials/far/tutorial_5/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2013 Pixar -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# -_add_far_tutorial( - far_tutorial_5 - far_tutorial_5.cpp -) diff --git a/tutorials/far/tutorial_5_1/CMakeLists.txt b/tutorials/far/tutorial_5_1/CMakeLists.txt new file mode 100644 index 00000000..3af75c8e --- /dev/null +++ b/tutorials/far/tutorial_5_1/CMakeLists.txt @@ -0,0 +1,27 @@ +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the trade +# names, trademarks, service marks, or product names of the Licensor +# and its affiliates, except as required to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. +# +# You may obtain a copy of the Apache License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. +# +_add_far_tutorial( + far_tutorial_5_1 + far_tutorial_5_1.cpp +) diff --git a/tutorials/far/tutorial_6/far_tutorial_6.cpp b/tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp similarity index 100% rename from tutorials/far/tutorial_6/far_tutorial_6.cpp rename to tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp diff --git a/tutorials/far/tutorial_9/CMakeLists.txt b/tutorials/far/tutorial_5_2/CMakeLists.txt similarity index 96% rename from tutorials/far/tutorial_9/CMakeLists.txt rename to tutorials/far/tutorial_5_2/CMakeLists.txt index a0bc57ec..2575d69a 100644 --- a/tutorials/far/tutorial_9/CMakeLists.txt +++ b/tutorials/far/tutorial_5_2/CMakeLists.txt @@ -22,7 +22,7 @@ # language governing permissions and limitations under the Apache License. # _add_far_tutorial( - far_tutorial_9 - far_tutorial_9.cpp + far_tutorial_5_2 + far_tutorial_5_2.cpp $ ) diff --git a/tutorials/far/tutorial_9/far_tutorial_9.cpp b/tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp similarity index 100% rename from tutorials/far/tutorial_9/far_tutorial_9.cpp rename to tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp diff --git a/tutorials/far/tutorial_6/CMakeLists.txt b/tutorials/far/tutorial_6/CMakeLists.txt deleted file mode 100644 index 08469304..00000000 --- a/tutorials/far/tutorial_6/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2013 Pixar -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# -_add_far_tutorial( - far_tutorial_6 - far_tutorial_6.cpp -) diff --git a/tutorials/far/tutorial_7/CMakeLists.txt b/tutorials/far/tutorial_7/CMakeLists.txt deleted file mode 100644 index 5b795500..00000000 --- a/tutorials/far/tutorial_7/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2013 Pixar -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# -_add_far_tutorial( - far_tutorial_7 - far_tutorial_7.cpp -) diff --git a/tutorials/far/tutorial_8/CMakeLists.txt b/tutorials/far/tutorial_8/CMakeLists.txt deleted file mode 100644 index 44f6b0c1..00000000 --- a/tutorials/far/tutorial_8/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2013 Pixar -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# -_add_far_tutorial( - far_tutorial_8 - far_tutorial_8.cpp -)