From b80a414361b76886db338e30cd250560a2e0c3b4 Mon Sep 17 00:00:00 2001 From: barry Date: Tue, 14 Jan 2020 14:27:51 -0800 Subject: [PATCH] Updated examples with new shapes for boundary interpolation "none": - added catmark_edgenone and loop_triangle_edgenone to shape lists --- examples/dxViewer/init_shapes.h | 3 ++- examples/farViewer/init_shapes.h | 4 ++-- examples/glEvalLimit/init_shapes.h | 3 ++- examples/glFVarViewer/init_shapes.h | 2 ++ examples/glImaging/init_shapes.h | 3 ++- examples/glPaintTest/init_shapes.h | 2 ++ examples/glShareTopology/init_shapes.h | 2 ++ examples/glStencilViewer/init_shapes.h | 3 ++- examples/glViewer/init_shapes.h | 3 ++- examples/mtlViewer/init_shapes.h | 3 ++- 10 files changed, 20 insertions(+), 8 deletions(-) diff --git a/examples/dxViewer/init_shapes.h b/examples/dxViewer/init_shapes.h index d08d4032..22121b59 100644 --- a/examples/dxViewer/init_shapes.h +++ b/examples/dxViewer/init_shapes.h @@ -42,6 +42,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("catmark_torus_creases1", catmark_torus_creases1, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark)); + g_defaultShapes.push_back(ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_interior", catmark_xord_interior, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_boundary", catmark_xord_boundary, kCatmark)); @@ -82,7 +83,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("loop_icos_infsharp", loop_icos_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop)); - g_defaultShapes.push_back(ShapeDesc("loop_saddle_edgeonly", loop_saddle_edgeonly, kLoop)); + g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_nonman_verts", loop_nonman_verts, kLoop)); diff --git a/examples/farViewer/init_shapes.h b/examples/farViewer/init_shapes.h index 7cbdab87..715b6ee6 100644 --- a/examples/farViewer/init_shapes.h +++ b/examples/farViewer/init_shapes.h @@ -47,6 +47,7 @@ static void initShapes() { g_shapes.push_back( ShapeDesc("catmark_chaikin2", catmark_chaikin2, kCatmark ) ); g_shapes.push_back( ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark ) ); g_shapes.push_back( ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark ) ); + g_shapes.push_back( ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark ) ); g_shapes.push_back( ShapeDesc("catmark_fan", catmark_fan, kCatmark ) ); g_shapes.push_back( ShapeDesc("catmark_flap", catmark_flap, kCatmark ) ); g_shapes.push_back( ShapeDesc("catmark_flap2", catmark_flap2, kCatmark ) ); @@ -81,10 +82,9 @@ static void initShapes() { // g_shapes.push_back( ShapeDesc("loop_cube_creases1", loop_cube_creases1, kLoop ) ); // g_shapes.push_back( ShapeDesc("loop_cube", loop_cube, kLoop ) ); // g_shapes.push_back( ShapeDesc("loop_icosahedron", loop_icosahedron, kLoop ) ); -// g_shapes.push_back( ShapeDesc("loop_saddle_edgecorner", loop_saddle_edgecorner, kLoop ) ); -// g_shapes.push_back( ShapeDesc("loop_saddle_edgeonly", loop_saddle_edgeonly, kLoop ) ); // g_shapes.push_back( ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop ) ); // g_shapes.push_back( ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop ) ); +// g_shapes.push_back( ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop ) ); // g_shapes.push_back( ShapeDesc("loop_chaikin0", loop_chaikin0, kLoop ) ); // g_shapes.push_back( ShapeDesc("loop_chaikin1", loop_chaikin1, kLoop ) ); } diff --git a/examples/glEvalLimit/init_shapes.h b/examples/glEvalLimit/init_shapes.h index d08d4032..22121b59 100644 --- a/examples/glEvalLimit/init_shapes.h +++ b/examples/glEvalLimit/init_shapes.h @@ -42,6 +42,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("catmark_torus_creases1", catmark_torus_creases1, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark)); + g_defaultShapes.push_back(ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_interior", catmark_xord_interior, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_boundary", catmark_xord_boundary, kCatmark)); @@ -82,7 +83,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("loop_icos_infsharp", loop_icos_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop)); - g_defaultShapes.push_back(ShapeDesc("loop_saddle_edgeonly", loop_saddle_edgeonly, kLoop)); + g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_nonman_verts", loop_nonman_verts, kLoop)); diff --git a/examples/glFVarViewer/init_shapes.h b/examples/glFVarViewer/init_shapes.h index c1e2aec7..ad63c52c 100644 --- a/examples/glFVarViewer/init_shapes.h +++ b/examples/glFVarViewer/init_shapes.h @@ -50,6 +50,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("catmark_fvar_project0", catmark_fvar_project0, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark)); + g_defaultShapes.push_back(ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_interior", catmark_xord_interior, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_boundary", catmark_xord_boundary, kCatmark)); @@ -74,6 +75,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("loop_fvar_bound3", loop_fvar_bound3, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop)); + g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_nonman_verts", loop_nonman_verts, kLoop)); diff --git a/examples/glImaging/init_shapes.h b/examples/glImaging/init_shapes.h index d08d4032..22121b59 100644 --- a/examples/glImaging/init_shapes.h +++ b/examples/glImaging/init_shapes.h @@ -42,6 +42,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("catmark_torus_creases1", catmark_torus_creases1, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark)); + g_defaultShapes.push_back(ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_interior", catmark_xord_interior, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_boundary", catmark_xord_boundary, kCatmark)); @@ -82,7 +83,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("loop_icos_infsharp", loop_icos_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop)); - g_defaultShapes.push_back(ShapeDesc("loop_saddle_edgeonly", loop_saddle_edgeonly, kLoop)); + g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_nonman_verts", loop_nonman_verts, kLoop)); diff --git a/examples/glPaintTest/init_shapes.h b/examples/glPaintTest/init_shapes.h index 9d1be653..33e15080 100644 --- a/examples/glPaintTest/init_shapes.h +++ b/examples/glPaintTest/init_shapes.h @@ -42,6 +42,7 @@ static void initShapes() { g_defaultShapes.push_back( ShapeDesc("catmark_dart_edgeonly", catmark_dart_edgeonly, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark ) ); + g_defaultShapes.push_back( ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_fan", catmark_fan, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_gregory_test1", catmark_gregory_test1, kCatmark ) ); @@ -70,6 +71,7 @@ static void initShapes() { g_defaultShapes.push_back( ShapeDesc("loop_cube_asymmetric", loop_cube_asymmetric, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop ) ); + g_defaultShapes.push_back( ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_icosahedron", loop_icosahedron, kLoop ) ); diff --git a/examples/glShareTopology/init_shapes.h b/examples/glShareTopology/init_shapes.h index 156d1444..c092425a 100644 --- a/examples/glShareTopology/init_shapes.h +++ b/examples/glShareTopology/init_shapes.h @@ -43,6 +43,7 @@ static void initShapes() { g_defaultShapes.push_back( ShapeDesc("catmark_dart_edgeonly", catmark_dart_edgeonly, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark ) ); + g_defaultShapes.push_back( ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_chaikin0", catmark_chaikin0, kCatmark ) ); g_defaultShapes.push_back( ShapeDesc("catmark_chaikin1", catmark_chaikin1, kCatmark ) ); @@ -87,6 +88,7 @@ static void initShapes() { g_defaultShapes.push_back( ShapeDesc("loop_cube_asymmetric", loop_cube_asymmetric, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop ) ); + g_defaultShapes.push_back( ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop ) ); g_defaultShapes.push_back( ShapeDesc("loop_icosahedron", loop_icosahedron, kLoop ) ); diff --git a/examples/glStencilViewer/init_shapes.h b/examples/glStencilViewer/init_shapes.h index d08d4032..22121b59 100644 --- a/examples/glStencilViewer/init_shapes.h +++ b/examples/glStencilViewer/init_shapes.h @@ -42,6 +42,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("catmark_torus_creases1", catmark_torus_creases1, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark)); + g_defaultShapes.push_back(ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_interior", catmark_xord_interior, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_boundary", catmark_xord_boundary, kCatmark)); @@ -82,7 +83,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("loop_icos_infsharp", loop_icos_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop)); - g_defaultShapes.push_back(ShapeDesc("loop_saddle_edgeonly", loop_saddle_edgeonly, kLoop)); + g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_nonman_verts", loop_nonman_verts, kLoop)); diff --git a/examples/glViewer/init_shapes.h b/examples/glViewer/init_shapes.h index d08d4032..22121b59 100644 --- a/examples/glViewer/init_shapes.h +++ b/examples/glViewer/init_shapes.h @@ -42,6 +42,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("catmark_torus_creases1", catmark_torus_creases1, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark)); + g_defaultShapes.push_back(ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_interior", catmark_xord_interior, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_boundary", catmark_xord_boundary, kCatmark)); @@ -82,7 +83,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("loop_icos_infsharp", loop_icos_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop)); - g_defaultShapes.push_back(ShapeDesc("loop_saddle_edgeonly", loop_saddle_edgeonly, kLoop)); + g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_nonman_verts", loop_nonman_verts, kLoop)); diff --git a/examples/mtlViewer/init_shapes.h b/examples/mtlViewer/init_shapes.h index d08d4032..22121b59 100644 --- a/examples/mtlViewer/init_shapes.h +++ b/examples/mtlViewer/init_shapes.h @@ -42,6 +42,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("catmark_torus_creases1", catmark_torus_creases1, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark)); + g_defaultShapes.push_back(ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_interior", catmark_xord_interior, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_xord_boundary", catmark_xord_boundary, kCatmark)); @@ -82,7 +83,7 @@ static void initShapes() { g_defaultShapes.push_back(ShapeDesc("loop_icos_infsharp", loop_icos_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop)); - g_defaultShapes.push_back(ShapeDesc("loop_saddle_edgeonly", loop_saddle_edgeonly, kLoop)); + g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_nonman_verts", loop_nonman_verts, kLoop));