Merge pull request #1251 from barfowl/far_tutorials

Minor improvements to Far tutorials:

tutorials/far/tutorial_1_1/far_tutorial_1_1.cpp

@@ -182,6 +182,9 @@ int main(int, char **) {
             printf("\n");
         }
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------

tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp

@@ -289,4 +289,7 @@ int main(int, char **) {
         }
         printf("\n");
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }

tutorials/far/tutorial_2_1/far_tutorial_2_1.cpp

@@ -207,6 +207,9 @@ int main(int, char **) {
         }
         printf(";\n");
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------

tutorials/far/tutorial_2_2/far_tutorial_2_2.cpp

@@ -333,7 +333,7 @@ int main(int, char **) {
         // Print colors
         int firstOfLastColors = refiner->GetNumFVarValuesTotal(channelColor) - ncolors;
 
-        for (int fvvert = 0; fvvert < nuvs; ++fvvert) {
+        for (int fvvert = 0; fvvert < ncolors; ++fvvert) {
             FVarVertexColor const & c = fvVertsColor[firstOfLastColors + fvvert];
             printf("c %f %f %f %f\n", c.r, c.g, c.b, c.a);
         }
@@ -355,5 +355,8 @@ int main(int, char **) {
             printf("\n");
         }
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 //------------------------------------------------------------------------------

tutorials/far/tutorial_2_3/far_tutorial_2_3.cpp

@@ -523,5 +523,8 @@ int main(int argc, char ** argv) {
             printf("\n");
         }
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 //------------------------------------------------------------------------------

tutorials/far/tutorial_3_1/far_tutorial_3_1.cpp

@@ -269,7 +269,7 @@ bool
 TopologyRefinerFactory<Converter>::assignComponentTopology(
     TopologyRefiner & refiner, Converter const & conv) {
 
-    typedef Far::IndexArray      IndexArray;
+    using Far::IndexArray;
 
     { // Face relations:
         int nfaces = conv.GetNumFaces();
@@ -488,6 +488,9 @@ int main(int, char **) {
             printf("\n");
         }
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------

tutorials/far/tutorial_4_1/far_tutorial_4_1.cpp

@@ -155,6 +155,7 @@ int main(int, char **) {
 
     delete refiner;
     delete stencilTable;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------

tutorials/far/tutorial_4_2/far_tutorial_4_2.cpp

@@ -206,6 +206,7 @@ int main(int, char **) {
 
     delete vertexStencils;
     delete varyingStencils;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------

tutorials/far/tutorial_4_3/far_tutorial_4_3.cpp

@@ -209,6 +209,7 @@ int main(int, char **) {
 
     delete refiner;
     delete stencilTable;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------

tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp

@@ -222,10 +222,10 @@ int main(int, char **) {
     Far::PtexIndices ptexIndices(*refiner);
 
     // Generate random samples on each ptex face
-    int nsamples = 200,
+    int nsamplesPerFace = 200,
         nfaces = ptexIndices.GetNumFaces();
 
-    std::vector<LimitFrame> samples(nsamples * nfaces);
+    std::vector<LimitFrame> samples(nsamplesPerFace * nfaces);
 
     srand( static_cast<int>(2147483647) );
 
@@ -233,7 +233,7 @@ int main(int, char **) {
 
     for (int face=0, count=0; face<nfaces; ++face) {
 
-        for (int sample=0; sample<nsamples; ++sample, ++count) {
+        for (int sample=0; sample<nsamplesPerFace; ++sample, ++count) {
 
             Real s = (Real)rand()/(Real)RAND_MAX,
                  t = (Real)rand()/(Real)RAND_MAX;
@@ -303,6 +303,9 @@ int main(int, char **) {
         printf("select deriv1Shape deriv2Shape;\n");
     }
 
+    delete refiner;
+    delete patchTable;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------

tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp

@@ -172,7 +172,8 @@ namespace {
         for (int x = 0; x < multiplier; ++x) {
             for (int y = 0; y < multiplier; ++y) {
                 for (int z = 0; z < multiplier; ++z) {
-                    appendDefaultPrimitive(Pos(x * 2.0f, y * 2.0f, z * 2.0f),
+                    appendDefaultPrimitive(
+                        Pos((float)x * 2.0f, (float)y * 2.0f, (float)z * 2.0f),
                         vertsPerFace, faceVerts, positionsPerVert);
                 }
             }
@@ -284,7 +285,8 @@ namespace {
 
         int numVertices = refiner->GetNumVerticesTotal();
         posVector.resize(numVertices);
-        std::memcpy(&posVector[0], &shape->verts[0], numVertices * sizeof(Pos));
+        std::memcpy(&posVector[0].p[0], &shape->verts[0],
+                    numVertices * 3 * sizeof(float));
 
         delete shape;
         return refiner;

tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp

@@ -228,7 +228,8 @@ namespace {
 
         int numVertices = refiner->GetNumVerticesTotal();
         posVector.resize(numVertices);
-        std::memcpy(&posVector[0], &shape->verts[0], numVertices * sizeof(Pos));
+        std::memcpy(&posVector[0].p[0], &shape->verts[0],
+                    numVertices * 3 * sizeof(float));
 
         delete shape;
         return refiner;