Merge pull request #1083 from barfowl/far_tutorial_review

Reorganized Far tutorials into groups

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
     )
 

documentation/api_overview.rst

@@ -189,7 +189,7 @@ from the `Far::TopologyDescriptor <far_overview.html#far-topologyrefinerfactory>
         // do something with dst and fverts
     }
 
-6. Done! See `far_tutorial_0 <far_tutorial_0.html>`__ for the complete code example.
+6. Done! See `Far tutorial 1.1 <far_tutorial_1_1.html>`__ for the complete code example.
 
 Use case 2: GL adaptive tessellation drawing of animating mesh
 ==============================================================

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 <far_overview.html#far-topologyrefinerfactory>`__ documentation.
 Additionally, documentation for Far::TopologyRefinerFactory<MESH> 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

documentation/tutorials.rst

@@ -35,136 +35,156 @@ The tutorial source code can be found in the `github.com repository
 <https://github.com/PixarAnimationStudios/OpenSubdiv/tree/master/tutorials>`__
 or in your local ``<repository root>/tutorials``.
 
-----
+Far Tutorials
+=============
 
-.. raw:: html
+1. Basic Construction and Interpolation
+***************************************
 
-  <style> .line {text-align:justify;} </style>
+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] <far_tutorial_1_1.html>`__
+
+.. 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] <far_tutorial_1_2.html>`__
+
+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] <far_tutorial_2_1.html>`__
+
+.. 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] <far_tutorial_2_2.html>`__
+
+.. 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] <far_tutorial_2_3.html>`__
+
+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] <far_tutorial_3_1.html>`__
+
+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] <far_tutorial_4_1.html>`__
+
+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] <far_tutorial_4_2.html>`__
+
+Tutorial 4.3
+^^^^^^^^^^^^
+ This tutorial shows how to create and manipulate tables of cascading stencils to apply
+ hierarchical vertex edits. `[code] <far_tutorial_4_3.html>`__
+
+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] <far_tutorial_5_1.html>`__
+
+.. 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_tutorial_5_2.html>`__
 
 ----
 
-.. |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_tutorial_0.html>`__
-       | |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] <far_tutorial_1.html>`__
-       |
-       | **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_tutorial_2.html>`__
-       | |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_tutorial_3.html>`__
-       | |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] <far_tutorial_4.html>`__
-       |
-     - | **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] <far_tutorial_5.html>`__
-       |
-       | **Tutorial 6**
-       | This tutorial shows how to interpolate surface limits at arbitrary
-         parametric locations using feature adaptive Far::PatchTable. `[code] <far_tutorial_6.html>`__
-       | |far_tut_6|
-       |
-       | **Tutorial 7**
-       | This tutorial shows how to create and manipulate tables of cascading
-         stencils to apply hierarchical vertex edits. `[code] <far_tutorial_7.html>`__
-       |
-       | **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] <far_tutorial_8.html>`__
-       |
-       | **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] <far_tutorial_9.html>`__
-       |
-       | **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] <far_tutorial_10.html>`__
-       |
+Tutorial 0
+**********
+ This tutorial demonstrates the manipulation of Osd Evaluator and BufferDescriptor.
+ `[code] <osd_tutorial_0.html>`__
 
 ----
 
-.. list-table:: **Osd Tutorials**
-   :class: quickref
-   :widths: 50 50
+Hbr Tutorials
+=============
 
-   * - | **Tutorial 0**
-       | This tutorial demonstrates the manipulation of Osd Evaluator and BufferDescriptor.
-         `[code] <osd_tutorial_0.html>`__
-       |
-     - |
+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] <hbr_tutorial_0.html>`__
+
+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] <hbr_tutorial_1.html>`__
+
+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_tutorial_2.html>`__
+
+.. 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] <hbr_tutorial_0.html>`__
-       |
-       | **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] <hbr_tutorial_1.html>`__
-       |
-     - | **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_tutorial_2.html>`__
-       | |hbr_tut_2|
-       |
-

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})

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
 )

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
 )

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
 )

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
 )

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
+)

tutorials/far/tutorial_3/CMakeLists.txt

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

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
+)

tutorials/far/tutorial_4/CMakeLists.txt

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

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
+)

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
+)

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
+)

tutorials/far/tutorial_5/CMakeLists.txt

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

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
+)

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
     $<TARGET_OBJECTS:regression_common_obj>
 )

tutorials/far/tutorial_6/CMakeLists.txt

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

tutorials/far/tutorial_7/CMakeLists.txt

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

tutorials/far/tutorial_8/CMakeLists.txt

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